#include "EXTERN.h"
#include "perl.h"
+#define USE_OP_MASK /* Turned on by default in 5.002beta1h */
+
+#ifdef USE_OP_MASK
+/*
+ * In the following definition, the ", (OP *) op" is just to make the compiler
+ * think the expression is of the right type: croak actually does a Siglongjmp.
+ */
+#define CHECKOP(type,op) \
+ ((op_mask && op_mask[type]) \
+ ? (croak("%s trapped by operation mask", op_desc[type]), (OP*)op) \
+ : (*check[type])((OP*)op))
+#else
+#define CHECKOP(type,op) (*check[type])(op)
+#endif /* USE_OP_MASK */
+
static I32 list_assignment _((OP *op));
-static OP *bad_type _((I32 n, char *t, OP *op, OP *kid));
+static OP *bad_type _((I32 n, char *t, char *name, OP *kid));
static OP *modkids _((OP *op, I32 type));
static OP *no_fh_allowed _((OP *op));
static OP *scalarboolean _((OP *op));
-static OP *too_few_arguments _((OP *op));
-static OP *too_many_arguments _((OP *op));
+static OP *too_few_arguments _((OP *op, char* name));
+static OP *too_many_arguments _((OP *op, char* name));
static void null _((OP* op));
+static PADOFFSET pad_findlex _((char* name, PADOFFSET newoff, I32 seq,
+ CV* startcv, I32 cx_ix));
+
+static char*
+CvNAME(cv)
+CV* cv;
+{
+ SV* tmpsv = sv_newmortal();
+ gv_efullname(tmpsv, CvGV(cv));
+ return SvPV(tmpsv,na);
+}
static OP *
no_fh_allowed(op)
OP *op;
{
sprintf(tokenbuf,"Missing comma after first argument to %s function",
- op_name[op->op_type]);
+ op_desc[op->op_type]);
yyerror(tokenbuf);
return op;
}
static OP *
-too_few_arguments(op)
-OP *op;
+too_few_arguments(op, name)
+OP* op;
+char* name;
{
- sprintf(tokenbuf,"Not enough arguments for %s", op_name[op->op_type]);
+ sprintf(tokenbuf,"Not enough arguments for %s", name);
yyerror(tokenbuf);
return op;
}
static OP *
-too_many_arguments(op)
+too_many_arguments(op, name)
OP *op;
+char* name;
{
- sprintf(tokenbuf,"Too many arguments for %s", op_name[op->op_type]);
+ sprintf(tokenbuf,"Too many arguments for %s", name);
yyerror(tokenbuf);
return op;
}
static OP *
-bad_type(n, t, op, kid)
+bad_type(n, t, name, kid)
I32 n;
char *t;
-OP *op;
+char *name;
OP *kid;
{
sprintf(tokenbuf, "Type of arg %d to %s must be %s (not %s)",
- (int) n, op_name[op->op_type], t, op_name[kid->op_type]);
+ (int) n, name, t, op_desc[kid->op_type]);
yyerror(tokenbuf);
return op;
}
{
int type = op->op_type;
if (type != OP_AELEM && type != OP_HELEM) {
- sprintf(tokenbuf, "Can't use %s as left arg of implicit ->",
- op_name[type]);
+ sprintf(tokenbuf, "Can't use subscript on %s", op_desc[type]);
yyerror(tokenbuf);
if (type == OP_RV2HV || type == OP_ENTERSUB)
- warn("(Did you mean $ instead of %c?)\n",
+ warn("(Did you mean $ or @ instead of %c?)\n",
type == OP_RV2HV ? '%' : '&');
}
}
sv_upgrade(sv, SVt_PVNV);
sv_setpv(sv, name);
av_store(comppad_name, off, sv);
- SvNVX(sv) = (double)cop_seqmax;
+ SvNVX(sv) = (double)999999999;
SvIVX(sv) = 0; /* Not yet introduced--see newSTATEOP */
if (!min_intro_pending)
min_intro_pending = off;
return off;
}
-PADOFFSET
-pad_findmy(name)
+static PADOFFSET
+#ifndef CAN_PROTOTYPE
+pad_findlex(name, newoff, seq, startcv, cx_ix)
char *name;
+PADOFFSET newoff;
+I32 seq;
+CV* startcv;
+I32 cx_ix;
+#else
+pad_findlex(char *name, PADOFFSET newoff, I32 seq, CV* startcv, I32 cx_ix)
+#endif
{
+ CV *cv;
I32 off;
SV *sv;
- SV **svp = AvARRAY(comppad_name);
register I32 i;
register CONTEXT *cx;
int saweval;
- AV *curlist;
- AV *curname;
- CV *cv;
- I32 seq = cop_seqmax;
- /* The one we're looking for is probably just before comppad_name_fill. */
- for (off = comppad_name_fill; off > 0; off--) {
- if ((sv = svp[off]) &&
- sv != &sv_undef &&
- seq <= SvIVX(sv) &&
- seq > (I32)SvNVX(sv) &&
- strEQ(SvPVX(sv), name))
- {
- return (PADOFFSET)off;
+ for (cv = startcv; cv; cv = CvOUTSIDE(cv)) {
+ AV* curlist = CvPADLIST(cv);
+ SV** svp = av_fetch(curlist, 0, FALSE);
+ AV *curname;
+ if (!svp || *svp == &sv_undef)
+ continue;
+ curname = (AV*)*svp;
+ svp = AvARRAY(curname);
+ for (off = AvFILL(curname); off > 0; off--) {
+ if ((sv = svp[off]) &&
+ sv != &sv_undef &&
+ seq <= SvIVX(sv) &&
+ seq > (I32)SvNVX(sv) &&
+ strEQ(SvPVX(sv), name))
+ {
+ I32 depth = CvDEPTH(cv) ? CvDEPTH(cv) : 1;
+ AV *oldpad = (AV*)*av_fetch(curlist, depth, FALSE);
+ SV *oldsv = *av_fetch(oldpad, off, TRUE);
+ if (!newoff) { /* Not a mere clone operation. */
+ SV *sv = NEWSV(1103,0);
+ newoff = pad_alloc(OP_PADSV, SVs_PADMY);
+ sv_upgrade(sv, SVt_PVNV);
+ sv_setpv(sv, name);
+ av_store(comppad_name, newoff, sv);
+ SvNVX(sv) = (double)curcop->cop_seq;
+ SvIVX(sv) = 999999999; /* A ref, intro immediately */
+ SvFLAGS(sv) |= SVf_FAKE;
+ }
+ av_store(comppad, newoff, SvREFCNT_inc(oldsv));
+ CvCLONE_on(compcv);
+ return newoff;
+ }
}
}
*/
saweval = 0;
- for (i = cxstack_ix; i >= 0; i--) {
+ for (i = cx_ix; i >= 0; i--) {
cx = &cxstack[i];
switch (cx->cx_type) {
default:
+ if (i == 0 && saweval) {
+ seq = cxstack[saweval].blk_oldcop->cop_seq;
+ return pad_findlex(name, newoff, seq, main_cv, 0);
+ }
break;
case CXt_EVAL:
+ if (cx->blk_eval.old_op_type != OP_ENTEREVAL &&
+ cx->blk_eval.old_op_type != OP_ENTERTRY)
+ return 0; /* require must have its own scope */
saweval = i;
break;
case CXt_SUB:
if (!saweval)
return 0;
cv = cx->blk_sub.cv;
- if (debstash && CvSTASH(cv) == debstash) /* ignore DB'* scope */
+ if (debstash && CvSTASH(cv) == debstash) { /* ignore DB'* scope */
+ saweval = i; /* so we know where we were called from */
continue;
- seq = cxstack[saweval].blk_oldcop->cop_seq;
- curlist = CvPADLIST(cv);
- curname = (AV*)*av_fetch(curlist, 0, FALSE);
- svp = AvARRAY(curname);
- for (off = AvFILL(curname); off > 0; off--) {
- if ((sv = svp[off]) &&
- sv != &sv_undef &&
- seq <= SvIVX(sv) &&
- seq > (I32)SvNVX(sv) &&
- strEQ(SvPVX(sv), name))
- {
- PADOFFSET newoff = pad_alloc(OP_PADSV, SVs_PADMY);
- AV *oldpad = (AV*)*av_fetch(curlist, CvDEPTH(cv), FALSE);
- SV *oldsv = *av_fetch(oldpad, off, TRUE);
- SV *sv = NEWSV(1103,0);
- sv_upgrade(sv, SVt_PVNV);
- sv_setpv(sv, name);
- av_store(comppad_name, newoff, sv);
- SvNVX(sv) = (double)curcop->cop_seq;
- SvIVX(sv) = 999999999; /* A ref, intro immediately */
- av_store(comppad, newoff, SvREFCNT_inc(oldsv));
- return newoff;
- }
}
- return 0;
+ seq = cxstack[saweval].blk_oldcop->cop_seq;
+ return pad_findlex(name, newoff, seq, cv, i-1);
}
}
- if (!saweval)
- return 0;
+ return 0;
+}
+
+PADOFFSET
+pad_findmy(name)
+char *name;
+{
+ I32 off;
+ SV *sv;
+ SV **svp = AvARRAY(comppad_name);
+ I32 seq = cop_seqmax;
- /* It's stupid to dup this code. main should be stored in a CV. */
- seq = cxstack[saweval].blk_oldcop->cop_seq;
- svp = AvARRAY(padname);
- for (off = AvFILL(padname); off > 0; off--) {
+ /* The one we're looking for is probably just before comppad_name_fill. */
+ for (off = AvFILL(comppad_name); off > 0; off--) {
if ((sv = svp[off]) &&
sv != &sv_undef &&
seq <= SvIVX(sv) &&
seq > (I32)SvNVX(sv) &&
strEQ(SvPVX(sv), name))
{
- PADOFFSET newoff = pad_alloc(OP_PADSV, SVs_PADMY);
- SV *oldsv = *av_fetch(pad, off, TRUE);
- SV *sv = NEWSV(1103,0);
- sv_upgrade(sv, SVt_PVNV);
- sv_setpv(sv, name);
- av_store(comppad_name, newoff, sv);
- SvNVX(sv) = (double)curcop->cop_seq;
- SvIVX(sv) = 999999999; /* A ref, intro immediately */
- av_store(comppad, newoff, SvREFCNT_inc(oldsv));
- return newoff;
+ return (PADOFFSET)off;
}
}
+
+ /* See if it's in a nested scope */
+ off = pad_findlex(name, 0, seq, CvOUTSIDE(compcv), cxstack_ix);
+ if (off)
+ return off;
+
return 0;
}
}
/* "Deintroduce" my variables that are leaving with this scope. */
for (off = AvFILL(comppad_name); off > fill; off--) {
- if ((sv = svp[off]) && sv != &sv_undef)
+ if ((sv = svp[off]) && sv != &sv_undef && SvIVX(sv) == 999999999)
SvIVX(sv) = cop_seqmax;
}
}
if (AvARRAY(comppad) != curpad)
croak("panic: pad_reset curpad");
DEBUG_X(fprintf(stderr, "Pad reset\n"));
- for (po = AvMAX(comppad); po > padix_floor; po--) {
- if (curpad[po] && curpad[po] != &sv_undef)
- SvPADTMP_off(curpad[po]);
+ if (!tainting) { /* Can't mix tainted and non-tainted temporaries. */
+ for (po = AvMAX(comppad); po > padix_floor; po--) {
+ if (curpad[po] && curpad[po] != &sv_undef)
+ SvPADTMP_off(curpad[po]);
+ }
+ padix = padix_floor;
}
- padix = padix_floor;
pad_reset_pending = FALSE;
}
}
}
-
switch (op->op_type) {
case OP_NULL:
op->op_targ = 0; /* Was holding old type, if any. */
case OP_CONST:
SvREFCNT_dec(cSVOP->op_sv);
break;
+ case OP_GOTO:
+ case OP_NEXT:
+ case OP_LAST:
+ case OP_REDO:
+ if (op->op_flags & (OPf_SPECIAL|OPf_STACKED|OPf_KIDS))
+ break;
+ /* FALL THROUGH */
case OP_TRANS:
Safefree(cPVOP->op_pv);
break;
case OP_SUBST:
op_free(cPMOP->op_pmreplroot);
/* FALL THROUGH */
+ case OP_PUSHRE:
case OP_MATCH:
- regfree(cPMOP->op_pmregexp);
+ pregfree(cPMOP->op_pmregexp);
+ SvREFCNT_dec(cPMOP->op_pmshort);
break;
default:
break;
switch (op->op_type) {
case OP_REPEAT:
+ if (op->op_private & OPpREPEAT_DOLIST)
+ null(((LISTOP*)cBINOP->op_first)->op_first);
scalar(cBINOP->op_first);
break;
case OP_OR:
scalar(kid);
}
break;
- case OP_SCOPE:
case OP_LEAVE:
case OP_LEAVETRY:
+ scalar(cLISTOP->op_first);
+ /* FALL THROUGH */
+ case OP_SCOPE:
case OP_LINESEQ:
case OP_LIST:
for (kid = cLISTOP->op_first; kid; kid = kid->op_sibling) {
case OP_PADHV:
case OP_PADANY:
case OP_AV2ARYLEN:
- case OP_SV2LEN:
case OP_REF:
case OP_REFGEN:
case OP_SREFGEN:
case OP_GGRGID:
case OP_GETLOGIN:
if (!(op->op_private & OPpLVAL_INTRO))
- useless = op_name[op->op_type];
+ useless = op_desc[op->op_type];
break;
case OP_RV2GV:
case OP_NEXTSTATE:
case OP_DBSTATE:
- curcop = ((COP*)op); /* for warning above */
+ curcop = ((COP*)op); /* for warning below */
break;
case OP_CONST:
case OP_REPEAT:
scalarvoid(cBINOP->op_first);
- useless = op_name[op->op_type];
+ useless = op_desc[op->op_type];
break;
case OP_OR:
scalarvoid(kid);
break;
case OP_NULL:
+ if (op->op_targ == OP_NEXTSTATE || op->op_targ == OP_DBSTATE)
+ curcop = ((COP*)op); /* for warning below */
if (op->op_flags & OPf_STACKED)
break;
case OP_ENTERTRY:
deprecate("implicit split to @_");
}
break;
+ case OP_DELETE:
+ op->op_private |= OPpLEAVE_VOID;
+ break;
}
if (useless && dowarn)
warn("Useless use of %s in void context", useless);
case OP_LIST:
listkids(op);
break;
- case OP_SCOPE:
case OP_LEAVE:
case OP_LEAVETRY:
+ list(cLISTOP->op_first);
+ /* FALL THROUGH */
+ case OP_SCOPE:
case OP_LINESEQ:
for (kid = cLISTOP->op_first; kid; kid = kid->op_sibling) {
if (kid->op_sibling)
switch (op->op_type) {
case OP_CONST:
- if (!(op->op_flags & (OPf_SPECIAL|OPf_MOD)))
+ if (!(op->op_private & (OPpCONST_ARYBASE)))
goto nomod;
if (eval_start && eval_start->op_type == OP_CONST) {
compiling.cop_arybase = (I32)SvIV(((SVOP*)eval_start)->op_sv);
}
else if (!type) {
SAVEI32(compiling.cop_arybase);
+ compiling.cop_arybase = 0;
}
else if (type == OP_REFGEN)
goto nomod;
if (type == OP_GREPSTART || type == OP_ENTERSUB || type == OP_REFGEN)
break;
sprintf(tokenbuf, "Can't modify %s in %s",
- op_name[op->op_type],
- type ? op_name[type] : "local");
+ op_desc[op->op_type],
+ type ? op_desc[type] : "local");
yyerror(tokenbuf);
return op;
case OP_RV2AV:
case OP_RV2HV:
+ if (type == OP_REFGEN && op->op_flags & OPf_PARENS) {
+ modcount = 10000;
+ return op; /* Treat \(@foo) like ordinary list. */
+ }
+ /* FALL THROUGH */
case OP_RV2GV:
ref(cUNOP->op_first, op->op_type);
/* FALL THROUGH */
- case OP_PADAV:
- case OP_PADHV:
case OP_AASSIGN:
case OP_ASLICE:
case OP_HSLICE:
modcount = 10000;
break;
case OP_RV2SV:
+ if (!type && cUNOP->op_first->op_type != OP_GV)
+ croak("Can't localize a reference");
ref(cUNOP->op_first, op->op_type);
/* FALL THROUGH */
- case OP_PADSV:
case OP_UNDEF:
case OP_GV:
case OP_AV2ARYLEN:
modcount++;
break;
- case OP_PUSHMARK:
+ case OP_PADAV:
+ case OP_PADHV:
+ modcount = 10000;
+ /* FALL THROUGH */
+ case OP_PADSV:
+ modcount++;
+ if (!type)
+ croak("Can't localize lexical variable %s",
+ SvPV(*av_fetch(comppad_name, op->op_targ, 4), na));
break;
+ case OP_PUSHMARK:
+ break;
case OP_POS:
mtype = '.';
sv_magic(sv, Nullsv, mtype, Nullch, 0);
curpad[op->op_targ] = sv;
if (op->op_flags & OPf_KIDS)
- mod(cBINOP->op_first, type);
+ mod(cBINOP->op_first->op_sibling, type);
break;
case OP_AELEM:
op->op_ppaddr = ppaddr[OP_RV2CV];
assert(cUNOP->op_first->op_type == OP_NULL);
null(((LISTOP*)cUNOP->op_first)->op_first); /* disable pushmark */
+ op->op_flags |= OPf_SPECIAL;
}
break;
break;
case OP_RV2SV:
ref(cUNOP->op_first, op->op_type);
+ /* FALL THROUGH */
+ case OP_PADSV:
if (type == OP_RV2AV || type == OP_RV2HV) {
op->op_private |= (type == OP_RV2AV ? OPpDEREF_AV : OPpDEREF_HV);
op->op_flags |= OPf_MOD;
type != OP_PADHV &&
type != OP_PUSHMARK)
{
- sprintf(tokenbuf, "Can't declare %s in my", op_name[op->op_type]);
+ sprintf(tokenbuf, "Can't declare %s in my", op_desc[op->op_type]);
yyerror(tokenbuf);
return op;
}
OP *o;
{
if (o) {
- if (o->op_flags & OPf_PARENS || perldb) {
+ if (o->op_flags & OPf_PARENS || perldb || tainting) {
o = prepend_elem(OP_LINESEQ, newOP(OP_ENTER, 0), o);
o->op_type = OP_LEAVE;
o->op_ppaddr = ppaddr[OP_LEAVE];
o->op_type = OP_SCOPE;
o->op_ppaddr = ppaddr[OP_SCOPE];
kid = ((LISTOP*)o)->op_first;
- if (kid->op_type == OP_NEXTSTATE || kid->op_type == OP_DBSTATE)
+ if (kid->op_type == OP_NEXTSTATE || kid->op_type == OP_DBSTATE){
+ SvREFCNT_dec(((COP*)kid)->cop_filegv);
null(kid);
+ }
}
else
- o = newUNOP(OP_SCOPE, 0, o);
+ o = newLISTOP(OP_SCOPE, 0, o, Nullop);
}
}
return o;
main_start = LINKLIST(main_root);
main_root->op_next = 0;
peep(main_start);
+ main_cv = compcv;
+ compcv = 0;
}
}
{
register OP *curop;
I32 type = o->op_type;
+ SV *sv;
if (opargs[type] & OA_RETSCALAR)
scalar(o);
curop = LINKLIST(o);
o->op_next = 0;
op = curop;
- run();
- if (o->op_targ && *stack_sp == PAD_SV(o->op_targ)) /* grab pad temp? */
+ runops();
+ sv = *(stack_sp--);
+ if (o->op_targ && sv == PAD_SV(o->op_targ)) /* grab pad temp? */
pad_swipe(o->op_targ);
- else if (SvTEMP(*stack_sp)) { /* grab mortal temp? */
- (void)SvREFCNT_inc(*stack_sp);
- SvTEMP_off(*stack_sp);
+ else if (SvTEMP(sv)) { /* grab mortal temp? */
+ (void)SvREFCNT_inc(sv);
+ SvTEMP_off(sv);
}
op_free(o);
if (type == OP_RV2GV)
- return newGVOP(OP_GV, 0, *(stack_sp--));
- else
- return newSVOP(OP_CONST, 0, *(stack_sp--));
+ return newGVOP(OP_GV, 0, sv);
+ else {
+ if ((SvFLAGS(sv) & (SVf_IOK|SVf_NOK|SVf_POK)) == SVf_NOK) {
+ IV iv = SvIV(sv);
+ if ((double)iv == SvNV(sv)) { /* can we smush double to int */
+ SvREFCNT_dec(sv);
+ sv = newSViv(iv);
+ }
+ }
+ return newSVOP(OP_CONST, 0, sv);
+ }
nope:
if (!(opargs[type] & OA_OTHERINT))
return o;
if (!(hints & HINT_INTEGER)) {
+ int vars = 0;
+
if (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) {
- if (SvIOK(((SVOP*)curop)->op_sv))
+ if (SvIOK(((SVOP*)curop)->op_sv)) {
+ if (SvIVX(((SVOP*)curop)->op_sv) <= 0 && vars++)
+ return o; /* negatives truncate wrong way, alas */
continue;
+ }
return o;
}
if (opargs[curop->op_type] & OA_RETINTEGER)
continue;
+ if (curop->op_type == OP_PADSV || curop->op_type == OP_RV2SV) {
+ if (vars++)
+ return o;
+ if (((o->op_type == OP_LT || o->op_type == OP_GE) &&
+ curop == ((BINOP*)o)->op_first ) ||
+ ((o->op_type == OP_GT || o->op_type == OP_LE) &&
+ curop == ((BINOP*)o)->op_last ))
+ {
+ /* Allow "$i < 100" and variants to integerize */
+ continue;
+ }
+ }
return o;
}
o->op_ppaddr = ppaddr[++(o->op_type)];
op = curop = LINKLIST(o);
o->op_next = 0;
pp_pushmark();
- run();
+ runops();
op = curop;
pp_anonlist();
tmps_floor = oldtmps_floor;
if (!op || op->op_type != OP_LIST)
op = newLISTOP(OP_LIST, 0, op, Nullop);
+ else
+ op->op_flags &= ~(OPf_KNOW|OPf_LIST);
if (!(opargs[type] & OA_MARK))
null(cLISTOP->op_first);
op->op_ppaddr = ppaddr[type];
op->op_flags |= flags;
- op = (*check[type])(op);
+ op = CHECKOP(type, op);
if (op->op_type != type)
return op;
op->op_flags = flags;
op->op_next = op;
- /* op->op_private = 0; */
+ op->op_private = 0 + (flags >> 8);
if (opargs[type] & OA_RETSCALAR)
scalar(op);
if (opargs[type] & OA_TARGET)
op->op_targ = pad_alloc(type, SVs_PADTMP);
- return (*check[type])(op);
+ return CHECKOP(type, op);
}
OP *
unop->op_ppaddr = ppaddr[type];
unop->op_first = first;
unop->op_flags = flags | OPf_KIDS;
- unop->op_private = 1;
+ unop->op_private = 1 | (flags >> 8);
- unop = (UNOP*)(*check[type])((OP*)unop);
+ unop = (UNOP*) CHECKOP(type, unop);
if (unop->op_next)
return (OP*)unop;
binop->op_flags = flags | OPf_KIDS;
if (!last) {
last = first;
- binop->op_private = 1;
+ binop->op_private = 1 | (flags >> 8);
}
else {
- binop->op_private = 2;
+ binop->op_private = 2 | (flags >> 8);
first->op_sibling = last;
}
- binop = (BINOP*)(*check[type])((OP*)binop);
+ binop = (BINOP*)CHECKOP(type, binop);
if (binop->op_next)
return (OP*)binop;
SV *rstr = ((SVOP*)repl)->op_sv;
STRLEN tlen;
STRLEN rlen;
- register char *t = SvPV(tstr, tlen);
- register char *r = SvPV(rstr, rlen);
+ register U8 *t = (U8*)SvPV(tstr, tlen);
+ register U8 *r = (U8*)SvPV(rstr, rlen);
register I32 i;
register I32 j;
- I32 squash;
I32 delete;
I32 complement;
register short *tbl;
tbl = (short*)cPVOP->op_pv;
complement = op->op_private & OPpTRANS_COMPLEMENT;
delete = op->op_private & OPpTRANS_DELETE;
- squash = op->op_private & OPpTRANS_SQUASH;
+ /* squash = op->op_private & OPpTRANS_SQUASH; */
if (complement) {
Zero(tbl, 256, short);
for (i = 0; i < tlen; i++)
- tbl[t[i] & 0377] = -1;
+ tbl[t[i]] = -1;
for (i = 0, j = 0; i < 256; i++) {
if (!tbl[i]) {
if (j >= rlen) {
if (delete)
tbl[i] = -2;
else if (rlen)
- tbl[i] = r[j-1] & 0377;
+ tbl[i] = r[j-1];
else
tbl[i] = i;
}
else
- tbl[i] = r[j++] & 0377;
+ tbl[i] = r[j++];
}
}
}
for (i = 0, j = 0; i < tlen; i++,j++) {
if (j >= rlen) {
if (delete) {
- if (tbl[t[i] & 0377] == -1)
- tbl[t[i] & 0377] = -2;
+ if (tbl[t[i]] == -1)
+ tbl[t[i]] = -2;
continue;
}
--j;
}
- if (tbl[t[i] & 0377] == -1)
- tbl[t[i] & 0377] = r[j] & 0377;
+ if (tbl[t[i]] == -1)
+ tbl[t[i]] = r[j];
}
}
op_free(expr);
pmop->op_type = type;
pmop->op_ppaddr = ppaddr[type];
pmop->op_flags = flags;
- pmop->op_private = 0;
+ pmop->op_private = 0 | (flags >> 8);
/* link into pm list */
if (type != OP_TRANS && curstash) {
p = SvPV(pat, plen);
pm->op_pmflags |= PMf_SKIPWHITE;
}
-#ifdef NOTDEF
- scan_prefix(pm, p, plen);
- if (pm->op_pmshort && (pm->op_pmflags & PMf_SCANFIRST))
- fbm_compile(pm->op_pmshort, pm->op_pmflags & PMf_FOLD);
-#endif
- pm->op_pmregexp = regcomp(p, p + plen, pm);
+ pm->op_pmregexp = pregcomp(p, p + plen, pm);
if (strEQ("\\s+", pm->op_pmregexp->precomp))
pm->op_pmflags |= PMf_WHITE;
hoistmust(pm);
}
if (repl) {
- if (repl->op_type == OP_CONST) {
- pm->op_pmflags |= PMf_CONST;
- prepend_elem(op->op_type, scalar(repl), op);
- }
+ OP *curop;
+ if (pm->op_pmflags & PMf_EVAL)
+ curop = 0;
+ else if (repl->op_type == OP_CONST)
+ curop = repl;
else {
- OP *curop;
OP *lastop = 0;
for (curop = LINKLIST(repl); curop!=repl; curop = LINKLIST(curop)) {
if (opargs[curop->op_type] & OA_DANGEROUS) {
if (lastop && lastop->op_type != OP_GV) /*funny deref?*/
break;
}
+ else if (curop->op_type == OP_PADSV ||
+ curop->op_type == OP_PADAV ||
+ curop->op_type == OP_PADHV ||
+ curop->op_type == OP_PADANY) {
+ /* is okay */
+ }
else
break;
}
lastop = curop;
}
- if (curop == repl) {
- pm->op_pmflags |= PMf_CONST; /* const for long enough */
- prepend_elem(op->op_type, scalar(repl), op);
- }
- else {
- Newz(1101, rcop, 1, LOGOP);
- rcop->op_type = OP_SUBSTCONT;
- rcop->op_ppaddr = ppaddr[OP_SUBSTCONT];
- rcop->op_first = scalar(repl);
- rcop->op_flags |= OPf_KIDS;
- rcop->op_private = 1;
- rcop->op_other = op;
-
- /* establish postfix order */
- rcop->op_next = LINKLIST(repl);
- repl->op_next = (OP*)rcop;
-
- pm->op_pmreplroot = scalar((OP*)rcop);
- pm->op_pmreplstart = LINKLIST(rcop);
- rcop->op_next = 0;
- }
+ }
+ if (curop == repl) {
+ pm->op_pmflags |= PMf_CONST; /* const for long enough */
+ pm->op_pmpermflags |= PMf_CONST; /* const for long enough */
+ prepend_elem(op->op_type, scalar(repl), op);
+ }
+ else {
+ Newz(1101, rcop, 1, LOGOP);
+ rcop->op_type = OP_SUBSTCONT;
+ rcop->op_ppaddr = ppaddr[OP_SUBSTCONT];
+ rcop->op_first = scalar(repl);
+ rcop->op_flags |= OPf_KIDS;
+ rcop->op_private = 1;
+ rcop->op_other = op;
+
+ /* establish postfix order */
+ rcop->op_next = LINKLIST(repl);
+ repl->op_next = (OP*)rcop;
+
+ pm->op_pmreplroot = scalar((OP*)rcop);
+ pm->op_pmreplstart = LINKLIST(rcop);
+ rcop->op_next = 0;
}
}
scalar((OP*)svop);
if (opargs[type] & OA_TARGET)
svop->op_targ = pad_alloc(type, SVs_PADTMP);
- return (*check[type])((OP*)svop);
+ return CHECKOP(type, svop);
}
OP *
scalar((OP*)gvop);
if (opargs[type] & OA_TARGET)
gvop->op_targ = pad_alloc(type, SVs_PADTMP);
- return (*check[type])((OP*)gvop);
+ return CHECKOP(type, gvop);
}
OP *
scalar((OP*)pvop);
if (opargs[type] & OA_TARGET)
pvop->op_targ = pad_alloc(type, SVs_PADTMP);
- return (*check[type])((OP*)pvop);
-}
-
-OP *
-newCVOP(type, flags, cv, cont)
-I32 type;
-I32 flags;
-CV *cv;
-OP *cont;
-{
- CVOP *cvop;
- Newz(1101, cvop, 1, CVOP);
- cvop->op_type = type;
- cvop->op_ppaddr = ppaddr[type];
- cvop->op_cv = cv;
- cvop->op_cont = cont;
- cvop->op_next = (OP*)cvop;
- cvop->op_flags = flags;
- if (opargs[type] & OA_RETSCALAR)
- scalar((OP*)cvop);
- if (opargs[type] & OA_TARGET)
- cvop->op_targ = pad_alloc(type, SVs_PADTMP);
- return (*check[type])((OP*)cvop);
+ return CHECKOP(type, pvop);
}
void
}
void
-utilize(aver, id, arg)
+utilize(aver, floor, id, arg)
int aver;
+I32 floor;
OP *id;
OP *arg;
{
if (id->op_type != OP_CONST)
croak("Module name must be constant");
- meth = newSVOP(OP_CONST, 0,
- aver
- ? newSVpv("import", 6)
- : newSVpv("unimport", 8)
- );
-
- /* Make copy of id so we don't free it twice */
- pack = newSVOP(OP_CONST, 0, newSVsv(((SVOP*)id)->op_sv));
-
- /* Fake up a require */
- rqop = newUNOP(OP_REQUIRE, 0, id);
-
/* Fake up an import/unimport */
- imop = convert(OP_ENTERSUB, OPf_STACKED|OPf_SPECIAL,
+ if (arg && arg->op_type == OP_STUB)
+ imop = arg; /* no import on explicit () */
+ 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)));
+ }
+
+ /* Fake up a require */
+ rqop = newUNOP(OP_REQUIRE, 0, id);
/* Fake up the BEGIN {}, which does its thing immediately. */
- newSUB(start_subparse(),
+ newSUB(floor,
newSVOP(OP_CONST, 0, newSVpv("BEGIN", 5)),
+ Nullop,
append_elem(OP_LINESEQ,
newSTATEOP(0, Nullch, rqop),
newSTATEOP(0, Nullch, imop) ));
if (list_assignment(left)) {
modcount = 0;
- eval_start = right; /* Grandfathering $[ assignment here. Bletch. */
+ eval_start = right; /* Grandfathering $[ assignment here. Bletch.*/
left = mod(left, OP_AASSIGN);
- if (!eval_start) {
+ if (eval_start)
+ eval_start = 0;
+ else {
op_free(left);
op_free(right);
return Nullop;
}
- if (right && right->op_type == OP_SPLIT) {
- if ((op = ((LISTOP*)right)->op_first) && op->op_type == OP_PUSHRE) {
- PMOP *pm = (PMOP*)op;
- if (left->op_type == OP_RV2AV &&
- !(left->op_private & OPpLVAL_INTRO) )
- {
- op = ((UNOP*)left)->op_first;
- if (op->op_type == OP_GV && !pm->op_pmreplroot) {
- pm->op_pmreplroot = (OP*)((GVOP*)op)->op_gv;
- pm->op_pmflags |= PMf_ONCE;
- op_free(left);
- return right;
- }
- }
- else {
- if (modcount < 10000) {
- SV *sv = ((SVOP*)((LISTOP*)right)->op_last)->op_sv;
- if (SvIVX(sv) == 0)
- sv_setiv(sv, modcount+1);
- }
- }
- }
- }
op = newBINOP(OP_AASSIGN, flags,
list(force_list(right)),
list(force_list(left)) );
- op->op_private = 0;
+ op->op_private = 0 | (flags >> 8);
if (!(left->op_private & OPpLVAL_INTRO)) {
- static int generation = 0;
+ static int generation = 100;
OP *curop;
OP *lastop = op;
generation++;
break;
SvCUR(gv) = generation;
}
+ else if (curop->op_type == OP_PADSV ||
+ curop->op_type == OP_PADAV ||
+ curop->op_type == OP_PADHV ||
+ curop->op_type == OP_PADANY) {
+ SV **svp = AvARRAY(comppad_name);
+ SV *sv = svp[curop->op_targ];
+ if (SvCUR(sv) == generation)
+ break;
+ SvCUR(sv) = generation; /* (SvCUR not used any more) */
+ }
else if (curop->op_type == OP_RV2CV)
break;
else if (curop->op_type == OP_RV2SV ||
if (curop != op)
op->op_private = OPpASSIGN_COMMON;
}
+ if (right && right->op_type == OP_SPLIT) {
+ OP* tmpop;
+ if ((tmpop = ((LISTOP*)right)->op_first) &&
+ tmpop->op_type == OP_PUSHRE)
+ {
+ PMOP *pm = (PMOP*)tmpop;
+ if (left->op_type == OP_RV2AV &&
+ !(left->op_private & OPpLVAL_INTRO) &&
+ !(op->op_private & OPpASSIGN_COMMON) )
+ {
+ tmpop = ((UNOP*)left)->op_first;
+ if (tmpop->op_type == OP_GV && !pm->op_pmreplroot) {
+ pm->op_pmreplroot = (OP*)((GVOP*)tmpop)->op_gv;
+ pm->op_pmflags |= PMf_ONCE;
+ tmpop = ((UNOP*)op)->op_first; /* to list (nulled) */
+ tmpop = ((UNOP*)tmpop)->op_first; /* to pushmark */
+ tmpop->op_sibling = Nullop; /* don't free split */
+ right->op_next = tmpop->op_next; /* fix starting loc */
+ op_free(op); /* blow off assign */
+ right->op_flags &= ~(OPf_KNOW|OPf_LIST);
+ /* "I don't know and I don't care." */
+ return right;
+ }
+ }
+ else {
+ if (modcount < 10000 &&
+ ((LISTOP*)right)->op_last->op_type == OP_CONST)
+ {
+ SV *sv = ((SVOP*)((LISTOP*)right)->op_last)->op_sv;
+ if (SvIVX(sv) == 0)
+ sv_setiv(sv, modcount+1);
+ }
+ }
+ }
+ }
return op;
}
if (!right)
return newBINOP(OP_NULL, flags, mod(scalar(left), OP_SASSIGN), scalar(right));
}
else {
- eval_start = right; /* Grandfathering $[ assignment here. Bletch. */
+ eval_start = right; /* Grandfathering $[ assignment here. Bletch.*/
op = newBINOP(OP_SASSIGN, flags,
scalar(right), mod(scalar(left), OP_SASSIGN) );
- if (!eval_start) {
+ if (eval_start)
+ eval_start = 0;
+ else {
op_free(op);
return Nullop;
}
I32 i;
SV *sv;
for (i = min_intro_pending; i <= max_intro_pending; i++) {
- if ((sv = svp[i]) && sv != &sv_undef)
+ if ((sv = svp[i]) && sv != &sv_undef && !SvIVX(sv)) {
SvIVX(sv) = 999999999; /* Don't know scope end yet. */
+ SvNVX(sv) = (double)cop_seqmax;
+ }
}
min_intro_pending = 0;
comppad_name_fill = max_intro_pending; /* Needn't search higher */
cop->op_ppaddr = ppaddr[ OP_NEXTSTATE ];
}
cop->op_flags = flags;
- cop->op_private = 0;
+ cop->op_private = 0 | (flags >> 8);
cop->op_next = (OP*)cop;
if (label) {
if (perldb && curstash != debstash) {
SV **svp = av_fetch(GvAV(curcop->cop_filegv),(I32)cop->cop_line, FALSE);
if (svp && *svp != &sv_undef && !SvIOK(*svp)) {
- SvIVX(*svp) = 1;
(void)SvIOK_on(*svp);
+ SvIVX(*svp) = 1;
SvSTASH(*svp) = (HV*)cop;
}
}
}
if (first->op_type == OP_CONST) {
if (dowarn && (first->op_private & OPpCONST_BARE))
- warn("Probable precedence problem on %s", op_name[type]);
+ warn("Probable precedence problem on %s", op_desc[type]);
if ((type == OP_AND) == (SvTRUE(((SVOP*)first)->op_sv))) {
op_free(first);
return other;
logop->op_first = first;
logop->op_flags = flags | OPf_KIDS;
logop->op_other = LINKLIST(other);
- logop->op_private = 1;
+ logop->op_private = 1 | (flags >> 8);
/* establish postfix order */
logop->op_next = LINKLIST(first);
condop->op_flags = flags | OPf_KIDS;
condop->op_true = LINKLIST(true);
condop->op_false = LINKLIST(false);
- condop->op_private = 1;
+ condop->op_private = 1 | (flags >> 8);
/* establish postfix order */
condop->op_next = LINKLIST(first);
condop->op_flags = OPf_KIDS;
condop->op_true = LINKLIST(left);
condop->op_false = LINKLIST(right);
- condop->op_private = 1;
+ condop->op_private = 1 | (flags >> 8);
left->op_sibling = right;
if (once && op != listop)
op->op_next = ((LOGOP*)cUNOP->op_first)->op_other;
+ if (op == listop)
+ op = newUNOP(OP_NULL, 0, op); /* or do {} while 1 loses outer block */
+
op->op_flags |= flags;
op = scope(op);
- op->op_flags |= OPf_SPECIAL; /* suppress POPBLOCK curpm restoration */
+ op->op_flags |= OPf_SPECIAL; /* suppress POPBLOCK curpm restoration*/
return op;
}
OP *op;
OP *condop;
- if (expr && (expr->op_type == OP_READLINE || expr->op_type == OP_GLOB))
- expr = newASSIGNOP(0, newSVREF(newGVOP(OP_GV, 0, defgv)), 0, expr);
+ if (expr && (expr->op_type == OP_READLINE || expr->op_type == OP_GLOB)) {
+ expr = newUNOP(OP_DEFINED, 0,
+ newASSIGNOP(0, newSVREF(newGVOP(OP_GV, 0, defgv)), 0, expr) );
+ }
if (!block)
block = newOP(OP_NULL, 0);
loop->op_nextop = op;
op->op_flags |= flags;
+ op->op_private |= (flags >> 8);
return op;
}
{
LOOP *loop;
int padoff = 0;
+ I32 iterflags = 0;
copline = forline;
if (sv) {
if (sv->op_type == OP_RV2SV) { /* symbol table variable */
- OP *op = sv;
- sv = cUNOP->op_first;
- sv->op_next = sv;
- cUNOP->op_first = Nullop;
- op_free(op);
+ sv->op_type = OP_RV2GV;
+ sv->op_ppaddr = ppaddr[OP_RV2GV];
}
else if (sv->op_type == OP_PADSV) { /* private variable */
padoff = sv->op_targ;
sv = Nullop;
}
else
- croak("Can't use %s for loop variable", op_name[sv->op_type]);
+ croak("Can't use %s for loop variable", op_desc[sv->op_type]);
}
else {
sv = newGVOP(OP_GV, 0, defgv);
}
- loop = (LOOP*)list(convert(OP_ENTERITER, 0,
+ if (expr->op_type == OP_RV2AV) {
+ expr = scalar(ref(expr, OP_ITER));
+ iterflags |= OPf_STACKED;
+ }
+ loop = (LOOP*)list(convert(OP_ENTERITER, iterflags,
append_elem(OP_LIST, mod(force_list(expr), OP_GREPSTART),
scalar(sv))));
assert(!loop->op_next);
SAVESPTR(curpad);
curpad = 0;
- op_free(CvROOT(cv));
+ if (!CvCLONED(cv))
+ op_free(CvROOT(cv));
CvROOT(cv) = Nullop;
- if (CvPADLIST(cv)) {
- I32 i = AvFILL(CvPADLIST(cv));
- while (i >= 0) {
- SV** svp = av_fetch(CvPADLIST(cv), i--, FALSE);
- if (svp)
- SvREFCNT_dec(*svp);
+ LEAVE;
+ }
+ SvREFCNT_dec(CvGV(cv));
+ CvGV(cv) = Nullgv;
+ SvREFCNT_dec(CvOUTSIDE(cv));
+ CvOUTSIDE(cv) = Nullcv;
+ if (CvPADLIST(cv)) {
+ I32 i = AvFILL(CvPADLIST(cv));
+ while (i >= 0) {
+ SV** svp = av_fetch(CvPADLIST(cv), i--, FALSE);
+ if (svp)
+ SvREFCNT_dec(*svp);
+ }
+ SvREFCNT_dec((SV*)CvPADLIST(cv));
+ CvPADLIST(cv) = Nullav;
+ }
+}
+
+CV *
+cv_clone(proto)
+CV* proto;
+{
+ AV* av;
+ I32 ix;
+ AV* protopadlist = CvPADLIST(proto);
+ AV* protopad_name = (AV*)*av_fetch(protopadlist, 0, FALSE);
+ AV* protopad = (AV*)*av_fetch(protopadlist, 1, FALSE);
+ SV** svp = AvARRAY(protopad);
+ AV* comppadlist;
+ CV* cv;
+
+ ENTER;
+ SAVESPTR(curpad);
+ SAVESPTR(comppad);
+ SAVESPTR(compcv);
+
+ cv = compcv = (CV*)NEWSV(1104,0);
+ sv_upgrade((SV *)cv, SVt_PVCV);
+ CvCLONED_on(cv);
+
+ CvFILEGV(cv) = CvFILEGV(proto);
+ CvGV(cv) = SvREFCNT_inc(CvGV(proto));
+ CvSTASH(cv) = CvSTASH(proto);
+ CvROOT(cv) = CvROOT(proto);
+ CvSTART(cv) = CvSTART(proto);
+ if (CvOUTSIDE(proto))
+ CvOUTSIDE(cv) = (CV*)SvREFCNT_inc((SV*)CvOUTSIDE(proto));
+
+ comppad = newAV();
+
+ comppadlist = newAV();
+ AvREAL_off(comppadlist);
+ av_store(comppadlist, 0, SvREFCNT_inc((SV*)protopad_name));
+ av_store(comppadlist, 1, (SV*)comppad);
+ CvPADLIST(cv) = comppadlist;
+ av_extend(comppad, AvFILL(protopad));
+ curpad = AvARRAY(comppad);
+
+ av = newAV(); /* will be @_ */
+ av_extend(av, 0);
+ av_store(comppad, 0, (SV*)av);
+ AvFLAGS(av) = AVf_REIFY;
+
+ svp = AvARRAY(protopad_name);
+ for ( ix = AvFILL(protopad); ix > 0; ix--) {
+ SV *sv;
+ if (svp[ix] != &sv_undef) {
+ char *name = SvPVX(svp[ix]); /* XXX */
+ if (SvFLAGS(svp[ix]) & SVf_FAKE) { /* lexical from outside? */
+ I32 off = pad_findlex(name,ix,curcop->cop_seq, CvOUTSIDE(proto),
+ cxstack_ix);
+ if (off != ix)
+ croak("panic: cv_clone: %s", name);
+ }
+ else { /* our own lexical */
+ if (*name == '@')
+ av_store(comppad, ix, sv = (SV*)newAV());
+ else if (*name == '%')
+ av_store(comppad, ix, sv = (SV*)newHV());
+ else
+ av_store(comppad, ix, sv = NEWSV(0,0));
+ SvPADMY_on(sv);
}
- SvREFCNT_dec((SV*)CvPADLIST(cv));
}
- SvREFCNT_dec(CvGV(cv));
- LEAVE;
+ else {
+ av_store(comppad, ix, sv = NEWSV(0,0));
+ SvPADTMP_on(sv);
+ }
}
+
+ LEAVE;
+ return cv;
}
CV *
-newSUB(floor,op,block)
+newSUB(floor,op,proto,block)
I32 floor;
OP *op;
+OP *proto;
OP *block;
{
register CV *cv;
char *name = op ? SvPVx(cSVOP->op_sv, na) : "__ANON__";
- GV *gv = gv_fetchpv(name, GV_ADDMULTI, SVt_PVCV);
+ GV* gv = gv_fetchpv(name, GV_ADDMULTI, SVt_PVCV);
AV* av;
char *s;
I32 ix;
if (cv = GvCV(gv)) {
if (GvCVGEN(gv))
cv = 0; /* just a cached method */
- else if (CvROOT(cv)) { /* already defined? */
- if (dowarn) {
+ else if (CvROOT(cv) || CvXSUB(cv) || GvASSUMECV(gv)) {
+ if (dowarn) { /* already defined (or promised)? */
line_t oldline = curcop->cop_line;
curcop->cop_line = copline;
}
}
if (cv) { /* must reuse cv if autoloaded */
- assert(SvREFCNT(CvGV(cv)) > 1);
- SvREFCNT_dec(CvGV(cv));
+ cv_undef(cv);
+ CvOUTSIDE(cv) = CvOUTSIDE(compcv);
+ CvOUTSIDE(compcv) = 0;
+ CvPADLIST(cv) = CvPADLIST(compcv);
+ CvPADLIST(compcv) = 0;
+ if (SvREFCNT(compcv) > 1) /* XXX Make closures transit through stub. */
+ CvOUTSIDE(compcv) = (CV*)SvREFCNT_inc((SV*)cv);
+ SvREFCNT_dec(compcv);
}
else {
- cv = (CV*)NEWSV(1104,0);
- sv_upgrade((SV *)cv, SVt_PVCV);
+ cv = compcv;
}
GvCV(gv) = cv;
GvCVGEN(gv) = 0;
CvGV(cv) = SvREFCNT_inc(gv);
CvSTASH(cv) = curstash;
+ if (proto) {
+ char *p = SvPVx(((SVOP*)proto)->op_sv, na);
+ if (SvPOK(cv) && strNE(SvPV((SV*)cv,na), p))
+ warn("Prototype mismatch: (%s) vs (%s)", SvPV((SV*)cv, na), p);
+ sv_setpv((SV*)cv, p);
+ op_free(proto);
+ }
+
+ if (error_count) {
+ op_free(block);
+ block = Nullop;
+ }
if (!block) {
CvROOT(cv) = 0;
op_free(op);
SvPADTMP_on(curpad[ix]);
}
- av = newAV();
- AvREAL_off(av);
if (AvFILL(comppad_name) < AvFILL(comppad))
av_store(comppad_name, AvFILL(comppad), Nullsv);
- av_store(av, 0, SvREFCNT_inc((SV*)comppad_name));
- av_store(av, 1, SvREFCNT_inc((SV*)comppad));
- AvFILL(av) = 1;
- CvPADLIST(cv) = av;
CvROOT(cv) = newUNOP(OP_LEAVESUB, 0, scalarseq(block));
CvSTART(cv) = LINKLIST(CvROOT(cv));
s++;
else
s = name;
- if (strEQ(s, "BEGIN")) {
+ if (strEQ(s, "BEGIN") && !error_count) {
line_t oldline = compiling.cop_line;
+ SV *oldrs = rs;
ENTER;
SAVESPTR(compiling.cop_filegv);
beginav = newAV();
av_push(beginav, (SV *)cv);
DEBUG_x( dump_sub(gv) );
- rs = nrs;
- rslen = nrslen;
- rschar = nrschar;
- rspara = (nrslen == 2);
+ rs = SvREFCNT_inc(nrs);
GvCV(gv) = 0;
calllist(beginav);
- rs = "\n";
- rslen = 1;
- rschar = '\n';
- rspara = 0;
+ SvREFCNT_dec(rs);
+ rs = oldrs;
curcop = &compiling;
curcop->cop_line = oldline; /* might have recursed to yylex */
LEAVE;
}
- else if (strEQ(s, "END")) {
+ else if (strEQ(s, "END") && !error_count) {
if (!endav)
endav = newAV();
av_unshift(endav, 1);
op_free(op);
copline = NOLINE;
LEAVE_SCOPE(floor);
- if (!op)
+ if (!op) {
GvCV(gv) = 0; /* Will remember in SVOP instead. */
+ CvANON_on(cv);
+ }
return cv;
}
char *filename;
{
CV* cv = newXS(name, (void(*)())subaddr, filename);
- CvOLDSTYLE(cv) = TRUE;
+ CvOLDSTYLE_on(cv);
CvXSUBANY(cv).any_i32 = ix;
return cv;
}
if (cv = GvCV(gv)) {
if (GvCVGEN(gv))
cv = 0; /* just a cached method */
- else if (CvROOT(cv)) { /* already defined? */
+ else if (CvROOT(cv) || CvXSUB(cv)) { /* already defined? */
if (dowarn) {
line_t oldline = curcop->cop_line;
av_unshift(endav, 1);
av_store(endav, 0, SvREFCNT_inc(gv));
}
- if (!name)
+ if (!name) {
GvCV(gv) = 0; /* Will remember elsewhere instead. */
+ CvANON_on(cv);
+ }
return cv;
}
register CV *cv;
char *name;
GV *gv;
- AV* av;
I32 ix;
if (op)
else
name = "STDOUT";
gv = gv_fetchpv(name,TRUE, SVt_PVFM);
- SvMULTI_on(gv);
+ GvMULTI_on(gv);
if (cv = GvFORM(gv)) {
if (dowarn) {
line_t oldline = curcop->cop_line;
}
SvREFCNT_dec(cv);
}
- cv = (CV*)NEWSV(1106,0);
- sv_upgrade((SV *)cv, SVt_PVFM);
+ cv = compcv;
GvFORM(gv) = cv;
CvGV(cv) = SvREFCNT_inc(gv);
CvFILEGV(cv) = curcop->cop_filegv;
SvPADTMP_on(curpad[ix]);
}
- CvPADLIST(cv) = av = newAV();
- AvREAL_off(av);
- av_store(av, 1, SvREFCNT_inc((SV*)comppad));
- AvFILL(av) = 1;
-
CvROOT(cv) = newUNOP(OP_LEAVEWRITE, 0, scalarseq(block));
CvSTART(cv) = LINKLIST(CvROOT(cv));
CvROOT(cv)->op_next = 0;
}
OP *
-newMETHOD(ref,name)
-OP *ref;
-OP *name;
-{
- LOGOP* mop;
- Newz(1101, mop, 1, LOGOP);
- mop->op_type = OP_METHOD;
- mop->op_ppaddr = ppaddr[OP_METHOD];
- mop->op_first = scalar(ref);
- mop->op_flags |= OPf_KIDS;
- mop->op_private = 1;
- mop->op_other = LINKLIST(name);
- mop->op_targ = pad_alloc(OP_METHOD, SVs_PADTMP);
- mop->op_next = LINKLIST(ref);
- ref->op_next = (OP*)mop;
- return scalar((OP*)mop);
-}
-
-OP *
newANONLIST(op)
OP* op;
{
}
OP *
-newANONSUB(floor, block)
+newANONSUB(floor, proto, block)
I32 floor;
+OP *proto;
OP *block;
{
return newUNOP(OP_REFGEN, 0,
- newSVOP(OP_ANONCODE, 0, (SV*)newSUB(floor, 0, block)));
+ newSVOP(OP_ANONCODE, 0, (SV*)newSUB(floor, 0, proto, block)));
}
OP *
{
if (type == OP_MAPSTART)
return newUNOP(OP_NULL, 0, o);
- return newUNOP(OP_RV2GV, 0, o);
+ return ref(newUNOP(OP_RV2GV, OPf_REF, o), type);
}
OP *
}
OP *
-newCVREF(o)
+newCVREF(flags, o)
+I32 flags;
OP *o;
{
- return newUNOP(OP_RV2CV, 0, scalar(o));
+ return newUNOP(OP_RV2CV, flags, scalar(o));
}
OP *
if (op->op_flags & OPf_KIDS) {
OP *kid = cUNOP->op_first;
if (kid->op_type != OP_HELEM)
- croak("%s argument is not a HASH element", op_name[op->op_type]);
+ croak("%s argument is not a HASH element", op_desc[op->op_type]);
null(kid);
}
return op;
register OP *op;
{
SVOP *kid = (SVOP*)cUNOP->op_first;
- int iscv = (op->op_type==OP_RV2CV)*2;
- op->op_private = (hints & HINT_STRICT_REFS);
+ op->op_private |= (hints & HINT_STRICT_REFS);
if (kid->op_type == OP_CONST) {
+ int iscv = (op->op_type==OP_RV2CV)*2;
GV *gv = 0;
kid->op_type = OP_GV;
for (gv = 0; !gv; iscv++) {
+ /*
+ * This is a little tricky. We only want to add the symbol if we
+ * didn't add it in the lexer. Otherwise we get duplicate strict
+ * warnings. But if we didn't add it in the lexer, we must at
+ * least pretend like we wanted to add it even if it existed before,
+ * or we get possible typo warnings. OPpCONST_ENTERED says
+ * whether the lexer already added THIS instance of this symbol.
+ */
gv = gv_fetchpv(SvPVx(kid->op_sv, na),
- iscv,
+ iscv | !(kid->op_private & OPpCONST_ENTERED),
iscv
? SVt_PVCV
: op->op_type == OP_RV2SV
? SVt_PVHV
: SVt_PVGV);
}
+ SvREFCNT_dec(kid->op_sv);
kid->op_sv = SvREFCNT_inc(gv);
}
return op;
gv_fetchpv(name, TRUE, SVt_PVAV) ));
if (dowarn)
warn("Array @%s missing the @ in argument %d of %s()",
- name, numargs, op_name[type]);
+ name, numargs, op_desc[type]);
op_free(kid);
kid = newop;
kid->op_sibling = sibl;
*tokid = kid;
}
else if (kid->op_type != OP_RV2AV && kid->op_type != OP_PADAV)
- bad_type(numargs, "array", op, kid);
+ bad_type(numargs, "array", op_desc[op->op_type], kid);
mod(kid, type);
break;
case OA_HVREF:
gv_fetchpv(name, TRUE, SVt_PVHV) ));
if (dowarn)
warn("Hash %%%s missing the %% in argument %d of %s()",
- name, numargs, op_name[type]);
+ name, numargs, op_desc[type]);
op_free(kid);
kid = newop;
kid->op_sibling = sibl;
*tokid = kid;
}
else if (kid->op_type != OP_RV2HV && kid->op_type != OP_PADHV)
- bad_type(numargs, "hash", op, kid);
+ bad_type(numargs, "hash", op_desc[op->op_type], kid);
mod(kid, type);
break;
case OA_CVREF:
tokid = &kid->op_sibling;
kid = kid->op_sibling;
}
- op->op_private = numargs;
+ op->op_private |= numargs;
if (kid)
- return too_many_arguments(op);
+ return too_many_arguments(op,op_desc[op->op_type]);
listkids(op);
}
else if (opargs[type] & OA_DEFGV) {
while (oa & OA_OPTIONAL)
oa >>= 4;
if (oa && oa != OA_LIST)
- return too_few_arguments(op);
+ return too_few_arguments(op,op_desc[op->op_type]);
}
return op;
}
if (op->op_flags & OPf_STACKED) {
OP* k;
op = ck_sort(op);
+ kid = cLISTOP->op_first->op_sibling;
for (k = cLISTOP->op_first->op_sibling->op_next; k; k = k->op_next) {
kid = k;
}
kid = cLISTOP->op_first->op_sibling;
if (!kid || !kid->op_sibling)
- return too_few_arguments(op);
+ return too_few_arguments(op,op_desc[op->op_type]);
for (kid = kid->op_sibling; kid; kid = kid->op_sibling)
mod(kid, OP_GREPSTART);
else if (kid && !kid->op_sibling) { /* print HANDLE; */
if (kid->op_type == OP_CONST && kid->op_private & OPpCONST_BARE) {
op->op_flags |= OPf_STACKED; /* make it a filehandle */
- kid = newUNOP(OP_RV2GV, 0, scalar(kid));
+ kid = newUNOP(OP_RV2GV, OPf_REF, scalar(kid));
cLISTOP->op_first->op_sibling = kid;
cLISTOP->op_last = kid;
kid = kid->op_sibling;
OP *op;
{
cPMOP->op_pmflags |= PMf_RUNTIME;
+ cPMOP->op_pmpermflags |= PMf_RUNTIME;
return op;
}
OP *op;
{
if (cBINOP->op_first->op_flags & OPf_PARENS) {
- op->op_private = OPpREPEAT_DOLIST;
+ op->op_private |= OPpREPEAT_DOLIST;
cBINOP->op_first = force_list(cBINOP->op_first);
}
else
for (s = SvPVX(kid->op_sv); *s; s++) {
if (*s == ':' && s[1] == ':') {
*s = '/';
- strcpy(s+1,s+2); /* known to be okay here */
+ Move(s+2, s+1, strlen(s+2)+1, char);
--SvCUR(kid->op_sv);
}
}
ck_select(op)
OP *op;
{
+ OP* kid;
if (op->op_flags & OPf_KIDS) {
- OP *kid = cLISTOP->op_first->op_sibling; /* get past pushmark */
+ kid = cLISTOP->op_first->op_sibling; /* get past pushmark */
if (kid && kid->op_sibling) {
op->op_type = OP_SSELECT;
op->op_ppaddr = ppaddr[OP_SSELECT];
return fold_constants(op);
}
}
- return ck_fun(op);
+ op = ck_fun(op);
+ kid = cLISTOP->op_first->op_sibling; /* get past pushmark */
+ if (kid && kid->op_type == OP_RV2GV)
+ kid->op_private &= ~HINT_STRICT_REFS;
+ return op;
}
OP *
kid->op_next = 0;
}
else if (kid->op_type == OP_LEAVE) {
- null(kid); /* wipe out leave */
- kid->op_next = kid;
+ if (op->op_type == OP_SORT) {
+ null(kid); /* wipe out leave */
+ kid->op_next = kid;
- for (k = kLISTOP->op_first->op_next; k; k = k->op_next) {
- if (k->op_next == kid)
- k->op_next = 0;
+ for (k = kLISTOP->op_first->op_next; k; k = k->op_next) {
+ if (k->op_next == kid)
+ k->op_next = 0;
+ }
}
+ else
+ kid->op_next = 0; /* just disconnect the leave */
k = kLISTOP->op_first;
}
peep(k);
scalar(kid);
if (kid->op_sibling)
- return too_many_arguments(op);
+ return too_many_arguments(op,op_desc[op->op_type]);
return op;
}
ck_subr(op)
OP *op;
{
- OP *o = ((cUNOP->op_first->op_sibling)
- ? cUNOP : ((UNOP*)cUNOP->op_first))->op_first->op_sibling;
-
- if (o->op_type == OP_RV2CV)
- null(o); /* disable rv2cv */
- op->op_private = (hints & HINT_STRICT_REFS);
+ OP *prev = ((cUNOP->op_first->op_sibling)
+ ? cUNOP : ((UNOP*)cUNOP->op_first))->op_first;
+ OP *o = prev->op_sibling;
+ OP *cvop;
+ char *proto = 0;
+ CV *cv = 0;
+ int optional = 0;
+ I32 arg = 0;
+
+ for (cvop = o; cvop->op_sibling; cvop = cvop->op_sibling) ;
+ if (cvop->op_type == OP_RV2CV) {
+ SVOP* tmpop;
+ op->op_private |= (cvop->op_private & OPpENTERSUB_AMPER);
+ null(cvop); /* disable rv2cv */
+ tmpop = (SVOP*)((UNOP*)cvop)->op_first;
+ if (tmpop->op_type == OP_GV) {
+ cv = GvCV(tmpop->op_sv);
+ if (cv && SvPOK(cv) && !(op->op_private & OPpENTERSUB_AMPER))
+ proto = SvPV((SV*)cv,na);
+ }
+ }
+ op->op_private |= (hints & HINT_STRICT_REFS);
if (perldb && curstash != debstash)
- op->op_private |= OPpDEREF_DB;
- while (o = o->op_sibling)
+ op->op_private |= OPpENTERSUB_DB;
+ while (o != cvop) {
+ if (proto) {
+ switch (*proto) {
+ case '\0':
+ return too_many_arguments(op, CvNAME(cv));
+ case ';':
+ optional = 1;
+ proto++;
+ continue;
+ case '$':
+ proto++;
+ arg++;
+ scalar(o);
+ break;
+ case '%':
+ case '@':
+ list(o);
+ arg++;
+ break;
+ case '&':
+ proto++;
+ arg++;
+ if (o->op_type != OP_REFGEN && o->op_type != OP_UNDEF)
+ bad_type(arg, "block", CvNAME(cv), o);
+ break;
+ case '*':
+ proto++;
+ arg++;
+ if (o->op_type == OP_RV2GV)
+ goto wrapref;
+ {
+ OP* kid = o;
+ o = newUNOP(OP_RV2GV, 0, kid);
+ o->op_sibling = kid->op_sibling;
+ kid->op_sibling = 0;
+ prev->op_sibling = o;
+ }
+ goto wrapref;
+ case '\\':
+ proto++;
+ arg++;
+ switch (*proto++) {
+ case '*':
+ if (o->op_type != OP_RV2GV)
+ bad_type(arg, "symbol", CvNAME(cv), o);
+ goto wrapref;
+ case '&':
+ if (o->op_type != OP_RV2CV)
+ bad_type(arg, "sub", CvNAME(cv), o);
+ goto wrapref;
+ case '$':
+ if (o->op_type != OP_RV2SV && o->op_type != OP_PADSV)
+ bad_type(arg, "scalar", CvNAME(cv), o);
+ goto wrapref;
+ case '@':
+ if (o->op_type != OP_RV2AV && o->op_type != OP_PADAV)
+ bad_type(arg, "array", CvNAME(cv), o);
+ goto wrapref;
+ case '%':
+ if (o->op_type != OP_RV2HV && o->op_type != OP_PADHV)
+ bad_type(arg, "hash", CvNAME(cv), o);
+ wrapref:
+ {
+ OP* kid = o;
+ o = newUNOP(OP_REFGEN, 0, kid);
+ o->op_sibling = kid->op_sibling;
+ kid->op_sibling = 0;
+ prev->op_sibling = o;
+ }
+ break;
+ default: goto oops;
+ }
+ break;
+ default:
+ oops:
+ croak("Malformed prototype for %s: %s",
+ CvNAME(cv),SvPV((SV*)cv,na));
+ }
+ }
+ else
+ list(o);
mod(o, OP_ENTERSUB);
+ prev = o;
+ o = o->op_sibling;
+ }
+ if (proto && !optional && *proto == '$')
+ return too_few_arguments(op, CvNAME(cv));
return op;
}
for (; o; o = o->op_next) {
if (o->op_seq)
break;
+ if (!op_seqmax)
+ op_seqmax++;
op = o;
switch (o->op_type) {
case OP_NEXTSTATE:
case OP_DBSTATE:
curcop = ((COP*)o); /* for warnings */
+ o->op_seq = op_seqmax++;
break;
case OP_CONCAT:
case OP_QUOTEMETA:
if (o->op_next->op_type == OP_STRINGIFY)
null(o->op_next);
- o->op_seq = ++op_seqmax;
+ o->op_seq = op_seqmax++;
break;
case OP_STUB:
if ((o->op_flags & (OPf_KNOW|OPf_LIST)) != (OPf_KNOW|OPf_LIST)) {
- o->op_seq = ++op_seqmax;
+ o->op_seq = op_seqmax++;
break; /* Scalar stub must produce undef. List stub is noop */
}
- /* FALL THROUGH */
+ goto nothin;
case OP_NULL:
+ if (o->op_targ == OP_NEXTSTATE || o->op_targ == OP_DBSTATE)
+ curcop = ((COP*)op);
+ goto nothin;
case OP_SCALAR:
case OP_LINESEQ:
case OP_SCOPE:
+ nothin:
if (oldop && o->op_next) {
oldop->op_next = o->op_next;
continue;
}
- o->op_seq = ++op_seqmax;
+ o->op_seq = op_seqmax++;
break;
case OP_GV:
<= 255 &&
i >= 0)
{
+ SvREFCNT_dec(((SVOP*)pop)->op_sv);
null(o->op_next);
null(pop->op_next);
null(pop);
GvAVn((GV*)(((SVOP*)o)->op_sv));
}
}
- o->op_seq = ++op_seqmax;
+ o->op_seq = op_seqmax++;
break;
case OP_MAPWHILE:
case OP_GREPWHILE:
case OP_AND:
case OP_OR:
- o->op_seq = ++op_seqmax;
+ o->op_seq = op_seqmax++;
peep(cLOGOP->op_other);
break;
case OP_COND_EXPR:
- o->op_seq = ++op_seqmax;
+ o->op_seq = op_seqmax++;
peep(cCONDOP->op_true);
peep(cCONDOP->op_false);
break;
case OP_ENTERLOOP:
- o->op_seq = ++op_seqmax;
+ o->op_seq = op_seqmax++;
peep(cLOOP->op_redoop);
peep(cLOOP->op_nextop);
peep(cLOOP->op_lastop);
case OP_MATCH:
case OP_SUBST:
- o->op_seq = ++op_seqmax;
+ o->op_seq = op_seqmax++;
peep(cPMOP->op_pmreplstart);
break;
case OP_EXEC:
- o->op_seq = ++op_seqmax;
+ o->op_seq = op_seqmax++;
if (dowarn && o->op_next && o->op_next->op_type == OP_NEXTSTATE) {
if (o->op_next->op_sibling &&
o->op_next->op_sibling->op_type != OP_DIE) {
}
break;
default:
- o->op_seq = ++op_seqmax;
+ o->op_seq = op_seqmax++;
break;
}
oldop = o;
projects / p5sagit/p5-mst-13.2.git / blobdiff