diff options
-rw-r--r-- | opcode.h | 2 | ||||
-rwxr-xr-x | opcode.pl | 2 | ||||
-rw-r--r-- | pp.c | 5 | ||||
-rw-r--r-- | t/op/cproto.t | 4 |
4 files changed, 6 insertions, 7 deletions
@@ -2,7 +2,7 @@ * opcode.h * * Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, - * 2000, 2001, 2002, 2003, 2004, by Larry Wall and others + * 2000, 2001, 2002, 2003, 2004, 2005 by Larry Wall and others * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -41,7 +41,7 @@ print <<"END"; * opcode.h * * Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, - * 2000, 2001, 2002, 2003, 2004, by Larry Wall and others + * 2000, 2001, 2002, 2003, 2004, 2005 by Larry Wall and others * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -388,7 +388,8 @@ PP(pp_prototype) I32 oa; char str[ MAX_ARGS_OP * 2 + 2 ]; /* One ';', one '\0' */ - if (code == -KEY_chop || code == -KEY_chomp) + if (code == -KEY_chop || code == -KEY_chomp + || code == -KEY_exec || code == -KEY_system) goto set; while (i < MAXO) { /* The slow way. */ if (strEQ(s + 6, PL_op_name[i]) @@ -406,8 +407,6 @@ PP(pp_prototype) seen_question = 1; str[n++] = ';'; } - else if (n && str[0] == ';' && seen_question) - goto set; /* XXXX system, exec */ if ((oa & (OA_OPTIONAL - 1)) >= OA_AVREF && (oa & (OA_OPTIONAL - 1)) <= OA_SCALARREF /* But globs are already references (kinda) */ diff --git a/t/op/cproto.t b/t/op/cproto.t index a50a85192b..d37118e045 100644 --- a/t/op/cproto.t +++ b/t/op/cproto.t @@ -137,7 +137,7 @@ lstat (*) lt ($$) m undef map undef -mkdir () +mkdir (;$$) msgctl ($$$) msgget ($$) msgrcv ($$$$$) @@ -197,7 +197,7 @@ send (*$$;$) setgrent () sethostent ($) setnetent ($) -setpgrp undef +setpgrp (;$$) setpriority ($$$) setprotoent ($) setpwent () |