[perl5.git] / perly_c.diff

--- perly.c.orig	Tue Jun 19 08:39:52 2001
+++ perly.c	Tue Jun 19 08:39:24 2001
@@ -1,5 +1,5 @@
 #ifndef lint
-static char yysccsid[] = "@(#)yaccpar 1.8 (Berkeley) 01/20/91";
+/* static char yysccsid[] = "@(#)yaccpar 1.8 (Berkeley) 01/20/91"; */
 #endif
 #define YYBYACC 1
 #line 16 "perly.y"
@@ -50,70 +50,9 @@
 #define yylex yylex_r
 #endif
 
-#line 54 "y.tab.c"
-#define WORD 257
-#define METHOD 258
-#define FUNCMETH 259
-#define THING 260
-#define PMFUNC 261
-#define PRIVATEREF 262
-#define FUNC0SUB 263
-#define UNIOPSUB 264
-#define LSTOPSUB 265
-#define LABEL 266
-#define FORMAT 267
-#define SUB 268
-#define ANONSUB 269
-#define PACKAGE 270
-#define USE 271
-#define WHILE 272
-#define UNTIL 273
-#define IF 274
-#define UNLESS 275
-#define ELSE 276
-#define ELSIF 277
-#define CONTINUE 278
-#define FOR 279
-#define LOOPEX 280
-#define DOTDOT 281
-#define FUNC0 282
-#define FUNC1 283
-#define FUNC 284
-#define UNIOP 285
-#define LSTOP 286
-#define RELOP 287
-#define EQOP 288
-#define MULOP 289
-#define ADDOP 290
-#define DOLSHARP 291
-#define DO 292
-#define HASHBRACK 293
-#define NOAMP 294
-#define LOCAL 295
-#define MY 296
-#define MYSUB 297
-#define COLONATTR 298
-#define PREC_LOW 299
-#define OROP 300
-#define ANDOP 301
-#define NOTOP 302
-#define ASSIGNOP 303
-#define OROR 304
-#define ANDAND 305
-#define BITOROP 306
-#define BITANDOP 307
-#define SHIFTOP 308
-#define MATCHOP 309
-#define UMINUS 310
-#define REFGEN 311
-#define POWOP 312
-#define PREINC 313
-#define PREDEC 314
-#define POSTINC 315
-#define POSTDEC 316
-#define ARROW 317
+#line 54 "perly.c"
 #define YYERRCODE 256
-short yylhs[] = {                                        -1,
+static short yylhs[] = {                                        -1,
     0,    9,    7,    6,   10,    8,   11,   11,   11,   12,
    12,   12,   12,   25,   25,   25,   25,   25,   25,   25,
    15,   15,   15,   14,   14,   43,   43,   13,   13,   13,
@@ -135,7 +74,7 @@
    49,   34,   34,   35,   35,   35,   44,   24,   19,   20,
    21,   22,   23,   36,   36,   36,   36,
 };
-short yylen[] = {                                         2,
+static short yylen[] = {                                         2,
     2,    4,    0,    0,    4,    0,    0,    2,    2,    2,
     1,    2,    3,    1,    1,    3,    3,    3,    3,    3,
     0,    2,    6,    7,    7,    0,    2,    8,    8,   10,
@@ -157,7 +96,7 @@
     1,    0,    1,    0,    1,    2,    1,    2,    2,    2,
     2,    2,    2,    1,    1,    1,    1,
 };
-short yydefred[] = {                                      4,
+static short yydefred[] = {                                      4,
     0,    7,    0,   45,   58,   56,    0,   56,   56,    8,
    46,    9,   11,   48,    0,   47,   49,   50,    0,    0,
     0,   70,   71,    0,   14,    3,  173,    0,    0,  154,
@@ -199,7 +138,7 @@
     0,   22,    0,    0,    0,   31,    5,    0,   30,    0,
     0,   33,    0,   23,
 };
-short yydgoto[] = {                                       1,
+static short yydgoto[] = {                                       1,
    10,   11,   20,  104,   19,    2,   95,  370,   98,  359,
     3,   12,   13,   70,  375,  285,   72,   73,   74,   75,
    76,   77,   78,   79,  291,   81,  292,  281,  283,  286,
@@ -207,7 +146,7 @@
   194,  327,  156,  289,  271,  225,   14,   83,  137,   84,
    85,   86,   87,   15,   16,   17,   18,   93,  278,
 };
-short yysindex[] = {                                      0,
+static short yysindex[] = {                                      0,
     0,    0, -132,    0,    0,    0,  -51,    0,    0,    0,
     0,    0,    0,    0,  650,    0,    0,    0, -239, -215,
     5,    0,    0, -215,    0,    0,    0,  -31,  -31,    0,
@@ -249,7 +188,7 @@
   449,    0, 2181, -150,  340,    0,    0,  355,    0,  216,
   216,    0, -123,    0,
 };
-short yyrindex[] = {                                      0,
+static short yyrindex[] = {                                      0,
     0,    0,  247,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,  274,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
@@ -291,7 +230,7 @@
   917,    0,    0,  119,    0,    0,    0,    0,    0,    0,
     0,    0,  179,    0,
 };
-short yygindex[] = {                                      0,
+static short yygindex[] = {                                      0,
     0,    0,  196,  425,    0,    0,   -2,    0,   37,  634,
   -94,    0,    0,    0, -323,  -15, 2445,    0,  999,  414,
   417,    0,    0,    0,  463,  -43,    0,    0,  321, -198,
@@ -300,7 +239,7 @@
     0,    0,    0,    0,    0,    0,    0,    0,    0,
 };
 #define YYTABLESIZE 4568
-short yytable[] = {                                      71,
+static short yytable[] = {                                      71,
   197,   65,  121,  227,   65,  111,  220,   22,  198,  293,
   139,  296,  315,  275,  305,  102,  273,   88,  113,  228,
    60,  113,  279,   65,  317,   60,  182,  254,  325,  101,
@@ -759,7 +698,7 @@
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,   77,   77,
 };
-short yycheck[] = {                                      15,
+static short yycheck[] = {                                      15,
    95,   36,   46,   41,   36,   40,   59,   59,  100,  208,
    54,   41,   59,  199,   41,   40,  196,  257,   41,   93,
   123,   44,  202,   36,   93,   59,   40,   40,   59,   29,
@@ -1224,7 +1163,7 @@
 #endif
 #define YYMAXTOKEN 317
 #if YYDEBUG
-char *yyname[] = {
+static char *yyname[] = {
 "end-of-file",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 "'!'",0,0,"'$'","'%'","'&'",0,"'('","')'","'*'","'+'","','","'-'",0,0,0,0,0,0,0,
 0,0,0,0,0,"':'","';'",0,0,0,"'?'","'@'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -1241,7 +1180,7 @@
 "ANDAND","BITOROP","BITANDOP","SHIFTOP","MATCHOP","UMINUS","REFGEN","POWOP",
 "PREINC","PREDEC","POSTINC","POSTDEC","ARROW",
 };
-char *yyrule[] = {
+static char *yyrule[] = {
 "$accept : prog",
 "prog : progstart lineseq",
 "block : '{' remember lineseq '}'",
@@ -1456,17 +1395,6 @@
 #define YYMAXDEPTH 500
 #endif
 #endif
-int yydebug;
-int yynerrs;
-int yyerrflag;
-int yychar;
-short *yyssp;
-YYSTYPE *yyvsp;
-YYSTYPE yyval;
-YYSTYPE yylval;
-short yyss[YYSTACKSIZE];
-YYSTYPE yyvs[YYSTACKSIZE];
-#define yystacksize YYSTACKSIZE
 #line 793 "perly.y"
  /* PROGRAM */
 
@@ -1477,7 +1405,7 @@
 #endif
 #define yyparse() Perl_yyparse(pTHX)
 
-#line 1481 "y.tab.c"
+#line 1409 "perly.c"
 #define YYABORT goto yyabort
 #define YYACCEPT goto yyaccept
 #define YYERROR goto yyerrlab
@@ -1485,11 +1413,31 @@
 yyparse()
 {
     register int yym, yyn, yystate;
+    register short *yyssp;
+    register YYSTYPE *yyvsp;
+    short* yyss;
+    YYSTYPE* yyvs;
+    unsigned yystacksize = YYSTACKSIZE;
+    int retval = 0;
 #if YYDEBUG
     register char *yys;
-    extern char *getenv();
+#endif
+
+    struct ysv *ysave;
+#ifdef USE_ITHREADS
+    ENTER;			/* force yydestruct() before we return */
+#endif
+    New(73, ysave, 1, struct ysv);
+    SAVEDESTRUCTOR_X(yydestruct, ysave);
+    ysave->oldyydebug	= yydebug;
+    ysave->oldyynerrs	= yynerrs;
+    ysave->oldyyerrflag	= yyerrflag;
+    ysave->oldyychar	= yychar;
+    ysave->oldyyval	= yyval;
+    ysave->oldyylval	= yylval;
 
-    if (yys = getenv("YYDEBUG"))
+#if YYDEBUG
+    if ((yys = getenv("YYDEBUG")))
     {
         yyn = *yys;
         if (yyn >= '0' && yyn <= '9')
@@ -1501,12 +1449,22 @@
     yyerrflag = 0;
     yychar = (-1);
 
+    /*
+    ** Initialize private stacks (yyparse may be called from an action)
+    */
+    New(73, yyss, yystacksize, short);
+    New(73, yyvs, yystacksize, YYSTYPE);
+    ysave->yyss = yyss;
+    ysave->yyvs = yyvs;
+    if (!yyvs || !yyss)
+	goto yyoverflow;
+
     yyssp = yyss;
     yyvsp = yyvs;
     *yyssp = yystate = 0;
 
 yyloop:
-    if (yyn = yydefred[yystate]) goto yyreduce;
+    if ((yyn = yydefred[yystate])) goto yyreduce;
     if (yychar < 0)
     {
         if ((yychar = yylex()) < 0) yychar = 0;
@@ -1516,7 +1474,7 @@
             yys = 0;
             if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
             if (!yys) yys = "illegal-symbol";
-            printf("yydebug: state %d, reading %d (%s)\n", yystate,
+            PerlIO_printf(Perl_debug_log, "yydebug: state %d, reading %d (%s)\n", yystate,
                     yychar, yys);
         }
 #endif
@@ -1526,12 +1484,24 @@
     {
 #if YYDEBUG
         if (yydebug)
-            printf("yydebug: state %d, shifting to state %d\n",
+            PerlIO_printf(Perl_debug_log, "yydebug: state %d, shifting to state %d\n",
                     yystate, yytable[yyn]);
 #endif
         if (yyssp >= yyss + yystacksize - 1)
         {
+	    /*
+	    ** reallocate and recover.  Note that pointers
+	    ** have to be reset, or bad things will happen
+	    */
+	    int yyps_index = (yyssp - yyss);
+	    int yypv_index = (yyvsp - yyvs);
+	    yystacksize += YYSTACKSIZE;
+	    ysave->yyvs = Renew(yyvs, yystacksize, YYSTYPE);
+	    ysave->yyss = Renew(yyss, yystacksize, short);
+	    if (!yyvs || !yyss)
             goto yyoverflow;
+	    yyssp = yyss + yyps_index;
+	    yyvsp = yyvs + yypv_index;
         }
         *++yyssp = yystate = yytable[yyn];
         *++yyvsp = yylval;
@@ -1547,14 +1517,14 @@
     }
     if (yyerrflag) goto yyinrecovery;
 #ifdef lint
-    goto yynewerror;
+
 #endif
-yynewerror:
+
     yyerror("syntax error");
 #ifdef lint
-    goto yyerrlab;
+
 #endif
-yyerrlab:
+
     ++yynerrs;
 yyinrecovery:
     if (yyerrflag < 3)
@@ -1567,12 +1537,24 @@
             {
 #if YYDEBUG
                 if (yydebug)
-                    printf("yydebug: state %d, error recovery shifting\
+                    PerlIO_printf(Perl_debug_log, "yydebug: state %d, error recovery shifting\
  to state %d\n", *yyssp, yytable[yyn]);
 #endif
                 if (yyssp >= yyss + yystacksize - 1)
                 {
+		    /*
+		    ** reallocate and recover.  Note that pointers
+		    ** have to be reset, or bad things will happen
+		    */
+		    int yyps_index = (yyssp - yyss);
+		    int yypv_index = (yyvsp - yyvs);
+		    yystacksize += YYSTACKSIZE;
+		    ysave->yyvs = Renew(yyvs, yystacksize, YYSTYPE);
+		    ysave->yyss = Renew(yyss, yystacksize, short);
+		    if (!yyvs || !yyss)
                     goto yyoverflow;
+		    yyssp = yyss + yyps_index;
+		    yyvsp = yyvs + yypv_index;
                 }
                 *++yyssp = yystate = yytable[yyn];
                 *++yyvsp = yylval;
@@ -1582,7 +1564,7 @@
             {
 #if YYDEBUG
                 if (yydebug)
-                    printf("yydebug: error recovery discarding state %d\n",
+                    PerlIO_printf(Perl_debug_log, "yydebug: error recovery discarding state %d\n",
                             *yyssp);
 #endif
                 if (yyssp <= yyss) goto yyabort;
@@ -1600,7 +1582,7 @@
             yys = 0;
             if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
             if (!yys) yys = "illegal-symbol";
-            printf("yydebug: state %d, error recovery discards token %d (%s)\n",
+            PerlIO_printf(Perl_debug_log, "yydebug: state %d, error recovery discards token %d (%s)\n",
                     yystate, yychar, yys);
         }
 #endif
@@ -1610,7 +1592,7 @@
 yyreduce:
 #if YYDEBUG
     if (yydebug)
-        printf("yydebug: state %d, reducing by rule %d (%s)\n",
+        PerlIO_printf(Perl_debug_log, "yydebug: state %d, reducing by rule %d (%s)\n",
                 yystate, yyn, yyrule[yyn]);
 #endif
     yym = yylen[yyn];
@@ -2473,7 +2455,7 @@
 #line 790 "perly.y"
 { yyval.opval = yyvsp[0].opval; }
 break;
-#line 2477 "y.tab.c"
+#line 2459 "perly.c"
     }
     yyssp -= yym;
     yystate = *yyssp;
@@ -2483,7 +2465,7 @@
     {
 #if YYDEBUG
         if (yydebug)
-            printf("yydebug: after reduction, shifting from state 0 to\
+            PerlIO_printf(Perl_debug_log, "yydebug: after reduction, shifting from state 0 to\
  state %d\n", YYFINAL);
 #endif
         yystate = YYFINAL;
@@ -2498,7 +2480,7 @@
                 yys = 0;
                 if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
                 if (!yys) yys = "illegal-symbol";
-                printf("yydebug: state %d, reading %d (%s)\n",
+                PerlIO_printf(Perl_debug_log, "yydebug: state %d, reading %d (%s)\n",
                         YYFINAL, yychar, yys);
             }
 #endif
@@ -2513,20 +2495,54 @@
         yystate = yydgoto[yym];
 #if YYDEBUG
     if (yydebug)
-        printf("yydebug: after reduction, shifting from state %d \
+        PerlIO_printf(Perl_debug_log, "yydebug: after reduction, shifting from state %d \
 to state %d\n", *yyssp, yystate);
 #endif
     if (yyssp >= yyss + yystacksize - 1)
     {
+	/*
+	** reallocate and recover.  Note that pointers
+	** have to be reset, or bad things will happen
+	*/
+	int yyps_index = (yyssp - yyss);
+	int yypv_index = (yyvsp - yyvs);
+	yystacksize += YYSTACKSIZE;
+	ysave->yyvs = Renew(yyvs, yystacksize, YYSTYPE);
+	ysave->yyss = Renew(yyss, yystacksize, short);
+	if (!yyvs || !yyss)
         goto yyoverflow;
+	yyssp = yyss + yyps_index;
+	yyvsp = yyvs + yypv_index;
     }
     *++yyssp = yystate;
     *++yyvsp = yyval;
     goto yyloop;
 yyoverflow:
-    yyerror("yacc stack overflow");
+    yyerror("Out of memory for yacc stack");
 yyabort:
-    return (1);
+    retval = 1;
 yyaccept:
-    return (0);
+#ifdef USE_ITHREADS
+    LEAVE;			/* force yydestruct() before we return */
+#endif
+    return retval;
+}
+
+#ifdef PERL_OBJECT
+#include "XSUB.h"
+#endif
+
+static void
+yydestruct(pTHXo_ void *ptr)
+{
+    struct ysv* ysave = (struct ysv*)ptr;
+    if (ysave->yyss) Safefree(ysave->yyss);
+    if (ysave->yyvs) Safefree(ysave->yyvs);
+    yydebug	= ysave->oldyydebug;
+    yynerrs	= ysave->oldyynerrs;
+    yyerrflag	= ysave->oldyyerrflag;
+    yychar	= ysave->oldyychar;
+    yyval	= ysave->oldyyval;
+    yylval	= ysave->oldyylval;
+    Safefree(ysave);
 }
Commit	Line	Data
ecb2f335 NIS	1	--- perly.c.orig Tue Jun 19 08:39:52 2001
	2	+++ perly.c Tue Jun 19 08:39:24 2001
	3	@@ -1,5 +1,5 @@
	4	#ifndef lint
	5	-static char yysccsid[] = "@(#)yaccpar 1.8 (Berkeley) 01/20/91";
	6	+/* static char yysccsid[] = "@(#)yaccpar 1.8 (Berkeley) 01/20/91"; */
	7	#endif
	8	#define YYBYACC 1
	9	#line 16 "perly.y"
7b57b0ea JH	10	@@ -50,70 +50,9 @@
	11	#define yylex yylex_r
	12	#endif
	13
	14	-#line 54 "y.tab.c"
	15	-#define WORD 257
	16	-#define METHOD 258
	17	-#define FUNCMETH 259
	18	-#define THING 260
	19	-#define PMFUNC 261
	20	-#define PRIVATEREF 262
	21	-#define FUNC0SUB 263
	22	-#define UNIOPSUB 264
	23	-#define LSTOPSUB 265
	24	-#define LABEL 266
	25	-#define FORMAT 267
	26	-#define SUB 268
	27	-#define ANONSUB 269
	28	-#define PACKAGE 270
	29	-#define USE 271
	30	-#define WHILE 272
	31	-#define UNTIL 273
	32	-#define IF 274
	33	-#define UNLESS 275
	34	-#define ELSE 276
	35	-#define ELSIF 277
	36	-#define CONTINUE 278
	37	-#define FOR 279
	38	-#define LOOPEX 280
	39	-#define DOTDOT 281
	40	-#define FUNC0 282
	41	-#define FUNC1 283
	42	-#define FUNC 284
	43	-#define UNIOP 285
	44	-#define LSTOP 286
	45	-#define RELOP 287
	46	-#define EQOP 288
	47	-#define MULOP 289
	48	-#define ADDOP 290
	49	-#define DOLSHARP 291
	50	-#define DO 292
	51	-#define HASHBRACK 293
	52	-#define NOAMP 294
	53	-#define LOCAL 295
	54	-#define MY 296
	55	-#define MYSUB 297
	56	-#define COLONATTR 298
	57	-#define PREC_LOW 299
	58	-#define OROP 300
	59	-#define ANDOP 301
	60	-#define NOTOP 302
	61	-#define ASSIGNOP 303
	62	-#define OROR 304
	63	-#define ANDAND 305
	64	-#define BITOROP 306
	65	-#define BITANDOP 307
	66	-#define SHIFTOP 308
	67	-#define MATCHOP 309
	68	-#define UMINUS 310
	69	-#define REFGEN 311
	70	-#define POWOP 312
	71	-#define PREINC 313
	72	-#define PREDEC 314
	73	-#define POSTINC 315
74	-#define POSTDEC 316
75	-#define ARROW 317
76	+#line 54 "perly.c"
77	#define YYERRCODE 256
78	-short yylhs[] = { -1,
79	+static short yylhs[] = { -1,
ecb2f335 NIS	80	0, 9, 7, 6, 10, 8, 11, 11, 11, 12,
	81	12, 12, 12, 25, 25, 25, 25, 25, 25, 25,
	82	15, 15, 15, 14, 14, 43, 43, 13, 13, 13,
7b57b0ea	83	@@ -135,7 +74,7 @@
ecb2f335 NIS	84	49, 34, 34, 35, 35, 35, 44, 24, 19, 20,
ecb2f335 NIS	85	21, 22, 23, 36, 36, 36, 36,
7b57b0ea JH	86	};
	87	-short yylen[] = { 2,
	88	+static short yylen[] = { 2,
ecb2f335	89	2, 4, 0, 0, 4, 0, 0, 2, 2, 2,
7b57b0ea JH	90	1, 2, 3, 1, 1, 3, 3, 3, 3, 3,
	91	0, 2, 6, 7, 7, 0, 2, 8, 8, 10,
	92	@@ -157,7 +96,7 @@
	93	1, 0, 1, 0, 1, 2, 1, 2, 2, 2,
	94	2, 2, 2, 1, 1, 1, 1,
	95	};
ecb2f335 NIS	96	-short yydefred[] = { 4,
ecb2f335 NIS	97	+static short yydefred[] = { 4,
7b57b0ea JH	98	0, 7, 0, 45, 58, 56, 0, 56, 56, 8,
7b57b0ea JH	99	46, 9, 11, 48, 0, 47, 49, 50, 0, 0,
ecb2f335	100	0, 70, 71, 0, 14, 3, 173, 0, 0, 154,
7b57b0ea JH	101	@@ -199,7 +138,7 @@
	102	0, 22, 0, 0, 0, 31, 5, 0, 30, 0,
	103	0, 33, 0, 23,
	104	};
	105	-short yydgoto[] = { 1,
	106	+static short yydgoto[] = { 1,
ecb2f335 NIS	107	10, 11, 20, 104, 19, 2, 95, 370, 98, 359,
	108	3, 12, 13, 70, 375, 285, 72, 73, 74, 75,
	109	76, 77, 78, 79, 291, 81, 292, 281, 283, 286,
7b57b0ea	110	@@ -207,7 +146,7 @@
ecb2f335 NIS	111	194, 327, 156, 289, 271, 225, 14, 83, 137, 84,
ecb2f335 NIS	112	85, 86, 87, 15, 16, 17, 18, 93, 278,
7b57b0ea JH	113	};
	114	-short yysindex[] = { 0,
	115	+static short yysindex[] = { 0,
	116	0, 0, -132, 0, 0, 0, -51, 0, 0, 0,
	117	0, 0, 0, 0, 650, 0, 0, 0, -239, -215,
	118	5, 0, 0, -215, 0, 0, 0, -31, -31, 0,
	119	@@ -249,7 +188,7 @@
	120	449, 0, 2181, -150, 340, 0, 0, 355, 0, 216,
	121	216, 0, -123, 0,
	122	};
	123	-short yyrindex[] = { 0,
	124	+static short yyrindex[] = { 0,
	125	0, 0, 247, 0, 0, 0, 0, 0, 0, 0,
	126	0, 0, 0, 0, 0, 0, 0, 0, 274, 0,
	127	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
	128	@@ -291,7 +230,7 @@
	129	917, 0, 0, 119, 0, 0, 0, 0, 0, 0,
	130	0, 0, 179, 0,
	131	};
	132	-short yygindex[] = { 0,
	133	+static short yygindex[] = { 0,
ecb2f335 NIS	134	0, 0, 196, 425, 0, 0, -2, 0, 37, 634,
	135	-94, 0, 0, 0, -323, -15, 2445, 0, 999, 414,
	136	417, 0, 0, 0, 463, -43, 0, 0, 321, -198,
7b57b0ea JH	137	@@ -300,7 +239,7 @@
	138	0, 0, 0, 0, 0, 0, 0, 0, 0,
	139	};
	140	#define YYTABLESIZE 4568
	141	-short yytable[] = { 71,
	142	+static short yytable[] = { 71,
	143	197, 65, 121, 227, 65, 111, 220, 22, 198, 293,
	144	139, 296, 315, 275, 305, 102, 273, 88, 113, 228,
	145	60, 113, 279, 65, 317, 60, 182, 254, 325, 101,
	146	@@ -759,7 +698,7 @@
	147	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
	148	0, 0, 0, 0, 0, 0, 77, 77,
	149	};
	150	-short yycheck[] = { 15,
	151	+static short yycheck[] = { 15,
	152	95, 36, 46, 41, 36, 40, 59, 59, 100, 208,
	153	54, 41, 59, 199, 41, 40, 196, 257, 41, 93,
	154	123, 44, 202, 36, 93, 59, 40, 40, 59, 29,
	155	@@ -1224,7 +1163,7 @@
	156	#endif
	157	#define YYMAXTOKEN 317
	158	#if YYDEBUG
	159	-char *yyname[] = {
	160	+static char *yyname[] = {
	161	"end-of-file",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
	162	"'!'",0,0,"'$'","'%'","'&'",0,"'('","')'","'*'","'+'","','","'-'",0,0,0,0,0,0,0,
	163	0,0,0,0,0,"':'","';'",0,0,0,"'?'","'@'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
	164	@@ -1241,7 +1180,7 @@
	165	"ANDAND","BITOROP","BITANDOP","SHIFTOP","MATCHOP","UMINUS","REFGEN","POWOP",
	166	"PREINC","PREDEC","POSTINC","POSTDEC","ARROW",
	167	};
	168	-char *yyrule[] = {
	169	+static char *yyrule[] = {
	170	"$accept : prog",
ecb2f335 NIS	171	"prog : progstart lineseq",
ecb2f335 NIS	172	"block : '{' remember lineseq '}'",
7b57b0ea JH	173	@@ -1456,17 +1395,6 @@
	174	#define YYMAXDEPTH 500
	175	#endif
	176	#endif
	177	-int yydebug;
	178	-int yynerrs;
	179	-int yyerrflag;
	180	-int yychar;
	181	-short *yyssp;
	182	-YYSTYPE *yyvsp;
	183	-YYSTYPE yyval;
	184	-YYSTYPE yylval;
	185	-short yyss[YYSTACKSIZE];
	186	-YYSTYPE yyvs[YYSTACKSIZE];
	187	-#define yystacksize YYSTACKSIZE
ecb2f335	188	#line 793 "perly.y"
7b57b0ea JH	189	/* PROGRAM */
	190
	191	@@ -1477,7 +1405,7 @@
	192	#endif
	193	#define yyparse() Perl_yyparse(pTHX)
	194
	195	-#line 1481 "y.tab.c"
ecb2f335	196	+#line 1409 "perly.c"
7b57b0ea JH	197	#define YYABORT goto yyabort
	198	#define YYACCEPT goto yyaccept
	199	#define YYERROR goto yyerrlab
ecb2f335	200	@@ -1485,11 +1413,31 @@
7b57b0ea JH	201	yyparse()
	202	{
	203	register int yym, yyn, yystate;
	204	+ register short *yyssp;
	205	+ register YYSTYPE *yyvsp;
	206	+ short* yyss;
	207	+ YYSTYPE* yyvs;
	208	+ unsigned yystacksize = YYSTACKSIZE;
	209	+ int retval = 0;
	210	#if YYDEBUG
	211	register char *yys;
	212	- extern char *getenv();
	213	+#endif
ecb2f335	214	+
7b57b0ea JH	215	+ struct ysv *ysave;
	216	+#ifdef USE_ITHREADS
	217	+ ENTER; /* force yydestruct() before we return */
	218	+#endif
	219	+ New(73, ysave, 1, struct ysv);
	220	+ SAVEDESTRUCTOR_X(yydestruct, ysave);
	221	+ ysave->oldyydebug = yydebug;
	222	+ ysave->oldyynerrs = yynerrs;
	223	+ ysave->oldyyerrflag = yyerrflag;
	224	+ ysave->oldyychar = yychar;
	225	+ ysave->oldyyval = yyval;
	226	+ ysave->oldyylval = yylval;
ecb2f335 NIS	227
ecb2f335 NIS	228	- if (yys = getenv("YYDEBUG"))
7b57b0ea	229	+#if YYDEBUG
ecb2f335	230	+ if ((yys = getenv("YYDEBUG")))
7b57b0ea JH	231	{
7b57b0ea JH	232	yyn = *yys;
ecb2f335 NIS	233	if (yyn >= '0' && yyn <= '9')
ecb2f335 NIS	234	@@ -1501,12 +1449,22 @@
7b57b0ea JH	235	yyerrflag = 0;
	236	yychar = (-1);
	237
	238	+ /*
	239	+ ** Initialize private stacks (yyparse may be called from an action)
	240	+ */
	241	+ New(73, yyss, yystacksize, short);
	242	+ New(73, yyvs, yystacksize, YYSTYPE);
	243	+ ysave->yyss = yyss;
	244	+ ysave->yyvs = yyvs;
	245	+ if (!yyvs \|\| !yyss)
	246	+ goto yyoverflow;
	247	+
	248	yyssp = yyss;
	249	yyvsp = yyvs;
	250	*yyssp = yystate = 0;
ecb2f335 NIS	251
	252	yyloop:
	253	- if (yyn = yydefred[yystate]) goto yyreduce;
	254	+ if ((yyn = yydefred[yystate])) goto yyreduce;
	255	if (yychar < 0)
	256	{
	257	if ((yychar = yylex()) < 0) yychar = 0;
7b57b0ea JH	258	@@ -1516,7 +1474,7 @@
	259	yys = 0;
	260	if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
	261	if (!yys) yys = "illegal-symbol";
	262	- printf("yydebug: state %d, reading %d (%s)\n", yystate,
	263	+ PerlIO_printf(Perl_debug_log, "yydebug: state %d, reading %d (%s)\n", yystate,
	264	yychar, yys);
	265	}
	266	#endif
	267	@@ -1526,12 +1484,24 @@
	268	{
	269	#if YYDEBUG
	270	if (yydebug)
	271	- printf("yydebug: state %d, shifting to state %d\n",
	272	+ PerlIO_printf(Perl_debug_log, "yydebug: state %d, shifting to state %d\n",
	273	yystate, yytable[yyn]);
	274	#endif
	275	if (yyssp >= yyss + yystacksize - 1)
	276	{
7b57b0ea JH	277	+ /*
	278	+ ** reallocate and recover. Note that pointers
	279	+ ** have to be reset, or bad things will happen
	280	+ */
	281	+ int yyps_index = (yyssp - yyss);
	282	+ int yypv_index = (yyvsp - yyvs);
	283	+ yystacksize += YYSTACKSIZE;
	284	+ ysave->yyvs = Renew(yyvs, yystacksize, YYSTYPE);
	285	+ ysave->yyss = Renew(yyss, yystacksize, short);
	286	+ if (!yyvs \|\| !yyss)
ecb2f335	287	goto yyoverflow;
7b57b0ea JH	288	+ yyssp = yyss + yyps_index;
	289	+ yyvsp = yyvs + yypv_index;
	290	}
	291	*++yyssp = yystate = yytable[yyn];
	292	*++yyvsp = yylval;
ecb2f335 NIS	293	@@ -1547,14 +1517,14 @@
	294	}
	295	if (yyerrflag) goto yyinrecovery;
7b57b0ea	296	#ifdef lint
ecb2f335 NIS	297	- goto yynewerror;
ecb2f335 NIS	298	+
7b57b0ea JH	299	#endif
	300	-yynewerror:
	301	+
	302	yyerror("syntax error");
	303	#ifdef lint
ecb2f335 NIS	304	- goto yyerrlab;
ecb2f335 NIS	305	+
7b57b0ea JH	306	#endif
	307	-yyerrlab:
	308	+
	309	++yynerrs;
	310	yyinrecovery:
	311	if (yyerrflag < 3)
	312	@@ -1567,12 +1537,24 @@
	313	{
	314	#if YYDEBUG
	315	if (yydebug)
	316	- printf("yydebug: state %d, error recovery shifting\
	317	+ PerlIO_printf(Perl_debug_log, "yydebug: state %d, error recovery shifting\
	318	to state %d\n", *yyssp, yytable[yyn]);
	319	#endif
	320	if (yyssp >= yyss + yystacksize - 1)
	321	{
7b57b0ea JH	322	+ /*
	323	+ ** reallocate and recover. Note that pointers
	324	+ ** have to be reset, or bad things will happen
	325	+ */
	326	+ int yyps_index = (yyssp - yyss);
	327	+ int yypv_index = (yyvsp - yyvs);
	328	+ yystacksize += YYSTACKSIZE;
	329	+ ysave->yyvs = Renew(yyvs, yystacksize, YYSTYPE);
	330	+ ysave->yyss = Renew(yyss, yystacksize, short);
	331	+ if (!yyvs \|\| !yyss)
ecb2f335	332	goto yyoverflow;
7b57b0ea JH	333	+ yyssp = yyss + yyps_index;
	334	+ yyvsp = yyvs + yypv_index;
	335	}
	336	*++yyssp = yystate = yytable[yyn];
	337	*++yyvsp = yylval;
	338	@@ -1582,7 +1564,7 @@
	339	{
	340	#if YYDEBUG
	341	if (yydebug)
	342	- printf("yydebug: error recovery discarding state %d\n",
	343	+ PerlIO_printf(Perl_debug_log, "yydebug: error recovery discarding state %d\n",
	344	*yyssp);
	345	#endif
	346	if (yyssp <= yyss) goto yyabort;
	347	@@ -1600,7 +1582,7 @@
	348	yys = 0;
	349	if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
	350	if (!yys) yys = "illegal-symbol";
	351	- printf("yydebug: state %d, error recovery discards token %d (%s)\n",
	352	+ PerlIO_printf(Perl_debug_log, "yydebug: state %d, error recovery discards token %d (%s)\n",
	353	yystate, yychar, yys);
	354	}
	355	#endif
	356	@@ -1610,7 +1592,7 @@
	357	yyreduce:
	358	#if YYDEBUG
	359	if (yydebug)
	360	- printf("yydebug: state %d, reducing by rule %d (%s)\n",
	361	+ PerlIO_printf(Perl_debug_log, "yydebug: state %d, reducing by rule %d (%s)\n",
	362	yystate, yyn, yyrule[yyn]);
	363	#endif
	364	yym = yylen[yyn];
	365	@@ -2473,7 +2455,7 @@
ecb2f335	366	#line 790 "perly.y"
7b57b0ea JH	367	{ yyval.opval = yyvsp[0].opval; }
	368	break;
	369	-#line 2477 "y.tab.c"
ecb2f335	370	+#line 2459 "perly.c"
7b57b0ea JH	371	}
	372	yyssp -= yym;
	373	yystate = *yyssp;
	374	@@ -2483,7 +2465,7 @@
	375	{
	376	#if YYDEBUG
	377	if (yydebug)
	378	- printf("yydebug: after reduction, shifting from state 0 to\
	379	+ PerlIO_printf(Perl_debug_log, "yydebug: after reduction, shifting from state 0 to\
	380	state %d\n", YYFINAL);
	381	#endif
	382	yystate = YYFINAL;
	383	@@ -2498,7 +2480,7 @@
	384	yys = 0;
	385	if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
	386	if (!yys) yys = "illegal-symbol";
	387	- printf("yydebug: state %d, reading %d (%s)\n",
	388	+ PerlIO_printf(Perl_debug_log, "yydebug: state %d, reading %d (%s)\n",
	389	YYFINAL, yychar, yys);
	390	}
	391	#endif
	392	@@ -2513,20 +2495,54 @@
	393	yystate = yydgoto[yym];
	394	#if YYDEBUG
	395	if (yydebug)
	396	- printf("yydebug: after reduction, shifting from state %d \
	397	+ PerlIO_printf(Perl_debug_log, "yydebug: after reduction, shifting from state %d \
	398	to state %d\n", *yyssp, yystate);
	399	#endif
	400	if (yyssp >= yyss + yystacksize - 1)
	401	{
7b57b0ea JH	402	+ /*
	403	+ ** reallocate and recover. Note that pointers
	404	+ ** have to be reset, or bad things will happen
	405	+ */
	406	+ int yyps_index = (yyssp - yyss);
	407	+ int yypv_index = (yyvsp - yyvs);
	408	+ yystacksize += YYSTACKSIZE;
	409	+ ysave->yyvs = Renew(yyvs, yystacksize, YYSTYPE);
	410	+ ysave->yyss = Renew(yyss, yystacksize, short);
	411	+ if (!yyvs \|\| !yyss)
ecb2f335	412	goto yyoverflow;
7b57b0ea JH	413	+ yyssp = yyss + yyps_index;
	414	+ yyvsp = yyvs + yypv_index;
	415	}
	416	*++yyssp = yystate;
	417	*++yyvsp = yyval;
	418	goto yyloop;
	419	yyoverflow:
	420	- yyerror("yacc stack overflow");
	421	+ yyerror("Out of memory for yacc stack");
	422	yyabort:
	423	- return (1);
	424	+ retval = 1;
	425	yyaccept:
	426	- return (0);
	427	+#ifdef USE_ITHREADS
	428	+ LEAVE; /* force yydestruct() before we return */
	429	+#endif
	430	+ return retval;
	431	+}
	432	+
	433	+#ifdef PERL_OBJECT
	434	+#include "XSUB.h"
	435	+#endif
	436	+
	437	+static void
	438	+yydestruct(pTHXo_ void *ptr)
	439	+{
	440	+ struct ysv* ysave = (struct ysv*)ptr;
	441	+ if (ysave->yyss) Safefree(ysave->yyss);
	442	+ if (ysave->yyvs) Safefree(ysave->yyvs);
	443	+ yydebug = ysave->oldyydebug;
	444	+ yynerrs = ysave->oldyynerrs;
	445	+ yyerrflag = ysave->oldyyerrflag;
	446	+ yychar = ysave->oldyychar;
	447	+ yyval = ysave->oldyyval;
	448	+ yylval = ysave->oldyylval;
	449	+ Safefree(ysave);
	450	}