-/* $RCSfile: cmd.h,v $$Revision: 4.1 $$Date: 92/08/07 17:19:19 $
+/* op.c
*
- * Copyright (c) 1991, Larry Wall
+ * Copyright (c) 1991-1994, 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.
*
- * $Log: cmd.h,v $
+ */
+
+/*
+ * "You see: Mr. Drogo, he married poor Miss Primula Brandybuck. She was
+ * our Mr. Bilbo's first cousin on the mother's side (her mother being the
+ * youngest of the Old Took's daughters); and Mr. Drogo was his second
+ * cousin. So Mr. Frodo is his first *and* second cousin, once removed
+ * either way, as the saying is, if you follow me." --the Gaffer
*/
#include "EXTERN.h"
#include "perl.h"
-/* Lowest byte of opargs */
-#define OA_MARK 1
-#define OA_FOLDCONST 2
-#define OA_RETSCALAR 4
-#define OA_TARGET 8
-#define OA_RETINTEGER 16
-#define OA_OTHERINT 32
-#define OA_DANGEROUS 64
-
-/* Remaining nybbles of opargs */
-#define OA_SCALAR 1
-#define OA_LIST 2
-#define OA_AVREF 3
-#define OA_HVREF 4
-#define OA_CVREF 5
-#define OA_FILEREF 6
-#define OA_SCALARREF 7
-#define OA_OPTIONAL 8
-
-void
-cpy7bit(d,s,l)
-register char *d;
-register char *s;
-register I32 l;
+#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 longjmp.
+ */
+#define CHECKOP(type,op) ((op_mask && op_mask[type]) ? \
+ (croak("%s trapped by operation mask", op_name[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, 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, 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;
{
- while (l--)
- *d++ = *s++ & 127;
- *d = '\0';
+ SV* tmpsv = sv_newmortal();
+ gv_efullname(tmpsv, CvGV(cv));
+ return SvPV(tmpsv,na);
}
static 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)",
- n, op_name[op->op_type], t, op_name[kid->op_type]);
+ (int) n, name, t, op_name[kid->op_type]);
yyerror(tokenbuf);
return op;
}
+void
+assertref(op)
+OP *op;
+{
+ int type = op->op_type;
+ if (type != OP_AELEM && type != OP_HELEM) {
+ sprintf(tokenbuf, "Can't use subscript on %s",
+ op_name[type]);
+ yyerror(tokenbuf);
+ if (type == OP_RV2HV || type == OP_ENTERSUB)
+ warn("(Did you mean $ or @ instead of %c?)\n",
+ type == OP_RV2HV ? '%' : '&');
+ }
+}
+
/* "register" allocation */
PADOFFSET
pad_allocmy(name)
char *name;
{
- PADOFFSET off = pad_alloc(OP_PADSV, SVs_PADMY);
- SV *sv = NEWSV(0,0);
+ PADOFFSET off;
+ SV *sv;
+
+ if (!(isALPHA(name[1]) || name[1] == '_' && (int)strlen(name) > 2)) {
+ if (!isprint(name[1]))
+ sprintf(name+1, "^%c", name[1] ^ 64); /* XXX is tokenbuf, really */
+ croak("Can't use global %s in \"my\"",name);
+ }
+ off = pad_alloc(OP_PADSV, SVs_PADMY);
+ sv = NEWSV(1102,0);
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;
- bool saweval;
- AV *curlist;
- AV *curname;
- CV *cv;
- I32 seq = cop_seqmax;
+ int saweval;
- /* 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]) &&
- 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));
+ SvFLAGS(compcv) |= SVpcv_CLONE;
+ return newoff;
+ }
}
}
* XXX This will also probably interact badly with eval tree caching.
*/
- saweval = FALSE;
- for (i = cxstack_ix; i >= 0; i--) {
+ saweval = 0;
+ 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:
- saweval = TRUE;
+ if (cx->blk_eval.old_op_type != OP_ENTEREVAL)
+ 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[i+1].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]) &&
- 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(0,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);
+ }
+ }
+
+ return 0;
+}
+
+PADOFFSET
+pad_findmy(name)
+char *name;
+{
+ I32 off;
+ SV *sv;
+ SV **svp = AvARRAY(comppad_name);
+ I32 seq = cop_seqmax;
+
+ /* 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))
+ {
+ 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;
}
SV *sv;
if (min_intro_pending && fill < min_intro_pending) {
for (off = max_intro_pending; off >= min_intro_pending; off--) {
- if (sv = svp[off])
+ if ((sv = svp[off]) && sv != &sv_undef)
warn("%s never introduced", SvPVX(sv));
}
}
/* "Deintroduce" my variables that are leaving with this scope. */
for (off = AvFILL(comppad_name); off > fill; off--) {
- if (sv = svp[off])
+ if ((sv = svp[off]) && sv != &sv_undef && SvIVX(sv) == 999999999)
SvIVX(sv) = cop_seqmax;
}
}
if (AvARRAY(comppad) != curpad)
croak("panic: pad_alloc");
+ if (pad_reset_pending)
+ pad_reset();
if (tmptype & SVs_PADMY) {
do {
sv = *av_fetch(comppad, AvFILL(comppad) + 1, TRUE);
}
SvFLAGS(sv) |= tmptype;
curpad = AvARRAY(comppad);
- DEBUG_X(fprintf(stderr, "Pad alloc %d for %s\n", retval, op_name[optype]));
+ DEBUG_X(fprintf(stderr, "Pad alloc %ld for %s\n", (long) retval, op_name[optype]));
return (PADOFFSET)retval;
}
SV *
-#ifndef STANDARD_C
+#ifndef CAN_PROTOTYPE
pad_sv(po)
PADOFFSET po;
#else
pad_sv(PADOFFSET po)
-#endif /* STANDARD_C */
+#endif /* CAN_PROTOTYPE */
{
if (!po)
croak("panic: pad_sv po");
}
void
-#ifndef STANDARD_C
+#ifndef CAN_PROTOTYPE
pad_free(po)
PADOFFSET po;
#else
pad_free(PADOFFSET po)
-#endif /* STANDARD_C */
+#endif /* CAN_PROTOTYPE */
{
+ if (!curpad)
+ return;
if (AvARRAY(comppad) != curpad)
croak("panic: pad_free curpad");
if (!po)
croak("panic: pad_free po");
DEBUG_X(fprintf(stderr, "Pad free %d\n", po));
- if (curpad[po])
+ if (curpad[po] && curpad[po] != &sv_undef)
SvPADTMP_off(curpad[po]);
- if (po < padix)
+ if ((I32)po < padix)
padix = po - 1;
}
void
-#ifndef STANDARD_C
+#ifndef CAN_PROTOTYPE
pad_swipe(po)
PADOFFSET po;
#else
pad_swipe(PADOFFSET po)
-#endif /* STANDARD_C */
+#endif /* CAN_PROTOTYPE */
{
if (AvARRAY(comppad) != curpad)
croak("panic: pad_swipe curpad");
if (!po)
croak("panic: pad_swipe po");
DEBUG_X(fprintf(stderr, "Pad swipe %d\n", po));
- curpad[po] = NEWSV(0,0);
SvPADTMP_off(curpad[po]);
- if (po < padix)
+ curpad[po] = NEWSV(1107,0);
+ SvPADTMP_on(curpad[po]);
+ if ((I32)po < padix)
padix = po - 1;
}
if (AvARRAY(comppad) != curpad)
croak("panic: pad_reset curpad");
DEBUG_X(fprintf(stderr, "Pad reset\n"));
- for (po = AvMAX(comppad); po > 0; po--) {
- if (curpad[po])
- 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 = 0;
+ pad_reset_pending = FALSE;
}
/* Destructor */
op_free(op)
OP *op;
{
- register OP *kid;
+ register OP *kid, *nextkid;
if (!op)
return;
if (op->op_flags & OPf_KIDS) {
- for (kid = cUNOP->op_first; kid; kid = kid->op_sibling)
+ for (kid = cUNOP->op_first; kid; kid = nextkid) {
+ nextkid = kid->op_sibling; /* Get before next freeing kid */
op_free(kid);
+ }
}
-
switch (op->op_type) {
case OP_NULL:
op->op_targ = 0; /* Was holding old type, if any. */
break;
+ case OP_ENTEREVAL:
+ op->op_targ = 0; /* Was holding hints. */
+ break;
case OP_GVSV:
case OP_GV:
- SvREFCNT_dec((SV*)cGVOP->op_gv);
+ SvREFCNT_dec(cGVOP->op_gv);
break;
case OP_NEXTSTATE:
case OP_DBSTATE:
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:
+ pregfree(cPMOP->op_pmregexp);
+ SvREFCNT_dec(cPMOP->op_pmshort);
+ break;
+ default:
+ break;
}
if (op->op_targ > 0)
op->op_ppaddr = ppaddr[OP_NULL];
}
-static void
-unlist(op)
-OP* op;
-{
- OP* kid = cLISTOP->op_first;
- assert(kid->op_type == OP_PUSHMARK);
- cLISTOP->op_first = kid->op_sibling;
- null(kid);
- null(op);
-}
-
/* Contextualizers */
#define LINKLIST(o) ((o)->op_next ? (o)->op_next : linklist((OP*)o))
return op;
}
-OP *
+static OP *
scalarboolean(op)
OP *op;
{
if (dowarn &&
- op->op_type == OP_SASSIGN && cBINOP->op_first->op_type == OP_CONST)
- warn("Found = in conditional, should be ==");
+ op->op_type == OP_SASSIGN && cBINOP->op_first->op_type == OP_CONST) {
+ line_t oldline = curcop->cop_line;
+
+ if (copline != NOLINE)
+ curcop->cop_line = copline;
+ warn("Found = in conditional, should be ==");
+ curcop->cop_line = oldline;
+ }
return scalar(op);
}
{
OP *kid;
- if (!op || (op->op_flags & OPf_KNOW)) /* assumes no premature commitment */
+ /* assumes no premature commitment */
+ if (!op || (op->op_flags & OPf_KNOW) || error_count)
return op;
op->op_flags &= ~OPf_LIST;
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:
for (kid = cUNOP->op_first->op_sibling; kid; kid = kid->op_sibling)
scalar(kid);
break;
+ case OP_SPLIT:
+ if ((kid = ((LISTOP*)op)->op_first) && kid->op_type == OP_PUSHRE) {
+ if (!kPMOP->op_pmreplroot)
+ deprecate("implicit split to @_");
+ }
+ /* FALL THROUGH */
case OP_MATCH:
case OP_SUBST:
case OP_NULL:
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) {
char* useless = 0;
SV* sv;
- if (!op)
+ if (!op || error_count)
return op;
if (op->op_flags & OPf_LIST)
return op;
case OP_AV2ARYLEN:
case OP_SV2LEN:
case OP_REF:
+ case OP_REFGEN:
+ case OP_SREFGEN:
case OP_DEFINED:
case OP_HEX:
case OP_OCT:
case OP_GGRNAM:
case OP_GGRGID:
case OP_GETLOGIN:
- if (!(op->op_flags & OPf_INTRO))
+ if (!(op->op_private & OPpLVAL_INTRO))
useless = op_name[op->op_type];
break;
case OP_RV2SV:
case OP_RV2AV:
case OP_RV2HV:
- if (!(op->op_flags & OPf_INTRO))
+ if (!(op->op_private & OPpLVAL_INTRO) &&
+ (!op->op_sibling || op->op_sibling->op_type != OP_READLINE))
useless = "a variable";
break;
case OP_NEXTSTATE:
case OP_DBSTATE:
- curcop = ((COP*)op); /* for warning above */
+ curcop = ((COP*)op); /* for warning below */
break;
case OP_CONST:
useless = 0;
else if (SvPOK(sv)) {
if (strnEQ(SvPVX(sv), "di", 2) ||
+ strnEQ(SvPVX(sv), "ds", 2) ||
strnEQ(SvPVX(sv), "ig", 2))
useless = 0;
}
for (kid = cUNOP->op_first->op_sibling; kid; kid = kid->op_sibling)
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:
case OP_ENTER:
case OP_SCALAR:
- case OP_NULL:
if (!(op->op_flags & OPf_KIDS))
break;
case OP_SCOPE:
case OP_LEAVE:
case OP_LEAVETRY:
+ case OP_LEAVELOOP:
+ op->op_private |= OPpLEAVE_VOID;
case OP_LINESEQ:
case OP_LIST:
for (kid = cLISTOP->op_first; kid; kid = kid->op_sibling)
scalarvoid(kid);
break;
+ case OP_SPLIT:
+ if ((kid = ((LISTOP*)op)->op_first) && kid->op_type == OP_PUSHRE) {
+ if (!kPMOP->op_pmreplroot)
+ 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);
{
OP *kid;
- if (!op || (op->op_flags & OPf_KNOW)) /* assumes no premature commitment */
+ /* assumes no premature commitment */
+ if (!op || (op->op_flags & OPf_KNOW) || error_count)
return op;
op->op_flags |= (OPf_KNOW | OPf_LIST);
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)
curcop = &compiling;
}
op->op_flags &= ~OPf_PARENS;
- if (needblockscope)
+ if (hints & HINT_BLOCK_SCOPE)
op->op_flags |= OPf_PARENS;
}
else
return op;
}
-OP *
+static OP *
modkids(op, type)
OP *op;
I32 type;
{
OP *kid;
SV *sv;
+ char mtype;
- if (!op)
+ if (!op || error_count)
return op;
switch (op->op_type) {
- case OP_ENTERSUBR:
- if ((type == OP_UNDEF) && !(op->op_flags & OPf_STACKED)) {
- op->op_type = OP_RV2CV; /* entersubr => rv2cv */
+ case OP_CONST:
+ 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);
+ eval_start = 0;
+ }
+ else if (!type) {
+ SAVEI32(compiling.cop_arybase);
+ compiling.cop_arybase = 0;
+ }
+ else if (type == OP_REFGEN)
+ goto nomod;
+ else
+ croak("That use of $[ is unsupported");
+ break;
+ case OP_ENTERSUB:
+ if ((type == OP_UNDEF || type == OP_REFGEN) &&
+ !(op->op_flags & OPf_STACKED)) {
+ op->op_type = OP_RV2CV; /* entersub => rv2cv */
op->op_ppaddr = ppaddr[OP_RV2CV];
- null(cUNOP->op_first); /* disable pushmark */
+ assert(cUNOP->op_first->op_type == OP_NULL);
+ null(((LISTOP*)cUNOP->op_first)->op_first); /* disable pushmark */
break;
}
/* FALL THROUGH */
default:
+ nomod:
+ /* grep, foreach, subcalls, refgen */
+ 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");
yyerror(tokenbuf);
return op;
+ case OP_PREINC:
+ case OP_PREDEC:
+ case OP_POW:
+ case OP_MULTIPLY:
+ case OP_DIVIDE:
+ case OP_MODULO:
+ case OP_REPEAT:
+ case OP_ADD:
+ case OP_SUBTRACT:
+ case OP_CONCAT:
+ case OP_LEFT_SHIFT:
+ case OP_RIGHT_SHIFT:
+ case OP_BIT_AND:
+ case OP_BIT_XOR:
+ case OP_BIT_OR:
+ case OP_I_MULTIPLY:
+ case OP_I_DIVIDE:
+ case OP_I_MODULO:
+ case OP_I_ADD:
+ case OP_I_SUBTRACT:
+ if (!(op->op_flags & OPf_STACKED))
+ goto nomod;
+ modcount++;
+ break;
+
case OP_COND_EXPR:
for (kid = cUNOP->op_first->op_sibling; kid; kid = kid->op_sibling)
mod(kid, type);
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_HSLICE:
case OP_NEXTSTATE:
case OP_DBSTATE:
+ case OP_REFGEN:
+ case OP_CHOMP:
modcount = 10000;
break;
case OP_RV2SV:
- if (type == OP_RV2AV || type == OP_RV2HV)
- op->op_private = type;
+ 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_PADAV:
- case OP_PADHV:
case OP_UNDEF:
case OP_GV:
case OP_AV2ARYLEN:
modcount++;
break;
- case OP_REFGEN:
+ 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_SUBSTR:
+
+ case OP_POS:
+ mtype = '.';
+ goto makelv;
case OP_VEC:
+ mtype = 'v';
+ goto makelv;
+ case OP_SUBSTR:
+ mtype = 'x';
+ makelv:
pad_free(op->op_targ);
op->op_targ = pad_alloc(op->op_type, SVs_PADMY);
sv = PAD_SV(op->op_targ);
sv_upgrade(sv, SVt_PVLV);
- sv_magic(sv, 0, op->op_type == OP_VEC ? 'v' : 'x', 0, 0);
+ sv_magic(sv, Nullsv, mtype, Nullch, 0);
curpad[op->op_targ] = sv;
- /* FALL THROUGH */
- case OP_NULL:
if (op->op_flags & OPf_KIDS)
- mod(cBINOP->op_first, type);
+ mod(cBINOP->op_first->op_sibling, type);
break;
+
case OP_AELEM:
case OP_HELEM:
ref(cBINOP->op_first, op->op_type);
- if (type == OP_RV2AV || type == OP_RV2HV)
- op->op_private = type;
+ modcount++;
break;
case OP_SCOPE:
case OP_LEAVE:
case OP_ENTER:
+ if (op->op_flags & OPf_KIDS)
+ mod(cLISTOP->op_last, type);
+ break;
+
+ case OP_NULL:
if (!(op->op_flags & OPf_KIDS))
break;
- mod(cLISTOP->op_last, type);
- break;
-
+ if (op->op_targ != OP_LIST) {
+ mod(cBINOP->op_first, type);
+ break;
+ }
+ /* FALL THROUGH */
case OP_LIST:
for (kid = cLISTOP->op_first; kid; kid = kid->op_sibling)
mod(kid, type);
break;
}
- op->op_flags |= OPf_LVAL;
- if (!type) {
+ op->op_flags |= OPf_MOD;
+
+ if (type == OP_AASSIGN || type == OP_SASSIGN)
+ op->op_flags |= OPf_SPECIAL|OPf_REF;
+ else if (!type) {
+ op->op_private |= OPpLVAL_INTRO;
op->op_flags &= ~OPf_SPECIAL;
- op->op_flags |= OPf_INTRO;
}
- else if (type == OP_AASSIGN || type == OP_SASSIGN)
- op->op_flags |= OPf_SPECIAL;
+ else if (type != OP_GREPSTART && type != OP_ENTERSUB)
+ op->op_flags |= OPf_REF;
return op;
}
I32 type;
{
OP *kid;
- SV *sv;
- if (!op)
+ if (!op || error_count)
return op;
switch (op->op_type) {
- case OP_ENTERSUBR:
- if ((type == OP_REFGEN || type == OP_DEFINED)
- && !(op->op_flags & (OPf_STACKED|OPf_PARENS))) {
- op->op_type = OP_RV2CV; /* entersubr => rv2cv */
+ case OP_ENTERSUB:
+ if ((type == OP_DEFINED) &&
+ !(op->op_flags & OPf_STACKED)) {
+ op->op_type = OP_RV2CV; /* entersub => rv2cv */
op->op_ppaddr = ppaddr[OP_RV2CV];
- null(cUNOP->op_first);
+ assert(cUNOP->op_first->op_type == OP_NULL);
+ null(((LISTOP*)cUNOP->op_first)->op_first); /* disable pushmark */
+ op->op_flags |= OPf_SPECIAL;
}
break;
ref(kid, type);
break;
case OP_RV2SV:
- if (type == OP_RV2AV || type == OP_RV2HV)
- op->op_private = type;
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;
+ }
break;
case OP_RV2AV:
case OP_RV2HV:
- op->op_flags |= OPf_LVAL;
+ op->op_flags |= OPf_REF;
/* FALL THROUGH */
case OP_RV2GV:
ref(cUNOP->op_first, op->op_type);
case OP_PADAV:
case OP_PADHV:
- op->op_flags |= OPf_LVAL;
+ op->op_flags |= OPf_REF;
break;
case OP_SCALAR:
case OP_AELEM:
case OP_HELEM:
ref(cBINOP->op_first, op->op_type);
- if (type == OP_RV2AV || type == OP_RV2HV || type == OP_REFGEN) {
- op->op_private = type;
- op->op_flags |= OPf_LVAL;
+ if (type == OP_RV2AV || type == OP_RV2HV) {
+ op->op_private |= (type == OP_RV2AV ? OPpDEREF_AV : OPpDEREF_HV);
+ op->op_flags |= OPf_MOD;
}
break;
break;
ref(cLISTOP->op_last, type);
break;
+ default:
+ break;
}
return scalar(op);
OP *op;
{
OP *kid;
- SV *sv;
I32 type;
- if (!op)
+ if (!op || error_count)
return op;
type = op->op_type;
yyerror(tokenbuf);
return op;
}
- op->op_flags |= OPf_LVAL|OPf_INTRO;
+ op->op_flags |= OPf_MOD;
+ op->op_private |= OPpLVAL_INTRO;
return op;
}
if (right->op_type != OP_MATCH)
left = mod(left, right->op_type);
if (right->op_type == OP_TRANS)
- op = newBINOP(OP_NULL, 0, scalar(left), right);
+ op = newBINOP(OP_NULL, OPf_STACKED, scalar(left), right);
else
op = prepend_elem(right->op_type, scalar(left), right);
if (type == OP_NOT)
OP *o;
{
if (o) {
- if (o->op_flags & OPf_PARENS) {
+ 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;
}
-OP *
-block_head(o, startp)
-OP *o;
-OP **startp;
+int
+block_start()
{
- if (!o) {
- *startp = 0;
- return o;
+ int retval = savestack_ix;
+ comppad_name_fill = AvFILL(comppad_name);
+ SAVEINT(min_intro_pending);
+ SAVEINT(max_intro_pending);
+ min_intro_pending = 0;
+ SAVEINT(comppad_name_fill);
+ SAVEINT(padix_floor);
+ padix_floor = padix;
+ pad_reset_pending = FALSE;
+ SAVEINT(hints);
+ hints &= ~HINT_BLOCK_SCOPE;
+ return retval;
+}
+
+OP*
+block_end(line, floor, seq)
+int line;
+int floor;
+OP* seq;
+{
+ int needblockscope = hints & HINT_BLOCK_SCOPE;
+ OP* retval = scalarseq(seq);
+ if (copline > (line_t)line)
+ copline = line;
+ LEAVE_SCOPE(floor);
+ pad_reset_pending = FALSE;
+ if (needblockscope)
+ hints |= HINT_BLOCK_SCOPE; /* propagate out */
+ pad_leavemy(comppad_name_fill);
+ return retval;
+}
+
+void
+newPROG(op)
+OP *op;
+{
+ if (in_eval) {
+ eval_root = newUNOP(OP_LEAVEEVAL, 0, op);
+ eval_start = linklist(eval_root);
+ eval_root->op_next = 0;
+ peep(eval_start);
+ }
+ else {
+ if (!op) {
+ main_start = 0;
+ return;
+ }
+ main_root = scope(sawparens(scalarvoid(op)));
+ curcop = &compiling;
+ main_start = LINKLIST(main_root);
+ main_root->op_next = 0;
+ peep(main_start);
+ main_cv = compcv;
+ compcv = 0;
}
- o = scope(sawparens(scalarvoid(o)));
- curcop = &compiling;
- *startp = LINKLIST(o);
- o->op_next = 0;
- peep(*startp);
- return o;
}
OP *
if (dowarn && bufptr > oldbufptr && bufptr[-1] == ',') {
char *s;
for (s = bufptr; *s && (isALNUM(*s) || strchr("@$%, ",*s)); s++) ;
- if (*s == ';' || *s == '=' && (s[1] == '@' || s[2] == '@'))
+ if (*s == ';' || *s == '=')
warn("Parens missing around \"%s\" list", lex ? "my" : "local");
}
}
if (o->op_type == OP_LIST) {
o = convert(OP_JOIN, 0,
prepend_elem(OP_LIST,
- newSVREF(newGVOP(OP_GV, 0, gv_fetchpv(";", TRUE))),
+ newSVREF(newGVOP(OP_GV, 0, gv_fetchpv(";", TRUE, SVt_PV))),
o));
}
return o;
if (opargs[type] & OA_TARGET)
o->op_targ = pad_alloc(type, SVs_PADTMP);
+ if ((opargs[type] & OA_OTHERINT) && (hints & HINT_INTEGER))
+ o->op_ppaddr = ppaddr[type = ++(o->op_type)];
+
if (!(opargs[type] & OA_FOLDCONST))
goto nope;
+ if (error_count)
+ 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) {
goto nope;
}
o->op_next = 0;
op = curop;
run();
- if (o->op_targ && *stack_sp == PAD_SV(o->op_targ))
+ sv = *(stack_sp--);
+ if (o->op_targ && sv == PAD_SV(o->op_targ)) /* grab pad temp? */
pad_swipe(o->op_targ);
+ 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 (!(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 (!(hints & HINT_INTEGER)) {
+ 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))
+ continue;
+ return o;
+ }
+ if (opargs[curop->op_type] & OA_RETINTEGER)
continue;
return o;
}
- if (opargs[curop->op_type] & OA_RETINTEGER)
- continue;
- return o;
+ o->op_ppaddr = ppaddr[++(o->op_type)];
}
- o->op_ppaddr = ppaddr[++(o->op_type)];
return o;
}
register OP *o;
{
register OP *curop;
- OP *anonop;
- I32 tmpmark;
- I32 tmpsp;
I32 oldtmps_floor = tmps_floor;
- AV *av;
- GV *gv;
- tmpmark = stack_sp - stack_base;
- anonop = newANONLIST(o);
- curop = LINKLIST(anonop);
- anonop->op_next = 0;
- op = curop;
+ list(o);
+ if (error_count)
+ return o; /* Don't attempt to run with errors */
+
+ op = curop = LINKLIST(o);
+ o->op_next = 0;
+ pp_pushmark();
run();
- tmpsp = stack_sp - stack_base;
+ op = curop;
+ pp_anonlist();
tmps_floor = oldtmps_floor;
- stack_sp = stack_base + tmpmark;
o->op_type = OP_RV2AV;
o->op_ppaddr = ppaddr[OP_RV2AV];
- o->op_sibling = 0;
curop = ((UNOP*)o)->op_first;
- ((UNOP*)o)->op_first = newSVOP(OP_CONST, 0, newSVsv(stack_sp[1]));
+ ((UNOP*)o)->op_first = newSVOP(OP_CONST, 0, SvREFCNT_inc(*stack_sp--));
op_free(curop);
- curop = ((UNOP*)anonop)->op_first;
- curop = ((UNOP*)curop)->op_first;
- curop->op_sibling = 0;
- op_free(anonop);
- o->op_next = 0;
linklist(o);
return list(o);
}
OP* op;
{
OP *kid;
- OP *last;
+ OP *last = 0;
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;
if (!last)
return first;
- if (first->op_type == type) {
- if (first->op_flags & OPf_KIDS)
- ((LISTOP*)first)->op_last->op_sibling = last;
- else {
- first->op_flags |= OPf_KIDS;
- ((LISTOP*)first)->op_first = last;
- }
- ((LISTOP*)first)->op_last = last;
- ((LISTOP*)first)->op_children++;
- return first;
- }
+ if (first->op_type != type || type==OP_LIST && first->op_flags & OPf_PARENS)
+ return newLISTOP(type, 0, first, last);
- return newLISTOP(type, 0, first, last);
+ if (first->op_flags & OPf_KIDS)
+ ((LISTOP*)first)->op_last->op_sibling = last;
+ else {
+ first->op_flags |= OPf_KIDS;
+ ((LISTOP*)first)->op_first = last;
+ }
+ ((LISTOP*)first)->op_last = last;
+ ((LISTOP*)first)->op_children++;
+ return first;
}
OP *
scalar(op);
if (opargs[type] & OA_TARGET)
op->op_targ = pad_alloc(type, SVs_PADTMP);
- return (*check[type])(op);
+ return CHECKOP(type, op);
}
OP *
first = newOP(OP_STUB, 0);
if (opargs[type] & OA_MARK)
first = force_list(first);
- else if (first->op_type == OP_LIST)
- unlist(first);
Newz(1101, unop, 1, UNOP);
unop->op_type = type;
unop->op_flags = flags | OPf_KIDS;
unop->op_private = 1;
- unop = (UNOP*)(*check[type])((OP*)unop);
+ unop = (UNOP*) CHECKOP(type, unop);
if (unop->op_next)
return (OP*)unop;
- return fold_constants(unop);
+ return fold_constants((OP *) unop);
}
OP *
first->op_sibling = last;
}
- binop = (BINOP*)(*check[type])((OP*)binop);
+ binop = (BINOP*)CHECKOP(type, binop);
if (binop->op_next)
return (OP*)binop;
binop->op_last = last = binop->op_first->op_sibling;
- return fold_constants(binop);
+ return fold_constants((OP *)binop);
}
OP *
OP *expr;
OP *repl;
{
- PMOP *pm = (PMOP*)op;
SV *tstr = ((SVOP*)expr)->op_sv;
SV *rstr = ((SVOP*)repl)->op_sv;
STRLEN tlen;
register char *r = 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);
pmop->op_private = 0;
/* link into pm list */
- if (type != OP_TRANS) {
+ if (type != OP_TRANS && curstash) {
pmop->op_pmnext = HvPMROOT(curstash);
HvPMROOT(curstash) = pmop;
}
p = SvPV(pat, plen);
pm->op_pmflags |= PMf_SKIPWHITE;
}
- scan_prefix(pm, p, plen);
- if (pm->op_pmshort && (pm->op_pmflags & PMf_SCANFIRST))
- fbm_compile(pm->op_pmshort, pm->op_pmflags & PMf_FOLD);
- pm->op_pmregexp = regcomp(p, p + plen, pm->op_pmflags & PMf_FOLD);
+ pm->op_pmregexp = pregcomp(p, p + plen, pm);
+ if (strEQ("\\s+", pm->op_pmregexp->precomp))
+ pm->op_pmflags |= PMf_WHITE;
hoistmust(pm);
op_free(expr);
}
}
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);
+ return CHECKOP(type, pvop);
}
OP *
scalar((OP*)cvop);
if (opargs[type] & OA_TARGET)
cvop->op_targ = pad_alloc(type, SVs_PADTMP);
- return (*check[type])((OP*)cvop);
+ return CHECKOP(type, cvop);
}
void
STRLEN len;
char *name;
sv = cSVOP->op_sv;
- curstash = fetch_stash(sv,TRUE);
name = SvPV(sv, len);
+ curstash = gv_stashpv(name,TRUE);
sv_setpvn(curstname, name, len);
op_free(op);
}
expect = XSTATE;
}
-HV*
-fetch_stash(sv,create)
-SV *sv;
-I32 create;
+void
+utilize(aver, id, arg)
+int aver;
+OP *id;
+OP *arg;
{
- char tmpbuf[256];
- HV *stash;
- GV *tmpgv;
- char *name = SvPV(sv, na);
- sprintf(tmpbuf,"%s::",name);
- tmpgv = gv_fetchpv(tmpbuf,create);
- if (!tmpgv)
- return 0;
- if (!GvHV(tmpgv))
- GvHV(tmpgv) = newHV();
- stash = GvHV(tmpgv);
- if (!HvNAME(stash))
- HvNAME(stash) = savestr(name);
- return stash;
+ OP *pack;
+ OP *meth;
+ OP *rqop;
+ OP *imop;
+
+ if (id->op_type != OP_CONST)
+ croak("Module name must be constant");
+
+ /* Fake up an import/unimport */
+ 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(),
+ newSVOP(OP_CONST, 0, newSVpv("BEGIN", 5)),
+ Nullop,
+ append_elem(OP_LINESEQ,
+ newSTATEOP(0, Nullch, rqop),
+ newSTATEOP(0, Nullch, imop) ));
+
+ copline = NOLINE;
+ expect = XSTATE;
}
OP *
}
OP *
-newASSIGNOP(flags, left, right)
+newASSIGNOP(flags, left, optype, right)
I32 flags;
OP *left;
+I32 optype;
OP *right;
{
OP *op;
+ if (optype) {
+ if (optype == OP_ANDASSIGN || optype == OP_ORASSIGN) {
+ return newLOGOP(optype, 0,
+ mod(scalar(left), optype),
+ newUNOP(OP_SASSIGN, 0, scalar(right)));
+ }
+ else {
+ return newBINOP(optype, OPf_STACKED,
+ mod(scalar(left), optype), scalar(right));
+ }
+ }
+
if (list_assignment(left)) {
modcount = 0;
+ eval_start = right; /* Grandfathering $[ assignment here. Bletch.*/
left = mod(left, OP_AASSIGN);
+ 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) {
+ 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;
list(force_list(right)),
list(force_list(left)) );
op->op_private = 0;
- if (!(left->op_flags & OPf_INTRO)) {
- static int generation = 0;
+ if (!(left->op_private & OPpLVAL_INTRO)) {
+ 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 ||
right->op_flags |= OPf_STACKED;
return newBINOP(OP_NULL, flags, mod(scalar(left), OP_SASSIGN), scalar(right));
}
- else
+ else {
+ eval_start = right; /* Grandfathering $[ assignment here. Bletch.*/
op = newBINOP(OP_SASSIGN, flags,
scalar(right), mod(scalar(left), OP_SASSIGN) );
+ if (eval_start)
+ eval_start = 0;
+ else {
+ op_free(op);
+ return Nullop;
+ }
+ }
return op;
}
I32 i;
SV *sv;
for (i = min_intro_pending; i <= max_intro_pending; i++) {
- if (sv = svp[i])
+ 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 */
if (label) {
cop->cop_label = label;
- needblockscope = TRUE;
+ hints |= HINT_BLOCK_SCOPE;
}
cop->cop_seq = cop_seqmax++;
+ cop->cop_arybase = curcop->cop_arybase;
if (copline == NOLINE)
cop->cop_line = curcop->cop_line;
SV **svp = av_fetch(GvAV(curcop->cop_filegv),(I32)cop->cop_line, FALSE);
if (svp && *svp != &sv_undef && !SvIOK(*svp)) {
SvIVX(*svp) = 1;
- SvIOK_on(*svp);
+ (void)SvIOK_on(*svp);
SvSTASH(*svp) = (HV*)cop;
}
}
LOGOP *logop;
OP *op;
+ if (type == OP_XOR) /* Not short circuit, but here by precedence. */
+ return newBINOP(type, flags, scalar(first), scalar(other));
+
scalarboolean(first);
/* optimize "!a && b" to "a || b", and "!a || b" to "a && b" */
if (first->op_type == OP_NOT && (first->op_flags & OPf_SPECIAL)) {
if (!other)
return first;
+ if (type == OP_ANDASSIGN || type == OP_ORASSIGN)
+ other->op_private |= OPpASSIGN_BACKWARDS; /* other is an OP_SASSIGN */
+
Newz(1101, logop, 1, LOGOP);
logop->op_type = type;
OP* listop;
OP* op;
int once = block && block->op_flags & OPf_SPECIAL &&
- (block->op_type == OP_ENTERSUBR || block->op_type == OP_NULL);
+ (block->op_type == OP_ENTERSUB || block->op_type == OP_NULL);
if (expr) {
if (once && expr->op_type == OP_CONST && !SvTRUE(((SVOP*)expr)->op_sv))
return block; /* do {} while 0 does once */
else if (expr->op_type == OP_READLINE || expr->op_type == OP_GLOB)
- expr = newASSIGNOP(0, newSVREF(newGVOP(OP_GV, 0, defgv)), expr);
+ expr = newASSIGNOP(0, newSVREF(newGVOP(OP_GV, 0, defgv)), 0, expr);
}
listop = append_elem(OP_LINESEQ, block, newOP(OP_UNSTACK, 0));
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;
- return scope(op);
+ op = scope(op);
+ op->op_flags |= OPf_SPECIAL; /* suppress POPBLOCK curpm restoration*/
+ return op;
}
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)), 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);
if (expr) {
op = newLOGOP(OP_AND, 0, expr, scalar(listop));
- if (op == expr) { /* oops, it's a while (0) */
- op_free(expr);
+ if (op == expr && op->op_type == OP_CONST && !SvTRUE(cSVOP->op_sv)) {
+ op_free(expr); /* oops, it's a while (0) */
op_free((OP*)loop);
return Nullop; /* (listop already freed by newLOGOP) */
}
}
OP *
-#ifndef STANDARD_C
+#ifndef CAN_PROTOTYPE
newFOROP(flags,label,forline,sv,expr,block,cont)
I32 flags;
char *label;
OP*cont;
#else
newFOROP(I32 flags,char *label,line_t forline,OP *sv,OP *expr,OP *block,OP *cont)
-#endif /* STANDARD_C */
+#endif /* CAN_PROTOTYPE */
{
LOOP *loop;
+ int padoff = 0;
+ I32 iterflags = 0;
copline = forline;
if (sv) {
- if (sv->op_type == OP_RV2SV) {
- OP *op = sv;
- sv = cUNOP->op_first;
- sv->op_next = sv;
- cUNOP->op_first = Nullop;
- op_free(op);
+ if (sv->op_type == OP_RV2SV) { /* symbol table variable */
+ sv->op_type = OP_RV2GV;
+ sv->op_ppaddr = ppaddr[OP_RV2GV];
+ }
+ else if (sv->op_type == OP_PADSV) { /* private variable */
+ padoff = sv->op_targ;
+ op_free(sv);
+ sv = Nullop;
}
else
croak("Can't use %s for loop variable", op_name[sv->op_type]);
else {
sv = newGVOP(OP_GV, 0, defgv);
}
- loop = (LOOP*)list(convert(OP_ENTERITER, 0,
- append_elem(OP_LIST, force_list(expr), scalar(sv))));
- return newSTATEOP(0, label, newWHILEOP(flags, 1,
- loop, newOP(OP_ITER, 0), block, cont));
+ 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);
+ Renew(loop, 1, LOOP);
+ loop->op_targ = padoff;
+ return newSTATEOP(0, label, newWHILEOP(flags, 1, loop,
+ newOP(OP_ITER, 0), block, cont));
}
OP*
{
OP *op;
if (type != OP_GOTO || label->op_type == OP_CONST) {
- op = newPVOP(type, 0, savestr(SvPVx(((SVOP*)label)->op_sv, na)));
+ op = newPVOP(type, 0, savepv(
+ label->op_type == OP_CONST
+ ? SvPVx(((SVOP*)label)->op_sv, na)
+ : "" ));
op_free(label);
}
else {
- if (label->op_type == OP_ENTERSUBR)
- label = newUNOP(OP_REFGEN, 0, ref(label, OP_REFGEN));
+ if (label->op_type == OP_ENTERSUB)
+ label = newUNOP(OP_REFGEN, 0, mod(label, OP_REFGEN));
op = newUNOP(type, OPf_STACKED, label);
}
- needblockscope = TRUE;
+ hints |= HINT_BLOCK_SCOPE;
return op;
}
void
-cv_clear(cv)
+cv_undef(cv)
CV *cv;
{
- if (!CvUSERSUB(cv) && CvROOT(cv)) {
+ if (!CvXSUB(cv) && CvROOT(cv)) {
+ if (CvDEPTH(cv))
+ croak("Can't undef active subroutine");
ENTER;
- if (CvPADLIST(cv)) {
- SV** svp = av_fetch(CvPADLIST(cv), 0, FALSE);
- if (svp) {
- SAVESPTR(comppad);
- SAVESPTR(curpad);
- comppad = (AV*)*svp; /* Need same context we had compiling */
- curpad = AvARRAY(comppad);
- }
- }
- op_free(CvROOT(cv));
+
+ SAVESPTR(curpad);
+ curpad = 0;
+
+ if (!(SvFLAGS(cv) & SVpcv_CLONED))
+ op_free(CvROOT(cv));
CvROOT(cv) = Nullop;
- if (CvDEPTH(cv))
- warn("Deleting active subroutine"); /* XXX */
- if (CvPADLIST(cv)) {
- I32 i = AvFILL(CvPADLIST(cv));
- while (i > 0) {
- SV** svp = av_fetch(CvPADLIST(cv), i--, FALSE);
- if (svp)
- av_free((AV*)*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);
+ SvFLAGS(cv) |= SVpcv_CLONED;
+
+ 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);
}
- av_free((AV*)CvPADLIST(cv));
}
- SvREFCNT_dec(CvGV(cv));
- LEAVE;
+ else {
+ av_store(comppad, ix, sv = NEWSV(0,0));
+ SvPADTMP_on(sv);
+ }
}
+
+ LEAVE;
+ return cv;
}
-void
-newSUB(floor,op,block)
+CV *
+newSUB(floor,op,proto,block)
I32 floor;
OP *op;
+OP *proto;
OP *block;
{
register CV *cv;
- char *name = SvPVx(cSVOP->op_sv, na);
- GV *gv = gv_fetchpv(name,2);
+ char *name = op ? SvPVx(cSVOP->op_sv, na) : "__ANON__";
+ GV *gv = gv_fetchpv(name, GV_ADDMULTI, SVt_PVCV);
AV* av;
char *s;
+ I32 ix;
- sub_generation++;
- if ((cv = GvCV(gv)) && !GvCVGEN(gv)) {
- if (CvDEPTH(cv))
- CvDELETED(cv) = TRUE; /* probably an autoloader */
- else {
- if (dowarn && CvROOT(cv)) {
+ if (op)
+ sub_generation++;
+ if (cv = GvCV(gv)) {
+ if (GvCVGEN(gv))
+ cv = 0; /* just a cached method */
+ else if (CvROOT(cv) || CvXSUB(cv) || GvFLAGS(gv) & GVf_IMPORTED) {
+ if (dowarn) { /* already defined (or promised)? */
line_t oldline = curcop->cop_line;
curcop->cop_line = copline;
curcop->cop_line = oldline;
}
SvREFCNT_dec(cv);
+ cv = 0;
}
}
- Newz(101,cv,1,CV);
- sv_upgrade(cv, SVt_PVCV);
- SvREFCNT(cv) = 1;
+ if (cv) { /* must reuse cv if autoloaded */
+ 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 = compcv;
+ }
GvCV(gv) = cv;
GvCVGEN(gv) = 0;
CvFILEGV(cv) = curcop->cop_filegv;
CvGV(cv) = SvREFCNT_inc(gv);
CvSTASH(cv) = curstash;
- av = newAV();
- av_store(av, 0, Nullsv);
- av_store(comppad, 0, (SV*)av);
- SvOK_on(av);
- AvREAL_off(av);
-
- av = newAV();
- AvREAL_off(av);
- if (AvFILL(comppad_name) < AvFILL(comppad))
- av_store(comppad_name, AvFILL(comppad), Nullsv);
- av_store(av, 0, (SV*)comppad_name);
- av_store(av, 1, (SV*)comppad);
- AvFILL(av) = 1;
- CvPADLIST(cv) = av;
- comppad_name = newAV();
+ 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);
+ }
if (!block) {
CvROOT(cv) = 0;
op_free(op);
copline = NOLINE;
LEAVE_SCOPE(floor);
- return;
+ return cv;
+ }
+
+ av = newAV(); /* Will be @_ */
+ av_extend(av, 0);
+ av_store(comppad, 0, (SV*)av);
+ AvFLAGS(av) = AVf_REIFY;
+
+ for (ix = AvFILL(comppad); ix > 0; ix--) {
+ if (!SvPADMY(curpad[ix]))
+ SvPADTMP_on(curpad[ix]);
}
- CvROOT(cv) = newUNOP(OP_LEAVESUBR, 0, scalarseq(block));
+
+ if (AvFILL(comppad_name) < AvFILL(comppad))
+ av_store(comppad_name, AvFILL(comppad), Nullsv);
+
+ CvROOT(cv) = newUNOP(OP_LEAVESUB, 0, scalarseq(block));
CvSTART(cv) = LINKLIST(CvROOT(cv));
CvROOT(cv)->op_next = 0;
peep(CvSTART(cv));
- CvDELETED(cv) = FALSE;
if (s = strrchr(name,':'))
s++;
else
s = name;
- if (strEQ(s, "BEGIN")) {
+ if (strEQ(s, "BEGIN") && !error_count) {
line_t oldline = compiling.cop_line;
ENTER;
SAVEI32(perldb);
if (!beginav)
beginav = newAV();
- av_push(beginav, cv);
+ av_push(beginav, (SV *)cv);
DEBUG_x( dump_sub(gv) );
rs = nrs;
rslen = nrslen;
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);
SV *sv;
SV *tmpstr = sv_newmortal();
- sprintf(buf,"%s:%ld",SvPVX(GvSV(curcop->cop_filegv)), subline);
+ sprintf(buf,"%s:%ld",SvPVX(GvSV(curcop->cop_filegv)), (long)subline);
sv = newSVpv(buf,0);
sv_catpv(sv,"-");
sprintf(buf,"%ld",(long)curcop->cop_line);
op_free(op);
copline = NOLINE;
LEAVE_SCOPE(floor);
+ if (!op) {
+ GvCV(gv) = 0; /* Will remember in SVOP instead. */
+ SvFLAGS(cv) |= SVpcv_ANON;
+ }
+ return cv;
}
-void
+#ifdef DEPRECATED
+CV *
newXSUB(name, ix, subaddr, filename)
char *name;
I32 ix;
I32 (*subaddr)();
char *filename;
{
+ CV* cv = newXS(name, (void(*)())subaddr, filename);
+ CvOLDSTYLE(cv) = TRUE;
+ CvXSUBANY(cv).any_i32 = ix;
+ return cv;
+}
+#endif
+
+CV *
+newXS(name, subaddr, filename)
+char *name;
+void (*subaddr) _((CV*));
+char *filename;
+{
register CV *cv;
- GV *gv = gv_fetchpv(name,2);
+ GV *gv = gv_fetchpv((name ? name : "__ANON__"), GV_ADDMULTI, SVt_PVCV);
char *s;
- sub_generation++;
- if ((cv = GvCV(gv)) && !GvCVGEN(gv)) {
- if (dowarn)
- warn("Subroutine %s redefined",name);
- if (!CvUSERSUB(cv) && CvROOT(cv)) {
- op_free(CvROOT(cv));
- CvROOT(cv) = Nullop;
+ if (name)
+ sub_generation++;
+ if (cv = GvCV(gv)) {
+ if (GvCVGEN(gv))
+ cv = 0; /* just a cached method */
+ else if (CvROOT(cv) || CvXSUB(cv)) { /* already defined? */
+ if (dowarn) {
+ line_t oldline = curcop->cop_line;
+
+ curcop->cop_line = copline;
+ warn("Subroutine %s redefined",name);
+ curcop->cop_line = oldline;
+ }
+ SvREFCNT_dec(cv);
+ cv = 0;
}
- Safefree(cv);
}
- Newz(101,cv,1,CV);
- sv_upgrade(cv, SVt_PVCV);
- SvREFCNT(cv) = 1;
+ if (cv) { /* must reuse cv if autoloaded */
+ assert(SvREFCNT(CvGV(cv)) > 1);
+ SvREFCNT_dec(CvGV(cv));
+ }
+ else {
+ cv = (CV*)NEWSV(1105,0);
+ sv_upgrade((SV *)cv, SVt_PVCV);
+ }
GvCV(gv) = cv;
CvGV(cv) = SvREFCNT_inc(gv);
GvCVGEN(gv) = 0;
CvFILEGV(cv) = gv_fetchfile(filename);
- CvUSERSUB(cv) = subaddr;
- CvUSERINDEX(cv) = ix;
- CvDELETED(cv) = FALSE;
- if (s = strrchr(name,':'))
+ CvXSUB(cv) = subaddr;
+ if (!name)
+ s = "__ANON__";
+ else if (s = strrchr(name,':'))
s++;
else
s = name;
av_unshift(endav, 1);
av_store(endav, 0, SvREFCNT_inc(gv));
}
+ if (!name) {
+ GvCV(gv) = 0; /* Will remember elsewhere instead. */
+ SvFLAGS(cv) |= SVpcv_ANON;
+ }
+ return cv;
}
void
register CV *cv;
char *name;
GV *gv;
- AV* av;
+ I32 ix;
if (op)
name = SvPVx(cSVOP->op_sv, na);
else
name = "STDOUT";
- gv = gv_fetchpv(name,TRUE);
+ gv = gv_fetchpv(name,TRUE, SVt_PVFM);
+ SvMULTI_on(gv);
if (cv = GvFORM(gv)) {
if (dowarn) {
line_t oldline = curcop->cop_line;
}
SvREFCNT_dec(cv);
}
- Newz(101,cv,1,CV);
- sv_upgrade(cv, SVt_PVFM);
- SvREFCNT(cv) = 1;
+ cv = compcv;
GvFORM(gv) = cv;
CvGV(cv) = SvREFCNT_inc(gv);
CvFILEGV(cv) = curcop->cop_filegv;
- CvPADLIST(cv) = av = newAV();
- AvREAL_off(av);
- av_store(av, 1, (SV*)comppad);
- AvFILL(av) = 1;
+ for (ix = AvFILL(comppad); ix > 0; ix--) {
+ if (!SvPADMY(curpad[ix]))
+ SvPADTMP_on(curpad[ix]);
+ }
CvROOT(cv) = newUNOP(OP_LEAVEWRITE, 0, scalarseq(block));
CvSTART(cv) = LINKLIST(CvROOT(cv));
CvROOT(cv)->op_next = 0;
peep(CvSTART(cv));
- CvDELETED(cv) = FALSE;
FmLINES(cv) = 0;
op_free(op);
copline = NOLINE;
OP* op;
{
return newUNOP(OP_REFGEN, 0,
- ref(list(convert(OP_ANONLIST, 0, op)), OP_REFGEN));
+ mod(list(convert(OP_ANONLIST, 0, op)), OP_REFGEN));
}
OP *
OP* op;
{
return newUNOP(OP_REFGEN, 0,
- ref(list(convert(OP_ANONHASH, 0, op)), OP_REFGEN));
+ mod(list(convert(OP_ANONHASH, 0, op)), OP_REFGEN));
+}
+
+OP *
+newANONSUB(floor, proto, block)
+I32 floor;
+OP *proto;
+OP *block;
+{
+ return newUNOP(OP_REFGEN, 0,
+ newSVOP(OP_ANONCODE, 0, (SV*)newSUB(floor, 0, proto, block)));
}
OP *
}
OP *
-newGVREF(o)
+newGVREF(type,o)
+I32 type;
OP *o;
{
- return newUNOP(OP_RV2GV, 0, scalar(o));
+ if (type == OP_MAPSTART)
+ return newUNOP(OP_NULL, 0, o);
+ return ref(newUNOP(OP_RV2GV, OPf_REF, o), type);
}
OP *
}
OP *
-ck_chop(op)
+ck_spair(op)
OP *op;
{
if (op->op_flags & OPf_KIDS) {
OP* newop;
+ OP* kid;
op = modkids(ck_fun(op), op->op_type);
- if (op->op_private != 1)
+ kid = cUNOP->op_first;
+ newop = kUNOP->op_first->op_sibling;
+ if (newop &&
+ (newop->op_sibling ||
+ !(opargs[newop->op_type] & OA_RETSCALAR) ||
+ newop->op_type == OP_PADAV || newop->op_type == OP_PADHV ||
+ newop->op_type == OP_RV2AV || newop->op_type == OP_RV2HV)) {
+
return op;
- newop = cUNOP->op_first->op_sibling;
- if (!newop || newop->op_type != OP_RV2SV)
- return op;
- op_free(cUNOP->op_first);
- cUNOP->op_first = newop;
+ }
+ op_free(kUNOP->op_first);
+ kUNOP->op_first = newop;
+ }
+ op->op_ppaddr = ppaddr[++op->op_type];
+ return ck_fun(op);
+}
+
+OP *
+ck_delete(op)
+OP *op;
+{
+ op = ck_fun(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]);
+ null(kid);
}
- op->op_type = OP_SCHOP;
- op->op_ppaddr = ppaddr[OP_SCHOP];
return op;
}
if (cLISTOP->op_first->op_type == OP_STUB) {
op_free(op);
op = newUNOP(type, OPf_SPECIAL,
- newGVOP(OP_GV, 0, gv_fetchpv("main'ARGV", TRUE)));
+ newGVOP(OP_GV, 0, gv_fetchpv("main'ARGV", TRUE, SVt_PVAV)));
}
return ck_fun(op);
}
ck_eval(op)
OP *op;
{
- needblockscope = TRUE;
+ hints |= HINT_BLOCK_SCOPE;
if (op->op_flags & OPf_KIDS) {
SVOP *kid = (SVOP*)cUNOP->op_first;
op_free(op);
op = newUNOP(OP_ENTEREVAL, 0, newSVREF(newGVOP(OP_GV, 0, defgv)));
}
+ op->op_targ = (PADOFFSET)hints;
return op;
}
register OP *op;
{
SVOP *kid = (SVOP*)cUNOP->op_first;
+
+ 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;
- kid->op_sv = SvREFCNT_inc(gv_fetchpv(SvPVx(kid->op_sv, na),
- 1+(op->op_type==OP_RV2CV)));
+ 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 | !(kid->op_private & OPpCONST_ENTERED),
+ iscv
+ ? SVt_PVCV
+ : op->op_type == OP_RV2SV
+ ? SVt_PV
+ : op->op_type == OP_RV2AV
+ ? SVt_PVAV
+ : op->op_type == OP_RV2HV
+ ? SVt_PVHV
+ : SVt_PVGV);
+ }
+ SvREFCNT_dec(kid->op_sv);
+ kid->op_sv = SvREFCNT_inc(gv);
}
return op;
}
{
I32 type = op->op_type;
- if (op->op_flags & OPf_SPECIAL)
+ if (op->op_flags & OPf_REF)
return op;
if (op->op_flags & OPf_KIDS) {
SVOP *kid = (SVOP*)cUNOP->op_first;
if (kid->op_type == OP_CONST && (kid->op_private & OPpCONST_BARE)) {
- OP *newop = newGVOP(type, OPf_SPECIAL,
- gv_fetchpv(SvPVx(kid->op_sv, na), TRUE));
+ OP *newop = newGVOP(type, OPf_REF,
+ gv_fetchpv(SvPVx(kid->op_sv, na), TRUE, SVt_PVIO));
op_free(op);
return newop;
}
else {
op_free(op);
if (type == OP_FTTTY)
- return newGVOP(type, OPf_SPECIAL, gv_fetchpv("main'STDIN", TRUE));
+ return newGVOP(type, OPf_REF, gv_fetchpv("main'STDIN", TRUE,
+ SVt_PVIO));
else
return newUNOP(type, 0, newSVREF(newGVOP(OP_GV, 0, defgv)));
}
OP **tokid;
OP *sibl;
I32 numargs = 0;
- register I32 oa = opargs[op->op_type] >> 8;
+ int type = op->op_type;
+ register I32 oa = opargs[type] >> OASHIFT;
if (op->op_flags & OPf_STACKED) {
if ((oa & OA_OPTIONAL) && (oa >> 4) && !((oa >> 4) & OA_OPTIONAL))
tokid = &kid->op_sibling;
kid = kid->op_sibling;
}
+ if (!kid && opargs[type] & OA_DEFGV)
+ *tokid = kid = newSVREF(newGVOP(OP_GV, 0, defgv));
while (oa && kid) {
numargs++;
(kid->op_private & OPpCONST_BARE)) {
char *name = SvPVx(((SVOP*)kid)->op_sv, na);
OP *newop = newAVREF(newGVOP(OP_GV, 0,
- gv_fetchpv(name, TRUE) ));
+ gv_fetchpv(name, TRUE, SVt_PVAV) ));
if (dowarn)
warn("Array @%s missing the @ in argument %d of %s()",
- name, numargs, op_name[op->op_type]);
+ name, numargs, op_name[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);
- mod(kid, op->op_type);
+ bad_type(numargs, "array", op_name[op->op_type], kid);
+ mod(kid, type);
break;
case OA_HVREF:
if (kid->op_type == OP_CONST &&
(kid->op_private & OPpCONST_BARE)) {
char *name = SvPVx(((SVOP*)kid)->op_sv, na);
OP *newop = newHVREF(newGVOP(OP_GV, 0,
- gv_fetchpv(name, TRUE) ));
+ gv_fetchpv(name, TRUE, SVt_PVHV) ));
if (dowarn)
warn("Hash %%%s missing the %% in argument %d of %s()",
- name, numargs, op_name[op->op_type]);
+ name, numargs, op_name[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);
- mod(kid, op->op_type);
+ bad_type(numargs, "hash", op_name[op->op_type], kid);
+ mod(kid, type);
break;
case OA_CVREF:
{
- OP *newop = newUNOP(OP_NULL, 0, scalar(kid));
+ OP *newop = newUNOP(OP_NULL, 0, kid);
kid->op_sibling = 0;
linklist(kid);
newop->op_next = newop;
if (kid->op_type == OP_CONST &&
(kid->op_private & OPpCONST_BARE)) {
OP *newop = newGVOP(OP_GV, 0,
- gv_fetchpv(SvPVx(((SVOP*)kid)->op_sv, na), TRUE) );
+ gv_fetchpv(SvPVx(((SVOP*)kid)->op_sv, na), TRUE,
+ SVt_PVIO) );
op_free(kid);
kid = newop;
}
scalar(kid);
break;
case OA_SCALARREF:
- mod(scalar(kid), op->op_type);
+ mod(scalar(kid), type);
break;
}
oa >>= 4;
}
op->op_private = numargs;
if (kid)
- return too_many_arguments(op);
+ return too_many_arguments(op,op_name[op->op_type]);
listkids(op);
}
+ else if (opargs[type] & OA_DEFGV) {
+ op_free(op);
+ return newUNOP(type, 0, newSVREF(newGVOP(OP_GV, 0, defgv)));
+ }
+
if (oa) {
while (oa & OA_OPTIONAL)
oa >>= 4;
if (oa && oa != OA_LIST)
- return too_few_arguments(op);
+ return too_few_arguments(op,op_name[op->op_type]);
}
return op;
}
ck_glob(op)
OP *op;
{
- GV *gv = newGVgen();
- GvIOn(gv);
+ GV *gv = newGVgen("main");
+ gv_IOadd(gv);
append_elem(OP_GLOB, op, newGVOP(OP_GV, 0, gv));
scalarkids(op);
- return op;
+ return ck_fun(op);
}
OP *
{
LOGOP *gwop;
OP *kid;
+ OPCODE type = op->op_type == OP_GREPSTART ? OP_GREPWHILE : OP_MAPWHILE;
+ op->op_ppaddr = ppaddr[OP_GREPSTART];
+ Newz(1101, gwop, 1, LOGOP);
+
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->op_next = (OP*)gwop;
op->op_flags &= ~OPf_STACKED;
}
+ kid = cLISTOP->op_first->op_sibling;
+ if (type == OP_MAPWHILE)
+ list(kid);
+ else
+ scalar(kid);
op = ck_fun(op);
if (error_count)
return op;
- kid = cLISTOP->op_first->op_sibling;
+ kid = cLISTOP->op_first->op_sibling;
if (kid->op_type != OP_NULL)
croak("panic: ck_grep");
kid = kUNOP->op_first;
- Newz(1101, gwop, 1, LOGOP);
- gwop->op_type = OP_GREPWHILE;
- gwop->op_ppaddr = ppaddr[OP_GREPWHILE];
- gwop->op_first = list(op);
+ gwop->op_type = type;
+ gwop->op_ppaddr = ppaddr[type];
+ gwop->op_first = listkids(op);
gwop->op_flags |= OPf_KIDS;
gwop->op_private = 1;
gwop->op_other = LINKLIST(kid);
- gwop->op_targ = pad_alloc(OP_GREPWHILE, SVs_PADTMP);
+ gwop->op_targ = pad_alloc(type, SVs_PADTMP);
kid->op_next = (OP*)gwop;
+ kid = cLISTOP->op_first->op_sibling;
+ if (!kid || !kid->op_sibling)
+ return too_few_arguments(op,op_name[op->op_type]);
+ for (kid = kid->op_sibling; kid; kid = kid->op_sibling)
+ mod(kid, OP_GREPSTART);
+
return (OP*)gwop;
}
OP *op;
{
/* XXX length optimization goes here */
- return op;
+ return ck_fun(op);
}
OP *
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;
}
ck_require(op)
OP *op;
{
- if (op->op_flags & OPf_KIDS) { /* Shall we fake a BEGIN {}? */
+ if (op->op_flags & OPf_KIDS) { /* Shall we supply missing .pm? */
SVOP *kid = (SVOP*)cUNOP->op_first;
if (kid->op_type == OP_CONST && (kid->op_private & OPpCONST_BARE)) {
- char *name = SvPVX(subname);
char *s;
- sv_catpvn(kid->op_sv, ".pm", 3);
- if (s = strrchr(name,':'))
- s++;
- else
- s = name;
- if (strNE(s, "BEGIN")) {
- op = newSTATEOP(0, Nullch, op);
- newSUB(start_subparse(),
- newSVOP(OP_CONST, 0, newSVpv("BEGIN", 5)),
- op);
- return newOP(OP_STUB,0);
+ for (s = SvPVX(kid->op_sv); *s; s++) {
+ if (*s == ':' && s[1] == ':') {
+ *s = '/';
+ Move(s+2, s+1, strlen(s+2)+1, char);
+ --SvCUR(kid->op_sv);
+ }
}
+ sv_catpvn(kid->op_sv, ".pm", 3);
}
}
return ck_fun(op);
return newUNOP(type, 0,
scalar(newUNOP(OP_RV2AV, 0,
scalar(newGVOP(OP_GV, 0,
- gv_fetchpv((subline ? "_" : "ARGV"), TRUE) )))));
+ gv_fetchpv((subline ? "_" : "ARGV"), TRUE, SVt_PVAV) )))));
}
return scalar(modkids(ck_fun(op), type));
}
if (kid->op_type == OP_SCOPE) {
k = kid->op_next;
kid->op_next = 0;
- peep(k);
}
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;
+ }
}
- peep(kLISTOP->op_first);
+ else
+ kid->op_next = 0; /* just disconnect the leave */
+ k = kLISTOP->op_first;
}
+ peep(k);
+
kid = cLISTOP->op_first->op_sibling; /* get past pushmark */
null(kid); /* wipe out rv2gv */
- kid->op_next = kid;
+ if (op->op_type == OP_SORT)
+ kid->op_next = kid;
+ else
+ kid->op_next = k;
op->op_flags |= OPf_SPECIAL;
}
}
kid = kid->op_sibling;
op_free(cLISTOP->op_first);
cLISTOP->op_first = kid;
- if (!kid)
+ if (!kid) {
cLISTOP->op_first = kid = newSVOP(OP_CONST, 0, newSVpv(" ", 1));
+ cLISTOP->op_last = kid; /* There was only one element previously */
+ }
if (kid->op_type != OP_MATCH) {
OP *sibl = kid->op_sibling;
scalar(kid);
if (kid->op_sibling)
- return too_many_arguments(op);
+ return too_many_arguments(op,op_name[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 = 0;
+ 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;
+ 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_flags & OPf_STACKED))
+ proto = SvPV((SV*)cv,na);
+ }
+ }
+ op->op_private = (hints & HINT_STRICT_REFS);
if (perldb && curstash != debstash)
- op->op_private |= OPpSUBR_DB;
+ op->op_private |= OPpDEREF_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;
}
if (op->op_flags & OPf_KIDS) {
SVOP *kid = (SVOP*)cUNOP->op_first;
- if (kid->op_type == OP_CONST && (kid->op_private & OPpCONST_BARE))
+ if (kid->op_type == OP_NULL)
+ kid = (SVOP*)kid->op_sibling;
+ if (kid &&
+ kid->op_type == OP_CONST && (kid->op_private & OPpCONST_BARE))
op->op_flags |= OPf_SPECIAL;
}
return ck_fun(op);
/* A peephole optimizer. We visit the ops in the order they're to execute. */
void
-peep(op)
-register OP* op;
+peep(o)
+register OP* o;
{
register OP* oldop = 0;
- if (!op || op->op_seq)
+ if (!o || o->op_seq)
return;
- for (; op; op = op->op_next) {
- if (op->op_seq)
- return;
- switch (op->op_type) {
+ ENTER;
+ SAVESPTR(op);
+ SAVESPTR(curcop);
+ for (; o; o = o->op_next) {
+ if (o->op_seq)
+ break;
+ 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_CONST:
+ case OP_JOIN:
+ case OP_UC:
+ case OP_UCFIRST:
+ case OP_LC:
+ case OP_LCFIRST:
+ case OP_QUOTEMETA:
+ if (o->op_next->op_type == OP_STRINGIFY)
+ null(o->op_next);
+ o->op_seq = ++op_seqmax;
+ break;
case OP_STUB:
- if ((op->op_flags & (OPf_KNOW|OPf_LIST)) != (OPf_KNOW|OPf_LIST)) {
- op->op_seq = ++op_seqmax;
+ if ((o->op_flags & (OPf_KNOW|OPf_LIST)) != (OPf_KNOW|OPf_LIST)) {
+ 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:
- if (oldop) {
- oldop->op_next = op->op_next;
+ nothin:
+ if (oldop && o->op_next) {
+ oldop->op_next = o->op_next;
continue;
}
- op->op_seq = ++op_seqmax;
+ o->op_seq = ++op_seqmax;
break;
case OP_GV:
- if (op->op_next->op_type == OP_RV2SV) {
- if (op->op_next->op_private < OP_RV2GV) {
- null(op->op_next);
- op->op_flags |= op->op_next->op_flags & OPf_INTRO;
- op->op_next = op->op_next->op_next;
- op->op_type = OP_GVSV;
- op->op_ppaddr = ppaddr[OP_GVSV];
+ if (o->op_next->op_type == OP_RV2SV) {
+ if (!(o->op_next->op_private & (OPpDEREF_HV|OPpDEREF_AV))) {
+ null(o->op_next);
+ o->op_private |= o->op_next->op_private & OPpLVAL_INTRO;
+ o->op_next = o->op_next->op_next;
+ o->op_type = OP_GVSV;
+ o->op_ppaddr = ppaddr[OP_GVSV];
}
}
- else if (op->op_next->op_type == OP_RV2AV) {
- OP* pop = op->op_next->op_next;
- I32 i;
+ else if (o->op_next->op_type == OP_RV2AV) {
+ OP* pop = o->op_next->op_next;
+ IV i;
if (pop->op_type == OP_CONST &&
+ (op = pop->op_next) &&
pop->op_next->op_type == OP_AELEM &&
- pop->op_next->op_private < OP_RV2GV &&
- !(pop->op_next->op_flags & OPf_INTRO) &&
- (i = SvIV(((SVOP*)pop)->op_sv)) <= 255 &&
+ !(pop->op_next->op_private &
+ (OPpDEREF_HV|OPpDEREF_AV|OPpLVAL_INTRO)) &&
+ (i = SvIV(((SVOP*)pop)->op_sv) - compiling.cop_arybase)
+ <= 255 &&
i >= 0)
{
- null(op->op_next);
+ SvREFCNT_dec(((SVOP*)pop)->op_sv);
+ null(o->op_next);
null(pop->op_next);
null(pop);
- op->op_flags &= ~OPf_LVAL;
- op->op_flags |= pop->op_next->op_flags & OPf_LVAL;
- op->op_next = pop->op_next->op_next;
- op->op_type = OP_AELEMFAST;
- op->op_ppaddr = ppaddr[OP_AELEMFAST];
- op->op_private = i;
- GvAVn((GV*)cSVOP->op_sv);
+ o->op_flags |= pop->op_next->op_flags & OPf_MOD;
+ o->op_next = pop->op_next->op_next;
+ o->op_type = OP_AELEMFAST;
+ o->op_ppaddr = ppaddr[OP_AELEMFAST];
+ o->op_private = (U8)i;
+ GvAVn((GV*)(((SVOP*)o)->op_sv));
}
}
- op->op_seq = ++op_seqmax;
+ o->op_seq = ++op_seqmax;
break;
+ case OP_MAPWHILE:
case OP_GREPWHILE:
case OP_AND:
case OP_OR:
- op->op_seq = ++op_seqmax;
+ o->op_seq = ++op_seqmax;
peep(cLOGOP->op_other);
break;
case OP_COND_EXPR:
- op->op_seq = ++op_seqmax;
+ o->op_seq = ++op_seqmax;
peep(cCONDOP->op_true);
peep(cCONDOP->op_false);
break;
case OP_ENTERLOOP:
- op->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:
- op->op_seq = ++op_seqmax;
- peep(cPMOP->op_pmreplroot);
+ o->op_seq = ++op_seqmax;
+ peep(cPMOP->op_pmreplstart);
break;
+ case OP_EXEC:
+ 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) {
+ line_t oldline = curcop->cop_line;
+
+ curcop->cop_line = ((COP*)o->op_next)->cop_line;
+ warn("Statement unlikely to be reached");
+ warn("(Maybe you meant system() when you said exec()?)\n");
+ curcop->cop_line = oldline;
+ }
+ }
+ break;
default:
- op->op_seq = ++op_seqmax;
+ o->op_seq = ++op_seqmax;
break;
}
- oldop = op;
+ oldop = o;
}
+ LEAVE;
}
projects / p5sagit/p5-mst-13.2.git / blobdiff