Allow for long long in h2xs

[p5sagit/p5-mst-13.2.git] / op.c

diff --git a/op.c b/op.c
index eba79ef..62309a1 100644 (file)
--- a/op.c
+++ b/op.c
@@ -2326,11 +2326,7 @@ Perl_fold_constants(pTHX_ register OP *o)
            SvIV_please(sv);
 #endif
        }
-       o = newSVOP(OP_CONST, 0, sv);
-       /* We don't want folded constants to trigger OCTMODE warnings,
-          so we cheat a bit and mark them OCTAL. AMS 20010709 */
-       o->op_private |= OPpCONST_OCTAL;
-       return o;
+       return newSVOP(OP_CONST, 0, sv);
     }
 
   nope:
@@ -2952,7 +2948,16 @@ Perl_newPMOP(pTHX_ I32 type, I32 flags)
        pmop->op_pmpermflags |= PMf_LOCALE;
     pmop->op_pmflags = pmop->op_pmpermflags;
 
-    /* link into pm list */
+ #ifdef USE_ITHREADS
+        {
+                SV* repointer = newSViv(0);
+                av_push(PL_regex_padav,SvREFCNT_inc(repointer));
+                pmop->op_pmoffset = av_len(PL_regex_padav);
+                PL_regex_pad = AvARRAY(PL_regex_padav);
+        }
+ #endif
+        
+        /* link into pm list */
     if (type != OP_TRANS && PL_curstash) {
        pmop->op_pmnext = HvPMROOT(PL_curstash);
        HvPMROOT(PL_curstash) = pmop;
@@ -4745,6 +4750,8 @@ Perl_newATTRSUB(pTHX_ I32 floor, OP *o, OP *proto, OP *attrs, OP *block)
        }
        /* ... before we throw it away */
        SvREFCNT_dec(PL_compcv);
+       if (PERLDB_INTER)/* Advice debugger on the new sub. */
+         ++PL_sub_generation;
     }
     else {
        cv = PL_compcv;
@@ -6123,39 +6130,6 @@ Perl_ck_null(pTHX_ OP *o)
 }
 
 OP *
-Perl_ck_octmode(pTHX_ OP *o)
-{
-    OP *p;
-
-    if ((ckWARN(WARN_OCTMODE)
-       /* Add WARN_MKDIR instead of getting rid of WARN_{CHMOD,UMASK}.
-          Backwards compatibility and consistency are terrible things.
-          AMS 20010705 */
-       || (o->op_type == OP_CHMOD && ckWARN(WARN_CHMOD))
-       || (o->op_type == OP_UMASK && ckWARN(WARN_UMASK))
-       || (o->op_type == OP_MKDIR && ckWARN(WARN_MKDIR)))
-       && o->op_flags & OPf_KIDS)
-    {
-       if (o->op_type == OP_MKDIR)
-           p = cLISTOPo->op_last;              /* mkdir $foo, 0777 */
-       else if (o->op_type == OP_CHMOD)
-           p = cLISTOPo->op_first->op_sibling; /* chmod 0777, $foo */
-       else
-           p = cUNOPo->op_first;               /* umask 0222 */
-
-       if (p->op_type == OP_CONST && !(p->op_private & OPpCONST_OCTAL)) {
-           int mode = SvIV(cSVOPx_sv(p));
-
-           Perl_warner(aTHX_ WARN_OCTMODE,
-                       "Non-octal literal mode (%d) specified", mode);
-           Perl_warner(aTHX_ WARN_OCTMODE,
-                       "\t(Did you mean 0%d instead?)\n", mode);
-       }
-    }
-    return ck_fun(o);
-}
-
-OP *
 Perl_ck_open(pTHX_ OP *o)
 {
     HV *table = GvHV(PL_hintgv);
@@ -6807,7 +6781,15 @@ Perl_peep(pTHX_ register OP *o)
            {
                PL_curcop = ((COP*)o);
            }
-           goto nothin;
+           /* XXX: We avoid setting op_seq here to prevent later calls
+              to peep() from mistakenly concluding that optimisation
+              has already occurred. This doesn't fix the real problem,
+              though (See 20010220.007). AMS 20010719 */
+           if (oldop && o->op_next) {
+               oldop->op_next = o->op_next;
+               continue;
+           }
+           break;
        case OP_SCALAR:
        case OP_LINESEQ:
        case OP_SCOPE: