summaryrefslogtreecommitdiff
path: root/op.c
diff options
context:
space:
mode:
authorGurusamy Sarathy <gsar@cpan.org>1999-11-10 01:52:22 +0000
committerGurusamy Sarathy <gsar@cpan.org>1999-11-10 01:52:22 +0000
commit7e363e51b620b0068542ae9460f4c9c09bf7914e (patch)
tree96f86e8047d556455018136169223b2b47bc3107 /op.c
parente0c198038146b7a4a8cc36d4608b35da0fadeaad (diff)
downloadperl-7e363e51b620b0068542ae9460f4c9c09bf7914e.tar.gz
remove dead branch/infinite looper in change#3612
p4raw-link: @3612 on //depot/perl: b162f9ead0a98db35cdcfc8c889e344c040c8d8e p4raw-id: //depot/perl@4543
Diffstat (limited to 'op.c')
-rw-r--r--op.c22
1 files changed, 15 insertions, 7 deletions
diff --git a/op.c b/op.c
index 1ea970d310..052d1c13fe 100644
--- a/op.c
+++ b/op.c
@@ -850,12 +850,10 @@ Perl_scalar(pTHX_ OP *o)
/* assumes no premature commitment */
if (!o || (o->op_flags & OPf_WANT) || PL_error_count
|| o->op_type == OP_RETURN)
+ {
return o;
+ }
- if ((o->op_private & OPpTARGET_MY)
- && (PL_opargs[o->op_type] & OA_TARGLEX)) /* OPp share the meaning */
- return scalar(o); /* As if inside SASSIGN */
-
o->op_flags = (o->op_flags & ~OPf_WANT) | OPf_WANT_SCALAR;
switch (o->op_type) {
@@ -936,11 +934,15 @@ Perl_scalarvoid(pTHX_ OP *o)
want = o->op_flags & OPf_WANT;
if ((want && want != OPf_WANT_SCALAR) || PL_error_count
|| o->op_type == OP_RETURN)
+ {
return o;
+ }
if ((o->op_private & OPpTARGET_MY)
- && (PL_opargs[o->op_type] & OA_TARGLEX)) /* OPp share the meaning */
+ && (PL_opargs[o->op_type] & OA_TARGLEX))/* OPp share the meaning */
+ {
return scalar(o); /* As if inside SASSIGN */
+ }
o->op_flags = (o->op_flags & ~OPf_WANT) | OPf_WANT_VOID;
@@ -1138,11 +1140,15 @@ Perl_list(pTHX_ OP *o)
/* assumes no premature commitment */
if (!o || (o->op_flags & OPf_WANT) || PL_error_count
|| o->op_type == OP_RETURN)
+ {
return o;
+ }
if ((o->op_private & OPpTARGET_MY)
- && (PL_opargs[o->op_type] & OA_TARGLEX)) /* OPp share the meaning */
+ && (PL_opargs[o->op_type] & OA_TARGLEX))/* OPp share the meaning */
+ {
return o; /* As if inside SASSIGN */
+ }
o->op_flags = (o->op_flags & ~OPf_WANT) | OPf_WANT_LIST;
@@ -1252,8 +1258,10 @@ Perl_mod(pTHX_ OP *o, I32 type)
return o;
if ((o->op_private & OPpTARGET_MY)
- && (PL_opargs[o->op_type] & OA_TARGLEX)) /* OPp share the meaning */
+ && (PL_opargs[o->op_type] & OA_TARGLEX))/* OPp share the meaning */
+ {
return o;
+ }
switch (o->op_type) {
case OP_UNDEF: