diff options
Diffstat (limited to 'test/yacc')
77 files changed, 924 insertions, 328 deletions
diff --git a/test/yacc/big_b.error b/test/yacc/big_b.error index 7019fded376d..6c3442bef994 100644 --- a/test/yacc/big_b.error +++ b/test/yacc/big_b.error @@ -5,6 +5,7 @@ Options: -b file_prefix set filename prefix (default "y.") -B create a backtracking parser -d write definitions (.tab.h) + -h print this help-message -H defines_file write definitions to defines_file -i write interface (y.tab.i) -g write a graphical description @@ -18,3 +19,13 @@ Options: -t add debugging support -v write description (y.output) -V show version information and exit + +Long options: + --defines -H + --file-prefix -b + --graph -g + --help -h + --name-prefix -p + --no-lines -l + --output -o + --version -V diff --git a/test/yacc/big_l.error b/test/yacc/big_l.error index be9f02a84acb..8ca42217c68b 100644 --- a/test/yacc/big_l.error +++ b/test/yacc/big_l.error @@ -5,6 +5,7 @@ Options: -b file_prefix set filename prefix (default "y.") -B create a backtracking parser -d write definitions (.tab.h) + -h print this help-message -H defines_file write definitions to defines_file -i write interface (y.tab.i) -g write a graphical description @@ -18,3 +19,13 @@ Options: -t add debugging support -v write description (y.output) -V show version information and exit + +Long options: + --defines -H + --file-prefix -b + --graph -g + --help -h + --name-prefix -p + --no-lines -l + --output -o + --version -V diff --git a/test/yacc/calc.tab.c b/test/yacc/calc.tab.c index 817bd006f8c6..22f387c2f096 100644 --- a/test/yacc/calc.tab.c +++ b/test/yacc/calc.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) @@ -150,7 +150,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, @@ -427,8 +427,8 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; @@ -554,64 +554,79 @@ yyreduce: case 3: #line 28 "calc.y" { yyerrok ; } +#line 558 "calc.tab.c" break; case 4: #line 32 "calc.y" { printf("%d\n",yystack.l_mark[0]);} +#line 563 "calc.tab.c" break; case 5: #line 34 "calc.y" { regs[yystack.l_mark[-2]] = yystack.l_mark[0]; } +#line 568 "calc.tab.c" break; case 6: #line 38 "calc.y" { yyval = yystack.l_mark[-1]; } +#line 573 "calc.tab.c" break; case 7: #line 40 "calc.y" { yyval = yystack.l_mark[-2] + yystack.l_mark[0]; } +#line 578 "calc.tab.c" break; case 8: #line 42 "calc.y" { yyval = yystack.l_mark[-2] - yystack.l_mark[0]; } +#line 583 "calc.tab.c" break; case 9: #line 44 "calc.y" { yyval = yystack.l_mark[-2] * yystack.l_mark[0]; } +#line 588 "calc.tab.c" break; case 10: #line 46 "calc.y" { yyval = yystack.l_mark[-2] / yystack.l_mark[0]; } +#line 593 "calc.tab.c" break; case 11: #line 48 "calc.y" { yyval = yystack.l_mark[-2] % yystack.l_mark[0]; } +#line 598 "calc.tab.c" break; case 12: #line 50 "calc.y" { yyval = yystack.l_mark[-2] & yystack.l_mark[0]; } +#line 603 "calc.tab.c" break; case 13: #line 52 "calc.y" { yyval = yystack.l_mark[-2] | yystack.l_mark[0]; } +#line 608 "calc.tab.c" break; case 14: #line 54 "calc.y" { yyval = - yystack.l_mark[0]; } +#line 613 "calc.tab.c" break; case 15: #line 56 "calc.y" { yyval = regs[yystack.l_mark[0]]; } +#line 618 "calc.tab.c" break; case 17: #line 61 "calc.y" { yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; } +#line 623 "calc.tab.c" break; case 18: #line 63 "calc.y" { yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; } +#line 628 "calc.tab.c" break; -#line 615 "calc.tab.c" +#line 630 "calc.tab.c" } yystack.s_mark -= yym; yystate = *yystack.s_mark; diff --git a/test/yacc/calc1.tab.c b/test/yacc/calc1.tab.c index eda1d00cc330..3f704400d84d 100644 --- a/test/yacc/calc1.tab.c +++ b/test/yacc/calc1.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) @@ -130,7 +130,7 @@ INTERVAL vreg[26]; #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 #line 31 "calc1.y" -typedef union +typedef union YYSTYPE { int ival; double dval; @@ -175,7 +175,7 @@ extern int YYPARSE_DECL(); #define CONST 259 #define UMINUS 260 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc1_lhs[] = { -1, 3, 3, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, @@ -564,8 +564,8 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; @@ -693,78 +693,91 @@ case 3: { (void) printf("%15.8f\n", yystack.l_mark[-1].dval); } +#line 697 "calc1.tab.c" break; case 4: #line 61 "calc1.y" { (void) printf("(%15.8f, %15.8f)\n", yystack.l_mark[-1].vval.lo, yystack.l_mark[-1].vval.hi); } +#line 704 "calc1.tab.c" break; case 5: #line 65 "calc1.y" { dreg[yystack.l_mark[-3].ival] = yystack.l_mark[-1].dval; } +#line 711 "calc1.tab.c" break; case 6: #line 69 "calc1.y" { vreg[yystack.l_mark[-3].ival] = yystack.l_mark[-1].vval; } +#line 718 "calc1.tab.c" break; case 7: #line 73 "calc1.y" { yyerrok; } +#line 725 "calc1.tab.c" break; case 9: #line 80 "calc1.y" { yyval.dval = dreg[yystack.l_mark[0].ival]; } +#line 732 "calc1.tab.c" break; case 10: #line 84 "calc1.y" { yyval.dval = yystack.l_mark[-2].dval + yystack.l_mark[0].dval; } +#line 739 "calc1.tab.c" break; case 11: #line 88 "calc1.y" { yyval.dval = yystack.l_mark[-2].dval - yystack.l_mark[0].dval; } +#line 746 "calc1.tab.c" break; case 12: #line 92 "calc1.y" { yyval.dval = yystack.l_mark[-2].dval * yystack.l_mark[0].dval; } +#line 753 "calc1.tab.c" break; case 13: #line 96 "calc1.y" { yyval.dval = yystack.l_mark[-2].dval / yystack.l_mark[0].dval; } +#line 760 "calc1.tab.c" break; case 14: #line 100 "calc1.y" { yyval.dval = -yystack.l_mark[0].dval; } +#line 767 "calc1.tab.c" break; case 15: #line 104 "calc1.y" { yyval.dval = yystack.l_mark[-1].dval; } +#line 774 "calc1.tab.c" break; case 16: #line 110 "calc1.y" { yyval.vval.hi = yyval.vval.lo = yystack.l_mark[0].dval; } +#line 781 "calc1.tab.c" break; case 17: #line 114 "calc1.y" @@ -777,12 +790,14 @@ case 17: YYERROR; } } +#line 794 "calc1.tab.c" break; case 18: #line 124 "calc1.y" { yyval.vval = vreg[yystack.l_mark[0].ival]; } +#line 801 "calc1.tab.c" break; case 19: #line 128 "calc1.y" @@ -790,6 +805,7 @@ case 19: yyval.vval.hi = yystack.l_mark[-2].vval.hi + yystack.l_mark[0].vval.hi; yyval.vval.lo = yystack.l_mark[-2].vval.lo + yystack.l_mark[0].vval.lo; } +#line 809 "calc1.tab.c" break; case 20: #line 133 "calc1.y" @@ -797,6 +813,7 @@ case 20: yyval.vval.hi = yystack.l_mark[-2].dval + yystack.l_mark[0].vval.hi; yyval.vval.lo = yystack.l_mark[-2].dval + yystack.l_mark[0].vval.lo; } +#line 817 "calc1.tab.c" break; case 21: #line 138 "calc1.y" @@ -804,6 +821,7 @@ case 21: yyval.vval.hi = yystack.l_mark[-2].vval.hi - yystack.l_mark[0].vval.lo; yyval.vval.lo = yystack.l_mark[-2].vval.lo - yystack.l_mark[0].vval.hi; } +#line 825 "calc1.tab.c" break; case 22: #line 143 "calc1.y" @@ -811,18 +829,21 @@ case 22: yyval.vval.hi = yystack.l_mark[-2].dval - yystack.l_mark[0].vval.lo; yyval.vval.lo = yystack.l_mark[-2].dval - yystack.l_mark[0].vval.hi; } +#line 833 "calc1.tab.c" break; case 23: #line 148 "calc1.y" { yyval.vval = vmul( yystack.l_mark[-2].vval.lo, yystack.l_mark[-2].vval.hi, yystack.l_mark[0].vval ); } +#line 840 "calc1.tab.c" break; case 24: #line 152 "calc1.y" { yyval.vval = vmul (yystack.l_mark[-2].dval, yystack.l_mark[-2].dval, yystack.l_mark[0].vval ); } +#line 847 "calc1.tab.c" break; case 25: #line 156 "calc1.y" @@ -830,6 +851,7 @@ case 25: if (dcheck(yystack.l_mark[0].vval)) YYERROR; yyval.vval = vdiv ( yystack.l_mark[-2].vval.lo, yystack.l_mark[-2].vval.hi, yystack.l_mark[0].vval ); } +#line 855 "calc1.tab.c" break; case 26: #line 161 "calc1.y" @@ -837,6 +859,7 @@ case 26: if (dcheck ( yystack.l_mark[0].vval )) YYERROR; yyval.vval = vdiv (yystack.l_mark[-2].dval, yystack.l_mark[-2].dval, yystack.l_mark[0].vval ); } +#line 863 "calc1.tab.c" break; case 27: #line 166 "calc1.y" @@ -844,14 +867,16 @@ case 27: yyval.vval.hi = -yystack.l_mark[0].vval.lo; yyval.vval.lo = -yystack.l_mark[0].vval.hi; } +#line 871 "calc1.tab.c" break; case 28: #line 171 "calc1.y" { yyval.vval = yystack.l_mark[-1].vval; } +#line 878 "calc1.tab.c" break; -#line 855 "calc1.tab.c" +#line 880 "calc1.tab.c" } yystack.s_mark -= yym; yystate = *yystack.s_mark; diff --git a/test/yacc/calc1.tab.h b/test/yacc/calc1.tab.h index c0633e37dfa8..dd493d013c26 100644 --- a/test/yacc/calc1.tab.h +++ b/test/yacc/calc1.tab.h @@ -8,7 +8,7 @@ #endif #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 -typedef union +typedef union YYSTYPE { int ival; double dval; diff --git a/test/yacc/calc2.tab.c b/test/yacc/calc2.tab.c index e2ab6f00dc64..62202c424b13 100644 --- a/test/yacc/calc2.tab.c +++ b/test/yacc/calc2.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) @@ -152,7 +152,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc2_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, @@ -440,8 +440,8 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; @@ -567,64 +567,79 @@ yyreduce: case 3: #line 35 "calc2.y" { yyerrok ; } +#line 571 "calc2.tab.c" break; case 4: #line 39 "calc2.y" { printf("%d\n",yystack.l_mark[0]);} +#line 576 "calc2.tab.c" break; case 5: #line 41 "calc2.y" { regs[yystack.l_mark[-2]] = yystack.l_mark[0]; } +#line 581 "calc2.tab.c" break; case 6: #line 45 "calc2.y" { yyval = yystack.l_mark[-1]; } +#line 586 "calc2.tab.c" break; case 7: #line 47 "calc2.y" { yyval = yystack.l_mark[-2] + yystack.l_mark[0]; } +#line 591 "calc2.tab.c" break; case 8: #line 49 "calc2.y" { yyval = yystack.l_mark[-2] - yystack.l_mark[0]; } +#line 596 "calc2.tab.c" break; case 9: #line 51 "calc2.y" { yyval = yystack.l_mark[-2] * yystack.l_mark[0]; } +#line 601 "calc2.tab.c" break; case 10: #line 53 "calc2.y" { yyval = yystack.l_mark[-2] / yystack.l_mark[0]; } +#line 606 "calc2.tab.c" break; case 11: #line 55 "calc2.y" { yyval = yystack.l_mark[-2] % yystack.l_mark[0]; } +#line 611 "calc2.tab.c" break; case 12: #line 57 "calc2.y" { yyval = yystack.l_mark[-2] & yystack.l_mark[0]; } +#line 616 "calc2.tab.c" break; case 13: #line 59 "calc2.y" { yyval = yystack.l_mark[-2] | yystack.l_mark[0]; } +#line 621 "calc2.tab.c" break; case 14: #line 61 "calc2.y" { yyval = - yystack.l_mark[0]; } +#line 626 "calc2.tab.c" break; case 15: #line 63 "calc2.y" { yyval = regs[yystack.l_mark[0]]; } +#line 631 "calc2.tab.c" break; case 17: #line 68 "calc2.y" { yyval = yystack.l_mark[0]; (*base) = (yystack.l_mark[0]==0) ? 8 : 10; } +#line 636 "calc2.tab.c" break; case 18: #line 70 "calc2.y" { yyval = (*base) * yystack.l_mark[-1] + yystack.l_mark[0]; } +#line 641 "calc2.tab.c" break; -#line 628 "calc2.tab.c" +#line 643 "calc2.tab.c" } yystack.s_mark -= yym; yystate = *yystack.s_mark; diff --git a/test/yacc/calc3.tab.c b/test/yacc/calc3.tab.c index bfabb4acaa50..eb487785e562 100644 --- a/test/yacc/calc3.tab.c +++ b/test/yacc/calc3.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) @@ -157,7 +157,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc3_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, @@ -448,8 +448,8 @@ YYPARSE_DECL() memset(&yyval, 0, sizeof(yyval)); memset(&yylval, 0, sizeof(yylval)); - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; @@ -575,64 +575,79 @@ yyreduce: case 3: #line 38 "calc3.y" { yyerrok ; } +#line 579 "calc3.tab.c" break; case 4: #line 42 "calc3.y" { printf("%d\n",yystack.l_mark[0]);} +#line 584 "calc3.tab.c" break; case 5: #line 44 "calc3.y" { regs[yystack.l_mark[-2]] = yystack.l_mark[0]; } +#line 589 "calc3.tab.c" break; case 6: #line 48 "calc3.y" { yyval = yystack.l_mark[-1]; } +#line 594 "calc3.tab.c" break; case 7: #line 50 "calc3.y" { yyval = yystack.l_mark[-2] + yystack.l_mark[0]; } +#line 599 "calc3.tab.c" break; case 8: #line 52 "calc3.y" { yyval = yystack.l_mark[-2] - yystack.l_mark[0]; } +#line 604 "calc3.tab.c" break; case 9: #line 54 "calc3.y" { yyval = yystack.l_mark[-2] * yystack.l_mark[0]; } +#line 609 "calc3.tab.c" break; case 10: #line 56 "calc3.y" { yyval = yystack.l_mark[-2] / yystack.l_mark[0]; } +#line 614 "calc3.tab.c" break; case 11: #line 58 "calc3.y" { yyval = yystack.l_mark[-2] % yystack.l_mark[0]; } +#line 619 "calc3.tab.c" break; case 12: #line 60 "calc3.y" { yyval = yystack.l_mark[-2] & yystack.l_mark[0]; } +#line 624 "calc3.tab.c" break; case 13: #line 62 "calc3.y" { yyval = yystack.l_mark[-2] | yystack.l_mark[0]; } +#line 629 "calc3.tab.c" break; case 14: #line 64 "calc3.y" { yyval = - yystack.l_mark[0]; } +#line 634 "calc3.tab.c" break; case 15: #line 66 "calc3.y" { yyval = regs[yystack.l_mark[0]]; } +#line 639 "calc3.tab.c" break; case 17: #line 71 "calc3.y" { yyval = yystack.l_mark[0]; (*base) = (yystack.l_mark[0]==0) ? 8 : 10; } +#line 644 "calc3.tab.c" break; case 18: #line 73 "calc3.y" { yyval = (*base) * yystack.l_mark[-1] + yystack.l_mark[0]; } +#line 649 "calc3.tab.c" break; -#line 636 "calc3.tab.c" +#line 651 "calc3.tab.c" } yystack.s_mark -= yym; yystate = *yystack.s_mark; diff --git a/test/yacc/calc_code_all.tab.c b/test/yacc/calc_code_all.tab.c index c17272f11e27..423189b7025a 100644 --- a/test/yacc/calc_code_all.tab.c +++ b/test/yacc/calc_code_all.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) @@ -156,7 +156,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc_code_all_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, @@ -455,8 +455,8 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; @@ -582,64 +582,79 @@ yyreduce: case 3: #line 35 "calc_code_all.y" { yyerrok ; } +#line 586 "calc_code_all.tab.c" break; case 4: #line 39 "calc_code_all.y" { printf("%d\n",yystack.l_mark[0]);} +#line 591 "calc_code_all.tab.c" break; case 5: #line 41 "calc_code_all.y" { regs[yystack.l_mark[-2]] = yystack.l_mark[0]; } +#line 596 "calc_code_all.tab.c" break; case 6: #line 45 "calc_code_all.y" { yyval = yystack.l_mark[-1]; } +#line 601 "calc_code_all.tab.c" break; case 7: #line 47 "calc_code_all.y" { yyval = yystack.l_mark[-2] + yystack.l_mark[0]; } +#line 606 "calc_code_all.tab.c" break; case 8: #line 49 "calc_code_all.y" { yyval = yystack.l_mark[-2] - yystack.l_mark[0]; } +#line 611 "calc_code_all.tab.c" break; case 9: #line 51 "calc_code_all.y" { yyval = yystack.l_mark[-2] * yystack.l_mark[0]; } +#line 616 "calc_code_all.tab.c" break; case 10: #line 53 "calc_code_all.y" { yyval = yystack.l_mark[-2] / yystack.l_mark[0]; } +#line 621 "calc_code_all.tab.c" break; case 11: #line 55 "calc_code_all.y" { yyval = yystack.l_mark[-2] % yystack.l_mark[0]; } +#line 626 "calc_code_all.tab.c" break; case 12: #line 57 "calc_code_all.y" { yyval = yystack.l_mark[-2] & yystack.l_mark[0]; } +#line 631 "calc_code_all.tab.c" break; case 13: #line 59 "calc_code_all.y" { yyval = yystack.l_mark[-2] | yystack.l_mark[0]; } +#line 636 "calc_code_all.tab.c" break; case 14: #line 61 "calc_code_all.y" { yyval = - yystack.l_mark[0]; } +#line 641 "calc_code_all.tab.c" break; case 15: #line 63 "calc_code_all.y" { yyval = regs[yystack.l_mark[0]]; } +#line 646 "calc_code_all.tab.c" break; case 17: #line 68 "calc_code_all.y" { yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; } +#line 651 "calc_code_all.tab.c" break; case 18: #line 70 "calc_code_all.y" { yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; } +#line 656 "calc_code_all.tab.c" break; -#line 643 "calc_code_all.tab.c" +#line 658 "calc_code_all.tab.c" } yystack.s_mark -= yym; yystate = *yystack.s_mark; diff --git a/test/yacc/calc_code_default.tab.c b/test/yacc/calc_code_default.tab.c index 275c0da8afe6..cf4e7e65261d 100644 --- a/test/yacc/calc_code_default.tab.c +++ b/test/yacc/calc_code_default.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) @@ -150,7 +150,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc_code_default_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, @@ -435,8 +435,8 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; @@ -562,64 +562,79 @@ yyreduce: case 3: #line 31 "calc_code_default.y" { yyerrok ; } +#line 566 "calc_code_default.tab.c" break; case 4: #line 35 "calc_code_default.y" { printf("%d\n",yystack.l_mark[0]);} +#line 571 "calc_code_default.tab.c" break; case 5: #line 37 "calc_code_default.y" { regs[yystack.l_mark[-2]] = yystack.l_mark[0]; } +#line 576 "calc_code_default.tab.c" break; case 6: #line 41 "calc_code_default.y" { yyval = yystack.l_mark[-1]; } +#line 581 "calc_code_default.tab.c" break; case 7: #line 43 "calc_code_default.y" { yyval = yystack.l_mark[-2] + yystack.l_mark[0]; } +#line 586 "calc_code_default.tab.c" break; case 8: #line 45 "calc_code_default.y" { yyval = yystack.l_mark[-2] - yystack.l_mark[0]; } +#line 591 "calc_code_default.tab.c" break; case 9: #line 47 "calc_code_default.y" { yyval = yystack.l_mark[-2] * yystack.l_mark[0]; } +#line 596 "calc_code_default.tab.c" break; case 10: #line 49 "calc_code_default.y" { yyval = yystack.l_mark[-2] / yystack.l_mark[0]; } +#line 601 "calc_code_default.tab.c" break; case 11: #line 51 "calc_code_default.y" { yyval = yystack.l_mark[-2] % yystack.l_mark[0]; } +#line 606 "calc_code_default.tab.c" break; case 12: #line 53 "calc_code_default.y" { yyval = yystack.l_mark[-2] & yystack.l_mark[0]; } +#line 611 "calc_code_default.tab.c" break; case 13: #line 55 "calc_code_default.y" { yyval = yystack.l_mark[-2] | yystack.l_mark[0]; } +#line 616 "calc_code_default.tab.c" break; case 14: #line 57 "calc_code_default.y" { yyval = - yystack.l_mark[0]; } +#line 621 "calc_code_default.tab.c" break; case 15: #line 59 "calc_code_default.y" { yyval = regs[yystack.l_mark[0]]; } +#line 626 "calc_code_default.tab.c" break; case 17: #line 64 "calc_code_default.y" { yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; } +#line 631 "calc_code_default.tab.c" break; case 18: #line 66 "calc_code_default.y" { yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; } +#line 636 "calc_code_default.tab.c" break; -#line 623 "calc_code_default.tab.c" +#line 638 "calc_code_default.tab.c" } yystack.s_mark -= yym; yystate = *yystack.s_mark; diff --git a/test/yacc/calc_code_imports.tab.c b/test/yacc/calc_code_imports.tab.c index 1ef6ad019c17..ddd89c35969b 100644 --- a/test/yacc/calc_code_imports.tab.c +++ b/test/yacc/calc_code_imports.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) @@ -150,7 +150,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc_code_imports_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, @@ -427,8 +427,8 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; @@ -554,64 +554,79 @@ yyreduce: case 3: #line 31 "calc_code_imports.y" { yyerrok ; } +#line 558 "calc_code_imports.tab.c" break; case 4: #line 35 "calc_code_imports.y" { printf("%d\n",yystack.l_mark[0]);} +#line 563 "calc_code_imports.tab.c" break; case 5: #line 37 "calc_code_imports.y" { regs[yystack.l_mark[-2]] = yystack.l_mark[0]; } +#line 568 "calc_code_imports.tab.c" break; case 6: #line 41 "calc_code_imports.y" { yyval = yystack.l_mark[-1]; } +#line 573 "calc_code_imports.tab.c" break; case 7: #line 43 "calc_code_imports.y" { yyval = yystack.l_mark[-2] + yystack.l_mark[0]; } +#line 578 "calc_code_imports.tab.c" break; case 8: #line 45 "calc_code_imports.y" { yyval = yystack.l_mark[-2] - yystack.l_mark[0]; } +#line 583 "calc_code_imports.tab.c" break; case 9: #line 47 "calc_code_imports.y" { yyval = yystack.l_mark[-2] * yystack.l_mark[0]; } +#line 588 "calc_code_imports.tab.c" break; case 10: #line 49 "calc_code_imports.y" { yyval = yystack.l_mark[-2] / yystack.l_mark[0]; } +#line 593 "calc_code_imports.tab.c" break; case 11: #line 51 "calc_code_imports.y" { yyval = yystack.l_mark[-2] % yystack.l_mark[0]; } +#line 598 "calc_code_imports.tab.c" break; case 12: #line 53 "calc_code_imports.y" { yyval = yystack.l_mark[-2] & yystack.l_mark[0]; } +#line 603 "calc_code_imports.tab.c" break; case 13: #line 55 "calc_code_imports.y" { yyval = yystack.l_mark[-2] | yystack.l_mark[0]; } +#line 608 "calc_code_imports.tab.c" break; case 14: #line 57 "calc_code_imports.y" { yyval = - yystack.l_mark[0]; } +#line 613 "calc_code_imports.tab.c" break; case 15: #line 59 "calc_code_imports.y" { yyval = regs[yystack.l_mark[0]]; } +#line 618 "calc_code_imports.tab.c" break; case 17: #line 64 "calc_code_imports.y" { yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; } +#line 623 "calc_code_imports.tab.c" break; case 18: #line 66 "calc_code_imports.y" { yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; } +#line 628 "calc_code_imports.tab.c" break; -#line 615 "calc_code_imports.tab.c" +#line 630 "calc_code_imports.tab.c" } yystack.s_mark -= yym; yystate = *yystack.s_mark; diff --git a/test/yacc/calc_code_provides.tab.c b/test/yacc/calc_code_provides.tab.c index 3d2555f6260a..46f68e4b0395 100644 --- a/test/yacc/calc_code_provides.tab.c +++ b/test/yacc/calc_code_provides.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) @@ -150,7 +150,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc_code_provides_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, @@ -435,8 +435,8 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; @@ -562,64 +562,79 @@ yyreduce: case 3: #line 31 "calc_code_provides.y" { yyerrok ; } +#line 566 "calc_code_provides.tab.c" break; case 4: #line 35 "calc_code_provides.y" { printf("%d\n",yystack.l_mark[0]);} +#line 571 "calc_code_provides.tab.c" break; case 5: #line 37 "calc_code_provides.y" { regs[yystack.l_mark[-2]] = yystack.l_mark[0]; } +#line 576 "calc_code_provides.tab.c" break; case 6: #line 41 "calc_code_provides.y" { yyval = yystack.l_mark[-1]; } +#line 581 "calc_code_provides.tab.c" break; case 7: #line 43 "calc_code_provides.y" { yyval = yystack.l_mark[-2] + yystack.l_mark[0]; } +#line 586 "calc_code_provides.tab.c" break; case 8: #line 45 "calc_code_provides.y" { yyval = yystack.l_mark[-2] - yystack.l_mark[0]; } +#line 591 "calc_code_provides.tab.c" break; case 9: #line 47 "calc_code_provides.y" { yyval = yystack.l_mark[-2] * yystack.l_mark[0]; } +#line 596 "calc_code_provides.tab.c" break; case 10: #line 49 "calc_code_provides.y" { yyval = yystack.l_mark[-2] / yystack.l_mark[0]; } +#line 601 "calc_code_provides.tab.c" break; case 11: #line 51 "calc_code_provides.y" { yyval = yystack.l_mark[-2] % yystack.l_mark[0]; } +#line 606 "calc_code_provides.tab.c" break; case 12: #line 53 "calc_code_provides.y" { yyval = yystack.l_mark[-2] & yystack.l_mark[0]; } +#line 611 "calc_code_provides.tab.c" break; case 13: #line 55 "calc_code_provides.y" { yyval = yystack.l_mark[-2] | yystack.l_mark[0]; } +#line 616 "calc_code_provides.tab.c" break; case 14: #line 57 "calc_code_provides.y" { yyval = - yystack.l_mark[0]; } +#line 621 "calc_code_provides.tab.c" break; case 15: #line 59 "calc_code_provides.y" { yyval = regs[yystack.l_mark[0]]; } +#line 626 "calc_code_provides.tab.c" break; case 17: #line 64 "calc_code_provides.y" { yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; } +#line 631 "calc_code_provides.tab.c" break; case 18: #line 66 "calc_code_provides.y" { yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; } +#line 636 "calc_code_provides.tab.c" break; -#line 623 "calc_code_provides.tab.c" +#line 638 "calc_code_provides.tab.c" } yystack.s_mark -= yym; yystate = *yystack.s_mark; diff --git a/test/yacc/calc_code_requires.tab.c b/test/yacc/calc_code_requires.tab.c index 50eb05cb304b..e409d37e40c2 100644 --- a/test/yacc/calc_code_requires.tab.c +++ b/test/yacc/calc_code_requires.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) @@ -150,7 +150,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc_code_requires_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, @@ -435,8 +435,8 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; @@ -562,64 +562,79 @@ yyreduce: case 3: #line 31 "calc_code_requires.y" { yyerrok ; } +#line 566 "calc_code_requires.tab.c" break; case 4: #line 35 "calc_code_requires.y" { printf("%d\n",yystack.l_mark[0]);} +#line 571 "calc_code_requires.tab.c" break; case 5: #line 37 "calc_code_requires.y" { regs[yystack.l_mark[-2]] = yystack.l_mark[0]; } +#line 576 "calc_code_requires.tab.c" break; case 6: #line 41 "calc_code_requires.y" { yyval = yystack.l_mark[-1]; } +#line 581 "calc_code_requires.tab.c" break; case 7: #line 43 "calc_code_requires.y" { yyval = yystack.l_mark[-2] + yystack.l_mark[0]; } +#line 586 "calc_code_requires.tab.c" break; case 8: #line 45 "calc_code_requires.y" { yyval = yystack.l_mark[-2] - yystack.l_mark[0]; } +#line 591 "calc_code_requires.tab.c" break; case 9: #line 47 "calc_code_requires.y" { yyval = yystack.l_mark[-2] * yystack.l_mark[0]; } +#line 596 "calc_code_requires.tab.c" break; case 10: #line 49 "calc_code_requires.y" { yyval = yystack.l_mark[-2] / yystack.l_mark[0]; } +#line 601 "calc_code_requires.tab.c" break; case 11: #line 51 "calc_code_requires.y" { yyval = yystack.l_mark[-2] % yystack.l_mark[0]; } +#line 606 "calc_code_requires.tab.c" break; case 12: #line 53 "calc_code_requires.y" { yyval = yystack.l_mark[-2] & yystack.l_mark[0]; } +#line 611 "calc_code_requires.tab.c" break; case 13: #line 55 "calc_code_requires.y" { yyval = yystack.l_mark[-2] | yystack.l_mark[0]; } +#line 616 "calc_code_requires.tab.c" break; case 14: #line 57 "calc_code_requires.y" { yyval = - yystack.l_mark[0]; } +#line 621 "calc_code_requires.tab.c" break; case 15: #line 59 "calc_code_requires.y" { yyval = regs[yystack.l_mark[0]]; } +#line 626 "calc_code_requires.tab.c" break; case 17: #line 64 "calc_code_requires.y" { yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; } +#line 631 "calc_code_requires.tab.c" break; case 18: #line 66 "calc_code_requires.y" { yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; } +#line 636 "calc_code_requires.tab.c" break; -#line 623 "calc_code_requires.tab.c" +#line 638 "calc_code_requires.tab.c" } yystack.s_mark -= yym; yystate = *yystack.s_mark; diff --git a/test/yacc/calc_code_top.tab.c b/test/yacc/calc_code_top.tab.c index c5e4e3fb351f..1f47973f1ace 100644 --- a/test/yacc/calc_code_top.tab.c +++ b/test/yacc/calc_code_top.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) @@ -158,7 +158,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc_code_top_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, @@ -435,8 +435,8 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; @@ -562,64 +562,79 @@ yyreduce: case 3: #line 31 "calc_code_top.y" { yyerrok ; } +#line 566 "calc_code_top.tab.c" break; case 4: #line 35 "calc_code_top.y" { printf("%d\n",yystack.l_mark[0]);} +#line 571 "calc_code_top.tab.c" break; case 5: #line 37 "calc_code_top.y" { regs[yystack.l_mark[-2]] = yystack.l_mark[0]; } +#line 576 "calc_code_top.tab.c" break; case 6: #line 41 "calc_code_top.y" { yyval = yystack.l_mark[-1]; } +#line 581 "calc_code_top.tab.c" break; case 7: #line 43 "calc_code_top.y" { yyval = yystack.l_mark[-2] + yystack.l_mark[0]; } +#line 586 "calc_code_top.tab.c" break; case 8: #line 45 "calc_code_top.y" { yyval = yystack.l_mark[-2] - yystack.l_mark[0]; } +#line 591 "calc_code_top.tab.c" break; case 9: #line 47 "calc_code_top.y" { yyval = yystack.l_mark[-2] * yystack.l_mark[0]; } +#line 596 "calc_code_top.tab.c" break; case 10: #line 49 "calc_code_top.y" { yyval = yystack.l_mark[-2] / yystack.l_mark[0]; } +#line 601 "calc_code_top.tab.c" break; case 11: #line 51 "calc_code_top.y" { yyval = yystack.l_mark[-2] % yystack.l_mark[0]; } +#line 606 "calc_code_top.tab.c" break; case 12: #line 53 "calc_code_top.y" { yyval = yystack.l_mark[-2] & yystack.l_mark[0]; } +#line 611 "calc_code_top.tab.c" break; case 13: #line 55 "calc_code_top.y" { yyval = yystack.l_mark[-2] | yystack.l_mark[0]; } +#line 616 "calc_code_top.tab.c" break; case 14: #line 57 "calc_code_top.y" { yyval = - yystack.l_mark[0]; } +#line 621 "calc_code_top.tab.c" break; case 15: #line 59 "calc_code_top.y" { yyval = regs[yystack.l_mark[0]]; } +#line 626 "calc_code_top.tab.c" break; case 17: #line 64 "calc_code_top.y" { yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; } +#line 631 "calc_code_top.tab.c" break; case 18: #line 66 "calc_code_top.y" { yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; } +#line 636 "calc_code_top.tab.c" break; -#line 623 "calc_code_top.tab.c" +#line 638 "calc_code_top.tab.c" } yystack.s_mark -= yym; yystate = *yystack.s_mark; diff --git a/test/yacc/code_calc.code.c b/test/yacc/code_calc.code.c index a1d4f4b6c50e..608ff7fb4ad1 100644 --- a/test/yacc/code_calc.code.c +++ b/test/yacc/code_calc.code.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) @@ -162,7 +162,7 @@ typedef int YYSTYPE; #define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? YYUNDFTOKEN : (a)) extern int YYPARSE_DECL(); -typedef short YYINT; +typedef int YYINT; extern YYINT yylhs[]; extern YYINT yylen[]; extern YYINT yydefred[]; @@ -336,8 +336,8 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; @@ -463,64 +463,79 @@ yyreduce: case 3: #line 32 "code_calc.y" { yyerrok ; } +#line 467 "code_calc.code.c" break; case 4: #line 36 "code_calc.y" { printf("%d\n",yystack.l_mark[0]);} +#line 472 "code_calc.code.c" break; case 5: #line 38 "code_calc.y" { regs[yystack.l_mark[-2]] = yystack.l_mark[0]; } +#line 477 "code_calc.code.c" break; case 6: #line 42 "code_calc.y" { yyval = yystack.l_mark[-1]; } +#line 482 "code_calc.code.c" break; case 7: #line 44 "code_calc.y" { yyval = yystack.l_mark[-2] + yystack.l_mark[0]; } +#line 487 "code_calc.code.c" break; case 8: #line 46 "code_calc.y" { yyval = yystack.l_mark[-2] - yystack.l_mark[0]; } +#line 492 "code_calc.code.c" break; case 9: #line 48 "code_calc.y" { yyval = yystack.l_mark[-2] * yystack.l_mark[0]; } +#line 497 "code_calc.code.c" break; case 10: #line 50 "code_calc.y" { yyval = yystack.l_mark[-2] / yystack.l_mark[0]; } +#line 502 "code_calc.code.c" break; case 11: #line 52 "code_calc.y" { yyval = yystack.l_mark[-2] % yystack.l_mark[0]; } +#line 507 "code_calc.code.c" break; case 12: #line 54 "code_calc.y" { yyval = yystack.l_mark[-2] & yystack.l_mark[0]; } +#line 512 "code_calc.code.c" break; case 13: #line 56 "code_calc.y" { yyval = yystack.l_mark[-2] | yystack.l_mark[0]; } +#line 517 "code_calc.code.c" break; case 14: #line 58 "code_calc.y" { yyval = - yystack.l_mark[0]; } +#line 522 "code_calc.code.c" break; case 15: #line 60 "code_calc.y" { yyval = regs[yystack.l_mark[0]]; } +#line 527 "code_calc.code.c" break; case 17: #line 65 "code_calc.y" { yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; } +#line 532 "code_calc.code.c" break; case 18: #line 67 "code_calc.y" { yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; } +#line 537 "code_calc.code.c" break; -#line 524 "code_calc.code.c" +#line 539 "code_calc.code.c" } yystack.s_mark -= yym; yystate = *yystack.s_mark; diff --git a/test/yacc/code_calc.tab.c b/test/yacc/code_calc.tab.c index df3b4525c9e6..9242641a931b 100644 --- a/test/yacc/code_calc.tab.c +++ b/test/yacc/code_calc.tab.c @@ -1,4 +1,4 @@ -typedef short YYINT; +typedef int YYINT; const YYINT calc_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, diff --git a/test/yacc/code_error.code.c b/test/yacc/code_error.code.c index b117ce6d21cd..ef2e78c00b5f 100644 --- a/test/yacc/code_error.code.c +++ b/test/yacc/code_error.code.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) @@ -152,7 +152,7 @@ typedef int YYSTYPE; #define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? YYUNDFTOKEN : (a)) extern int YYPARSE_DECL(); -typedef short YYINT; +typedef int YYINT; extern YYINT yylhs[]; extern YYINT yylen[]; extern YYINT yydefred[]; @@ -306,8 +306,8 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; diff --git a/test/yacc/code_error.tab.c b/test/yacc/code_error.tab.c index 9296aa5b1e24..d394ad808498 100644 --- a/test/yacc/code_error.tab.c +++ b/test/yacc/code_error.tab.c @@ -1,4 +1,4 @@ -typedef short YYINT; +typedef int YYINT; const YYINT error_lhs[] = { -1, 0, }; diff --git a/test/yacc/defines1.calc.c b/test/yacc/defines1.calc.c index f7ee6749fe49..e5ebf355c009 100644 --- a/test/yacc/defines1.calc.c +++ b/test/yacc/defines1.calc.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) @@ -74,7 +74,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT yylhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, @@ -351,8 +351,8 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; @@ -478,64 +478,79 @@ yyreduce: case 3: #line 28 "calc.y" { yyerrok ; } +#line 482 "y.tab.c" break; case 4: #line 32 "calc.y" { printf("%d\n",yystack.l_mark[0]);} +#line 487 "y.tab.c" break; case 5: #line 34 "calc.y" { regs[yystack.l_mark[-2]] = yystack.l_mark[0]; } +#line 492 "y.tab.c" break; case 6: #line 38 "calc.y" { yyval = yystack.l_mark[-1]; } +#line 497 "y.tab.c" break; case 7: #line 40 "calc.y" { yyval = yystack.l_mark[-2] + yystack.l_mark[0]; } +#line 502 "y.tab.c" break; case 8: #line 42 "calc.y" { yyval = yystack.l_mark[-2] - yystack.l_mark[0]; } +#line 507 "y.tab.c" break; case 9: #line 44 "calc.y" { yyval = yystack.l_mark[-2] * yystack.l_mark[0]; } +#line 512 "y.tab.c" break; case 10: #line 46 "calc.y" { yyval = yystack.l_mark[-2] / yystack.l_mark[0]; } +#line 517 "y.tab.c" break; case 11: #line 48 "calc.y" { yyval = yystack.l_mark[-2] % yystack.l_mark[0]; } +#line 522 "y.tab.c" break; case 12: #line 50 "calc.y" { yyval = yystack.l_mark[-2] & yystack.l_mark[0]; } +#line 527 "y.tab.c" break; case 13: #line 52 "calc.y" { yyval = yystack.l_mark[-2] | yystack.l_mark[0]; } +#line 532 "y.tab.c" break; case 14: #line 54 "calc.y" { yyval = - yystack.l_mark[0]; } +#line 537 "y.tab.c" break; case 15: #line 56 "calc.y" { yyval = regs[yystack.l_mark[0]]; } +#line 542 "y.tab.c" break; case 17: #line 61 "calc.y" { yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; } +#line 547 "y.tab.c" break; case 18: #line 63 "calc.y" { yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; } +#line 552 "y.tab.c" break; -#line 539 "y.tab.c" +#line 554 "y.tab.c" } yystack.s_mark -= yym; yystate = *yystack.s_mark; diff --git a/test/yacc/defines2.calc.c b/test/yacc/defines2.calc.c index f7ee6749fe49..e5ebf355c009 100644 --- a/test/yacc/defines2.calc.c +++ b/test/yacc/defines2.calc.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) @@ -74,7 +74,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT yylhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, @@ -351,8 +351,8 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; @@ -478,64 +478,79 @@ yyreduce: case 3: #line 28 "calc.y" { yyerrok ; } +#line 482 "y.tab.c" break; case 4: #line 32 "calc.y" { printf("%d\n",yystack.l_mark[0]);} +#line 487 "y.tab.c" break; case 5: #line 34 "calc.y" { regs[yystack.l_mark[-2]] = yystack.l_mark[0]; } +#line 492 "y.tab.c" break; case 6: #line 38 "calc.y" { yyval = yystack.l_mark[-1]; } +#line 497 "y.tab.c" break; case 7: #line 40 "calc.y" { yyval = yystack.l_mark[-2] + yystack.l_mark[0]; } +#line 502 "y.tab.c" break; case 8: #line 42 "calc.y" { yyval = yystack.l_mark[-2] - yystack.l_mark[0]; } +#line 507 "y.tab.c" break; case 9: #line 44 "calc.y" { yyval = yystack.l_mark[-2] * yystack.l_mark[0]; } +#line 512 "y.tab.c" break; case 10: #line 46 "calc.y" { yyval = yystack.l_mark[-2] / yystack.l_mark[0]; } +#line 517 "y.tab.c" break; case 11: #line 48 "calc.y" { yyval = yystack.l_mark[-2] % yystack.l_mark[0]; } +#line 522 "y.tab.c" break; case 12: #line 50 "calc.y" { yyval = yystack.l_mark[-2] & yystack.l_mark[0]; } +#line 527 "y.tab.c" break; case 13: #line 52 "calc.y" { yyval = yystack.l_mark[-2] | yystack.l_mark[0]; } +#line 532 "y.tab.c" break; case 14: #line 54 "calc.y" { yyval = - yystack.l_mark[0]; } +#line 537 "y.tab.c" break; case 15: #line 56 "calc.y" { yyval = regs[yystack.l_mark[0]]; } +#line 542 "y.tab.c" break; case 17: #line 61 "calc.y" { yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; } +#line 547 "y.tab.c" break; case 18: #line 63 "calc.y" { yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; } +#line 552 "y.tab.c" break; -#line 539 "y.tab.c" +#line 554 "y.tab.c" } yystack.s_mark -= yym; yystate = *yystack.s_mark; diff --git a/test/yacc/defines3.calc.c b/test/yacc/defines3.calc.c index 538726bb1f43..90bca1d7b368 100644 --- a/test/yacc/defines3.calc.c +++ b/test/yacc/defines3.calc.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) @@ -74,7 +74,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT yylhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, @@ -351,8 +351,8 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; @@ -478,64 +478,79 @@ yyreduce: case 3: #line 28 "calc.y" { yyerrok ; } +#line 482 "prefix.tab.c" break; case 4: #line 32 "calc.y" { printf("%d\n",yystack.l_mark[0]);} +#line 487 "prefix.tab.c" break; case 5: #line 34 "calc.y" { regs[yystack.l_mark[-2]] = yystack.l_mark[0]; } +#line 492 "prefix.tab.c" break; case 6: #line 38 "calc.y" { yyval = yystack.l_mark[-1]; } +#line 497 "prefix.tab.c" break; case 7: #line 40 "calc.y" { yyval = yystack.l_mark[-2] + yystack.l_mark[0]; } +#line 502 "prefix.tab.c" break; case 8: #line 42 "calc.y" { yyval = yystack.l_mark[-2] - yystack.l_mark[0]; } +#line 507 "prefix.tab.c" break; case 9: #line 44 "calc.y" { yyval = yystack.l_mark[-2] * yystack.l_mark[0]; } +#line 512 "prefix.tab.c" break; case 10: #line 46 "calc.y" { yyval = yystack.l_mark[-2] / yystack.l_mark[0]; } +#line 517 "prefix.tab.c" break; case 11: #line 48 "calc.y" { yyval = yystack.l_mark[-2] % yystack.l_mark[0]; } +#line 522 "prefix.tab.c" break; case 12: #line 50 "calc.y" { yyval = yystack.l_mark[-2] & yystack.l_mark[0]; } +#line 527 "prefix.tab.c" break; case 13: #line 52 "calc.y" { yyval = yystack.l_mark[-2] | yystack.l_mark[0]; } +#line 532 "prefix.tab.c" break; case 14: #line 54 "calc.y" { yyval = - yystack.l_mark[0]; } +#line 537 "prefix.tab.c" break; case 15: #line 56 "calc.y" { yyval = regs[yystack.l_mark[0]]; } +#line 542 "prefix.tab.c" break; case 17: #line 61 "calc.y" { yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; } +#line 547 "prefix.tab.c" break; case 18: #line 63 "calc.y" { yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; } +#line 552 "prefix.tab.c" break; -#line 539 "prefix.tab.c" +#line 554 "prefix.tab.c" } yystack.s_mark -= yym; yystate = *yystack.s_mark; diff --git a/test/yacc/empty.tab.c b/test/yacc/empty.tab.c index e33865531957..f2387a4218e2 100644 --- a/test/yacc/empty.tab.c +++ b/test/yacc/empty.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) @@ -144,7 +144,7 @@ typedef int YYSTYPE; extern int YYPARSE_DECL(); #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT empty_lhs[] = { -1, 0, }; @@ -317,8 +317,8 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; diff --git a/test/yacc/err_syntax1.tab.c b/test/yacc/err_syntax1.tab.c index 6c35f23329b5..f0d4d2c7b6a6 100644 --- a/test/yacc/err_syntax1.tab.c +++ b/test/yacc/err_syntax1.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) diff --git a/test/yacc/err_syntax10.tab.c b/test/yacc/err_syntax10.tab.c index e4b15781e448..2cf718c93de9 100644 --- a/test/yacc/err_syntax10.tab.c +++ b/test/yacc/err_syntax10.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) @@ -134,7 +134,7 @@ static void yyerror(const char *); extern int YYPARSE_DECL(); #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT err_syntax10_lhs[] = { -1, 0, }; @@ -316,8 +316,8 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; diff --git a/test/yacc/err_syntax11.tab.c b/test/yacc/err_syntax11.tab.c index 070661ed5dbc..ef6c680724fd 100644 --- a/test/yacc/err_syntax11.tab.c +++ b/test/yacc/err_syntax11.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) @@ -140,7 +140,7 @@ typedef int YYSTYPE; extern int YYPARSE_DECL(); #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT err_syntax11_lhs[] = { -1, 0, }; @@ -322,8 +322,8 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; diff --git a/test/yacc/err_syntax12.tab.c b/test/yacc/err_syntax12.tab.c index 7c6c63e9494f..8060aaa26a19 100644 --- a/test/yacc/err_syntax12.tab.c +++ b/test/yacc/err_syntax12.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) @@ -141,7 +141,7 @@ extern int YYPARSE_DECL(); #define text 456 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT err_syntax12_lhs[] = { -1, 0, }; @@ -328,8 +328,8 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; diff --git a/test/yacc/err_syntax13.tab.c b/test/yacc/err_syntax13.tab.c index 6c35f23329b5..f0d4d2c7b6a6 100644 --- a/test/yacc/err_syntax13.tab.c +++ b/test/yacc/err_syntax13.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) diff --git a/test/yacc/err_syntax14.tab.c b/test/yacc/err_syntax14.tab.c index 6c35f23329b5..f0d4d2c7b6a6 100644 --- a/test/yacc/err_syntax14.tab.c +++ b/test/yacc/err_syntax14.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) diff --git a/test/yacc/err_syntax15.tab.c b/test/yacc/err_syntax15.tab.c index 6c35f23329b5..f0d4d2c7b6a6 100644 --- a/test/yacc/err_syntax15.tab.c +++ b/test/yacc/err_syntax15.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) diff --git a/test/yacc/err_syntax16.tab.c b/test/yacc/err_syntax16.tab.c index 6c35f23329b5..f0d4d2c7b6a6 100644 --- a/test/yacc/err_syntax16.tab.c +++ b/test/yacc/err_syntax16.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) diff --git a/test/yacc/err_syntax17.tab.c b/test/yacc/err_syntax17.tab.c index 6c35f23329b5..f0d4d2c7b6a6 100644 --- a/test/yacc/err_syntax17.tab.c +++ b/test/yacc/err_syntax17.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) diff --git a/test/yacc/err_syntax18.tab.c b/test/yacc/err_syntax18.tab.c index 6038c1436ba6..1c08b55b5b70 100644 --- a/test/yacc/err_syntax18.tab.c +++ b/test/yacc/err_syntax18.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) @@ -140,7 +140,7 @@ typedef int YYSTYPE; extern int YYPARSE_DECL(); #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT err_syntax18_lhs[] = { -1, 0, }; @@ -324,8 +324,8 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; @@ -451,8 +451,9 @@ yyreduce: case 1: #line 9 "err_syntax18.y" { yyval = yystack.l_mark[1]; } +#line 455 "err_syntax18.tab.c" break; -#line 456 "err_syntax18.tab.c" +#line 457 "err_syntax18.tab.c" } yystack.s_mark -= yym; yystate = *yystack.s_mark; diff --git a/test/yacc/err_syntax19.tab.c b/test/yacc/err_syntax19.tab.c index 6c35f23329b5..f0d4d2c7b6a6 100644 --- a/test/yacc/err_syntax19.tab.c +++ b/test/yacc/err_syntax19.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) diff --git a/test/yacc/err_syntax2.tab.c b/test/yacc/err_syntax2.tab.c index 6c35f23329b5..f0d4d2c7b6a6 100644 --- a/test/yacc/err_syntax2.tab.c +++ b/test/yacc/err_syntax2.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) diff --git a/test/yacc/err_syntax20.tab.c b/test/yacc/err_syntax20.tab.c index ea9fc87ce3a5..d0b02858dcc9 100644 --- a/test/yacc/err_syntax20.tab.c +++ b/test/yacc/err_syntax20.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) @@ -135,7 +135,7 @@ extern int YYPARSE_DECL(); #define recur 257 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT err_syntax20_lhs[] = { -1, 0, }; @@ -320,8 +320,8 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; @@ -447,8 +447,9 @@ yyreduce: case 1: #line 12 "err_syntax20.y" { yystack.l_mark[-1].rechk = 3; } +#line 451 "err_syntax20.tab.c" break; -#line 452 "err_syntax20.tab.c" +#line 453 "err_syntax20.tab.c" } yystack.s_mark -= yym; yystate = *yystack.s_mark; diff --git a/test/yacc/err_syntax21.tab.c b/test/yacc/err_syntax21.tab.c index 6c35f23329b5..f0d4d2c7b6a6 100644 --- a/test/yacc/err_syntax21.tab.c +++ b/test/yacc/err_syntax21.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) diff --git a/test/yacc/err_syntax22.tab.c b/test/yacc/err_syntax22.tab.c index 6c35f23329b5..f0d4d2c7b6a6 100644 --- a/test/yacc/err_syntax22.tab.c +++ b/test/yacc/err_syntax22.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) diff --git a/test/yacc/err_syntax23.tab.c b/test/yacc/err_syntax23.tab.c index 6c35f23329b5..f0d4d2c7b6a6 100644 --- a/test/yacc/err_syntax23.tab.c +++ b/test/yacc/err_syntax23.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) diff --git a/test/yacc/err_syntax24.tab.c b/test/yacc/err_syntax24.tab.c index 6c35f23329b5..f0d4d2c7b6a6 100644 --- a/test/yacc/err_syntax24.tab.c +++ b/test/yacc/err_syntax24.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) diff --git a/test/yacc/err_syntax25.tab.c b/test/yacc/err_syntax25.tab.c index 6c35f23329b5..f0d4d2c7b6a6 100644 --- a/test/yacc/err_syntax25.tab.c +++ b/test/yacc/err_syntax25.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) diff --git a/test/yacc/err_syntax26.tab.c b/test/yacc/err_syntax26.tab.c index 6c35f23329b5..f0d4d2c7b6a6 100644 --- a/test/yacc/err_syntax26.tab.c +++ b/test/yacc/err_syntax26.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) diff --git a/test/yacc/err_syntax27.tab.c b/test/yacc/err_syntax27.tab.c index 6c35f23329b5..f0d4d2c7b6a6 100644 --- a/test/yacc/err_syntax27.tab.c +++ b/test/yacc/err_syntax27.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) diff --git a/test/yacc/err_syntax3.tab.c b/test/yacc/err_syntax3.tab.c index 6c35f23329b5..f0d4d2c7b6a6 100644 --- a/test/yacc/err_syntax3.tab.c +++ b/test/yacc/err_syntax3.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) diff --git a/test/yacc/err_syntax4.tab.c b/test/yacc/err_syntax4.tab.c index 6c35f23329b5..f0d4d2c7b6a6 100644 --- a/test/yacc/err_syntax4.tab.c +++ b/test/yacc/err_syntax4.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) diff --git a/test/yacc/err_syntax5.tab.c b/test/yacc/err_syntax5.tab.c index 6c35f23329b5..f0d4d2c7b6a6 100644 --- a/test/yacc/err_syntax5.tab.c +++ b/test/yacc/err_syntax5.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) diff --git a/test/yacc/err_syntax6.tab.c b/test/yacc/err_syntax6.tab.c index 6c35f23329b5..f0d4d2c7b6a6 100644 --- a/test/yacc/err_syntax6.tab.c +++ b/test/yacc/err_syntax6.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) diff --git a/test/yacc/err_syntax7.tab.c b/test/yacc/err_syntax7.tab.c index 6c35f23329b5..f0d4d2c7b6a6 100644 --- a/test/yacc/err_syntax7.tab.c +++ b/test/yacc/err_syntax7.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) diff --git a/test/yacc/err_syntax7a.tab.c b/test/yacc/err_syntax7a.tab.c index 6c35f23329b5..f0d4d2c7b6a6 100644 --- a/test/yacc/err_syntax7a.tab.c +++ b/test/yacc/err_syntax7a.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) diff --git a/test/yacc/err_syntax7b.tab.c b/test/yacc/err_syntax7b.tab.c index 6c35f23329b5..f0d4d2c7b6a6 100644 --- a/test/yacc/err_syntax7b.tab.c +++ b/test/yacc/err_syntax7b.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) diff --git a/test/yacc/err_syntax8.tab.c b/test/yacc/err_syntax8.tab.c index 6c35f23329b5..f0d4d2c7b6a6 100644 --- a/test/yacc/err_syntax8.tab.c +++ b/test/yacc/err_syntax8.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) diff --git a/test/yacc/err_syntax8a.tab.c b/test/yacc/err_syntax8a.tab.c index 6c35f23329b5..f0d4d2c7b6a6 100644 --- a/test/yacc/err_syntax8a.tab.c +++ b/test/yacc/err_syntax8a.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) diff --git a/test/yacc/err_syntax9.tab.c b/test/yacc/err_syntax9.tab.c index 6c35f23329b5..f0d4d2c7b6a6 100644 --- a/test/yacc/err_syntax9.tab.c +++ b/test/yacc/err_syntax9.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) diff --git a/test/yacc/error.tab.c b/test/yacc/error.tab.c index 93d901149cae..f21fa7dd8549 100644 --- a/test/yacc/error.tab.c +++ b/test/yacc/error.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) @@ -140,7 +140,7 @@ typedef int YYSTYPE; extern int YYPARSE_DECL(); #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT error_lhs[] = { -1, 0, }; @@ -322,8 +322,8 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; diff --git a/test/yacc/expr.oxout.tab.c b/test/yacc/expr.oxout.tab.c index 0edef3ae9659..af45682f868b 100644 --- a/test/yacc/expr.oxout.tab.c +++ b/test/yacc/expr.oxout.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) @@ -15,85 +15,85 @@ #define YYEOF 0 #ifndef yyparse -#define yyparse expr.oxout_parse +#define yyparse expr_oxout_parse #endif /* yyparse */ #ifndef yylex -#define yylex expr.oxout_lex +#define yylex expr_oxout_lex #endif /* yylex */ #ifndef yyerror -#define yyerror expr.oxout_error +#define yyerror expr_oxout_error #endif /* yyerror */ #ifndef yychar -#define yychar expr.oxout_char +#define yychar expr_oxout_char #endif /* yychar */ #ifndef yyval -#define yyval expr.oxout_val +#define yyval expr_oxout_val #endif /* yyval */ #ifndef yylval -#define yylval expr.oxout_lval +#define yylval expr_oxout_lval #endif /* yylval */ #ifndef yydebug -#define yydebug expr.oxout_debug +#define yydebug expr_oxout_debug #endif /* yydebug */ #ifndef yynerrs -#define yynerrs expr.oxout_nerrs +#define yynerrs expr_oxout_nerrs #endif /* yynerrs */ #ifndef yyerrflag -#define yyerrflag expr.oxout_errflag +#define yyerrflag expr_oxout_errflag #endif /* yyerrflag */ #ifndef yylhs -#define yylhs expr.oxout_lhs +#define yylhs expr_oxout_lhs #endif /* yylhs */ #ifndef yylen -#define yylen expr.oxout_len +#define yylen expr_oxout_len #endif /* yylen */ #ifndef yydefred -#define yydefred expr.oxout_defred +#define yydefred expr_oxout_defred #endif /* yydefred */ #ifndef yydgoto -#define yydgoto expr.oxout_dgoto +#define yydgoto expr_oxout_dgoto #endif /* yydgoto */ #ifndef yysindex -#define yysindex expr.oxout_sindex +#define yysindex expr_oxout_sindex #endif /* yysindex */ #ifndef yyrindex -#define yyrindex expr.oxout_rindex +#define yyrindex expr_oxout_rindex #endif /* yyrindex */ #ifndef yygindex -#define yygindex expr.oxout_gindex +#define yygindex expr_oxout_gindex #endif /* yygindex */ #ifndef yytable -#define yytable expr.oxout_table +#define yytable expr_oxout_table #endif /* yytable */ #ifndef yycheck -#define yycheck expr.oxout_check +#define yycheck expr_oxout_check #endif /* yycheck */ #ifndef yyname -#define yyname expr.oxout_name +#define yyname expr_oxout_name #endif /* yyname */ #ifndef yyrule -#define yyrule expr.oxout_rule +#define yyrule expr_oxout_rule #endif /* yyrule */ -#define YYPREFIX "expr.oxout_" +#define YYPREFIX "expr_oxout_" #define YYPURE 0 @@ -117,7 +117,7 @@ extern void yyerror(const char *); #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 #line 31 "expr.oxout.y" -typedef union { +typedef union YYSTYPE { struct yyyOxAttrbs { struct yyyStackItem *yyyOxStackItem; } yyyOxAttrbs; @@ -178,33 +178,33 @@ extern int YYPARSE_DECL(); #define ID 257 #define CONST 258 #define YYERRCODE 256 -typedef short YYINT; -static const YYINT expr.oxout_lhs[] = { -1, +typedef int YYINT; +static const YYINT expr_oxout_lhs[] = { -1, 2, 0, 1, 3, 3, 3, 3, 3, 3, 3, }; -static const YYINT expr.oxout_len[] = { 2, +static const YYINT expr_oxout_len[] = { 2, 0, 2, 1, 3, 3, 3, 3, 3, 1, 1, }; -static const YYINT expr.oxout_defred[] = { 1, +static const YYINT expr_oxout_defred[] = { 1, 0, 0, 9, 10, 0, 2, 0, 0, 0, 0, 0, 0, 8, 0, 0, 4, 0, }; -static const YYINT expr.oxout_dgoto[] = { 1, +static const YYINT expr_oxout_dgoto[] = { 1, 6, 2, 7, }; -static const YYINT expr.oxout_sindex[] = { 0, +static const YYINT expr_oxout_sindex[] = { 0, 0, -40, 0, 0, -40, 0, -18, -24, -40, -40, -40, -40, 0, -37, -37, 0, -39, }; -static const YYINT expr.oxout_rindex[] = { 0, +static const YYINT expr_oxout_rindex[] = { 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 2, 8, 0, 1, }; -static const YYINT expr.oxout_gindex[] = { 0, +static const YYINT expr_oxout_gindex[] = { 0, 0, 0, 4, }; #define YYTABLESIZE 218 -static const YYINT expr.oxout_table[] = { 5, +static const YYINT expr_oxout_table[] = { 5, 6, 5, 11, 0, 11, 3, 0, 7, 8, 12, 0, 0, 14, 15, 16, 17, 13, 11, 9, 0, 10, 0, 12, 11, 9, 0, 10, 0, 12, 0, @@ -228,7 +228,7 @@ static const YYINT expr.oxout_table[] = { 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 4, }; -static const YYINT expr.oxout_check[] = { 40, +static const YYINT expr_oxout_check[] = { 40, 0, 0, 42, -1, 42, 0, -1, 0, 5, 47, -1, -1, 9, 10, 11, 12, 41, 42, 43, -1, 45, -1, 47, 42, 43, -1, 45, -1, 47, -1, @@ -260,7 +260,7 @@ static const YYINT expr.oxout_check[] = { 40, #define YYUNDFTOKEN 264 #define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? YYUNDFTOKEN : (a)) #if YYDEBUG -static const char *const expr.oxout_name[] = { +static const char *const expr_oxout_name[] = { "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, @@ -271,7 +271,7 @@ static const char *const expr.oxout_name[] = { 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,"ID", "CONST",0,0,0,0,0,"illegal-symbol", }; -static const char *const expr.oxout_rule[] = { +static const char *const expr_oxout_rule[] = { "$accept : yyyAugNonterm", "$$1 :", "yyyAugNonterm : $$1 s", @@ -382,8 +382,8 @@ void yyyfatal(char *msg) void yyyHandleOverflow(char which) - {char *msg1,*msg2; - long oldSize,newSize; + {char *msg1 = "?", *msg2; + long oldSize = 0, newSize; switch(which) { case yyySSALof : @@ -690,7 +690,7 @@ if (yyyCond(1) != yyyPass) { } if (yyyCond(2) != yyyPass) { #line 23 "expr.Y" - printf("postfix: ")/* missing ; */ + printf("postfix: "); #line 497 "expr.oxout.y" } @@ -992,11 +992,11 @@ void yyyYoxInit(void) static int yyyInitDone = 0; if (yyyInitDone) return; - if ((yyyRS = (struct yyyRSitem *) - calloc((size_t)(yyyRSmaxSize+1), (size_t)sizeof(struct yyyRSitem)) + if ((yyyRS = (yyyRSitem *) + calloc((size_t)(yyyRSmaxSize+1), (size_t)sizeof(yyyRSitem)) ) == - ((struct yyyRSitem *) NULL) + ((yyyRSitem *) NULL) ) yyyfatal("malloc error in ox ready set space allocation\n"); yyyRS++; @@ -1051,7 +1051,7 @@ void yyyGenIntNode(long yyyProdNum, int yyyRHSlength, int yyyNattrbs, struct yyy (yyyRCT *) calloc((size_t)yyyNattrbs, (size_t)sizeof(yyyRCT)); if ((*yyyOxStackItem)->node->refCountList == (yyyRCT *) NULL) yyyfatal("malloc error in ox reference count list space allocation\n"); - (*yyyOxStackItem)->node->prodNum = yyyProdNum; + (*yyyOxStackItem)->node->prodNum = (int) yyyProdNum; va_start(ap, yyval_OxAttrbs); for (i=1;i<=yyyRHSlength;i++) {yyySIT *yaccStDum = va_arg(ap,struct yyyOxAttrbs *)->yyyOxStackItem; @@ -1152,9 +1152,9 @@ void yyyAdjustINRC(long yyyProdNum, int yyyRHSlength, long startP, long stopP, s -void yyyGenLeaf(int nAttrbs,int typeNum,long startP,long stopP,YYSTYPE *yylval) +void yyyGenLeaf(int nAttrbs,int typeNum,long startP,long stopP,YYSTYPE *mylval) {yyyRCT *rcPdum; - yyySIT **yyyOxStackItem = &yylval->yyyOxAttrbs.yyyOxStackItem; + yyySIT **yyyOxStackItem = &mylval->yyyOxAttrbs.yyyOxStackItem; (*yyyOxStackItem) = (yyySIT *) malloc((size_t)sizeof(yyySIT)); if ((*yyyOxStackItem) == (yyySIT *) NULL) yyyfatal("malloc error in ox yacc semantic stack space allocation\n"); @@ -1718,8 +1718,8 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; @@ -1845,62 +1845,72 @@ yyreduce: case 1: #line 64 "expr.oxout.y" {yyyYoxInit();} +#line 1849 "expr.oxout.tab.c" break; case 2: #line 66 "expr.oxout.y" { yyyDecorate(); yyyExecuteRRsection(yystack.l_mark[0].yyyOxAttrbs.yyyOxStackItem->node); } +#line 1856 "expr.oxout.tab.c" break; case 3: #line 73 "expr.oxout.y" {if(yyyYok){ yyyGenIntNode(1,1,0,&yyval.yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs); yyyAdjustINRC(1,1,0,0,&yyval.yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs);}} +#line 1863 "expr.oxout.tab.c" break; case 4: #line 80 "expr.oxout.y" {if(yyyYok){ yyyGenIntNode(2,3,0,&yyval.yyyOxAttrbs,&yystack.l_mark[-2].yyyOxAttrbs,&yystack.l_mark[-1].yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs); yyyAdjustINRC(2,3,0,0,&yyval.yyyOxAttrbs,&yystack.l_mark[-2].yyyOxAttrbs,&yystack.l_mark[-1].yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs);}} +#line 1870 "expr.oxout.tab.c" break; case 5: #line 87 "expr.oxout.y" {if(yyyYok){ yyyGenIntNode(3,3,0,&yyval.yyyOxAttrbs,&yystack.l_mark[-2].yyyOxAttrbs,&yystack.l_mark[-1].yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs); yyyAdjustINRC(3,3,0,0,&yyval.yyyOxAttrbs,&yystack.l_mark[-2].yyyOxAttrbs,&yystack.l_mark[-1].yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs);}} +#line 1877 "expr.oxout.tab.c" break; case 6: #line 94 "expr.oxout.y" {if(yyyYok){ yyyGenIntNode(4,3,0,&yyval.yyyOxAttrbs,&yystack.l_mark[-2].yyyOxAttrbs,&yystack.l_mark[-1].yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs); yyyAdjustINRC(4,3,0,0,&yyval.yyyOxAttrbs,&yystack.l_mark[-2].yyyOxAttrbs,&yystack.l_mark[-1].yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs);}} +#line 1884 "expr.oxout.tab.c" break; case 7: #line 101 "expr.oxout.y" {if(yyyYok){ yyyGenIntNode(5,3,0,&yyval.yyyOxAttrbs,&yystack.l_mark[-2].yyyOxAttrbs,&yystack.l_mark[-1].yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs); yyyAdjustINRC(5,3,0,0,&yyval.yyyOxAttrbs,&yystack.l_mark[-2].yyyOxAttrbs,&yystack.l_mark[-1].yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs);}} +#line 1891 "expr.oxout.tab.c" break; case 8: #line 108 "expr.oxout.y" {if(yyyYok){ yyyGenIntNode(6,3,0,&yyval.yyyOxAttrbs,&yystack.l_mark[-2].yyyOxAttrbs,&yystack.l_mark[-1].yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs); yyyAdjustINRC(6,3,0,0,&yyval.yyyOxAttrbs,&yystack.l_mark[-2].yyyOxAttrbs,&yystack.l_mark[-1].yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs);}} +#line 1898 "expr.oxout.tab.c" break; case 9: #line 114 "expr.oxout.y" {if(yyyYok){ yyyGenIntNode(7,1,0,&yyval.yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs); yyyAdjustINRC(7,1,0,0,&yyval.yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs);}} +#line 1905 "expr.oxout.tab.c" break; case 10: #line 121 "expr.oxout.y" {if(yyyYok){ yyyGenIntNode(8,1,0,&yyval.yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs); yyyAdjustINRC(8,1,0,0,&yyval.yyyOxAttrbs,&yystack.l_mark[0].yyyOxAttrbs);}} +#line 1912 "expr.oxout.tab.c" break; -#line 1904 "expr.oxout.tab.c" +#line 1914 "expr.oxout.tab.c" } yystack.s_mark -= yym; yystate = *yystack.s_mark; diff --git a/test/yacc/expr.oxout.tab.h b/test/yacc/expr.oxout.tab.h index bdaa83b160d7..03527bb036a4 100644 --- a/test/yacc/expr.oxout.tab.h +++ b/test/yacc/expr.oxout.tab.h @@ -6,10 +6,10 @@ #endif #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 -typedef union { +typedef union YYSTYPE { struct yyyOxAttrbs { struct yyyStackItem *yyyOxStackItem; } yyyOxAttrbs; } YYSTYPE; #endif /* !YYSTYPE_IS_DECLARED */ -extern YYSTYPE expr.oxout_lval; +extern YYSTYPE expr_oxout_lval; diff --git a/test/yacc/grammar.tab.c b/test/yacc/grammar.tab.c index 399e0f8c74e7..90136eca0dba 100644 --- a/test/yacc/grammar.tab.c +++ b/test/yacc/grammar.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) @@ -454,7 +454,7 @@ extern int YYPARSE_DECL(); #define T_ASMARG 290 #define T_VA_DCL 291 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT grammar_lhs[] = { -1, 0, 0, 26, 26, 27, 27, 27, 27, 27, 27, 27, 31, 30, 30, 28, 28, 34, 28, 32, 32, @@ -1166,8 +1166,8 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; @@ -1295,12 +1295,14 @@ case 10: { yyerrok; } +#line 1299 "grammar.tab.c" break; case 11: #line 382 "grammar.y" { yyerrok; } +#line 1306 "grammar.tab.c" break; case 13: #line 393 "grammar.y" @@ -1310,12 +1312,14 @@ case 13: * have generated. */ } +#line 1316 "grammar.tab.c" break; case 14: #line 400 "grammar.y" { /* empty */ } +#line 1323 "grammar.tab.c" break; case 15: #line 407 "grammar.y" @@ -1329,6 +1333,7 @@ case 15: free_decl_spec(&yystack.l_mark[-1].decl_spec); end_typedef(); } +#line 1337 "grammar.tab.c" break; case 16: #line 418 "grammar.y" @@ -1345,6 +1350,7 @@ case 16: free_decl_spec(&yystack.l_mark[-2].decl_spec); end_typedef(); } +#line 1354 "grammar.tab.c" break; case 17: #line 432 "grammar.y" @@ -1352,24 +1358,28 @@ case 17: cur_decl_spec_flags = yystack.l_mark[0].decl_spec.flags; free_decl_spec(&yystack.l_mark[0].decl_spec); } +#line 1362 "grammar.tab.c" break; case 18: #line 437 "grammar.y" { end_typedef(); } +#line 1369 "grammar.tab.c" break; case 19: #line 444 "grammar.y" { begin_typedef(); } +#line 1376 "grammar.tab.c" break; case 20: #line 448 "grammar.y" { begin_typedef(); } +#line 1383 "grammar.tab.c" break; case 23: #line 460 "grammar.y" @@ -1384,6 +1394,7 @@ case 23: new_symbol(typedef_names, yystack.l_mark[0].declarator->name, NULL, flags); free_declarator(yystack.l_mark[0].declarator); } +#line 1398 "grammar.tab.c" break; case 24: #line 472 "grammar.y" @@ -1395,6 +1406,7 @@ case 24: new_symbol(typedef_names, yystack.l_mark[0].declarator->name, NULL, flags); free_declarator(yystack.l_mark[0].declarator); } +#line 1410 "grammar.tab.c" break; case 25: #line 484 "grammar.y" @@ -1408,6 +1420,7 @@ case 25: func_params->begin_comment = cur_file->begin_comment; func_params->end_comment = cur_file->end_comment; } +#line 1424 "grammar.tab.c" break; case 26: #line 495 "grammar.y" @@ -1434,6 +1447,7 @@ case 26: free_decl_spec(&yystack.l_mark[-4].decl_spec); free_declarator(yystack.l_mark[-3].declarator); } +#line 1451 "grammar.tab.c" break; case 28: #line 520 "grammar.y" @@ -1446,6 +1460,7 @@ case 28: func_params->begin_comment = cur_file->begin_comment; func_params->end_comment = cur_file->end_comment; } +#line 1464 "grammar.tab.c" break; case 29: #line 530 "grammar.y" @@ -1464,6 +1479,7 @@ case 29: free_decl_spec(&decl_spec); free_declarator(yystack.l_mark[-4].declarator); } +#line 1483 "grammar.tab.c" break; case 36: #line 561 "grammar.y" @@ -1472,114 +1488,133 @@ case 36: free(yystack.l_mark[-1].decl_spec.text); free(yystack.l_mark[0].decl_spec.text); } +#line 1492 "grammar.tab.c" break; case 40: #line 576 "grammar.y" { new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE); } +#line 1499 "grammar.tab.c" break; case 41: #line 580 "grammar.y" { new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_EXTERN); } +#line 1506 "grammar.tab.c" break; case 42: #line 584 "grammar.y" { new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE); } +#line 1513 "grammar.tab.c" break; case 43: #line 588 "grammar.y" { new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_STATIC); } +#line 1520 "grammar.tab.c" break; case 44: #line 592 "grammar.y" { new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_INLINE); } +#line 1527 "grammar.tab.c" break; case 45: #line 596 "grammar.y" { new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_JUNK); } +#line 1534 "grammar.tab.c" break; case 46: #line 603 "grammar.y" { new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_CHAR); } +#line 1541 "grammar.tab.c" break; case 47: #line 607 "grammar.y" { new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE); } +#line 1548 "grammar.tab.c" break; case 48: #line 611 "grammar.y" { new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_FLOAT); } +#line 1555 "grammar.tab.c" break; case 49: #line 615 "grammar.y" { new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE); } +#line 1562 "grammar.tab.c" break; case 50: #line 619 "grammar.y" { new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE); } +#line 1569 "grammar.tab.c" break; case 51: #line 623 "grammar.y" { new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_SHORT); } +#line 1576 "grammar.tab.c" break; case 52: #line 627 "grammar.y" { new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE); } +#line 1583 "grammar.tab.c" break; case 53: #line 631 "grammar.y" { new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE); } +#line 1590 "grammar.tab.c" break; case 54: #line 635 "grammar.y" { new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE); } +#line 1597 "grammar.tab.c" break; case 55: #line 639 "grammar.y" { new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_CHAR); } +#line 1604 "grammar.tab.c" break; case 56: #line 643 "grammar.y" { new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE); } +#line 1611 "grammar.tab.c" break; case 57: #line 647 "grammar.y" { new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE); } +#line 1618 "grammar.tab.c" break; case 58: #line 651 "grammar.y" @@ -1589,12 +1624,14 @@ case 58: if (s != NULL) new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, s->flags); } +#line 1628 "grammar.tab.c" break; case 61: #line 663 "grammar.y" { new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE); } +#line 1635 "grammar.tab.c" break; case 62: #line 667 "grammar.y" @@ -1607,6 +1644,7 @@ case 62: if (s != NULL) new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, s->flags); } +#line 1648 "grammar.tab.c" break; case 63: #line 680 "grammar.y" @@ -1616,6 +1654,7 @@ case 63: (void)sprintf(s = buf, "%.*s %.*s", TEXT_LEN, yystack.l_mark[-2].text.text, TEXT_LEN, yystack.l_mark[-1].text.text); new_decl_spec(&yyval.decl_spec, s, yystack.l_mark[-2].text.begin, DS_NONE); } +#line 1658 "grammar.tab.c" break; case 64: #line 687 "grammar.y" @@ -1625,6 +1664,7 @@ case 64: (void)sprintf(s = buf, "%.*s {}", TEXT_LEN, yystack.l_mark[-1].text.text); new_decl_spec(&yyval.decl_spec, s, yystack.l_mark[-1].text.begin, DS_NONE); } +#line 1668 "grammar.tab.c" break; case 65: #line 694 "grammar.y" @@ -1632,30 +1672,35 @@ case 65: (void)sprintf(buf, "%.*s %.*s", TEXT_LEN, yystack.l_mark[-1].text.text, TEXT_LEN, yystack.l_mark[0].text.text); new_decl_spec(&yyval.decl_spec, buf, yystack.l_mark[-1].text.begin, DS_NONE); } +#line 1676 "grammar.tab.c" break; case 66: #line 702 "grammar.y" { imply_typedef(yyval.text.text); } +#line 1683 "grammar.tab.c" break; case 67: #line 706 "grammar.y" { imply_typedef(yyval.text.text); } +#line 1690 "grammar.tab.c" break; case 68: #line 713 "grammar.y" { new_decl_list(&yyval.decl_list, yystack.l_mark[0].declarator); } +#line 1697 "grammar.tab.c" break; case 69: #line 717 "grammar.y" { add_decl_list(&yyval.decl_list, &yystack.l_mark[-2].decl_list, yystack.l_mark[0].declarator); } +#line 1704 "grammar.tab.c" break; case 70: #line 724 "grammar.y" @@ -1667,6 +1712,7 @@ case 70: } cur_declarator = yyval.declarator; } +#line 1716 "grammar.tab.c" break; case 71: #line 733 "grammar.y" @@ -1677,6 +1723,7 @@ case 71: fputs(" =", cur_file->tmp_file); } } +#line 1727 "grammar.tab.c" break; case 73: #line 745 "grammar.y" @@ -1686,6 +1733,7 @@ case 73: (void)sprintf(s = buf, "enum %.*s", TEXT_LEN, yystack.l_mark[-1].text.text); new_decl_spec(&yyval.decl_spec, s, yystack.l_mark[-2].text.begin, DS_NONE); } +#line 1737 "grammar.tab.c" break; case 74: #line 752 "grammar.y" @@ -1695,6 +1743,7 @@ case 74: (void)sprintf(s = buf, "%.*s {}", TEXT_LEN, yystack.l_mark[-1].text.text); new_decl_spec(&yyval.decl_spec, s, yystack.l_mark[-1].text.begin, DS_NONE); } +#line 1747 "grammar.tab.c" break; case 75: #line 759 "grammar.y" @@ -1702,6 +1751,7 @@ case 75: (void)sprintf(buf, "enum %.*s", TEXT_LEN, yystack.l_mark[0].text.text); new_decl_spec(&yyval.decl_spec, buf, yystack.l_mark[-1].text.begin, DS_NONE); } +#line 1755 "grammar.tab.c" break; case 76: #line 767 "grammar.y" @@ -1709,6 +1759,7 @@ case 76: imply_typedef("enum"); yyval.text = yystack.l_mark[0].text; } +#line 1763 "grammar.tab.c" break; case 79: #line 780 "grammar.y" @@ -1720,12 +1771,14 @@ case 79: yyval.declarator->begin = yystack.l_mark[-1].text.begin; yyval.declarator->pointer = TRUE; } +#line 1775 "grammar.tab.c" break; case 81: #line 793 "grammar.y" { yyval.declarator = new_declarator(yystack.l_mark[0].text.text, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin); } +#line 1782 "grammar.tab.c" break; case 82: #line 797 "grammar.y" @@ -1736,6 +1789,7 @@ case 82: yyval.declarator->text = xstrdup(buf); yyval.declarator->begin = yystack.l_mark[-2].text.begin; } +#line 1793 "grammar.tab.c" break; case 83: #line 805 "grammar.y" @@ -1745,6 +1799,7 @@ case 83: free(yyval.declarator->text); yyval.declarator->text = xstrdup(buf); } +#line 1803 "grammar.tab.c" break; case 84: #line 812 "grammar.y" @@ -1755,6 +1810,7 @@ case 84: yyval.declarator->head = (yystack.l_mark[-3].declarator->func_stack == NULL) ? yyval.declarator : yystack.l_mark[-3].declarator->head; yyval.declarator->func_def = FUNC_ANSI; } +#line 1814 "grammar.tab.c" break; case 85: #line 820 "grammar.y" @@ -1765,6 +1821,7 @@ case 85: yyval.declarator->head = (yystack.l_mark[-3].declarator->func_stack == NULL) ? yyval.declarator : yystack.l_mark[-3].declarator->head; yyval.declarator->func_def = FUNC_TRADITIONAL; } +#line 1825 "grammar.tab.c" break; case 86: #line 831 "grammar.y" @@ -1772,6 +1829,7 @@ case 86: (void)sprintf(yyval.text.text, "*%.*s", TEXT_LEN, yystack.l_mark[0].text.text); yyval.text.begin = yystack.l_mark[-1].text.begin; } +#line 1833 "grammar.tab.c" break; case 87: #line 836 "grammar.y" @@ -1779,6 +1837,7 @@ case 87: (void)sprintf(yyval.text.text, "*%.*s%.*s", TEXT_LEN, yystack.l_mark[-1].text.text, TEXT_LEN, yystack.l_mark[0].text.text); yyval.text.begin = yystack.l_mark[-2].text.begin; } +#line 1841 "grammar.tab.c" break; case 88: #line 844 "grammar.y" @@ -1786,6 +1845,7 @@ case 88: strcpy(yyval.text.text, ""); yyval.text.begin = 0L; } +#line 1849 "grammar.tab.c" break; case 90: #line 853 "grammar.y" @@ -1794,6 +1854,7 @@ case 90: yyval.text.begin = yystack.l_mark[0].decl_spec.begin; free(yystack.l_mark[0].decl_spec.text); } +#line 1858 "grammar.tab.c" break; case 91: #line 859 "grammar.y" @@ -1802,24 +1863,28 @@ case 91: yyval.text.begin = yystack.l_mark[-1].text.begin; free(yystack.l_mark[0].decl_spec.text); } +#line 1867 "grammar.tab.c" break; case 93: #line 869 "grammar.y" { add_ident_list(&yyval.param_list, &yystack.l_mark[-2].param_list, "..."); } +#line 1874 "grammar.tab.c" break; case 94: #line 876 "grammar.y" { new_param_list(&yyval.param_list, yystack.l_mark[0].parameter); } +#line 1881 "grammar.tab.c" break; case 95: #line 880 "grammar.y" { add_param_list(&yyval.param_list, &yystack.l_mark[-2].param_list, yystack.l_mark[0].parameter); } +#line 1888 "grammar.tab.c" break; case 96: #line 887 "grammar.y" @@ -1827,6 +1892,7 @@ case 96: check_untagged(&yystack.l_mark[-1].decl_spec); yyval.parameter = new_parameter(&yystack.l_mark[-1].decl_spec, yystack.l_mark[0].declarator); } +#line 1896 "grammar.tab.c" break; case 97: #line 892 "grammar.y" @@ -1834,6 +1900,7 @@ case 97: check_untagged(&yystack.l_mark[-1].decl_spec); yyval.parameter = new_parameter(&yystack.l_mark[-1].decl_spec, yystack.l_mark[0].declarator); } +#line 1904 "grammar.tab.c" break; case 98: #line 897 "grammar.y" @@ -1841,12 +1908,14 @@ case 98: check_untagged(&yystack.l_mark[0].decl_spec); yyval.parameter = new_parameter(&yystack.l_mark[0].decl_spec, (Declarator *)0); } +#line 1912 "grammar.tab.c" break; case 99: #line 905 "grammar.y" { new_ident_list(&yyval.param_list); } +#line 1919 "grammar.tab.c" break; case 101: #line 913 "grammar.y" @@ -1854,18 +1923,21 @@ case 101: new_ident_list(&yyval.param_list); add_ident_list(&yyval.param_list, &yyval.param_list, yystack.l_mark[0].text.text); } +#line 1927 "grammar.tab.c" break; case 102: #line 918 "grammar.y" { add_ident_list(&yyval.param_list, &yystack.l_mark[-2].param_list, yystack.l_mark[0].text.text); } +#line 1934 "grammar.tab.c" break; case 103: #line 925 "grammar.y" { yyval.text = yystack.l_mark[0].text; } +#line 1941 "grammar.tab.c" break; case 104: #line 929 "grammar.y" @@ -1878,12 +1950,14 @@ case 104: (void)sprintf(yyval.text.text, "&%.*s", TEXT_LEN, yystack.l_mark[0].text.text); yyval.text.begin = yystack.l_mark[-1].text.begin; } +#line 1954 "grammar.tab.c" break; case 105: #line 942 "grammar.y" { yyval.declarator = new_declarator(yystack.l_mark[0].text.text, "", yystack.l_mark[0].text.begin); } +#line 1961 "grammar.tab.c" break; case 106: #line 946 "grammar.y" @@ -1894,6 +1968,7 @@ case 106: yyval.declarator->text = xstrdup(buf); yyval.declarator->begin = yystack.l_mark[-1].text.begin; } +#line 1972 "grammar.tab.c" break; case 108: #line 958 "grammar.y" @@ -1904,6 +1979,7 @@ case 108: yyval.declarator->text = xstrdup(buf); yyval.declarator->begin = yystack.l_mark[-2].text.begin; } +#line 1983 "grammar.tab.c" break; case 109: #line 966 "grammar.y" @@ -1913,12 +1989,14 @@ case 109: free(yyval.declarator->text); yyval.declarator->text = xstrdup(buf); } +#line 1993 "grammar.tab.c" break; case 110: #line 973 "grammar.y" { yyval.declarator = new_declarator(yystack.l_mark[0].text.text, "", yystack.l_mark[0].text.begin); } +#line 2000 "grammar.tab.c" break; case 111: #line 977 "grammar.y" @@ -1929,6 +2007,7 @@ case 111: yyval.declarator->head = (yystack.l_mark[-3].declarator->func_stack == NULL) ? yyval.declarator : yystack.l_mark[-3].declarator->head; yyval.declarator->func_def = FUNC_ANSI; } +#line 2011 "grammar.tab.c" break; case 112: #line 985 "grammar.y" @@ -1938,6 +2017,7 @@ case 112: yyval.declarator->head = (yystack.l_mark[-2].declarator->func_stack == NULL) ? yyval.declarator : yystack.l_mark[-2].declarator->head; yyval.declarator->func_def = FUNC_ANSI; } +#line 2021 "grammar.tab.c" break; case 113: #line 992 "grammar.y" @@ -1951,6 +2031,7 @@ case 113: yyval.declarator->head = yyval.declarator; yyval.declarator->func_def = FUNC_ANSI; } +#line 2035 "grammar.tab.c" break; case 114: #line 1003 "grammar.y" @@ -1963,8 +2044,9 @@ case 114: yyval.declarator->head = yyval.declarator; yyval.declarator->func_def = FUNC_ANSI; } +#line 2048 "grammar.tab.c" break; -#line 1968 "grammar.tab.c" +#line 2050 "grammar.tab.c" } yystack.s_mark -= yym; yystate = *yystack.s_mark; diff --git a/test/yacc/help.error b/test/yacc/help.error index f69a74a93091..c4d890b024ca 100644 --- a/test/yacc/help.error +++ b/test/yacc/help.error @@ -5,6 +5,7 @@ Options: -b file_prefix set filename prefix (default "y.") -B create a backtracking parser -d write definitions (.tab.h) + -h print this help-message -H defines_file write definitions to defines_file -i write interface (y.tab.i) -g write a graphical description @@ -18,3 +19,13 @@ Options: -t add debugging support -v write description (y.output) -V show version information and exit + +Long options: + --defines -H + --file-prefix -b + --graph -g + --help -h + --name-prefix -p + --no-lines -l + --output -o + --version -V diff --git a/test/yacc/no_b_opt.error b/test/yacc/no_b_opt.error index f69a74a93091..c4d890b024ca 100644 --- a/test/yacc/no_b_opt.error +++ b/test/yacc/no_b_opt.error @@ -5,6 +5,7 @@ Options: -b file_prefix set filename prefix (default "y.") -B create a backtracking parser -d write definitions (.tab.h) + -h print this help-message -H defines_file write definitions to defines_file -i write interface (y.tab.i) -g write a graphical description @@ -18,3 +19,13 @@ Options: -t add debugging support -v write description (y.output) -V show version information and exit + +Long options: + --defines -H + --file-prefix -b + --graph -g + --help -h + --name-prefix -p + --no-lines -l + --output -o + --version -V diff --git a/test/yacc/no_output2.error b/test/yacc/no_output2.error index f69a74a93091..c4d890b024ca 100644 --- a/test/yacc/no_output2.error +++ b/test/yacc/no_output2.error @@ -5,6 +5,7 @@ Options: -b file_prefix set filename prefix (default "y.") -B create a backtracking parser -d write definitions (.tab.h) + -h print this help-message -H defines_file write definitions to defines_file -i write interface (y.tab.i) -g write a graphical description @@ -18,3 +19,13 @@ Options: -t add debugging support -v write description (y.output) -V show version information and exit + +Long options: + --defines -H + --file-prefix -b + --graph -g + --help -h + --name-prefix -p + --no-lines -l + --output -o + --version -V diff --git a/test/yacc/no_p_opt.error b/test/yacc/no_p_opt.error index f69a74a93091..c4d890b024ca 100644 --- a/test/yacc/no_p_opt.error +++ b/test/yacc/no_p_opt.error @@ -5,6 +5,7 @@ Options: -b file_prefix set filename prefix (default "y.") -B create a backtracking parser -d write definitions (.tab.h) + -h print this help-message -H defines_file write definitions to defines_file -i write interface (y.tab.i) -g write a graphical description @@ -18,3 +19,13 @@ Options: -t add debugging support -v write description (y.output) -V show version information and exit + +Long options: + --defines -H + --file-prefix -b + --graph -g + --help -h + --name-prefix -p + --no-lines -l + --output -o + --version -V diff --git a/test/yacc/nostdin.error b/test/yacc/nostdin.error index 67101620d2c1..7f74f49a89bc 100644 --- a/test/yacc/nostdin.error +++ b/test/yacc/nostdin.error @@ -4,6 +4,7 @@ Options: -b file_prefix set filename prefix (default "y.") -B create a backtracking parser -d write definitions (.tab.h) + -h print this help-message -H defines_file write definitions to defines_file -i write interface (y.tab.i) -g write a graphical description @@ -17,3 +18,13 @@ Options: -t add debugging support -v write description (y.output) -V show version information and exit + +Long options: + --defines -H + --file-prefix -b + --graph -g + --help -h + --name-prefix -p + --no-lines -l + --output -o + --version -V diff --git a/test/yacc/ok_syntax1.tab.c b/test/yacc/ok_syntax1.tab.c index c1bbc4ffc48e..3d97e7db7c32 100644 --- a/test/yacc/ok_syntax1.tab.c +++ b/test/yacc/ok_syntax1.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) @@ -117,7 +117,7 @@ static void YYERROR_DECL(); #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 #line 43 "ok_syntax1.y" -typedef union +typedef union YYSTYPE { char * cval; int ival; @@ -178,7 +178,7 @@ extern int YYPARSE_DECL(); #define VT 272 #define UMINUS 273 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT ok_syntax1_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, @@ -472,8 +472,8 @@ YYPARSE_DECL() memset(&yyval, 0, sizeof(yyval)); memset(&yylval, 0, sizeof(yylval)); - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; @@ -599,64 +599,79 @@ yyreduce: case 3: #line 66 "ok_syntax1.y" { yyerrok ; } +#line 603 "ok_syntax1.tab.c" break; case 4: #line 70 "ok_syntax1.y" { printf("%d\n",yystack.l_mark[0].ival);} +#line 608 "ok_syntax1.tab.c" break; case 5: #line 72 "ok_syntax1.y" { regs[yystack.l_mark[-2].ival] = yystack.l_mark[0].ival; } +#line 613 "ok_syntax1.tab.c" break; case 6: #line 76 "ok_syntax1.y" { yyval.ival = yystack.l_mark[-1].ival; } +#line 618 "ok_syntax1.tab.c" break; case 7: #line 78 "ok_syntax1.y" { yyval.ival = yystack.l_mark[-2].ival + yystack.l_mark[0].ival; } +#line 623 "ok_syntax1.tab.c" break; case 8: #line 80 "ok_syntax1.y" { yyval.ival = yystack.l_mark[-2].ival - yystack.l_mark[0].ival; } +#line 628 "ok_syntax1.tab.c" break; case 9: #line 82 "ok_syntax1.y" { yyval.ival = yystack.l_mark[-2].ival * yystack.l_mark[0].ival; } +#line 633 "ok_syntax1.tab.c" break; case 10: #line 84 "ok_syntax1.y" { yyval.ival = yystack.l_mark[-2].ival / yystack.l_mark[0].ival; } +#line 638 "ok_syntax1.tab.c" break; case 11: #line 86 "ok_syntax1.y" { yyval.ival = yystack.l_mark[-2].ival % yystack.l_mark[0].ival; } +#line 643 "ok_syntax1.tab.c" break; case 12: #line 88 "ok_syntax1.y" { yyval.ival = yystack.l_mark[-2].ival & yystack.l_mark[0].ival; } +#line 648 "ok_syntax1.tab.c" break; case 13: #line 90 "ok_syntax1.y" { yyval.ival = yystack.l_mark[-2].ival | yystack.l_mark[0].ival; } +#line 653 "ok_syntax1.tab.c" break; case 14: #line 92 "ok_syntax1.y" { yyval.ival = - yystack.l_mark[0].ival; } +#line 658 "ok_syntax1.tab.c" break; case 15: #line 94 "ok_syntax1.y" { yyval.ival = regs[yystack.l_mark[0].ival]; } +#line 663 "ok_syntax1.tab.c" break; case 17: #line 99 "ok_syntax1.y" { yyval.ival = yystack.l_mark[0].ival; (*base) = (yystack.l_mark[0].ival==0) ? 8 : 10; } +#line 668 "ok_syntax1.tab.c" break; case 18: #line 101 "ok_syntax1.y" { yyval.ival = (*base) * yystack.l_mark[-1].ival + yystack.l_mark[0].ival; } +#line 673 "ok_syntax1.tab.c" break; -#line 660 "ok_syntax1.tab.c" +#line 675 "ok_syntax1.tab.c" } yystack.s_mark -= yym; yystate = *yystack.s_mark; diff --git a/test/yacc/ok_syntax1.tab.h b/test/yacc/ok_syntax1.tab.h index 892b211c8a71..ca92fd77dfc2 100644 --- a/test/yacc/ok_syntax1.tab.h +++ b/test/yacc/ok_syntax1.tab.h @@ -20,7 +20,7 @@ #endif #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 -typedef union +typedef union YYSTYPE { char * cval; int ival; diff --git a/test/yacc/pure_calc.tab.c b/test/yacc/pure_calc.tab.c index ee47ce6cb021..eb0021549e27 100644 --- a/test/yacc/pure_calc.tab.c +++ b/test/yacc/pure_calc.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) @@ -160,7 +160,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT calc_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, @@ -444,8 +444,8 @@ YYPARSE_DECL() memset(&yyval, 0, sizeof(yyval)); memset(&yylval, 0, sizeof(yylval)); - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; @@ -571,64 +571,79 @@ yyreduce: case 3: #line 34 "pure_calc.y" { yyerrok ; } +#line 575 "pure_calc.tab.c" break; case 4: #line 38 "pure_calc.y" { printf("%d\n",yystack.l_mark[0]);} +#line 580 "pure_calc.tab.c" break; case 5: #line 40 "pure_calc.y" { regs[yystack.l_mark[-2]] = yystack.l_mark[0]; } +#line 585 "pure_calc.tab.c" break; case 6: #line 44 "pure_calc.y" { yyval = yystack.l_mark[-1]; } +#line 590 "pure_calc.tab.c" break; case 7: #line 46 "pure_calc.y" { yyval = yystack.l_mark[-2] + yystack.l_mark[0]; } +#line 595 "pure_calc.tab.c" break; case 8: #line 48 "pure_calc.y" { yyval = yystack.l_mark[-2] - yystack.l_mark[0]; } +#line 600 "pure_calc.tab.c" break; case 9: #line 50 "pure_calc.y" { yyval = yystack.l_mark[-2] * yystack.l_mark[0]; } +#line 605 "pure_calc.tab.c" break; case 10: #line 52 "pure_calc.y" { yyval = yystack.l_mark[-2] / yystack.l_mark[0]; } +#line 610 "pure_calc.tab.c" break; case 11: #line 54 "pure_calc.y" { yyval = yystack.l_mark[-2] % yystack.l_mark[0]; } +#line 615 "pure_calc.tab.c" break; case 12: #line 56 "pure_calc.y" { yyval = yystack.l_mark[-2] & yystack.l_mark[0]; } +#line 620 "pure_calc.tab.c" break; case 13: #line 58 "pure_calc.y" { yyval = yystack.l_mark[-2] | yystack.l_mark[0]; } +#line 625 "pure_calc.tab.c" break; case 14: #line 60 "pure_calc.y" { yyval = - yystack.l_mark[0]; } +#line 630 "pure_calc.tab.c" break; case 15: #line 62 "pure_calc.y" { yyval = regs[yystack.l_mark[0]]; } +#line 635 "pure_calc.tab.c" break; case 17: #line 67 "pure_calc.y" { yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; } +#line 640 "pure_calc.tab.c" break; case 18: #line 69 "pure_calc.y" { yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; } +#line 645 "pure_calc.tab.c" break; -#line 632 "pure_calc.tab.c" +#line 647 "pure_calc.tab.c" } yystack.s_mark -= yym; yystate = *yystack.s_mark; diff --git a/test/yacc/pure_error.tab.c b/test/yacc/pure_error.tab.c index 91bbed670c15..f3e13bee933e 100644 --- a/test/yacc/pure_error.tab.c +++ b/test/yacc/pure_error.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) @@ -152,7 +152,7 @@ typedef int YYSTYPE; extern int YYPARSE_DECL(); #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT error_lhs[] = { -1, 0, }; @@ -341,8 +341,8 @@ YYPARSE_DECL() memset(&yyval, 0, sizeof(yyval)); memset(&yylval, 0, sizeof(yylval)); - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; diff --git a/test/yacc/quote_calc-s.tab.c b/test/yacc/quote_calc-s.tab.c index fa9d70394997..588c14b76a3b 100644 --- a/test/yacc/quote_calc-s.tab.c +++ b/test/yacc/quote_calc-s.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) @@ -156,7 +156,7 @@ extern int YYPARSE_DECL(); #define LETTER 270 #define UMINUS 271 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT quote_calc_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, @@ -442,8 +442,8 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; @@ -569,64 +569,79 @@ yyreduce: case 3: #line 35 "quote_calc.y" { yyerrok ; } +#line 573 "quote_calc-s.tab.c" break; case 4: #line 39 "quote_calc.y" { printf("%d\n",yystack.l_mark[0]);} +#line 578 "quote_calc-s.tab.c" break; case 5: #line 41 "quote_calc.y" { regs[yystack.l_mark[-2]] = yystack.l_mark[0]; } +#line 583 "quote_calc-s.tab.c" break; case 6: #line 45 "quote_calc.y" { yyval = yystack.l_mark[-1]; } +#line 588 "quote_calc-s.tab.c" break; case 7: #line 47 "quote_calc.y" { yyval = yystack.l_mark[-2] + yystack.l_mark[0]; } +#line 593 "quote_calc-s.tab.c" break; case 8: #line 49 "quote_calc.y" { yyval = yystack.l_mark[-2] - yystack.l_mark[0]; } +#line 598 "quote_calc-s.tab.c" break; case 9: #line 51 "quote_calc.y" { yyval = yystack.l_mark[-2] * yystack.l_mark[0]; } +#line 603 "quote_calc-s.tab.c" break; case 10: #line 53 "quote_calc.y" { yyval = yystack.l_mark[-2] / yystack.l_mark[0]; } +#line 608 "quote_calc-s.tab.c" break; case 11: #line 55 "quote_calc.y" { yyval = yystack.l_mark[-2] % yystack.l_mark[0]; } +#line 613 "quote_calc-s.tab.c" break; case 12: #line 57 "quote_calc.y" { yyval = yystack.l_mark[-2] & yystack.l_mark[0]; } +#line 618 "quote_calc-s.tab.c" break; case 13: #line 59 "quote_calc.y" { yyval = yystack.l_mark[-2] | yystack.l_mark[0]; } +#line 623 "quote_calc-s.tab.c" break; case 14: #line 61 "quote_calc.y" { yyval = - yystack.l_mark[0]; } +#line 628 "quote_calc-s.tab.c" break; case 15: #line 63 "quote_calc.y" { yyval = regs[yystack.l_mark[0]]; } +#line 633 "quote_calc-s.tab.c" break; case 17: #line 68 "quote_calc.y" { yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; } +#line 638 "quote_calc-s.tab.c" break; case 18: #line 70 "quote_calc.y" { yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; } +#line 643 "quote_calc-s.tab.c" break; -#line 630 "quote_calc-s.tab.c" +#line 645 "quote_calc-s.tab.c" } yystack.s_mark -= yym; yystate = *yystack.s_mark; diff --git a/test/yacc/quote_calc.tab.c b/test/yacc/quote_calc.tab.c index 3ddf2ff08f9e..33a718e5eaaa 100644 --- a/test/yacc/quote_calc.tab.c +++ b/test/yacc/quote_calc.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) @@ -162,7 +162,7 @@ extern int YYPARSE_DECL(); #define LETTER 270 #define UMINUS 271 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT quote_calc_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, @@ -448,8 +448,8 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; @@ -575,64 +575,79 @@ yyreduce: case 3: #line 35 "quote_calc.y" { yyerrok ; } +#line 579 "quote_calc.tab.c" break; case 4: #line 39 "quote_calc.y" { printf("%d\n",yystack.l_mark[0]);} +#line 584 "quote_calc.tab.c" break; case 5: #line 41 "quote_calc.y" { regs[yystack.l_mark[-2]] = yystack.l_mark[0]; } +#line 589 "quote_calc.tab.c" break; case 6: #line 45 "quote_calc.y" { yyval = yystack.l_mark[-1]; } +#line 594 "quote_calc.tab.c" break; case 7: #line 47 "quote_calc.y" { yyval = yystack.l_mark[-2] + yystack.l_mark[0]; } +#line 599 "quote_calc.tab.c" break; case 8: #line 49 "quote_calc.y" { yyval = yystack.l_mark[-2] - yystack.l_mark[0]; } +#line 604 "quote_calc.tab.c" break; case 9: #line 51 "quote_calc.y" { yyval = yystack.l_mark[-2] * yystack.l_mark[0]; } +#line 609 "quote_calc.tab.c" break; case 10: #line 53 "quote_calc.y" { yyval = yystack.l_mark[-2] / yystack.l_mark[0]; } +#line 614 "quote_calc.tab.c" break; case 11: #line 55 "quote_calc.y" { yyval = yystack.l_mark[-2] % yystack.l_mark[0]; } +#line 619 "quote_calc.tab.c" break; case 12: #line 57 "quote_calc.y" { yyval = yystack.l_mark[-2] & yystack.l_mark[0]; } +#line 624 "quote_calc.tab.c" break; case 13: #line 59 "quote_calc.y" { yyval = yystack.l_mark[-2] | yystack.l_mark[0]; } +#line 629 "quote_calc.tab.c" break; case 14: #line 61 "quote_calc.y" { yyval = - yystack.l_mark[0]; } +#line 634 "quote_calc.tab.c" break; case 15: #line 63 "quote_calc.y" { yyval = regs[yystack.l_mark[0]]; } +#line 639 "quote_calc.tab.c" break; case 17: #line 68 "quote_calc.y" { yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; } +#line 644 "quote_calc.tab.c" break; case 18: #line 70 "quote_calc.y" { yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; } +#line 649 "quote_calc.tab.c" break; -#line 636 "quote_calc.tab.c" +#line 651 "quote_calc.tab.c" } yystack.s_mark -= yym; yystate = *yystack.s_mark; diff --git a/test/yacc/quote_calc2-s.tab.c b/test/yacc/quote_calc2-s.tab.c index 43d268218cd3..98438d9f5675 100644 --- a/test/yacc/quote_calc2-s.tab.c +++ b/test/yacc/quote_calc2-s.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) @@ -156,7 +156,7 @@ extern int YYPARSE_DECL(); #define LETTER 270 #define UMINUS 271 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT quote_calc2_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, @@ -442,8 +442,8 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; @@ -569,64 +569,79 @@ yyreduce: case 3: #line 35 "quote_calc2.y" { yyerrok ; } +#line 573 "quote_calc2-s.tab.c" break; case 4: #line 39 "quote_calc2.y" { printf("%d\n",yystack.l_mark[0]);} +#line 578 "quote_calc2-s.tab.c" break; case 5: #line 41 "quote_calc2.y" { regs[yystack.l_mark[-2]] = yystack.l_mark[0]; } +#line 583 "quote_calc2-s.tab.c" break; case 6: #line 45 "quote_calc2.y" { yyval = yystack.l_mark[-1]; } +#line 588 "quote_calc2-s.tab.c" break; case 7: #line 47 "quote_calc2.y" { yyval = yystack.l_mark[-2] + yystack.l_mark[0]; } +#line 593 "quote_calc2-s.tab.c" break; case 8: #line 49 "quote_calc2.y" { yyval = yystack.l_mark[-2] - yystack.l_mark[0]; } +#line 598 "quote_calc2-s.tab.c" break; case 9: #line 51 "quote_calc2.y" { yyval = yystack.l_mark[-2] * yystack.l_mark[0]; } +#line 603 "quote_calc2-s.tab.c" break; case 10: #line 53 "quote_calc2.y" { yyval = yystack.l_mark[-2] / yystack.l_mark[0]; } +#line 608 "quote_calc2-s.tab.c" break; case 11: #line 55 "quote_calc2.y" { yyval = yystack.l_mark[-2] % yystack.l_mark[0]; } +#line 613 "quote_calc2-s.tab.c" break; case 12: #line 57 "quote_calc2.y" { yyval = yystack.l_mark[-2] & yystack.l_mark[0]; } +#line 618 "quote_calc2-s.tab.c" break; case 13: #line 59 "quote_calc2.y" { yyval = yystack.l_mark[-2] | yystack.l_mark[0]; } +#line 623 "quote_calc2-s.tab.c" break; case 14: #line 61 "quote_calc2.y" { yyval = - yystack.l_mark[0]; } +#line 628 "quote_calc2-s.tab.c" break; case 15: #line 63 "quote_calc2.y" { yyval = regs[yystack.l_mark[0]]; } +#line 633 "quote_calc2-s.tab.c" break; case 17: #line 68 "quote_calc2.y" { yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; } +#line 638 "quote_calc2-s.tab.c" break; case 18: #line 70 "quote_calc2.y" { yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; } +#line 643 "quote_calc2-s.tab.c" break; -#line 630 "quote_calc2-s.tab.c" +#line 645 "quote_calc2-s.tab.c" } yystack.s_mark -= yym; yystate = *yystack.s_mark; diff --git a/test/yacc/quote_calc2.tab.c b/test/yacc/quote_calc2.tab.c index 1699b7fbafaf..8301c570b695 100644 --- a/test/yacc/quote_calc2.tab.c +++ b/test/yacc/quote_calc2.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) @@ -162,7 +162,7 @@ extern int YYPARSE_DECL(); #define LETTER 270 #define UMINUS 271 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT quote_calc2_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, @@ -448,8 +448,8 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; @@ -575,64 +575,79 @@ yyreduce: case 3: #line 35 "quote_calc2.y" { yyerrok ; } +#line 579 "quote_calc2.tab.c" break; case 4: #line 39 "quote_calc2.y" { printf("%d\n",yystack.l_mark[0]);} +#line 584 "quote_calc2.tab.c" break; case 5: #line 41 "quote_calc2.y" { regs[yystack.l_mark[-2]] = yystack.l_mark[0]; } +#line 589 "quote_calc2.tab.c" break; case 6: #line 45 "quote_calc2.y" { yyval = yystack.l_mark[-1]; } +#line 594 "quote_calc2.tab.c" break; case 7: #line 47 "quote_calc2.y" { yyval = yystack.l_mark[-2] + yystack.l_mark[0]; } +#line 599 "quote_calc2.tab.c" break; case 8: #line 49 "quote_calc2.y" { yyval = yystack.l_mark[-2] - yystack.l_mark[0]; } +#line 604 "quote_calc2.tab.c" break; case 9: #line 51 "quote_calc2.y" { yyval = yystack.l_mark[-2] * yystack.l_mark[0]; } +#line 609 "quote_calc2.tab.c" break; case 10: #line 53 "quote_calc2.y" { yyval = yystack.l_mark[-2] / yystack.l_mark[0]; } +#line 614 "quote_calc2.tab.c" break; case 11: #line 55 "quote_calc2.y" { yyval = yystack.l_mark[-2] % yystack.l_mark[0]; } +#line 619 "quote_calc2.tab.c" break; case 12: #line 57 "quote_calc2.y" { yyval = yystack.l_mark[-2] & yystack.l_mark[0]; } +#line 624 "quote_calc2.tab.c" break; case 13: #line 59 "quote_calc2.y" { yyval = yystack.l_mark[-2] | yystack.l_mark[0]; } +#line 629 "quote_calc2.tab.c" break; case 14: #line 61 "quote_calc2.y" { yyval = - yystack.l_mark[0]; } +#line 634 "quote_calc2.tab.c" break; case 15: #line 63 "quote_calc2.y" { yyval = regs[yystack.l_mark[0]]; } +#line 639 "quote_calc2.tab.c" break; case 17: #line 68 "quote_calc2.y" { yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; } +#line 644 "quote_calc2.tab.c" break; case 18: #line 70 "quote_calc2.y" { yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; } +#line 649 "quote_calc2.tab.c" break; -#line 636 "quote_calc2.tab.c" +#line 651 "quote_calc2.tab.c" } yystack.s_mark -= yym; yystate = *yystack.s_mark; diff --git a/test/yacc/quote_calc3-s.tab.c b/test/yacc/quote_calc3-s.tab.c index 351d530dd5f3..599ff8bfa751 100644 --- a/test/yacc/quote_calc3-s.tab.c +++ b/test/yacc/quote_calc3-s.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) @@ -156,7 +156,7 @@ extern int YYPARSE_DECL(); #define LETTER 270 #define UMINUS 271 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT quote_calc3_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, @@ -443,8 +443,8 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; @@ -570,64 +570,79 @@ yyreduce: case 3: #line 35 "quote_calc3.y" { yyerrok ; } +#line 574 "quote_calc3-s.tab.c" break; case 4: #line 39 "quote_calc3.y" { printf("%d\n",yystack.l_mark[0]);} +#line 579 "quote_calc3-s.tab.c" break; case 5: #line 41 "quote_calc3.y" { regs[yystack.l_mark[-2]] = yystack.l_mark[0]; } +#line 584 "quote_calc3-s.tab.c" break; case 6: #line 45 "quote_calc3.y" { yyval = yystack.l_mark[-1]; } +#line 589 "quote_calc3-s.tab.c" break; case 7: #line 47 "quote_calc3.y" { yyval = yystack.l_mark[-2] + yystack.l_mark[0]; } +#line 594 "quote_calc3-s.tab.c" break; case 8: #line 49 "quote_calc3.y" { yyval = yystack.l_mark[-2] - yystack.l_mark[0]; } +#line 599 "quote_calc3-s.tab.c" break; case 9: #line 51 "quote_calc3.y" { yyval = yystack.l_mark[-2] * yystack.l_mark[0]; } +#line 604 "quote_calc3-s.tab.c" break; case 10: #line 53 "quote_calc3.y" { yyval = yystack.l_mark[-2] / yystack.l_mark[0]; } +#line 609 "quote_calc3-s.tab.c" break; case 11: #line 55 "quote_calc3.y" { yyval = yystack.l_mark[-2] % yystack.l_mark[0]; } +#line 614 "quote_calc3-s.tab.c" break; case 12: #line 57 "quote_calc3.y" { yyval = yystack.l_mark[-2] & yystack.l_mark[0]; } +#line 619 "quote_calc3-s.tab.c" break; case 13: #line 59 "quote_calc3.y" { yyval = yystack.l_mark[-2] | yystack.l_mark[0]; } +#line 624 "quote_calc3-s.tab.c" break; case 14: #line 61 "quote_calc3.y" { yyval = - yystack.l_mark[0]; } +#line 629 "quote_calc3-s.tab.c" break; case 15: #line 63 "quote_calc3.y" { yyval = regs[yystack.l_mark[0]]; } +#line 634 "quote_calc3-s.tab.c" break; case 17: #line 68 "quote_calc3.y" { yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; } +#line 639 "quote_calc3-s.tab.c" break; case 18: #line 70 "quote_calc3.y" { yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; } +#line 644 "quote_calc3-s.tab.c" break; -#line 631 "quote_calc3-s.tab.c" +#line 646 "quote_calc3-s.tab.c" } yystack.s_mark -= yym; yystate = *yystack.s_mark; diff --git a/test/yacc/quote_calc3.tab.c b/test/yacc/quote_calc3.tab.c index 7479855b62b1..4ba3ce72f318 100644 --- a/test/yacc/quote_calc3.tab.c +++ b/test/yacc/quote_calc3.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) @@ -156,7 +156,7 @@ extern int YYPARSE_DECL(); #define LETTER 270 #define UMINUS 271 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT quote_calc3_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, @@ -443,8 +443,8 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; @@ -570,64 +570,79 @@ yyreduce: case 3: #line 35 "quote_calc3.y" { yyerrok ; } +#line 574 "quote_calc3.tab.c" break; case 4: #line 39 "quote_calc3.y" { printf("%d\n",yystack.l_mark[0]);} +#line 579 "quote_calc3.tab.c" break; case 5: #line 41 "quote_calc3.y" { regs[yystack.l_mark[-2]] = yystack.l_mark[0]; } +#line 584 "quote_calc3.tab.c" break; case 6: #line 45 "quote_calc3.y" { yyval = yystack.l_mark[-1]; } +#line 589 "quote_calc3.tab.c" break; case 7: #line 47 "quote_calc3.y" { yyval = yystack.l_mark[-2] + yystack.l_mark[0]; } +#line 594 "quote_calc3.tab.c" break; case 8: #line 49 "quote_calc3.y" { yyval = yystack.l_mark[-2] - yystack.l_mark[0]; } +#line 599 "quote_calc3.tab.c" break; case 9: #line 51 "quote_calc3.y" { yyval = yystack.l_mark[-2] * yystack.l_mark[0]; } +#line 604 "quote_calc3.tab.c" break; case 10: #line 53 "quote_calc3.y" { yyval = yystack.l_mark[-2] / yystack.l_mark[0]; } +#line 609 "quote_calc3.tab.c" break; case 11: #line 55 "quote_calc3.y" { yyval = yystack.l_mark[-2] % yystack.l_mark[0]; } +#line 614 "quote_calc3.tab.c" break; case 12: #line 57 "quote_calc3.y" { yyval = yystack.l_mark[-2] & yystack.l_mark[0]; } +#line 619 "quote_calc3.tab.c" break; case 13: #line 59 "quote_calc3.y" { yyval = yystack.l_mark[-2] | yystack.l_mark[0]; } +#line 624 "quote_calc3.tab.c" break; case 14: #line 61 "quote_calc3.y" { yyval = - yystack.l_mark[0]; } +#line 629 "quote_calc3.tab.c" break; case 15: #line 63 "quote_calc3.y" { yyval = regs[yystack.l_mark[0]]; } +#line 634 "quote_calc3.tab.c" break; case 17: #line 68 "quote_calc3.y" { yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; } +#line 639 "quote_calc3.tab.c" break; case 18: #line 70 "quote_calc3.y" { yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; } +#line 644 "quote_calc3.tab.c" break; -#line 631 "quote_calc3.tab.c" +#line 646 "quote_calc3.tab.c" } yystack.s_mark -= yym; yystate = *yystack.s_mark; diff --git a/test/yacc/quote_calc4-s.tab.c b/test/yacc/quote_calc4-s.tab.c index d3e6adc52720..864882923863 100644 --- a/test/yacc/quote_calc4-s.tab.c +++ b/test/yacc/quote_calc4-s.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) @@ -156,7 +156,7 @@ extern int YYPARSE_DECL(); #define LETTER 270 #define UMINUS 271 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT quote_calc4_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, @@ -443,8 +443,8 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; @@ -570,64 +570,79 @@ yyreduce: case 3: #line 35 "quote_calc4.y" { yyerrok ; } +#line 574 "quote_calc4-s.tab.c" break; case 4: #line 39 "quote_calc4.y" { printf("%d\n",yystack.l_mark[0]);} +#line 579 "quote_calc4-s.tab.c" break; case 5: #line 41 "quote_calc4.y" { regs[yystack.l_mark[-2]] = yystack.l_mark[0]; } +#line 584 "quote_calc4-s.tab.c" break; case 6: #line 45 "quote_calc4.y" { yyval = yystack.l_mark[-1]; } +#line 589 "quote_calc4-s.tab.c" break; case 7: #line 47 "quote_calc4.y" { yyval = yystack.l_mark[-2] + yystack.l_mark[0]; } +#line 594 "quote_calc4-s.tab.c" break; case 8: #line 49 "quote_calc4.y" { yyval = yystack.l_mark[-2] - yystack.l_mark[0]; } +#line 599 "quote_calc4-s.tab.c" break; case 9: #line 51 "quote_calc4.y" { yyval = yystack.l_mark[-2] * yystack.l_mark[0]; } +#line 604 "quote_calc4-s.tab.c" break; case 10: #line 53 "quote_calc4.y" { yyval = yystack.l_mark[-2] / yystack.l_mark[0]; } +#line 609 "quote_calc4-s.tab.c" break; case 11: #line 55 "quote_calc4.y" { yyval = yystack.l_mark[-2] % yystack.l_mark[0]; } +#line 614 "quote_calc4-s.tab.c" break; case 12: #line 57 "quote_calc4.y" { yyval = yystack.l_mark[-2] & yystack.l_mark[0]; } +#line 619 "quote_calc4-s.tab.c" break; case 13: #line 59 "quote_calc4.y" { yyval = yystack.l_mark[-2] | yystack.l_mark[0]; } +#line 624 "quote_calc4-s.tab.c" break; case 14: #line 61 "quote_calc4.y" { yyval = - yystack.l_mark[0]; } +#line 629 "quote_calc4-s.tab.c" break; case 15: #line 63 "quote_calc4.y" { yyval = regs[yystack.l_mark[0]]; } +#line 634 "quote_calc4-s.tab.c" break; case 17: #line 68 "quote_calc4.y" { yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; } +#line 639 "quote_calc4-s.tab.c" break; case 18: #line 70 "quote_calc4.y" { yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; } +#line 644 "quote_calc4-s.tab.c" break; -#line 631 "quote_calc4-s.tab.c" +#line 646 "quote_calc4-s.tab.c" } yystack.s_mark -= yym; yystate = *yystack.s_mark; diff --git a/test/yacc/quote_calc4.tab.c b/test/yacc/quote_calc4.tab.c index db3aef21119d..115a2c0beb5a 100644 --- a/test/yacc/quote_calc4.tab.c +++ b/test/yacc/quote_calc4.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) @@ -156,7 +156,7 @@ extern int YYPARSE_DECL(); #define LETTER 270 #define UMINUS 271 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT quote_calc4_lhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, @@ -443,8 +443,8 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; @@ -570,64 +570,79 @@ yyreduce: case 3: #line 35 "quote_calc4.y" { yyerrok ; } +#line 574 "quote_calc4.tab.c" break; case 4: #line 39 "quote_calc4.y" { printf("%d\n",yystack.l_mark[0]);} +#line 579 "quote_calc4.tab.c" break; case 5: #line 41 "quote_calc4.y" { regs[yystack.l_mark[-2]] = yystack.l_mark[0]; } +#line 584 "quote_calc4.tab.c" break; case 6: #line 45 "quote_calc4.y" { yyval = yystack.l_mark[-1]; } +#line 589 "quote_calc4.tab.c" break; case 7: #line 47 "quote_calc4.y" { yyval = yystack.l_mark[-2] + yystack.l_mark[0]; } +#line 594 "quote_calc4.tab.c" break; case 8: #line 49 "quote_calc4.y" { yyval = yystack.l_mark[-2] - yystack.l_mark[0]; } +#line 599 "quote_calc4.tab.c" break; case 9: #line 51 "quote_calc4.y" { yyval = yystack.l_mark[-2] * yystack.l_mark[0]; } +#line 604 "quote_calc4.tab.c" break; case 10: #line 53 "quote_calc4.y" { yyval = yystack.l_mark[-2] / yystack.l_mark[0]; } +#line 609 "quote_calc4.tab.c" break; case 11: #line 55 "quote_calc4.y" { yyval = yystack.l_mark[-2] % yystack.l_mark[0]; } +#line 614 "quote_calc4.tab.c" break; case 12: #line 57 "quote_calc4.y" { yyval = yystack.l_mark[-2] & yystack.l_mark[0]; } +#line 619 "quote_calc4.tab.c" break; case 13: #line 59 "quote_calc4.y" { yyval = yystack.l_mark[-2] | yystack.l_mark[0]; } +#line 624 "quote_calc4.tab.c" break; case 14: #line 61 "quote_calc4.y" { yyval = - yystack.l_mark[0]; } +#line 629 "quote_calc4.tab.c" break; case 15: #line 63 "quote_calc4.y" { yyval = regs[yystack.l_mark[0]]; } +#line 634 "quote_calc4.tab.c" break; case 17: #line 68 "quote_calc4.y" { yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; } +#line 639 "quote_calc4.tab.c" break; case 18: #line 70 "quote_calc4.y" { yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; } +#line 644 "quote_calc4.tab.c" break; -#line 631 "quote_calc4.tab.c" +#line 646 "quote_calc4.tab.c" } yystack.s_mark -= yym; yystate = *yystack.s_mark; diff --git a/test/yacc/rename_debug.c b/test/yacc/rename_debug.c index 909063a084fc..dad9d93ab7ce 100644 --- a/test/yacc/rename_debug.c +++ b/test/yacc/rename_debug.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) @@ -16,7 +16,7 @@ #line 17 "rename_debug.c" #include "rename_debug.i" #include "rename_debug.h" -typedef short YYINT; +typedef int YYINT; static const YYINT yylhs[] = { -1, 0, }; @@ -202,8 +202,8 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; diff --git a/test/yacc/stdin1.calc.c b/test/yacc/stdin1.calc.c index 96b39d66ed38..19898028a660 100644 --- a/test/yacc/stdin1.calc.c +++ b/test/yacc/stdin1.calc.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) @@ -74,7 +74,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT yylhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, @@ -351,8 +351,8 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; @@ -478,64 +478,79 @@ yyreduce: case 3: #line 28 "(null)" { yyerrok ; } +#line 482 "stdin1.calc.c" break; case 4: #line 32 "(null)" { printf("%d\n",yystack.l_mark[0]);} +#line 487 "stdin1.calc.c" break; case 5: #line 34 "(null)" { regs[yystack.l_mark[-2]] = yystack.l_mark[0]; } +#line 492 "stdin1.calc.c" break; case 6: #line 38 "(null)" { yyval = yystack.l_mark[-1]; } +#line 497 "stdin1.calc.c" break; case 7: #line 40 "(null)" { yyval = yystack.l_mark[-2] + yystack.l_mark[0]; } +#line 502 "stdin1.calc.c" break; case 8: #line 42 "(null)" { yyval = yystack.l_mark[-2] - yystack.l_mark[0]; } +#line 507 "stdin1.calc.c" break; case 9: #line 44 "(null)" { yyval = yystack.l_mark[-2] * yystack.l_mark[0]; } +#line 512 "stdin1.calc.c" break; case 10: #line 46 "(null)" { yyval = yystack.l_mark[-2] / yystack.l_mark[0]; } +#line 517 "stdin1.calc.c" break; case 11: #line 48 "(null)" { yyval = yystack.l_mark[-2] % yystack.l_mark[0]; } +#line 522 "stdin1.calc.c" break; case 12: #line 50 "(null)" { yyval = yystack.l_mark[-2] & yystack.l_mark[0]; } +#line 527 "stdin1.calc.c" break; case 13: #line 52 "(null)" { yyval = yystack.l_mark[-2] | yystack.l_mark[0]; } +#line 532 "stdin1.calc.c" break; case 14: #line 54 "(null)" { yyval = - yystack.l_mark[0]; } +#line 537 "stdin1.calc.c" break; case 15: #line 56 "(null)" { yyval = regs[yystack.l_mark[0]]; } +#line 542 "stdin1.calc.c" break; case 17: #line 61 "(null)" { yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; } +#line 547 "stdin1.calc.c" break; case 18: #line 63 "(null)" { yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; } +#line 552 "stdin1.calc.c" break; -#line 539 "stdin1.calc.c" +#line 554 "stdin1.calc.c" } yystack.s_mark -= yym; yystate = *yystack.s_mark; diff --git a/test/yacc/stdin2.calc.c b/test/yacc/stdin2.calc.c index ce2de318446c..218350e19ab4 100644 --- a/test/yacc/stdin2.calc.c +++ b/test/yacc/stdin2.calc.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) @@ -74,7 +74,7 @@ extern int YYPARSE_DECL(); #define LETTER 258 #define UMINUS 259 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT yylhs[] = { -1, 0, 0, 0, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, @@ -351,8 +351,8 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; @@ -478,64 +478,79 @@ yyreduce: case 3: #line 28 "calc.y" { yyerrok ; } +#line 482 "stdin2.calc.c" break; case 4: #line 32 "calc.y" { printf("%d\n",yystack.l_mark[0]);} +#line 487 "stdin2.calc.c" break; case 5: #line 34 "calc.y" { regs[yystack.l_mark[-2]] = yystack.l_mark[0]; } +#line 492 "stdin2.calc.c" break; case 6: #line 38 "calc.y" { yyval = yystack.l_mark[-1]; } +#line 497 "stdin2.calc.c" break; case 7: #line 40 "calc.y" { yyval = yystack.l_mark[-2] + yystack.l_mark[0]; } +#line 502 "stdin2.calc.c" break; case 8: #line 42 "calc.y" { yyval = yystack.l_mark[-2] - yystack.l_mark[0]; } +#line 507 "stdin2.calc.c" break; case 9: #line 44 "calc.y" { yyval = yystack.l_mark[-2] * yystack.l_mark[0]; } +#line 512 "stdin2.calc.c" break; case 10: #line 46 "calc.y" { yyval = yystack.l_mark[-2] / yystack.l_mark[0]; } +#line 517 "stdin2.calc.c" break; case 11: #line 48 "calc.y" { yyval = yystack.l_mark[-2] % yystack.l_mark[0]; } +#line 522 "stdin2.calc.c" break; case 12: #line 50 "calc.y" { yyval = yystack.l_mark[-2] & yystack.l_mark[0]; } +#line 527 "stdin2.calc.c" break; case 13: #line 52 "calc.y" { yyval = yystack.l_mark[-2] | yystack.l_mark[0]; } +#line 532 "stdin2.calc.c" break; case 14: #line 54 "calc.y" { yyval = - yystack.l_mark[0]; } +#line 537 "stdin2.calc.c" break; case 15: #line 56 "calc.y" { yyval = regs[yystack.l_mark[0]]; } +#line 542 "stdin2.calc.c" break; case 17: #line 61 "calc.y" { yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; } +#line 547 "stdin2.calc.c" break; case 18: #line 63 "calc.y" { yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; } +#line 552 "stdin2.calc.c" break; -#line 539 "stdin2.calc.c" +#line 554 "stdin2.calc.c" } yystack.s_mark -= yym; yystate = *yystack.s_mark; diff --git a/test/yacc/varsyntax_calc1.tab.c b/test/yacc/varsyntax_calc1.tab.c index b66d44f2c124..c151810d423e 100644 --- a/test/yacc/varsyntax_calc1.tab.c +++ b/test/yacc/varsyntax_calc1.tab.c @@ -3,8 +3,8 @@ /* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */ #define YYBYACC 1 -#define YYMAJOR 1 -#define YYMINOR 9 +#define YYMAJOR 2 +#define YYMINOR 0 #define YYCHECK "yyyymmdd" #define YYEMPTY (-1) @@ -131,7 +131,7 @@ INTERVAL vreg[26]; #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 #line 32 "varsyntax_calc1.y" -typedef union +typedef union YYSTYPE { int ival; /* dreg & vreg array index values*/ double dval; /* floating point values*/ @@ -176,7 +176,7 @@ extern int YYPARSE_DECL(); #define CONST 259 #define UMINUS 260 #define YYERRCODE 256 -typedef short YYINT; +typedef int YYINT; static const YYINT varsyntax_calc1_lhs[] = { -1, 3, 3, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, @@ -565,8 +565,8 @@ YYPARSE_DECL() } #endif - yym = 0; - yyn = 0; + /* yym is set below */ + /* yyn is set below */ yynerrs = 0; yyerrflag = 0; yychar = YYEMPTY; @@ -694,78 +694,91 @@ case 3: { (void) printf("%15.8f\n", yystack.l_mark[-1].dval); } +#line 698 "varsyntax_calc1.tab.c" break; case 4: #line 63 "varsyntax_calc1.y" { (void) printf("(%15.8f, %15.8f)\n", yystack.l_mark[-1].vval.lo, yystack.l_mark[-1].vval.hi); } +#line 705 "varsyntax_calc1.tab.c" break; case 5: #line 67 "varsyntax_calc1.y" { dreg[yystack.l_mark[-3].ival] = yystack.l_mark[-1].dval; } +#line 712 "varsyntax_calc1.tab.c" break; case 6: #line 71 "varsyntax_calc1.y" { vreg[yystack.l_mark[-3].ival] = yystack.l_mark[-1].vval; } +#line 719 "varsyntax_calc1.tab.c" break; case 7: #line 75 "varsyntax_calc1.y" { yyerrok; } +#line 726 "varsyntax_calc1.tab.c" break; case 9: #line 82 "varsyntax_calc1.y" { yyval.dval = dreg[yystack.l_mark[0].ival]; /* $$ & $1 are sufficient here*/ } +#line 733 "varsyntax_calc1.tab.c" break; case 10: #line 86 "varsyntax_calc1.y" { yyval.dval = yystack.l_mark[-2].dval + yystack.l_mark[0].dval; } +#line 740 "varsyntax_calc1.tab.c" break; case 11: #line 90 "varsyntax_calc1.y" { yyval.dval = yystack.l_mark[-2].dval - yystack.l_mark[0].dval; } +#line 747 "varsyntax_calc1.tab.c" break; case 12: #line 94 "varsyntax_calc1.y" { yyval.dval = yystack.l_mark[-2].dval * yystack.l_mark[0].dval; } +#line 754 "varsyntax_calc1.tab.c" break; case 13: #line 98 "varsyntax_calc1.y" { yyval.dval = yystack.l_mark[-2].dval / yystack.l_mark[0].dval; } +#line 761 "varsyntax_calc1.tab.c" break; case 14: #line 102 "varsyntax_calc1.y" { yyval.dval = -yystack.l_mark[0].dval; } +#line 768 "varsyntax_calc1.tab.c" break; case 15: #line 106 "varsyntax_calc1.y" { yyval.dval = yystack.l_mark[-1].dval; } +#line 775 "varsyntax_calc1.tab.c" break; case 16: #line 112 "varsyntax_calc1.y" { yyval.vval.hi = yyval.vval.lo = yystack.l_mark[0].dval; } +#line 782 "varsyntax_calc1.tab.c" break; case 17: #line 116 "varsyntax_calc1.y" @@ -778,12 +791,14 @@ case 17: YYERROR; } } +#line 795 "varsyntax_calc1.tab.c" break; case 18: #line 126 "varsyntax_calc1.y" { yyval.vval = vreg[yystack.l_mark[0].ival]; } +#line 802 "varsyntax_calc1.tab.c" break; case 19: #line 130 "varsyntax_calc1.y" @@ -791,6 +806,7 @@ case 19: yyval.vval.hi = yystack.l_mark[-2].vval.hi + yystack.l_mark[0].vval.hi; yyval.vval.lo = yystack.l_mark[-2].vval.lo + yystack.l_mark[0].vval.lo; } +#line 810 "varsyntax_calc1.tab.c" break; case 20: #line 135 "varsyntax_calc1.y" @@ -798,6 +814,7 @@ case 20: yyval.vval.hi = yystack.l_mark[-2].dval + yystack.l_mark[0].vval.hi; yyval.vval.lo = yystack.l_mark[-2].dval + yystack.l_mark[0].vval.lo; } +#line 818 "varsyntax_calc1.tab.c" break; case 21: #line 140 "varsyntax_calc1.y" @@ -805,6 +822,7 @@ case 21: yyval.vval.hi = yystack.l_mark[-2].vval.hi - yystack.l_mark[0].vval.lo; yyval.vval.lo = yystack.l_mark[-2].vval.lo - yystack.l_mark[0].vval.hi; } +#line 826 "varsyntax_calc1.tab.c" break; case 22: #line 145 "varsyntax_calc1.y" @@ -812,18 +830,21 @@ case 22: yyval.vval.hi = yystack.l_mark[-2].dval - yystack.l_mark[0].vval.lo; yyval.vval.lo = yystack.l_mark[-2].dval - yystack.l_mark[0].vval.hi; } +#line 834 "varsyntax_calc1.tab.c" break; case 23: #line 150 "varsyntax_calc1.y" { yyval.vval = vmul( yystack.l_mark[-2].vval.lo, yystack.l_mark[-2].vval.hi, yystack.l_mark[0].vval ); } +#line 841 "varsyntax_calc1.tab.c" break; case 24: #line 154 "varsyntax_calc1.y" { yyval.vval = vmul (yystack.l_mark[-2].dval, yystack.l_mark[-2].dval, yystack.l_mark[0].vval ); } +#line 848 "varsyntax_calc1.tab.c" break; case 25: #line 158 "varsyntax_calc1.y" @@ -831,6 +852,7 @@ case 25: if (dcheck(yystack.l_mark[0].vval)) YYERROR; yyval.vval = vdiv ( yystack.l_mark[-2].vval.lo, yystack.l_mark[-2].vval.hi, yystack.l_mark[0].vval ); } +#line 856 "varsyntax_calc1.tab.c" break; case 26: #line 163 "varsyntax_calc1.y" @@ -838,6 +860,7 @@ case 26: if (dcheck ( yystack.l_mark[0].vval )) YYERROR; yyval.vval = vdiv (yystack.l_mark[-2].dval, yystack.l_mark[-2].dval, yystack.l_mark[0].vval ); } +#line 864 "varsyntax_calc1.tab.c" break; case 27: #line 168 "varsyntax_calc1.y" @@ -845,14 +868,16 @@ case 27: yyval.vval.hi = -yystack.l_mark[0].vval.lo; yyval.vval.lo = -yystack.l_mark[0].vval.hi; } +#line 872 "varsyntax_calc1.tab.c" break; case 28: #line 173 "varsyntax_calc1.y" { yyval.vval = yystack.l_mark[-1].vval; } +#line 879 "varsyntax_calc1.tab.c" break; -#line 856 "varsyntax_calc1.tab.c" +#line 881 "varsyntax_calc1.tab.c" } yystack.s_mark -= yym; yystate = *yystack.s_mark; diff --git a/test/yacc/varsyntax_calc1.tab.h b/test/yacc/varsyntax_calc1.tab.h index fd07f2cc3d41..50369b226429 100644 --- a/test/yacc/varsyntax_calc1.tab.h +++ b/test/yacc/varsyntax_calc1.tab.h @@ -8,7 +8,7 @@ #endif #ifndef YYSTYPE_IS_DECLARED #define YYSTYPE_IS_DECLARED 1 -typedef union +typedef union YYSTYPE { int ival; /* dreg & vreg array index values*/ double dval; /* floating point values*/ |