/* perly.c
*
- * Copyright (c) 2004, 2005, 2006 Larry Wall and others
+ * Copyright (c) 2004, 2005, 2006, 2007, 2008 by Larry Wall and others
*
* You may distribute under the terms of either the GNU General Public
* License or the Artistic License, as specified in the README file.
* This is controlled by the PERL_IN_MADLY_C define.
*/
-
-
-/* allow stack size to grow effectively without limit */
-#define YYMAXDEPTH 10000000
-
#include "EXTERN.h"
#define PERL_IN_PERLY_C
#include "perl.h"
typedef short int yytype_int16;
typedef signed char yysigned_char;
+/* YYINITDEPTH -- initial size of the parser's stacks. */
+#define YYINITDEPTH 200
+
#ifdef DEBUGGING
# define YYDEBUG 1
#else
# define YYSIZE_T size_t
-#define YYEMPTY (-2)
#define YYEOF 0
#define YYTERROR 1
/* yy_stack_print()
- * print the top 8 items on the parse stack. The args have the same
- * meanings as the local vars in yyparse() of the same name */
+ * print the top 8 items on the parse stack.
+ */
static void
-yy_stack_print (pTHX_ const short *yyss, const short *yyssp, const YYSTYPE *yyvs, const char**yyns)
+yy_stack_print (pTHX_ const yy_parser *parser)
{
- int i;
- int start = 1;
- int count = (int)(yyssp - yyss);
+ const yy_stack_frame *ps, *min;
- if (count > 8) {
- start = count - 8 + 1;
- count = 8;
- }
+ min = parser->ps - 8 + 1;
+ if (min <= parser->stack)
+ min = parser->stack + 1;
PerlIO_printf(Perl_debug_log, "\nindex:");
- for (i=0; i < count; i++)
- PerlIO_printf(Perl_debug_log, " %8d", start+i);
+ for (ps = min; ps <= parser->ps; ps++)
+ PerlIO_printf(Perl_debug_log, " %8d", (int)(ps - parser->stack));
+
PerlIO_printf(Perl_debug_log, "\nstate:");
- for (i=0; i < count; i++)
- PerlIO_printf(Perl_debug_log, " %8d", yyss[start+i]);
+ for (ps = min; ps <= parser->ps; ps++)
+ PerlIO_printf(Perl_debug_log, " %8d", ps->state);
+
PerlIO_printf(Perl_debug_log, "\ntoken:");
- for (i=0; i < count; i++)
- PerlIO_printf(Perl_debug_log, " %8.8s", yyns[start+i]);
+ for (ps = min; ps <= parser->ps; ps++)
+ PerlIO_printf(Perl_debug_log, " %8.8s", ps->name);
+
PerlIO_printf(Perl_debug_log, "\nvalue:");
- for (i=0; i < count; i++) {
- switch (yy_type_tab[yystos[yyss[start+i]]]) {
+ for (ps = min; ps <= parser->ps; ps++) {
+ switch (yy_type_tab[yystos[ps->state]]) {
case toketype_opval:
PerlIO_printf(Perl_debug_log, " %8.8s",
- yyvs[start+i].opval
- ? PL_op_name[yyvs[start+i].opval->op_type]
+ ps->val.opval
+ ? PL_op_name[ps->val.opval->op_type]
: "(Nullop)"
);
break;
#ifndef PERL_IN_MADLY_C
case toketype_p_tkval:
PerlIO_printf(Perl_debug_log, " %8.8s",
- yyvs[start+i].pval ? yyvs[start+i].pval : "(NULL)");
+ ps->val.pval ? ps->val.pval : "(NULL)");
break;
case toketype_i_tkval:
#endif
case toketype_ival:
- PerlIO_printf(Perl_debug_log, " %8"IVdf, (IV)yyvs[start+i].ival);
+ PerlIO_printf(Perl_debug_log, " %8"IVdf, (IV)ps->val.ival);
break;
default:
- PerlIO_printf(Perl_debug_log, " %8"UVxf, (UV)yyvs[start+i].ival);
+ PerlIO_printf(Perl_debug_log, " %8"UVxf, (UV)ps->val.ival);
}
}
PerlIO_printf(Perl_debug_log, "\n\n");
}
-# define YY_STACK_PRINT(yyss, yyssp, yyvs, yyns) \
-do { \
- if (yydebug && DEBUG_v_TEST) \
- yy_stack_print (aTHX_ (yyss), (yyssp), (yyvs), (yyns)); \
+# define YY_STACK_PRINT(parser) \
+do { \
+ if (yydebug && DEBUG_v_TEST) \
+ yy_stack_print (aTHX_ parser); \
} while (0)
#else /* !DEBUGGING */
# define YYDPRINTF(Args)
# define YYDSYMPRINTF(Title, Token, Value)
-# define YY_STACK_PRINT(yyss, yyssp, yyvs, yyns)
+# define YY_STACK_PRINT(parser)
# define YY_REDUCE_PRINT(Rule)
#endif /* !DEBUGGING */
-
-/* YYINITDEPTH -- initial size of the parser's stacks. */
-#define YYINITDEPTH 200
-
-/* a snapshot of the current stack position variables for use by
- * S_clear_yystack */
-
-typedef struct {
- short *yyss;
- short *yyssp;
- YYSTYPE *yyvsp;
- AV **yypsp;
- int yylen;
-} yystack_positions;
-
/* called during cleanup (via SAVEDESTRUCTOR_X) to free any items on the
* parse stack, thus avoiding leaks if we die */
static void
-S_clear_yystack(pTHX_ const void *p)
+S_clear_yystack(pTHX_ const yy_parser *parser)
{
- yystack_positions *y = (yystack_positions*) p;
- int i;
+ yy_stack_frame *ps = parser->ps;
+ int i = 0;
- if (!y->yyss)
+ if (!parser->stack)
return;
+
YYDPRINTF ((Perl_debug_log, "clearing the parse stack\n"));
- /* Freeing ops on the stack, and the op_latefree/op_latefreed flags:
+ /* Freeing ops on the stack, and the op_latefree / op_latefreed /
+ * op_attached flags:
*
* When we pop tokens off the stack during error recovery, or when
* we pop all the tokens off the stack after a die during a shift or
- * reduce (ie Perl_croak somewhere in yylex(), or in one of the
- * newFOO() functions, then its possible that some of these tokens are
+ * reduce (i.e. Perl_croak somewhere in yylex() or in one of the
+ * newFOO() functions), then it's possible that some of these tokens are
* of type opval, pointing to an OP. All these ops are orphans; each is
* its own miniature subtree that has not yet been attached to a
- * larger tree. In this case, we shoould clearly free the op (making
- * sure, for each op we free thyat we have PL_comppad pointing to the
+ * larger tree. In this case, we should clearly free the op (making
+ * sure, for each op we free that we have PL_comppad pointing to the
* right place for freeing any SVs attached to the op in threaded
* builds.
*
- * However, there is a particular problem if we die in newFOO called
+ * However, there is a particular problem if we die in newFOO() called
* by a reducing action; e.g.
*
* foo : bar baz boz
* { $$ = newFOO($1,$2,$3) }
*
* where
- * OP *newFOO { .... croak .... }
+ * OP *newFOO { ....; if (...) croak; .... }
*
* In this case, when we come to clean bar baz and boz off the stack,
* we don't know whether newFOO() has already:
* * freed them
- * * left them as it
+ * * left them as is
* * attached them to part of a larger tree
+ * * attached them to PL_compcv
+ * * attached them to PL_compcv then freed it (as in BEGIN {die } )
*
* To get round this problem, we set the flag op_latefree on every op
* that gets pushed onto the parser stack. If op_free() sees this
* reduced, call op_free with op_latefree=1. This ensures that all ops
* hanging off these op are freed, but the reducing ops themselces are
* just undefed. Then we set op_latefreed=0 on *all* ops on the stack
- * and free them. A little though should convince you that this
- * two-part approach to the reducing ops should handle all three cases
- * above safely.
- */
-
- /* free any reducing ops (1st pass) */
-
- for (i=0; i< y->yylen; i++) {
- if (yy_type_tab[yystos[y->yyssp[-i]]] == toketype_opval
- && y->yyvsp[-i].opval) {
- if (y->yypsp[-i] != PL_comppad) {
- PAD_RESTORE_LOCAL(y->yypsp[-i]);
+ * and free them. A little thought should convince you that this
+ * two-part approach to the reducing ops should handle the first three
+ * cases above safely.
+ *
+ * In the case of attaching to PL_compcv (currently just newATTRSUB
+ * does this), then we set the op_attached flag on the op that has
+ * been so attached, then avoid doing the final op_free during
+ * cleanup, on the assumption that it will happen (or has already
+ * happened) when PL_compcv is freed.
+ *
+ * Note this is fairly fragile mechanism. A more robust approach
+ * would be to use two of these flag bits as 2-bit reference count
+ * field for each op, indicating whether it is pointed to from:
+ * * a parent op
+ * * the parser stack
+ * * a CV
+ * but this would involve reworking all code (core and external) that
+ * manipulate op trees.
+ *
+ * XXX DAPM 17/1/07 I've decided its too fragile for now, and so have
+ * disabled it */
+
+#define DISABLE_STACK_FREE
+
+
+#ifdef DISABLE_STACK_FREE
+ for (i=0; i< parser->yylen; i++) {
+ SvREFCNT_dec(ps[-i].compcv);
+ }
+ ps -= parser->yylen;
+#else
+ /* clear any reducing ops (1st pass) */
+
+ for (i=0; i< parser->yylen; i++) {
+ LEAVE_SCOPE(ps[-i].savestack_ix);
+ if (yy_type_tab[yystos[ps[-i].state]] == toketype_opval
+ && ps[-i].val.opval) {
+ if ( ! (ps[-i].val.opval->op_attached
+ && !ps[-i].val.opval->op_latefreed))
+ {
+ if (ps[-i].compcv != PL_compcv) {
+ PL_compcv = ps[-i].compcv;
+ PAD_SET_CUR_NOSAVE(CvPADLIST(PL_compcv), 1);
+ }
+ op_free(ps[-i].val.opval);
}
- op_free(y->yyvsp[-i].opval);
}
}
+#endif
/* now free whole the stack, including the just-reduced ops */
- while (y->yyssp > y->yyss) {
- if (yy_type_tab[yystos[*y->yyssp]] == toketype_opval
- && y->yyvsp->opval)
+ while (ps > parser->stack) {
+ LEAVE_SCOPE(ps->savestack_ix);
+ if (yy_type_tab[yystos[ps->state]] == toketype_opval
+ && ps->val.opval)
{
- if (*y->yypsp != PL_comppad) {
- PAD_RESTORE_LOCAL(*y->yypsp);
+ if (ps->compcv != PL_compcv) {
+ PL_compcv = ps->compcv;
+ PAD_SET_CUR_NOSAVE(CvPADLIST(PL_compcv), 1);
}
YYDPRINTF ((Perl_debug_log, "(freeing op)\n"));
- y->yyvsp->opval->op_latefree = 0;
- op_free(y->yyvsp->opval);
+#ifndef DISABLE_STACK_FREE
+ ps->val.opval->op_latefree = 0;
+ if (!(ps->val.opval->op_attached && !ps->val.opval->op_latefreed))
+#endif
+ op_free(ps->val.opval);
}
- y->yyvsp--;
- y->yyssp--;
- y->yypsp--;
+ SvREFCNT_dec(ps->compcv);
+ ps--;
}
-}
+ Safefree(parser->stack);
+}
/*----------.
int
#ifdef PERL_IN_MADLY_C
-Perl_madparse (pTHX)
+Perl_madparse (pTHX_ int gramtype)
#else
-Perl_yyparse (pTHX)
+Perl_yyparse (pTHX_ int gramtype)
#endif
{
dVAR;
- int yychar; /* The lookahead symbol. */
- YYSTYPE yylval; /* The semantic value of the lookahead symbol. */
- int yynerrs; /* Number of syntax errors so far. */
register int yystate;
register int yyn;
int yyresult;
- /* Number of tokens to shift before error messages enabled. */
- int yyerrstatus;
/* Lookahead token as an internal (translated) token number. */
int yytoken = 0;
- /* three stacks and their tools:
- yyss: related to states,
- yyvs: related to semantic values,
- yyps: current value of PL_comppad for each state
-
-
- Refer to the stacks thru separate pointers, to allow yyoverflow
- to reallocate them elsewhere. */
-
- /* The state stack. */
- short *yyss;
- register short *yyssp;
-
- /* The semantic value stack. */
- YYSTYPE *yyvs;
- register YYSTYPE *yyvsp;
-
- AV **yyps;
- AV **yypsp;
+ register yy_parser *parser; /* the parser object */
+ register yy_stack_frame *ps; /* current parser stack frame */
- /* for ease of re-allocation and automatic freeing, have three SVs whose
- * SvPVX points to the stacks */
- SV *yyss_sv, *yyvs_sv, *yyps_sv;
- SV *ss_save_sv;
- yystack_positions *ss_save;
+#define YYPOPSTACK parser->ps = --ps
+#define YYPUSHSTACK parser->ps = ++ps
-
-#ifdef DEBUGGING
- /* maintain also a stack of token/rule names for debugging with -Dpv */
- const char **yyns, **yynsp;
- SV *yyns_sv;
-# define YYPOPSTACK (yyvsp--, yyssp--, yypsp--, yynsp--)
-#else
-# define YYPOPSTACK (yyvsp--, yyssp--, yypsp--)
-#endif
-
-
- YYSIZE_T yystacksize = YYINITDEPTH;
-
- /* The variables used to return semantic value and location from the
- action routines. */
+ /* The variable used to return semantic value and location from the
+ action routines: ie $$. */
YYSTYPE yyval;
-
- /* When reducing, the number of symbols on the RHS of the reduced
- rule. */
- int yylen;
-
#ifndef PERL_IN_MADLY_C
# ifdef PERL_MAD
if (PL_madskills)
- return madparse();
+ return madparse(gramtype);
# endif
#endif
YYDPRINTF ((Perl_debug_log, "Starting parse\n"));
- ENTER; /* force stack free before we return */
- SAVEVPTR(PL_yycharp);
- SAVEVPTR(PL_yylvalp);
- PL_yycharp = &yychar; /* so PL_yyerror() can access it */
- PL_yylvalp = &yylval; /* so various functions in toke.c can access it */
-
- yyss_sv = newSV(YYINITDEPTH * sizeof(short));
- yyvs_sv = newSV(YYINITDEPTH * sizeof(YYSTYPE));
- yyps_sv = newSV(YYINITDEPTH * sizeof(AV*));
- ss_save_sv = newSV(sizeof(yystack_positions));
- SAVEFREESV(yyss_sv);
- SAVEFREESV(yyvs_sv);
- SAVEFREESV(yyps_sv);
- SAVEFREESV(ss_save_sv);
- yyss = (short *) SvPVX(yyss_sv);
- yyvs = (YYSTYPE *) SvPVX(yyvs_sv);
- yyps = (AV **) SvPVX(yyps_sv);
- ss_save = (yystack_positions *) SvPVX(ss_save_sv);
-
- ss_save->yyss = NULL; /* disarm stack cleanup */
- /* cleanup the parse stack on premature exit */
- SAVEDESTRUCTOR_X(S_clear_yystack, (void*) ss_save);
-
- /* note that elements zero of yyvs and yyns are not used */
- yyssp = yyss;
- yyvsp = yyvs;
- yypsp = yyps;
-#ifdef DEBUGGING
- yyns_sv = newSV(YYINITDEPTH * sizeof(char *));
- SAVEFREESV(yyns_sv);
- /* XXX This seems strange to cast char * to char ** */
- yyns = (const char **) SvPVX(yyns_sv);
- yynsp = yyns;
-#endif
-
- *yyssp = 0;
- yyvsp->ival = 0;
- yyerrstatus = 0;
- yynerrs = 0;
- yychar = YYEMPTY; /* Cause a token to be read. */
+ parser = PL_parser;
+
+ ENTER; /* force parser state cleanup/restoration before we return */
+ SAVEPPTR(parser->yylval.pval);
+ SAVEINT(parser->yychar);
+ SAVEINT(parser->yyerrstatus);
+ SAVEINT(parser->stack_size);
+ SAVEINT(parser->yylen);
+ SAVEVPTR(parser->stack);
+ SAVEVPTR(parser->ps);
+
+ /* initialise state for this parse */
+ parser->yychar = gramtype;
+ parser->yyerrstatus = 0;
+ parser->stack_size = YYINITDEPTH;
+ parser->yylen = 0;
+ Newx(parser->stack, YYINITDEPTH, yy_stack_frame);
+ ps = parser->ps = parser->stack;
+ ps->state = 0;
+ SAVEDESTRUCTOR_X(S_clear_yystack, parser);
/*------------------------------------------------------------.
| yynewstate -- Push a new state, which is found in yystate. |
`------------------------------------------------------------*/
yynewstate:
- yystate = *yyssp;
+ yystate = ps->state;
YYDPRINTF ((Perl_debug_log, "Entering state %d\n", yystate));
- if (yy_type_tab[yystos[yystate]] == toketype_opval && yyvsp->opval) {
- yyvsp->opval->op_latefree = 1;
- yyvsp->opval->op_latefreed = 0;
+#ifndef DISABLE_STACK_FREE
+ if (yy_type_tab[yystos[yystate]] == toketype_opval && ps->val.opval) {
+ ps->val.opval->op_latefree = 1;
+ ps->val.opval->op_latefreed = 0;
}
-
- ss_save->yyss = yyss;
- ss_save->yyssp = yyssp;
- ss_save->yyvsp = yyvsp;
- ss_save->yypsp = yypsp;
- ss_save->yylen = 0;
-
- if (yyss + yystacksize - 1 <= yyssp) {
- /* Get the current used size of the three stacks, in elements. */
- const YYSIZE_T yysize = yyssp - yyss + 1;
-
- /* Extend the stack our own way. */
- if (YYMAXDEPTH <= yystacksize)
- goto yyoverflowlab;
- yystacksize *= 2;
- if (YYMAXDEPTH < yystacksize)
- yystacksize = YYMAXDEPTH;
-
- SvGROW(yyss_sv, yystacksize * sizeof(short));
- SvGROW(yyvs_sv, yystacksize * sizeof(YYSTYPE));
- SvGROW(yyps_sv, yystacksize * sizeof(AV*));
- yyss = (short *) SvPVX(yyss_sv);
- yyvs = (YYSTYPE *) SvPVX(yyvs_sv);
- yyps = (AV **) SvPVX(yyps_sv);
-#ifdef DEBUGGING
- SvGROW(yyns_sv, yystacksize * sizeof(char *));
- /* XXX This seems strange to cast char * to char ** */
- yyns = (const char **) SvPVX(yyns_sv);
- if (! yyns)
- goto yyoverflowlab;
- yynsp = yyns + yysize - 1;
#endif
- if (!yyss || ! yyvs || ! yyps)
- goto yyoverflowlab;
- yyssp = yyss + yysize - 1;
- yyvsp = yyvs + yysize - 1;
- yypsp = yyps + yysize - 1;
+ parser->yylen = 0;
+ {
+ size_t size = ps - parser->stack + 1;
- YYDPRINTF ((Perl_debug_log, "Stack size increased to %lu\n",
- (unsigned long int) yystacksize));
+ /* grow the stack? We always leave 1 spare slot,
+ * in case of a '' -> 'foo' reduction */
- if (yyss + yystacksize - 1 <= yyssp)
- YYABORT;
+ if (size >= (size_t)parser->stack_size - 1) {
+ /* this will croak on insufficient memory */
+ parser->stack_size *= 2;
+ Renew(parser->stack, parser->stack_size, yy_stack_frame);
+ ps = parser->ps = parser->stack + size -1;
- ss_save->yyss = yyss;
- ss_save->yyssp = yyssp;
- ss_save->yyvsp = yyvsp;
- ss_save->yypsp = yypsp;
- ss_save->yylen = 0;
+ YYDPRINTF((Perl_debug_log,
+ "parser stack size increased to %lu frames\n",
+ (unsigned long int)parser->stack_size));
+ }
}
/* Do appropriate processing given the current state. */
/* Read a lookahead token if we need one and don't already have one. */
-/* yyresume: */
/* First try to decide what to do without reference to lookahead token. */
/* Not known => get a lookahead token if don't already have one. */
/* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */
- if (yychar == YYEMPTY) {
+ if (parser->yychar == YYEMPTY) {
YYDPRINTF ((Perl_debug_log, "Reading a token: "));
#ifdef PERL_IN_MADLY_C
- yychar = PL_madskills ? madlex() : yylex();
+ parser->yychar = PL_madskills ? madlex() : yylex();
#else
- yychar = yylex();
+ parser->yychar = yylex();
#endif
# ifdef EBCDIC
- if (yychar >= 0 && yychar < 255) {
- yychar = NATIVE_TO_ASCII(yychar);
+ if (parser->yychar >= 0 && parser->yychar < 255) {
+ parser->yychar = NATIVE_TO_ASCII(parser->yychar);
}
# endif
}
- if (yychar <= YYEOF) {
- yychar = yytoken = YYEOF;
+ if (parser->yychar <= YYEOF) {
+ parser->yychar = yytoken = YYEOF;
YYDPRINTF ((Perl_debug_log, "Now at end of input.\n"));
}
else {
- yytoken = YYTRANSLATE (yychar);
- YYDSYMPRINTF ("Next token is", yytoken, &yylval);
+ yytoken = YYTRANSLATE (parser->yychar);
+ YYDSYMPRINTF ("Next token is", yytoken, &parser->yylval);
}
/* If the proper action on seeing token YYTOKEN is to reduce or to
YYDPRINTF ((Perl_debug_log, "Shifting token %s, ", yytname[yytoken]));
/* Discard the token being shifted unless it is eof. */
- if (yychar != YYEOF)
- yychar = YYEMPTY;
-
- *++yyssp = yyn;
- *++yyvsp = yylval;
- *++yypsp = PL_comppad;
+ if (parser->yychar != YYEOF)
+ parser->yychar = YYEMPTY;
+
+ YYPUSHSTACK;
+ ps->state = yyn;
+ ps->val = parser->yylval;
+ ps->compcv = (CV*)SvREFCNT_inc(PL_compcv);
+ ps->savestack_ix = PL_savestack_ix;
#ifdef DEBUGGING
- *++yynsp = (const char *)(yytname[yytoken]);
+ ps->name = (const char *)(yytname[yytoken]);
#endif
-
/* Count tokens shifted since error; after three, turn off error
status. */
- if (yyerrstatus)
- yyerrstatus--;
+ if (parser->yyerrstatus)
+ parser->yyerrstatus--;
goto yynewstate;
`-----------------------------*/
yyreduce:
/* yyn is the number of a rule to reduce with. */
- yylen = yyr2[yyn];
+ parser->yylen = yyr2[yyn];
/* If YYLEN is nonzero, implement the default value of the action:
"$$ = $1".
users should not rely upon it. Assigning to YYVAL
unconditionally makes the parser a bit smaller, and it avoids a
GCC warning that YYVAL may be used uninitialized. */
- yyval = yyvsp[1-yylen];
+ yyval = ps[1-parser->yylen].val;
- YY_STACK_PRINT (yyss, yyssp, yyvs, yyns);
+ YY_STACK_PRINT(parser);
YY_REDUCE_PRINT (yyn);
- /* running external code may trigger a die (eg 'use nosuchmodule'):
- * record the current stack state so that an unwind will
- * free all the pesky OPs lounging around on the parse stack */
- ss_save->yyss = yyss;
- ss_save->yyssp = yyssp;
- ss_save->yyvsp = yyvsp;
- ss_save->yypsp = yypsp;
- ss_save->yylen = yylen;
-
switch (yyn) {
* freed; the rest need the flag resetting */
{
int i;
- for (i=0; i< yylen; i++) {
- if (yy_type_tab[yystos[yyssp[-i]]] == toketype_opval
- && yyvsp[-i].opval)
+ for (i=0; i< parser->yylen; i++) {
+#ifndef DISABLE_STACK_FREE
+ if (yy_type_tab[yystos[ps[-i].state]] == toketype_opval
+ && ps[-i].val.opval)
{
- yyvsp[-i].opval->op_latefree = 0;
- if (yyvsp[-i].opval->op_latefreed)
- op_free(yyvsp[-i].opval);
+ ps[-i].val.opval->op_latefree = 0;
+ if (ps[-i].val.opval->op_latefreed)
+ op_free(ps[-i].val.opval);
}
+#endif
+ SvREFCNT_dec(ps[-i].compcv);
}
}
- yyvsp -= yylen;
- yyssp -= yylen;
- yypsp -= yylen;
-#ifdef DEBUGGING
- yynsp -= yylen;
-#endif
+ parser->ps = ps -= (parser->yylen-1);
/* Now shift the result of the reduction. Determine what state
that goes to, based on the state we popped back to and the rule
number reduced by. */
- *++yyvsp = yyval;
- *++yypsp = PL_comppad;
+ ps->val = yyval;
+ ps->compcv = (CV*)SvREFCNT_inc(PL_compcv);
+ ps->savestack_ix = PL_savestack_ix;
#ifdef DEBUGGING
- *++yynsp = (const char *)(yytname [yyr1[yyn]]);
+ ps->name = (const char *)(yytname [yyr1[yyn]]);
#endif
yyn = yyr1[yyn];
- yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
- if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+ yystate = yypgoto[yyn - YYNTOKENS] + ps[-1].state;
+ if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == ps[-1].state)
yystate = yytable[yystate];
else
yystate = yydefgoto[yyn - YYNTOKENS];
- *++yyssp = yystate;
+ ps->state = yystate;
goto yynewstate;
`------------------------------------*/
yyerrlab:
/* If not already recovering from an error, report this error. */
- if (!yyerrstatus) {
- ++yynerrs;
+ if (!parser->yyerrstatus) {
yyerror ("syntax error");
}
- if (yyerrstatus == 3) {
+ if (parser->yyerrstatus == 3) {
/* If just tried and failed to reuse lookahead token after an
error, discard it. */
/* Return failure if at end of input. */
- if (yychar == YYEOF) {
+ if (parser->yychar == YYEOF) {
/* Pop the error token. */
+ SvREFCNT_dec(ps->compcv);
YYPOPSTACK;
/* Pop the rest of the stack. */
- while (yyss < yyssp) {
- YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp);
- if (yy_type_tab[yystos[*yyssp]] == toketype_opval
- && yyvsp->opval)
+ while (ps > parser->stack) {
+ YYDSYMPRINTF ("Error: popping", yystos[ps->state], &ps->val);
+ LEAVE_SCOPE(ps->savestack_ix);
+ if (yy_type_tab[yystos[ps->state]] == toketype_opval
+ && ps->val.opval)
{
YYDPRINTF ((Perl_debug_log, "(freeing op)\n"));
- if (*yypsp != PL_comppad) {
- PAD_RESTORE_LOCAL(*yypsp);
+ if (ps->compcv != PL_compcv) {
+ PL_compcv = ps->compcv;
+ PAD_SET_CUR_NOSAVE(CvPADLIST(PL_compcv), 1);
}
- yyvsp->opval->op_latefree = 0;
- op_free(yyvsp->opval);
+ ps->val.opval->op_latefree = 0;
+ op_free(ps->val.opval);
}
+ SvREFCNT_dec(ps->compcv);
YYPOPSTACK;
}
YYABORT;
}
- YYDSYMPRINTF ("Error: discarding", yytoken, &yylval);
- yychar = YYEMPTY;
+ YYDSYMPRINTF ("Error: discarding", yytoken, &parser->yylval);
+ if (yy_type_tab[yytoken] == toketype_opval)
+ op_free(parser->yylval.opval);
+ parser->yychar = YYEMPTY;
}
| yyerrlab1 -- error raised explicitly by an action. |
`----------------------------------------------------*/
yyerrlab1:
- yyerrstatus = 3; /* Each real token shifted decrements this. */
+ parser->yyerrstatus = 3; /* Each real token shifted decrements this. */
for (;;) {
yyn = yypact[yystate];
}
/* Pop the current state because it cannot handle the error token. */
- if (yyssp == yyss)
+ if (ps == parser->stack)
YYABORT;
- YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp);
- if (yy_type_tab[yystos[*yyssp]] == toketype_opval && yyvsp->opval) {
+ YYDSYMPRINTF ("Error: popping", yystos[ps->state], &ps->val);
+ LEAVE_SCOPE(ps->savestack_ix);
+ if (yy_type_tab[yystos[ps->state]] == toketype_opval && ps->val.opval) {
YYDPRINTF ((Perl_debug_log, "(freeing op)\n"));
- if (*yypsp != PL_comppad) {
- PAD_RESTORE_LOCAL(*yypsp);
+ if (ps->compcv != PL_compcv) {
+ PL_compcv = ps->compcv;
+ PAD_SET_CUR_NOSAVE(CvPADLIST(PL_compcv), 1);
}
- yyvsp->opval->op_latefree = 0;
- op_free(yyvsp->opval);
+ ps->val.opval->op_latefree = 0;
+ op_free(ps->val.opval);
}
- yyvsp--;
- yypsp--;
-#ifdef DEBUGGING
- yynsp--;
-#endif
- yystate = *--yyssp;
+ SvREFCNT_dec(ps->compcv);
+ YYPOPSTACK;
+ yystate = ps->state;
- YY_STACK_PRINT (yyss, yyssp, yyvs, yyns);
+ YY_STACK_PRINT(parser);
}
if (yyn == YYFINAL)
YYDPRINTF ((Perl_debug_log, "Shifting error token, "));
- *++yyssp = yyn;
- *++yyvsp = yylval;
- *++yypsp = PL_comppad;
+ YYPUSHSTACK;
+ ps->state = yyn;
+ ps->val = parser->yylval;
+ ps->compcv = (CV*)SvREFCNT_inc(PL_compcv);
+ ps->savestack_ix = PL_savestack_ix;
#ifdef DEBUGGING
- *++yynsp ="<err>";
+ ps->name ="<err>";
#endif
goto yynewstate;
`-------------------------------------*/
yyacceptlab:
yyresult = 0;
+ for (ps=parser->ps; ps > parser->stack; ps--) {
+ SvREFCNT_dec(ps->compcv);
+ }
+ parser->ps = parser->stack; /* disable cleanup */
goto yyreturn;
/*-----------------------------------.
yyresult = 1;
goto yyreturn;
- /*----------------------------------------------.
- | yyoverflowlab -- parser overflow comes here. |
- `----------------------------------------------*/
- yyoverflowlab:
- yyerror ("parser stack overflow");
- yyresult = 2;
- /* Fall through. */
-
yyreturn:
-
- ss_save->yyss = NULL; /* disarm parse stack cleanup */
- LEAVE; /* force stack free before we return */
-
+ LEAVE; /* force parser stack cleanup before we return */
return yyresult;
}
https://perl5.git.perl.org / perl5.git / blobdiff