[win32] merge changes#1014,1038 from maintbranch

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

diff --git a/av.c b/av.c
index e715d10..02be7cc 100644 (file)
--- a/av.c
+++ b/av.c
@@ -21,10 +21,10 @@ av_reify(AV *av)
     I32 key;
     SV* sv;
 
-    if (AvREAL(av))                           
-       return;          
+    if (AvREAL(av))
+       return;
 #ifdef DEBUGGING
-    if (SvRMAGICAL(av) && mg_find((SV*)av,'P')) 
+    if (SvRMAGICAL(av) && mg_find((SV*)av,'P'))
        warn("av_reify called on tied array");
 #endif
     key = AvMAX(av) + 1;
@@ -53,12 +53,14 @@ av_extend(AV *av, I32 key)
        dSP;
        ENTER;
        SAVETMPS;
-       PUSHMARK(sp);
-       EXTEND(sp,2);
+       PUSHSTACK(SI_MAGIC);
+       PUSHMARK(SP);
+       EXTEND(SP,2);
        PUSHs(mg->mg_obj);
-       PUSHs(sv_2mortal(newSViv(key)));
+       PUSHs(sv_2mortal(newSViv(key+1)));
         PUTBACK;
        perl_call_method("EXTEND", G_SCALAR|G_DISCARD);
+       POPSTACK();
        FREETMPS;
        LEAVE;
        return;
@@ -157,8 +159,8 @@ av_fetch(register AV *av, I32 key, I32 lval)
            dTHR;
            sv = sv_newmortal();
            mg_copy((SV*)av, sv, 0, key);
-           Sv = sv;
-           return &Sv;
+           av_fetch_sv = sv;
+           return &av_fetch_sv;
        }
     }
 
@@ -321,7 +323,7 @@ av_clear(register AV *av)
        warn("Attempt to clear deleted array");
     }
 #endif
-    if (!av || AvMAX(av) < 0)
+    if (!av)
        return;
     /*SUPPRESS 560*/
 
@@ -329,6 +331,9 @@ av_clear(register AV *av)
     if (SvRMAGICAL(av))
        mg_clear((SV*)av); 
 
+    if (AvMAX(av) < 0)
+       return;
+
     if (AvREAL(av)) {
        ary = AvARRAY(av);
        key = AvFILLp(av) + 1;
@@ -364,7 +369,6 @@ av_undef(register AV *av)
            SvREFCNT_dec(AvARRAY(av)[--key]);
     }
     Safefree(AvALLOC(av));
-    AvARRAY(av) = 0;
     AvALLOC(av) = 0;
     SvPVX(av) = 0;
     AvMAX(av) = AvFILLp(av) = -1;
@@ -385,12 +389,16 @@ av_push(register AV *av, SV *val)
 
     if (SvRMAGICAL(av) && (mg = mg_find((SV*)av,'P'))) {
        dSP;
-       PUSHMARK(sp);
-       EXTEND(sp,2);
+       PUSHSTACK(SI_MAGIC);
+       PUSHMARK(SP);
+       EXTEND(SP,2);
        PUSHs(mg->mg_obj);
        PUSHs(val);
-        PUTBACK;
+       PUTBACK;
+       ENTER;
        perl_call_method("PUSH", G_SCALAR|G_DISCARD);
+       LEAVE;
+       POPSTACK();
        return;
     }
     av_store(av,AvFILLp(av)+1,val);
@@ -408,14 +416,18 @@ av_pop(register AV *av)
        croak(no_modify);
     if (SvRMAGICAL(av) && (mg = mg_find((SV*)av,'P'))) {
        dSP;    
-       PUSHMARK(sp);
+       PUSHSTACK(SI_MAGIC);
+       PUSHMARK(SP);
        XPUSHs(mg->mg_obj);
-        PUTBACK;
+       PUTBACK;
+       ENTER;
        if (perl_call_method("POP", G_SCALAR)) {
            retval = newSVsv(*stack_sp--);    
        } else {    
            retval = &sv_undef;
        }
+       LEAVE;
+       POPSTACK();
        return retval;
     }
     retval = AvARRAY(av)[AvFILLp(av)];
@@ -429,7 +441,7 @@ void
 av_unshift(register AV *av, register I32 num)
 {
     register I32 i;
-    register SV **sstr,**dstr;
+    register SV **ary;
     MAGIC* mg;
 
     if (!av || num <= 0)
@@ -439,14 +451,18 @@ av_unshift(register AV *av, register I32 num)
 
     if (SvRMAGICAL(av) && (mg = mg_find((SV*)av,'P'))) {
        dSP;
-       PUSHMARK(sp);
-       EXTEND(sp,1+num);
+       PUSHSTACK(SI_MAGIC);
+       PUSHMARK(SP);
+       EXTEND(SP,1+num);
        PUSHs(mg->mg_obj);
        while (num-- > 0) {
            PUSHs(&sv_undef);
        }
        PUTBACK;
+       ENTER;
        perl_call_method("UNSHIFT", G_SCALAR|G_DISCARD);
+       LEAVE;
+       POPSTACK();
        return;
     }
 
@@ -463,21 +479,14 @@ av_unshift(register AV *av, register I32 num)
        SvPVX(av) = (char*)(AvARRAY(av) - i);
     }
     if (num) {
-       av_extend(av,AvFILLp(av)+num);
+       i = AvFILLp(av);
+       av_extend(av, i + num);
        AvFILLp(av) += num;
-       dstr = AvARRAY(av) + AvFILLp(av);
-       sstr = dstr - num;
-#ifdef BUGGY_MSC5
- # pragma loop_opt(off)        /* don't loop-optimize the following code */
-#endif /* BUGGY_MSC5 */
-       for (i = AvFILLp(av) - num; i >= 0; --i) {
-           *dstr-- = *sstr--;
-#ifdef BUGGY_MSC5
- # pragma loop_opt()   /* loop-optimization back to command-line setting */
-#endif /* BUGGY_MSC5 */
-       }
-       while (num)
-           AvARRAY(av)[--num] = &sv_undef;
+       ary = AvARRAY(av);
+       Move(ary, ary + num, i + 1, SV*);
+       do {
+           ary[--num] = &sv_undef;
+       } while (num);
     }
 }
 
@@ -493,14 +502,18 @@ av_shift(register AV *av)
        croak(no_modify);
     if (SvRMAGICAL(av) && (mg = mg_find((SV*)av,'P'))) {
        dSP;
-       PUSHMARK(sp);
+       PUSHSTACK(SI_MAGIC);
+       PUSHMARK(SP);
        XPUSHs(mg->mg_obj);
-        PUTBACK;
+       PUTBACK;
+       ENTER;
        if (perl_call_method("SHIFT", G_SCALAR)) {
            retval = newSVsv(*stack_sp--);            
        } else {    
            retval = &sv_undef;
-       }
+       }     
+       LEAVE;
+       POPSTACK();
        return retval;
     }
     retval = *AvARRAY(av);
@@ -532,12 +545,14 @@ av_fill(register AV *av, I32 fill)
        dSP;            
        ENTER;
        SAVETMPS;
-       PUSHMARK(sp);
-       EXTEND(sp,2);
+       PUSHSTACK(SI_MAGIC);
+       PUSHMARK(SP);
+       EXTEND(SP,2);
        PUSHs(mg->mg_obj);
-       PUSHs(sv_2mortal(newSViv(fill)));
+       PUSHs(sv_2mortal(newSViv(fill+1)));
        PUTBACK;
        perl_call_method("STORESIZE", G_SCALAR|G_DISCARD);
+       POPSTACK();
        FREETMPS;
        LEAVE;
        return;