Updated for Second Edition.

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

diff --git a/av.c b/av.c
index 7116cc4..cad6eae 100644 (file)
--- a/av.c
+++ b/av.c
@@ -64,12 +64,37 @@ I32 key;
        }
        else {
            if (AvALLOC(av)) {
+#ifndef STRANGE_MALLOC
+               U32 bytes;
+#endif
+
                newmax = key + AvMAX(av) / 5;
              resize:
+#ifdef STRANGE_MALLOC
                Renew(AvALLOC(av),newmax+1, SV*);
+#else
+               bytes = (newmax + 1) * sizeof(SV*);
+#define MALLOC_OVERHEAD 16
+               tmp = MALLOC_OVERHEAD;
+               while (tmp - MALLOC_OVERHEAD < bytes)
+                   tmp += tmp;
+               tmp -= MALLOC_OVERHEAD;
+               tmp /= sizeof(SV*);
+               assert(tmp > newmax);
+               newmax = tmp - 1;
+               New(2,ary, newmax+1, SV*);
+               Copy(AvALLOC(av), ary, AvMAX(av)+1, SV*);
+               if (AvMAX(av) > 64 && !nice_chunk) {
+                   nice_chunk = (char*)AvALLOC(av);
+                   nice_chunk_size = (AvMAX(av) + 1) * sizeof(SV*);
+               }
+               else
+                   Safefree(AvALLOC(av));
+               AvALLOC(av) = ary;
+#endif
                ary = AvALLOC(av) + AvMAX(av) + 1;
                tmp = newmax - AvMAX(av);
-               if (av == stack) {      /* Oops, grew stack (via av_store()?) */
+               if (av == curstack) {   /* Oops, grew stack (via av_store()?) */
                    stack_sp = AvALLOC(av) + (stack_sp - stack_base);
                    stack_base = AvALLOC(av);
                    stack_max = stack_base + newmax;
@@ -128,12 +153,19 @@ I32 lval;
        return av_store(av,key,sv);
     }
     if (AvARRAY(av)[key] == &sv_undef) {
+    emptyness:
        if (lval) {
            sv = NEWSV(6,0);
            return av_store(av,key,sv);
        }
        return 0;
     }
+    else if (AvREIFY(av)
+            && (!AvARRAY(av)[key]      /* eg. @_ could have freed elts */
+                || SvTYPE(AvARRAY(av)[key]) == SVTYPEMASK)) {
+       AvARRAY(av)[key] = &sv_undef;   /* 1/2 reify */
+       goto emptyness;
+    }
     return &AvARRAY(av)[key];
 }
 
@@ -171,7 +203,7 @@ SV *val;
     ary = AvARRAY(av);
     if (AvFILL(av) < key) {
        if (!AvREAL(av)) {
-           if (av == stack && key > stack_sp - stack_base)
+           if (av == curstack && key > stack_sp - stack_base)
                stack_sp = stack_base + key;    /* XPUSH in disguise */
            do
                ary[++AvFILL(av)] = &sv_undef;
@@ -264,6 +296,11 @@ register AV *av;
     register I32 key;
     SV** ary;
 
+#ifdef DEBUGGING
+    if (SvREFCNT(av) <= 0) {
+       warn("Attempt to clear deleted array");
+    }
+#endif
     if (!av || AvMAX(av) < 0)
        return;
     /*SUPPRESS 560*/
@@ -297,10 +334,6 @@ register AV *av;
        while (key)
            SvREFCNT_dec(AvARRAY(av)[--key]);
     }
-    if (key = AvARRAY(av) - AvALLOC(av)) {
-       AvMAX(av) += key;
-       SvPVX(av) = (char*)AvALLOC(av);
-    }
     Safefree(AvALLOC(av));
     AvALLOC(av) = 0;
     SvPVX(av) = 0;