X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=pp_sort.c;h=6d7565042f49c50728c2e82aec59163b9b6bca09;hb=3480a8d2d46562b783befbcecf951d5a2b4067d7;hp=b07eea6cb6d604dc827ca897d76b72d88426ad54;hpb=6c3fb703f2b4baeb80013bb4dcb062d7252ba482;p=p5sagit%2Fp5-mst-13.2.git diff --git a/pp_sort.c b/pp_sort.c index b07eea6..6d75650 100644 --- a/pp_sort.c +++ b/pp_sort.c @@ -1,7 +1,7 @@ /* pp_sort.c * * Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - * 2000, 2001, 2002, 2003, 2004, 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. @@ -13,6 +13,17 @@ * rear!' the slave-driver shouted. 'Three files up. And stay there... */ +/* This file contains pp ("push/pop") functions that + * execute the opcodes that make up a perl program. A typical pp function + * expects to find its arguments on the stack, and usually pushes its + * results onto the stack, hence the 'pp' terminology. Each OP structure + * contains a pointer to the relevant pp_foo() function. + * + * This particular file just contains pp_sort(), which is complex + * enough to merit its own file! See the other pp*.c files for the rest of + * the pp_ functions. + */ + #include "EXTERN.h" #define PERL_IN_PP_SORT_C #include "perl.h" @@ -354,7 +365,7 @@ S_mergesortsv(pTHX_ gptr *base, size_t nmemb, SVCOMPARE_t cmp, U32 flags) gptr small[SMALLSORT]; gptr *which[3]; off_runs stack[60], *stackp; - SVCOMPARE_t savecmp; + SVCOMPARE_t savecmp = 0; if (nmemb <= 1) return; /* sorted trivially */ @@ -1452,7 +1463,7 @@ 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) @@ -1479,7 +1490,7 @@ S_sortsv_desc(pTHX_ SV **array, size_t nmemb, SVCOMPARE_t cmp) PP(pp_sort) { - dSP; dMARK; dORIGMARK; + dVAR; dSP; dMARK; dORIGMARK; register SV **p1 = ORIGMARK+1, **p2; register I32 max, i; AV* av = Nullav; @@ -1492,6 +1503,8 @@ PP(pp_sort) bool hasargs = FALSE; I32 is_xsub = 0; I32 sorting_av = 0; + U8 priv = PL_op->op_private; + U8 flags = PL_op->op_flags; void (*sortsvp)(pTHX_ SV **array, size_t nmemb, SVCOMPARE_t cmp) = Perl_sortsv; @@ -1502,8 +1515,8 @@ PP(pp_sort) ENTER; SAVEVPTR(PL_sortcop); - if (PL_op->op_flags & OPf_STACKED) { - if (PL_op->op_flags & OPf_SPECIAL) { + if (flags & OPf_STACKED) { + if (flags & OPf_SPECIAL) { OP *kid = cLISTOP->op_first->op_sibling; /* pass pushmark */ kid = kUNOP->op_first; /* pass rv2gv */ kid = kUNOP->op_first; /* pass leave */ @@ -1553,7 +1566,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 (PL_op->op_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); @@ -1561,7 +1574,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; } @@ -1576,7 +1589,7 @@ PP(pp_sort) max = SP - MARK; } - if (PL_op->op_private & OPpSORT_DESCEND) { + if (priv & OPpSORT_DESCEND) { sortsvp = S_sortsv_desc; } @@ -1601,6 +1614,7 @@ PP(pp_sort) AvFILLp(av) = max-1; if (max > 1) { + SV **start; if (PL_sortcop) { PERL_CONTEXT *cx; SV** newsp; @@ -1624,7 +1638,7 @@ PP(pp_sort) } PUSHBLOCK(cx, CXt_NULL, PL_stack_base); - if (!(PL_op->op_flags & OPf_SPECIAL)) { + if (!(flags & OPf_SPECIAL)) { cx->cx_type = CXt_SUB; cx->blk_gimme = G_SCALAR; PUSHSUB(cx); @@ -1640,8 +1654,10 @@ PP(pp_sort) CX_CURPAD_SAVE(cx->blk_sub); cx->blk_sub.argarray = av; } - sortsvp(aTHX_ p1-max, max, - is_xsub ? sortcv_xsub : hasargs ? sortcv_stacked : sortcv); + + start = p1 - max; + sortsvp(aTHX_ start, max, + is_xsub ? sortcv_xsub : hasargs ? sortcv_stacked : sortcv); POPBLOCK(cx,PL_curpm); PL_stack_sp = newsp; @@ -1650,9 +1666,10 @@ PP(pp_sort) } else { MEXTEND(SP, 20); /* Can't afford stack realloc on signal. */ - sortsvp(aTHX_ sorting_av ? AvARRAY(av) : ORIGMARK+1, max, - (PL_op->op_private & OPpSORT_NUMERIC) - ? ( (PL_op->op_private & OPpSORT_INTEGER) + start = sorting_av ? AvARRAY(av) : ORIGMARK+1; + sortsvp(aTHX_ start, max, + (priv & OPpSORT_NUMERIC) + ? ( (priv & OPpSORT_INTEGER) ? ( overloading ? amagic_i_ncmp : sv_i_ncmp) : ( overloading ? amagic_ncmp : sv_ncmp)) : ( IN_LOCALE_RUNTIME @@ -1660,14 +1677,13 @@ PP(pp_sort) ? amagic_cmp_locale : sv_cmp_locale_static) : ( overloading ? amagic_cmp : sv_cmp_static))); - if (PL_op->op_private & OPpSORT_REVERSE) { - SV **p = sorting_av ? AvARRAY(av) : ORIGMARK+1; - SV **q = p+max-1; - while (p < q) { - SV *tmp = *p; - *p++ = *q; - *q-- = tmp; - } + } + if (priv & OPpSORT_REVERSE) { + SV **q = start+max-1; + while (start < q) { + SV *tmp = *start; + *start++ = *q; + *q-- = tmp; } } } @@ -1676,8 +1692,7 @@ PP(pp_sort) SV *sv; SV** base, **didstore; for (base = ORIGMARK+1, i=0; i < max; i++) { - sv = NEWSV(28,0); - sv_setsv(sv, base[i]); + sv = newSVsv(base[i]); base[i] = sv; } av_clear(av); @@ -1699,6 +1714,7 @@ PP(pp_sort) static I32 sortcv(pTHX_ SV *a, SV *b) { + dVAR; I32 oldsaveix = PL_savestack_ix; I32 oldscopeix = PL_scopestack_ix; I32 result; @@ -1722,6 +1738,7 @@ sortcv(pTHX_ SV *a, SV *b) static I32 sortcv_stacked(pTHX_ SV *a, SV *b) { + dVAR; I32 oldsaveix = PL_savestack_ix; I32 oldscopeix = PL_scopestack_ix; I32 result; @@ -1733,12 +1750,12 @@ sortcv_stacked(pTHX_ SV *a, SV *b) 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; @@ -1763,7 +1780,7 @@ sortcv_stacked(pTHX_ SV *a, SV *b) static I32 sortcv_xsub(pTHX_ SV *a, SV *b) { - dSP; + dVAR; dSP; I32 oldsaveix = PL_savestack_ix; I32 oldscopeix = PL_scopestack_ix; I32 result; @@ -1902,3 +1919,13 @@ amagic_cmp_locale(pTHX_ register SV *str1, register SV *str2) } return sv_cmp_locale(str1, str2); } + +/* + * Local variables: + * c-indentation-style: bsd + * c-basic-offset: 4 + * indent-tabs-mode: t + * End: + * + * ex: set ts=8 sts=4 sw=4 noet: + */