X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/800e9ae0504a9c74de77c7ab0037cc96b5df4995..660a461690361c615b3b45ef731dd3d6f0d55d01:/av.c diff --git a/av.c b/av.c index 3ced5be..5f9c092 100644 --- a/av.c +++ b/av.c @@ -1,6 +1,7 @@ /* av.c * - * Copyright (c) 1991-1997, Larry Wall + * Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, + * 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. @@ -12,55 +13,66 @@ * meant that things should remain where they had set them)." --Treebeard */ +/* +=head1 Array Manipulation Functions +*/ + #include "EXTERN.h" +#define PERL_IN_AV_C #include "perl.h" void -av_reify(AV *av) +Perl_av_reify(pTHX_ AV *av) { I32 key; - SV* sv; if (AvREAL(av)) return; #ifdef DEBUGGING - if (SvRMAGICAL(av) && mg_find((SV*)av,'P')) - warn("av_reify called on tied array"); + if (SvTIED_mg((SV*)av, PERL_MAGIC_tied) && ckWARN_d(WARN_DEBUGGING)) + Perl_warner(aTHX_ packWARN(WARN_DEBUGGING), "av_reify called on tied array"); #endif key = AvMAX(av) + 1; while (key > AvFILLp(av) + 1) - AvARRAY(av)[--key] = &sv_undef; + AvARRAY(av)[--key] = &PL_sv_undef; while (key) { - sv = AvARRAY(av)[--key]; + SV * const sv = AvARRAY(av)[--key]; assert(sv); - if (sv != &sv_undef) { - dTHR; + if (sv != &PL_sv_undef) (void)SvREFCNT_inc(sv); - } } key = AvARRAY(av) - AvALLOC(av); while (key) - AvALLOC(av)[--key] = &sv_undef; + AvALLOC(av)[--key] = &PL_sv_undef; + AvREIFY_off(av); AvREAL_on(av); } +/* +=for apidoc av_extend + +Pre-extend an array. The C is the index to which the array should be +extended. + +=cut +*/ + void -av_extend(AV *av, I32 key) +Perl_av_extend(pTHX_ AV *av, I32 key) { - dTHR; /* only necessary if we have to extend stack */ - MAGIC *mg; - if (SvRMAGICAL(av) && (mg = mg_find((SV*)av,'P'))) { + MAGIC * const mg = SvTIED_mg((SV*)av, PERL_MAGIC_tied); + if (mg) { dSP; ENTER; SAVETMPS; - PUSHSTACK(SI_MAGIC); + PUSHSTACKi(PERLSI_MAGIC); PUSHMARK(SP); EXTEND(SP,2); - PUSHs(mg->mg_obj); + PUSHs(SvTIED_obj((SV*)av, mg)); PUSHs(sv_2mortal(newSViv(key+1))); PUTBACK; - perl_call_method("EXTEND", G_SCALAR|G_DISCARD); - POPSTACK(); + call_method("EXTEND", G_SCALAR|G_DISCARD); + POPSTACK; FREETMPS; LEAVE; return; @@ -75,38 +87,51 @@ av_extend(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] = &sv_undef; + ary[--tmp] = &PL_sv_undef; } - if (key > AvMAX(av) - 10) { newmax = key + AvMAX(av); goto resize; } } else { +#ifdef PERL_MALLOC_WRAP + static const char oom_array_extend[] = + "Out of memory during array extend"; /* Duplicated in pp_hot.c */ +#endif + if (AvALLOC(av)) { -#ifndef STRANGE_MALLOC - U32 bytes; +#if !defined(STRANGE_MALLOC) && !defined(MYMALLOC) + MEM_SIZE bytes; + IV itmp; #endif +#ifdef MYMALLOC + newmax = malloced_size((void*)AvALLOC(av))/sizeof(SV*) - 1; + + if (key <= newmax) + goto resized; +#endif newmax = key + AvMAX(av) / 5; resize: -#ifdef STRANGE_MALLOC + MEM_WRAP_CHECK_1(newmax+1, SV*, oom_array_extend); +#if defined(STRANGE_MALLOC) || defined(MYMALLOC) 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*); + itmp = MALLOC_OVERHEAD; + while ((MEM_SIZE)(itmp - MALLOC_OVERHEAD) < bytes) + itmp += itmp; + itmp -= MALLOC_OVERHEAD; + itmp /= sizeof(SV*); + assert(itmp > newmax); + newmax = itmp - 1; + assert(newmax >= AvMAX(av)); + 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*)); @@ -114,66 +139,102 @@ av_extend(AV *av, I32 key) Safefree(AvALLOC(av)); AvALLOC(av) = ary; #endif +#ifdef MYMALLOC + resized: +#endif ary = AvALLOC(av) + AvMAX(av) + 1; tmp = newmax - AvMAX(av); - 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; + if (av == PL_curstack) { /* Oops, grew stack (via av_store()?) */ + PL_stack_sp = AvALLOC(av) + (PL_stack_sp - PL_stack_base); + PL_stack_base = AvALLOC(av); + PL_stack_max = PL_stack_base + newmax; } } else { - newmax = key < 4 ? 4 : key; - New(2,AvALLOC(av), newmax+1, SV*); + newmax = key < 3 ? 3 : key; + MEM_WRAP_CHECK_1(newmax+1, SV*, oom_array_extend); + Newx(AvALLOC(av), newmax+1, SV*); ary = AvALLOC(av) + 1; tmp = newmax; - AvALLOC(av)[0] = &sv_undef; /* For the stacks */ + AvALLOC(av)[0] = &PL_sv_undef; /* For the stacks */ } if (AvREAL(av)) { while (tmp) - ary[--tmp] = &sv_undef; + ary[--tmp] = &PL_sv_undef; } - SvPVX(av) = (char*)AvALLOC(av); + SvPV_set(av, (char*)AvALLOC(av)); AvMAX(av) = newmax; } } } +/* +=for apidoc av_fetch + +Returns the SV at the specified index in the array. The C is the +index. If C is set then the fetch will be part of a store. Check +that the return value is non-null before dereferencing it to a C. + +See L for +more information on how to use this function on tied arrays. + +=cut +*/ + SV** -av_fetch(register AV *av, I32 key, I32 lval) +Perl_av_fetch(pTHX_ register AV *av, I32 key, I32 lval) { SV *sv; if (!av) return 0; + if (SvRMAGICAL(av)) { + const MAGIC * const tied_magic = mg_find((SV*)av, PERL_MAGIC_tied); + if (tied_magic || mg_find((SV*)av, PERL_MAGIC_regdata)) { + U32 adjust_index = 1; + + if (tied_magic && key < 0) { + /* Handle negative array indices 20020222 MJD */ + SV * const * const negative_indices_glob = + hv_fetch(SvSTASH(SvRV(SvTIED_obj((SV *)av, + tied_magic))), + NEGATIVE_INDICES_VAR, 16, 0); + + if (negative_indices_glob + && SvTRUE(GvSV(*negative_indices_glob))) + adjust_index = 0; + } + + if (key < 0 && adjust_index) { + key += AvFILL(av) + 1; + if (key < 0) + return 0; + } + + sv = sv_newmortal(); + sv_upgrade(sv, SVt_PVLV); + mg_copy((SV*)av, sv, 0, key); + LvTYPE(sv) = 't'; + LvTARG(sv) = sv; /* fake (SV**) */ + return &(LvTARG(sv)); + } + } + if (key < 0) { key += AvFILL(av) + 1; if (key < 0) return 0; } - if (SvRMAGICAL(av)) { - if (mg_find((SV*)av,'P')) { - dTHR; - sv = sv_newmortal(); - mg_copy((SV*)av, sv, 0, key); - av_fetch_sv = sv; - return &av_fetch_sv; - } - } - if (key > AvFILLp(av)) { if (!lval) return 0; - if (AvREALISH(av)) - sv = NEWSV(5,0); - else - sv = sv_newmortal(); + sv = NEWSV(5,0); return av_store(av,key,sv); } - if (AvARRAY(av)[key] == &sv_undef) { + if (AvARRAY(av)[key] == &PL_sv_undef) { emptyness: if (lval) { sv = NEWSV(6,0); @@ -183,24 +244,66 @@ av_fetch(register AV *av, I32 key, I32 lval) } 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 */ + || SvIS_FREED(AvARRAY(av)[key]))) { + AvARRAY(av)[key] = &PL_sv_undef; /* 1/2 reify */ goto emptyness; } return &AvARRAY(av)[key]; } +/* +=for apidoc av_store + +Stores an SV in an array. The array index is specified as C. The +return value will be NULL if the operation failed or if the value did not +need to be actually stored within the array (as in the case of tied +arrays). Otherwise it can be dereferenced to get the original C. Note +that the caller is responsible for suitably incrementing the reference +count of C before the call, and decrementing it if the function +returned NULL. + +See L for +more information on how to use this function on tied arrays. + +=cut +*/ + SV** -av_store(register AV *av, I32 key, SV *val) +Perl_av_store(pTHX_ register AV *av, I32 key, SV *val) { SV** ary; - U32 fill; - if (!av) return 0; if (!val) - val = &sv_undef; + val = &PL_sv_undef; + + if (SvRMAGICAL(av)) { + const MAGIC * const tied_magic = mg_find((SV*)av, PERL_MAGIC_tied); + if (tied_magic) { + /* Handle negative array indices 20020222 MJD */ + if (key < 0) { + unsigned adjust_index = 1; + SV * const * const negative_indices_glob = + hv_fetch(SvSTASH(SvRV(SvTIED_obj((SV *)av, + tied_magic))), + NEGATIVE_INDICES_VAR, 16, 0); + if (negative_indices_glob + && SvTRUE(GvSV(*negative_indices_glob))) + adjust_index = 0; + if (adjust_index) { + key += AvFILL(av) + 1; + if (key < 0) + return 0; + } + } + if (val != &PL_sv_undef) { + mg_copy((SV*)av, val, 0, key); + } + return 0; + } + } + if (key < 0) { key += AvFILL(av) + 1; @@ -209,16 +312,7 @@ av_store(register AV *av, I32 key, SV *val) } if (SvREADONLY(av) && key >= AvFILL(av)) - croak(no_modify); - - if (SvRMAGICAL(av)) { - if (mg_find((SV*)av,'P')) { - if (val != &sv_undef) { - mg_copy((SV*)av, val, 0, key); - } - return 0; - } - } + Perl_croak(aTHX_ PL_no_modify); if (!AvREAL(av) && AvREIFY(av)) av_reify(av); @@ -227,11 +321,10 @@ av_store(register AV *av, I32 key, SV *val) ary = AvARRAY(av); if (AvFILLp(av) < key) { if (!AvREAL(av)) { - dTHR; - if (av == curstack && key > stack_sp - stack_base) - stack_sp = stack_base + key; /* XPUSH in disguise */ + if (av == PL_curstack && key > PL_stack_sp - PL_stack_base) + PL_stack_sp = PL_stack_base + key; /* XPUSH in disguise */ do - ary[++AvFILLp(av)] = &sv_undef; + ary[++AvFILLp(av)] = &PL_sv_undef; while (AvFILLp(av) < key); } AvFILLp(av) = key; @@ -240,7 +333,7 @@ av_store(register AV *av, I32 key, SV *val) SvREFCNT_dec(ary[key]); ary[key] = val; if (SvSMAGICAL(av)) { - if (val != &sv_undef) { + if (val != &PL_sv_undef) { MAGIC* mg = SvMAGIC(av); sv_magic(val, (SV*)av, toLOWER(mg->mg_type), 0, key); } @@ -249,34 +342,50 @@ av_store(register AV *av, I32 key, SV *val) return &ary[key]; } +/* +=for apidoc newAV + +Creates a new AV. The reference count is set to 1. + +=cut +*/ + AV * -newAV(void) +Perl_newAV(pTHX) { - register AV *av; + register AV * const av = (AV*)NEWSV(3,0); - 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; } +/* +=for apidoc av_make + +Creates a new AV and populates it with a list of SVs. The SVs are copied +into the array, so they may be freed after the call to av_make. The new AV +will have a reference count of 1. + +=cut +*/ + AV * -av_make(register I32 size, register SV **strp) +Perl_av_make(pTHX_ register I32 size, register SV **strp) { - register AV *av; - register I32 i; - register SV** ary; + register AV * const av = (AV*)NEWSV(8,0); - 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. */ - New(4,ary,size,SV*); + /* sv_upgrade does AvREAL_only() */ + if (size) { /* "defined" was returning undef for size==0 anyway. */ + register SV** ary; + register I32 i; + 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++) { @@ -289,46 +398,30 @@ av_make(register I32 size, register SV **strp) return av; } -AV * -av_fake(register I32 size, register SV **strp) -{ - register AV *av; - register SV** ary; +/* +=for apidoc av_clear - av = (AV*)NEWSV(9,0); - sv_upgrade((SV *)av, SVt_PVAV); - New(4,ary,size+1,SV*); - AvALLOC(av) = ary; - Copy(strp,ary,size,SV*); - AvFLAGS(av) = AVf_REIFY; - SvPVX(av) = (char*)ary; - AvFILLp(av) = size - 1; - AvMAX(av) = size - 1; - while (size--) { - assert (*strp); - SvTEMP_off(*strp); - strp++; - } - return av; -} +Clears an array, making it empty. Does not free the memory used by the +array itself. + +=cut +*/ void -av_clear(register AV *av) +Perl_av_clear(pTHX_ register AV *av) { register I32 key; - SV** ary; #ifdef DEBUGGING - if (SvREFCNT(av) <= 0) { - warn("Attempt to clear deleted array"); + if (SvREFCNT(av) == 0 && ckWARN_d(WARN_DEBUGGING)) { + Perl_warner(aTHX_ packWARN(WARN_DEBUGGING), "Attempt to clear deleted array"); } #endif if (!av) return; - /*SUPPRESS 560*/ if (SvREADONLY(av)) - croak(no_modify); + Perl_croak(aTHX_ PL_no_modify); /* Give any tie a chance to cleanup first */ if (SvRMAGICAL(av)) @@ -338,137 +431,175 @@ av_clear(register AV *av) return; if (AvREAL(av)) { - ary = AvARRAY(av); + SV** const ary = AvARRAY(av); key = AvFILLp(av) + 1; while (key) { - SvREFCNT_dec(ary[--key]); - ary[key] = &sv_undef; + SV * const sv = ary[--key]; + /* undef the slot before freeing the value, because a + * destructor might try to modify this arrray */ + ary[key] = &PL_sv_undef; + SvREFCNT_dec(sv); } } - if (key = AvARRAY(av) - AvALLOC(av)) { + if ((key = AvARRAY(av) - AvALLOC(av))) { AvMAX(av) += key; - SvPVX(av) = (char*)AvALLOC(av); + SvPV_set(av, (char*)AvALLOC(av)); } AvFILLp(av) = -1; } +/* +=for apidoc av_undef + +Undefines the array. Frees the memory used by the array itself. + +=cut +*/ + void -av_undef(register AV *av) +Perl_av_undef(pTHX_ register AV *av) { - register I32 key; - if (!av) return; - /*SUPPRESS 560*/ /* Give any tie a chance to cleanup first */ - if (SvRMAGICAL(av) && mg_find((SV*)av,'P')) + 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; - } } +/* +=for apidoc av_push + +Pushes an SV onto the end of the array. The array will grow automatically +to accommodate the addition. + +=cut +*/ + void -av_push(register AV *av, SV *val) +Perl_av_push(pTHX_ register AV *av, SV *val) { + dVAR; MAGIC *mg; if (!av) return; if (SvREADONLY(av)) - croak(no_modify); + Perl_croak(aTHX_ PL_no_modify); - if (SvRMAGICAL(av) && (mg = mg_find((SV*)av,'P'))) { + if ((mg = SvTIED_mg((SV*)av, PERL_MAGIC_tied))) { dSP; - PUSHSTACK(SI_MAGIC); + PUSHSTACKi(PERLSI_MAGIC); PUSHMARK(SP); EXTEND(SP,2); - PUSHs(mg->mg_obj); + PUSHs(SvTIED_obj((SV*)av, mg)); PUSHs(val); PUTBACK; ENTER; - perl_call_method("PUSH", G_SCALAR|G_DISCARD); + call_method("PUSH", G_SCALAR|G_DISCARD); LEAVE; - POPSTACK(); + POPSTACK; return; } av_store(av,AvFILLp(av)+1,val); } +/* +=for apidoc av_pop + +Pops an SV off the end of the array. Returns C<&PL_sv_undef> if the array +is empty. + +=cut +*/ + SV * -av_pop(register AV *av) +Perl_av_pop(pTHX_ register AV *av) { + dVAR; SV *retval; MAGIC* mg; - if (!av || AvFILL(av) < 0) - return &sv_undef; + if (!av) + return &PL_sv_undef; if (SvREADONLY(av)) - croak(no_modify); - if (SvRMAGICAL(av) && (mg = mg_find((SV*)av,'P'))) { + Perl_croak(aTHX_ PL_no_modify); + if ((mg = SvTIED_mg((SV*)av, PERL_MAGIC_tied))) { dSP; - PUSHSTACK(SI_MAGIC); + PUSHSTACKi(PERLSI_MAGIC); PUSHMARK(SP); - XPUSHs(mg->mg_obj); + XPUSHs(SvTIED_obj((SV*)av, mg)); PUTBACK; ENTER; - if (perl_call_method("POP", G_SCALAR)) { - retval = newSVsv(*stack_sp--); + if (call_method("POP", G_SCALAR)) { + retval = newSVsv(*PL_stack_sp--); } else { - retval = &sv_undef; + retval = &PL_sv_undef; } LEAVE; - POPSTACK(); + POPSTACK; return retval; } + if (AvFILL(av) < 0) + return &PL_sv_undef; retval = AvARRAY(av)[AvFILLp(av)]; - AvARRAY(av)[AvFILLp(av)--] = &sv_undef; + AvARRAY(av)[AvFILLp(av)--] = &PL_sv_undef; if (SvSMAGICAL(av)) mg_set((SV*)av); return retval; } +/* +=for apidoc av_unshift + +Unshift the given number of C values onto the beginning of the +array. The array will grow automatically to accommodate the addition. You +must then use C to assign values to these new elements. + +=cut +*/ + void -av_unshift(register AV *av, register I32 num) +Perl_av_unshift(pTHX_ register AV *av, register I32 num) { + dVAR; register I32 i; - register SV **ary; MAGIC* mg; - if (!av || num <= 0) + if (!av) return; if (SvREADONLY(av)) - croak(no_modify); + Perl_croak(aTHX_ PL_no_modify); - if (SvRMAGICAL(av) && (mg = mg_find((SV*)av,'P'))) { + if ((mg = SvTIED_mg((SV*)av, PERL_MAGIC_tied))) { dSP; - PUSHSTACK(SI_MAGIC); + PUSHSTACKi(PERLSI_MAGIC); PUSHMARK(SP); EXTEND(SP,1+num); - PUSHs(mg->mg_obj); + PUSHs(SvTIED_obj((SV*)av, mg)); while (num-- > 0) { - PUSHs(&sv_undef); + PUSHs(&PL_sv_undef); } PUTBACK; ENTER; - perl_call_method("UNSHIFT", G_SCALAR|G_DISCARD); + call_method("UNSHIFT", G_SCALAR|G_DISCARD); LEAVE; - POPSTACK(); + POPSTACK; return; } + if (num <= 0) + return; if (!AvREAL(av) && AvREIFY(av)) av_reify(av); i = AvARRAY(av) - AvALLOC(av); @@ -479,50 +610,70 @@ av_unshift(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; + num += slide; av_extend(av, i + num); AvFILLp(av) += num; ary = AvARRAY(av); Move(ary, ary + num, i + 1, SV*); do { - ary[--num] = &sv_undef; + ary[--num] = &PL_sv_undef; } while (num); + /* Make extra elements into a buffer */ + AvMAX(av) -= slide; + AvFILLp(av) -= slide; + SvPV_set(av, (char*)(AvARRAY(av) + slide)); } } +/* +=for apidoc av_shift + +Shifts an SV off the beginning of the array. + +=cut +*/ + SV * -av_shift(register AV *av) +Perl_av_shift(pTHX_ register AV *av) { + dVAR; SV *retval; MAGIC* mg; - if (!av || AvFILL(av) < 0) - return &sv_undef; + if (!av) + return &PL_sv_undef; if (SvREADONLY(av)) - croak(no_modify); - if (SvRMAGICAL(av) && (mg = mg_find((SV*)av,'P'))) { + Perl_croak(aTHX_ PL_no_modify); + if ((mg = SvTIED_mg((SV*)av, PERL_MAGIC_tied))) { dSP; - PUSHSTACK(SI_MAGIC); + PUSHSTACKi(PERLSI_MAGIC); PUSHMARK(SP); - XPUSHs(mg->mg_obj); + XPUSHs(SvTIED_obj((SV*)av, mg)); PUTBACK; ENTER; - if (perl_call_method("SHIFT", G_SCALAR)) { - retval = newSVsv(*stack_sp--); + if (call_method("SHIFT", G_SCALAR)) { + retval = newSVsv(*PL_stack_sp--); } else { - retval = &sv_undef; + retval = &PL_sv_undef; } LEAVE; - POPSTACK(); + POPSTACK; return retval; } + if (AvFILL(av) < 0) + return &PL_sv_undef; retval = *AvARRAY(av); if (AvREAL(av)) - *AvARRAY(av) = &sv_undef; - SvPVX(av) = (char*)(AvARRAY(av) + 1); + *AvARRAY(av) = &PL_sv_undef; + SvPV_set(av, (char*)(AvARRAY(av) + 1)); AvMAX(av)--; AvFILLp(av)--; if (SvSMAGICAL(av)) @@ -530,32 +681,50 @@ av_shift(register AV *av) return retval; } +/* +=for apidoc av_len + +Returns the highest index in the array. Returns -1 if the array is +empty. + +=cut +*/ + I32 -av_len(register AV *av) +Perl_av_len(pTHX_ register const AV *av) { return AvFILL(av); } +/* +=for apidoc av_fill + +Ensure than an array has a given number of elements, equivalent to +Perl's C<$#array = $fill;>. + +=cut +*/ void -av_fill(register AV *av, I32 fill) +Perl_av_fill(pTHX_ register AV *av, I32 fill) { + dVAR; MAGIC *mg; if (!av) - croak("panic: null array"); + Perl_croak(aTHX_ "panic: null array"); if (fill < 0) fill = -1; - if (SvRMAGICAL(av) && (mg = mg_find((SV*)av,'P'))) { + if ((mg = SvTIED_mg((SV*)av, PERL_MAGIC_tied))) { dSP; ENTER; SAVETMPS; - PUSHSTACK(SI_MAGIC); + PUSHSTACKi(PERLSI_MAGIC); PUSHMARK(SP); EXTEND(SP,2); - PUSHs(mg->mg_obj); + PUSHs(SvTIED_obj((SV*)av, mg)); PUSHs(sv_2mortal(newSViv(fill+1))); PUTBACK; - perl_call_method("STORESIZE", G_SCALAR|G_DISCARD); - POPSTACK(); + call_method("STORESIZE", G_SCALAR|G_DISCARD); + POPSTACK; FREETMPS; LEAVE; return; @@ -567,12 +736,12 @@ av_fill(register AV *av, I32 fill) if (AvREAL(av)) { while (key > fill) { SvREFCNT_dec(ary[key]); - ary[key--] = &sv_undef; + ary[key--] = &PL_sv_undef; } } else { while (key < fill) - ary[++key] = &sv_undef; + ary[++key] = &PL_sv_undef; } AvFILLp(av) = fill; @@ -580,221 +749,185 @@ av_fill(register AV *av, I32 fill) mg_set((SV*)av); } else - (void)av_store(av,fill,&sv_undef); + (void)av_store(av,fill,&PL_sv_undef); } - -HV* -avhv_keys(AV *av) +/* +=for apidoc av_delete + +Deletes the element indexed by C from the array. Returns the +deleted element. If C equals C, the element is freed +and null is returned. + +=cut +*/ +SV * +Perl_av_delete(pTHX_ AV *av, I32 key, I32 flags) { - SV **keysp; - HV *keys = Nullhv; - - keysp = av_fetch(av, 0, FALSE); - if (keysp) { - SV *sv = *keysp; - if (SvGMAGICAL(sv)) - mg_get(sv); - if (SvROK(sv)) { - sv = SvRV(sv); - if (SvTYPE(sv) == SVt_PVHV) - keys = (HV*)sv; - } + SV *sv; + + if (!av) + return Nullsv; + if (SvREADONLY(av)) + Perl_croak(aTHX_ PL_no_modify); + + if (SvRMAGICAL(av)) { + const MAGIC * const tied_magic = mg_find((SV*)av, PERL_MAGIC_tied); + if ((tied_magic || mg_find((SV*)av, PERL_MAGIC_regdata))) { + /* Handle negative array indices 20020222 MJD */ + SV **svp; + if (key < 0) { + unsigned adjust_index = 1; + if (tied_magic) { + SV * const * const negative_indices_glob = + hv_fetch(SvSTASH(SvRV(SvTIED_obj((SV *)av, + tied_magic))), + NEGATIVE_INDICES_VAR, 16, 0); + if (negative_indices_glob + && SvTRUE(GvSV(*negative_indices_glob))) + adjust_index = 0; + } + if (adjust_index) { + key += AvFILL(av) + 1; + if (key < 0) + return Nullsv; + } + } + svp = av_fetch(av, key, TRUE); + if (svp) { + sv = *svp; + mg_clear(sv); + if (mg_find(sv, PERL_MAGIC_tiedelem)) { + sv_unmagic(sv, PERL_MAGIC_tiedelem); /* No longer an element */ + return sv; + } + return Nullsv; + } + } } - if (!keys) - croak("Can't coerce array into hash"); - return keys; -} -SV** -avhv_fetch(AV *av, char *key, U32 klen, I32 lval) -{ - SV **indsvp; - HV *keys = avhv_keys(av); - I32 ind; - - indsvp = hv_fetch(keys, key, klen, FALSE); - if (indsvp) { - ind = SvIV(*indsvp); - if (ind < 1) - croak("Bad index while coercing array into hash"); - } else { - if (!lval) - return 0; - - ind = AvFILL(av) + 1; - hv_store(keys, key, klen, newSViv(ind), 0); + if (key < 0) { + key += AvFILL(av) + 1; + if (key < 0) + return Nullsv; } - return av_fetch(av, ind, lval); -} -SV** -avhv_fetch_ent(AV *av, SV *keysv, I32 lval, U32 hash) -{ - SV **indsvp; - HV *keys = avhv_keys(av); - HE *he; - I32 ind; - - he = hv_fetch_ent(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(keys, keysv, newSViv(ind), 0); + if (key > AvFILLp(av)) + return Nullsv; + else { + if (!AvREAL(av) && AvREIFY(av)) + av_reify(av); + sv = AvARRAY(av)[key]; + if (key == AvFILLp(av)) { + AvARRAY(av)[key] = &PL_sv_undef; + do { + AvFILLp(av)--; + } while (--key >= 0 && AvARRAY(av)[key] == &PL_sv_undef); + } + else + AvARRAY(av)[key] = &PL_sv_undef; + if (SvSMAGICAL(av)) + mg_set((SV*)av); + } + if (flags & G_DISCARD) { + SvREFCNT_dec(sv); + sv = Nullsv; } - return av_fetch(av, ind, lval); + else if (AvREAL(av)) + sv = sv_2mortal(sv); + return sv; } -SV** -avhv_store(AV *av, char *key, U32 klen, SV *val, U32 hash) -{ - SV **indsvp; - HV *keys = avhv_keys(av); - I32 ind; - - indsvp = hv_fetch(keys, key, klen, FALSE); - if (indsvp) { - ind = SvIV(*indsvp); - if (ind < 1) - croak("Bad index while coercing array into hash"); - } else { - ind = AvFILL(av) + 1; - hv_store(keys, key, klen, newSViv(ind), hash); - } - return av_store(av, ind, val); -} +/* +=for apidoc av_exists -SV** -avhv_store_ent(AV *av, SV *keysv, SV *val, U32 hash) -{ - HV *keys = avhv_keys(av); - HE *he; - I32 ind; - - he = hv_fetch_ent(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(keys, keysv, newSViv(ind), hash); - } - return av_store(av, ind, val); -} +Returns true if the element indexed by C has been initialized. -bool -avhv_exists_ent(AV *av, SV *keysv, U32 hash) -{ - HV *keys = avhv_keys(av); - return hv_exists_ent(keys, keysv, hash); -} +This relies on the fact that uninitialized array elements are set to +C<&PL_sv_undef>. +=cut +*/ bool -avhv_exists(AV *av, char *key, U32 klen) +Perl_av_exists(pTHX_ AV *av, I32 key) { - HV *keys = avhv_keys(av); - return hv_exists(keys, key, klen); -} + if (!av) + return FALSE; -/* avhv_delete leaks. Caller can re-index and compress if so desired. */ -SV * -avhv_delete(AV *av, char *key, U32 klen, I32 flags) -{ - HV *keys = avhv_keys(av); - SV *sv; - SV **svp; - I32 ind; - - sv = hv_delete(keys, key, klen, 0); - 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); + + if (SvRMAGICAL(av)) { + const MAGIC * const tied_magic = mg_find((SV*)av, PERL_MAGIC_tied); + if (tied_magic || mg_find((SV*)av, PERL_MAGIC_regdata)) { + SV *sv = sv_newmortal(); + MAGIC *mg; + /* Handle negative array indices 20020222 MJD */ + if (key < 0) { + unsigned adjust_index = 1; + if (tied_magic) { + SV * const * const negative_indices_glob = + hv_fetch(SvSTASH(SvRV(SvTIED_obj((SV *)av, + tied_magic))), + NEGATIVE_INDICES_VAR, 16, 0); + if (negative_indices_glob + && SvTRUE(GvSV(*negative_indices_glob))) + adjust_index = 0; + } + if (adjust_index) { + key += AvFILL(av) + 1; + if (key < 0) + return FALSE; + } + } + + mg_copy((SV*)av, sv, 0, key); + mg = mg_find(sv, PERL_MAGIC_tiedelem); + if (mg) { + magic_existspack(sv, mg); + return (bool)SvTRUE(sv); + } + + } } - *svp = &sv_undef; - return sv; -} -/* avhv_delete_ent leaks. Caller can re-index and compress if so desired. */ -SV * -avhv_delete_ent(AV *av, SV *keysv, I32 flags, U32 hash) -{ - HV *keys = avhv_keys(av); - SV *sv; - SV **svp; - I32 ind; - - sv = hv_delete_ent(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); + if (key < 0) { + key += AvFILL(av) + 1; + if (key < 0) + return FALSE; } - *svp = &sv_undef; - return sv; -} -HE * -avhv_iternext(AV *av) -{ - HV *keys = avhv_keys(av); - return hv_iternext(keys); + if (key <= AvFILLp(av) && AvARRAY(av)[key] != &PL_sv_undef + && AvARRAY(av)[key]) + { + return TRUE; + } + else + return FALSE; } -SV * -avhv_iterval(AV *av, register HE *entry) -{ - HV *keys = avhv_keys(av); - SV *sv; - I32 ind; - - sv = hv_iterval(keys, entry); - ind = SvIV(sv); - if (ind < 1) - croak("Bad index while coercing array into hash"); - return *av_fetch(av, ind, TRUE); -} +SV ** +Perl_av_arylen_p(pTHX_ AV *av) { + dVAR; + MAGIC *mg = mg_find((SV*)av, PERL_MAGIC_arylen_p); -SV * -avhv_iternextsv(AV *av, char **key, I32 *retlen) -{ - HV *keys = avhv_keys(av); - HE *he; - SV *sv; - I32 ind; - - he = hv_iternext(keys); - if (!he) - return Nullsv; - *key = hv_iterkey(he, retlen); - sv = hv_iterval(keys, he); - ind = SvIV(sv); - if (ind < 1) - croak("Bad index while coercing array into hash"); - return *av_fetch(av, ind, TRUE); + 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: + */