diff options
Diffstat (limited to 'perly_c.diff')
| -rw-r--r-- | perly_c.diff | 178 |
1 files changed, 90 insertions, 88 deletions
diff --git a/perly_c.diff b/perly_c.diff index 431afc18ff..9ef8f25f14 100644 --- a/perly_c.diff +++ b/perly_c.diff @@ -1,5 +1,5 @@ ---- perly.c.orig Wed May 10 18:57:57 2006 -+++ perly.c Wed May 10 18:57:57 2006 +--- perly.c.orig 2006-05-11 10:52:38.000000000 +0200 ++++ perly.c 2006-05-11 10:52:38.000000000 +0200 @@ -1,5 +1,5 @@ #ifndef lint -static char yysccsid[] = "@(#)yaccpar 1.8 (Berkeley) 01/20/91"; @@ -16,7 +16,7 @@ /* stuff included here to make perly_c.diff apply better */ -@@ -50,71 +50,9 @@ +@@ -50,73 +50,9 @@ #define yylex yylex_r #endif @@ -66,121 +66,123 @@ -#define COLONATTR 299 -#define PREC_LOW 300 -#define OROP 301 --#define ANDOP 302 --#define NOTOP 303 --#define ASSIGNOP 304 --#define OROR 305 --#define ANDAND 306 --#define BITOROP 307 --#define BITANDOP 308 --#define SHIFTOP 309 --#define MATCHOP 310 --#define UMINUS 311 --#define REFGEN 312 --#define POWOP 313 --#define PREINC 314 --#define PREDEC 315 --#define POSTINC 316 --#define POSTDEC 317 --#define ARROW 318 -+#line 54 "perly.c" +-#define DOROP 302 +-#define ANDOP 303 +-#define NOTOP 304 +-#define ASSIGNOP 305 +-#define OROR 306 +-#define DORDOR 307 +-#define ANDAND 308 +-#define BITOROP 309 +-#define BITANDOP 310 +-#define SHIFTOP 311 +-#define MATCHOP 312 +-#define UMINUS 313 +-#define REFGEN 314 +-#define POWOP 315 +-#define PREINC 316 +-#define PREDEC 317 +-#define POSTINC 318 +-#define POSTDEC 319 +-#define ARROW 320 ++#line 52 "perly.c" #define YYERRCODE 256 -short yylhs[] = { -1, +static short yylhs[] = { -1, 0, 10, 8, 7, 11, 9, 12, 12, 12, 13, 13, 13, 13, 26, 26, 26, 26, 26, 26, 26, 16, 16, 16, 15, 15, 43, 43, 14, 14, 14, -@@ -136,7 +74,7 @@ - 49, 49, 49, 34, 34, 35, 35, 35, 44, 25, - 20, 21, 22, 23, 24, 36, 36, 36, 36, +@@ -139,7 +75,7 @@ + 44, 25, 20, 21, 22, 23, 24, 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, 9, 9, 10, -@@ -158,7 +96,7 @@ - 1, 1, 1, 0, 1, 0, 1, 2, 1, 2, - 2, 2, 2, 2, 2, 1, 1, 1, 1, +@@ -162,7 +98,7 @@ + 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, 175, 0, 0, 154, -@@ -200,7 +138,7 @@ - 0, 28, 29, 0, 22, 0, 0, 0, 31, 5, - 0, 30, 0, 0, 0, 0, 33, 23, + 0, 70, 71, 0, 14, 3, 177, 0, 0, 156, +@@ -205,7 +141,7 @@ + 0, 0, 31, 5, 0, 30, 0, 0, 0, 0, + 33, 23, }; -short yydgoto[] = { 1, +static short yydgoto[] = { 1, - 10, 11, 20, 105, 19, 359, 2, 96, 373, 99, - 362, 3, 12, 13, 71, 376, 285, 73, 74, 75, - 76, 77, 78, 79, 80, 292, 82, 293, 283, 234, -@@ -208,7 +146,7 @@ - 196, 328, 158, 290, 273, 227, 14, 84, 138, 85, - 86, 87, 88, 15, 16, 17, 18, 94, 280, + 10, 11, 20, 105, 19, 363, 2, 96, 377, 99, + 366, 3, 12, 13, 71, 380, 289, 73, 74, 75, + 76, 77, 78, 79, 80, 296, 82, 297, 287, 236, +@@ -213,7 +149,7 @@ + 198, 332, 158, 294, 277, 229, 14, 84, 138, 85, + 86, 87, 88, 15, 16, 17, 18, 94, 284, }; -short yysindex[] = { 0, +static short yysindex[] = { 0, - 0, 0, -112, 0, 0, 0, -47, 0, 0, 0, - 0, 0, 0, 0, 651, 0, 0, 0, -214, -201, - 44, 0, 0, -201, 0, 0, 0, -13, -13, 0, -@@ -250,7 +188,7 @@ - -149, 0, 0, 591, 0, 2210, -149, 1761, 0, 0, - 385, 0, 388, 290, 290, -124, 0, 0, + 0, 0, -228, 0, 0, 0, -56, 0, 0, 0, + 0, 0, 0, 0, 796, 0, 0, 0, -230, -225, + 24, 0, 0, -225, 0, 0, 0, 172, 172, 0, +@@ -256,7 +192,7 @@ + -185, 1669, 0, 0, 370, 0, 373, 215, 215, -241, + 0, 0, }; -short yyrindex[] = { 0, +static short yyrindex[] = { 0, - 0, 0, 466, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 302, 0, + 0, 0, 383, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 292, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -@@ -292,7 +230,7 @@ - 71, 0, 0, 827, 0, 0, 71, 427, 0, 0, - 0, 0, 0, 0, 0, 179, 0, 0, +@@ -299,7 +235,7 @@ + 17, 394, 0, 0, 0, 0, 0, 0, 0, 96, + 0, 0, }; -short yygindex[] = { 0, +static short yygindex[] = { 0, - 0, 0, 180, 444, 0, -308, 0, -34, 0, -6, - 1062, -94, 0, 0, 0, -343, -15, 2478, 0, 2171, - 428, 429, 0, 0, 0, 468, 423, 0, 148, -110, -@@ -301,7 +239,7 @@ + 0, 0, 43, 411, 0, -321, 0, 803, 0, 166, + 630, -84, 0, 0, 0, -339, -15, 58, 0, 2512, + 396, 397, 0, 0, 0, 435, 501, 0, 118, -120, +@@ -308,7 +244,7 @@ 0, 0, 0, 0, 0, 0, 0, 0, 0, }; - #define YYTABLESIZE 4871 + #define YYTABLESIZE 4809 -short yytable[] = { 72, +static short yytable[] = { 72, - 56, 199, 222, 66, 68, 54, 60, 61, 70, 69, - 65, 22, 64, 66, 316, 60, 229, 112, 200, 377, - 326, 62, 66, 277, 297, 230, 306, 360, 64, 15, -@@ -791,7 +729,7 @@ - 0, 0, 0, 0, 0, 112, 112, 0, 112, 112, - 112, + 231, 60, 22, 301, 224, 202, 310, 232, 60, 66, + 281, 201, 330, 112, 320, 62, 26, 66, 364, 64, + 186, 260, 279, 222, 298, 189, 89, 381, 285, 15, +@@ -791,7 +727,7 @@ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 112, 112, 112, 0, 112, }; -short yycheck[] = { 15, +static short yycheck[] = { 15, - 33, 96, 59, 36, 37, 38, 123, 40, 15, 42, - 43, 59, 45, 36, 59, 59, 41, 40, 101, 363, - 59, 59, 36, 201, 41, 93, 41, 336, 59, 41, -@@ -1287,7 +1225,7 @@ + 41, 59, 59, 41, 59, 101, 41, 93, 123, 36, + 203, 96, 59, 40, 59, 59, 0, 36, 340, 59, + 40, 40, 200, 40, 212, 91, 257, 367, 206, 41, +@@ -1280,7 +1216,7 @@ #endif - #define YYMAXTOKEN 318 + #define YYMAXTOKEN 320 #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, -@@ -1304,7 +1242,7 @@ - "OROR","ANDAND","BITOROP","BITANDOP","SHIFTOP","MATCHOP","UMINUS","REFGEN", - "POWOP","PREINC","PREDEC","POSTINC","POSTDEC","ARROW", +@@ -1297,7 +1233,7 @@ + "ASSIGNOP","OROR","DORDOR","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 '}'", -@@ -1521,17 +1459,6 @@ +@@ -1516,17 +1452,6 @@ #define YYMAXDEPTH 500 #endif #endif @@ -195,19 +197,19 @@ -short yyss[YYSTACKSIZE]; -YYSTYPE yyvs[YYSTACKSIZE]; -#define yystacksize YYSTACKSIZE - #line 812 "perly.y" + #line 816 "perly.y" /* PROGRAM */ -@@ -1542,7 +1469,7 @@ +@@ -1537,7 +1462,7 @@ #endif #define yyparse() Perl_yyparse(pTHX) --#line 1546 "y.tab.c" -+#line 1473 "perly.c" +-#line 1541 "y.tab.c" ++#line 1464 "perly.c" #define YYABORT goto yyabort #define YYACCEPT goto yyaccept #define YYERROR goto yyerrlab -@@ -1550,11 +1477,31 @@ +@@ -1545,11 +1470,31 @@ yyparse() { register int yym, yyn, yystate; @@ -241,7 +243,7 @@ { yyn = *yys; if (yyn >= '0' && yyn <= '9') -@@ -1566,12 +1513,22 @@ +@@ -1561,12 +1506,22 @@ yyerrflag = 0; yychar = (-1); @@ -265,7 +267,7 @@ if (yychar < 0) { if ((yychar = yylex()) < 0) yychar = 0; -@@ -1581,7 +1538,7 @@ +@@ -1576,7 +1531,7 @@ yys = 0; if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; if (!yys) yys = "illegal-symbol"; @@ -274,7 +276,7 @@ yychar, yys); } #endif -@@ -1591,12 +1548,24 @@ +@@ -1586,12 +1541,24 @@ { #if YYDEBUG if (yydebug) @@ -300,7 +302,7 @@ } *++yyssp = yystate = yytable[yyn]; *++yyvsp = yylval; -@@ -1612,14 +1581,14 @@ +@@ -1607,14 +1574,14 @@ } if (yyerrflag) goto yyinrecovery; #ifdef lint @@ -319,7 +321,7 @@ ++yynerrs; yyinrecovery: if (yyerrflag < 3) -@@ -1632,12 +1601,24 @@ +@@ -1627,12 +1594,24 @@ { #if YYDEBUG if (yydebug) @@ -345,7 +347,7 @@ } *++yyssp = yystate = yytable[yyn]; *++yyvsp = yylval; -@@ -1647,7 +1628,7 @@ +@@ -1642,7 +1621,7 @@ { #if YYDEBUG if (yydebug) @@ -354,7 +356,7 @@ *yyssp); #endif if (yyssp <= yyss) goto yyabort; -@@ -1665,7 +1646,7 @@ +@@ -1660,7 +1639,7 @@ yys = 0; if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; if (!yys) yys = "illegal-symbol"; @@ -363,7 +365,7 @@ yystate, yychar, yys); } #endif -@@ -1675,7 +1656,7 @@ +@@ -1670,7 +1649,7 @@ yyreduce: #if YYDEBUG if (yydebug) @@ -372,16 +374,16 @@ yystate, yyn, yyrule[yyn]); #endif yym = yylen[yyn]; -@@ -2550,7 +2531,7 @@ - #line 809 "perly.y" +@@ -2553,7 +2532,7 @@ + #line 813 "perly.y" { yyval.opval = yyvsp[0].opval; } break; --#line 2554 "y.tab.c" -+#line 2535 "perly.c" +-#line 2557 "y.tab.c" ++#line 2480 "perly.c" } yyssp -= yym; yystate = *yyssp; -@@ -2560,7 +2541,7 @@ +@@ -2563,7 +2542,7 @@ { #if YYDEBUG if (yydebug) @@ -390,7 +392,7 @@ state %d\n", YYFINAL); #endif yystate = YYFINAL; -@@ -2575,7 +2556,7 @@ +@@ -2578,7 +2557,7 @@ yys = 0; if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; if (!yys) yys = "illegal-symbol"; @@ -399,7 +401,7 @@ YYFINAL, yychar, yys); } #endif -@@ -2590,20 +2571,50 @@ +@@ -2593,20 +2572,50 @@ yystate = yydgoto[yym]; #if YYDEBUG if (yydebug) |