-/* $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;
-{
- while (l--)
- *d++ = *s++ & 127;
- *d = '\0';
-}
+static I32 list_assignment _((OP *op));
+static OP *bad_type _((I32 n, char *t, OP *op, 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 void null _((OP* op));
-OP *
+static OP *
no_fh_allowed(op)
OP *op;
{
return op;
}
-OP *
+static OP *
too_few_arguments(op)
OP *op;
{
return op;
}
-OP *
+static OP *
too_many_arguments(op)
OP *op;
{
return op;
}
+static OP *
+bad_type(n, t, op, kid)
+I32 n;
+char *t;
+OP *op;
+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]);
+ 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 %s as left arg of implicit ->",
+ op_name[type]);
+ yyerror(tokenbuf);
+ if (type == OP_RV2HV || type == OP_ENTERSUB)
+ warn("(Did you mean $ 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(comppadname, off, sv);
+ av_store(comppad_name, off, sv);
SvNVX(sv) = (double)cop_seqmax;
- SvIVX(sv) = 99999999;
+ SvIVX(sv) = 0; /* Not yet introduced--see newSTATEOP */
+ if (!min_intro_pending)
+ min_intro_pending = off;
+ max_intro_pending = off;
if (*name == '@')
av_store(comppad, off, (SV*)newAV());
else if (*name == '%')
{
I32 off;
SV *sv;
- SV **svp = AvARRAY(comppadname);
+ SV **svp = AvARRAY(comppad_name);
register I32 i;
register CONTEXT *cx;
- bool saweval;
+ int saweval;
AV *curlist;
AV *curname;
CV *cv;
I32 seq = cop_seqmax;
- for (off = comppadnamefill; off > 0; off--) {
+ /* 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))
* XXX This will also probably interact badly with eval tree caching.
*/
- saweval = FALSE;
+ saweval = 0;
for (i = cxstack_ix; i >= 0; i--) {
cx = &cxstack[i];
switch (cx->cx_type) {
default:
break;
case CXt_EVAL:
- saweval = TRUE;
+ saweval = i;
break;
case CXt_SUB:
if (!saweval)
cv = cx->blk_sub.cv;
if (debstash && CvSTASH(cv) == debstash) /* ignore DB'* scope */
continue;
- seq = cxstack[i+1].blk_oldcop->cop_seq;
+ 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(0,0);
+ SV *sv = NEWSV(1103,0);
sv_upgrade(sv, SVt_PVNV);
sv_setpv(sv, name);
- av_store(comppadname, newoff, sv);
+ av_store(comppad_name, newoff, sv);
SvNVX(sv) = (double)curcop->cop_seq;
- SvIVX(sv) = 99999999;
- av_store(comppad, newoff, sv_ref(oldsv));
+ SvIVX(sv) = 999999999; /* A ref, intro immediately */
+ av_store(comppad, newoff, SvREFCNT_inc(oldsv));
return newoff;
}
}
}
}
+ if (!saweval)
+ return 0;
+
+ /* 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--) {
+ 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 0;
}
I32 fill;
{
I32 off;
- SV **svp = AvARRAY(comppadname);
+ SV **svp = AvARRAY(comppad_name);
SV *sv;
- for (off = AvFILL(comppadname); off > fill; off--) {
- if (sv = svp[off])
+ if (min_intro_pending && fill < min_intro_pending) {
+ for (off = max_intro_pending; off >= min_intro_pending; 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]) && sv != &sv_undef)
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);
else {
do {
sv = *av_fetch(comppad, ++padix, TRUE);
- } while (SvSTORAGE(sv) & (SVs_PADTMP|SVs_PADMY));
+ } while (SvFLAGS(sv) & (SVs_PADTMP|SVs_PADMY));
retval = padix;
}
- SvSTORAGE(sv) |= tmptype;
+ 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 CAN_PROTOTYPE
pad_sv(po)
PADOFFSET po;
+#else
+pad_sv(PADOFFSET po)
+#endif /* CAN_PROTOTYPE */
{
if (!po)
croak("panic: pad_sv po");
}
void
+#ifndef CAN_PROTOTYPE
pad_free(po)
PADOFFSET po;
+#else
+pad_free(PADOFFSET po)
+#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 CAN_PROTOTYPE
pad_swipe(po)
PADOFFSET po;
+#else
+pad_swipe(PADOFFSET po)
+#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])
+ for (po = AvMAX(comppad); po > padix_floor; po--) {
+ if (curpad[po] && curpad[po] != &sv_undef)
SvPADTMP_off(curpad[po]);
}
- padix = 0;
+ padix = padix_floor;
+ 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);
+ }
}
- if (op->op_targ > 0)
- pad_free(op->op_targ);
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:
- sv_free((SV*)cGVOP->op_gv);
+ SvREFCNT_dec(cGVOP->op_gv);
+ break;
+ case OP_NEXTSTATE:
+ case OP_DBSTATE:
+ SvREFCNT_dec(cCOP->cop_filegv);
break;
case OP_CONST:
- sv_free(cSVOP->op_sv);
+ SvREFCNT_dec(cSVOP->op_sv);
+ break;
+ case OP_TRANS:
+ Safefree(cPVOP->op_pv);
+ break;
+ case OP_SUBST:
+ op_free(cPMOP->op_pmreplroot);
+ /* FALL THROUGH */
+ case OP_MATCH:
+ regfree(cPMOP->op_pmregexp);
+ break;
+ default:
break;
}
+ if (op->op_targ > 0)
+ pad_free(op->op_targ);
+
Safefree(op);
}
+static void
+null(op)
+OP* op;
+{
+ if (op->op_type != OP_NULL && op->op_targ > 0)
+ pad_free(op->op_targ);
+ op->op_targ = op->op_type;
+ op->op_type = OP_NULL;
+ op->op_ppaddr = ppaddr[OP_NULL];
+}
+
/* Contextualizers */
#define LINKLIST(o) ((o)->op_next ? (o)->op_next : linklist((OP*)o))
return op;
}
+static OP *
+scalarboolean(op)
+OP *op;
+{
+ if (dowarn &&
+ 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 *
scalar(op)
OP *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:
scalar(cBINOP->op_first);
- return op;
+ break;
case OP_OR:
case OP_AND:
case OP_COND_EXPR:
+ for (kid = cUNOP->op_first->op_sibling; kid; kid = kid->op_sibling)
+ scalar(kid);
break;
- default:
+ 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:
- if (!(op->op_flags & OPf_KIDS))
- return op;
+ default:
+ if (op->op_flags & OPf_KIDS) {
+ for (kid = cUNOP->op_first; kid; kid = kid->op_sibling)
+ scalar(kid);
+ }
break;
case OP_SCOPE:
case OP_LEAVE:
case OP_LEAVETRY:
case OP_LINESEQ:
+ case OP_LIST:
for (kid = cLISTOP->op_first; kid; kid = kid->op_sibling) {
if (kid->op_sibling)
scalarvoid(kid);
scalar(kid);
}
curcop = &compiling;
- return op;
- case OP_LIST:
- op = prepend_elem(OP_LIST, newOP(OP_PUSHMARK, 0), op);
break;
}
- for (kid = cUNOP->op_first->op_sibling; kid; kid = kid->op_sibling)
- scalar(kid);
return op;
}
OP *op;
{
OP *kid;
+ char* useless = 0;
+ SV* sv;
- if (!op)
+ if (!op || error_count)
return op;
if (op->op_flags & OPf_LIST)
return op;
switch (op->op_type) {
default:
- if (dowarn && (opargs[op->op_type] & OA_FOLDCONST) &&
- !(op->op_flags & OPf_STACKED))
- warn("Useless use of %s", op_name[op->op_type]);
- return op;
+ if (!(opargs[op->op_type] & OA_FOLDCONST))
+ break;
+ if (op->op_flags & OPf_STACKED)
+ break;
+ /* FALL THROUGH */
+ case OP_GVSV:
+ case OP_WANTARRAY:
+ case OP_GV:
+ case OP_PADSV:
+ case OP_PADAV:
+ case OP_PADHV:
+ case OP_PADANY:
+ 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_LENGTH:
+ case OP_SUBSTR:
+ case OP_VEC:
+ case OP_INDEX:
+ case OP_RINDEX:
+ case OP_SPRINTF:
+ case OP_AELEM:
+ case OP_AELEMFAST:
+ case OP_ASLICE:
+ case OP_VALUES:
+ case OP_KEYS:
+ case OP_HELEM:
+ case OP_HSLICE:
+ case OP_UNPACK:
+ case OP_PACK:
+ case OP_JOIN:
+ case OP_LSLICE:
+ case OP_ANONLIST:
+ case OP_ANONHASH:
+ case OP_SORT:
+ case OP_REVERSE:
+ case OP_RANGE:
+ case OP_FLIP:
+ case OP_FLOP:
+ case OP_CALLER:
+ case OP_FILENO:
+ case OP_EOF:
+ case OP_TELL:
+ case OP_GETSOCKNAME:
+ case OP_GETPEERNAME:
+ case OP_READLINK:
+ case OP_TELLDIR:
+ case OP_GETPPID:
+ case OP_GETPGRP:
+ case OP_GETPRIORITY:
+ case OP_TIME:
+ case OP_TMS:
+ case OP_LOCALTIME:
+ case OP_GMTIME:
+ case OP_GHBYNAME:
+ case OP_GHBYADDR:
+ case OP_GHOSTENT:
+ case OP_GNBYNAME:
+ case OP_GNBYADDR:
+ case OP_GNETENT:
+ case OP_GPBYNAME:
+ case OP_GPBYNUMBER:
+ case OP_GPROTOENT:
+ case OP_GSBYNAME:
+ case OP_GSBYPORT:
+ case OP_GSERVENT:
+ case OP_GPWNAM:
+ case OP_GPWUID:
+ case OP_GGRNAM:
+ case OP_GGRGID:
+ case OP_GETLOGIN:
+ if (!(op->op_private & OPpLVAL_INTRO))
+ useless = op_name[op->op_type];
+ break;
+
+ case OP_RV2GV:
+ case OP_RV2SV:
+ case OP_RV2AV:
+ case OP_RV2HV:
+ 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 */
break;
case OP_CONST:
- op->op_type = OP_NULL; /* don't execute a constant */
- sv_free(cSVOP->op_sv); /* don't even remember it */
+ sv = cSVOP->op_sv;
+ if (dowarn) {
+ useless = "a constant";
+ if (SvNIOK(sv) && (SvNV(sv) == 0.0 || SvNV(sv) == 1.0))
+ useless = 0;
+ else if (SvPOK(sv)) {
+ if (strnEQ(SvPVX(sv), "di", 2) ||
+ strnEQ(SvPVX(sv), "ds", 2) ||
+ strnEQ(SvPVX(sv), "ig", 2))
+ useless = 0;
+ }
+ }
+ null(op); /* don't execute a constant */
+ SvREFCNT_dec(sv); /* don't even remember it */
break;
case OP_POSTINC:
- op->op_type = OP_PREINC;
+ op->op_type = OP_PREINC; /* pre-increment is faster */
op->op_ppaddr = ppaddr[OP_PREINC];
break;
case OP_POSTDEC:
- op->op_type = OP_PREDEC;
+ op->op_type = OP_PREDEC; /* pre-decrement is faster */
op->op_ppaddr = ppaddr[OP_PREDEC];
break;
case OP_REPEAT:
scalarvoid(cBINOP->op_first);
+ useless = op_name[op->op_type];
break;
+
case OP_OR:
case OP_AND:
case OP_COND_EXPR:
for (kid = cUNOP->op_first->op_sibling; kid; kid = kid->op_sibling)
scalarvoid(kid);
break;
+ case OP_NULL:
+ 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:
- for (kid = cLISTOP->op_first; kid; kid = kid->op_sibling)
- scalarvoid(kid);
- break;
case OP_LIST:
- op = prepend_elem(OP_LIST, newOP(OP_PUSHMARK, 0), op);
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;
}
+ if (useless && dowarn)
+ warn("Useless use of %s in void context", useless);
return 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_KNOW | OPf_LIST);
return op;
}
-static OP *
-guess_mark(op)
-OP *op;
-{
- if (op->op_type == OP_LIST &&
- (!cLISTOP->op_first ||
- cLISTOP->op_first->op_type != OP_PUSHMARK))
- {
- op = prepend_elem(OP_LIST, newOP(OP_PUSHMARK, 0), op);
- op->op_private |= OPpLIST_GUESSED;
- }
- return op;
-}
-
OP *
scalarseq(op)
OP *op;
{
OP *kid;
- OP **prev;
if (op) {
if (op->op_type == OP_LINESEQ ||
op->op_type == OP_LEAVE ||
op->op_type == OP_LEAVETRY)
{
- prev = &cLISTOP->op_first;
for (kid = cLISTOP->op_first; kid; kid = kid->op_sibling) {
if (kid->op_sibling) {
scalarvoid(kid);
- prev = &kid->op_sibling;
}
- else
- *prev = guess_mark(kid);
}
curcop = &compiling;
}
op->op_flags &= ~OPf_PARENS;
- if (needblockscope)
+ if (hints & HINT_BLOCK_SCOPE)
op->op_flags |= OPf_PARENS;
}
+ else
+ op = newOP(OP_STUB, 0);
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_DEFINED || type == OP_UNDEF || type == OP_REFGEN) &&
- !(op->op_flags & OPf_STACKED)) {
- op->op_type = OP_RV2CV; /* entersubr => rv2cv */
+ case OP_CONST:
+ if (!(op->op_flags & (OPf_SPECIAL|OPf_MOD)))
+ 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);
+ }
+ 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];
- cUNOP->op_first->op_type = OP_NULL; /* disable pushmark */
- cUNOP->op_first->op_ppaddr = ppaddr[OP_NULL];
+ assert(cUNOP->op_first->op_type == OP_NULL);
+ null(((LISTOP*)cUNOP->op_first)->op_first); /* disable pushmark */
break;
}
/* FALL THROUGH */
default:
- if (type == OP_DEFINED)
- return scalar(op); /* ordinary expression, not lvalue */
- sprintf(tokenbuf, "Can't %s %s in %s",
- type == OP_REFGEN ? "refer to" : "modify",
+ 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_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:
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;
+ 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:
case OP_SASSIGN:
- case OP_REFGEN:
- case OP_ANONLIST:
- case OP_ANONHASH:
+ case OP_AELEMFAST:
modcount++;
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))
- croak("panic: mod");
- mod(cBINOP->op_first, type ? type : op->op_type);
+ if (op->op_flags & OPf_KIDS)
+ mod(cBINOP->op_first, type);
break;
+
case OP_AELEM:
case OP_HELEM:
- mod(cBINOP->op_first, type ? type : op->op_type);
- if (type == OP_RV2AV || type == OP_RV2HV)
- op->op_private = type;
+ ref(cBINOP->op_first, op->op_type);
+ modcount++;
break;
case OP_SCOPE:
case OP_LEAVE:
case OP_ENTER:
- if (type != OP_RV2HV && type != OP_RV2AV)
- break;
+ if (op->op_flags & OPf_KIDS)
+ mod(cLISTOP->op_last, type);
+ break;
+
+ case OP_NULL:
if (!(op->op_flags & OPf_KIDS))
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) {
- default:
- sprintf(tokenbuf, "Can't use %s as reference in %s",
- op_name[op->op_type],
- type ? op_name[type] : "local");
- yyerror(tokenbuf);
- return op;
-
+ 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];
+ assert(cUNOP->op_first->op_type == OP_NULL);
+ null(((LISTOP*)cUNOP->op_first)->op_first); /* disable pushmark */
+ }
+ break;
+
case OP_COND_EXPR:
for (kid = cUNOP->op_first->op_sibling; kid; kid = kid->op_sibling)
ref(kid, type);
break;
-
+ case OP_RV2SV:
+ ref(cUNOP->op_first, op->op_type);
+ 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_REF;
+ /* FALL THROUGH */
case OP_RV2GV:
ref(cUNOP->op_first, op->op_type);
- /* FALL THROUGH */
- case OP_AASSIGN:
- case OP_ASLICE:
- case OP_HSLICE:
- case OP_NEXTSTATE:
- case OP_DBSTATE:
- case OP_ENTERSUBR:
break;
- case OP_RV2SV:
- if (type == OP_RV2AV || type == OP_RV2HV)
- op->op_private = type;
- /* FALL THROUGH */
- case OP_PADSV:
+
case OP_PADAV:
case OP_PADHV:
- case OP_UNDEF:
- case OP_GV:
- case OP_AV2ARYLEN:
- case OP_SASSIGN:
- case OP_REFGEN:
- case OP_ANONLIST:
- case OP_ANONHASH:
- break;
-
- case OP_PUSHMARK:
+ op->op_flags |= OPf_REF;
break;
-
- case OP_SUBSTR:
- case OP_VEC:
- 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);
- curpad[op->op_targ] = sv;
- /* FALL THROUGH */
+
+ case OP_SCALAR:
case OP_NULL:
if (!(op->op_flags & OPf_KIDS))
break;
- ref(cBINOP->op_first, type ? type : op->op_type);
+ ref(cBINOP->op_first, type);
break;
case OP_AELEM:
case OP_HELEM:
- ref(cBINOP->op_first, type ? type : op->op_type);
- if (type == OP_RV2AV || type == OP_RV2HV)
- op->op_private = type;
+ ref(cBINOP->op_first, op->op_type);
+ 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_SCOPE:
case OP_LEAVE:
case OP_ENTER:
- if (type != OP_RV2HV && type != OP_RV2AV)
- break;
+ case OP_LIST:
if (!(op->op_flags & OPf_KIDS))
break;
- /* FALL THROUGH */
- case OP_LIST:
- for (kid = cLISTOP->op_first; kid; kid = kid->op_sibling)
- ref(kid, type);
+ ref(cLISTOP->op_last, type);
+ break;
+ default:
break;
}
- op->op_flags |= OPf_LVAL;
- if (!type) {
- op->op_flags &= ~OPf_SPECIAL;
- op->op_flags |= OPf_INTRO;
- }
- else if (type == OP_AASSIGN || type == OP_SASSIGN)
- op->op_flags |= OPf_SPECIAL;
- return op;
+ return scalar(op);
+
}
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) {
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_NULL;
- kid->op_ppaddr = ppaddr[OP_NULL];
- }
+ if (kid->op_type == OP_NEXTSTATE || kid->op_type == OP_DBSTATE)
+ null(kid);
}
else
o = newUNOP(OP_SCOPE, 0, o);
return o;
}
-OP *
-block_head(o, startp)
-OP *o;
-OP **startp;
+int
+block_start()
+{
+ 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 (!o) {
- *startp = 0;
- return o;
+ 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);
}
- o = scope(scalarseq(o));
- *startp = LINKLIST(o);
- o->op_next = 0;
- peep(*startp);
- return o;
}
OP *
{
if (o->op_flags & OPf_PARENS)
list(o);
- else
+ else {
scalar(o);
+ if (dowarn && bufptr > oldbufptr && bufptr[-1] == ',') {
+ char *s;
+ for (s = bufptr; *s && (isALNUM(*s) || strchr("@$%, ",*s)); s++) ;
+ if (*s == ';' || *s == '=')
+ warn("Parens missing around \"%s\" list", lex ? "my" : "local");
+ }
+ }
in_my = FALSE;
if (lex)
return my(o);
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;
{
register OP *curop;
I32 type = o->op_type;
- SV *sv;
if (opargs[type] & OA_RETSCALAR)
scalar(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))
+ if (o->op_targ && *stack_sp == 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);
+ }
op_free(o);
if (type == OP_RV2GV)
return newGVOP(OP_GV, 0, *(stack_sp--));
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;
-
- if (opargs[type] & OA_MARK)
- op = prepend_elem(OP_LIST, newOP(OP_PUSHMARK, 0), op);
+ OP *last = 0;
if (!op || op->op_type != OP_LIST)
op = newLISTOP(OP_LIST, 0, op, Nullop);
+ if (!(opargs[type] & OA_MARK))
+ null(cLISTOP->op_first);
+
op->op_type = type;
op->op_ppaddr = ppaddr[type];
op->op_flags |= flags;
{
if (!first)
return last;
- else if (!last)
- return first;
- else 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++;
+
+ if (!last)
return first;
- }
- return newLISTOP(type, 0, first, last);
+ if (first->op_type != type || type==OP_LIST && first->op_flags & OPf_PARENS)
+ 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 *
{
if (!first)
return (OP*)last;
- else if (!last)
+
+ if (!last)
return (OP*)first;
- else if (first->op_type != type)
+
+ if (first->op_type != type)
return prepend_elem(type, (OP*)first, (OP*)last);
- else if (last->op_type != type)
+
+ if (last->op_type != type)
return append_elem(type, (OP*)first, (OP*)last);
first->op_last->op_sibling = last->op_first;
{
if (!first)
return last;
- else if (!last)
+
+ if (!last)
return first;
- else if (last->op_type == type) {
- if (!(last->op_flags & OPf_KIDS)) {
- ((LISTOP*)last)->op_last = first;
- last->op_flags |= OPf_KIDS;
+
+ if (last->op_type == type) {
+ if (type == OP_LIST) { /* already a PUSHMARK there */
+ first->op_sibling = ((LISTOP*)last)->op_first->op_sibling;
+ ((LISTOP*)last)->op_first->op_sibling = first;
+ }
+ else {
+ if (!(last->op_flags & OPf_KIDS)) {
+ ((LISTOP*)last)->op_last = first;
+ last->op_flags |= OPf_KIDS;
+ }
+ first->op_sibling = ((LISTOP*)last)->op_first;
+ ((LISTOP*)last)->op_first = first;
}
- first->op_sibling = ((LISTOP*)last)->op_first;
- ((LISTOP*)last)->op_first = first;
((LISTOP*)last)->op_children++;
return last;
}
OP *
newNULLLIST()
{
- return Nullop;
+ return newOP(OP_STUB, 0);
+}
+
+OP *
+force_list(op)
+OP* op;
+{
+ if (!op || op->op_type != OP_LIST)
+ op = newLISTOP(OP_LIST, 0, op, Nullop);
+ null(op);
+ return op;
}
OP *
listop->op_ppaddr = ppaddr[type];
listop->op_children = (first != 0) + (last != 0);
listop->op_flags = flags;
- if (listop->op_children)
- listop->op_flags |= OPf_KIDS;
if (!last && first)
last = first;
else if (!first && last)
first = last;
+ else if (first)
+ first->op_sibling = last;
listop->op_first = first;
listop->op_last = last;
- if (first && first != last)
- first->op_sibling = last;
+ if (type == OP_LIST) {
+ OP* pushop;
+ pushop = newOP(OP_PUSHMARK, 0);
+ pushop->op_sibling = first;
+ listop->op_first = pushop;
+ listop->op_flags |= OPf_KIDS;
+ if (!last)
+ listop->op_last = pushop;
+ }
+ else if (listop->op_children)
+ listop->op_flags |= OPf_KIDS;
return (OP*)listop;
}
{
UNOP *unop;
- if (opargs[type] & OA_MARK) {
- if (first->op_type == OP_LIST)
- prepend_elem(OP_LIST, newOP(OP_PUSHMARK, 0), first);
- else
- return newBINOP(type, flags, newOP(OP_PUSHMARK, 0), first);
- }
-
if (!first)
first = newOP(OP_STUB, 0);
+ if (opargs[type] & OA_MARK)
+ first = force_list(first);
Newz(1101, unop, 1, UNOP);
unop->op_type = type;
if (unop->op_next)
return (OP*)unop;
- return fold_constants(unop);
+ return fold_constants((OP *) unop);
}
OP *
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;
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;
}
+#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);
- pm->op_pmregexp = regcomp(p, p + plen, pm->op_pmflags & PMf_FOLD);
+#endif
+ pm->op_pmregexp = regcomp(p, p + plen, pm);
+ if (strEQ("\\s+", pm->op_pmregexp->precomp))
+ pm->op_pmflags |= PMf_WHITE;
hoistmust(pm);
op_free(expr);
}
Newz(1101, gvop, 1, GVOP);
gvop->op_type = type;
gvop->op_ppaddr = ppaddr[type];
- gvop->op_gv = (GV*)sv_ref(gv);
+ gvop->op_gv = (GV*)SvREFCNT_inc(gv);
gvop->op_next = (OP*)gvop;
gvop->op_flags = flags;
if (opargs[type] & OA_RETSCALAR)
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);
}
curstash = Nullhv;
}
copline = NOLINE;
- expect = XBLOCK;
+ expect = XSTATE;
}
-HV*
-fetch_stash(sv,create)
-SV *sv;
-I32 create;
-{
- 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;
+void
+utilize(aver, id, arg)
+int aver;
+OP *id;
+OP *arg;
+{
+ OP *pack;
+ OP *meth;
+ OP *rqop;
+ OP *imop;
+
+ 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,
+ append_elem(OP_LIST,
+ prepend_elem(OP_LIST, pack, list(arg)),
+ newUNOP(OP_METHOD, 0, meth)));
+
+ /* Fake up the BEGIN {}, which does its thing immediately. */
+ newSUB(start_subparse(),
+ newSVOP(OP_CONST, 0, newSVpv("BEGIN", 5)),
+ append_elem(OP_LINESEQ,
+ newSTATEOP(0, Nullch, rqop),
+ newSTATEOP(0, Nullch, imop) ));
+
+ copline = NOLINE;
+ expect = XSTATE;
}
OP *
OP *listval;
{
return newBINOP(OP_LSLICE, flags,
- list(prepend_elem(OP_LIST, newOP(OP_PUSHMARK, 0), subscript)),
- list(prepend_elem(OP_LIST, newOP(OP_PUSHMARK, 0), listval)) );
+ list(force_list(subscript)),
+ list(force_list(listval)) );
}
static I32
}
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) {
+ 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;
}
}
op = newBINOP(OP_AASSIGN, flags,
- list(prepend_elem(OP_LIST, newOP(OP_PUSHMARK, 0), right)),
- list(prepend_elem(OP_LIST, newOP(OP_PUSHMARK, 0), left)) );
+ list(force_list(right)),
+ list(force_list(left)) );
op->op_private = 0;
- if (!(left->op_flags & OPf_INTRO)) {
+ if (!(left->op_private & OPpLVAL_INTRO)) {
static int generation = 0;
OP *curop;
OP *lastop = op;
if (curop != op)
op->op_private = OPpASSIGN_COMMON;
}
- op->op_targ = pad_alloc(OP_AASSIGN, SVs_PADTMP); /* for scalar context */
return op;
}
if (!right)
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) {
+ op_free(op);
+ return Nullop;
+ }
+ }
return op;
}
{
register COP *cop;
- comppadnamefill = AvFILL(comppadname); /* introduce my variables */
+ /* Introduce my variables. */
+ if (min_intro_pending) {
+ SV **svp = AvARRAY(comppad_name);
+ I32 i;
+ SV *sv;
+ for (i = min_intro_pending; i <= max_intro_pending; i++) {
+ if ((sv = svp[i]) && sv != &sv_undef)
+ SvIVX(sv) = 999999999; /* Don't know scope end yet. */
+ }
+ min_intro_pending = 0;
+ comppad_name_fill = max_intro_pending; /* Needn't search higher */
+ }
Newz(1101, cop, 1, COP);
- cop->op_type = OP_NEXTSTATE;
- cop->op_ppaddr = ppaddr[ perldb ? OP_DBSTATE : OP_NEXTSTATE ];
+ if (perldb && curcop->cop_line && curstash != debstash) {
+ cop->op_type = OP_DBSTATE;
+ cop->op_ppaddr = ppaddr[ OP_DBSTATE ];
+ }
+ else {
+ cop->op_type = OP_NEXTSTATE;
+ cop->op_ppaddr = ppaddr[ OP_NEXTSTATE ];
+ }
cop->op_flags = flags;
cop->op_private = 0;
cop->op_next = (OP*)cop;
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;
cop->cop_line = copline;
copline = NOLINE;
}
- cop->cop_filegv = curcop->cop_filegv;
+ cop->cop_filegv = SvREFCNT_inc(curcop->cop_filegv);
cop->cop_stash = curstash;
- if (perldb) {
+ 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;
- SvIOK_on(*svp);
+ (void)SvIOK_on(*svp);
SvSTASH(*svp) = (HV*)cop;
}
}
LOGOP *logop;
OP *op;
- scalar(first);
+ 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 (type == OP_AND || type == OP_OR) {
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;
if (!true)
return newLOGOP(OP_OR, 0, first, false);
- scalar(first);
+ scalarboolean(first);
if (first->op_type == OP_CONST) {
if (SvTRUE(((SVOP*)first)->op_sv)) {
op_free(first);
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, guess_mark(block), newOP(OP_UNSTACK, 0));
+ listop = append_elem(OP_LINESEQ, block, newOP(OP_UNSTACK, 0));
op = newLOGOP(OP_AND, 0, expr, listop);
((LISTOP*)listop)->op_last->op_next = LINKLIST(op);
op->op_next = ((LOGOP*)cUNOP->op_first)->op_other;
op->op_flags |= flags;
- return scope(op);
+ op = scope(op);
+ op->op_flags |= OPf_SPECIAL; /* suppress POPBLOCK curpm restoration */
+ return 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);
+ expr = 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 CAN_PROTOTYPE
newFOROP(flags,label,forline,sv,expr,block,cont)
I32 flags;
char *label;
OP* expr;
OP*block;
OP*cont;
+#else
+newFOROP(I32 flags,char *label,line_t forline,OP *sv,OP *expr,OP *block,OP *cont)
+#endif /* CAN_PROTOTYPE */
{
LOOP *loop;
+ int padoff = 0;
copline = forline;
if (sv) {
- if (sv->op_type == OP_RV2SV) {
+ 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);
}
+ 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]);
}
sv = newGVOP(OP_GV, 0, defgv);
}
loop = (LOOP*)list(convert(OP_ENTERITER, 0,
- append_elem(OP_LIST,
- prepend_elem(OP_LIST, newOP(OP_PUSHMARK, 0), expr),
- scalar(sv))));
- return newSTATEOP(0, label, newWHILEOP(flags, 1,
- loop, newOP(OP_ITER, 0), block, cont));
+ 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*
+newLOOPEX(type, label)
+I32 type;
+OP* label;
+{
+ OP *op;
+ if (type != OP_GOTO || label->op_type == OP_CONST) {
+ 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_ENTERSUB)
+ label = newUNOP(OP_REFGEN, 0, mod(label, OP_REFGEN));
+ op = newUNOP(type, OPf_STACKED, label);
+ }
+ 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;
+
+ SAVESPTR(curpad);
+ curpad = 0;
+
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) {
+ while (i >= 0) {
SV** svp = av_fetch(CvPADLIST(cv), i--, FALSE);
if (svp)
- av_free((AV*)*svp);
+ SvREFCNT_dec(*svp);
}
- av_free((AV*)CvPADLIST(cv));
+ SvREFCNT_dec((SV*)CvPADLIST(cv));
}
+ SvREFCNT_dec(CvGV(cv));
+ LEAVE;
}
}
-void
+CV *
newSUB(floor,op,block)
I32 floor;
OP *op;
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)) { /* already defined? */
+ if (dowarn) {
line_t oldline = curcop->cop_line;
curcop->cop_line = copline;
warn("Subroutine %s redefined",name);
curcop->cop_line = oldline;
}
- sv_free((SV*)cv);
+ 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 */
+ assert(SvREFCNT(CvGV(cv)) > 1);
+ SvREFCNT_dec(CvGV(cv));
+ }
+ else {
+ cv = (CV*)NEWSV(1104,0);
+ sv_upgrade((SV *)cv, SVt_PVCV);
+ }
GvCV(gv) = cv;
GvCVGEN(gv) = 0;
CvFILEGV(cv) = curcop->cop_filegv;
-
- av = newAV();
- AvREAL_off(av);
- if (AvFILL(comppadname) < AvFILL(comppad))
- av_store(comppadname, AvFILL(comppad), Nullsv);
- av_store(av, 0, (SV*)comppadname);
- av_store(av, 1, (SV*)comppad);
- AvFILL(av) = 1;
- CvPADLIST(cv) = av;
- comppadname = newAV();
+ CvGV(cv) = SvREFCNT_inc(gv);
+ CvSTASH(cv) = curstash;
if (!block) {
CvROOT(cv) = 0;
op_free(op);
copline = NOLINE;
- leave_scope(floor);
- return;
+ LEAVE_SCOPE(floor);
+ return cv;
}
- CvROOT(cv) = newUNOP(OP_LEAVESUBR, 0, scalarseq(block));
+
+ 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]);
+ }
+
+ 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));
CvROOT(cv)->op_next = 0;
- CvSTASH(cv) = curstash;
peep(CvSTART(cv));
- CvDELETED(cv) = FALSE;
- if (strEQ(name, "BEGIN")) {
- line_t oldline = curcop->cop_line;
- GV* oldfile = curcop->cop_filegv;
+ if (s = strrchr(name,':'))
+ s++;
+ else
+ s = name;
+ if (strEQ(s, "BEGIN")) {
+ line_t oldline = compiling.cop_line;
+ ENTER;
+ SAVESPTR(compiling.cop_filegv);
+ SAVEI32(perldb);
if (!beginav)
beginav = newAV();
- av_push(beginav, sv_ref(gv));
+ av_push(beginav, (SV *)cv);
DEBUG_x( dump_sub(gv) );
rs = nrs;
rslen = nrslen;
rschar = nrschar;
rspara = (nrslen == 2);
+ GvCV(gv) = 0;
calllist(beginav);
- sv_free((SV*)cv);
rs = "\n";
rslen = 1;
rschar = '\n';
rspara = 0;
- GvCV(gv) = 0;
curcop = &compiling;
- curcop->cop_line = oldline; /* might have compiled something */
- curcop->cop_filegv = oldfile; /* recursively, clobbering these */
+ curcop->cop_line = oldline; /* might have recursed to yylex */
+ LEAVE;
}
- else if (strEQ(name, "END")) {
+ else if (strEQ(s, "END")) {
if (!endav)
endav = newAV();
av_unshift(endav, 1);
- av_store(endav, 0, sv_ref(gv));
+ av_store(endav, 0, SvREFCNT_inc(cv));
}
- if (perldb) {
+ if (perldb && curstash != debstash) {
SV *sv;
- SV *tmpstr = sv_mortalcopy(&sv_undef);
+ 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);
+ LEAVE_SCOPE(floor);
+ if (!op)
+ GvCV(gv) = 0; /* Will remember in SVOP instead. */
+ 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;
+
+ if (name)
+ sub_generation++;
+ if (cv = GvCV(gv)) {
+ if (GvCVGEN(gv))
+ cv = 0; /* just a cached method */
+ else if (CvROOT(cv)) { /* already defined? */
+ if (dowarn) {
+ line_t oldline = curcop->cop_line;
- 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;
+ 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 (strEQ(name, "BEGIN")) {
+ CvXSUB(cv) = subaddr;
+ if (!name)
+ s = "__ANON__";
+ else if (s = strrchr(name,':'))
+ s++;
+ else
+ s = name;
+ if (strEQ(s, "BEGIN")) {
if (!beginav)
beginav = newAV();
- av_push(beginav, sv_ref(gv));
+ av_push(beginav, SvREFCNT_inc(gv));
}
- else if (strEQ(name, "END")) {
+ else if (strEQ(s, "END")) {
if (!endav)
endav = newAV();
av_unshift(endav, 1);
- av_store(endav, 0, sv_ref(gv));
+ av_store(endav, 0, SvREFCNT_inc(gv));
}
+ if (!name)
+ GvCV(gv) = 0; /* Will remember elsewhere instead. */
+ return cv;
}
void
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;
warn("Format %s redefined",name);
curcop->cop_line = oldline;
}
- sv_free((SV*)cv);
+ SvREFCNT_dec(cv);
}
- Newz(101,cv,1,CV);
- sv_upgrade(cv, SVt_PVFM);
- SvREFCNT(cv) = 1;
+ cv = (CV*)NEWSV(1106,0);
+ sv_upgrade((SV *)cv, SVt_PVFM);
GvFORM(gv) = cv;
+ CvGV(cv) = SvREFCNT_inc(gv);
CvFILEGV(cv) = curcop->cop_filegv;
+ for (ix = AvFILL(comppad); ix > 0; ix--) {
+ if (!SvPADMY(curpad[ix]))
+ SvPADTMP_on(curpad[ix]);
+ }
+
CvPADLIST(cv) = av = newAV();
AvREAL_off(av);
- av_store(av, 1, (SV*)comppad);
+ 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;
peep(CvSTART(cv));
- CvDELETED(cv) = FALSE;
FmLINES(cv) = 0;
op_free(op);
copline = NOLINE;
- leave_scope(floor);
+ LEAVE_SCOPE(floor);
}
OP *
mop->op_targ = pad_alloc(OP_METHOD, SVs_PADTMP);
mop->op_next = LINKLIST(ref);
ref->op_next = (OP*)mop;
- return (OP*)mop;
+ return scalar((OP*)mop);
}
OP *
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, block)
+I32 floor;
+OP *block;
+{
+ return newUNOP(OP_REFGEN, 0,
+ newSVOP(OP_ANONCODE, 0, (SV*)newSUB(floor, 0, 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 newUNOP(OP_RV2GV, 0, o);
}
OP *
/* Check routines. */
OP *
-ck_aelem(op)
-OP *op;
-{
- /* XXX need to optimize constant subscript here. */
- return op;
-}
-
-OP *
ck_concat(op)
OP *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)
- return op;
- newop = cUNOP->op_first->op_sibling;
- if (!newop || newop->op_type != OP_RV2SV)
+ 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;
- 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;
}
{
I32 type = op->op_type;
- if (op->op_flags & OPf_KIDS)
+ if (op->op_flags & OPf_KIDS) {
+ 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, SVt_PVAV)));
+ }
return ck_fun(op);
-
- if (op->op_flags & OPf_SPECIAL) {
- op_free(op);
- op = newUNOP(type, 0, newGVOP(OP_GV, 0, gv_fetchpv("main'ARGV", TRUE)));
}
return op;
}
ck_eval(op)
OP *op;
{
- needblockscope = TRUE;
+ hints |= HINT_BLOCK_SCOPE;
if (op->op_flags & OPf_KIDS) {
SVOP *kid = (SVOP*)cUNOP->op_first;
if (!kid) {
op->op_flags &= ~OPf_KIDS;
- op->op_type = OP_NULL;
- op->op_ppaddr = ppaddr[OP_NULL];
+ null(op);
}
else if (kid->op_type == OP_LINESEQ) {
LOGOP *enter;
op_free(op);
op = newUNOP(OP_ENTEREVAL, 0, newSVREF(newGVOP(OP_GV, 0, defgv)));
}
+ op->op_targ = (PADOFFSET)hints;
return op;
}
if (op->op_flags & OPf_STACKED) {
op = ck_fun(op);
kid = cUNOP->op_first->op_sibling;
- if (kid->op_type == OP_RV2GV) {
- kid->op_type = OP_NULL;
- kid->op_ppaddr = ppaddr[OP_NULL];
- }
+ if (kid->op_type == OP_RV2GV)
+ null(kid);
}
else
op = listkids(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);
if (kid->op_type == OP_CONST) {
+ GV *gv = 0;
kid->op_type = OP_GV;
- kid->op_sv = sv_ref((SV*)gv_fetchpv(SvPVx(kid->op_sv, na),
- 1+(op->op_type==OP_RV2CV)));
+ for (gv = 0; !gv; iscv++) {
+ gv = gv_fetchpv(SvPVx(kid->op_sv, na),
+ iscv,
+ 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))
if (op->op_flags & OPf_KIDS) {
tokid = &cLISTOP->op_first;
kid = cLISTOP->op_first;
- if (kid->op_type == OP_PUSHMARK) {
+ if (kid->op_type == OP_PUSHMARK ||
+ kid->op_type == OP_NULL && kid->op_targ == OP_PUSHMARK)
+ {
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;
}
- mod(kid, op->op_type);
+ else if (kid->op_type != OP_RV2AV && kid->op_type != OP_PADAV)
+ bad_type(numargs, "array", op, 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;
}
- mod(kid, op->op_type);
+ else if (kid->op_type != OP_RV2HV && kid->op_type != OP_PADHV)
+ bad_type(numargs, "hash", op, 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;
return too_many_arguments(op);
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;
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);
+ 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);
+ 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 *
}
OP *
+ck_rfun(op)
+OP *op;
+{
+ return refkids(ck_fun(op), op->op_type);
+}
+
+OP *
ck_listiob(op)
OP *op;
{
kid = cLISTOP->op_first;
if (!kid) {
- prepend_elem(op->op_type, newOP(OP_PUSHMARK, 0), op);
+ op = force_list(op);
kid = cLISTOP->op_first;
}
if (kid->op_type == OP_PUSHMARK)
{
if (cBINOP->op_first->op_flags & OPf_PARENS) {
op->op_private = OPpREPEAT_DOLIST;
- cBINOP->op_first =
- prepend_elem(OP_NULL, newOP(OP_PUSHMARK, 0), cBINOP->op_first);
+ cBINOP->op_first = force_list(cBINOP->op_first);
}
else
scalar(op);
}
OP *
+ck_require(op)
+OP *op;
+{
+ 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 *s;
+ for (s = SvPVX(kid->op_sv); *s; s++) {
+ if (*s == ':' && s[1] == ':') {
+ *s = '/';
+ strcpy(s+1,s+2); /* known to be okay here */
+ --SvCUR(kid->op_sv);
+ }
+ }
+ sv_catpvn(kid->op_sv, ".pm", 3);
+ }
+ }
+ return ck_fun(op);
+}
+
+OP *
ck_retarget(op)
OP *op;
{
{
if (op->op_flags & OPf_KIDS) {
OP *kid = cLISTOP->op_first->op_sibling; /* get past pushmark */
- if (kid) {
+ if (kid && kid->op_sibling) {
op->op_type = OP_SSELECT;
op->op_ppaddr = ppaddr[OP_SSELECT];
op = 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) {
- kid->op_type = OP_NULL; /* wipe out leave */
- kid->op_ppaddr = ppaddr[OP_NULL];
+ 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;
}
- peep(kLISTOP->op_first);
+ k = kLISTOP->op_first;
}
+ peep(k);
+
kid = cLISTOP->op_first->op_sibling; /* get past pushmark */
- kid->op_type = OP_NULL; /* wipe out rv2gv */
- kid->op_ppaddr = ppaddr[OP_NULL];
- kid->op_next = kid;
+ null(kid); /* wipe out rv2gv */
+ if (op->op_type == OP_SORT)
+ kid->op_next = kid;
+ else
+ kid->op_next = k;
op->op_flags |= OPf_SPECIAL;
}
}
if (op->op_flags & OPf_STACKED)
return no_fh_allowed(op);
- if (!(op->op_flags & OPf_KIDS))
- op = prepend_elem(OP_SPLIT,
- pmruntime(
- newPMOP(OP_MATCH, OPf_SPECIAL),
- newSVOP(OP_CONST, 0, newSVpv(" ", 1)),
- Nullop),
- op);
-
kid = cLISTOP->op_first;
- if (kid->op_type == OP_PUSHMARK)
+ if (kid->op_type != OP_NULL)
croak("panic: ck_split");
+ kid = kid->op_sibling;
+ op_free(cLISTOP->op_first);
+ cLISTOP->op_first = 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;
}
pm = (PMOP*)kid;
if (pm->op_pmshort && !(pm->op_pmflags & PMf_ALL)) {
- sv_free(pm->op_pmshort); /* can't use substring to optimize */
+ SvREFCNT_dec(pm->op_pmshort); /* can't use substring to optimize */
pm->op_pmshort = 0;
}
OP *o = ((cUNOP->op_first->op_sibling)
? cUNOP : ((UNOP*)cUNOP->op_first))->op_first->op_sibling;
- if (o->op_type == OP_RV2CV) {
- o->op_type = OP_NULL; /* disable rv2cv */
- o->op_ppaddr = ppaddr[OP_NULL];
- }
- op->op_private = 0;
- if (perldb)
- op->op_private |= OPpSUBR_DB;
+ if (o->op_type == OP_RV2CV)
+ null(o); /* disable rv2cv */
+ op->op_private = (hints & HINT_STRICT_REFS);
+ if (perldb && curstash != debstash)
+ op->op_private |= OPpDEREF_DB;
+ while (o = o->op_sibling)
+ mod(o, OP_ENTERSUB);
+ return op;
+}
+
+OP *
+ck_svconst(op)
+OP *op;
+{
+ SvREADONLY_on(cSVOP->op_sv);
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 */
+ 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 ((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 */
case OP_NULL:
case OP_SCALAR:
case OP_LINESEQ:
case OP_SCOPE:
- if (oldop) {
- oldop->op_next = op->op_next;
+ 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 &&
- op->op_next->op_private < OP_RV2GV)
- {
- op->op_next->op_type = OP_NULL;
- op->op_next->op_ppaddr = ppaddr[OP_NULL];
- 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 (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 &
+ (OPpDEREF_HV|OPpDEREF_AV|OPpLVAL_INTRO)) &&
+ (i = SvIV(((SVOP*)pop)->op_sv) - compiling.cop_arybase)
+ <= 255 &&
+ i >= 0)
+ {
+ null(o->op_next);
+ null(pop->op_next);
+ null(pop);
+ 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