summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dump.c4
-rw-r--r--op.c4
-rw-r--r--op.h2
-rw-r--r--pp.c2
-rw-r--r--pp_hot.c2
5 files changed, 7 insertions, 7 deletions
diff --git a/dump.c b/dump.c
index 1283d1d725..0733b30841 100644
--- a/dump.c
+++ b/dump.c
@@ -944,8 +944,8 @@ Perl_do_op_dump(pTHX_ I32 level, PerlIO *file, const OP *o)
sv_catpv(tmpsv, ",LVAL_DEFER");
}
else if (optype == OP_RV2HV || optype == OP_PADHV) {
- if (o->op_private & OpMAYBE_TRUEBOOL)
- sv_catpvs(tmpsv, ",OpMAYBE_TRUEBOOL");
+ if (o->op_private & OPpMAYBE_TRUEBOOL)
+ sv_catpvs(tmpsv, ",OPpMAYBE_TRUEBOOL");
if (o->op_private & OPpTRUEBOOL)
sv_catpvs(tmpsv, ",OPpTRUEBOOL");
}
diff --git a/op.c b/op.c
index cd37eb8978..c8196b8d4b 100644
--- a/op.c
+++ b/op.c
@@ -10555,7 +10555,7 @@ Perl_rpeep(pTHX_ register OP *o)
|| o->op_type == OP_AND )
fop->op_private |= OPpTRUEBOOL;
else if (!(lop->op_flags & OPf_WANT))
- fop->op_private |= OpMAYBE_TRUEBOOL;
+ fop->op_private |= OPpMAYBE_TRUEBOOL;
}
if ( (lop->op_flags & OPf_WANT) == OPf_WANT_VOID
&& sop)
@@ -10567,7 +10567,7 @@ Perl_rpeep(pTHX_ register OP *o)
case OP_COND_EXPR:
if ((fop = HV_OR_SCALARHV(cLOGOP->op_first)))
- fop->op_private |= OpMAYBE_TRUEBOOL;
+ fop->op_private |= OPpMAYBE_TRUEBOOL;
#undef HV_OR_SCALARHV
/* GERONIMO! */
}
diff --git a/op.h b/op.h
index 60af704d2d..2bfaa0d9dd 100644
--- a/op.h
+++ b/op.h
@@ -224,7 +224,7 @@ Deprecated. Use C<GIMME_V> instead.
/* OP_RV2HV and OP_PADHV */
#define OPpTRUEBOOL 32 /* %hash in (%hash || $foo) in
void context */
-#define OpMAYBE_TRUEBOOL 64 /* %hash in (%hash || $foo) where
+#define OPpMAYBE_TRUEBOOL 64 /* %hash in (%hash || $foo) where
cx is not known till run time */
/* OP_SUBSTR only */
diff --git a/pp.c b/pp.c
index 0d31c2634a..0c148baf2b 100644
--- a/pp.c
+++ b/pp.c
@@ -132,7 +132,7 @@ PP(pp_padhv)
RETURNOP(Perl_do_kv(aTHX));
}
else if ((PL_op->op_private & OPpTRUEBOOL
- || ( PL_op->op_private & OpMAYBE_TRUEBOOL
+ || ( PL_op->op_private & OPpMAYBE_TRUEBOOL
&& block_gimme() == G_VOID ))
&& (!SvRMAGICAL(TARG) || !mg_find(TARG, PERL_MAGIC_tied)))
SETs(HvUSEDKEYS(TARG) ? &PL_sv_yes : sv_2mortal(newSViv(0)));
diff --git a/pp_hot.c b/pp_hot.c
index ea574d7ab2..930410a0fa 100644
--- a/pp_hot.c
+++ b/pp_hot.c
@@ -874,7 +874,7 @@ PP(pp_rv2av)
return Perl_do_kv(aTHX);
}
else if ((PL_op->op_private & OPpTRUEBOOL
- || ( PL_op->op_private & OpMAYBE_TRUEBOOL
+ || ( PL_op->op_private & OPpMAYBE_TRUEBOOL
&& block_gimme() == G_VOID ))
&& (!SvRMAGICAL(sv) || !mg_find(sv, PERL_MAGIC_tied)))
SETs(HvUSEDKEYS(sv) ? &PL_sv_yes : sv_2mortal(newSViv(0)));
View Lorry Controller Status