Fix line numbers inside here-docs

[perl5.git] / op.c

diff --git a/op.c b/op.c
index cd37eb8..f807d33 100644 (file)
--- a/op.c
+++ b/op.c
@@ -5605,8 +5605,7 @@ Perl_newSTATEOP(pTHX_ I32 flags, char *label, OP *o)
         CopLINE_set(cop, CopLINE(PL_curcop));
     else {
        CopLINE_set(cop, PL_parser->copline);
-       if (PL_parser)
-           PL_parser->copline = NOLINE;
+       PL_parser->copline = NOLINE;
     }
 #ifdef USE_ITHREADS
     CopFILE_set(cop, CopFILE(PL_curcop));      /* XXX share in a pvtable? */
@@ -10555,7 +10554,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 +10566,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! */
        }