X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=av.c;h=c1b03fee75be2c63df32febe14d45b7e1f40aaa6;hb=e59c8b07349f66b8f6de8cad95787c1bfaf1297d;hp=5f04d05d645647634b59478b1dab13f75677eef5;hpb=725ac12f95fe41dbf122254e15cf9e957365a925;p=p5sagit%2Fp5-mst-13.2.git diff --git a/av.c b/av.c index 5f04d05..c1b03fe 100644 --- a/av.c +++ b/av.c @@ -42,7 +42,7 @@ Perl_av_reify(pTHX_ AV *av) SV * const sv = AvARRAY(av)[--key]; assert(sv); if (sv != &PL_sv_undef) - SvREFCNT_inc_void_NN(sv); + SvREFCNT_inc_simple_void_NN(sv); } key = AvARRAY(av) - AvALLOC(av); while (key) @@ -95,7 +95,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; - SvPV_set(av, (char*)AvALLOC(av)); + AvARRAY(av) = AvALLOC(av); if (AvREAL(av)) { while (tmp) ary[--tmp] = &PL_sv_undef; @@ -171,7 +171,7 @@ Perl_av_extend(pTHX_ AV *av, I32 key) ary[--tmp] = &PL_sv_undef; } - SvPV_set(av, (char*)AvALLOC(av)); + AvARRAY(av) = AvALLOC(av); AvMAX(av) = newmax; } } @@ -194,32 +194,31 @@ SV** Perl_av_fetch(pTHX_ register AV *av, I32 key, I32 lval) { dVAR; - SV *sv; assert(av); 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); + SV *sv; + if (key < 0) { + I32 adjust_index = 1; + if (tied_magic) { + /* 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 (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; - } + if (adjust_index) { + key += AvFILL(av) + 1; + if (key < 0) + return NULL; + } + } sv = sv_newmortal(); sv_upgrade(sv, SVt_PVLV); @@ -233,22 +232,19 @@ Perl_av_fetch(pTHX_ register AV *av, I32 key, I32 lval) if (key < 0) { key += AvFILL(av) + 1; if (key < 0) - return 0; + return NULL; } if (key > AvFILLp(av)) { if (!lval) - return 0; - sv = newSV(0); - return av_store(av,key,sv); + return NULL; + return av_store(av,key,newSV(0)); } if (AvARRAY(av)[key] == &PL_sv_undef) { emptyness: - if (lval) { - sv = newSV(0); - return av_store(av,key,sv); - } - return 0; + if (lval) + return av_store(av,key,newSV(0)); + return NULL; } else if (AvREIFY(av) && (!AvARRAY(av)[key] /* eg. @_ could have freed elts */ @@ -296,7 +292,7 @@ Perl_av_store(pTHX_ register AV *av, I32 key, SV *val) if (tied_magic) { /* Handle negative array indices 20020222 MJD */ if (key < 0) { - unsigned adjust_index = 1; + bool adjust_index = 1; SV * const * const negative_indices_glob = hv_fetch(SvSTASH(SvRV(SvTIED_obj((SV *)av, tied_magic))), @@ -313,7 +309,7 @@ Perl_av_store(pTHX_ register AV *av, I32 key, SV *val) if (val != &PL_sv_undef) { mg_copy((SV*)av, val, 0, key); } - return 0; + return NULL; } } @@ -321,7 +317,7 @@ Perl_av_store(pTHX_ register AV *av, I32 key, SV *val) if (key < 0) { key += AvFILL(av) + 1; if (key < 0) - return 0; + return NULL; } if (SvREADONLY(av) && key >= AvFILL(av)) @@ -336,9 +332,9 @@ Perl_av_store(pTHX_ register AV *av, I32 key, SV *val) if (!AvREAL(av)) { if (av == PL_curstack && key > PL_stack_sp - PL_stack_base) PL_stack_sp = PL_stack_base + key; /* XPUSH in disguise */ - do + do { ary[++AvFILLp(av)] = &PL_sv_undef; - while (AvFILLp(av) < key); + } while (AvFILLp(av) < key); } AvFILLp(av) = key; } @@ -366,12 +362,10 @@ Creates a new AV. The reference count is set to 1. AV * Perl_newAV(pTHX) { - register AV * const av = (AV*)newSV(0); - - sv_upgrade((SV *)av, SVt_PVAV); + register AV * const av = (AV*)newSV_type(SVt_PVAV); /* sv_upgrade does AvREAL_only() */ AvALLOC(av) = 0; - SvPV_set(av, NULL); + AvARRAY(av) = NULL; AvMAX(av) = AvFILLp(av) = -1; return av; } @@ -389,18 +383,15 @@ will have a reference count of 1. AV * Perl_av_make(pTHX_ register I32 size, register SV **strp) { - register AV * const av = (AV*)newSV(0); - - sv_upgrade((SV *) av,SVt_PVAV); + register AV * const av = (AV*)newSV_type(SVt_PVAV); /* 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; - SvPV_set(av, (char*)ary); - AvFILLp(av) = size - 1; - AvMAX(av) = size - 1; + AvARRAY(av) = ary; + AvFILLp(av) = AvMAX(av) = size - 1; for (i = 0; i < size; i++) { assert (*strp); ary[i] = newSV(0); @@ -424,7 +415,7 @@ void Perl_av_clear(pTHX_ register AV *av) { dVAR; - register I32 key; + I32 extra; assert(av); #ifdef DEBUGGING @@ -445,18 +436,19 @@ Perl_av_clear(pTHX_ register AV *av) if (AvREAL(av)) { SV** const ary = AvARRAY(av); - key = AvFILLp(av) + 1; - while (key) { - SV * const sv = ary[--key]; + I32 index = AvFILLp(av) + 1; + while (index) { + SV * const sv = ary[--index]; /* undef the slot before freeing the value, because a - * destructor might try to modify this arrray */ - ary[key] = &PL_sv_undef; + * destructor might try to modify this array */ + ary[index] = &PL_sv_undef; SvREFCNT_dec(sv); } } - if ((key = AvARRAY(av) - AvALLOC(av))) { - AvMAX(av) += key; - SvPV_set(av, (char*)AvALLOC(av)); + extra = AvARRAY(av) - AvALLOC(av); + if (extra) { + AvMAX(av) += extra; + AvARRAY(av) = AvALLOC(av); } AvFILLp(av) = -1; @@ -477,17 +469,38 @@ Perl_av_undef(pTHX_ register AV *av) /* Give any tie a chance to cleanup first */ if (SvTIED_mg((SV*)av, PERL_MAGIC_tied)) - av_fill(av, -1); /* mg_clear() ? */ + av_fill(av, -1); if (AvREAL(av)) { register I32 key = AvFILLp(av) + 1; while (key) SvREFCNT_dec(AvARRAY(av)[--key]); } + Safefree(AvALLOC(av)); - AvALLOC(av) = 0; - SvPV_set(av, NULL); + AvALLOC(av) = NULL; + AvARRAY(av) = NULL; AvMAX(av) = AvFILLp(av) = -1; + + if(SvRMAGICAL(av)) mg_clear((SV*)av); +} + +/* + +=for apidoc av_create_and_push + +Push an SV onto the end of the array, creating the array if necessary. +A small internal helper function to remove a commonly duplicated idiom. + +=cut +*/ + +void +Perl_av_create_and_push(pTHX_ AV **const avp, SV *const val) +{ + if (!*avp) + *avp = newAV(); + av_push(*avp, val); } /* @@ -572,6 +585,26 @@ Perl_av_pop(pTHX_ register AV *av) } /* + +=for apidoc av_create_and_unshift_one + +Unshifts an SV onto the beginning of the array, creating the array if +necessary. +A small internal helper function to remove a commonly duplicated idiom. + +=cut +*/ + +SV ** +Perl_av_create_and_unshift_one(pTHX_ AV **const avp, SV *const val) +{ + if (!*avp) + *avp = newAV(); + av_unshift(*avp, 1); + return av_store(*avp, 0, val); +} + +/* =for apidoc av_unshift Unshift the given number of C values onto the beginning of the @@ -622,14 +655,13 @@ Perl_av_unshift(pTHX_ register AV *av, register I32 num) AvMAX(av) += i; AvFILLp(av) += i; - SvPV_set(av, (char*)(AvARRAY(av) - i)); + AvARRAY(av) = AvARRAY(av) - i; } if (num) { register SV **ary; - I32 slide; - i = AvFILLp(av); + const I32 i = AvFILLp(av); /* Create extra elements */ - slide = i > 0 ? i : 0; + const I32 slide = i > 0 ? i : 0; num += slide; av_extend(av, i + num); AvFILLp(av) += num; @@ -641,7 +673,7 @@ Perl_av_unshift(pTHX_ register AV *av, register I32 num) /* Make extra elements into a buffer */ AvMAX(av) -= slide; AvFILLp(av) -= slide; - SvPV_set(av, (char*)(AvARRAY(av) + slide)); + AvARRAY(av) = AvARRAY(av) + slide; } } @@ -685,7 +717,7 @@ Perl_av_shift(pTHX_ register AV *av) retval = *AvARRAY(av); if (AvREAL(av)) *AvARRAY(av) = &PL_sv_undef; - SvPV_set(av, (char*)(AvARRAY(av) + 1)); + AvARRAY(av) = AvARRAY(av) + 1; AvMAX(av)--; AvFILLp(av)--; if (SvSMAGICAL(av)) @@ -696,8 +728,8 @@ Perl_av_shift(pTHX_ register AV *av) /* =for apidoc av_len -Returns the highest index in the array. Returns -1 if the array is -empty. +Returns the highest index in the array. The number of elements in the +array is C. Returns -1 if the array is empty. =cut */ @@ -712,9 +744,15 @@ Perl_av_len(pTHX_ register const AV *av) /* =for apidoc av_fill -Ensure than an array has a given number of elements, equivalent to +Set the highest index in the array to the given number, equivalent to Perl's C<$#array = $fill;>. +The number of elements in the an array will be C after +av_fill() returns. If the array was previously shorter then the +additional elements appended are set to C. If the array +was longer, then the excess elements are freed. C is +the same as C. + =cut */ void