X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=op.c;h=cb868a45009c8dc271d7bb5f452e11b674864bc5;hb=d20626d86bf3d55ba658adbc2678de4c519cbc6c;hp=279fae814afd7f8c8c3de9401240d8bb6ce81491;hpb=2ba6ecf407bef45da384c153231c33d524202d81;p=p5sagit%2Fp5-mst-13.2.git diff --git a/op.c b/op.c index 279fae8..cb868a4 100644 --- a/op.c +++ b/op.c @@ -1,6 +1,6 @@ /* op.c * - * Copyright (c) 1991-1997, Larry Wall + * Copyright (c) 1991-1999, Larry Wall * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -16,14 +16,39 @@ */ #include "EXTERN.h" +#define PERL_IN_OP_C #include "perl.h" - -#ifdef PERL_OBJECT -#define CHECKCALL this->*PL_check -#else -#define CHECKCALL *PL_check +#include "keywords.h" + +/* #define PL_OP_SLAB_ALLOC */ + +/* XXXXXX testing */ +#define OP_REFCNT_LOCK NOOP +#define OP_REFCNT_UNLOCK NOOP +#define OpREFCNT_set(o,n) NOOP +#define OpREFCNT_dec(o) 0 + +#ifdef PL_OP_SLAB_ALLOC +#define SLAB_SIZE 8192 +static char *PL_OpPtr = NULL; +static int PL_OpSpace = 0; +#define NewOp(m,var,c,type) do { if ((PL_OpSpace -= c*sizeof(type)) >= 0) \ + var = (type *)(PL_OpPtr -= c*sizeof(type)); \ + else \ + var = (type *) Slab_Alloc(m,c*sizeof(type)); \ + } while (0) + +STATIC void * +S_Slab_Alloc(pTHX_ int m, size_t sz) +{ + Newz(m,PL_OpPtr,SLAB_SIZE,char); + PL_OpSpace = SLAB_SIZE - sz; + return PL_OpPtr += PL_OpSpace; +} + +#else +#define NewOp(m, var, c, type) Newz(m, var, c, type) #endif - /* * In the following definition, the ", Nullop" is just to make the compiler * think the expression is of the right type: croak actually does a Siglongjmp. @@ -31,32 +56,14 @@ #define CHECKOP(type,o) \ ((PL_op_mask && PL_op_mask[type]) \ ? ( op_free((OP*)o), \ - croak("%s trapped by operation mask", PL_op_desc[type]), \ + Perl_croak(aTHX_ "%s trapped by operation mask", PL_op_desc[type]), \ Nullop ) \ - : (CHECKCALL[type])((OP*)o)) + : CALL_FPTR(PL_check[type])(aTHX_ (OP*)o)) #define PAD_MAX 999999999 -static bool scalar_mod_type _((OP *o, I32 type)); -#ifndef PERL_OBJECT -static I32 list_assignment _((OP *o)); -static void bad_type _((I32 n, char *t, char *name, OP *kid)); -static OP *modkids _((OP *o, I32 type)); -static OP *no_fh_allowed _((OP *o)); -static OP *scalarboolean _((OP *o)); -static OP *too_few_arguments _((OP *o, char* name)); -static OP *too_many_arguments _((OP *o, char* name)); -static void null _((OP* o)); -static PADOFFSET pad_findlex _((char* name, PADOFFSET newoff, U32 seq, - CV* startcv, I32 cx_ix, I32 saweval)); -static OP *newDEFSVOP _((void)); -static OP *new_logop _((I32 type, I32 flags, OP **firstp, OP **otherp)); -static void simplify_sort _((OP *o)); -static bool is_handle_constructor _((OP *o, I32 argnum)); -#endif - STATIC char* -gv_ename(GV *gv) +S_gv_ename(pTHX_ GV *gv) { STRLEN n_a; SV* tmpsv = sv_newmortal(); @@ -65,75 +72,77 @@ gv_ename(GV *gv) } STATIC OP * -no_fh_allowed(OP *o) +S_no_fh_allowed(pTHX_ OP *o) { - yyerror(form("Missing comma after first argument to %s function", + yyerror(Perl_form(aTHX_ "Missing comma after first argument to %s function", PL_op_desc[o->op_type])); return o; } STATIC OP * -too_few_arguments(OP *o, char *name) +S_too_few_arguments(pTHX_ OP *o, char *name) { - yyerror(form("Not enough arguments for %s", name)); + yyerror(Perl_form(aTHX_ "Not enough arguments for %s", name)); return o; } STATIC OP * -too_many_arguments(OP *o, char *name) +S_too_many_arguments(pTHX_ OP *o, char *name) { - yyerror(form("Too many arguments for %s", name)); + yyerror(Perl_form(aTHX_ "Too many arguments for %s", name)); return o; } STATIC void -bad_type(I32 n, char *t, char *name, OP *kid) +S_bad_type(pTHX_ I32 n, char *t, char *name, OP *kid) { - yyerror(form("Type of arg %d to %s must be %s (not %s)", + yyerror(Perl_form(aTHX_ "Type of arg %d to %s must be %s (not %s)", (int)n, name, t, PL_op_desc[kid->op_type])); } -void -assertref(OP *o) +STATIC void +S_no_bareword_allowed(pTHX_ OP *o) { - int type = o->op_type; - if (type != OP_AELEM && type != OP_HELEM && type != OP_GELEM) { - yyerror(form("Can't use subscript on %s", PL_op_desc[type])); - if (type == OP_ENTERSUB || type == OP_RV2HV || type == OP_PADHV) { - dTHR; - SV *msg = sv_2mortal( - newSVpvf("(Did you mean $ or @ instead of %c?)\n", - type == OP_ENTERSUB ? '&' : '%')); - if (PL_in_eval & 2) - warn("%_", msg); - else if (PL_in_eval) - sv_catsv(GvSV(PL_errgv), msg); - else - PerlIO_write(PerlIO_stderr(), SvPVX(msg), SvCUR(msg)); - } - } + qerror(Perl_mess(aTHX_ + "Bareword \"%s\" not allowed while \"strict subs\" in use", + SvPV_nolen(cSVOPo->op_sv))); } /* "register" allocation */ PADOFFSET -pad_allocmy(char *name) +Perl_pad_allocmy(pTHX_ char *name) { dTHR; PADOFFSET off; SV *sv; if (!( + PL_in_my == KEY_our || isALPHA(name[1]) || (PL_hints & HINT_UTF8 && (name[1] & 0xc0) == 0xc0) || - name[1] == '_' && (int)strlen(name) > 2)) + name[1] == '_' && (int)strlen(name) > 2 )) { - if (!isPRINT(name[1])) { - name[3] = '\0'; + if (!isPRINT(name[1]) || strchr("\t\n\r\f", name[1])) { + /* 1999-02-27 mjd@plover.com */ + char *p; + p = strchr(name, '\0'); + /* The next block assumes the buffer is at least 205 chars + long. At present, it's always at least 256 chars. */ + if (p-name > 200) { + strcpy(name+200, "..."); + p = name+199; + } + else { + p[1] = '\0'; + } + /* Move everything else down one character */ + for (; p-name > 2; p--) + *p = *(p-1); name[2] = toCTRL(name[1]); name[1] = '^'; } - croak("Can't use global %s in \"my\"",name); + yyerror(Perl_form(aTHX_ "Can't use global %s in \"my\"",name)); } if (ckWARN(WARN_UNSAFE) && AvFILLp(PL_comppad_name) >= 0) { SV **svp = AvARRAY(PL_comppad_name); @@ -143,9 +152,11 @@ pad_allocmy(char *name) && (SvIVX(sv) == PAD_MAX || SvIVX(sv) == 0) && strEQ(name, SvPVX(sv))) { - warner(WARN_UNSAFE, - "\"my\" variable %s masks earlier declaration in same %s", - name, (SvIVX(sv) == PAD_MAX ? "scope" : "statement")); + Perl_warner(aTHX_ WARN_UNSAFE, + "\"%s\" variable %s masks earlier declaration in same %s", + (PL_in_my == KEY_our ? "our" : "my"), + name, + (SvIVX(sv) == PAD_MAX ? "scope" : "statement")); break; } } @@ -156,14 +167,17 @@ pad_allocmy(char *name) sv_setpv(sv, name); if (PL_in_my_stash) { if (*name != '$') - croak("Can't declare class for non-scalar %s in \"my\"",name); + yyerror(Perl_form(aTHX_ "Can't declare class for non-scalar %s in \"my\"", + name)); SvOBJECT_on(sv); (void)SvUPGRADE(sv, SVt_PVMG); SvSTASH(sv) = (HV*)SvREFCNT_inc(PL_in_my_stash); PL_sv_objcount++; } + if (PL_in_my == KEY_our) + SvFLAGS(sv) |= SVpad_OUR; av_store(PL_comppad_name, off, sv); - SvNVX(sv) = (double)PAD_MAX; + SvNVX(sv) = (NV)PAD_MAX; SvIVX(sv) = 0; /* Not yet introduced--see newSTATEOP */ if (!PL_min_intro_pending) PL_min_intro_pending = off; @@ -176,8 +190,11 @@ pad_allocmy(char *name) return off; } +#define FINDLEX_NOSEARCH 1 /* don't search outer contexts */ + STATIC PADOFFSET -pad_findlex(char *name, PADOFFSET newoff, U32 seq, CV* startcv, I32 cx_ix, I32 saweval) +S_pad_findlex(pTHX_ char *name, PADOFFSET newoff, U32 seq, CV* startcv, + I32 cx_ix, I32 saweval, U32 flags) { dTHR; CV *cv; @@ -223,9 +240,11 @@ pad_findlex(char *name, PADOFFSET newoff, U32 seq, CV* startcv, I32 cx_ix, I32 s sv_upgrade(namesv, SVt_PVNV); sv_setpv(namesv, name); av_store(PL_comppad_name, newoff, namesv); - SvNVX(namesv) = (double)PL_curcop->cop_seq; + SvNVX(namesv) = (NV)PL_curcop->cop_seq; SvIVX(namesv) = PAD_MAX; /* A ref, intro immediately */ SvFAKE_on(namesv); /* A ref, not a real var */ + if (SvFLAGS(sv) & SVpad_OUR)/* An "our" variable */ + SvFLAGS(namesv) |= SVpad_OUR; if (SvOBJECT(sv)) { /* A typed var */ SvOBJECT_on(namesv); (void)SvUPGRADE(namesv, SVt_PVMG); @@ -251,7 +270,7 @@ pad_findlex(char *name, PADOFFSET newoff, U32 seq, CV* startcv, I32 cx_ix, I32 s if (ckWARN(WARN_CLOSURE) && !CvUNIQUE(bcv) && !CvUNIQUE(cv)) { - warner(WARN_CLOSURE, + Perl_warner(aTHX_ WARN_CLOSURE, "Variable \"%s\" may be unavailable", name); } @@ -262,7 +281,7 @@ pad_findlex(char *name, PADOFFSET newoff, U32 seq, CV* startcv, I32 cx_ix, I32 s } else if (!CvUNIQUE(PL_compcv)) { if (ckWARN(WARN_CLOSURE) && !SvFAKE(sv) && !CvUNIQUE(cv)) - warner(WARN_CLOSURE, + Perl_warner(aTHX_ WARN_CLOSURE, "Variable \"%s\" will not stay shared", name); } } @@ -272,6 +291,9 @@ pad_findlex(char *name, PADOFFSET newoff, U32 seq, CV* startcv, I32 cx_ix, I32 s } } + if (flags & FINDLEX_NOSEARCH) + return 0; + /* Nothing in current lexical context--try eval's context, if any. * This is necessary to let the perldb get at lexically scoped variables. * XXX This will also probably interact badly with eval tree caching. @@ -283,7 +305,7 @@ pad_findlex(char *name, PADOFFSET newoff, U32 seq, CV* startcv, I32 cx_ix, I32 s default: if (i == 0 && saweval) { seq = cxstack[saweval].blk_oldcop->cop_seq; - return pad_findlex(name, newoff, seq, PL_main_cv, -1, saweval); + return pad_findlex(name, newoff, seq, PL_main_cv, -1, saweval, 0); } break; case CXt_EVAL: @@ -306,7 +328,7 @@ pad_findlex(char *name, PADOFFSET newoff, U32 seq, CV* startcv, I32 cx_ix, I32 s continue; } seq = cxstack[saweval].blk_oldcop->cop_seq; - return pad_findlex(name, newoff, seq, cv, i-1, saweval); + return pad_findlex(name, newoff, seq, cv, i-1, saweval,FINDLEX_NOSEARCH); } } @@ -314,7 +336,7 @@ pad_findlex(char *name, PADOFFSET newoff, U32 seq, CV* startcv, I32 cx_ix, I32 s } PADOFFSET -pad_findmy(char *name) +Perl_pad_findmy(pTHX_ char *name) { dTHR; I32 off; @@ -347,7 +369,7 @@ pad_findmy(char *name) seq > I_32(SvNVX(sv)))) && strEQ(SvPVX(sv), name)) { - if (SvIVX(sv)) + if (SvIVX(sv) || SvFLAGS(sv) & SVpad_OUR) return (PADOFFSET)off; pendoff = off; /* this pending def. will override import */ } @@ -366,7 +388,7 @@ pad_findmy(char *name) } /* See if it's in a nested scope */ - off = pad_findlex(name, 0, seq, outside, cxstack_ix, 0); + off = pad_findlex(name, 0, seq, outside, cxstack_ix, 0, 0); if (off) { /* If there is a pending local definition, this new alias must die */ if (pendoff) @@ -377,15 +399,16 @@ pad_findmy(char *name) } void -pad_leavemy(I32 fill) +Perl_pad_leavemy(pTHX_ I32 fill) { + dTHR; I32 off; SV **svp = AvARRAY(PL_comppad_name); SV *sv; if (PL_min_intro_pending && fill < PL_min_intro_pending) { for (off = PL_max_intro_pending; off >= PL_min_intro_pending; off--) { - if ((sv = svp[off]) && sv != &PL_sv_undef) - warn("%s never introduced", SvPVX(sv)); + if ((sv = svp[off]) && sv != &PL_sv_undef && ckWARN_d(WARN_INTERNAL)) + Perl_warner(aTHX_ WARN_INTERNAL, "%s never introduced", SvPVX(sv)); } } /* "Deintroduce" my variables that are leaving with this scope. */ @@ -396,14 +419,14 @@ pad_leavemy(I32 fill) } PADOFFSET -pad_alloc(I32 optype, U32 tmptype) +Perl_pad_alloc(pTHX_ I32 optype, U32 tmptype) { dTHR; SV *sv; I32 retval; if (AvARRAY(PL_comppad) != PL_curpad) - croak("panic: pad_alloc"); + Perl_croak(aTHX_ "panic: pad_alloc"); if (PL_pad_reset_pending) pad_reset(); if (tmptype & SVs_PADMY) { @@ -433,49 +456,53 @@ pad_alloc(I32 optype, U32 tmptype) SvFLAGS(sv) |= tmptype; PL_curpad = AvARRAY(PL_comppad); #ifdef USE_THREADS - DEBUG_X(PerlIO_printf(Perl_debug_log, "0x%lx Pad 0x%lx alloc %ld for %s\n", - (unsigned long) thr, (unsigned long) PL_curpad, + DEBUG_X(PerlIO_printf(Perl_debug_log, + "0x%"UVxf" Pad 0x%"UVxf" alloc %ld for %s\n", + PTR2UV(thr), PTR2UV(PL_curpad), (long) retval, PL_op_name[optype])); #else - DEBUG_X(PerlIO_printf(Perl_debug_log, "Pad 0x%lx alloc %ld for %s\n", - (unsigned long) PL_curpad, + DEBUG_X(PerlIO_printf(Perl_debug_log, + "Pad 0x%"UVxf" alloc %ld for %s\n", + PTR2UV(PL_curpad), (long) retval, PL_op_name[optype])); #endif /* USE_THREADS */ return (PADOFFSET)retval; } SV * -pad_sv(PADOFFSET po) +Perl_pad_sv(pTHX_ PADOFFSET po) { dTHR; #ifdef USE_THREADS - DEBUG_X(PerlIO_printf(Perl_debug_log, "0x%lx Pad 0x%lx sv %d\n", - (unsigned long) thr, (unsigned long) PL_curpad, po)); + DEBUG_X(PerlIO_printf(Perl_debug_log, + "0x%"UVxf" Pad 0x%"UVxf" sv %d\n", + PTR2UV(thr), PTR2UV(PL_curpad), po)); #else if (!po) - croak("panic: pad_sv po"); - DEBUG_X(PerlIO_printf(Perl_debug_log, "Pad 0x%lx sv %d\n", - (unsigned long) PL_curpad, po)); + Perl_croak(aTHX_ "panic: pad_sv po"); + DEBUG_X(PerlIO_printf(Perl_debug_log, "Pad 0x%"UVxf" sv %d\n", + PTR2UV(PL_curpad), po)); #endif /* USE_THREADS */ return PL_curpad[po]; /* eventually we'll turn this into a macro */ } void -pad_free(PADOFFSET po) +Perl_pad_free(pTHX_ PADOFFSET po) { dTHR; if (!PL_curpad) return; if (AvARRAY(PL_comppad) != PL_curpad) - croak("panic: pad_free curpad"); + Perl_croak(aTHX_ "panic: pad_free curpad"); if (!po) - croak("panic: pad_free po"); + Perl_croak(aTHX_ "panic: pad_free po"); #ifdef USE_THREADS - DEBUG_X(PerlIO_printf(Perl_debug_log, "0x%lx Pad 0x%lx free %d\n", - (unsigned long) thr, (unsigned long) PL_curpad, po)); + DEBUG_X(PerlIO_printf(Perl_debug_log, + "0x%"UVxf" Pad 0x%"UVxf" free %d\n", + PTR2UV(thr), PTR2UV(PL_curpad), po)); #else - DEBUG_X(PerlIO_printf(Perl_debug_log, "Pad 0x%lx free %d\n", - (unsigned long) PL_curpad, po)); + DEBUG_X(PerlIO_printf(Perl_debug_log, "Pad 0x%"UVxf" free %d\n", + PTR2UV(PL_curpad), po)); #endif /* USE_THREADS */ if (PL_curpad[po] && PL_curpad[po] != &PL_sv_undef) SvPADTMP_off(PL_curpad[po]); @@ -484,19 +511,20 @@ pad_free(PADOFFSET po) } void -pad_swipe(PADOFFSET po) +Perl_pad_swipe(pTHX_ PADOFFSET po) { dTHR; if (AvARRAY(PL_comppad) != PL_curpad) - croak("panic: pad_swipe curpad"); + Perl_croak(aTHX_ "panic: pad_swipe curpad"); if (!po) - croak("panic: pad_swipe po"); + Perl_croak(aTHX_ "panic: pad_swipe po"); #ifdef USE_THREADS - DEBUG_X(PerlIO_printf(Perl_debug_log, "0x%lx Pad 0x%lx swipe %d\n", - (unsigned long) thr, (unsigned long) PL_curpad, po)); + DEBUG_X(PerlIO_printf(Perl_debug_log, + "0x%"UVxf" Pad 0x%"UVxf" swipe %d\n", + PTR2UV(thr), PTR2UV(PL_curpad), po)); #else - DEBUG_X(PerlIO_printf(Perl_debug_log, "Pad 0x%lx swipe %d\n", - (unsigned long) PL_curpad, po)); + DEBUG_X(PerlIO_printf(Perl_debug_log, "Pad 0x%"UVxf" swipe %d\n", + PTR2UV(PL_curpad), po)); #endif /* USE_THREADS */ SvPADTMP_off(PL_curpad[po]); PL_curpad[po] = NEWSV(1107,0); @@ -512,20 +540,21 @@ pad_swipe(PADOFFSET po) * We avoid doing this until we can think of a Better Way. * GSAR 97-10-29 */ void -pad_reset(void) +Perl_pad_reset(pTHX) { #ifdef USE_BROKEN_PAD_RESET dTHR; register I32 po; if (AvARRAY(PL_comppad) != PL_curpad) - croak("panic: pad_reset curpad"); + Perl_croak(aTHX_ "panic: pad_reset curpad"); #ifdef USE_THREADS - DEBUG_X(PerlIO_printf(Perl_debug_log, "0x%lx Pad 0x%lx reset\n", - (unsigned long) thr, (unsigned long) PL_curpad)); + DEBUG_X(PerlIO_printf(Perl_debug_log, + "0x%"UVxf" Pad 0x%"UVxf" reset\n", + PTR2UV(thr), PTR2UV(PL_curpad))); #else - DEBUG_X(PerlIO_printf(Perl_debug_log, "Pad 0x%lx reset\n", - (unsigned long) PL_curpad)); + DEBUG_X(PerlIO_printf(Perl_debug_log, "Pad 0x%"UVxf" reset\n", + PTR2UV(PL_curpad))); #endif /* USE_THREADS */ if (!PL_tainting) { /* Can't mix tainted and non-tainted temporaries. */ for (po = AvMAX(PL_comppad); po > PL_padix_floor; po--) { @@ -541,7 +570,7 @@ pad_reset(void) #ifdef USE_THREADS /* find_threadsv is not reentrant */ PADOFFSET -find_threadsv(const char *name) +Perl_find_threadsv(pTHX_ const char *name) { dTHR; char *p; @@ -597,7 +626,7 @@ find_threadsv(const char *name) default: sv_magic(sv, 0, 0, name, 1); } - DEBUG_S(PerlIO_printf(PerlIO_stderr(), + DEBUG_S(PerlIO_printf(Perl_error_log, "find_threadsv: new SV %p for $%s%c\n", sv, (*name < 32) ? "^" : "", (*name < 32) ? toCTRL(*name) : *name)); @@ -609,55 +638,91 @@ find_threadsv(const char *name) /* Destructor */ void -op_free(OP *o) +Perl_op_free(pTHX_ OP *o) { register OP *kid, *nextkid; + OPCODE type; if (!o || o->op_seq == (U16)-1) return; + if (o->op_private & OPpREFCOUNTED) { + switch (o->op_type) { + case OP_LEAVESUB: + case OP_LEAVESUBLV: + case OP_LEAVEEVAL: + case OP_LEAVE: + case OP_SCOPE: + case OP_LEAVEWRITE: + OP_REFCNT_LOCK; + if (OpREFCNT_dec(o)) { + OP_REFCNT_UNLOCK; + return; + } + OP_REFCNT_UNLOCK; + break; + default: + break; + } + } + if (o->op_flags & OPf_KIDS) { for (kid = cUNOPo->op_first; kid; kid = nextkid) { nextkid = kid->op_sibling; /* Get before next freeing kid */ op_free(kid); } } + type = o->op_type; + if (type == OP_NULL) + type = o->op_targ; + + /* COP* is not cleared by op_clear() so that we may track line + * numbers etc even after null() */ + if (type == OP_NEXTSTATE || type == OP_SETSTATE || type == OP_DBSTATE) + cop_free((COP*)o); + + op_clear(o); +#ifdef PL_OP_SLAB_ALLOC + if ((char *) o == PL_OpPtr) + { + } +#else + Safefree(o); +#endif +} + +STATIC void +S_op_clear(pTHX_ OP *o) +{ switch (o->op_type) { - case OP_NULL: - o->op_targ = 0; /* Was holding old type, if any. */ - break; - case OP_ENTEREVAL: - o->op_targ = 0; /* Was holding hints. */ + case OP_NULL: /* Was holding old type, if any. */ + case OP_ENTEREVAL: /* Was holding hints. */ +#ifdef USE_THREADS + case OP_THREADSV: /* Was holding index into thr->threadsv AV. */ +#endif + o->op_targ = 0; break; #ifdef USE_THREADS case OP_ENTERITER: if (!(o->op_flags & OPf_SPECIAL)) break; /* FALL THROUGH */ - case OP_THREADSV: - o->op_targ = 0; /* Was holding index into thr->threadsv AV. */ - break; #endif /* USE_THREADS */ default: if (!(o->op_flags & OPf_REF) - || (PL_check[o->op_type] != FUNC_NAME_TO_PTR(ck_ftst))) + || (PL_check[o->op_type] != MEMBER_TO_FPTR(Perl_ck_ftst))) break; /* FALL THROUGH */ case OP_GVSV: case OP_GV: case OP_AELEMFAST: - SvREFCNT_dec(cGVOPo->op_gv); - break; - case OP_NEXTSTATE: - case OP_DBSTATE: - Safefree(cCOPo->cop_label); - SvREFCNT_dec(cCOPo->cop_filegv); - if (cCOPo->cop_warnings != WARN_NONE && cCOPo->cop_warnings != WARN_ALL) - SvREFCNT_dec(cCOPo->cop_warnings); + SvREFCNT_dec(cSVOPo->op_sv); + cSVOPo->op_sv = Nullsv; break; case OP_CONST: SvREFCNT_dec(cSVOPo->op_sv); + cSVOPo->op_sv = Nullsv; break; case OP_GOTO: case OP_NEXT: @@ -667,32 +732,46 @@ op_free(OP *o) break; /* FALL THROUGH */ case OP_TRANS: - if (o->op_private & (OPpTRANS_FROM_UTF|OPpTRANS_TO_UTF)) + if (o->op_private & (OPpTRANS_FROM_UTF|OPpTRANS_TO_UTF)) { SvREFCNT_dec(cSVOPo->op_sv); - else + cSVOPo->op_sv = Nullsv; + } + else { Safefree(cPVOPo->op_pv); + cPVOPo->op_pv = Nullch; + } break; case OP_SUBST: op_free(cPMOPo->op_pmreplroot); + cPMOPo->op_pmreplroot = Nullop; /* FALL THROUGH */ case OP_PUSHRE: case OP_MATCH: case OP_QR: ReREFCNT_dec(cPMOPo->op_pmregexp); + cPMOPo->op_pmregexp = (REGEXP*)NULL; break; } if (o->op_targ > 0) pad_free(o->op_targ); +} - Safefree(o); +STATIC void +S_cop_free(pTHX_ COP* cop) +{ + Safefree(cop->cop_label); + SvREFCNT_dec(CopFILEGV(cop)); + if (! specialWARN(cop->cop_warnings)) + SvREFCNT_dec(cop->cop_warnings); } STATIC void -null(OP *o) +S_null(pTHX_ OP *o) { - if (o->op_type != OP_NULL && o->op_type != OP_THREADSV && o->op_targ > 0) - pad_free(o->op_targ); + if (o->op_type == OP_NULL) + return; + op_clear(o); o->op_targ = o->op_type; o->op_type = OP_NULL; o->op_ppaddr = PL_ppaddr[OP_NULL]; @@ -703,7 +782,7 @@ null(OP *o) #define LINKLIST(o) ((o)->op_next ? (o)->op_next : linklist((OP*)o)) OP * -linklist(OP *o) +Perl_linklist(pTHX_ OP *o) { register OP *kid; @@ -727,7 +806,7 @@ linklist(OP *o) } OP * -scalarkids(OP *o) +Perl_scalarkids(pTHX_ OP *o) { OP *kid; if (o && o->op_flags & OPf_KIDS) { @@ -738,7 +817,7 @@ scalarkids(OP *o) } STATIC OP * -scalarboolean(OP *o) +S_scalarboolean(pTHX_ OP *o) { if (o->op_type == OP_SASSIGN && cBINOPo->op_first->op_type == OP_CONST) { dTHR; @@ -747,7 +826,7 @@ scalarboolean(OP *o) if (PL_copline != NOLINE) PL_curcop->cop_line = PL_copline; - warner(WARN_SYNTAX, "Found = in conditional, should be =="); + Perl_warner(aTHX_ WARN_SYNTAX, "Found = in conditional, should be =="); PL_curcop->cop_line = oldline; } } @@ -755,7 +834,7 @@ scalarboolean(OP *o) } OP * -scalar(OP *o) +Perl_scalar(pTHX_ OP *o) { OP *kid; @@ -764,6 +843,10 @@ scalar(OP *o) || o->op_type == OP_RETURN) return o; + if ((o->op_private & OPpTARGET_MY) + && (PL_opargs[o->op_type] & OA_TARGLEX)) /* OPp share the meaning */ + return scalar(o); /* As if inside SASSIGN */ + o->op_flags = (o->op_flags & ~OPf_WANT) | OPf_WANT_SCALAR; switch (o->op_type) { @@ -822,18 +905,34 @@ scalar(OP *o) } OP * -scalarvoid(OP *o) +Perl_scalarvoid(pTHX_ OP *o) { OP *kid; char* useless = 0; SV* sv; + U8 want; + + if (o->op_type == OP_NEXTSTATE + || o->op_type == OP_SETSTATE + || o->op_type == OP_DBSTATE + || (o->op_type == OP_NULL && (o->op_targ == OP_NEXTSTATE + || o->op_targ == OP_SETSTATE + || o->op_targ == OP_DBSTATE))) + { + dTHR; + PL_curcop = (COP*)o; /* for warning below */ + } /* assumes no premature commitment */ - U8 want = o->op_flags & OPf_WANT; - if (!o || (want && want != OPf_WANT_SCALAR) || PL_error_count + want = o->op_flags & OPf_WANT; + if ((want && want != OPf_WANT_SCALAR) || PL_error_count || o->op_type == OP_RETURN) return o; + if ((o->op_private & OPpTARGET_MY) + && (PL_opargs[o->op_type] & OA_TARGLEX)) /* OPp share the meaning */ + return scalar(o); /* As if inside SASSIGN */ + o->op_flags = (o->op_flags & ~OPf_WANT) | OPf_WANT_VOID; switch (o->op_type) { @@ -930,14 +1029,11 @@ scalarvoid(OP *o) useless = "a variable"; break; - case OP_NEXTSTATE: - case OP_DBSTATE: - WITH_THR(PL_curcop = ((COP*)o)); /* for warning below */ - break; - case OP_CONST: sv = cSVOPo->op_sv; - { + if (cSVOPo->op_private & OPpCONST_STRICT) + no_bareword_allowed(o); + else { dTHR; if (ckWARN(WARN_VOID)) { useless = "a constant"; @@ -951,8 +1047,7 @@ scalarvoid(OP *o) } } } - null(o); /* don't execute a constant */ - SvREFCNT_dec(sv); /* don't even remember it */ + null(o); /* don't execute or even remember it */ break; case OP_POSTINC: @@ -973,11 +1068,11 @@ scalarvoid(OP *o) break; case OP_NULL: - if (o->op_targ == OP_NEXTSTATE || o->op_targ == OP_DBSTATE) - WITH_THR(PL_curcop = ((COP*)o)); /* for warning below */ if (o->op_flags & OPf_STACKED) break; /* FALL THROUGH */ + case OP_NEXTSTATE: + case OP_DBSTATE: case OP_ENTERTRY: case OP_ENTER: case OP_SCALAR: @@ -1010,13 +1105,13 @@ scalarvoid(OP *o) if (useless) { dTHR; if (ckWARN(WARN_VOID)) - warner(WARN_VOID, "Useless use of %s in void context", useless); + Perl_warner(aTHX_ WARN_VOID, "Useless use of %s in void context", useless); } return o; } OP * -listkids(OP *o) +Perl_listkids(pTHX_ OP *o) { OP *kid; if (o && o->op_flags & OPf_KIDS) { @@ -1027,7 +1122,7 @@ listkids(OP *o) } OP * -list(OP *o) +Perl_list(pTHX_ OP *o) { OP *kid; @@ -1036,6 +1131,10 @@ list(OP *o) || o->op_type == OP_RETURN) return o; + if ((o->op_private & OPpTARGET_MY) + && (PL_opargs[o->op_type] & OA_TARGLEX)) /* OPp share the meaning */ + return o; /* As if inside SASSIGN */ + o->op_flags = (o->op_flags & ~OPf_WANT) | OPf_WANT_LIST; switch (o->op_type) { @@ -1094,7 +1193,7 @@ list(OP *o) } OP * -scalarseq(OP *o) +Perl_scalarseq(pTHX_ OP *o) { OP *kid; @@ -1122,7 +1221,7 @@ scalarseq(OP *o) } STATIC OP * -modkids(OP *o, I32 type) +S_modkids(pTHX_ OP *o, I32 type) { OP *kid; if (o && o->op_flags & OPf_KIDS) { @@ -1133,7 +1232,7 @@ modkids(OP *o, I32 type) } OP * -mod(OP *o, I32 type) +Perl_mod(pTHX_ OP *o, I32 type) { dTHR; OP *kid; @@ -1143,6 +1242,10 @@ mod(OP *o, I32 type) if (!o || PL_error_count) return o; + if ((o->op_private & OPpTARGET_MY) + && (PL_opargs[o->op_type] & OA_TARGLEX)) /* OPp share the meaning */ + return o; + switch (o->op_type) { case OP_UNDEF: PL_modcount++; @@ -1161,7 +1264,7 @@ mod(OP *o, I32 type) else if (type == OP_REFGEN) goto nomod; else - croak("That use of $[ is unsupported"); + Perl_croak(aTHX_ "That use of $[ is unsupported"); break; case OP_STUB: if (o->op_flags & OPf_PARENS) @@ -1176,15 +1279,103 @@ mod(OP *o, I32 type) null(((LISTOP*)cUNOPo->op_first)->op_first);/* disable pushmark */ break; } + else { /* lvalue subroutine call */ + o->op_private |= OPpLVAL_INTRO; + if (type == OP_GREPSTART || type == OP_ENTERSUB) { + /* Backward compatibility mode: */ + o->op_private |= OPpENTERSUB_INARGS; + break; + } + else { /* Compile-time error message: */ + OP *kid = cUNOPo->op_first; + CV *cv; + OP *okid; + + if (kid->op_type == OP_PUSHMARK) + goto skip_kids; + if (kid->op_type != OP_NULL || kid->op_targ != OP_LIST) + Perl_croak(aTHX_ + "panic: unexpected lvalue entersub " + "args: type/targ %ld:%ld", + (long)kid->op_type,kid->op_targ); + kid = kLISTOP->op_first; + skip_kids: + while (kid->op_sibling) + kid = kid->op_sibling; + if (!(kid->op_type == OP_NULL && kid->op_targ == OP_RV2CV)) { + /* Indirect call */ + if (kid->op_type == OP_METHOD_NAMED + || kid->op_type == OP_METHOD) + { + OP *newop; + + if (kid->op_sibling || kid->op_next != kid) { + yyerror("panic: unexpected optree near method call"); + break; + } + + NewOp(1101, newop, 1, OP); + newop->op_type = OP_RV2CV; + newop->op_ppaddr = PL_ppaddr[OP_RV2CV]; + newop->op_next = newop; + kid->op_sibling = newop; + newop->op_private |= OPpLVAL_INTRO; + break; + } + + if (kid->op_type != OP_RV2CV) + Perl_croak(aTHX_ + "panic: unexpected lvalue entersub " + "entry via type/targ %ld:%ld", + (long)kid->op_type,kid->op_targ); + kid->op_private |= OPpLVAL_INTRO; + break; /* Postpone until runtime */ + } + + okid = kid; + kid = kUNOP->op_first; + if (kid->op_type == OP_NULL && kid->op_targ == OP_RV2SV) + kid = kUNOP->op_first; + if (kid->op_type == OP_NULL) + Perl_croak(aTHX_ + "Unexpected constant lvalue entersub " + "entry via type/targ %ld:%ld", + (long)kid->op_type,kid->op_targ); + if (kid->op_type != OP_GV) { + /* Restore RV2CV to check lvalueness */ + restore_2cv: + if (kid->op_next && kid->op_next != kid) { /* Happens? */ + okid->op_next = kid->op_next; + kid->op_next = okid; + } + else + okid->op_next = Nullop; + okid->op_type = OP_RV2CV; + okid->op_targ = 0; + okid->op_ppaddr = PL_ppaddr[OP_RV2CV]; + okid->op_private |= OPpLVAL_INTRO; + break; + } + + cv = GvCV((GV*)kSVOP->op_sv); + if (!cv) + goto restore_2cv; + if (CvLVALUE(cv)) + break; + } + } /* FALL THROUGH */ default: nomod: /* grep, foreach, subcalls, refgen */ if (type == OP_GREPSTART || type == OP_ENTERSUB || type == OP_REFGEN) break; - yyerror(form("Can't modify %s in %s", + yyerror(Perl_form(aTHX_ "Can't modify %s in %s", (o->op_type == OP_NULL && (o->op_flags & OPf_SPECIAL) - ? "do block" : PL_op_desc[o->op_type]), + ? "do block" + : (o->op_type == OP_ENTERSUB + ? "non-lvalue subroutine call" + : PL_op_desc[o->op_type])), type ? PL_op_desc[type] : "local")); return o; @@ -1221,7 +1412,7 @@ mod(OP *o, I32 type) case OP_RV2AV: case OP_RV2HV: if (!type && cUNOPo->op_first->op_type != OP_GV) - croak("Can't localize through a reference"); + Perl_croak(aTHX_ "Can't localize through a reference"); if (type == OP_REFGEN && o->op_flags & OPf_PARENS) { PL_modcount = 10000; return o; /* Treat \(@foo) like ordinary list. */ @@ -1243,7 +1434,7 @@ mod(OP *o, I32 type) break; case OP_RV2SV: if (!type && cUNOPo->op_first->op_type != OP_GV) - croak("Can't localize through a reference"); + Perl_croak(aTHX_ "Can't localize through a reference"); ref(cUNOPo->op_first, o->op_type); /* FALL THROUGH */ case OP_GV: @@ -1267,7 +1458,7 @@ mod(OP *o, I32 type) case OP_PADSV: PL_modcount++; if (!type) - croak("Can't localize lexical variable %s", + Perl_croak(aTHX_ "Can't localize lexical variable %s", SvPV(*av_fetch(PL_comppad_name, o->op_targ, 4), n_a)); break; @@ -1343,8 +1534,8 @@ mod(OP *o, I32 type) return o; } -static bool -scalar_mod_type(OP *o, I32 type) +STATIC bool +S_scalar_mod_type(pTHX_ OP *o, I32 type) { switch (type) { case OP_SASSIGN: @@ -1391,7 +1582,7 @@ scalar_mod_type(OP *o, I32 type) } STATIC bool -is_handle_constructor(OP *o, I32 argnum) +S_is_handle_constructor(pTHX_ OP *o, I32 argnum) { switch (o->op_type) { case OP_PIPE_OP: @@ -1414,7 +1605,7 @@ is_handle_constructor(OP *o, I32 argnum) } OP * -refkids(OP *o, I32 type) +Perl_refkids(pTHX_ OP *o, I32 type) { OP *kid; if (o && o->op_flags & OPf_KIDS) { @@ -1425,7 +1616,7 @@ refkids(OP *o, I32 type) } OP * -ref(OP *o, I32 type) +Perl_ref(pTHX_ OP *o, I32 type) { OP *kid; @@ -1513,8 +1704,60 @@ ref(OP *o, I32 type) } -OP * -my(OP *o) +STATIC OP * +S_dup_attrlist(pTHX_ OP *o) +{ + OP *rop = Nullop; + + /* An attrlist is either a simple OP_CONST or an OP_LIST with kids, + * where the first kid is OP_PUSHMARK and the remaining ones + * are OP_CONST. We need to push the OP_CONST values. + */ + if (o->op_type == OP_CONST) + rop = newSVOP(OP_CONST, o->op_flags, SvREFCNT_inc(cSVOPo->op_sv)); + else { + assert((o->op_type == OP_LIST) && (o->op_flags & OPf_KIDS)); + for (o = cLISTOPo->op_first; o; o=o->op_sibling) { + if (o->op_type == OP_CONST) + rop = append_elem(OP_LIST, rop, + newSVOP(OP_CONST, o->op_flags, + SvREFCNT_inc(cSVOPo->op_sv))); + } + } + return rop; +} + +STATIC void +S_apply_attrs(pTHX_ HV *stash, SV *target, OP *attrs) +{ + OP *modname; /* for 'use' */ + SV *stashsv; + + /* fake up C */ + ENTER; /* need to protect against side-effects of 'use' */ + SAVEINT(PL_expect); + if (stash && HvNAME(stash)) + stashsv = newSVpv(HvNAME(stash), 0); + else + stashsv = &PL_sv_no; +#define ATTRSMODULE "attributes" + modname = newSVOP(OP_CONST, 0, + newSVpvn(ATTRSMODULE, sizeof(ATTRSMODULE)-1)); + modname->op_private |= OPpCONST_BARE; + /* that flag is required to make 'use' work right */ + utilize(1, start_subparse(FALSE, 0), + Nullop, /* version */ + modname, + prepend_elem(OP_LIST, + newSVOP(OP_CONST, 0, stashsv), + prepend_elem(OP_LIST, + newSVOP(OP_CONST, 0, newRV(target)), + dup_attrlist(attrs)))); + LEAVE; +} + +STATIC OP * +S_my_kid(pTHX_ OP *o, OP *attrs) { OP *kid; I32 type; @@ -1525,24 +1768,60 @@ my(OP *o) type = o->op_type; if (type == OP_LIST) { for (kid = cLISTOPo->op_first; kid; kid = kid->op_sibling) - my(kid); + my_kid(kid, attrs); } else if (type == OP_UNDEF) { return o; + } else if (type == OP_RV2SV || /* "our" declaration */ + type == OP_RV2AV || + type == OP_RV2HV) { /* XXX does this let anything illegal in? */ + return o; } else if (type != OP_PADSV && type != OP_PADAV && type != OP_PADHV && type != OP_PUSHMARK) { - yyerror(form("Can't declare %s in my", PL_op_desc[o->op_type])); + yyerror(Perl_form(aTHX_ "Can't declare %s in my", PL_op_desc[o->op_type])); return o; } + else if (attrs && type != OP_PUSHMARK) { + HV *stash; + SV *padsv; + SV **namesvp; + + /* check for C when deciding package */ + namesvp = av_fetch(PL_comppad_name, o->op_targ, FALSE); + if (namesvp && *namesvp && SvOBJECT(*namesvp) && HvNAME(SvSTASH(*namesvp))) + stash = SvSTASH(*namesvp); + else + stash = PL_curstash; + padsv = PAD_SV(o->op_targ); + apply_attrs(stash, padsv, attrs); + } o->op_flags |= OPf_MOD; o->op_private |= OPpLVAL_INTRO; return o; } OP * -sawparens(OP *o) +Perl_my_attrs(pTHX_ OP *o, OP *attrs) +{ + if (o->op_flags & OPf_PARENS) + list(o); + PL_in_my = FALSE; + PL_in_my_stash = Nullhv; + if (attrs) + SAVEFREEOP(attrs); + return my_kid(o, attrs); +} + +OP * +Perl_my(pTHX_ OP *o) +{ + return my_kid(o, Nullop); +} + +OP * +Perl_sawparens(pTHX_ OP *o) { if (o) o->op_flags |= OPf_PARENS; @@ -1550,7 +1829,7 @@ sawparens(OP *o) } OP * -bind_match(I32 type, OP *left, OP *right) +Perl_bind_match(pTHX_ I32 type, OP *left, OP *right) { dTHR; OP *o; @@ -1563,10 +1842,10 @@ bind_match(I32 type, OP *left, OP *right) char *desc = PL_op_desc[(right->op_type == OP_SUBST || right->op_type == OP_TRANS) ? right->op_type : OP_MATCH]; - char *sample = ((left->op_type == OP_RV2AV || - left->op_type == OP_PADAV) - ? "@array" : "%hash"); - warner(WARN_UNSAFE, + const char *sample = ((left->op_type == OP_RV2AV || + left->op_type == OP_PADAV) + ? "@array" : "%hash"); + Perl_warner(aTHX_ WARN_UNSAFE, "Applying %s to %s will act on scalar(%s)", desc, sample, sample); } @@ -1591,7 +1870,7 @@ bind_match(I32 type, OP *left, OP *right) } OP * -invert(OP *o) +Perl_invert(pTHX_ OP *o) { if (!o) return o; @@ -1600,7 +1879,7 @@ invert(OP *o) } OP * -scope(OP *o) +Perl_scope(pTHX_ OP *o) { if (o) { if (o->op_flags & OPf_PARENS || PERLDB_NOOPT || PL_tainting) { @@ -1614,10 +1893,8 @@ scope(OP *o) o->op_type = OP_SCOPE; o->op_ppaddr = PL_ppaddr[OP_SCOPE]; kid = ((LISTOP*)o)->op_first; - if (kid->op_type == OP_NEXTSTATE || kid->op_type == OP_DBSTATE){ - SvREFCNT_dec(((COP*)kid)->cop_filegv); + if (kid->op_type == OP_NEXTSTATE || kid->op_type == OP_DBSTATE) null(kid); - } } else o = newLISTOP(OP_SCOPE, 0, o, Nullop); @@ -1627,7 +1904,7 @@ scope(OP *o) } void -save_hints(void) +Perl_save_hints(pTHX) { SAVEI32(PL_hints); SAVESPTR(GvHV(PL_hintgv)); @@ -1636,7 +1913,7 @@ save_hints(void) } int -block_start(int full) +Perl_block_start(pTHX_ int full) { dTHR; int retval = PL_savestack_ix; @@ -1658,8 +1935,7 @@ block_start(int full) SAVEHINTS(); PL_hints &= ~HINT_BLOCK_SCOPE; SAVEPPTR(PL_compiling.cop_warnings); - if (PL_compiling.cop_warnings != WARN_ALL && - PL_compiling.cop_warnings != WARN_NONE) { + if (! specialWARN(PL_compiling.cop_warnings)) { PL_compiling.cop_warnings = newSVsv(PL_compiling.cop_warnings) ; SAVEFREESV(PL_compiling.cop_warnings) ; } @@ -1669,7 +1945,7 @@ block_start(int full) } OP* -block_end(I32 floor, OP *seq) +Perl_block_end(pTHX_ I32 floor, OP *seq) { dTHR; int needblockscope = PL_hints & HINT_BLOCK_SCOPE; @@ -1685,7 +1961,7 @@ block_end(I32 floor, OP *seq) } STATIC OP * -newDEFSVOP(void) +S_newDEFSVOP(pTHX) { #ifdef USE_THREADS OP *o = newOP(OP_THREADSV, 0); @@ -1697,12 +1973,18 @@ newDEFSVOP(void) } void -newPROG(OP *o) +Perl_newPROG(pTHX_ OP *o) { dTHR; if (PL_in_eval) { - PL_eval_root = newUNOP(OP_LEAVEEVAL, ((PL_in_eval & 4) ? OPf_SPECIAL : 0), o); + if (PL_eval_root) + return; + PL_eval_root = newUNOP(OP_LEAVEEVAL, + ((PL_in_eval & EVAL_KEEPERR) + ? OPf_SPECIAL : 0), o); PL_eval_start = linklist(PL_eval_root); + PL_eval_root->op_private |= OPpREFCOUNTED; + OpREFCNT_set(PL_eval_root, 1); PL_eval_root->op_next = 0; peep(PL_eval_start); } @@ -1712,26 +1994,28 @@ newPROG(OP *o) PL_main_root = scope(sawparens(scalarvoid(o))); PL_curcop = &PL_compiling; PL_main_start = LINKLIST(PL_main_root); + PL_main_root->op_private |= OPpREFCOUNTED; + OpREFCNT_set(PL_main_root, 1); PL_main_root->op_next = 0; peep(PL_main_start); PL_compcv = 0; /* Register with debugger */ if (PERLDB_INTER) { - CV *cv = perl_get_cv("DB::postponed", FALSE); + CV *cv = get_cv("DB::postponed", FALSE); if (cv) { dSP; PUSHMARK(SP); - XPUSHs((SV*)PL_compiling.cop_filegv); + XPUSHs((SV*)CopFILEGV(&PL_compiling)); PUTBACK; - perl_call_sv((SV*)cv, G_DISCARD); + call_sv((SV*)cv, G_DISCARD); } } } } OP * -localize(OP *o, I32 lex) +Perl_localize(pTHX_ OP *o, I32 lex) { if (o->op_flags & OPf_PARENS) list(o); @@ -1741,7 +2025,7 @@ localize(OP *o, I32 lex) char *s; for (s = PL_bufptr; *s && (isALNUM(*s) || (*s & 0x80) || strchr("@$%, ",*s)); s++) ; if (*s == ';' || *s == '=') - warner(WARN_PARENTHESIS, "Parentheses missing around \"%s\" list", + Perl_warner(aTHX_ WARN_PARENTHESIS, "Parentheses missing around \"%s\" list", lex ? "my" : "local"); } } @@ -1754,7 +2038,7 @@ localize(OP *o, I32 lex) } OP * -jmaybe(OP *o) +Perl_jmaybe(pTHX_ OP *o) { if (o->op_type == OP_LIST) { OP *o2; @@ -1770,7 +2054,7 @@ jmaybe(OP *o) } OP * -fold_constants(register OP *o) +Perl_fold_constants(pTHX_ register OP *o) { dTHR; register OP *curop; @@ -1779,16 +2063,26 @@ fold_constants(register OP *o) if (PL_opargs[type] & OA_RETSCALAR) scalar(o); - if (PL_opargs[type] & OA_TARGET) + if (PL_opargs[type] & OA_TARGET && !o->op_targ) o->op_targ = pad_alloc(type, SVs_PADTMP); - if ((PL_opargs[type] & OA_OTHERINT) && (PL_hints & HINT_INTEGER)) + /* integerize op, unless it happens to be C<-foo>. + * XXX should pp_i_negate() do magic string negation instead? */ + if ((PL_opargs[type] & OA_OTHERINT) && (PL_hints & HINT_INTEGER) + && !(type == OP_NEGATE && cUNOPo->op_first->op_type == OP_CONST + && (cUNOPo->op_first->op_private & OPpCONST_BARE))) + { o->op_ppaddr = PL_ppaddr[type = ++(o->op_type)]; + } if (!(PL_opargs[type] & OA_FOLDCONST)) goto nope; switch (type) { + case OP_NEGATE: + /* XXX might want a ck_negate() for this */ + cUNOPo->op_first->op_private &= ~OPpCONST_STRICT; + break; case OP_SPRINTF: case OP_UCFIRST: case OP_LCFIRST: @@ -1808,11 +2102,13 @@ fold_constants(register OP *o) goto nope; /* Don't try to run w/ errors */ for (curop = LINKLIST(o); curop != o; curop = LINKLIST(curop)) { - if (curop->op_type != OP_CONST && - curop->op_type != OP_LIST && - curop->op_type != OP_SCALAR && - curop->op_type != OP_NULL && - curop->op_type != OP_PUSHMARK) { + if ((curop->op_type != OP_CONST || + (curop->op_private & OPpCONST_BARE)) && + curop->op_type != OP_LIST && + curop->op_type != OP_SCALAR && + curop->op_type != OP_NULL && + curop->op_type != OP_PUSHMARK) + { goto nope; } } @@ -1820,7 +2116,7 @@ fold_constants(register OP *o) curop = LINKLIST(o); o->op_next = 0; PL_op = curop; - CALLRUNOPS(); + CALLRUNOPS(aTHX); sv = *(PL_stack_sp--); if (o->op_targ && sv == PAD_SV(o->op_targ)) /* grab pad temp? */ pad_swipe(o->op_targ); @@ -1837,7 +2133,7 @@ fold_constants(register OP *o) type != OP_NEGATE) { IV iv = SvIV(sv); - if ((double)iv == SvNV(sv)) { + if ((NV)iv == SvNV(sv)) { SvREFCNT_dec(sv); sv = newSViv(iv); } @@ -1852,8 +2148,12 @@ fold_constants(register OP *o) return o; if (!(PL_hints & HINT_INTEGER)) { - if (type == OP_DIVIDE || !(o->op_flags & OPf_KIDS)) + if (type == OP_MODULO + || type == OP_DIVIDE + || !(o->op_flags & OPf_KIDS)) + { return o; + } for (curop = ((UNOP*)o)->op_first; curop; curop = curop->op_sibling) { if (curop->op_type == OP_CONST) { @@ -1872,7 +2172,7 @@ fold_constants(register OP *o) } OP * -gen_constant_list(register OP *o) +Perl_gen_constant_list(pTHX_ register OP *o) { dTHR; register OP *curop; @@ -1884,10 +2184,10 @@ gen_constant_list(register OP *o) PL_op = curop = LINKLIST(o); o->op_next = 0; - pp_pushmark(ARGS); - CALLRUNOPS(); + pp_pushmark(); + CALLRUNOPS(aTHX); PL_op = curop; - pp_anonlist(ARGS); + pp_anonlist(); PL_tmps_floor = oldtmps_floor; o->op_type = OP_RV2AV; @@ -1900,7 +2200,7 @@ gen_constant_list(register OP *o) } OP * -convert(I32 type, I32 flags, OP *o) +Perl_convert(pTHX_ I32 type, I32 flags, OP *o) { OP *kid; OP *last = 0; @@ -1934,7 +2234,7 @@ convert(I32 type, I32 flags, OP *o) /* List constructors */ OP * -append_elem(I32 type, OP *first, OP *last) +Perl_append_elem(pTHX_ I32 type, OP *first, OP *last) { if (!first) return last; @@ -1957,7 +2257,7 @@ append_elem(I32 type, OP *first, OP *last) } OP * -append_list(I32 type, LISTOP *first, LISTOP *last) +Perl_append_list(pTHX_ I32 type, LISTOP *first, LISTOP *last) { if (!first) return (OP*)last; @@ -1976,13 +2276,16 @@ append_list(I32 type, LISTOP *first, LISTOP *last) first->op_children += last->op_children; if (first->op_children) first->op_flags |= OPf_KIDS; - - Safefree(last); + +#ifdef PL_OP_SLAB_ALLOC +#else + Safefree(last); +#endif return (OP*)first; } OP * -prepend_elem(I32 type, OP *first, OP *last) +Perl_prepend_elem(pTHX_ I32 type, OP *first, OP *last) { if (!first) return last; @@ -2013,13 +2316,13 @@ prepend_elem(I32 type, OP *first, OP *last) /* Constructors */ OP * -newNULLLIST(void) +Perl_newNULLLIST(pTHX) { return newOP(OP_STUB, 0); } OP * -force_list(OP *o) +Perl_force_list(pTHX_ OP *o) { if (!o || o->op_type != OP_LIST) o = newLISTOP(OP_LIST, 0, o, Nullop); @@ -2028,11 +2331,11 @@ force_list(OP *o) } OP * -newLISTOP(I32 type, I32 flags, OP *first, OP *last) +Perl_newLISTOP(pTHX_ I32 type, I32 flags, OP *first, OP *last) { LISTOP *listop; - Newz(1101, listop, 1, LISTOP); + NewOp(1101, listop, 1, LISTOP); listop->op_type = type; listop->op_ppaddr = PL_ppaddr[type]; @@ -2063,10 +2366,10 @@ newLISTOP(I32 type, I32 flags, OP *first, OP *last) } OP * -newOP(I32 type, I32 flags) +Perl_newOP(pTHX_ I32 type, I32 flags) { OP *o; - Newz(1101, o, 1, OP); + NewOp(1101, o, 1, OP); o->op_type = type; o->op_ppaddr = PL_ppaddr[type]; o->op_flags = flags; @@ -2081,7 +2384,7 @@ newOP(I32 type, I32 flags) } OP * -newUNOP(I32 type, I32 flags, OP *first) +Perl_newUNOP(pTHX_ I32 type, I32 flags, OP *first) { UNOP *unop; @@ -2090,7 +2393,7 @@ newUNOP(I32 type, I32 flags, OP *first) if (PL_opargs[type] & OA_MARK) first = force_list(first); - Newz(1101, unop, 1, UNOP); + NewOp(1101, unop, 1, UNOP); unop->op_type = type; unop->op_ppaddr = PL_ppaddr[type]; unop->op_first = first; @@ -2104,10 +2407,10 @@ newUNOP(I32 type, I32 flags, OP *first) } OP * -newBINOP(I32 type, I32 flags, OP *first, OP *last) +Perl_newBINOP(pTHX_ I32 type, I32 flags, OP *first, OP *last) { BINOP *binop; - Newz(1101, binop, 1, BINOP); + NewOp(1101, binop, 1, BINOP); if (!first) first = newOP(OP_NULL, 0); @@ -2126,7 +2429,7 @@ newBINOP(I32 type, I32 flags, OP *first, OP *last) } binop = (BINOP*)CHECKOP(type, binop); - if (binop->op_next) + if (binop->op_next || binop->op_type != type) return (OP*)binop; binop->op_last = binop->op_first->op_sibling; @@ -2148,7 +2451,7 @@ utf8compare(const void *a, const void *b) } OP * -pmtrans(OP *o, OP *expr, OP *repl) +Perl_pmtrans(pTHX_ OP *o, OP *expr, OP *repl) { SV *tstr = ((SVOP*)expr)->op_sv; SV *rstr = ((SVOP*)repl)->op_sv; @@ -2168,7 +2471,7 @@ pmtrans(OP *o, OP *expr, OP *repl) squash = o->op_private & OPpTRANS_SQUASH; if (o->op_private & (OPpTRANS_FROM_UTF|OPpTRANS_TO_UTF)) { - SV* listsv = newSVpv("# comment\n",0); + SV* listsv = newSVpvn("# comment\n",10); SV* transv = 0; U8* tend = t + tlen; U8* rend = r + rlen; @@ -2196,7 +2499,7 @@ pmtrans(OP *o, OP *expr, OP *repl) UV nextmin = 0; New(1109, cp, tlen, U8*); i = 0; - transv = newSVpv("",0); + transv = newSVpvn("",0); while (t < tend) { cp[i++] = t; t += UTF8SKIP(t); @@ -2293,15 +2596,15 @@ pmtrans(OP *o, OP *expr, OP *repl) if (rfirst == 0xffffffff) { diff = tdiff; /* oops, pretend rdiff is infinite */ if (diff > 0) - sv_catpvf(listsv, "%04x\t%04x\tXXXX\n", tfirst, tlast); + Perl_sv_catpvf(aTHX_ listsv, "%04x\t%04x\tXXXX\n", tfirst, tlast); else - sv_catpvf(listsv, "%04x\t\tXXXX\n", tfirst); + Perl_sv_catpvf(aTHX_ listsv, "%04x\t\tXXXX\n", tfirst); } else { if (diff > 0) - sv_catpvf(listsv, "%04x\t%04x\t%04x\n", tfirst, tfirst + diff, rfirst); + Perl_sv_catpvf(aTHX_ listsv, "%04x\t%04x\t%04x\n", tfirst, tfirst + diff, rfirst); else - sv_catpvf(listsv, "%04x\t\t%04x\n", tfirst, rfirst); + Perl_sv_catpvf(aTHX_ listsv, "%04x\t\t%04x\n", tfirst, rfirst); if (rfirst + diff > max) max = rfirst + diff; @@ -2399,12 +2702,12 @@ pmtrans(OP *o, OP *expr, OP *repl) } OP * -newPMOP(I32 type, I32 flags) +Perl_newPMOP(pTHX_ I32 type, I32 flags) { dTHR; PMOP *pmop; - Newz(1101, pmop, 1, PMOP); + NewOp(1101, pmop, 1, PMOP); pmop->op_type = type; pmop->op_ppaddr = PL_ppaddr[type]; pmop->op_flags = flags; @@ -2426,7 +2729,7 @@ newPMOP(I32 type, I32 flags) } OP * -pmruntime(OP *o, OP *expr, OP *repl) +Perl_pmruntime(pTHX_ OP *o, OP *expr, OP *repl) { dTHR; PMOP *pm; @@ -2448,7 +2751,7 @@ pmruntime(OP *o, OP *expr, OP *repl) p = SvPV(pat, plen); pm->op_pmflags |= PMf_SKIPWHITE; } - pm->op_pmregexp = CALLREGCOMP(p, p + plen, pm); + pm->op_pmregexp = CALLREGCOMP(aTHX_ p, p + plen, pm); if (strEQ("\\s+", pm->op_pmregexp->precomp)) pm->op_pmflags |= PMf_WHITE; op_free(expr); @@ -2459,7 +2762,7 @@ pmruntime(OP *o, OP *expr, OP *repl) ? OP_REGCRESET : OP_REGCMAYBE),0,expr); - Newz(1101, rcop, 1, LOGOP); + NewOp(1101, rcop, 1, LOGOP); rcop->op_type = OP_REGCOMP; rcop->op_ppaddr = PL_ppaddr[OP_REGCOMP]; rcop->op_first = scalar(expr); @@ -2485,8 +2788,11 @@ pmruntime(OP *o, OP *expr, OP *repl) if (repl) { OP *curop; - if (pm->op_pmflags & PMf_EVAL) + if (pm->op_pmflags & PMf_EVAL) { curop = 0; + if (PL_curcop->cop_line < PL_multi_end) + PL_curcop->cop_line = PL_multi_end; + } #ifdef USE_THREADS else if (repl->op_type == OP_THREADSV && strchr("&`'123456789+", @@ -2509,7 +2815,7 @@ pmruntime(OP *o, OP *expr, OP *repl) } #else if (curop->op_type == OP_GV) { - GV *gv = ((GVOP*)curop)->op_gv; + GV *gv = (GV*)((SVOP*)curop)->op_sv; repl_has_vars = 1; if (strchr("&`'123456789+", *GvENAME(gv))) break; @@ -2551,7 +2857,7 @@ pmruntime(OP *o, OP *expr, OP *repl) pm->op_pmflags |= PMf_MAYBE_CONST; pm->op_pmpermflags |= PMf_MAYBE_CONST; } - Newz(1101, rcop, 1, LOGOP); + NewOp(1101, rcop, 1, LOGOP); rcop->op_type = OP_SUBSTCONT; rcop->op_ppaddr = PL_ppaddr[OP_SUBSTCONT]; rcop->op_first = scalar(repl); @@ -2573,10 +2879,10 @@ pmruntime(OP *o, OP *expr, OP *repl) } OP * -newSVOP(I32 type, I32 flags, SV *sv) +Perl_newSVOP(pTHX_ I32 type, I32 flags, SV *sv) { SVOP *svop; - Newz(1101, svop, 1, SVOP); + NewOp(1101, svop, 1, SVOP); svop->op_type = type; svop->op_ppaddr = PL_ppaddr[type]; svop->op_sv = sv; @@ -2590,28 +2896,17 @@ newSVOP(I32 type, I32 flags, SV *sv) } OP * -newGVOP(I32 type, I32 flags, GV *gv) +Perl_newGVOP(pTHX_ I32 type, I32 flags, GV *gv) { dTHR; - GVOP *gvop; - Newz(1101, gvop, 1, GVOP); - gvop->op_type = type; - gvop->op_ppaddr = PL_ppaddr[type]; - gvop->op_gv = (GV*)SvREFCNT_inc(gv); - gvop->op_next = (OP*)gvop; - gvop->op_flags = flags; - if (PL_opargs[type] & OA_RETSCALAR) - scalar((OP*)gvop); - if (PL_opargs[type] & OA_TARGET) - gvop->op_targ = pad_alloc(type, SVs_PADTMP); - return CHECKOP(type, gvop); + return newSVOP(type, flags, SvREFCNT_inc(gv)); } OP * -newPVOP(I32 type, I32 flags, char *pv) +Perl_newPVOP(pTHX_ I32 type, I32 flags, char *pv) { PVOP *pvop; - Newz(1101, pvop, 1, PVOP); + NewOp(1101, pvop, 1, PVOP); pvop->op_type = type; pvop->op_ppaddr = PL_ppaddr[type]; pvop->op_pv = pv; @@ -2625,7 +2920,7 @@ newPVOP(I32 type, I32 flags, char *pv) } void -package(OP *o) +Perl_package(pTHX_ OP *o) { dTHR; SV *sv; @@ -2651,7 +2946,7 @@ package(OP *o) } void -utilize(int aver, I32 floor, OP *version, OP *id, OP *arg) +Perl_utilize(pTHX_ int aver, I32 floor, OP *version, OP *id, OP *arg) { OP *pack; OP *meth; @@ -2661,7 +2956,7 @@ utilize(int aver, I32 floor, OP *version, OP *id, OP *arg) GV *gv; if (id->op_type != OP_CONST) - croak("Module name must be constant"); + Perl_croak(aTHX_ "Module name must be constant"); veop = Nullop; @@ -2673,20 +2968,19 @@ utilize(int aver, I32 floor, OP *version, OP *id, OP *arg) } else { OP *pack; - OP *meth; if (version->op_type != OP_CONST || !SvNIOK(vesv)) - croak("Version number must be constant number"); + Perl_croak(aTHX_ "Version number must be constant number"); /* Make copy of id so we don't free it twice */ pack = newSVOP(OP_CONST, 0, newSVsv(((SVOP*)id)->op_sv)); /* Fake up a method call to VERSION */ - meth = newSVOP(OP_CONST, 0, newSVpv("VERSION", 7)); veop = convert(OP_ENTERSUB, OPf_STACKED|OPf_SPECIAL, append_elem(OP_LIST, prepend_elem(OP_LIST, pack, list(version)), - newUNOP(OP_METHOD, 0, meth))); + newSVOP(OP_METHOD_NAMED, 0, + newSVpvn("VERSION", 7)))); } } @@ -2699,15 +2993,12 @@ utilize(int aver, I32 floor, OP *version, OP *id, OP *arg) else { /* Make copy of id so we don't free it twice */ pack = newSVOP(OP_CONST, 0, newSVsv(((SVOP*)id)->op_sv)); - meth = newSVOP(OP_CONST, 0, - aver - ? newSVpv("import", 6) - : newSVpv("unimport", 8) - ); imop = convert(OP_ENTERSUB, OPf_STACKED|OPf_SPECIAL, append_elem(OP_LIST, prepend_elem(OP_LIST, pack, list(arg)), - newUNOP(OP_METHOD, 0, meth))); + newSVOP(OP_METHOD_NAMED, 0, + aver ? newSVpvn("import", 6) + : newSVpvn("unimport", 8)))); } /* Fake up a require, handle override, if any */ @@ -2727,8 +3018,9 @@ utilize(int aver, I32 floor, OP *version, OP *id, OP *arg) } /* Fake up the BEGIN {}, which does its thing immediately. */ - newSUB(floor, - newSVOP(OP_CONST, 0, newSVpv("BEGIN", 5)), + newATTRSUB(floor, + newSVOP(OP_CONST, 0, newSVpvn("BEGIN", 5)), + Nullop, Nullop, append_elem(OP_LINESEQ, append_elem(OP_LINESEQ, @@ -2736,12 +3028,13 @@ utilize(int aver, I32 floor, OP *version, OP *id, OP *arg) newSTATEOP(0, Nullch, veop)), newSTATEOP(0, Nullch, imop) )); + PL_hints |= HINT_BLOCK_SCOPE; PL_copline = NOLINE; PL_expect = XSTATE; } OP * -dofile(OP *term) +Perl_dofile(pTHX_ OP *term) { OP *doop; GV *gv; @@ -2764,7 +3057,7 @@ dofile(OP *term) } OP * -newSLICEOP(I32 flags, OP *subscript, OP *listval) +Perl_newSLICEOP(pTHX_ I32 flags, OP *subscript, OP *listval) { return newBINOP(OP_LSLICE, flags, list(force_list(subscript)), @@ -2772,7 +3065,7 @@ newSLICEOP(I32 flags, OP *subscript, OP *listval) } STATIC I32 -list_assignment(register OP *o) +S_list_assignment(pTHX_ register OP *o) { if (!o) return TRUE; @@ -2781,8 +3074,8 @@ list_assignment(register OP *o) o = cUNOPo->op_first; if (o->op_type == OP_COND_EXPR) { - I32 t = list_assignment(cCONDOPo->op_first->op_sibling); - I32 f = list_assignment(cCONDOPo->op_first->op_sibling->op_sibling); + I32 t = list_assignment(cLOGOPo->op_first->op_sibling); + I32 f = list_assignment(cLOGOPo->op_first->op_sibling->op_sibling); if (t && f) return TRUE; @@ -2806,7 +3099,7 @@ list_assignment(register OP *o) } OP * -newASSIGNOP(I32 flags, OP *left, I32 optype, OP *right) +Perl_newASSIGNOP(pTHX_ I32 flags, OP *left, I32 optype, OP *right) { OP *o; @@ -2845,7 +3138,7 @@ newASSIGNOP(I32 flags, OP *left, I32 optype, OP *right) for (curop = LINKLIST(o); curop != o; curop = LINKLIST(curop)) { if (PL_opargs[curop->op_type] & OA_DANGEROUS) { if (curop->op_type == OP_GV) { - GV *gv = ((GVOP*)curop)->op_gv; + GV *gv = (GV*)((SVOP*)curop)->op_sv; if (gv == PL_defgv || SvCUR(gv) == PL_generation) break; SvCUR(gv) = PL_generation; @@ -2897,7 +3190,7 @@ newASSIGNOP(I32 flags, OP *left, I32 optype, OP *right) { tmpop = ((UNOP*)left)->op_first; if (tmpop->op_type == OP_GV && !pm->op_pmreplroot) { - pm->op_pmreplroot = (OP*)((GVOP*)tmpop)->op_gv; + pm->op_pmreplroot = (OP*)((SVOP*)tmpop)->op_sv; pm->op_pmflags |= PMf_ONCE; tmpop = cUNOPo->op_first; /* to list (nulled) */ tmpop = ((UNOP*)tmpop)->op_first; /* to pushmark */ @@ -2943,13 +3236,13 @@ newASSIGNOP(I32 flags, OP *left, I32 optype, OP *right) } OP * -newSTATEOP(I32 flags, char *label, OP *o) +Perl_newSTATEOP(pTHX_ I32 flags, char *label, OP *o) { dTHR; U32 seq = intro_my(); register COP *cop; - Newz(1101, cop, 1, COP); + NewOp(1101, cop, 1, COP); if (PERLDB_LINE && PL_curcop->cop_line && PL_curstash != PL_debstash) { cop->op_type = OP_DBSTATE; cop->op_ppaddr = PL_ppaddr[ OP_DBSTATE ]; @@ -2972,8 +3265,7 @@ newSTATEOP(I32 flags, char *label, OP *o) } cop->cop_seq = seq; cop->cop_arybase = PL_curcop->cop_arybase; - if (PL_curcop->cop_warnings == WARN_NONE - || PL_curcop->cop_warnings == WARN_ALL) + if (specialWARN(PL_curcop->cop_warnings)) cop->cop_warnings = PL_curcop->cop_warnings ; else cop->cop_warnings = newSVsv(PL_curcop->cop_warnings) ; @@ -2982,14 +3274,14 @@ newSTATEOP(I32 flags, char *label, OP *o) if (PL_copline == NOLINE) cop->cop_line = PL_curcop->cop_line; else { - cop->cop_line = PL_copline; + cop->cop_line = PL_copline; PL_copline = NOLINE; } - cop->cop_filegv = (GV*)SvREFCNT_inc(PL_curcop->cop_filegv); + CopFILEGV_set(cop, (GV*)SvREFCNT_inc(CopFILEGV(PL_curcop))); cop->cop_stash = PL_curstash; if (PERLDB_LINE && PL_curstash != PL_debstash) { - SV **svp = av_fetch(GvAV(PL_curcop->cop_filegv),(I32)cop->cop_line, FALSE); + SV **svp = av_fetch(CopFILEAV(PL_curcop), (I32)CopLINE(cop), FALSE); if (svp && *svp != &PL_sv_undef && !SvIOK(*svp)) { (void)SvIOK_on(*svp); SvIVX(*svp) = 1; @@ -3002,7 +3294,7 @@ newSTATEOP(I32 flags, char *label, OP *o) /* "Introduce" my variables to visible status. */ U32 -intro_my(void) +Perl_intro_my(pTHX) { SV **svp; SV *sv; @@ -3015,7 +3307,7 @@ intro_my(void) for (i = PL_min_intro_pending; i <= PL_max_intro_pending; i++) { if ((sv = svp[i]) && sv != &PL_sv_undef && !SvIVX(sv)) { SvIVX(sv) = PAD_MAX; /* Don't know scope end yet. */ - SvNVX(sv) = (double)PL_cop_seqmax; + SvNVX(sv) = (NV)PL_cop_seqmax; } } PL_min_intro_pending = 0; @@ -3024,13 +3316,13 @@ intro_my(void) } OP * -newLOGOP(I32 type, I32 flags, OP *first, OP *other) +Perl_newLOGOP(pTHX_ I32 type, I32 flags, OP *first, OP *other) { return new_logop(type, flags, &first, &other); } STATIC OP * -new_logop(I32 type, I32 flags, OP** firstp, OP** otherp) +S_new_logop(pTHX_ I32 type, I32 flags, OP** firstp, OP** otherp) { dTHR; LOGOP *logop; @@ -3059,7 +3351,7 @@ new_logop(I32 type, I32 flags, OP** firstp, OP** otherp) } if (first->op_type == OP_CONST) { if (ckWARN(WARN_PRECEDENCE) && (first->op_private & OPpCONST_BARE)) - warner(WARN_PRECEDENCE, "Probable precedence problem on %s", + Perl_warner(aTHX_ WARN_PRECEDENCE, "Probable precedence problem on %s", PL_op_desc[type]); if ((type == OP_AND) == (SvTRUE(((SVOP*)first)->op_sv))) { op_free(first); @@ -3088,20 +3380,26 @@ new_logop(I32 type, I32 flags, OP** firstp, OP** otherp) if (k2 && k2->op_type == OP_READLINE && (k2->op_flags & OPf_STACKED) && ((k1->op_flags & OPf_WANT) == OPf_WANT_SCALAR)) + { warnop = k2->op_type; + } break; case OP_SASSIGN: if (k1->op_type == OP_READDIR || k1->op_type == OP_GLOB + || (k1->op_type == OP_NULL && k1->op_targ == OP_GLOB) || k1->op_type == OP_EACH) - warnop = k1->op_type; + { + warnop = ((k1->op_type == OP_NULL) + ? k1->op_targ : k1->op_type); + } break; } if (warnop) { line_t oldline = PL_curcop->cop_line; PL_curcop->cop_line = PL_copline; - warner(WARN_UNSAFE, + Perl_warner(aTHX_ WARN_UNSAFE, "Value of %s%s can be \"0\"; test with defined()", PL_op_desc[warnop], ((warnop == OP_READLINE || warnop == OP_GLOB) @@ -3116,7 +3414,7 @@ new_logop(I32 type, I32 flags, OP** firstp, OP** otherp) if (type == OP_ANDASSIGN || type == OP_ORASSIGN) other->op_private |= OPpASSIGN_BACKWARDS; /* other is an OP_SASSIGN */ - Newz(1101, logop, 1, LOGOP); + NewOp(1101, logop, 1, LOGOP); logop->op_type = type; logop->op_ppaddr = PL_ppaddr[type]; @@ -3137,10 +3435,11 @@ new_logop(I32 type, I32 flags, OP** firstp, OP** otherp) } OP * -newCONDOP(I32 flags, OP *first, OP *trueop, OP *falseop) +Perl_newCONDOP(pTHX_ I32 flags, OP *first, OP *trueop, OP *falseop) { dTHR; - CONDOP *condop; + LOGOP *logop; + OP *start; OP *o; if (!falseop) @@ -3165,62 +3464,64 @@ newCONDOP(I32 flags, OP *first, OP *trueop, OP *falseop) list(trueop); scalar(falseop); } - Newz(1101, condop, 1, CONDOP); + NewOp(1101, logop, 1, LOGOP); + logop->op_type = OP_COND_EXPR; + logop->op_ppaddr = PL_ppaddr[OP_COND_EXPR]; + logop->op_first = first; + logop->op_flags = flags | OPf_KIDS; + logop->op_private = 1 | (flags >> 8); + logop->op_other = LINKLIST(trueop); + logop->op_next = LINKLIST(falseop); - condop->op_type = OP_COND_EXPR; - condop->op_ppaddr = PL_ppaddr[OP_COND_EXPR]; - condop->op_first = first; - condop->op_flags = flags | OPf_KIDS; - condop->op_true = LINKLIST(trueop); - condop->op_false = LINKLIST(falseop); - condop->op_private = 1 | (flags >> 8); /* establish postfix order */ - condop->op_next = LINKLIST(first); - first->op_next = (OP*)condop; + start = LINKLIST(first); + first->op_next = (OP*)logop; first->op_sibling = trueop; trueop->op_sibling = falseop; - o = newUNOP(OP_NULL, 0, (OP*)condop); + o = newUNOP(OP_NULL, 0, (OP*)logop); - trueop->op_next = o; - falseop->op_next = o; + trueop->op_next = falseop->op_next = o; + o->op_next = start; return o; } OP * -newRANGE(I32 flags, OP *left, OP *right) +Perl_newRANGE(pTHX_ I32 flags, OP *left, OP *right) { dTHR; - CONDOP *condop; + LOGOP *range; OP *flip; OP *flop; + OP *leftstart; OP *o; - Newz(1101, condop, 1, CONDOP); + NewOp(1101, range, 1, LOGOP); - condop->op_type = OP_RANGE; - condop->op_ppaddr = PL_ppaddr[OP_RANGE]; - condop->op_first = left; - condop->op_flags = OPf_KIDS; - condop->op_true = LINKLIST(left); - condop->op_false = LINKLIST(right); - condop->op_private = 1 | (flags >> 8); + range->op_type = OP_RANGE; + range->op_ppaddr = PL_ppaddr[OP_RANGE]; + range->op_first = left; + range->op_flags = OPf_KIDS; + leftstart = LINKLIST(left); + range->op_other = LINKLIST(right); + range->op_private = 1 | (flags >> 8); left->op_sibling = right; - condop->op_next = (OP*)condop; - flip = newUNOP(OP_FLIP, flags, (OP*)condop); + range->op_next = (OP*)range; + flip = newUNOP(OP_FLIP, flags, (OP*)range); flop = newUNOP(OP_FLOP, 0, flip); o = newUNOP(OP_NULL, 0, flop); linklist(flop); + range->op_next = leftstart; left->op_next = flip; right->op_next = flop; - condop->op_targ = pad_alloc(OP_RANGE, SVs_PADMY); - sv_upgrade(PAD_SV(condop->op_targ), SVt_PVNV); + range->op_targ = pad_alloc(OP_RANGE, SVs_PADMY); + sv_upgrade(PAD_SV(range->op_targ), SVt_PVNV); flip->op_targ = pad_alloc(OP_RANGE, SVs_PADMY); sv_upgrade(PAD_SV(flip->op_targ), SVt_PVNV); @@ -3235,7 +3536,7 @@ newRANGE(I32 flags, OP *left, OP *right) } OP * -newLOOPOP(I32 flags, I32 debuggable, OP *expr, OP *block) +Perl_newLOOPOP(pTHX_ I32 flags, I32 debuggable, OP *expr, OP *block) { dTHR; OP* listop; @@ -3264,6 +3565,7 @@ newLOOPOP(I32 flags, I32 debuggable, OP *expr, OP *block) case OP_SASSIGN: if (k1->op_type == OP_READDIR || k1->op_type == OP_GLOB + || (k1->op_type == OP_NULL && k1->op_targ == OP_NULL) || k1->op_type == OP_EACH) expr = newUNOP(OP_DEFINED, 0, expr); break; @@ -3290,7 +3592,7 @@ newLOOPOP(I32 flags, I32 debuggable, OP *expr, OP *block) } OP * -newWHILEOP(I32 flags, I32 debuggable, LOOP *loop, I32 whileline, OP *expr, OP *block, OP *cont) +Perl_newWHILEOP(pTHX_ I32 flags, I32 debuggable, LOOP *loop, I32 whileline, OP *expr, OP *block, OP *cont) { dTHR; OP *redo; @@ -3317,6 +3619,7 @@ newWHILEOP(I32 flags, I32 debuggable, LOOP *loop, I32 whileline, OP *expr, OP *b case OP_SASSIGN: if (k1->op_type == OP_READDIR || k1->op_type == OP_GLOB + || (k1->op_type == OP_NULL && k1->op_targ == OP_GLOB) || k1->op_type == OP_EACH) expr = newUNOP(OP_DEFINED, 0, expr); break; @@ -3359,7 +3662,7 @@ newWHILEOP(I32 flags, I32 debuggable, LOOP *loop, I32 whileline, OP *expr, OP *b o = listop; if (!loop) { - Newz(1101,loop,1,LOOP); + NewOp(1101,loop,1,LOOP); loop->op_type = OP_ENTERLOOP; loop->op_ppaddr = PL_ppaddr[OP_ENTERLOOP]; loop->op_private = 0; @@ -3382,9 +3685,10 @@ newWHILEOP(I32 flags, I32 debuggable, LOOP *loop, I32 whileline, OP *expr, OP *b } OP * -newFOROP(I32 flags,char *label,line_t forline,OP *sv,OP *expr,OP *block,OP *cont) +Perl_newFOROP(pTHX_ I32 flags,char *label,line_t forline,OP *sv,OP *expr,OP *block,OP *cont) { LOOP *loop; + LOOP *tmp; OP *wop; int padoff = 0; I32 iterflags = 0; @@ -3406,7 +3710,7 @@ newFOROP(I32 flags,char *label,line_t forline,OP *sv,OP *expr,OP *block,OP *cont sv = Nullop; } else - croak("Can't use %s for loop variable", PL_op_desc[sv->op_type]); + Perl_croak(aTHX_ "Can't use %s for loop variable", PL_op_desc[sv->op_type]); } else { #ifdef USE_THREADS @@ -3429,7 +3733,7 @@ newFOROP(I32 flags,char *label,line_t forline,OP *sv,OP *expr,OP *block,OP *cont * treated as min/max values by 'pp_iterinit'. */ UNOP* flip = (UNOP*)((UNOP*)((BINOP*)expr)->op_first)->op_first; - CONDOP* range = (CONDOP*) flip->op_first; + LOGOP* range = (LOGOP*) flip->op_first; OP* left = range->op_first; OP* right = left->op_sibling; LISTOP* listop; @@ -3438,8 +3742,8 @@ newFOROP(I32 flags,char *label,line_t forline,OP *sv,OP *expr,OP *block,OP *cont range->op_first = Nullop; listop = (LISTOP*)newLISTOP(OP_LIST, 0, left, right); - listop->op_first->op_next = range->op_true; - left->op_next = range->op_false; + listop->op_first->op_next = range->op_next; + left->op_next = range->op_other; right->op_next = (OP*)listop; listop->op_next = listop->op_first; @@ -3456,7 +3760,13 @@ newFOROP(I32 flags,char *label,line_t forline,OP *sv,OP *expr,OP *block,OP *cont loop = (LOOP*)list(convert(OP_ENTERITER, iterflags, append_elem(OP_LIST, expr, scalar(sv)))); assert(!loop->op_next); +#ifdef PL_OP_SLAB_ALLOC + NewOp(1234,tmp,1,LOOP); + Copy(loop,tmp,1,LOOP); + loop = tmp; +#else Renew(loop, 1, LOOP); +#endif loop->op_targ = padoff; wop = newWHILEOP(flags, 1, loop, forline, newOP(OP_ITER, 0), block, cont); PL_copline = forline; @@ -3464,7 +3774,7 @@ newFOROP(I32 flags,char *label,line_t forline,OP *sv,OP *expr,OP *block,OP *cont } OP* -newLOOPEX(I32 type, OP *label) +Perl_newLOOPEX(pTHX_ I32 type, OP *label) { dTHR; OP *o; @@ -3491,7 +3801,7 @@ newLOOPEX(I32 type, OP *label) } void -cv_undef(CV *cv) +Perl_cv_undef(pTHX_ CV *cv) { dTHR; #ifdef USE_THREADS @@ -3505,10 +3815,10 @@ cv_undef(CV *cv) if (!CvXSUB(cv) && CvROOT(cv)) { #ifdef USE_THREADS if (CvDEPTH(cv) || (CvOWNER(cv) && CvOWNER(cv) != thr)) - croak("Can't undef active subroutine"); + Perl_croak(aTHX_ "Can't undef active subroutine"); #else if (CvDEPTH(cv)) - croak("Can't undef active subroutine"); + Perl_croak(aTHX_ "Can't undef active subroutine"); #endif /* USE_THREADS */ ENTER; @@ -3551,8 +3861,7 @@ cv_undef(CV *cv) #ifdef DEBUG_CLOSURES STATIC void -cv_dump(cv) -CV* cv; +cv_dump(CV *cv) { CV *outside = CvOUTSIDE(cv); AV* padlist = CvPADLIST(cv); @@ -3562,13 +3871,14 @@ CV* cv; SV** ppad; I32 ix; - PerlIO_printf(Perl_debug_log, "\tCV=0x%lx (%s), OUTSIDE=0x%lx (%s)\n", - cv, + PerlIO_printf(Perl_debug_log, + "\tCV=0x%"UVxf" (%s), OUTSIDE=0x%"UVxf" (%s)\n", + PTR2UV(cv), (CvANON(cv) ? "ANON" : (cv == PL_main_cv) ? "MAIN" : CvUNIQUE(cv) ? "UNIQUE" : CvGV(cv) ? GvNAME(CvGV(cv)) : "UNDEFINED"), - outside, + PTR2UV(outside), (!outside ? "null" : CvANON(outside) ? "ANON" : (outside == PL_main_cv) ? "MAIN" @@ -3585,18 +3895,19 @@ CV* cv; for (ix = 1; ix <= AvFILLp(pad_name); ix++) { if (SvPOK(pname[ix])) - PerlIO_printf(Perl_debug_log, "\t%4d. 0x%lx (%s\"%s\" %ld-%ld)\n", - ix, ppad[ix], + PerlIO_printf(Perl_debug_log, + "\t%4d. 0x%"UVxf" (%s\"%s\" %"IVdf"-%"IVdf")\n", + ix, PTR2UV(ppad[ix]), SvFAKE(pname[ix]) ? "FAKE " : "", SvPVX(pname[ix]), - (long)I_32(SvNVX(pname[ix])), - (long)SvIVX(pname[ix])); + (IV)I_32(SvNVX(pname[ix])), + SvIVX(pname[ix])); } } #endif /* DEBUG_CLOSURES */ STATIC CV * -cv_clone2(CV *proto, CV *outside) +S_cv_clone2(pTHX_ CV *proto, CV *outside) { dTHR; AV* av; @@ -3630,7 +3941,6 @@ cv_clone2(CV *proto, CV *outside) MUTEX_INIT(CvMUTEXP(cv)); CvOWNER(cv) = 0; #endif /* USE_THREADS */ - CvFILEGV(cv) = CvFILEGV(proto); CvGV(cv) = (GV*)SvREFCNT_inc(CvGV(proto)); CvSTASH(cv) = CvSTASH(proto); CvROOT(cv) = CvROOT(proto); @@ -3666,11 +3976,11 @@ cv_clone2(CV *proto, CV *outside) char *name = SvPVX(namesv); /* XXX */ if (SvFLAGS(namesv) & SVf_FAKE) { /* lexical from outside? */ I32 off = pad_findlex(name, ix, SvIVX(namesv), - CvOUTSIDE(cv), cxstack_ix, 0); + CvOUTSIDE(cv), cxstack_ix, 0, 0); if (!off) PL_curpad[ix] = SvREFCNT_inc(ppad[ix]); else if (off != ix) - croak("panic: cv_clone: %s", name); + Perl_croak(aTHX_ "panic: cv_clone: %s", name); } else { /* our own lexical */ SV* sv; @@ -3728,7 +4038,7 @@ cv_clone2(CV *proto, CV *outside) } CV * -cv_clone(CV *proto) +Perl_cv_clone(pTHX_ CV *proto) { CV *cv; MUTEX_LOCK(&PL_cred_mutex); /* XXX create separate mutex */ @@ -3738,9 +4048,11 @@ cv_clone(CV *proto) } void -cv_ckproto(CV *cv, GV *gv, char *p) +Perl_cv_ckproto(pTHX_ CV *cv, GV *gv, char *p) { - if ((!p != !SvPOK(cv)) || (p && strNE(p, SvPVX(cv)))) { + dTHR; + + if (((!p != !SvPOK(cv)) || (p && strNE(p, SvPVX(cv)))) && ckWARN_d(WARN_UNSAFE)) { SV* msg = sv_newmortal(); SV* name = Nullsv; @@ -3748,20 +4060,20 @@ cv_ckproto(CV *cv, GV *gv, char *p) gv_efullname3(name = sv_newmortal(), gv, Nullch); sv_setpv(msg, "Prototype mismatch:"); if (name) - sv_catpvf(msg, " sub %_", name); + Perl_sv_catpvf(aTHX_ msg, " sub %_", name); if (SvPOK(cv)) - sv_catpvf(msg, " (%s)", SvPVX(cv)); + Perl_sv_catpvf(aTHX_ msg, " (%s)", SvPVX(cv)); sv_catpv(msg, " vs "); if (p) - sv_catpvf(msg, "(%s)", p); + Perl_sv_catpvf(aTHX_ msg, "(%s)", p); else sv_catpv(msg, "none"); - warn("%_", msg); + Perl_warner(aTHX_ WARN_UNSAFE, "%_", msg); } } SV * -cv_const_sv(CV *cv) +Perl_cv_const_sv(pTHX_ CV *cv) { if (!cv || !SvPOK(cv) || SvCUR(cv)) return Nullsv; @@ -3769,7 +4081,7 @@ cv_const_sv(CV *cv) } SV * -op_const_sv(OP *o, CV *cv) +Perl_op_const_sv(pTHX_ OP *o, CV *cv) { SV *sv = Nullsv; @@ -3782,7 +4094,7 @@ op_const_sv(OP *o, CV *cv) for (; o; o = o->op_next) { OPCODE type = o->op_type; - if(sv && o->op_next == o) + if (sv && o->op_next == o) return sv; if (type == OP_NEXTSTATE || type == OP_NULL || type == OP_PUSHMARK) continue; @@ -3806,14 +4118,35 @@ op_const_sv(OP *o, CV *cv) return sv; } +void +Perl_newMYSUB(pTHX_ I32 floor, OP *o, OP *proto, OP *attrs, OP *block) +{ + if (o) + SAVEFREEOP(o); + if (proto) + SAVEFREEOP(proto); + if (attrs) + SAVEFREEOP(attrs); + if (block) + SAVEFREEOP(block); + Perl_croak(aTHX_ "\"my sub\" not yet implemented"); +} + +CV * +Perl_newSUB(pTHX_ I32 floor, OP *o, OP *proto, OP *block) +{ + return Perl_newATTRSUB(aTHX_ floor, o, proto, Nullop, block); +} + CV * -newSUB(I32 floor, OP *o, OP *proto, OP *block) +Perl_newATTRSUB(pTHX_ I32 floor, OP *o, OP *proto, OP *attrs, OP *block) { dTHR; STRLEN n_a; char *name = o ? SvPVx(cSVOPo->op_sv, n_a) : Nullch; GV *gv = gv_fetchpv(name ? name : "__ANON__", - GV_ADDMULTI | (block ? 0 : GV_NOINIT), SVt_PVCV); + GV_ADDMULTI | ((block || attrs) ? 0 : GV_NOINIT), + SVt_PVCV); char *ps = proto ? SvPVx(((SVOP*)proto)->op_sv, n_a) : Nullch; register CV *cv=0; I32 ix; @@ -3822,12 +4155,17 @@ newSUB(I32 floor, OP *o, OP *proto, OP *block) SAVEFREEOP(o); if (proto) SAVEFREEOP(proto); + if (attrs) + SAVEFREEOP(attrs); - if (SvTYPE(gv) != SVt_PVGV) { /* Prototype now, and had + if (SvTYPE(gv) != SVt_PVGV) { /* Maybe prototype now, and had at maximum a prototype before. */ if (SvTYPE(gv) > SVt_NULL) { - if (!SvPOK((SV*)gv) && !(SvIOK((SV*)gv) && SvIVX((SV*)gv) == -1)) - warn("Runaway prototype"); + if (!SvPOK((SV*)gv) && !(SvIOK((SV*)gv) && SvIVX((SV*)gv) == -1) + && ckWARN_d(WARN_UNSAFE)) + { + Perl_warner(aTHX_ WARN_UNSAFE, "Runaway prototype"); + } cv_ckproto((CV*)gv, NULL, ps); } if (ps) @@ -3848,14 +4186,16 @@ newSUB(I32 floor, OP *o, OP *proto, OP *block) if (CvROOT(cv) || CvXSUB(cv) || GvASSUMECV(gv)) { SV* const_sv; bool const_changed = TRUE; - if (!block) { + if (!block && !attrs) { /* just a "sub foo;" when &foo is already defined */ SAVEFREESV(PL_compcv); goto done; } /* ahem, death to those who redefine active sort subs */ if (PL_curstackinfo->si_type == PERLSI_SORT && PL_sortcop == CvSTART(cv)) - croak("Can't redefine active sort subroutine %s", name); + Perl_croak(aTHX_ "Can't redefine active sort subroutine %s", name); + if (!block) + goto withattrs; if(const_sv = cv_const_sv(cv)) const_changed = sv_cmp(const_sv, op_const_sv(block, Nullcv)); if ((const_sv && const_changed) || ckWARN(WARN_REDEFINE) @@ -3865,16 +4205,48 @@ newSUB(I32 floor, OP *o, OP *proto, OP *block) "autouse"))) { line_t oldline = PL_curcop->cop_line; PL_curcop->cop_line = PL_copline; - warner(WARN_REDEFINE, + Perl_warner(aTHX_ WARN_REDEFINE, const_sv ? "Constant subroutine %s redefined" - : "Subroutine %s redefined", name); + : "Subroutine %s redefined", name); PL_curcop->cop_line = oldline; } SvREFCNT_dec(cv); cv = Nullcv; } } + withattrs: + if (attrs) { + HV *stash; + SV *rcv; + + /* Need to do a C + * before we clobber PL_compcv. + */ + if (cv && !block) { + rcv = (SV*)cv; + if (CvGV(cv) && GvSTASH(CvGV(cv)) && HvNAME(GvSTASH(CvGV(cv)))) + stash = GvSTASH(CvGV(cv)); + else if (CvSTASH(cv) && HvNAME(CvSTASH(cv))) + stash = CvSTASH(cv); + else + stash = PL_curstash; + } + else { + /* possibly about to re-define existing subr -- ignore old cv */ + rcv = (SV*)PL_compcv; + if (name && GvSTASH(gv) && HvNAME(GvSTASH(gv))) + stash = GvSTASH(gv); + else + stash = PL_curstash; + } + apply_attrs(stash, rcv, attrs); + } if (cv) { /* must reuse cv if autoloaded */ + if (!block) { + /* got here with just attrs -- work done, so bug out */ + SAVEFREESV(PL_compcv); + goto done; + } cv_undef(cv); CvFLAGS(cv) = CvFLAGS(PL_compcv); CvOUTSIDE(cv) = CvOUTSIDE(PL_compcv); @@ -3894,7 +4266,6 @@ newSUB(I32 floor, OP *o, OP *proto, OP *block) } } CvGV(cv) = (GV*)SvREFCNT_inc(gv); - CvFILEGV(cv) = PL_curcop->cop_filegv; CvSTASH(cv) = PL_curstash; #ifdef USE_THREADS CvOWNER(cv) = 0; @@ -3916,12 +4287,12 @@ newSUB(I32 floor, OP *o, OP *proto, OP *block) if (strEQ(s, "BEGIN")) { char *not_safe = "BEGIN not safe after errors--compilation aborted"; - if (PL_in_eval & 4) - croak(not_safe); + if (PL_in_eval & EVAL_KEEPERR) + Perl_croak(aTHX_ not_safe); else { /* force display of errors found but not reported */ sv_catpv(ERRSV, not_safe); - croak("%s", SvPVx(ERRSV, n_a)); + Perl_croak(aTHX_ "%s", SvPVx(ERRSV, n_a)); } } } @@ -3972,7 +4343,14 @@ newSUB(I32 floor, OP *o, OP *proto, OP *block) } } - CvROOT(cv) = newUNOP(OP_LEAVESUB, 0, scalarseq(block)); + if (CvLVALUE(cv)) { + CvROOT(cv) = newUNOP(OP_LEAVESUBLV, 0, scalarseq(block)); + } + else { + CvROOT(cv) = newUNOP(OP_LEAVESUB, 0, scalarseq(block)); + } + CvROOT(cv)->op_private |= OPpREFCOUNTED; + OpREFCNT_set(CvROOT(cv), 1); CvSTART(cv) = LINKLIST(CvROOT(cv)); CvROOT(cv)->op_next = 0; peep(CvSTART(cv)); @@ -3987,9 +4365,9 @@ newSUB(I32 floor, OP *o, OP *proto, OP *block) CV *cv; HV *hv; - sv_setpvf(sv, "%_:%ld-%ld", - GvSV(PL_curcop->cop_filegv), - (long)PL_subline, (long)PL_curcop->cop_line); + Perl_sv_setpvf(aTHX_ sv, "%_:%ld-%ld", + CopFILESV(PL_curcop), + (long)PL_subline, (long)CopLINE(PL_curcop)); gv_efullname3(tmpstr, gv, Nullch); hv_store(GvHV(PL_DBsub), SvPVX(tmpstr), SvCUR(tmpstr), sv, 0); hv = GvHVn(db_postponed); @@ -3999,7 +4377,7 @@ newSUB(I32 floor, OP *o, OP *proto, OP *block) PUSHMARK(SP); XPUSHs(tmpstr); PUTBACK; - perl_call_sv((SV*)cv, G_DISCARD); + call_sv((SV*)cv, G_DISCARD); } } @@ -4010,7 +4388,7 @@ newSUB(I32 floor, OP *o, OP *proto, OP *block) if (strEQ(s, "BEGIN")) { I32 oldscope = PL_scopestack_ix; ENTER; - SAVESPTR(PL_compiling.cop_filegv); + SAVESPTR(CopFILEGV(&PL_compiling)); SAVEI16(PL_compiling.cop_line); save_svref(&PL_rs); sv_setsv(PL_rs, PL_nrs); @@ -4049,7 +4427,7 @@ newSUB(I32 floor, OP *o, OP *proto, OP *block) /* XXX unsafe for threads if eval_owner isn't held */ void -newCONSTSUB(HV *stash, char *name, SV *sv) +Perl_newCONSTSUB(pTHX_ HV *stash, char *name, SV *sv) { dTHR; U32 oldhints = PL_hints; @@ -4062,10 +4440,11 @@ newCONSTSUB(HV *stash, char *name, SV *sv) if(stash) PL_curstash = PL_curcop->cop_stash = stash; - newSUB( + newATTRSUB( start_subparse(FALSE, 0), newSVOP(OP_CONST, 0, newSVpv(name,0)), newSVOP(OP_CONST, 0, &PL_sv_no), /* SvPV(&PL_sv_no) == "" -- GMB */ + Nullop, newSTATEOP(0, Nullch, newSVOP(OP_CONST, 0, sv)) ); @@ -4076,7 +4455,7 @@ newCONSTSUB(HV *stash, char *name, SV *sv) } CV * -newXS(char *name, void (*subaddr) (CV * _CPERLproto), char *filename) +Perl_newXS(pTHX_ char *name, XSUBADDR_t subaddr, char *filename) { dTHR; GV *gv = gv_fetchpv(name ? name : "__ANON__", GV_ADDMULTI, SVt_PVCV); @@ -4096,7 +4475,7 @@ newXS(char *name, void (*subaddr) (CV * _CPERLproto), char *filename) line_t oldline = PL_curcop->cop_line; if (PL_copline != NOLINE) PL_curcop->cop_line = PL_copline; - warner(WARN_REDEFINE, "Subroutine %s redefined",name); + Perl_warner(aTHX_ WARN_REDEFINE, "Subroutine %s redefined",name); PL_curcop->cop_line = oldline; } SvREFCNT_dec(cv); @@ -4121,7 +4500,7 @@ newXS(char *name, void (*subaddr) (CV * _CPERLproto), char *filename) MUTEX_INIT(CvMUTEXP(cv)); CvOWNER(cv) = 0; #endif /* USE_THREADS */ - CvFILEGV(cv) = gv_fetchfile(filename); + (void)gv_fetchfile(filename); CvXSUB(cv) = subaddr; if (name) { @@ -4157,7 +4536,7 @@ newXS(char *name, void (*subaddr) (CV * _CPERLproto), char *filename) } void -newFORM(I32 floor, OP *o, OP *block) +Perl_newFORM(pTHX_ I32 floor, OP *o, OP *block) { dTHR; register CV *cv; @@ -4177,7 +4556,7 @@ newFORM(I32 floor, OP *o, OP *block) line_t oldline = PL_curcop->cop_line; PL_curcop->cop_line = PL_copline; - warner(WARN_REDEFINE, "Format %s redefined",name); + Perl_warner(aTHX_ WARN_REDEFINE, "Format %s redefined",name); PL_curcop->cop_line = oldline; } SvREFCNT_dec(cv); @@ -4185,7 +4564,6 @@ newFORM(I32 floor, OP *o, OP *block) cv = PL_compcv; GvFORM(gv) = cv; CvGV(cv) = (GV*)SvREFCNT_inc(gv); - CvFILEGV(cv) = PL_curcop->cop_filegv; for (ix = AvFILLp(PL_comppad); ix > 0; ix--) { if (!SvPADMY(PL_curpad[ix]) && !SvIMMORTAL(PL_curpad[ix])) @@ -4193,6 +4571,8 @@ newFORM(I32 floor, OP *o, OP *block) } CvROOT(cv) = newUNOP(OP_LEAVEWRITE, 0, scalarseq(block)); + CvROOT(cv)->op_private |= OPpREFCOUNTED; + OpREFCNT_set(CvROOT(cv), 1); CvSTART(cv) = LINKLIST(CvROOT(cv)); CvROOT(cv)->op_next = 0; peep(CvSTART(cv)); @@ -4202,28 +4582,35 @@ newFORM(I32 floor, OP *o, OP *block) } OP * -newANONLIST(OP *o) +Perl_newANONLIST(pTHX_ OP *o) { return newUNOP(OP_REFGEN, 0, mod(list(convert(OP_ANONLIST, 0, o)), OP_REFGEN)); } OP * -newANONHASH(OP *o) +Perl_newANONHASH(pTHX_ OP *o) { return newUNOP(OP_REFGEN, 0, mod(list(convert(OP_ANONHASH, 0, o)), OP_REFGEN)); } OP * -newANONSUB(I32 floor, OP *proto, OP *block) +Perl_newANONSUB(pTHX_ I32 floor, OP *proto, OP *block) +{ + return newANONATTRSUB(floor, proto, Nullop, block); +} + +OP * +Perl_newANONATTRSUB(pTHX_ I32 floor, OP *proto, OP *attrs, OP *block) { return newUNOP(OP_REFGEN, 0, - newSVOP(OP_ANONCODE, 0, (SV*)newSUB(floor, 0, proto, block))); + newSVOP(OP_ANONCODE, 0, + (SV*)newATTRSUB(floor, 0, proto, attrs, block))); } OP * -oopsAV(OP *o) +Perl_oopsAV(pTHX_ OP *o) { switch (o->op_type) { case OP_PADSV: @@ -4238,15 +4625,18 @@ oopsAV(OP *o) break; default: - warn("oops: oopsAV"); + if (ckWARN_d(WARN_INTERNAL)) + Perl_warner(aTHX_ WARN_INTERNAL, "oops: oopsAV"); break; } return o; } OP * -oopsHV(OP *o) +Perl_oopsHV(pTHX_ OP *o) { + dTHR; + switch (o->op_type) { case OP_PADSV: case OP_PADAV: @@ -4262,14 +4652,15 @@ oopsHV(OP *o) break; default: - warn("oops: oopsHV"); + if (ckWARN_d(WARN_INTERNAL)) + Perl_warner(aTHX_ WARN_INTERNAL, "oops: oopsHV"); break; } return o; } OP * -newAVREF(OP *o) +Perl_newAVREF(pTHX_ OP *o) { if (o->op_type == OP_PADANY) { o->op_type = OP_PADAV; @@ -4280,15 +4671,15 @@ newAVREF(OP *o) } OP * -newGVREF(I32 type, OP *o) +Perl_newGVREF(pTHX_ I32 type, OP *o) { - if (type == OP_MAPSTART) + if (type == OP_MAPSTART || type == OP_GREPSTART || type == OP_SORT) return newUNOP(OP_NULL, 0, o); return ref(newUNOP(OP_RV2GV, OPf_REF, o), type); } OP * -newHVREF(OP *o) +Perl_newHVREF(pTHX_ OP *o) { if (o->op_type == OP_PADANY) { o->op_type = OP_PADHV; @@ -4299,21 +4690,21 @@ newHVREF(OP *o) } OP * -oopsCV(OP *o) +Perl_oopsCV(pTHX_ OP *o) { - croak("NOT IMPL LINE %d",__LINE__); + Perl_croak(aTHX_ "NOT IMPL LINE %d",__LINE__); /* STUB */ return o; } OP * -newCVREF(I32 flags, OP *o) +Perl_newCVREF(pTHX_ I32 flags, OP *o) { return newUNOP(OP_RV2CV, flags, scalar(o)); } OP * -newSVREF(OP *o) +Perl_newSVREF(pTHX_ OP *o) { if (o->op_type == OP_PADANY) { o->op_type = OP_PADSV; @@ -4330,7 +4721,7 @@ newSVREF(OP *o) /* Check routines. */ OP * -ck_anoncode(OP *o) +Perl_ck_anoncode(pTHX_ OP *o) { PADOFFSET ix; SV* name; @@ -4350,14 +4741,14 @@ ck_anoncode(OP *o) } OP * -ck_bitop(OP *o) +Perl_ck_bitop(pTHX_ OP *o) { o->op_private = PL_hints; return o; } OP * -ck_concat(OP *o) +Perl_ck_concat(pTHX_ OP *o) { if (cUNOPo->op_first->op_type == OP_CONCAT) o->op_flags |= OPf_STACKED; @@ -4365,7 +4756,7 @@ ck_concat(OP *o) } OP * -ck_spair(OP *o) +Perl_ck_spair(pTHX_ OP *o) { if (o->op_flags & OPf_KIDS) { OP* newop; @@ -4390,7 +4781,7 @@ ck_spair(OP *o) } OP * -ck_delete(OP *o) +Perl_ck_delete(pTHX_ OP *o) { o = ck_fun(o); o->op_private = 0; @@ -4399,7 +4790,7 @@ ck_delete(OP *o) if (kid->op_type == OP_HSLICE) o->op_private |= OPpSLICE; else if (kid->op_type != OP_HELEM) - croak("%s argument is not a HASH element or slice", + Perl_croak(aTHX_ "%s argument is not a HASH element or slice", PL_op_desc[o->op_type]); null(kid); } @@ -4407,7 +4798,7 @@ ck_delete(OP *o) } OP * -ck_eof(OP *o) +Perl_ck_eof(pTHX_ OP *o) { I32 type = o->op_type; @@ -4423,7 +4814,7 @@ ck_eof(OP *o) } OP * -ck_eval(OP *o) +Perl_ck_eval(pTHX_ OP *o) { PL_hints |= HINT_BLOCK_SCOPE; if (o->op_flags & OPf_KIDS) { @@ -4440,7 +4831,7 @@ ck_eval(OP *o) cUNOPo->op_first = 0; op_free(o); - Newz(1101, enter, 1, LOGOP); + NewOp(1101, enter, 1, LOGOP); enter->op_type = OP_ENTERTRY; enter->op_ppaddr = PL_ppaddr[OP_ENTERTRY]; enter->op_private = 0; @@ -4466,7 +4857,7 @@ ck_eval(OP *o) } OP * -ck_exec(OP *o) +Perl_ck_exec(pTHX_ OP *o) { OP *kid; if (o->op_flags & OPf_STACKED) { @@ -4481,13 +4872,13 @@ ck_exec(OP *o) } OP * -ck_exists(OP *o) +Perl_ck_exists(pTHX_ OP *o) { o = ck_fun(o); if (o->op_flags & OPf_KIDS) { OP *kid = cUNOPo->op_first; if (kid->op_type != OP_HELEM) - croak("%s argument is not a HASH element", PL_op_desc[o->op_type]); + Perl_croak(aTHX_ "%s argument is not a HASH element", PL_op_desc[o->op_type]); null(kid); } return o; @@ -4495,7 +4886,7 @@ ck_exists(OP *o) #if 0 OP * -ck_gvconst(register OP *o) +Perl_ck_gvconst(pTHX_ register OP *o) { o = fold_constants(o); if (o->op_type == OP_CONST) @@ -4505,7 +4896,7 @@ ck_gvconst(register OP *o) #endif OP * -ck_rvconst(register OP *o) +Perl_ck_rvconst(pTHX_ register OP *o) { dTHR; SVOP *kid = (SVOP*)cUNOPo->op_first; @@ -4552,7 +4943,7 @@ ck_rvconst(register OP *o) break; } if (badtype) - croak("Constant is not %s reference", badtype); + Perl_croak(aTHX_ "Constant is not %s reference", badtype); return o; } name = SvPV(kidsv, n_a); @@ -4570,7 +4961,7 @@ ck_rvconst(register OP *o) break; } if (badthing) - croak( + Perl_croak(aTHX_ "Can't use bareword (\"%s\") as %s ref while \"strict refs\" in use", name, badthing); } @@ -4600,13 +4991,14 @@ ck_rvconst(register OP *o) kid->op_type = OP_GV; SvREFCNT_dec(kid->op_sv); kid->op_sv = SvREFCNT_inc(gv); + kid->op_ppaddr = PL_ppaddr[OP_GV]; } } return o; } OP * -ck_ftst(OP *o) +Perl_ck_ftst(pTHX_ OP *o) { dTHR; I32 type = o->op_type; @@ -4637,7 +5029,7 @@ ck_ftst(OP *o) } OP * -ck_fun(OP *o) +Perl_ck_fun(pTHX_ OP *o) { dTHR; register OP *kid; @@ -4696,9 +5088,9 @@ ck_fun(OP *o) OP *newop = newAVREF(newGVOP(OP_GV, 0, gv_fetchpv(name, TRUE, SVt_PVAV) )); if (ckWARN(WARN_SYNTAX)) - warner(WARN_SYNTAX, - "Array @%s missing the @ in argument %ld of %s()", - name, (long)numargs, PL_op_desc[type]); + Perl_warner(aTHX_ WARN_SYNTAX, + "Array @%s missing the @ in argument %"IVdf" of %s()", + name, (IV)numargs, PL_op_desc[type]); op_free(kid); kid = newop; kid->op_sibling = sibl; @@ -4716,9 +5108,9 @@ ck_fun(OP *o) OP *newop = newHVREF(newGVOP(OP_GV, 0, gv_fetchpv(name, TRUE, SVt_PVHV) )); if (ckWARN(WARN_SYNTAX)) - warner(WARN_SYNTAX, - "Hash %%%s missing the %% in argument %ld of %s()", - name, (long)numargs, PL_op_desc[type]); + Perl_warner(aTHX_ WARN_SYNTAX, + "Hash %%%s missing the %% in argument %"IVdf" of %s()", + name, (IV)numargs, PL_op_desc[type]); op_free(kid); kid = newop; kid->op_sibling = sibl; @@ -4756,11 +5148,27 @@ ck_fun(OP *o) } else { I32 flags = OPf_SPECIAL; + I32 priv = 0; /* is this op a FH constructor? */ - if (is_handle_constructor(o,numargs)) - flags = 0; + if (is_handle_constructor(o,numargs)) { + flags = 0; + /* Set a flag to tell rv2gv to vivify + * need to "prove" flag does not mean something + * else already - NI-S 1999/05/07 + */ + priv = OPpDEREF; +#if 0 + /* Helps with open($array[$n],...) + but is too simplistic - need to do selectively + */ + mod(kid,type); +#endif + } kid->op_sibling = 0; kid = newUNOP(OP_RV2GV, flags, scalar(kid)); + if (priv) { + kid->op_private |= priv; + } } kid->op_sibling = sibl; *tokid = kid; @@ -4795,7 +5203,7 @@ ck_fun(OP *o) } OP * -ck_glob(OP *o) +Perl_ck_glob(pTHX_ OP *o) { GV *gv; @@ -4805,6 +5213,19 @@ ck_glob(OP *o) if (!((gv = gv_fetchpv("glob", FALSE, SVt_PVCV)) && GvIMPORTED_CV(gv))) gv = gv_fetchpv("CORE::GLOBAL::glob", FALSE, SVt_PVCV); +#if defined(PERL_INTERNAL_GLOB) && !defined(MINIPERL_BUILD) + /* XXX this can be tightened up and made more failsafe. */ + if (!gv) { + OP *modname = newSVOP(OP_CONST, 0, newSVpvn("File::Glob", 10)); + modname->op_private |= OPpCONST_BARE; + ENTER; + utilize(1, start_subparse(FALSE, 0), Nullop, modname, + newSVOP(OP_CONST, 0, newSVpvn("globally", 8))); + gv = gv_fetchpv("CORE::GLOBAL::glob", FALSE, SVt_PVCV); + LEAVE; + } +#endif /* PERL_INTERNAL_GLOB && !MINIPERL_BUILD */ + if (gv && GvIMPORTED_CV(gv)) { append_elem(OP_GLOB, o, newSVOP(OP_CONST, 0, newSViv(PL_glob_index++))); @@ -4828,14 +5249,14 @@ ck_glob(OP *o) } OP * -ck_grep(OP *o) +Perl_ck_grep(pTHX_ OP *o) { LOGOP *gwop; OP *kid; OPCODE type = o->op_type == OP_GREPSTART ? OP_GREPWHILE : OP_MAPWHILE; o->op_ppaddr = PL_ppaddr[OP_GREPSTART]; - Newz(1101, gwop, 1, LOGOP); + NewOp(1101, gwop, 1, LOGOP); if (o->op_flags & OPf_STACKED) { OP* k; @@ -4857,7 +5278,7 @@ ck_grep(OP *o) return o; kid = cLISTOPo->op_first->op_sibling; if (kid->op_type != OP_NULL) - croak("panic: ck_grep"); + Perl_croak(aTHX_ "panic: ck_grep"); kid = kUNOP->op_first; gwop->op_type = type; @@ -4879,7 +5300,7 @@ ck_grep(OP *o) } OP * -ck_index(OP *o) +Perl_ck_index(pTHX_ OP *o) { if (o->op_flags & OPf_KIDS) { OP *kid = cLISTOPo->op_first->op_sibling; /* get past pushmark */ @@ -4892,28 +5313,59 @@ ck_index(OP *o) } OP * -ck_lengthconst(OP *o) +Perl_ck_lengthconst(pTHX_ OP *o) { /* XXX length optimization goes here */ return ck_fun(o); } OP * -ck_lfun(OP *o) +Perl_ck_lfun(pTHX_ OP *o) { OPCODE type = o->op_type; return modkids(ck_fun(o), type); } OP * -ck_rfun(OP *o) +Perl_ck_defined(pTHX_ OP *o) /* 19990527 MJD */ +{ + dTHR; + if ((o->op_flags & OPf_KIDS) && ckWARN(WARN_DEPRECATED)) { + switch (cUNOPo->op_first->op_type) { + case OP_RV2AV: + break; /* Globals via GV can be undef */ + case OP_PADAV: + case OP_AASSIGN: /* Is this a good idea? */ + Perl_warner(aTHX_ WARN_DEPRECATED, + "defined(@array) is deprecated"); + Perl_warner(aTHX_ WARN_DEPRECATED, + "(Maybe you should just omit the defined()?)\n"); + break; + case OP_RV2HV: + break; /* Globals via GV can be undef */ + case OP_PADHV: + Perl_warner(aTHX_ WARN_DEPRECATED, + "defined(%hash) is deprecated"); + Perl_warner(aTHX_ WARN_DEPRECATED, + "(Maybe you should just omit the defined()?)\n"); + break; + default: + /* no warning */ + break; + } + } + return ck_rfun(o); +} + +OP * +Perl_ck_rfun(pTHX_ OP *o) { OPCODE type = o->op_type; return refkids(ck_fun(o), type); } OP * -ck_listiob(OP *o) +Perl_ck_listiob(pTHX_ OP *o) { register OP *kid; @@ -4951,7 +5403,7 @@ ck_listiob(OP *o) } OP * -ck_fun_locale(OP *o) +Perl_ck_fun_locale(pTHX_ OP *o) { o = ck_fun(o); @@ -4965,7 +5417,59 @@ ck_fun_locale(OP *o) } OP * -ck_scmp(OP *o) +Perl_ck_sassign(pTHX_ OP *o) +{ + OP *kid = cLISTOPo->op_first; + /* has a disposable target? */ + if ((PL_opargs[kid->op_type] & OA_TARGLEX) + && !(kid->op_flags & OPf_STACKED)) + { + OP *kkid = kid->op_sibling; + + /* Can just relocate the target. */ + if (kkid && kkid->op_type == OP_PADSV + && !(kkid->op_private & OPpLVAL_INTRO)) + { + /* Concat has problems if target is equal to right arg. */ + if (kid->op_type == OP_CONCAT) { + if (kLISTOP->op_first->op_sibling->op_type == OP_PADSV + && kLISTOP->op_first->op_sibling->op_targ == kkid->op_targ) + return o; + } + else if (kid->op_type == OP_JOIN) { + /* do_join has problems if the arguments coincide with target. + In fact the second argument *can* safely coincide, + but ignore=pessimize this rare occasion. */ + OP *arg = kLISTOP->op_first->op_sibling; /* Skip PUSHMARK */ + + while (arg) { + if (arg->op_type == OP_PADSV + && arg->op_targ == kkid->op_targ) + return o; + arg = arg->op_sibling; + } + } + else if (kid->op_type == OP_QUOTEMETA) { + /* quotemeta has problems if the argument coincides with target. */ + if (kLISTOP->op_first->op_type == OP_PADSV + && kLISTOP->op_first->op_targ == kkid->op_targ) + return o; + } + kid->op_targ = kkid->op_targ; + /* Now we do not need PADSV and SASSIGN. */ + kid->op_sibling = o->op_sibling; /* NULL */ + cLISTOPo->op_first = NULL; + op_free(o); + op_free(kkid); + kid->op_private |= OPpTARGET_MY; /* Used for context settings */ + return kid; + } + } + return o; +} + +OP * +Perl_ck_scmp(pTHX_ OP *o) { o->op_private = 0; #ifdef USE_LOCALE @@ -4977,20 +5481,40 @@ ck_scmp(OP *o) } OP * -ck_match(OP *o) +Perl_ck_match(pTHX_ OP *o) { o->op_private |= OPpRUNTIME; return o; } OP * -ck_null(OP *o) +Perl_ck_method(pTHX_ OP *o) +{ + OP *kid = cUNOPo->op_first; + if (kid->op_type == OP_CONST) { + SV* sv = kSVOP->op_sv; + if (!(strchr(SvPVX(sv), ':') || strchr(SvPVX(sv), '\''))) { + OP *cmop; + sv_upgrade(sv, SVt_PVIV); + SvIOK_on(sv); + PERL_HASH(SvUVX(sv), SvPVX(sv), SvCUR(sv)); + cmop = newSVOP(OP_METHOD_NAMED, 0, sv); + kSVOP->op_sv = Nullsv; + op_free(o); + return cmop; + } + } + return o; +} + +OP * +Perl_ck_null(pTHX_ OP *o) { return o; } OP * -ck_repeat(OP *o) +Perl_ck_repeat(pTHX_ OP *o) { if (cBINOPo->op_first->op_flags & OPf_PARENS) { o->op_private |= OPpREPEAT_DOLIST; @@ -5002,7 +5526,7 @@ ck_repeat(OP *o) } OP * -ck_require(OP *o) +Perl_ck_require(pTHX_ OP *o) { if (o->op_flags & OPf_KIDS) { /* Shall we supply missing .pm? */ SVOP *kid = (SVOP*)cUNOPo->op_first; @@ -5024,16 +5548,16 @@ ck_require(OP *o) #if 0 OP * -ck_retarget(OP *o) +Perl_ck_retarget(pTHX_ OP *o) { - croak("NOT IMPL LINE %d",__LINE__); + Perl_croak(aTHX_ "NOT IMPL LINE %d",__LINE__); /* STUB */ return o; } #endif OP * -ck_select(OP *o) +Perl_ck_select(pTHX_ OP *o) { OP* kid; if (o->op_flags & OPf_KIDS) { @@ -5053,7 +5577,7 @@ ck_select(OP *o) } OP * -ck_shift(OP *o) +Perl_ck_shift(pTHX_ OP *o) { I32 type = o->op_type; @@ -5082,7 +5606,7 @@ ck_shift(OP *o) } OP * -ck_sort(OP *o) +Perl_ck_sort(pTHX_ OP *o) { o->op_private = 0; #ifdef USE_LOCALE @@ -5090,12 +5614,12 @@ ck_sort(OP *o) o->op_private |= OPpLOCALE; #endif - if (o->op_flags & OPf_STACKED) + if (o->op_type == OP_SORT && o->op_flags & OPf_STACKED) simplify_sort(o); if (o->op_flags & OPf_STACKED) { /* may have been cleared */ OP *kid = cLISTOPo->op_first->op_sibling; /* get past pushmark */ OP *k; - kid = kUNOP->op_first; /* get past rv2gv */ + kid = kUNOP->op_first; /* get past null */ if (kid->op_type == OP_SCOPE || kid->op_type == OP_LEAVE) { linklist(kid); @@ -5120,7 +5644,6 @@ ck_sort(OP *o) peep(k); kid = cLISTOPo->op_first->op_sibling; /* get past pushmark */ - null(kid); /* wipe out rv2gv */ if (o->op_type == OP_SORT) kid->op_next = kid; else @@ -5135,7 +5658,7 @@ ck_sort(OP *o) } STATIC void -simplify_sort(OP *o) +S_simplify_sort(pTHX_ OP *o) { dTHR; register OP *kid = cLISTOPo->op_first->op_sibling; /* get past pushmark */ @@ -5143,7 +5666,9 @@ simplify_sort(OP *o) int reversed; if (!(o->op_flags & OPf_STACKED)) return; - kid = kUNOP->op_first; /* get past rv2gv */ + GvMULTI_on(gv_fetchpv("a", TRUE, SVt_PV)); + GvMULTI_on(gv_fetchpv("b", TRUE, SVt_PV)); + kid = kUNOP->op_first; /* get past null */ if (kid->op_type != OP_SCOPE) return; kid = kLISTOP->op_last; /* get past scope */ @@ -5162,11 +5687,11 @@ simplify_sort(OP *o) if (kUNOP->op_first->op_type != OP_GV) return; kid = kUNOP->op_first; /* get past rv2sv */ - if (GvSTASH(kGVOP->op_gv) != PL_curstash) + if (GvSTASH((GV*)kSVOP->op_sv) != PL_curstash) return; - if (strEQ(GvNAME(kGVOP->op_gv), "a")) + if (strEQ(GvNAME((GV*)kSVOP->op_sv), "a")) reversed = 0; - else if(strEQ(GvNAME(kGVOP->op_gv), "b")) + else if(strEQ(GvNAME((GV*)kSVOP->op_sv), "b")) reversed = 1; else return; @@ -5177,10 +5702,10 @@ simplify_sort(OP *o) if (kUNOP->op_first->op_type != OP_GV) return; kid = kUNOP->op_first; /* get past rv2sv */ - if (GvSTASH(kGVOP->op_gv) != PL_curstash + if (GvSTASH((GV*)kSVOP->op_sv) != PL_curstash || ( reversed - ? strNE(GvNAME(kGVOP->op_gv), "a") - : strNE(GvNAME(kGVOP->op_gv), "b"))) + ? strNE(GvNAME((GV*)kSVOP->op_sv), "a") + : strNE(GvNAME((GV*)kSVOP->op_sv), "b"))) return; o->op_flags &= ~(OPf_STACKED | OPf_SPECIAL); if (reversed) @@ -5189,13 +5714,14 @@ simplify_sort(OP *o) o->op_private |= OPpSORT_NUMERIC; if (k->op_type == OP_I_NCMP) o->op_private |= OPpSORT_NUMERIC | OPpSORT_INTEGER; - op_free(cLISTOPo->op_first->op_sibling); /* delete comparison block */ - cLISTOPo->op_first->op_sibling = cLISTOPo->op_last; - cLISTOPo->op_children = 1; + kid = cLISTOPo->op_first->op_sibling; + cLISTOPo->op_first->op_sibling = kid->op_sibling; /* bypass old block */ + op_free(kid); /* then delete it */ + cLISTOPo->op_children--; } OP * -ck_split(OP *o) +Perl_ck_split(pTHX_ OP *o) { register OP *kid; @@ -5204,12 +5730,12 @@ ck_split(OP *o) kid = cLISTOPo->op_first; if (kid->op_type != OP_NULL) - croak("panic: ck_split"); + Perl_croak(aTHX_ "panic: ck_split"); kid = kid->op_sibling; op_free(cLISTOPo->op_first); cLISTOPo->op_first = kid; if (!kid) { - cLISTOPo->op_first = kid = newSVOP(OP_CONST, 0, newSVpv(" ", 1)); + cLISTOPo->op_first = kid = newSVOP(OP_CONST, 0, newSVpvn(" ", 1)); cLISTOPo->op_last = kid; /* There was only one element previously */ } @@ -5246,7 +5772,24 @@ ck_split(OP *o) } OP * -ck_subr(OP *o) +Perl_ck_join(pTHX_ OP *o) +{ + if (ckWARN(WARN_SYNTAX)) { + OP *kid = cLISTOPo->op_first->op_sibling; + if (kid && kid->op_type == OP_MATCH) { + char *pmstr = "STRING"; + if (kPMOP->op_pmregexp) + pmstr = kPMOP->op_pmregexp->precomp; + Perl_warner(aTHX_ WARN_SYNTAX, + "/%s/ should probably be written as \"%s\"", + pmstr, pmstr); + } + } + return ck_fun(o); +} + +OP * +Perl_ck_subr(pTHX_ OP *o) { dTHR; OP *prev = ((cUNOPo->op_first->op_sibling) @@ -5260,20 +5803,32 @@ ck_subr(OP *o) I32 arg = 0; STRLEN n_a; + o->op_private |= OPpENTERSUB_HASTARG; for (cvop = o2; cvop->op_sibling; cvop = cvop->op_sibling) ; if (cvop->op_type == OP_RV2CV) { SVOP* tmpop; o->op_private |= (cvop->op_private & OPpENTERSUB_AMPER); null(cvop); /* disable rv2cv */ tmpop = (SVOP*)((UNOP*)cvop)->op_first; - if (tmpop->op_type == OP_GV) { + if (tmpop->op_type == OP_GV && !(o->op_private & OPpENTERSUB_AMPER)) { cv = GvCVu(tmpop->op_sv); - if (cv && SvPOK(cv) && !(o->op_private & OPpENTERSUB_AMPER)) { + if (!cv) + tmpop->op_private |= OPpEARLY_CV; + else if (SvPOK(cv)) { namegv = CvANON(cv) ? (GV*)tmpop->op_sv : CvGV(cv); proto = SvPV((SV*)cv, n_a); } } } + else if (cvop->op_type == OP_METHOD || cvop->op_type == OP_METHOD_NAMED) { + if (o2->op_type == OP_CONST) + o2->op_private &= ~OPpCONST_STRICT; + else if (o2->op_type == OP_LIST) { + OP *o = ((UNOP*)o2)->op_first->op_sibling; + if (o && o->op_type == OP_CONST) + o->op_private &= ~OPpCONST_STRICT; + } + } o->op_private |= (PL_hints & HINT_STRICT_REFS); if (PERLDB_SUB && PL_curstash != PL_debstash) o->op_private |= OPpENTERSUB_DB; @@ -5308,6 +5863,35 @@ ck_subr(OP *o) arg++; if (o2->op_type == OP_RV2GV) goto wrapref; /* autoconvert GLOB -> GLOBref */ + else if (o2->op_type == OP_CONST) + o2->op_private &= ~OPpCONST_STRICT; + else if (o2->op_type == OP_ENTERSUB) { + /* accidental subroutine, revert to bareword */ + OP *gvop = ((UNOP*)o2)->op_first; + if (gvop && gvop->op_type == OP_NULL) { + gvop = ((UNOP*)gvop)->op_first; + if (gvop) { + for (; gvop->op_sibling; gvop = gvop->op_sibling) + ; + if (gvop && + (gvop->op_private & OPpENTERSUB_NOPAREN) && + (gvop = ((UNOP*)gvop)->op_first) && + gvop->op_type == OP_GV) + { + GV *gv = (GV*)((SVOP*)gvop)->op_sv; + OP *sibling = o2->op_sibling; + SV *n = newSVpvn("",0); + op_free(o2); + gv_fullname3(n, gv, ""); + if (SvCUR(n)>6 && strnEQ(SvPVX(n),"main::",6)) + sv_chop(n, SvPVX(n)+6); + o2 = newSVOP(OP_CONST, 0, n); + prev->op_sibling = o2; + o2->op_sibling = sibling; + } + } + } + } scalar(o2); break; case '\\': @@ -5325,6 +5909,8 @@ ck_subr(OP *o) case '$': if (o2->op_type != OP_RV2SV && o2->op_type != OP_PADSV + && o2->op_type != OP_HELEM + && o2->op_type != OP_AELEM && o2->op_type != OP_THREADSV) { bad_type(arg, "scalar", gv_ename(namegv), o2); @@ -5355,7 +5941,7 @@ ck_subr(OP *o) continue; default: oops: - croak("Malformed prototype for %s: %s", + Perl_croak(aTHX_ "Malformed prototype for %s: %s", gv_ename(namegv), SvPV((SV*)cv, n_a)); } } @@ -5372,23 +5958,26 @@ ck_subr(OP *o) } OP * -ck_svconst(OP *o) +Perl_ck_svconst(pTHX_ OP *o) { SvREADONLY_on(cSVOPo->op_sv); return o; } OP * -ck_trunc(OP *o) +Perl_ck_trunc(pTHX_ OP *o) { if (o->op_flags & OPf_KIDS) { SVOP *kid = (SVOP*)cUNOPo->op_first; if (kid->op_type == OP_NULL) kid = (SVOP*)kid->op_sibling; - if (kid && - kid->op_type == OP_CONST && (kid->op_private & OPpCONST_BARE)) + if (kid && kid->op_type == OP_CONST && + (kid->op_private & OPpCONST_BARE)) + { o->op_flags |= OPf_SPECIAL; + kid->op_private &= ~OPpCONST_STRICT; + } } return ck_fun(o); } @@ -5396,11 +5985,12 @@ ck_trunc(OP *o) /* A peephole optimizer. We visit the ops in the order they're to execute. */ void -peep(register OP *o) +Perl_peep(pTHX_ register OP *o) { dTHR; register OP* oldop = 0; STRLEN n_a; + OP *last_composite = Nullop; if (!o || o->op_seq) return; @@ -5414,22 +6004,49 @@ peep(register OP *o) PL_op_seqmax++; PL_op = o; switch (o->op_type) { + case OP_SETSTATE: case OP_NEXTSTATE: case OP_DBSTATE: PL_curcop = ((COP*)o); /* for warnings */ o->op_seq = PL_op_seqmax++; + last_composite = Nullop; break; - case OP_CONCAT: case OP_CONST: - case OP_JOIN: + if (cSVOPo->op_private & OPpCONST_STRICT) + no_bareword_allowed(o); + /* FALL THROUGH */ case OP_UC: case OP_UCFIRST: case OP_LC: case OP_LCFIRST: + if ( o->op_next && o->op_next->op_type == OP_STRINGIFY + && !(o->op_next->op_private & OPpTARGET_MY) ) + null(o->op_next); + o->op_seq = PL_op_seqmax++; + break; + case OP_CONCAT: + case OP_JOIN: case OP_QUOTEMETA: - if (o->op_next && o->op_next->op_type == OP_STRINGIFY) + if (o->op_next && o->op_next->op_type == OP_STRINGIFY) { + if (o->op_next->op_private & OPpTARGET_MY) { + if ((o->op_flags & OPf_STACKED) /* chained concats */ + || (o->op_type == OP_CONCAT + /* Concat has problems if target is equal to right arg. */ + && (((LISTOP*)o)->op_first->op_sibling->op_type + == OP_PADSV) + && (((LISTOP*)o)->op_first->op_sibling->op_targ + == o->op_next->op_targ))) { + goto ignore_optimization; + } + else { + o->op_targ = o->op_next->op_targ; + o->op_private |= OPpTARGET_MY; + } + } null(o->op_next); + } + ignore_optimization: o->op_seq = PL_op_seqmax++; break; case OP_STUB: @@ -5439,8 +6056,12 @@ peep(register OP *o) } goto nothin; case OP_NULL: - if (o->op_targ == OP_NEXTSTATE || o->op_targ == OP_DBSTATE) + if (o->op_targ == OP_NEXTSTATE + || o->op_targ == OP_DBSTATE + || o->op_targ == OP_SETSTATE) + { PL_curcop = ((COP*)o); + } goto nothin; case OP_SCALAR: case OP_LINESEQ: @@ -5475,7 +6096,6 @@ peep(register OP *o) <= 255 && i >= 0) { - SvREFCNT_dec(((SVOP*)pop)->op_sv); null(o->op_next); null(pop->op_next); null(pop); @@ -5484,9 +6104,21 @@ peep(register OP *o) o->op_type = OP_AELEMFAST; o->op_ppaddr = PL_ppaddr[OP_AELEMFAST]; o->op_private = (U8)i; - GvAVn(((GVOP*)o)->op_gv); + GvAVn((GV*)((SVOP*)o)->op_sv); + } + } + else if ((o->op_private & OPpEARLY_CV) && ckWARN(WARN_UNSAFE)) { + GV *gv = (GV*)cSVOPo->op_sv; + if (SvTYPE(gv) == SVt_PVGV && GvCV(gv) && SvPVX(GvCV(gv))) { + /* XXX could check prototype here instead of just carping */ + SV *sv = sv_newmortal(); + gv_efullname3(sv, gv, Nullch); + Perl_warner(aTHX_ WARN_UNSAFE, + "%s() called too early to check prototype", + SvPV_nolen(sv)); } } + o->op_seq = PL_op_seqmax++; break; @@ -5494,18 +6126,16 @@ peep(register OP *o) case OP_GREPWHILE: case OP_AND: case OP_OR: + case OP_ANDASSIGN: + case OP_ORASSIGN: + case OP_COND_EXPR: + case OP_RANGE: o->op_seq = PL_op_seqmax++; while (cLOGOP->op_other->op_type == OP_NULL) cLOGOP->op_other = cLOGOP->op_other->op_next; peep(cLOGOP->op_other); break; - case OP_COND_EXPR: - o->op_seq = PL_op_seqmax++; - peep(cCONDOP->op_true); - peep(cCONDOP->op_false); - break; - case OP_ENTERLOOP: o->op_seq = PL_op_seqmax++; peep(cLOOP->op_redoop); @@ -5531,8 +6161,8 @@ peep(register OP *o) line_t oldline = PL_curcop->cop_line; PL_curcop->cop_line = ((COP*)o->op_next)->cop_line; - warner(WARN_SYNTAX, "Statement unlikely to be reached"); - warner(WARN_SYNTAX, "(Maybe you meant system() when you said exec()?)\n"); + Perl_warner(aTHX_ WARN_SYNTAX, "Statement unlikely to be reached"); + Perl_warner(aTHX_ WARN_SYNTAX, "(Maybe you meant system() when you said exec()?)\n"); PL_curcop->cop_line = oldline; } } @@ -5547,7 +6177,7 @@ peep(register OP *o) char *key; STRLEN keylen; - if (o->op_private & (OPpDEREF_HV|OPpDEREF_AV|OPpLVAL_INTRO) + if ((o->op_private & (OPpLVAL_INTRO)) || ((BINOP*)o)->op_last->op_type != OP_CONST) break; rop = (UNOP*)((BINOP*)o)->op_first; @@ -5563,12 +6193,12 @@ peep(register OP *o) key = SvPV(*svp, keylen); indsvp = hv_fetch(GvHV(*fields), key, keylen, FALSE); if (!indsvp) { - croak("No such field \"%s\" in variable %s of type %s", + Perl_croak(aTHX_ "No such pseudo-hash field \"%s\" in variable %s of type %s", key, SvPV(lexname, n_a), HvNAME(SvSTASH(lexname))); } ind = SvIV(*indsvp); if (ind < 1) - croak("Bad index while coercing array into hash"); + Perl_croak(aTHX_ "Bad index while coercing array into hash"); rop->op_type = OP_RV2AV; rop->op_ppaddr = PL_ppaddr[OP_RV2AV]; o->op_type = OP_AELEM; @@ -5578,6 +6208,42 @@ peep(register OP *o) break; } + case OP_RV2AV: + case OP_RV2HV: + if (!(o->op_flags & OPf_WANT) + || (o->op_flags & OPf_WANT) == OPf_WANT_LIST) + { + last_composite = o; + } + o->op_seq = PL_op_seqmax++; + break; + + case OP_RETURN: + if (o->op_next && o->op_next->op_type != OP_LEAVESUBLV) { + o->op_seq = PL_op_seqmax++; + break; + } + /* FALL THROUGH */ + + case OP_LEAVESUBLV: + if (last_composite) { + OP *r = last_composite; + + while (r->op_sibling) + r = r->op_sibling; + if (r->op_next == o + || (r->op_next->op_type == OP_LIST + && r->op_next->op_next == o)) + { + if (last_composite->op_type == OP_RV2AV) + yyerror("Lvalue subs returning arrays not implemented yet"); + else + yyerror("Lvalue subs returning hashes not implemented yet"); + ; + } + } + /* FALL THROUGH */ + default: o->op_seq = PL_op_seqmax++; break;