forked from schacon/perl
-
Notifications
You must be signed in to change notification settings - Fork 0
/
perly_c.diff
456 lines (448 loc) · 13.9 KB
/
perly_c.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
--- perly.c.orig Wed May 10 18:57:57 2006
+++ perly.c Wed May 10 18:57:57 2006
@@ -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 25 "perly.y"
@@ -9,7 +9,7 @@
#ifdef EBCDIC
#undef YYDEBUG
#endif
-#define dep() deprecate("\"do\" to call subroutines")
+#define dep() deprecate_old("\"do\" to call subroutines")
/* stuff included here to make perly_c.diff apply better */
@@ -50,71 +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 REQUIRE 298
-#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 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,
};
-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,
};
-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,
};
-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,
};
-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,
};
-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, 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,
};
-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, 0, 0, 0, 0, 0, 0, 0,
};
#define YYTABLESIZE 4871
-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,
};
-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 @@
#endif
#define YYMAXTOKEN 318
#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",
};
-char *yyrule[] = {
+static char *yyrule[] = {
"$accept : prog",
"prog : progstart lineseq",
"block : '{' remember lineseq '}'",
@@ -1521,17 +1459,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 812 "perly.y"
/* PROGRAM */
@@ -1542,7 +1469,7 @@
#endif
#define yyparse() Perl_yyparse(pTHX)
-#line 1546 "y.tab.c"
+#line 1473 "perly.c"
#define YYABORT goto yyabort
#define YYACCEPT goto yyaccept
#define YYERROR goto yyerrlab
@@ -1550,11 +1477,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')
@@ -1566,12 +1513,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;
@@ -1581,7 +1538,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
@@ -1591,12 +1548,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;
@@ -1612,14 +1581,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)
@@ -1632,12 +1601,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;
@@ -1647,7 +1628,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;
@@ -1665,7 +1646,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
@@ -1675,7 +1656,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];
@@ -2550,7 +2531,7 @@
#line 809 "perly.y"
{ yyval.opval = yyvsp[0].opval; }
break;
-#line 2554 "y.tab.c"
+#line 2535 "perly.c"
}
yyssp -= yym;
yystate = *yyssp;
@@ -2560,7 +2541,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;
@@ -2575,7 +2556,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
@@ -2590,20 +2571,50 @@
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;
+}
+
+static void
+yydestruct(pTHX_ 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);
}