Add to MANIFEST: README.threads, lib/ISA.pm, lib/Class/Fields.pm

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

diff --git a/av.c b/av.c
index 8e8e47a..b9382a8 100644 (file)
--- a/av.c
+++ b/av.c
@@ -1,6 +1,6 @@
 /*    av.c
  *
- *    Copyright (c) 1991-1994, Larry Wall
+ *    Copyright (c) 1991-1997, 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.
@@ -30,9 +30,14 @@ AV* av;
     while (key) {
        sv = AvARRAY(av)[--key];
        assert(sv);
-       if (sv != &sv_undef)
+       if (sv != &sv_undef) {
+           dTHR;
            (void)SvREFCNT_inc(sv);
+       }
     }
+    key = AvARRAY(av) - AvALLOC(av);
+    while (key)
+       AvALLOC(av)[--key] = &sv_undef;
     AvREAL_on(av);
 }
 
@@ -41,6 +46,7 @@ av_extend(av,key)
 AV *av;
 I32 key;
 {
+    dTHR;                      /* only necessary if we have to extend stack */
     if (key > AvMAX(av)) {
        SV** ary;
        I32 tmp;
@@ -94,7 +100,7 @@ I32 key;
 #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;
@@ -131,6 +137,7 @@ I32 lval;
 
     if (SvRMAGICAL(av)) {
        if (mg_find((SV*)av,'P')) {
+           dTHR;
            sv = sv_newmortal();
            mg_copy((SV*)av, sv, 0, key);
            Sv = sv;
@@ -153,12 +160,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];
 }
 
@@ -172,10 +186,13 @@ SV *val;
 
     if (!av)
        return 0;
+    if (!val)
+       val = &sv_undef;
 
     if (SvRMAGICAL(av)) {
        if (mg_find((SV*)av,'P')) {
-           mg_copy((SV*)av, val, 0, key);
+           if (val != &sv_undef)
+               mg_copy((SV*)av, val, 0, key);
            return 0;
        }
     }
@@ -185,18 +202,17 @@ SV *val;
        if (key < 0)
            return 0;
     }
-    if (!val)
-       val = &sv_undef;
-
+    if (SvREADONLY(av) && key >= AvFILL(av))
+       croak(no_modify);
+    if (!AvREAL(av) && AvREIFY(av))
+       av_reify(av);
     if (key > AvMAX(av))
        av_extend(av,key);
-    if (AvREIFY(av))
-       av_reify(av);
-
     ary = AvARRAY(av);
     if (AvFILL(av) < key) {
        if (!AvREAL(av)) {
-           if (av == stack && key > stack_sp - stack_base)
+           dTHR;
+           if (av == curstack && key > stack_sp - stack_base)
                stack_sp = stack_base + key;    /* XPUSH in disguise */
            do
                ary[++AvFILL(av)] = &sv_undef;
@@ -289,6 +305,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*/
@@ -322,10 +343,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;
@@ -354,6 +371,8 @@ register AV *av;
 
     if (!av || AvFILL(av) < 0)
        return &sv_undef;
+    if (SvREADONLY(av))
+       croak(no_modify);
     retval = AvARRAY(av)[AvFILL(av)];
     AvARRAY(av)[AvFILL(av)--] = &sv_undef;
     if (SvSMAGICAL(av))
@@ -371,12 +390,10 @@ register I32 num;
 
     if (!av || num <= 0)
        return;
-    if (!AvREAL(av)) {
-       if (AvREIFY(av))
-           av_reify(av);
-       else
-           croak("Can't unshift");
-    }
+    if (SvREADONLY(av))
+       croak(no_modify);
+    if (!AvREAL(av) && AvREIFY(av))
+       av_reify(av);
     i = AvARRAY(av) - AvALLOC(av);
     if (i) {
        if (i > num)
@@ -414,6 +431,8 @@ register AV *av;
 
     if (!av || AvFILL(av) < 0)
        return &sv_undef;
+    if (SvREADONLY(av))
+       croak(no_modify);
     retval = *AvARRAY(av);
     if (AvREAL(av))
        *AvARRAY(av) = &sv_undef;
@@ -493,6 +512,35 @@ I32 lval;
 }
 
 SV**
+avhv_fetch_ent(av, keysv, lval, hash)
+AV *av;
+SV *keysv;
+I32 lval;
+U32 hash;
+{
+    SV **keys, **indsvp;
+    HE *he;
+    I32 ind;
+    
+    keys = av_fetch(av, 0, FALSE);
+    if (!keys || !SvROK(*keys) || SvTYPE(SvRV(*keys)) != SVt_PVHV)
+       croak("Can't coerce array into hash");
+    he = hv_fetch_ent((HV*)SvRV(*keys), keysv, FALSE, hash);
+    if (he) {
+       ind = SvIV(HeVAL(he));
+       if (ind < 1)
+           croak("Bad index while coercing array into hash");
+    } else {
+       if (!lval)
+           return 0;
+       
+       ind = AvFILL(av) + 1;
+       hv_store_ent((HV*)SvRV(*keys), keysv, newSViv(ind), 0);
+    }
+    return av_fetch(av, ind, lval);
+}
+
+SV**
 avhv_store(av, key, klen, val, hash)
 AV *av;
 char *key;
@@ -518,6 +566,46 @@ U32 hash;
     return av_store(av, ind, val);
 }
 
+SV**
+avhv_store_ent(av, keysv, val, hash)
+AV *av;
+SV *keysv;
+SV *val;
+U32 hash;
+{
+    SV **keys;
+    HE *he;
+    I32 ind;
+    
+    keys = av_fetch(av, 0, FALSE);
+    if (!keys || !SvROK(*keys) || SvTYPE(SvRV(*keys)) != SVt_PVHV)
+       croak("Can't coerce array into hash");
+    he = hv_fetch_ent((HV*)SvRV(*keys), keysv, FALSE, hash);
+    if (he) {
+       ind = SvIV(HeVAL(he));
+       if (ind < 1)
+           croak("Bad index while coercing array into hash");
+    } else {
+       ind = AvFILL(av) + 1;
+       hv_store_ent((HV*)SvRV(*keys), keysv, newSViv(ind), hash);
+    }
+    return av_store(av, ind, val);
+}
+
+bool
+avhv_exists_ent(av, keysv, hash)
+AV *av;
+SV *keysv;
+U32 hash;
+{
+    SV **keys;
+    
+    keys = av_fetch(av, 0, FALSE);
+    if (!keys || !SvROK(*keys) || SvTYPE(SvRV(*keys)) != SVt_PVHV)
+       croak("Can't coerce array into hash");
+    return hv_exists_ent((HV*)SvRV(*keys), keysv, hash);
+}
+
 bool
 avhv_exists(av, key, klen)
 AV *av;
@@ -567,6 +655,41 @@ I32 flags;
     return sv;
 }
 
+/* avhv_delete_ent leaks. Caller can re-index and compress if so desired. */
+SV *
+avhv_delete_ent(av, keysv, flags, hash)
+AV *av;
+SV *keysv;
+I32 flags;
+U32 hash;
+{
+    SV **keys;
+    SV *sv;
+    SV **svp;
+    I32 ind;
+    
+    keys = av_fetch(av, 0, FALSE);
+    if (!keys || !SvROK(*keys) || SvTYPE(SvRV(*keys)) != SVt_PVHV)
+       croak("Can't coerce array into hash");
+    sv = hv_delete_ent((HV*)SvRV(*keys), keysv, 0, hash);
+    if (!sv)
+       return Nullsv;
+    ind = SvIV(sv);
+    if (ind < 1)
+       croak("Bad index while coercing array into hash");
+    svp = av_fetch(av, ind, FALSE);
+    if (!svp)
+       return Nullsv;
+    if (flags & G_DISCARD) {
+       sv = Nullsv;
+       SvREFCNT_dec(*svp);
+    } else {
+       sv = sv_2mortal(*svp);
+    }
+    *svp = &sv_undef;
+    return sv;
+}
+
 I32
 avhv_iterinit(av)
 AV *av;