Change 25661 by [EMAIL PROTECTED] on 2005/09/29 14:17:12
Integrate:
[ 24380]
Fix getting prototype of builtins mkdir and setpgrp.
Hardcode special exceptions for exec and system, instead
of trying to be clever and failing.
Affected files ...
... //depot/maint-5.8/perl/opcode.h#13 integrate
... //depot/maint-5.8/perl/opcode.pl#18 integrate
... //depot/maint-5.8/perl/pp.c#78 integrate
... //depot/maint-5.8/perl/t/op/cproto.t#5 integrate
Differences ...
==== //depot/maint-5.8/perl/opcode.h#13 (text+w) ====
Index: perl/opcode.h
--- perl/opcode.h#12~25472~ Sun Sep 18 08:52:39 2005
+++ perl/opcode.h Thu Sep 29 07:17:12 2005
@@ -3,7 +3,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.
==== //depot/maint-5.8/perl/opcode.pl#18 (xtext) ====
Index: perl/opcode.pl
--- perl/opcode.pl#17~25472~ Sun Sep 18 08:52:39 2005
+++ perl/opcode.pl Thu Sep 29 07:17:12 2005
@@ -42,7 +42,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.
==== //depot/maint-5.8/perl/pp.c#78 (text) ====
Index: perl/pp.c
--- perl/pp.c#77~25654~ Thu Sep 29 02:45:08 2005
+++ perl/pp.c Thu Sep 29 07:17:12 2005
@@ -390,7 +390,8 @@
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])
@@ -408,8 +409,6 @@
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) */
==== //depot/maint-5.8/perl/t/op/cproto.t#5 (text) ====
Index: perl/t/op/cproto.t
--- perl/t/op/cproto.t#4~21715~ Thu Nov 13 11:57:33 2003
+++ perl/t/op/cproto.t Thu Sep 29 07:17:12 2005
@@ -197,7 +197,7 @@
setgrent ()
sethostent ($)
setnetent ($)
-setpgrp undef
+setpgrp (;$$)
setpriority ($$$)
setprotoent ($)
setpwent ()
End of Patch.
