Updated to MakeMaker-5.38.
[p5sagit/p5-mst-13.2.git] / scope.c
diff --git a/scope.c b/scope.c
index c52e099..03cdddd 100644 (file)
--- a/scope.c
+++ b/scope.c
@@ -1,21 +1,36 @@
-/* $RCSfile: op.c,v $$Revision: 4.1 $$Date: 92/08/07 17:19:16 $
+/*    scope.c
  *
- *    Copyright (c) 1991, Larry Wall
+ *    Copyright (c) 1991-1994, Larry Wall
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
  *
- * $Log:       op.c,v $
+ */
+
+/*
+ * "For the fashion of Minas Tirith was such that it was built on seven
+ * levels..."
  */
 
 #include "EXTERN.h"
 #include "perl.h"
 
+SV**
+stack_grow(sp, p, n)
+SV** sp;
+SV** p;
+int n;
+{
+    stack_sp = sp;
+    av_extend(curstack, (p - stack_base) + (n) + 128);
+    return stack_sp;
+}
+
 I32
 cxinc()
 {
     cxstack_max = cxstack_max * 3 / 2;
-    Renew(cxstack, cxstack_max, CONTEXT);
+    Renew(cxstack, cxstack_max + 1, CONTEXT);  /* XXX should fix CXINC macro */
     return cxstack_ix + 1;
 }
 
@@ -58,6 +73,17 @@ pop_scope()
 }
 
 void
+markstack_grow()
+{
+    I32 oldmax = markstack_max - markstack;
+    I32 newmax = oldmax * 3 / 2;
+
+    Renew(markstack, newmax, I32);
+    markstack_ptr = markstack + oldmax;
+    markstack_max = markstack + newmax;
+}
+
+void
 savestack_grow()
 {
     savestack_max = savestack_max * 3 / 2;
@@ -94,14 +120,25 @@ GV *gv;
     SSPUSHINT(SAVEt_SV);
 
     sv = GvSV(gv) = NEWSV(0,0);
-    if (SvTYPE(osv) >= SVt_PVMG && SvMAGIC(osv)) {
+    if (SvTYPE(osv) >= SVt_PVMG && SvMAGIC(osv) && SvTYPE(osv) != SVt_PVGV) {
        sv_upgrade(sv, SvTYPE(osv));
-       mg_get(osv);
-       SvFLAGS(osv) |= (SvFLAGS(osv) & (SVp_IOK|SVp_NOK|SVp_POK)) >> PRIVSHIFT;
+       if (SvGMAGICAL(osv)) {
+           MAGIC* mg;
+           bool oldtainted = tainted;
+           mg_get(osv);
+           if (tainting && tainted && (mg = mg_find(osv, 't'))) {
+               SAVESPTR(mg->mg_obj);
+               mg->mg_obj = osv;
+           }
+           SvFLAGS(osv) |= (SvFLAGS(osv) &
+               (SVp_IOK|SVp_NOK|SVp_POK)) >> PRIVSHIFT;
+           tainted = oldtainted;
+       }
        SvMAGIC(sv) = SvMAGIC(osv);
-       localizing = TRUE;
+       SvFLAGS(sv) |= SvMAGICAL(osv);
+       localizing = 1;
        SvSETMAGIC(sv);
-       localizing = FALSE;
+       localizing = 0;
     }
     return sv;
 }
@@ -115,7 +152,7 @@ GV *gv;
     GP *ogp = GvGP(gv);
 
     SSCHECK(3);
-    SSPUSHPTR(gv);
+    SSPUSHPTR(SvREFCNT_inc(gv));
     SSPUSHPTR(ogp);
     SSPUSHINT(SAVEt_GP);
 
@@ -141,12 +178,25 @@ SV **sptr;
     SSPUSHINT(SAVEt_SVREF);
 
     sv = *sptr = NEWSV(0,0);
-    if (SvTYPE(osv) >= SVt_PVMG && SvMAGIC(sv)) {
+    if (SvTYPE(osv) >= SVt_PVMG && SvMAGIC(osv) && SvTYPE(osv) != SVt_PVGV) {
        sv_upgrade(sv, SvTYPE(osv));
+       if (SvGMAGICAL(osv)) {
+           MAGIC* mg;
+           bool oldtainted = tainted;
+           mg_get(osv);
+           if (tainting && tainted && (mg = mg_find(osv, 't'))) {
+               SAVESPTR(mg->mg_obj);
+               mg->mg_obj = osv;
+           }
+           SvFLAGS(osv) |= (SvFLAGS(osv) &
+               (SVp_IOK|SVp_NOK|SVp_POK)) >> PRIVSHIFT;
+           tainted = oldtainted;
+       }
        SvMAGIC(sv) = SvMAGIC(osv);
-       localizing = TRUE;
+       SvFLAGS(sv) |= SvMAGICAL(osv);
+       localizing = 1;
        SvSETMAGIC(sv);
-       localizing = FALSE;
+       localizing = 0;
     }
     return sv;
 }
@@ -221,6 +271,16 @@ I32 *intp;
     SSPUSHINT(SAVEt_I32);
 }
 
+void
+save_iv(ivp)
+IV *ivp;
+{
+    SSCHECK(3);
+    SSPUSHIV(*ivp);
+    SSPUSHPTR(ivp);
+    SSPUSHINT(SAVEt_IV);
+}
+
 /* Cannot use save_sptr() to store a char* since the SV** cast will
  * force word-alignment and we'll miss the pointer.
  */
@@ -305,7 +365,7 @@ save_clearsv(svp)
 SV** svp;
 {
     SSCHECK(2);
-    SSPUSHPTR(svp);
+    SSPUSHLONG((long)(svp-curpad));
     SSPUSHINT(SAVEt_CLEARSV);
 }
 
@@ -341,6 +401,17 @@ I32 maxsarg;
 }
 
 void
+save_destructor(f,p)
+void (*f) _((void*));
+void* p;
+{
+    SSCHECK(3);
+    SSPUSHDPTR(f);
+    SSPUSHPTR(p);
+    SSPUSHINT(SAVEt_DESTRUCTOR);
+}
+
+void
 leave_scope(base)
 I32 base;
 {
@@ -359,28 +430,47 @@ I32 base;
            value = (SV*)SSPOPPTR;
            sv = (SV*)SSPOPPTR;
            sv_replace(sv,value);
+           localizing = 2;
            SvSETMAGIC(sv);
+           localizing = 0;
            break;
         case SAVEt_SV:                         /* scalar reference */
            value = (SV*)SSPOPPTR;
            gv = (GV*)SSPOPPTR;
            sv = GvSV(gv);
-           if (SvTYPE(sv) >= SVt_PVMG && SvMAGIC(sv)) {
+           if (SvTYPE(sv) >= SVt_PVMG && SvMAGIC(sv) &&
+               SvTYPE(sv) != SVt_PVGV)
+           {
+               (void)SvUPGRADE(value, SvTYPE(sv));
                SvMAGIC(value) = SvMAGIC(sv);
+               SvFLAGS(value) |= SvMAGICAL(sv);
+               SvMAGICAL_off(sv);
                SvMAGIC(sv) = 0;
            }
             SvREFCNT_dec(sv);
-            GvSV(gv) = sv = value;
-           SvSETMAGIC(sv);
+            GvSV(gv) = value;
+           localizing = 2;
+           SvSETMAGIC(value);
+           localizing = 0;
             break;
         case SAVEt_SVREF:                      /* scalar reference */
            ptr = SSPOPPTR;
            sv = *(SV**)ptr;
-           if (SvTYPE(sv) >= SVt_PVMG)
+           value = (SV*)SSPOPPTR;
+           if (SvTYPE(sv) >= SVt_PVMG && SvMAGIC(sv) &&
+               SvTYPE(sv) != SVt_PVGV)
+           {
+               (void)SvUPGRADE(value, SvTYPE(sv));
+               SvMAGIC(value) = SvMAGIC(sv);
+               SvFLAGS(value) |= SvMAGICAL(sv);
+               SvMAGICAL_off(sv);
                SvMAGIC(sv) = 0;
+           }
             SvREFCNT_dec(sv);
-           *(SV**)ptr = sv = (SV*)SSPOPPTR;
-           SvSETMAGIC(sv);
+           *(SV**)ptr = value;
+           localizing = 2;
+           SvSETMAGIC(value);
+           localizing = 0;
             break;
         case SAVEt_AV:                         /* array reference */
            av = (AV*)SSPOPPTR;
@@ -406,6 +496,10 @@ I32 base;
            ptr = SSPOPPTR;
            *(I32*)ptr = (I32)SSPOPINT;
            break;
+       case SAVEt_IV:                          /* IV reference */
+           ptr = SSPOPPTR;
+           *(IV*)ptr = (IV)SSPOPIV;
+           break;
        case SAVEt_SPTR:                        /* SV* reference */
            ptr = SSPOPPTR;
            *(SV**)ptr = (SV*)SSPOPPTR;
@@ -424,13 +518,14 @@ I32 base;
            break;
        case SAVEt_NSTAB:
            gv = (GV*)SSPOPPTR;
-           (void)sv_clear(gv);
+           (void)sv_clear((SV*)gv);
            break;
         case SAVEt_GP:                         /* scalar reference */
            ptr = SSPOPPTR;
            gv = (GV*)SSPOPPTR;
             gp_free(gv);
             GvGP(gv) = (GP*)ptr;
+           SvREFCNT_dec(gv);
             break;
        case SAVEt_FREESV:
            ptr = SSPOPPTR;
@@ -446,15 +541,17 @@ I32 base;
            Safefree((char*)ptr);
            break;
        case SAVEt_CLEARSV:
-           ptr = SSPOPPTR;
+           ptr = (void*)&curpad[SSPOPLONG];
            sv = *(SV**)ptr;
-           if (SvREFCNT(sv) <= 1) {    /* Can clear pad variable in place. */
+           if (SvREFCNT(sv) <= 1) { /* Can clear pad variable in place. */
                if (SvTHINKFIRST(sv)) {
                    if (SvREADONLY(sv))
                        croak("panic: leave_scope clearsv");
                    if (SvROK(sv))
                        sv_unref(sv);
                }
+               if (SvMAGICAL(sv))
+                   mg_free(sv);
 
                switch (SvTYPE(sv)) {
                case SVt_NULL:
@@ -471,26 +568,38 @@ I32 base;
                    break;
                default:
                    if (SvPOK(sv) && SvLEN(sv))
-                       SvOOK_off(sv);
-                   SvOK_off(sv);
-                   SvSETMAGIC(sv);
+                       (void)SvOOK_off(sv);
+                   (void)SvOK_off(sv);
                    break;
                }
            }
            else {      /* Someone has a claim on this, so abandon it. */
+               U32 padflags = SvFLAGS(sv) & (SVs_PADBUSY|SVs_PADMY|SVs_PADTMP);
                SvREFCNT_dec(sv);       /* Cast current value to the winds. */
                switch (SvTYPE(sv)) {   /* Console ourselves with a new value */
                case SVt_PVAV:  *(SV**)ptr = (SV*)newAV();      break;
                case SVt_PVHV:  *(SV**)ptr = (SV*)newHV();      break;
                default:        *(SV**)ptr = NEWSV(0,0);        break;
                }
+               SvFLAGS(*(SV**)ptr) |= padflags; /* preserve pad nature */
            }
            break;
        case SAVEt_DELETE:
            ptr = SSPOPPTR;
            hv = (HV*)ptr;
            ptr = SSPOPPTR;
-           hv_delete(hv, (char*)ptr, (U32)SSPOPINT);
+           (void)hv_delete(hv, (char*)ptr, (U32)SSPOPINT, G_DISCARD);
+           Safefree(ptr);
+           break;
+       case SAVEt_DESTRUCTOR:
+           ptr = SSPOPPTR;
+           (*SSPOPDPTR)(ptr);
+           break;
+       case SAVEt_REGCONTEXT:
+           {
+               I32 delta = SSPOPINT;
+               savestack_ix -= delta;  /* regexp must have croaked */
+           }
            break;
        default:
            croak("panic: leave_scope inconsistency");
@@ -499,91 +608,93 @@ I32 base;
 }
 
 #ifdef DEBUGGING
+
 void
 cx_dump(cx)
 CONTEXT* cx;
 {
-    fprintf(stderr, "CX %d = %s\n", cx - cxstack, block_type[cx->cx_type]);
+    PerlIO_printf(Perl_debug_log, "CX %d = %s\n", cx - cxstack, block_type[cx->cx_type]);
     if (cx->cx_type != CXt_SUBST) {
-       fprintf(stderr, "BLK_OLDSP = %ld\n", (long)cx->blk_oldsp);
-       fprintf(stderr, "BLK_OLDCOP = 0x%lx\n", (long)cx->blk_oldcop);
-       fprintf(stderr, "BLK_OLDMARKSP = %ld\n", (long)cx->blk_oldmarksp);
-       fprintf(stderr, "BLK_OLDSCOPESP = %ld\n", (long)cx->blk_oldscopesp);
-       fprintf(stderr, "BLK_OLDRETSP = %ld\n", (long)cx->blk_oldretsp);
-       fprintf(stderr, "BLK_OLDPM = 0x%lx\n", (long)cx->blk_oldpm);
-       fprintf(stderr, "BLK_GIMME = %s\n", cx->blk_gimme ? "LIST" : "SCALAR");
+       PerlIO_printf(Perl_debug_log, "BLK_OLDSP = %ld\n", (long)cx->blk_oldsp);
+       PerlIO_printf(Perl_debug_log, "BLK_OLDCOP = 0x%lx\n", (long)cx->blk_oldcop);
+       PerlIO_printf(Perl_debug_log, "BLK_OLDMARKSP = %ld\n", (long)cx->blk_oldmarksp);
+       PerlIO_printf(Perl_debug_log, "BLK_OLDSCOPESP = %ld\n", (long)cx->blk_oldscopesp);
+       PerlIO_printf(Perl_debug_log, "BLK_OLDRETSP = %ld\n", (long)cx->blk_oldretsp);
+       PerlIO_printf(Perl_debug_log, "BLK_OLDPM = 0x%lx\n", (long)cx->blk_oldpm);
+       PerlIO_printf(Perl_debug_log, "BLK_GIMME = %s\n", cx->blk_gimme ? "LIST" : "SCALAR");
     }
     switch (cx->cx_type) {
     case CXt_NULL:
     case CXt_BLOCK:
        break;
     case CXt_SUB:
-       fprintf(stderr, "BLK_SUB.CV = 0x%lx\n",
+       PerlIO_printf(Perl_debug_log, "BLK_SUB.CV = 0x%lx\n",
                (long)cx->blk_sub.cv);
-       fprintf(stderr, "BLK_SUB.GV = 0x%lx\n",
+       PerlIO_printf(Perl_debug_log, "BLK_SUB.GV = 0x%lx\n",
                (long)cx->blk_sub.gv);
-       fprintf(stderr, "BLK_SUB.DFOUTGV = 0x%lx\n",
+       PerlIO_printf(Perl_debug_log, "BLK_SUB.DFOUTGV = 0x%lx\n",
                (long)cx->blk_sub.dfoutgv);
-       fprintf(stderr, "BLK_SUB.OLDDEPTH = %ld\n",
+       PerlIO_printf(Perl_debug_log, "BLK_SUB.OLDDEPTH = %ld\n",
                (long)cx->blk_sub.olddepth);
-       fprintf(stderr, "BLK_SUB.HASARGS = %d\n",
+       PerlIO_printf(Perl_debug_log, "BLK_SUB.HASARGS = %d\n",
                (int)cx->blk_sub.hasargs);
        break;
     case CXt_EVAL:
-       fprintf(stderr, "BLK_EVAL.OLD_IN_EVAL = %ld\n",
+       PerlIO_printf(Perl_debug_log, "BLK_EVAL.OLD_IN_EVAL = %ld\n",
                (long)cx->blk_eval.old_in_eval);
-       fprintf(stderr, "BLK_EVAL.OLD_OP_TYPE = %s\n",
-               op_name[cx->blk_eval.old_op_type]);
-       fprintf(stderr, "BLK_EVAL.OLD_NAME = %s\n",
+       PerlIO_printf(Perl_debug_log, "BLK_EVAL.OLD_OP_TYPE = %s (%s)\n",
+               op_name[cx->blk_eval.old_op_type],
+               op_desc[cx->blk_eval.old_op_type]);
+       PerlIO_printf(Perl_debug_log, "BLK_EVAL.OLD_NAME = %s\n",
                cx->blk_eval.old_name);
-       fprintf(stderr, "BLK_EVAL.OLD_EVAL_ROOT = 0x%lx\n",
+       PerlIO_printf(Perl_debug_log, "BLK_EVAL.OLD_EVAL_ROOT = 0x%lx\n",
                (long)cx->blk_eval.old_eval_root);
        break;
 
     case CXt_LOOP:
-       fprintf(stderr, "BLK_LOOP.LABEL = %s\n",
+       PerlIO_printf(Perl_debug_log, "BLK_LOOP.LABEL = %s\n",
                cx->blk_loop.label);
-       fprintf(stderr, "BLK_LOOP.RESETSP = %ld\n",
+       PerlIO_printf(Perl_debug_log, "BLK_LOOP.RESETSP = %ld\n",
                (long)cx->blk_loop.resetsp);
-       fprintf(stderr, "BLK_LOOP.REDO_OP = 0x%lx\n",
+       PerlIO_printf(Perl_debug_log, "BLK_LOOP.REDO_OP = 0x%lx\n",
                (long)cx->blk_loop.redo_op);
-       fprintf(stderr, "BLK_LOOP.NEXT_OP = 0x%lx\n",
+       PerlIO_printf(Perl_debug_log, "BLK_LOOP.NEXT_OP = 0x%lx\n",
                (long)cx->blk_loop.next_op);
-       fprintf(stderr, "BLK_LOOP.LAST_OP = 0x%lx\n",
+       PerlIO_printf(Perl_debug_log, "BLK_LOOP.LAST_OP = 0x%lx\n",
                (long)cx->blk_loop.last_op);
-       fprintf(stderr, "BLK_LOOP.ITERIX = %ld\n",
+       PerlIO_printf(Perl_debug_log, "BLK_LOOP.ITERIX = %ld\n",
                (long)cx->blk_loop.iterix);
-       fprintf(stderr, "BLK_LOOP.ITERARY = 0x%lx\n",
+       PerlIO_printf(Perl_debug_log, "BLK_LOOP.ITERARY = 0x%lx\n",
                (long)cx->blk_loop.iterary);
-       fprintf(stderr, "BLK_LOOP.ITERVAR = 0x%lx\n",
+       PerlIO_printf(Perl_debug_log, "BLK_LOOP.ITERVAR = 0x%lx\n",
                (long)cx->blk_loop.itervar);
        if (cx->blk_loop.itervar)
-           fprintf(stderr, "BLK_LOOP.ITERSAVE = 0x%lx\n",
+           PerlIO_printf(Perl_debug_log, "BLK_LOOP.ITERSAVE = 0x%lx\n",
                (long)cx->blk_loop.itersave);
        break;
 
     case CXt_SUBST:
-       fprintf(stderr, "SB_ITERS = %ld\n",
+       PerlIO_printf(Perl_debug_log, "SB_ITERS = %ld\n",
                (long)cx->sb_iters);
-       fprintf(stderr, "SB_MAXITERS = %ld\n",
+       PerlIO_printf(Perl_debug_log, "SB_MAXITERS = %ld\n",
                (long)cx->sb_maxiters);
-       fprintf(stderr, "SB_SAFEBASE = %ld\n",
+       PerlIO_printf(Perl_debug_log, "SB_SAFEBASE = %ld\n",
                (long)cx->sb_safebase);
-       fprintf(stderr, "SB_ONCE = %ld\n",
+       PerlIO_printf(Perl_debug_log, "SB_ONCE = %ld\n",
                (long)cx->sb_once);
-       fprintf(stderr, "SB_ORIG = %s\n",
+       PerlIO_printf(Perl_debug_log, "SB_ORIG = %s\n",
                cx->sb_orig);
-       fprintf(stderr, "SB_DSTR = 0x%lx\n",
+       PerlIO_printf(Perl_debug_log, "SB_DSTR = 0x%lx\n",
                (long)cx->sb_dstr);
-       fprintf(stderr, "SB_TARG = 0x%lx\n",
+       PerlIO_printf(Perl_debug_log, "SB_TARG = 0x%lx\n",
                (long)cx->sb_targ);
-       fprintf(stderr, "SB_S = 0x%lx\n",
+       PerlIO_printf(Perl_debug_log, "SB_S = 0x%lx\n",
                (long)cx->sb_s);
-       fprintf(stderr, "SB_M = 0x%lx\n",
+       PerlIO_printf(Perl_debug_log, "SB_M = 0x%lx\n",
                (long)cx->sb_m);
-       fprintf(stderr, "SB_STREND = 0x%lx\n",
+       PerlIO_printf(Perl_debug_log, "SB_STREND = 0x%lx\n",
                (long)cx->sb_strend);
-       fprintf(stderr, "SB_SUBBASE = 0x%lx\n",
+       PerlIO_printf(Perl_debug_log, "SB_SUBBASE = 0x%lx\n",
                (long)cx->sb_subbase);
        break;
     }