Index: perly.c
+*** perly.c.old Wed Jun 10 03:48:43 1998
+--- perly.c Wed Jun 10 03:55:10 1998
***************
-*** 13,82 ****
+*** 7,10 ****
+--- 7,18 ----
+ #include "perl.h"
+
++ #ifdef PERL_OBJECT
++ static void
++ Dep(CPerlObj *pPerl)
++ {
++ pPerl->deprecate("\"do\" to call subroutines");
++ }
++ #define dep() Dep(this)
++ #else
+ static void
+ dep(void)
+***************
+*** 12,82 ****
+ deprecate("\"do\" to call subroutines");
}
! #line 29 "perly.y"
! #define ARROW 314
#define YYERRCODE 256
short yylhs[] = { -1,
---- 13,17 ----
+--- 20,26 ----
+ deprecate("\"do\" to call subroutines");
}
++ #endif
! #line 16 "perly.c"
#define YYERRCODE 256
short yylhs[] = { -1,
***************
-*** 1348,1358 ****
+*** 1337,1361 ****
int yyerrflag;
int yychar;
- short *yyssp;
- short yyss[YYSTACKSIZE];
- YYSTYPE yyvs[YYSTACKSIZE];
- #define yystacksize YYSTACKSIZE
- #line 632 "perly.y"
+ #line 635 "perly.y"
/* PROGRAM */
---- 1283,1288 ----
-***************
-*** 1361,1372 ****
+! #line 1349 "y.tab.c"
+ #define YYABORT goto yyabort
#define YYACCEPT goto yyaccept
#define YYERROR goto yyerrlab
int
if (yys = getenv("YYDEBUG"))
{
---- 1291,1348 ----
+--- 1281,1347 ----
+ int yyerrflag;
+ int yychar;
+ YYSTYPE yyval;
+ YYSTYPE yylval;
+ #line 635 "perly.y"
+ /* PROGRAM */
+! #line 1349 "perly.c"
+ #define YYABORT goto yyabort
#define YYACCEPT goto yyaccept
#define YYERROR goto yyerrlab
+
+ #endif
+ #endif
+
-+ struct ysv *ysave = (struct ysv*)safemalloc(sizeof(struct ysv));
++ struct ysv *ysave;
++ New(73, ysave, 1, struct ysv);
+ SAVEDESTRUCTOR(yydestruct, ysave);
+ ysave->oldyydebug = yydebug;
+ ysave->oldyynerrs = yynerrs;
if (yys = getenv("YYDEBUG"))
{
***************
-*** 1381,1384 ****
---- 1357,1368 ----
+*** 1370,1373 ****
+--- 1356,1369 ----
yychar = (-1);
+ /*
+ ** Initialize private stacks (yyparse may be called from an action)
+ */
-+ ysave->yyss = yyss = (short*)safemalloc(yystacksize*sizeof(short));
-+ ysave->yyvs = yyvs = (YYSTYPE*)safemalloc(yystacksize*sizeof(YYSTYPE));
++ 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;
***************
-*** 1396,1400 ****
+*** 1385,1389 ****
if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
if (!yys) yys = "illegal-symbol";
! printf("yydebug: state %d, reading %d (%s)\n", yystate,
yychar, yys);
}
---- 1380,1384 ----
+--- 1381,1385 ----
if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
if (!yys) yys = "illegal-symbol";
-! fprintf(stderr, "yydebug: state %d, reading %d (%s)\n", yystate,
+! PerlIO_printf(Perl_debug_log, "yydebug: state %d, reading %d (%s)\n", yystate,
yychar, yys);
}
***************
-*** 1406,1415 ****
+*** 1395,1404 ****
#if YYDEBUG
if (yydebug)
! printf("yydebug: state %d, shifting to state %d\n",
! goto yyoverflow;
}
*++yyssp = yystate = yytable[yyn];
---- 1390,1413 ----
+--- 1391,1414 ----
#if YYDEBUG
if (yydebug)
-! fprintf(stderr, "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)
}
*++yyssp = yystate = yytable[yyn];
***************
-*** 1447,1456 ****
+*** 1436,1445 ****
#if YYDEBUG
if (yydebug)
! printf("yydebug: state %d, error recovery shifting\
! goto yyoverflow;
}
*++yyssp = yystate = yytable[yyn];
---- 1445,1469 ----
+--- 1446,1470 ----
#if YYDEBUG
if (yydebug)
-! fprintf(stderr,
+! PerlIO_printf(Perl_debug_log,
! "yydebug: state %d, error recovery shifting to state %d\n",
! *yyssp, yytable[yyn]);
#endif
}
*++yyssp = yystate = yytable[yyn];
***************
-*** 1462,1467 ****
+*** 1451,1456 ****
#if YYDEBUG
if (yydebug)
! printf("yydebug: error recovery discarding state %d\n",
! *yyssp);
#endif
if (yyssp <= yyss) goto yyabort;
---- 1475,1481 ----
+--- 1476,1482 ----
#if YYDEBUG
if (yydebug)
-! fprintf(stderr,
+! PerlIO_printf(Perl_debug_log,
! "yydebug: error recovery discarding state %d\n",
! *yyssp);
#endif
if (yyssp <= yyss) goto yyabort;
***************
-*** 1480,1485 ****
+*** 1469,1474 ****
if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
if (!yys) yys = "illegal-symbol";
! printf("yydebug: state %d, error recovery discards token %d (%s)\n",
! yystate, yychar, yys);
}
#endif
---- 1494,1500 ----
+--- 1495,1501 ----
if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
if (!yys) yys = "illegal-symbol";
-! fprintf(stderr,
+! PerlIO_printf(Perl_debug_log,
! "yydebug: state %d, error recovery discards token %d (%s)\n",
! yystate, yychar, yys);
}
#endif
***************
-*** 1490,1494 ****
+*** 1479,1483 ****
#if YYDEBUG
if (yydebug)
! printf("yydebug: state %d, reducing by rule %d (%s)\n",
yystate, yyn, yyrule[yyn]);
#endif
---- 1505,1509 ----
+--- 1506,1510 ----
#if YYDEBUG
if (yydebug)
-! fprintf(stderr, "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
***************
-*** 2279,2284 ****
+*** 2263,2267 ****
+ { yyval.opval = yyvsp[0].opval; }
+ break;
+! #line 2266 "y.tab.c"
+ }
+ yyssp -= yym;
+--- 2290,2294 ----
+ { yyval.opval = yyvsp[0].opval; }
+ break;
+! #line 2266 "perly.c"
+ }
+ yyssp -= yym;
+***************
+*** 2273,2278 ****
#if YYDEBUG
if (yydebug)
! printf("yydebug: after reduction, shifting from state 0 to\
! state %d\n", YYFINAL);
#endif
yystate = YYFINAL;
---- 2294,2300 ----
+--- 2300,2306 ----
#if YYDEBUG
if (yydebug)
-! fprintf(stderr,
+! PerlIO_printf(Perl_debug_log,
! "yydebug: after reduction, shifting from state 0 to state %d\n",
! YYFINAL);
#endif
yystate = YYFINAL;
***************
-*** 2294,2298 ****
+*** 2288,2292 ****
if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
if (!yys) yys = "illegal-symbol";
! printf("yydebug: state %d, reading %d (%s)\n",
YYFINAL, yychar, yys);
}
---- 2310,2314 ----
+--- 2316,2320 ----
if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
if (!yys) yys = "illegal-symbol";
-! fprintf(stderr, "yydebug: state %d, reading %d (%s)\n",
+! PerlIO_printf(Perl_debug_log, "yydebug: state %d, reading %d (%s)\n",
YYFINAL, yychar, yys);
}
***************
-*** 2309,2318 ****
+*** 2303,2312 ****
#if YYDEBUG
if (yydebug)
! printf("yydebug: after reduction, shifting from state %d \
! goto yyoverflow;
}
*++yyssp = yystate;
---- 2325,2349 ----
+--- 2331,2355 ----
#if YYDEBUG
if (yydebug)
-! fprintf(stderr,
+! PerlIO_printf(Perl_debug_log,
! "yydebug: after reduction, shifting from state %d to state %d\n",
! *yyssp, yystate);
#endif
}
*++yyssp = yystate;
***************
-*** 2320,2327 ****
+*** 2314,2321 ****
goto yyloop;
yyoverflow:
! yyerror("yacc stack overflow");
yyaccept:
! return (0);
}
---- 2351,2358 ----
+--- 2357,2364 ----
goto yyloop;
yyoverflow:
! yyerror("Out of memory for yacc stack");