Change 33021 by [EMAIL PROTECTED] on 2008/01/21 08:54:25
Add a flag G_WANT, as a mask for the bits G_SCALAR, G_ARRAY and G_VOID.
Affected files ...
... //depot/perl/cop.h#155 edit
... //depot/perl/perl.c#857 edit
Differences ...
==== //depot/perl/cop.h#155 (text) ====
Index: perl/cop.h
--- perl/cop.h#154~33018~ 2008-01-20 14:20:56.000000000 -0800
+++ perl/cop.h 2008-01-21 00:54:25.000000000 -0800
@@ -740,6 +740,7 @@
#define G_SCALAR 0
#define G_ARRAY 1
#define G_VOID 128 /* skip this bit when adding flags below */
+#define G_WANT (128|1)
/* extra flags for Perl_call_* routines */
#define G_DISCARD 2 /* Call FREETMPS.
==== //depot/perl/perl.c#857 (text) ====
Index: perl/perl.c
--- perl/perl.c#856~33020~ 2008-01-21 00:23:46.000000000 -0800
+++ perl/perl.c 2008-01-21 00:54:25.000000000 -0800
@@ -2650,7 +2650,7 @@
goto redo_body;
}
PL_stack_sp = PL_stack_base + oldmark;
- if (flags & G_ARRAY)
+ if ((flags & G_WANT) == G_ARRAY)
retval = 0;
else {
retval = 1;
@@ -2749,7 +2749,7 @@
goto redo_body;
}
PL_stack_sp = PL_stack_base + oldmark;
- if (flags & G_ARRAY)
+ if ((flags & G_WANT) == G_ARRAY)
retval = 0;
else {
retval = 1;
End of Patch.
