X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=perly.c.diff;h=f72163ec46703bf8d641c8c5147fa936d82dbf43;hb=91b7def858c29dac014df40946a128c06b3aa2ed;hp=4d8135309ae22e8833e0132db45d873a80d0f209;hpb=ed6116ce9b9d13712ea252ee248b0400653db7f9;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/perly.c.diff b/perly.c.diff
index 4d81353..f72163e 100644
--- a/perly.c.diff
+++ b/perly.c.diff
@@ -1,7 +1,81 @@
-*** perly.c.orig	Fri Jan 14 03:56:26 1994
---- perly.c	Sun Jan 16 18:29:19 1994
+*** perly.c.orig	Tue Nov 14 17:16:49 1995
+--- perly.c	Tue Nov 14 17:17:44 1995
 ***************
-*** 1635,1647 ****
+*** 12,82 ****
+      deprecate("\"do\" to call subroutines");
+  }
+  
+- #line 29 "perly.y"
+- typedef union {
+-     I32	ival;
+-     char *pval;
+-     OP *opval;
+-     GV *gvval;
+- } YYSTYPE;
+- #line 23 "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 RELOP 285
+- #define EQOP 286
+- #define MULOP 287
+- #define ADDOP 288
+- #define DOLSHARP 289
+- #define DO 290
+- #define LOCAL 291
+- #define HASHBRACK 292
+- #define NOAMP 293
+- #define OROP 294
+- #define ANDOP 295
+- #define NOTOP 296
+- #define LSTOP 297
+- #define ASSIGNOP 298
+- #define OROR 299
+- #define ANDAND 300
+- #define BITOROP 301
+- #define BITANDOP 302
+- #define UNIOP 303
+- #define SHIFTOP 304
+- #define MATCHOP 305
+- #define UMINUS 306
+- #define REFGEN 307
+- #define POWOP 308
+- #define PREINC 309
+- #define PREDEC 310
+- #define POSTINC 311
+- #define POSTDEC 312
+- #define ARROW 313
+  #define YYERRCODE 256
+  short yylhs[] = {                                        -1,
+     31,    0,    5,    3,    6,    6,    6,    7,    7,    7,
+--- 12,17 ----
+***************
+*** 1338,1350 ****
   int yynerrs;
   int yyerrflag;
   int yychar;
@@ -12,13 +86,45 @@
 - short yyss[YYSTACKSIZE];
 - YYSTYPE yyvs[YYSTACKSIZE];
 - #define yystacksize YYSTACKSIZE
-  #line 605 "perly.y"
+  #line 563 "perly.y"
    /* PROGRAM */
-  #line 1648 "y.tab.c"
---- 1635,1642 ----
+  #line 1351 "y.tab.c"
+--- 1273,1280 ----
 ***************
-*** 1652,1657 ****
---- 1647,1665 ----
+*** 1351,1364 ****
+--- 1281,1339 ----
+  #define YYABORT goto yyabort
+  #define YYACCEPT goto yyaccept
+  #define YYERROR goto yyerrlab
++ 
++ struct ysv {
++     short* yyss;
++     YYSTYPE* yyvs;
++     int oldyydebug;
++     int oldyynerrs;
++     int oldyyerrflag;
++     int oldyychar;
++     YYSTYPE oldyyval;
++     YYSTYPE oldyylval;
++ };
++ 
++ void
++ yydestruct(ptr)
++ 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);
++ }
++ 
+  int
   yyparse()
   {
       register int yym, yyn, yystate;
@@ -27,28 +133,36 @@
 +     short* yyss;
 +     YYSTYPE* yyvs;
 +     unsigned yystacksize = YYSTACKSIZE;
-+     int oldyydebug	= yydebug;
-+     int oldyynerrs	= yynerrs;
-+     int oldyyerrflag	= yyerrflag;
-+     int oldyychar	= yychar;
-+     YYSTYPE oldyyval	= yyval;
-+     YYSTYPE oldyylval	= yylval;
 +     int retval = 0;
-+ 
   #if YYDEBUG
       register char *yys;
       extern char *getenv();
++ #endif
+  
++     struct ysv *ysave = (struct ysv*)safemalloc(sizeof(struct ysv));
++     SAVEDESTRUCTOR(yydestruct, ysave);
++     ysave->oldyydebug	= yydebug;
++     ysave->oldyynerrs	= yynerrs;
++     ysave->oldyyerrflag	= yyerrflag;
++     ysave->oldyychar	= yychar;
++     ysave->oldyyval	= yyval;
++     ysave->oldyylval	= yylval;
++ 
++ #if YYDEBUG
+      if (yys = getenv("YYDEBUG"))
+      {
+          yyn = *yys;
 ***************
-*** 1668,1673 ****
---- 1676,1689 ----
+*** 1371,1376 ****
+--- 1346,1359 ----
       yyerrflag = 0;
       yychar = (-1);
   
 +     /*
 +     ** Initialize private stacks (yyparse may be called from an action)
 +     */
-+     yyss = (short*)malloc(yystacksize*sizeof(short));
-+     yyvs = (YYSTYPE*)malloc(yystacksize*sizeof(YYSTYPE));
++     ysave->yyss = yyss = (short*)safemalloc(yystacksize*sizeof(short));
++     ysave->yyvs = yyvs = (YYSTYPE*)safemalloc(yystacksize*sizeof(YYSTYPE));
 +     if (!yyvs || !yyss)
 + 	goto yyoverflow;
 + 
@@ -56,7 +170,7 @@
       yyvsp = yyvs;
       *yyssp = yystate = 0;
 ***************
-*** 1683,1689 ****
+*** 1386,1392 ****
               yys = 0;
               if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
               if (!yys) yys = "illegal-symbol";
@@ -64,7 +178,7 @@
                       yychar, yys);
           }
   #endif
---- 1699,1705 ----
+--- 1369,1375 ----
               yys = 0;
               if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
               if (!yys) yys = "illegal-symbol";
@@ -73,7 +187,7 @@
           }
   #endif
 ***************
-*** 1693,1704 ****
+*** 1396,1407 ****
       {
   #if YYDEBUG
           if (yydebug)
@@ -86,7 +200,7 @@
           }
           *++yyssp = yystate = yytable[yyn];
           *++yyvsp = yylval;
---- 1709,1732 ----
+--- 1379,1404 ----
       {
   #if YYDEBUG
           if (yydebug)
@@ -102,8 +216,10 @@
 ! 	    int yyps_index = (yyssp - yyss);
 ! 	    int yypv_index = (yyvsp - yyvs);
 ! 	    yystacksize += YYSTACKSIZE;
-! 	    yyvs = (YYSTYPE*)realloc((char*)yyvs,yystacksize * sizeof(YYSTYPE));
-! 	    yyss = (short*)realloc((char*)yyss,yystacksize * sizeof(short));
+! 	    ysave->yyvs = yyvs =
+! 		(YYSTYPE*)realloc((char*)yyvs,yystacksize * sizeof(YYSTYPE));
+! 	    ysave->yyss = yyss =
+! 		(short*)realloc((char*)yyss,yystacksize * sizeof(short));
 ! 	    if (!yyvs || !yyss)
 ! 		goto yyoverflow;
 ! 	    yyssp = yyss + yyps_index;
@@ -112,7 +228,7 @@
           *++yyssp = yystate = yytable[yyn];
           *++yyvsp = yylval;
 ***************
-*** 1734,1745 ****
+*** 1437,1448 ****
               {
   #if YYDEBUG
                   if (yydebug)
@@ -125,7 +241,7 @@
                   }
                   *++yyssp = yystate = yytable[yyn];
                   *++yyvsp = yylval;
---- 1762,1788 ----
+--- 1434,1460 ----
               {
   #if YYDEBUG
                   if (yydebug)
@@ -142,9 +258,9 @@
 ! 		    int yyps_index = (yyssp - yyss);
 ! 		    int yypv_index = (yyvsp - yyvs);
 ! 		    yystacksize += YYSTACKSIZE;
-! 		    yyvs = (YYSTYPE*)realloc((char*)yyvs,
+! 		    ysave->yyvs = yyvs = (YYSTYPE*)realloc((char*)yyvs,
 ! 			yystacksize * sizeof(YYSTYPE));
-! 		    yyss = (short*)realloc((char*)yyss,
+! 		    ysave->yyss = yyss = (short*)realloc((char*)yyss,
 ! 			yystacksize * sizeof(short));
 ! 		    if (!yyvs || !yyss)
 ! 			goto yyoverflow;
@@ -154,7 +270,7 @@
                   *++yyssp = yystate = yytable[yyn];
                   *++yyvsp = yylval;
 ***************
-*** 1749,1756 ****
+*** 1452,1459 ****
               {
   #if YYDEBUG
                   if (yydebug)
@@ -163,7 +279,7 @@
   #endif
                   if (yyssp <= yyss) goto yyabort;
                   --yyssp;
---- 1792,1800 ----
+--- 1464,1472 ----
               {
   #if YYDEBUG
                   if (yydebug)
@@ -174,7 +290,7 @@
                   if (yyssp <= yyss) goto yyabort;
                   --yyssp;
 ***************
-*** 1767,1774 ****
+*** 1470,1477 ****
               yys = 0;
               if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
               if (!yys) yys = "illegal-symbol";
@@ -183,7 +299,7 @@
           }
   #endif
           yychar = (-1);
---- 1811,1819 ----
+--- 1483,1491 ----
               yys = 0;
               if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
               if (!yys) yys = "illegal-symbol";
@@ -194,7 +310,7 @@
   #endif
           yychar = (-1);
 ***************
-*** 1777,1783 ****
+*** 1480,1486 ****
   yyreduce:
   #if YYDEBUG
       if (yydebug)
@@ -202,7 +318,7 @@
                   yystate, yyn, yyrule[yyn]);
   #endif
       yym = yylen[yyn];
---- 1822,1828 ----
+--- 1494,1500 ----
   yyreduce:
   #if YYDEBUG
       if (yydebug)
@@ -211,7 +327,7 @@
   #endif
       yym = yylen[yyn];
 ***************
-*** 2529,2536 ****
+*** 2189,2196 ****
       {
   #if YYDEBUG
           if (yydebug)
@@ -220,7 +336,7 @@
   #endif
           yystate = YYFINAL;
           *++yyssp = YYFINAL;
---- 2574,2582 ----
+--- 2203,2211 ----
       {
   #if YYDEBUG
           if (yydebug)
@@ -231,7 +347,7 @@
           yystate = YYFINAL;
           *++yyssp = YYFINAL;
 ***************
-*** 2544,2550 ****
+*** 2204,2210 ****
                   yys = 0;
                   if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
                   if (!yys) yys = "illegal-symbol";
@@ -239,7 +355,7 @@
                           YYFINAL, yychar, yys);
               }
   #endif
---- 2590,2596 ----
+--- 2219,2225 ----
                   yys = 0;
                   if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
                   if (!yys) yys = "illegal-symbol";
@@ -248,7 +364,7 @@
               }
   #endif
 ***************
-*** 2559,2578 ****
+*** 2219,2238 ****
           yystate = yydgoto[yym];
   #if YYDEBUG
       if (yydebug)
@@ -269,7 +385,7 @@
   yyaccept:
 !     return (0);
   }
---- 2605,2645 ----
+--- 2234,2268 ----
           yystate = yydgoto[yym];
   #if YYDEBUG
       if (yydebug)
@@ -286,8 +402,10 @@
 ! 	int yyps_index = (yyssp - yyss);
 ! 	int yypv_index = (yyvsp - yyvs);
 ! 	yystacksize += YYSTACKSIZE;
-! 	yyvs = (YYSTYPE*)realloc((char*)yyvs,yystacksize * sizeof(YYSTYPE));
-! 	yyss = (short*)realloc((char*)yyss,yystacksize * sizeof(short));
+! 	ysave->yyvs = yyvs =
+! 	    (YYSTYPE*)realloc((char*)yyvs,yystacksize * sizeof(YYSTYPE));
+! 	ysave->yyss = yyss =
+! 	    (short*)realloc((char*)yyss,yystacksize * sizeof(short));
 ! 	if (!yyvs || !yyss)
 ! 	    goto yyoverflow;
 ! 	yyssp = yyss + yyps_index;
@@ -301,13 +419,5 @@
   yyabort:
 !     retval = 1;
   yyaccept:
-!     if (yyss) free(yyss);
-!     if (yyvs) free(yyvs);
-!     yydebug	= oldyydebug;
-!     yynerrs	= oldyynerrs;
-!     yyerrflag	= oldyyerrflag;
-!     yychar	= oldyychar;
-!     yyval	= oldyyval;
-!     yylval	= oldyylval;
 !     return retval;
   }