X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=pp_sort.c;h=9592edb32347de4c27d8fb115ed84e9952880af9;hb=0ee1060bc7f323c193867d7f04e45058f219516b;hp=877f17162ba266dc6493808557b8a6d28eec845a;hpb=f2b990bf33ddc9a2c27b053bb94a963bce0c09ce;p=p5sagit%2Fp5-mst-13.2.git diff --git a/pp_sort.c b/pp_sort.c index 877f171..9592edb 100644 --- a/pp_sort.c +++ b/pp_sort.c @@ -46,9 +46,8 @@ static I32 amagic_cmp_locale(pTHX_ SV *a, SV *b); #define sv_cmp_static Perl_sv_cmp #define sv_cmp_locale_static Perl_sv_cmp_locale -#define SORTHINTS(hintsv) \ - (((hintsv) = GvSV(gv_fetchpv("sort::hints", GV_ADDMULTI, SVt_IV))), \ - (SvIOK(hintsv) ? ((I32)SvIV(hintsv)) : 0)) +#define dSORTHINTS SV *hintsv = GvSV(gv_fetchpv("sort::hints", GV_ADDMULTI, SVt_IV)) +#define SORTHINTS (SvIOK(hintsv) ? ((I32)SvIV(hintsv)) : 0) #ifndef SMALLSORT #define SMALLSORT (200) @@ -147,17 +146,17 @@ typedef SV * gptr; /* pointers in our lists */ ** ** Unless otherwise specified, pair pointers address the first of two elements. ** -** b and b+1 are a pair that compare with sense ``sense''. -** b is the ``bottom'' of adjacent pairs that might form a longer run. +** b and b+1 are a pair that compare with sense "sense". +** b is the "bottom" of adjacent pairs that might form a longer run. ** ** p2 parallels b in the list2 array, where runs are defined by ** a pointer chain. ** -** t represents the ``top'' of the adjacent pairs that might extend +** t represents the "top" of the adjacent pairs that might extend ** the run beginning at b. Usually, t addresses a pair ** that compares with opposite sense from (b,b+1). ** However, it may also address a singleton element at the end of list1, -** or it may be equal to ``last'', the first element beyond list1. +** or it may be equal to "last", the first element beyond list1. ** ** r addresses the Nth pair following b. If this would be beyond t, ** we back it off to t. Only when r is less than t do we consider the @@ -376,7 +375,7 @@ S_mergesortsv(pTHX_ gptr *base, size_t nmemb, SVCOMPARE_t cmp, U32 flags) } if (nmemb <= SMALLSORT) aux = small; /* use stack for aux array */ - else { New(799,aux,nmemb,gptr); } /* allocate auxilliary array */ + else { Newx(aux,nmemb,gptr); } /* allocate auxilliary array */ level = 0; stackp = stack; stackp->runs = dynprep(aTHX_ base, aux, nmemb, cmp); @@ -412,7 +411,7 @@ S_mergesortsv(pTHX_ gptr *base, size_t nmemb, SVCOMPARE_t cmp, U32 flags) ** which head to merge) the item to merge ** (at pointer q) is the first operand of ** the comparison. When we want to know - ** if ``q is strictly less than the other'', + ** if "q is strictly less than the other", ** we can't just do ** cmp(q, other) < 0 ** because stability demands that we treat equality @@ -784,10 +783,10 @@ S_qsortsvu(pTHX_ SV ** array, size_t num_elts, SVCOMPARE_t compare) /* Innoculate large partitions against quadratic behavior */ if (num_elts > QSORT_PLAY_SAFE) { - register size_t n, j; - register SV **q; - for (n = num_elts, q = array; n > 1; ) { - j = (size_t)(n-- * Drand01()); + register size_t n; + register SV ** const q = array; + for (n = num_elts; n > 1; ) { + register const size_t j = (size_t)(n-- * Drand01()); temp = q[j]; q[j] = q[n]; q[n] = temp; @@ -1143,7 +1142,7 @@ S_qsortsvu(pTHX_ SV ** array, size_t num_elts, SVCOMPARE_t compare) qsort_break_even *= 2; #endif #if QSORT_ORDER_GUESS == 3 - int prev_break = qsort_break_even; + const int prev_break = qsort_break_even; qsort_break_even *= qsort_break_even; if (qsort_break_even < prev_break) { qsort_break_even = (part_right - part_left) + 1; @@ -1321,8 +1320,8 @@ static I32 cmpindir(pTHX_ gptr a, gptr b) { I32 sense; - gptr *ap = (gptr *)a; - gptr *bp = (gptr *)b; + gptr * const ap = (gptr *)a; + gptr * const bp = (gptr *)b; if ((sense = PL_sort_RealCmp(aTHX_ *ap, *bp)) == 0) sense = (ap > bp) ? 1 : ((ap < bp) ? -1 : 0); @@ -1333,8 +1332,8 @@ static I32 cmpindir_desc(pTHX_ gptr a, gptr b) { I32 sense; - gptr *ap = (gptr *)a; - gptr *bp = (gptr *)b; + gptr * const ap = (gptr *)a; + gptr * const bp = (gptr *)b; /* Reverse the default */ if ((sense = PL_sort_RealCmp(aTHX_ *ap, *bp))) @@ -1347,9 +1346,10 @@ cmpindir_desc(pTHX_ gptr a, gptr b) STATIC void S_qsortsv(pTHX_ gptr *list1, size_t nmemb, SVCOMPARE_t cmp, U32 flags) { - SV *hintsv; - if (SORTHINTS(hintsv) & HINT_SORT_STABLE) { + dSORTHINTS; + + if (SORTHINTS & HINT_SORT_STABLE) { register gptr **pp, *q; register size_t n, j, i; gptr *small[SMALLSORT], **indir, tmp; @@ -1358,7 +1358,7 @@ S_qsortsv(pTHX_ gptr *list1, size_t nmemb, SVCOMPARE_t cmp, U32 flags) /* Small arrays can use the stack, big ones must be allocated */ if (nmemb <= SMALLSORT) indir = small; - else { New(1799, indir, nmemb, gptr *); } + else { Newx(indir, nmemb, gptr *); } /* Copy pointers to original array elements into indirect array */ for (n = nmemb, pp = indir, q = list1; n--; ) *pp++ = q++; @@ -1442,15 +1442,8 @@ Perl_sortsv(pTHX_ SV **array, size_t nmemb, SVCOMPARE_t cmp) { void (*sortsvp)(pTHX_ SV **array, size_t nmemb, SVCOMPARE_t cmp, U32 flags) = S_mergesortsv; - SV *hintsv; - I32 hints; - - /* Sun's Compiler (cc: WorkShop Compilers 4.2 30 Oct 1996 C 4.2) used - to miscompile this function under optimization -O. If you get test - errors related to picking the correct sort() function, try recompiling - this file without optimiziation. -- A.D. 4/2002. - */ - hints = SORTHINTS(hintsv); + dSORTHINTS; + const I32 hints = SORTHINTS; if (hints & HINT_SORT_QUICKSORT) { sortsvp = S_qsortsv; } @@ -1463,20 +1456,13 @@ Perl_sortsv(pTHX_ SV **array, size_t nmemb, SVCOMPARE_t cmp) } -void +static void S_sortsv_desc(pTHX_ SV **array, size_t nmemb, SVCOMPARE_t cmp) { void (*sortsvp)(pTHX_ SV **array, size_t nmemb, SVCOMPARE_t cmp, U32 flags) = S_mergesortsv; - SV *hintsv; - I32 hints; - - /* Sun's Compiler (cc: WorkShop Compilers 4.2 30 Oct 1996 C 4.2) used - to miscompile this function under optimization -O. If you get test - errors related to picking the correct sort() function, try recompiling - this file without optimiziation. -- A.D. 4/2002. - */ - hints = SORTHINTS(hintsv); + dSORTHINTS; + const I32 hints = SORTHINTS; if (hints & HINT_SORT_QUICKSORT) { sortsvp = S_qsortsv; } @@ -1488,9 +1474,13 @@ S_sortsv_desc(pTHX_ SV **array, size_t nmemb, SVCOMPARE_t cmp) sortsvp(aTHX_ array, nmemb, cmp, 1); } +#define SvNSIOK(sv) ((SvFLAGS(sv) & SVf_NOK) || ((SvFLAGS(sv) & (SVf_IOK|SVf_IVisUV)) == SVf_IOK)) +#define SvSIOK(sv) ((SvFLAGS(sv) & (SVf_IOK|SVf_IVisUV)) == SVf_IOK) +#define SvNSIV(sv) ( SvNOK(sv) ? SvNVX(sv) : ( SvSIOK(sv) ? SvIVX(sv) : sv_2nv(sv) ) ) + PP(pp_sort) { - dSP; dMARK; dORIGMARK; + dVAR; dSP; dMARK; dORIGMARK; register SV **p1 = ORIGMARK+1, **p2; register I32 max, i; AV* av = Nullav; @@ -1503,10 +1493,11 @@ PP(pp_sort) bool hasargs = FALSE; I32 is_xsub = 0; I32 sorting_av = 0; - U8 private = PL_op->op_private; - U8 flags = PL_op->op_flags; + const U8 priv = PL_op->op_private; + const U8 flags = PL_op->op_flags; void (*sortsvp)(pTHX_ SV **array, size_t nmemb, SVCOMPARE_t cmp) = Perl_sortsv; + I32 all_SIVs = 1; if (gimme != G_ARRAY) { SP = MARK; @@ -1526,8 +1517,7 @@ PP(pp_sort) else { cv = sv_2cv(*++MARK, &stash, &gv, 0); if (cv && SvPOK(cv)) { - STRLEN n_a; - char *proto = SvPV((SV*)cv, n_a); + const char *proto = SvPV_nolen_const((SV*)cv); if (proto && strEQ(proto, "$$")) { hasargs = TRUE; } @@ -1554,7 +1544,8 @@ PP(pp_sort) SAVEVPTR(CvROOT(cv)->op_ppaddr); CvROOT(cv)->op_ppaddr = PL_ppaddr[OP_NULL]; - PAD_SET_CUR(CvPADLIST(cv), 1); + SAVECOMPPAD(); + PAD_SET_CUR_NOSAVE(CvPADLIST(cv), 1); } } } @@ -1566,7 +1557,7 @@ PP(pp_sort) /* optimiser converts "@a = sort @a" to "sort \@a"; * in case of tied @a, pessimise: push (@a) onto stack, then assign * result back to @a at the end of this function */ - if (private & OPpSORT_INPLACE) { + if (priv & OPpSORT_INPLACE) { assert( MARK+1 == SP && *SP && SvTYPE(*SP) == SVt_PVAV); (void)POPMARK; /* remove mark associated with ex-OP_AASSIGN */ av = (AV*)(*SP); @@ -1574,7 +1565,7 @@ PP(pp_sort) if (SvMAGICAL(av)) { MEXTEND(SP, max); p2 = SP; - for (i=0; i < (U32)max; i++) { + for (i=0; i < max; i++) { SV **svp = av_fetch(av, i, FALSE); *SP++ = (svp) ? *svp : Nullsv; } @@ -1589,21 +1580,46 @@ PP(pp_sort) max = SP - MARK; } - if (private & OPpSORT_DESCEND) { + if (priv & OPpSORT_DESCEND) { sortsvp = S_sortsv_desc; } - /* shuffle stack down, removing optional initial cv (p1!=p2), plus any - * nulls; also stringify any args */ + /* shuffle stack down, removing optional initial cv (p1!=p2), plus + * any nulls; also stringify or converting to integer or number as + * required any args */ for (i=max; i > 0 ; i--) { if ((*p1 = *p2++)) { /* Weed out nulls. */ SvTEMP_off(*p1); - if (!PL_sortcop && !SvPOK(*p1)) { - STRLEN n_a; - if (SvAMAGIC(*p1)) - overloading = 1; - else - (void)sv_2pv(*p1, &n_a); + if (!PL_sortcop) { + if (priv & OPpSORT_NUMERIC) { + if (priv & OPpSORT_INTEGER) { + if (!SvIOK(*p1)) { + if (SvAMAGIC(*p1)) + overloading = 1; + else + (void)sv_2iv(*p1); + } + } + else { + if (!SvNSIOK(*p1)) { + if (SvAMAGIC(*p1)) + overloading = 1; + else + (void)sv_2nv(*p1); + } + if (all_SIVs && !SvSIOK(*p1)) + all_SIVs = 0; + } + } + else { + if (!SvPOK(*p1)) { + if (SvAMAGIC(*p1)) + overloading = 1; + else + (void)sv_2pv_flags(*p1, 0, + SV_GMAGIC|SV_CONST_RETURN); + } + } } p1++; } @@ -1618,7 +1634,7 @@ PP(pp_sort) if (PL_sortcop) { PERL_CONTEXT *cx; SV** newsp; - bool oldcatch = CATCH_GET; + const bool oldcatch = CATCH_GET; SAVETMPS; SAVEOP(); @@ -1668,17 +1684,17 @@ PP(pp_sort) MEXTEND(SP, 20); /* Can't afford stack realloc on signal. */ start = sorting_av ? AvARRAY(av) : ORIGMARK+1; sortsvp(aTHX_ start, max, - (private & OPpSORT_NUMERIC) - ? ( (private & OPpSORT_INTEGER) + (priv & OPpSORT_NUMERIC) + ? ( ( ( priv & OPpSORT_INTEGER) || all_SIVs) ? ( overloading ? amagic_i_ncmp : sv_i_ncmp) - : ( overloading ? amagic_ncmp : sv_ncmp)) + : ( overloading ? amagic_ncmp : sv_ncmp ) ) : ( IN_LOCALE_RUNTIME ? ( overloading ? amagic_cmp_locale : sv_cmp_locale_static) : ( overloading ? amagic_cmp : sv_cmp_static))); } - if (private & OPpSORT_REVERSE) { + if (priv & OPpSORT_REVERSE) { SV **q = start+max-1; while (start < q) { SV *tmp = *start; @@ -1689,17 +1705,15 @@ PP(pp_sort) } if (av && !sorting_av) { /* simulate pp_aassign of tied AV */ - SV *sv; - SV** base, **didstore; - for (base = ORIGMARK+1, i=0; i < max; i++) { - sv = newSVsv(base[i]); - base[i] = sv; + SV** const base = ORIGMARK+1; + for (i=0; i < max; i++) { + base[i] = newSVsv(base[i]); } av_clear(av); av_extend(av, max); for (i=0; i < max; i++) { - sv = base[i]; - didstore = av_store(av, i, sv); + SV * const sv = base[i]; + SV **didstore = av_store(av, i, sv); if (SvSMAGICAL(sv)) mg_set(sv); if (!didstore) @@ -1714,8 +1728,9 @@ PP(pp_sort) static I32 sortcv(pTHX_ SV *a, SV *b) { - I32 oldsaveix = PL_savestack_ix; - I32 oldscopeix = PL_scopestack_ix; + dVAR; + const I32 oldsaveix = PL_savestack_ix; + const I32 oldscopeix = PL_scopestack_ix; I32 result; GvSV(PL_firstgv) = a; GvSV(PL_secondgv) = b; @@ -1737,23 +1752,22 @@ sortcv(pTHX_ SV *a, SV *b) static I32 sortcv_stacked(pTHX_ SV *a, SV *b) { - I32 oldsaveix = PL_savestack_ix; - I32 oldscopeix = PL_scopestack_ix; + dVAR; + const I32 oldsaveix = PL_savestack_ix; + const I32 oldscopeix = PL_scopestack_ix; I32 result; - AV *av; - - av = GvAV(PL_defgv); + AV * const av = GvAV(PL_defgv); if (AvMAX(av) < 1) { SV** ary = AvALLOC(av); if (AvARRAY(av) != ary) { AvMAX(av) += AvARRAY(av) - AvALLOC(av); - SvPVX(av) = (char*)ary; + SvPV_set(av, (char*)ary); } if (AvMAX(av) < 1) { AvMAX(av) = 1; Renew(ary,2,SV*); - SvPVX(av) = (char*)ary; + SvPV_set(av, (char*)ary); } } AvFILLp(av) = 1; @@ -1778,11 +1792,11 @@ sortcv_stacked(pTHX_ SV *a, SV *b) static I32 sortcv_xsub(pTHX_ SV *a, SV *b) { - dSP; - I32 oldsaveix = PL_savestack_ix; - I32 oldscopeix = PL_scopestack_ix; + dVAR; dSP; + const I32 oldsaveix = PL_savestack_ix; + const I32 oldscopeix = PL_scopestack_ix; + CV * const cv=(CV*)PL_sortcop; I32 result; - CV *cv=(CV*)PL_sortcop; SP = PL_stack_base; PUSHMARK(SP); @@ -1807,47 +1821,41 @@ sortcv_xsub(pTHX_ SV *a, SV *b) static I32 sv_ncmp(pTHX_ SV *a, SV *b) { - NV nv1 = SvNV(a); - NV nv2 = SvNV(b); + const NV nv1 = SvNSIV(a); + const NV nv2 = SvNSIV(b); return nv1 < nv2 ? -1 : nv1 > nv2 ? 1 : 0; } static I32 sv_i_ncmp(pTHX_ SV *a, SV *b) { - IV iv1 = SvIV(a); - IV iv2 = SvIV(b); + const IV iv1 = SvIV(a); + const IV iv2 = SvIV(b); return iv1 < iv2 ? -1 : iv1 > iv2 ? 1 : 0; } -#define tryCALL_AMAGICbin(left,right,meth,svp) STMT_START { \ - *svp = Nullsv; \ - if (PL_amagic_generation) { \ - if (SvAMAGIC(left)||SvAMAGIC(right))\ - *svp = amagic_call(left, \ - right, \ - CAT2(meth,_amg), \ - 0); \ - } \ - } STMT_END + +#define tryCALL_AMAGICbin(left,right,meth) \ + (PL_amagic_generation && (SvAMAGIC(left)||SvAMAGIC(right))) \ + ? amagic_call(left, right, CAT2(meth,_amg), 0) \ + : Nullsv; static I32 amagic_ncmp(pTHX_ register SV *a, register SV *b) { - SV *tmpsv; - tryCALL_AMAGICbin(a,b,ncmp,&tmpsv); + SV * const tmpsv = tryCALL_AMAGICbin(a,b,ncmp); if (tmpsv) { - NV d; - if (SvIOK(tmpsv)) { - I32 i = SvIVX(tmpsv); + const I32 i = SvIVX(tmpsv); if (i > 0) return 1; return i? -1 : 0; } - d = SvNV(tmpsv); - if (d > 0) - return 1; - return d? -1 : 0; + else { + const NV d = SvNV(tmpsv); + if (d > 0) + return 1; + return d ? -1 : 0; + } } return sv_ncmp(aTHX_ a, b); } @@ -1855,21 +1863,20 @@ amagic_ncmp(pTHX_ register SV *a, register SV *b) static I32 amagic_i_ncmp(pTHX_ register SV *a, register SV *b) { - SV *tmpsv; - tryCALL_AMAGICbin(a,b,ncmp,&tmpsv); + SV * const tmpsv = tryCALL_AMAGICbin(a,b,ncmp); if (tmpsv) { - NV d; - if (SvIOK(tmpsv)) { - I32 i = SvIVX(tmpsv); + const I32 i = SvIVX(tmpsv); if (i > 0) return 1; return i? -1 : 0; } - d = SvNV(tmpsv); - if (d > 0) - return 1; - return d? -1 : 0; + else { + const NV d = SvNV(tmpsv); + if (d > 0) + return 1; + return d ? -1 : 0; + } } return sv_i_ncmp(aTHX_ a, b); } @@ -1877,21 +1884,20 @@ amagic_i_ncmp(pTHX_ register SV *a, register SV *b) static I32 amagic_cmp(pTHX_ register SV *str1, register SV *str2) { - SV *tmpsv; - tryCALL_AMAGICbin(str1,str2,scmp,&tmpsv); + SV * const tmpsv = tryCALL_AMAGICbin(str1,str2,scmp); if (tmpsv) { - NV d; - if (SvIOK(tmpsv)) { - I32 i = SvIVX(tmpsv); + const I32 i = SvIVX(tmpsv); if (i > 0) return 1; return i? -1 : 0; } - d = SvNV(tmpsv); - if (d > 0) - return 1; - return d? -1 : 0; + else { + const NV d = SvNV(tmpsv); + if (d > 0) + return 1; + return d? -1 : 0; + } } return sv_cmp(str1, str2); } @@ -1899,21 +1905,20 @@ amagic_cmp(pTHX_ register SV *str1, register SV *str2) static I32 amagic_cmp_locale(pTHX_ register SV *str1, register SV *str2) { - SV *tmpsv; - tryCALL_AMAGICbin(str1,str2,scmp,&tmpsv); + SV * const tmpsv = tryCALL_AMAGICbin(str1,str2,scmp); if (tmpsv) { - NV d; - if (SvIOK(tmpsv)) { - I32 i = SvIVX(tmpsv); + const I32 i = SvIVX(tmpsv); if (i > 0) return 1; return i? -1 : 0; } - d = SvNV(tmpsv); - if (d > 0) - return 1; - return d? -1 : 0; + else { + const NV d = SvNV(tmpsv); + if (d > 0) + return 1; + return d? -1 : 0; + } } return sv_cmp_locale(str1, str2); } @@ -1925,5 +1930,5 @@ amagic_cmp_locale(pTHX_ register SV *str1, register SV *str2) * indent-tabs-mode: t * End: * - * vim: expandtab shiftwidth=4: -*/ + * ex: set ts=8 sts=4 sw=4 noet: + */