Fix obsolete identifiers in comment

[perl5.git] / av.c

diff --git a/av.c b/av.c
index 5dd0222..1b54065 100644 (file)
--- a/av.c
+++ b/av.c
@@ -1,7 +1,7 @@
 /*    av.c
  *
  *    Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- *    2000, 2001, 2002, 2003, by Larry Wall and others
+ *    2000, 2001, 2002, 2003, 2004, 2005 by Larry Wall and others
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -25,7 +25,6 @@ void
 Perl_av_reify(pTHX_ AV *av)
 {
     I32 key;
-    SV* sv;
 
     if (AvREAL(av))
        return;
@@ -37,7 +36,7 @@ Perl_av_reify(pTHX_ AV *av)
     while (key > AvFILLp(av) + 1)
        AvARRAY(av)[--key] = &PL_sv_undef;
     while (key) {
-       sv = AvARRAY(av)[--key];
+       SV * const sv = AvARRAY(av)[--key];
        assert(sv);
        if (sv != &PL_sv_undef)
            (void)SvREFCNT_inc(sv);
@@ -88,7 +87,7 @@ Perl_av_extend(pTHX_ AV *av, I32 key)
            tmp = AvARRAY(av) - AvALLOC(av);
            Move(AvARRAY(av), AvALLOC(av), AvFILLp(av)+1, SV*);
            AvMAX(av) += tmp;
-           SvPVX(av) = (char*)AvALLOC(av);
+           SvPV_set(av, (char*)AvALLOC(av));
            if (AvREAL(av)) {
                while (tmp)
                    ary[--tmp] = &PL_sv_undef;
@@ -133,7 +132,7 @@ Perl_av_extend(pTHX_ AV *av, I32 key)
                assert(itmp > newmax);
                newmax = itmp - 1;
                assert(newmax >= AvMAX(av));
-               New(2,ary, newmax+1, SV*);
+               Newx(ary, newmax+1, SV*);
                Copy(AvALLOC(av), ary, AvMAX(av)+1, SV*);
                if (AvMAX(av) > 64)
                    offer_nice_chunk(AvALLOC(av), (AvMAX(av)+1) * sizeof(SV*));
@@ -155,7 +154,7 @@ Perl_av_extend(pTHX_ AV *av, I32 key)
            else {
                newmax = key < 3 ? 3 : key;
                MEM_WRAP_CHECK_1(newmax+1, SV*, oom_array_extend);
-               New(2,AvALLOC(av), newmax+1, SV*);
+               Newx(AvALLOC(av), newmax+1, SV*);
                ary = AvALLOC(av) + 1;
                tmp = newmax;
                AvALLOC(av)[0] = &PL_sv_undef;  /* For the stacks */
@@ -165,7 +164,7 @@ Perl_av_extend(pTHX_ AV *av, I32 key)
                    ary[--tmp] = &PL_sv_undef;
            }
            
-           SvPVX(av) = (char*)AvALLOC(av);
+           SvPV_set(av, (char*)AvALLOC(av));
            AvMAX(av) = newmax;
        }
     }
@@ -359,9 +358,9 @@ Perl_newAV(pTHX)
 
     av = (AV*)NEWSV(3,0);
     sv_upgrade((SV *)av, SVt_PVAV);
-    AvREAL_on(av);
+    /* sv_upgrade does AvREAL_only()  */
     AvALLOC(av) = 0;
-    SvPVX(av) = 0;
+    SvPV_set(av, (char*)0);
     AvMAX(av) = AvFILLp(av) = -1;
     return av;
 }
@@ -383,13 +382,13 @@ Perl_av_make(pTHX_ register I32 size, register SV **strp)
 
     av = (AV*)NEWSV(8,0);
     sv_upgrade((SV *) av,SVt_PVAV);
-    AvFLAGS(av) = AVf_REAL;
-    if (size) {                /* `defined' was returning undef for size==0 anyway. */
+    /* sv_upgrade does AvREAL_only()  */
+    if (size) {                /* "defined" was returning undef for size==0 anyway. */
         register SV** ary;
         register I32 i;
-       New(4,ary,size,SV*);
+       Newx(ary,size,SV*);
        AvALLOC(av) = ary;
-       SvPVX(av) = (char*)ary;
+       SvPV_set(av, (char*)ary);
        AvFILLp(av) = size - 1;
        AvMAX(av) = size - 1;
        for (i = 0; i < size; i++) {
@@ -410,11 +409,11 @@ Perl_av_fake(pTHX_ register I32 size, register SV **strp)
 
     av = (AV*)NEWSV(9,0);
     sv_upgrade((SV *)av, SVt_PVAV);
-    New(4,ary,size+1,SV*);
+    Newx(ary,size+1,SV*);
     AvALLOC(av) = ary;
     Copy(strp,ary,size,SV*);
-    AvFLAGS(av) = AVf_REIFY;
-    SvPVX(av) = (char*)ary;
+    AvREIFY_only(av);
+    SvPV_set(av, (char*)ary);
     AvFILLp(av) = size - 1;
     AvMAX(av) = size - 1;
     while (size--) {
@@ -446,7 +445,6 @@ Perl_av_clear(pTHX_ register AV *av)
 #endif
     if (!av)
        return;
-    /*SUPPRESS 560*/
 
     if (SvREADONLY(av))
        Perl_croak(aTHX_ PL_no_modify);
@@ -471,7 +469,7 @@ Perl_av_clear(pTHX_ register AV *av)
     }
     if ((key = AvARRAY(av) - AvALLOC(av))) {
        AvMAX(av) += key;
-       SvPVX(av) = (char*)AvALLOC(av);
+       SvPV_set(av, (char*)AvALLOC(av));
     }
     AvFILLp(av) = -1;
 
@@ -488,29 +486,24 @@ Undefines the array.  Frees the memory used by the array itself.
 void
 Perl_av_undef(pTHX_ register AV *av)
 {
-    register I32 key;
-
     if (!av)
        return;
-    /*SUPPRESS 560*/
 
     /* Give any tie a chance to cleanup first */
     if (SvTIED_mg((SV*)av, PERL_MAGIC_tied)) 
        av_fill(av, -1);   /* mg_clear() ? */
 
     if (AvREAL(av)) {
-       key = AvFILLp(av) + 1;
+       register I32 key = AvFILLp(av) + 1;
        while (key)
            SvREFCNT_dec(AvARRAY(av)[--key]);
     }
     Safefree(AvALLOC(av));
     AvALLOC(av) = 0;
-    SvPVX(av) = 0;
+    SvPV_set(av, (char*)0);
     AvMAX(av) = AvFILLp(av) = -1;
-    if (AvARYLEN(av)) {
-       SvREFCNT_dec(AvARYLEN(av));
-       AvARYLEN(av) = 0;
-    }
+    /* It's in magic - it must already be gone.  */
+    assert (!AvARYLEN(av));
 }
 
 /*
@@ -525,6 +518,7 @@ to accommodate the addition.
 void
 Perl_av_push(pTHX_ register AV *av, SV *val)
 {             
+    dVAR;
     MAGIC *mg;
     if (!av)
        return;
@@ -560,6 +554,7 @@ is empty.
 SV *
 Perl_av_pop(pTHX_ register AV *av)
 {
+    dVAR;
     SV *retval;
     MAGIC* mg;
 
@@ -605,10 +600,9 @@ must then use C<av_store> to assign values to these new elements.
 void
 Perl_av_unshift(pTHX_ register AV *av, register I32 num)
 {
+    dVAR;
     register I32 i;
-    register SV **ary;
     MAGIC* mg;
-    I32 slide;
 
     if (!av)
        return;
@@ -644,9 +638,11 @@ Perl_av_unshift(pTHX_ register AV *av, register I32 num)
     
        AvMAX(av) += i;
        AvFILLp(av) += i;
-       SvPVX(av) = (char*)(AvARRAY(av) - i);
+       SvPV_set(av, (char*)(AvARRAY(av) - i));
     }
     if (num) {
+       register SV **ary;
+       I32 slide;
        i = AvFILLp(av);
        /* Create extra elements */
        slide = i > 0 ? i : 0;
@@ -661,7 +657,7 @@ Perl_av_unshift(pTHX_ register AV *av, register I32 num)
        /* Make extra elements into a buffer */
        AvMAX(av) -= slide;
        AvFILLp(av) -= slide;
-       SvPVX(av) = (char*)(AvARRAY(av) + slide);
+       SvPV_set(av, (char*)(AvARRAY(av) + slide));
     }
 }
 
@@ -676,6 +672,7 @@ Shifts an SV off the beginning of the array.
 SV *
 Perl_av_shift(pTHX_ register AV *av)
 {
+    dVAR;
     SV *retval;
     MAGIC* mg;
 
@@ -704,7 +701,7 @@ Perl_av_shift(pTHX_ register AV *av)
     retval = *AvARRAY(av);
     if (AvREAL(av))
        *AvARRAY(av) = &PL_sv_undef;
-    SvPVX(av) = (char*)(AvARRAY(av) + 1);
+    SvPV_set(av, (char*)(AvARRAY(av) + 1));
     AvMAX(av)--;
     AvFILLp(av)--;
     if (SvSMAGICAL(av))
@@ -738,6 +735,7 @@ Perl's C<$#array = $fill;>.
 void
 Perl_av_fill(pTHX_ register AV *av, I32 fill)
 {
+    dVAR;
     MAGIC *mg;
     if (!av)
        Perl_croak(aTHX_ "panic: null array");
@@ -933,3 +931,31 @@ Perl_av_exists(pTHX_ AV *av, I32 key)
     else
        return FALSE;
 }
+
+SV **
+Perl_av_arylen_p(pTHX_ AV *av) {
+    dVAR;
+    MAGIC *mg = mg_find((SV*)av, PERL_MAGIC_arylen_p);
+
+    if (!mg) {
+       mg = sv_magicext((SV*)av, 0, PERL_MAGIC_arylen_p, &PL_vtbl_arylen_p,
+                        0, 0);
+
+       if (!mg) {
+           Perl_die(aTHX_ "panic: av_arylen_p");
+       }
+       /* sv_magicext won't set this for us because we pass in a NULL obj  */
+       mg->mg_flags |= MGf_REFCOUNTED;
+    }
+    return &(mg->mg_obj);
+}
+
+/*
+ * Local variables:
+ * c-indentation-style: bsd
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ *
+ * ex: set ts=8 sts=4 sw=4 noet:
+ */