X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=perly_c.diff;h=84c24f548877313ded5747b85816d64a1585905f;hb=475b40fdd42aeff1d8eaa6926314ced65a429639;hp=a1be10861e3a39a8ecc0e33cd52872a82667e39d;hpb=ed423f7afb5038546a92d00ca689992f3e08bc61;p=p5sagit%2Fp5-mst-13.2.git diff --git a/perly_c.diff b/perly_c.diff index a1be108..84c24f5 100644 --- a/perly_c.diff +++ b/perly_c.diff @@ -1,5 +1,5 @@ ---- perly.c.orig Mon Aug 5 15:02:10 2002 -+++ perly.c Mon Aug 5 15:08:41 2002 +--- y.tab.c Mon Sep 30 04:20:57 2002 ++++ perly.c Mon Sep 30 04:18:04 2002 @@ -1,5 +1,5 @@ #ifndef lint -static char yysccsid[] = "@(#)yaccpar 1.8 (Berkeley) 01/20/91"; @@ -92,8 +92,8 @@ 12, 12, 12, 25, 25, 25, 25, 25, 25, 25, 15, 15, 15, 14, 14, 43, 43, 13, 13, 13, @@ -137,7 +74,7 @@ - 49, 49, 49, 34, 34, 35, 35, 35, 44, 24, - 19, 20, 21, 22, 23, 36, 36, 36, 36, + 49, 49, 34, 34, 35, 35, 35, 44, 24, 19, + 20, 21, 22, 23, 36, 36, 36, 36, }; -short yylen[] = { 2, +static short yylen[] = { 2, @@ -101,68 +101,68 @@ 1, 2, 3, 1, 1, 3, 3, 3, 3, 3, 0, 2, 6, 7, 7, 0, 2, 8, 8, 10, @@ -159,7 +96,7 @@ - 1, 1, 1, 0, 1, 0, 1, 2, 1, 2, - 2, 2, 2, 2, 2, 1, 1, 1, 1, + 1, 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, 175, 0, 0, 156, + 0, 70, 0, 14, 3, 174, 0, 0, 155, 0, @@ -201,7 +138,7 @@ - 0, 32, 0, 0, 0, 22, 0, 0, 0, 31, - 5, 0, 30, 0, 0, 33, 0, 23, + 32, 0, 0, 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, 374, 98, 363, - 3, 12, 13, 70, 379, 289, 72, 73, 74, 75, - 76, 77, 78, 79, 295, 81, 296, 285, 287, 290, + 10, 11, 20, 103, 19, 2, 94, 373, 97, 362, + 3, 12, 13, 69, 378, 288, 71, 72, 73, 74, + 75, 76, 77, 78, 294, 80, 295, 284, 286, 289, @@ -209,7 +146,7 @@ - 196, 331, 156, 293, 275, 227, 14, 83, 137, 84, - 85, 86, 87, 15, 16, 17, 18, 93, 282, + 195, 330, 155, 292, 274, 226, 14, 82, 136, 83, + 84, 85, 86, 15, 16, 17, 18, 92, 281, }; -short yysindex[] = { 0, +static short yysindex[] = { 0, - 0, 0, -183, 0, 0, 0, -57, 0, 0, 0, - 0, 0, 0, 0, 820, 0, 0, 0, -222, -208, - 7, 0, 0, -208, 0, 0, 0, -31, -31, 0, + 0, 0, -236, 0, 0, 0, -231, 0, 0, 0, + 0, 0, 0, 0, 819, 0, 0, 0, -211, -209, + 3, 0, -209, 0, 0, 0, -32, -32, 0, 23, @@ -251,7 +188,7 @@ - 179, 0, 1860, -168, 352, 0, 2214, -168, 298, 0, - 0, 299, 0, 179, 179, 0, -256, 0, + 0, 1859, -173, 350, 0, 2213, -173, 360, 0, 0, + 361, 0, 221, 221, 0, -240, 0, }; -short yyrindex[] = { 0, +static short yyrindex[] = { 0, - 0, 0, 372, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 219, 0, + 0, 0, 371, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 289, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -293,7 +230,7 @@ - 0, 0, 370, 91, 881, 0, 0, 91, 0, 0, - 0, 0, 0, 0, 0, 0, 187, 0, + 0, 435, 90, 880, 0, 0, 90, 0, 0, 0, + 0, 0, 0, 0, 0, 186, 0, }; -short yygindex[] = { 0, +static short yygindex[] = { 0, - 0, 0, 29, 378, 0, 0, -55, 0, 676, 567, - -94, 0, 0, 0, -355, -15, 2480, 0, 650, 364, - 380, 0, 0, 0, 412, 755, 0, 0, 291, -202, + 0, 0, 50, 453, 0, 0, -22, 0, 63, 153, + -93, 0, 0, 0, -346, -15, 2480, 0, 1744, 437, + 439, 0, 0, 0, 481, 755, 0, 0, 341, -186, @@ -302,7 +239,7 @@ 0, 0, 0, 0, 0, 0, 0, 0, 0, }; - #define YYTABLESIZE 5052 --short yytable[] = { 71, -+static short yytable[] = { 71, - 199, 22, 60, 229, 65, 65, 222, 297, 60, 111, - 380, 200, 279, 329, 65, 300, 62, 64, 258, 377, - 378, 161, 15, 184, 161, 220, 230, 187, 65, 67, + #define YYTABLESIZE 5051 +-short yytable[] = { 70, ++static short yytable[] = { 70, + 198, 300, 75, 64, 60, 280, 228, 60, 279, 64, + 199, 328, 183, 257, 219, 62, 278, 64, 379, 186, + 75, 110, 296, 188, 15, 21, 197, 170, 64, 4, @@ -810,7 +747,7 @@ - 0, 0, 0, 0, 0, 115, 115, 115, 0, 115, - 115, 115, + 0, 0, 0, 0, 114, 114, 114, 0, 114, 114, + 114, }; -short yycheck[] = { 15, +static short yycheck[] = { 15, - 95, 59, 59, 41, 36, 36, 59, 210, 123, 40, - 366, 100, 201, 59, 36, 41, 59, 59, 40, 276, - 277, 41, 41, 40, 44, 40, 93, 91, 36, 37, + 94, 44, 41, 36, 59, 41, 41, 123, 44, 36, + 99, 59, 40, 40, 40, 59, 200, 36, 365, 91, + 59, 40, 209, 91, 41, 257, 93, 63, 59, 266, @@ -1324,7 +1261,7 @@ #endif #define YYMAXTOKEN 319 @@ -181,7 +181,7 @@ "$accept : prog", "prog : progstart lineseq", "block : '{' remember lineseq '}'", -@@ -1558,17 +1495,6 @@ +@@ -1557,17 +1494,6 @@ #define YYMAXDEPTH 500 #endif #endif @@ -196,19 +196,19 @@ -short yyss[YYSTACKSIZE]; -YYSTYPE yyvs[YYSTACKSIZE]; -#define yystacksize YYSTACKSIZE - #line 797 "perly.y" + #line 795 "perly.y" /* PROGRAM */ -@@ -1579,7 +1505,7 @@ +@@ -1578,7 +1504,7 @@ #endif #define yyparse() Perl_yyparse(pTHX) --#line 1583 "y.tab.c" -+#line 1509 "perly.c" +-#line 1582 "y.tab.c" ++#line 1582 "perly.c" #define YYABORT goto yyabort #define YYACCEPT goto yyaccept #define YYERROR goto yyerrlab -@@ -1587,11 +1513,31 @@ +@@ -1586,11 +1512,31 @@ yyparse() { register int yym, yyn, yystate; @@ -242,7 +242,7 @@ { yyn = *yys; if (yyn >= '0' && yyn <= '9') -@@ -1603,12 +1549,22 @@ +@@ -1602,12 +1548,22 @@ yyerrflag = 0; yychar = (-1); @@ -266,7 +266,7 @@ if (yychar < 0) { if ((yychar = yylex()) < 0) yychar = 0; -@@ -1618,7 +1574,7 @@ +@@ -1617,7 +1573,7 @@ yys = 0; if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; if (!yys) yys = "illegal-symbol"; @@ -275,7 +275,7 @@ yychar, yys); } #endif -@@ -1628,12 +1584,24 @@ +@@ -1627,12 +1583,24 @@ { #if YYDEBUG if (yydebug) @@ -301,7 +301,7 @@ } *++yyssp = yystate = yytable[yyn]; *++yyvsp = yylval; -@@ -1649,14 +1617,14 @@ +@@ -1648,14 +1616,14 @@ } if (yyerrflag) goto yyinrecovery; #ifdef lint @@ -320,7 +320,7 @@ ++yynerrs; yyinrecovery: if (yyerrflag < 3) -@@ -1669,12 +1637,24 @@ +@@ -1668,12 +1636,24 @@ { #if YYDEBUG if (yydebug) @@ -346,7 +346,7 @@ } *++yyssp = yystate = yytable[yyn]; *++yyvsp = yylval; -@@ -1684,7 +1664,7 @@ +@@ -1683,7 +1663,7 @@ { #if YYDEBUG if (yydebug) @@ -355,7 +355,7 @@ *yyssp); #endif if (yyssp <= yyss) goto yyabort; -@@ -1702,7 +1682,7 @@ +@@ -1701,7 +1681,7 @@ yys = 0; if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; if (!yys) yys = "illegal-symbol"; @@ -364,7 +364,7 @@ yystate, yychar, yys); } #endif -@@ -1712,7 +1692,7 @@ +@@ -1711,7 +1691,7 @@ yyreduce: #if YYDEBUG if (yydebug) @@ -373,16 +373,16 @@ yystate, yyn, yyrule[yyn]); #endif yym = yylen[yyn]; -@@ -2583,7 +2563,7 @@ - #line 794 "perly.y" +@@ -2578,7 +2558,7 @@ + #line 792 "perly.y" { yyval.opval = yyvsp[0].opval; } break; --#line 2587 "y.tab.c" -+#line 2567 "perly.c" +-#line 2582 "y.tab.c" ++#line 2582 "perly.c" } yyssp -= yym; yystate = *yyssp; -@@ -2593,7 +2573,7 @@ +@@ -2588,7 +2568,7 @@ { #if YYDEBUG if (yydebug) @@ -391,7 +391,7 @@ state %d\n", YYFINAL); #endif yystate = YYFINAL; -@@ -2608,7 +2588,7 @@ +@@ -2603,7 +2583,7 @@ yys = 0; if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; if (!yys) yys = "illegal-symbol"; @@ -400,7 +400,7 @@ YYFINAL, yychar, yys); } #endif -@@ -2623,20 +2603,50 @@ +@@ -2618,20 +2598,50 @@ yystate = yydgoto[yym]; #if YYDEBUG if (yydebug)