From 1c5ecd7b2c06298a666b6a7469c25ff4e1b00676 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Fri, 24 Sep 2010 08:53:33 +0000 Subject: use bison-2.4.3 git-svn-id: svn://tug.org/texlive/trunk@19871 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/README.hacking | 2 +- Build/source/texk/web2c/omegafonts/pl-parser.c | 190 ++++++----- Build/source/texk/web2c/omegafonts/pl-parser.h | 7 +- Build/source/texk/web2c/otps/otp-parser.c | 160 ++++----- Build/source/texk/web2c/otps/otp-parser.h | 7 +- Build/source/texk/web2c/web2c/web2c-parser.c | 446 +++++++++++++------------ Build/source/texk/web2c/web2c/web2c-parser.h | 7 +- 7 files changed, 420 insertions(+), 399 deletions(-) diff --git a/Build/source/README.hacking b/Build/source/README.hacking index e1a162de5ab..69c2b505e14 100644 --- a/Build/source/README.hacking +++ b/Build/source/README.hacking @@ -13,7 +13,7 @@ automake (GNU automake) 1.11.1 ltmain.sh (GNU libtool) 2.4 -bison (GNU Bison) 2.4.1 +bison (GNU Bison) 2.4.3 flex 2.5.35 diff --git a/Build/source/texk/web2c/omegafonts/pl-parser.c b/Build/source/texk/web2c/omegafonts/pl-parser.c index 0b94d5ce52b..bd1e320538d 100644 --- a/Build/source/texk/web2c/omegafonts/pl-parser.c +++ b/Build/source/texk/web2c/omegafonts/pl-parser.c @@ -1,10 +1,9 @@ - -/* A Bison parser, made by GNU Bison 2.4.1. */ +/* A Bison parser, made by GNU Bison 2.4.3. */ /* Skeleton implementation for Bison's Yacc-like parsers in C - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006, + 2009, 2010 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -46,7 +45,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.4.1" +#define YYBISON_VERSION "2.4.3" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -112,7 +111,7 @@ along with Omega; if not, write to the Free Software Foundation, Inc., /* Line 189 of yacc.c */ -#line 116 "pl-parser.c" +#line 115 "pl-parser.c" /* Enabling traces. */ #ifndef YYDEBUG @@ -324,7 +323,7 @@ typedef int YYSTYPE; /* Line 264 of yacc.c */ -#line 328 "pl-parser.c" +#line 327 "pl-parser.c" #ifdef short # undef short @@ -374,7 +373,7 @@ typedef short int yytype_int16; #define YYSIZE_MAXIMUM ((YYSIZE_T) -1) #ifndef YY_ -# if YYENABLE_NLS +# if defined YYENABLE_NLS && YYENABLE_NLS # if ENABLE_NLS # include /* INFRINGES ON USER NAME SPACE */ # define YY_(msgid) dgettext ("bison-runtime", msgid) @@ -985,9 +984,18 @@ static const yytype_uint8 yystos[] = /* Like YYERROR except do call yyerror. This remains here temporarily to ease the transition to the new meaning of YYERROR, for GCC. - Once GCC version 2 has supplanted version 1, this can go. */ + Once GCC version 2 has supplanted version 1, this can go. However, + YYFAIL appears to be in use. Nevertheless, it is formally deprecated + in Bison 2.4.2's NEWS entry, where a plan to phase it out is + discussed. */ #define YYFAIL goto yyerrlab +#if defined YYFAIL + /* This is here to suppress warnings from the GCC cpp's + -Wunused-macros. Normally we don't worry about that warning, but + some users do, and we want to make it easy for users to remove + YYFAIL uses, which will produce warnings from Bison 2.5. */ +#endif #define YYRECOVERING() (!!yyerrstatus) @@ -1044,7 +1052,7 @@ while (YYID (0)) we won't break user code: when these are the locations we know. */ #ifndef YY_LOCATION_PRINT -# if YYLTYPE_IS_TRIVIAL +# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL # define YY_LOCATION_PRINT(File, Loc) \ fprintf (File, "%d.%d-%d.%d", \ (Loc).first_line, (Loc).first_column, \ @@ -1783,561 +1791,561 @@ yyreduce: { case 5: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 170 "pl-parser.y" { set_check_sum((yyvsp[(2) - (2)]).yint); } break; case 6: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 172 "pl-parser.y" { set_design_size((yyvsp[(2) - (2)]).yfix); } break; case 7: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 174 "pl-parser.y" { set_design_units((yyvsp[(2) - (2)]).yfix); } break; case 8: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 176 "pl-parser.y" { set_coding_scheme((yyvsp[(1) - (1)]).ystring); } break; case 9: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 178 "pl-parser.y" { set_family((yyvsp[(1) - (1)]).ystring); } break; case 10: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 180 "pl-parser.y" { set_face((yyvsp[(2) - (2)]).yint); } break; case 11: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 182 "pl-parser.y" { set_seven_bit_safe_flag((yyvsp[(1) - (1)]).yint); } break; case 12: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 184 "pl-parser.y" { set_header_word((yyvsp[(2) - (3)]).yint, (yyvsp[(3) - (3)]).yint); } break; case 13: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 186 "pl-parser.y" { init_parameters(); } break; case 15: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 189 "pl-parser.y" { init_ligkern(); } break; case 17: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 192 "pl-parser.y" { set_boundary_character((yyvsp[(2) - (2)]).yint); } break; case 18: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 194 "pl-parser.y" { init_character((yyvsp[(2) - (2)]).yint, NULL); } break; case 21: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 201 "pl-parser.y" { set_vtitle((yyvsp[(1) - (1)]).ystring); } break; case 22: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 203 "pl-parser.y" { init_map_font((yyvsp[(2) - (2)]).yint); } break; case 24: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 209 "pl-parser.y" { set_ofm_level((yyvsp[(2) - (2)]).yint); } break; case 25: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 211 "pl-parser.y" { set_font_dir((yyvsp[(1) - (1)]).yint); } break; case 26: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 213 "pl-parser.y" { init_character((yyvsp[(2) - (3)]).yint,NULL); } break; case 27: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 215 "pl-parser.y" { copy_characters((yyvsp[(2) - (5)]).yint,(yyvsp[(3) - (5)]).yint); } break; case 28: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 217 "pl-parser.y" {init_font_ivalue((yyvsp[(2) - (2)]).yint);} break; case 30: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 220 "pl-parser.y" { init_font_mvalue((yyvsp[(2) - (2)]).yint);} break; case 32: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 223 "pl-parser.y" { init_font_fvalue((yyvsp[(2) - (2)]).yint);} break; case 34: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 226 "pl-parser.y" { init_font_penalty((yyvsp[(2) - (2)]).yint);} break; case 36: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 229 "pl-parser.y" { init_font_rule((yyvsp[(2) - (2)]).yint);} break; case 38: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 232 "pl-parser.y" { init_font_glue((yyvsp[(2) - (2)]).yint);} break; case 42: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 244 "pl-parser.y" { set_param_word((yyvsp[(1) - (2)]).yint, (yyvsp[(2) - (2)]).yfix); } break; case 43: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 246 "pl-parser.y" { set_param_word((yyvsp[(2) - (3)]).yint, (yyvsp[(3) - (3)]).yfix); } break; case 47: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 258 "pl-parser.y" { set_label_command((yyvsp[(2) - (2)]).yint); } break; case 48: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 260 "pl-parser.y" { set_label_command(CHAR_BOUNDARY); } break; case 49: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 262 "pl-parser.y" { set_ligature_command((yyvsp[(1) - (3)]).yint, (yyvsp[(2) - (3)]).yint, (yyvsp[(3) - (3)]).yint); } break; case 50: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 264 "pl-parser.y" { set_kerning_command((yyvsp[(2) - (3)]).yint, (yyvsp[(3) - (3)]).yfix); } break; case 51: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 266 "pl-parser.y" { set_stop_command(); } break; case 52: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 268 "pl-parser.y" { set_skip_command((yyvsp[(2) - (2)]).yint); } break; case 54: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 274 "pl-parser.y" { set_c_label_command((yyvsp[(2) - (2)]).yint); } break; case 55: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 276 "pl-parser.y" { set_c_kerning_command((yyvsp[(2) - (3)]).yint, (yyvsp[(3) - (3)]).yfix); } break; case 56: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 278 "pl-parser.y" { set_c_glue_command((yyvsp[(2) - (3)]).yint, (yyvsp[(3) - (3)]).yint); } break; case 57: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 280 "pl-parser.y" { set_c_penalty_command((yyvsp[(2) - (3)]).yint, (yyvsp[(3) - (3)]).yint); } break; case 58: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 282 "pl-parser.y" { set_c_penglue_command((yyvsp[(2) - (4)]).yint, (yyvsp[(3) - (4)]).yint, (yyvsp[(4) - (4)]).yint); } break; case 61: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 293 "pl-parser.y" { set_character_measure((yyvsp[(1) - (2)]).yint, (yyvsp[(2) - (2)]).yfix); } break; case 62: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 295 "pl-parser.y" { set_next_larger((yyvsp[(2) - (2)]).yint); } break; case 63: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 297 "pl-parser.y" { init_var_character(); } break; case 66: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 304 "pl-parser.y" { init_map(); } break; case 67: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 306 "pl-parser.y" { end_map(); } break; case 68: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 311 "pl-parser.y" { set_accent((yyvsp[(1) - (1)]).yint); } break; case 69: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 313 "pl-parser.y" { set_character_ivalue((yyvsp[(2) - (3)]).yint, (yyvsp[(3) - (3)]).yint); } break; case 70: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 315 "pl-parser.y" { set_character_mvalue((yyvsp[(2) - (3)]).yint, (yyvsp[(3) - (3)]).yint); } break; case 71: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 317 "pl-parser.y" { set_character_fvalue((yyvsp[(2) - (3)]).yint, (yyvsp[(3) - (3)]).yint); } break; case 72: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 319 "pl-parser.y" { set_character_penalty((yyvsp[(2) - (3)]).yint, (yyvsp[(3) - (3)]).yint); } break; case 73: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 321 "pl-parser.y" { set_character_rule((yyvsp[(2) - (3)]).yint, (yyvsp[(3) - (3)]).yint); } break; case 74: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 323 "pl-parser.y" { set_character_glue((yyvsp[(2) - (3)]).yint, (yyvsp[(3) - (3)]).yint); } break; case 77: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 335 "pl-parser.y" { set_extensible_piece((yyvsp[(1) - (2)]).yint, (yyvsp[(2) - (2)]).yint); } break; case 81: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 350 "pl-parser.y" { set_font_name((yyvsp[(1) - (1)]).ystring); } break; case 82: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 352 "pl-parser.y" { set_font_area((yyvsp[(1) - (1)]).ystring); } break; case 83: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 354 "pl-parser.y" { set_font_check_sum((yyvsp[(2) - (2)]).yint); } break; case 84: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 356 "pl-parser.y" { set_font_at((yyvsp[(2) - (2)]).yfix); } break; case 85: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 358 "pl-parser.y" { set_font_design_size((yyvsp[(2) - (2)]).yfix); } break; case 89: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 370 "pl-parser.y" { set_select_font((yyvsp[(2) - (2)]).yint); } break; case 90: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 372 "pl-parser.y" { set_set_char((yyvsp[(2) - (2)]).yint); } break; case 91: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 374 "pl-parser.y" { set_set_rule((yyvsp[(2) - (3)]).yfix, (yyvsp[(3) - (3)]).yfix); } break; case 92: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 376 "pl-parser.y" { set_move((yyvsp[(1) - (2)]).yint, (yyvsp[(2) - (2)]).yfix); } break; case 93: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 378 "pl-parser.y" { set_push(); } break; case 94: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 380 "pl-parser.y" { set_pop(); } break; case 95: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 382 "pl-parser.y" { set_special((yyvsp[(1) - (1)]).ystring); } break; case 96: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 384 "pl-parser.y" { set_special_hex((yyvsp[(1) - (1)]).ystring); } break; case 99: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 397 "pl-parser.y" { init_font_ivalue_entry((yyvsp[(2) - (2)]).yint); } break; case 104: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 410 "pl-parser.y" { set_font_ivalue_definition((yyvsp[(2) - (2)]).yint); } break; case 108: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 422 "pl-parser.y" { init_font_mvalue_entry((yyvsp[(2) - (2)]).yint); } break; case 113: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 435 "pl-parser.y" { set_font_mvalue_definition((yyvsp[(2) - (2)]).yfix); } break; case 117: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 447 "pl-parser.y" { init_font_fvalue_entry((yyvsp[(2) - (2)]).yint); } break; case 122: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 460 "pl-parser.y" { set_font_fvalue_definition((yyvsp[(2) - (2)]).yfix); } break; case 126: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 472 "pl-parser.y" { init_font_penalty_entry((yyvsp[(2) - (2)]).yint); } break; case 131: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 485 "pl-parser.y" { set_font_penalty_definition((yyvsp[(2) - (2)]).yint); } break; case 135: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 497 "pl-parser.y" { init_font_rule_entry((yyvsp[(2) - (2)]).yint); } break; case 140: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 510 "pl-parser.y" { set_font_rule_measure((yyvsp[(1) - (2)]).yint, (yyvsp[(2) - (2)]).yfix); } break; case 144: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 522 "pl-parser.y" { init_font_glue_entry((yyvsp[(2) - (2)]).yint); } break; case 149: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 535 "pl-parser.y" { set_font_glue_type((yyvsp[(2) - (2)]).yint); } break; case 150: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 537 "pl-parser.y" { set_font_glue_width((yyvsp[(2) - (2)]).yfix); } break; case 151: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 539 "pl-parser.y" { set_font_glue_character((yyvsp[(2) - (2)]).yint); } break; case 152: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 541 "pl-parser.y" { set_font_glue_rule((yyvsp[(2) - (3)]).yint, (yyvsp[(3) - (3)]).yint); } break; case 153: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 543 "pl-parser.y" { set_font_glue_shrink_stretch((yyvsp[(1) - (3)]).yint, (yyvsp[(2) - (3)]).yfix, (yyvsp[(3) - (3)]).yint); } break; -/* Line 1455 of yacc.c */ -#line 2341 "pl-parser.c" +/* Line 1464 of yacc.c */ +#line 2349 "pl-parser.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); diff --git a/Build/source/texk/web2c/omegafonts/pl-parser.h b/Build/source/texk/web2c/omegafonts/pl-parser.h index 9419f3bf2c1..200c88cb961 100644 --- a/Build/source/texk/web2c/omegafonts/pl-parser.h +++ b/Build/source/texk/web2c/omegafonts/pl-parser.h @@ -1,10 +1,9 @@ - -/* A Bison parser, made by GNU Bison 2.4.1. */ +/* A Bison parser, made by GNU Bison 2.4.3. */ /* Skeleton interface for Bison's Yacc-like parsers in C - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006, + 2009, 2010 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/Build/source/texk/web2c/otps/otp-parser.c b/Build/source/texk/web2c/otps/otp-parser.c index 277ba986375..e9411f82634 100644 --- a/Build/source/texk/web2c/otps/otp-parser.c +++ b/Build/source/texk/web2c/otps/otp-parser.c @@ -1,10 +1,9 @@ - -/* A Bison parser, made by GNU Bison 2.4.1. */ +/* A Bison parser, made by GNU Bison 2.4.3. */ /* Skeleton implementation for Bison's Yacc-like parsers in C - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006, + 2009, 2010 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -46,7 +45,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.4.1" +#define YYBISON_VERSION "2.4.3" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -83,7 +82,7 @@ fprintf(stderr, "line %d: %s\n", line_number, msg); /* Line 189 of yacc.c */ -#line 87 "otp-parser.c" +#line 86 "otp-parser.c" /* Enabling traces. */ #ifndef YYDEBUG @@ -163,7 +162,7 @@ typedef int YYSTYPE; /* Line 264 of yacc.c */ -#line 167 "otp-parser.c" +#line 166 "otp-parser.c" #ifdef short # undef short @@ -213,7 +212,7 @@ typedef short int yytype_int16; #define YYSIZE_MAXIMUM ((YYSIZE_T) -1) #ifndef YY_ -# if YYENABLE_NLS +# if defined YYENABLE_NLS && YYENABLE_NLS # if ENABLE_NLS # include /* INFRINGES ON USER NAME SPACE */ # define YY_(msgid) dgettext ("bison-runtime", msgid) @@ -704,9 +703,18 @@ static const yytype_uint8 yystos[] = /* Like YYERROR except do call yyerror. This remains here temporarily to ease the transition to the new meaning of YYERROR, for GCC. - Once GCC version 2 has supplanted version 1, this can go. */ + Once GCC version 2 has supplanted version 1, this can go. However, + YYFAIL appears to be in use. Nevertheless, it is formally deprecated + in Bison 2.4.2's NEWS entry, where a plan to phase it out is + discussed. */ #define YYFAIL goto yyerrlab +#if defined YYFAIL + /* This is here to suppress warnings from the GCC cpp's + -Wunused-macros. Normally we don't worry about that warning, but + some users do, and we want to make it easy for users to remove + YYFAIL uses, which will produce warnings from Bison 2.5. */ +#endif #define YYRECOVERING() (!!yyerrstatus) @@ -763,7 +771,7 @@ while (YYID (0)) we won't break user code: when these are the locations we know. */ #ifndef YY_LOCATION_PRINT -# if YYLTYPE_IS_TRIVIAL +# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL # define YY_LOCATION_PRINT(File, Loc) \ fprintf (File, "%d.%d-%d.%d", \ (Loc).first_line, (Loc).first_column, \ @@ -1502,168 +1510,168 @@ yyreduce: { case 3: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 72 "otp-parser.y" { input_bytes=2; } break; case 4: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 74 "otp-parser.y" { input_bytes=(yyvsp[(2) - (3)]).yint; } break; case 5: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 79 "otp-parser.y" { output_bytes=2; } break; case 6: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 81 "otp-parser.y" { output_bytes=(yyvsp[(2) - (3)]).yint; } break; case 11: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 96 "otp-parser.y" { store_table((yyvsp[(1) - (4)]).ystring, (yyvsp[(3) - (4)]).yint); } break; case 15: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 107 "otp-parser.y" { add_to_table((yyvsp[(1) - (1)]).yint); } break; case 16: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 109 "otp-parser.y" { add_to_table((yyvsp[(3) - (3)]).yint); } break; case 19: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 119 "otp-parser.y" { store_state((yyvsp[(1) - (1)]).ystring); } break; case 20: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 121 "otp-parser.y" { store_state((yyvsp[(3) - (3)]).ystring); } break; case 25: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 136 "otp-parser.y" { store_alias((yyvsp[(1) - (4)]).ystring, (yyvsp[(3) - (4)]).yleft); } break; case 26: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 141 "otp-parser.y" { (yyval).yleft = StringLeft((yyvsp[(1) - (1)]).ystring); } break; case 27: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 143 "otp-parser.y" { (yyval).yleft = CompleteLeft((yyvsp[(1) - (6)]).yleft, (yyvsp[(3) - (6)]).yint, (yyvsp[(5) - (6)]).yint); } break; case 28: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 145 "otp-parser.y" { (yyval).yleft = PlusLeft((yyvsp[(1) - (5)]).yleft, (yyvsp[(3) - (5)]).yint); } break; case 29: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 147 "otp-parser.y" { (yyval).yleft = CompleteLeft((yyvsp[(1) - (4)]).yleft, (yyvsp[(3) - (4)]).yint, (yyvsp[(3) - (4)]).yint); } break; case 30: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 149 "otp-parser.y" { (yyval).yleft = (yyvsp[(1) - (1)]).yleft; } break; case 31: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 154 "otp-parser.y" { (yyval).yleft = SingleLeft((yyvsp[(1) - (1)]).yint); } break; case 32: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 156 "otp-parser.y" { (yyval).yleft = DoubleLeft((yyvsp[(1) - (3)]).yint, (yyvsp[(3) - (3)]).yint); } break; case 33: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 158 "otp-parser.y" { (yyval).yleft = WildCard(); } break; case 34: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 160 "otp-parser.y" { (yyval).yleft = NotChoiceLeft((yyvsp[(3) - (4)]).ylleft); } break; case 35: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 162 "otp-parser.y" { (yyval).yleft = ChoiceLeft((yyvsp[(2) - (3)]).ylleft); } break; case 36: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 164 "otp-parser.y" { (yyval).yleft = lookup_alias((yyvsp[(2) - (3)]).ystring); } break; case 37: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 169 "otp-parser.y" { (yyval).ylleft = llist1((yyvsp[(1) - (1)]).yleft); } break; case 38: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 171 "otp-parser.y" { (yyval).ylleft = lappend1((yyvsp[(1) - (3)]).ylleft, (yyvsp[(3) - (3)]).yleft); } break; case 39: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 176 "otp-parser.y" { for(cur_state=0; cur_state $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2182,7 +2190,7 @@ yyreturn: -/* Line 1675 of yacc.c */ +/* Line 1684 of yacc.c */ #line 331 "otp-parser.y" diff --git a/Build/source/texk/web2c/otps/otp-parser.h b/Build/source/texk/web2c/otps/otp-parser.h index 3da27ea6953..d88582d1c82 100644 --- a/Build/source/texk/web2c/otps/otp-parser.h +++ b/Build/source/texk/web2c/otps/otp-parser.h @@ -1,10 +1,9 @@ - -/* A Bison parser, made by GNU Bison 2.4.1. */ +/* A Bison parser, made by GNU Bison 2.4.3. */ /* Skeleton interface for Bison's Yacc-like parsers in C - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006, + 2009, 2010 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/Build/source/texk/web2c/web2c/web2c-parser.c b/Build/source/texk/web2c/web2c/web2c-parser.c index bb5af6a7444..dcfc9754e46 100644 --- a/Build/source/texk/web2c/web2c/web2c-parser.c +++ b/Build/source/texk/web2c/web2c/web2c-parser.c @@ -1,10 +1,9 @@ - -/* A Bison parser, made by GNU Bison 2.4.1. */ +/* A Bison parser, made by GNU Bison 2.4.3. */ /* Skeleton implementation for Bison's Yacc-like parsers in C - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006, + 2009, 2010 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -46,7 +45,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.4.1" +#define YYBISON_VERSION "2.4.3" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -106,7 +105,7 @@ static boolean doreturn (string); /* Line 189 of yacc.c */ -#line 110 "web2c-parser.c" +#line 109 "web2c-parser.c" /* Enabling traces. */ #ifndef YYDEBUG @@ -266,7 +265,7 @@ typedef int YYSTYPE; /* Line 264 of yacc.c */ -#line 270 "web2c-parser.c" +#line 269 "web2c-parser.c" #ifdef short # undef short @@ -316,7 +315,7 @@ typedef short int yytype_int16; #define YYSIZE_MAXIMUM ((YYSIZE_T) -1) #ifndef YY_ -# if YYENABLE_NLS +# if defined YYENABLE_NLS && YYENABLE_NLS # if ENABLE_NLS # include /* INFRINGES ON USER NAME SPACE */ # define YY_(msgid) dgettext ("bison-runtime", msgid) @@ -1209,9 +1208,18 @@ static const yytype_uint16 yystos[] = /* Like YYERROR except do call yyerror. This remains here temporarily to ease the transition to the new meaning of YYERROR, for GCC. - Once GCC version 2 has supplanted version 1, this can go. */ + Once GCC version 2 has supplanted version 1, this can go. However, + YYFAIL appears to be in use. Nevertheless, it is formally deprecated + in Bison 2.4.2's NEWS entry, where a plan to phase it out is + discussed. */ #define YYFAIL goto yyerrlab +#if defined YYFAIL + /* This is here to suppress warnings from the GCC cpp's + -Wunused-macros. Normally we don't worry about that warning, but + some users do, and we want to make it easy for users to remove + YYFAIL uses, which will produce warnings from Bison 2.5. */ +#endif #define YYRECOVERING() (!!yyerrstatus) @@ -1268,7 +1276,7 @@ while (YYID (0)) we won't break user code: when these are the locations we know. */ #ifndef YY_LOCATION_PRINT -# if YYLTYPE_IS_TRIVIAL +# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL # define YY_LOCATION_PRINT(File, Loc) \ fprintf (File, "%d.%d-%d.%d", \ (Loc).first_line, (Loc).first_column, \ @@ -2007,7 +2015,7 @@ yyreduce: { case 2: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 66 "web2c-parser.y" { printf ("#define %s\n", uppercasify (program_name)); @@ -2018,21 +2026,21 @@ yyreduce: case 3: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 73 "web2c-parser.y" { printf ("\n#include \"%s\"\n", coerce_name); } break; case 4: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 76 "web2c-parser.y" { YYACCEPT; } break; case 7: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 86 "web2c-parser.y" { ii = add_to_table (last_id); @@ -2042,7 +2050,7 @@ yyreduce: case 8: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 91 "web2c-parser.y" { ii = add_to_table (last_id); @@ -2052,7 +2060,7 @@ yyreduce: case 9: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 96 "web2c-parser.y" { ii = add_to_table (last_id); @@ -2062,7 +2070,7 @@ yyreduce: case 10: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 101 "web2c-parser.y" { ii = add_to_table (last_id); @@ -2072,7 +2080,7 @@ yyreduce: case 11: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 106 "web2c-parser.y" { ii = add_to_table (last_id); @@ -2082,7 +2090,7 @@ yyreduce: case 12: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 111 "web2c-parser.y" { ii = add_to_table (last_id); @@ -2092,7 +2100,7 @@ yyreduce: case 13: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 116 "web2c-parser.y" { ii = add_to_table (last_id); @@ -2102,7 +2110,7 @@ yyreduce: case 14: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 121 "web2c-parser.y" { ii = add_to_table (last_id); @@ -2116,7 +2124,7 @@ yyreduce: case 15: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 130 "web2c-parser.y" { ii = add_to_table (last_id); @@ -2126,7 +2134,7 @@ yyreduce: case 23: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 157 "web2c-parser.y" { if (block_level > 0) my_output("{\n "); indent++; block_level++; @@ -2135,7 +2143,7 @@ yyreduce: case 24: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 162 "web2c-parser.y" { if (block_level == 2) { if (strcmp(fn_return_type, "void")) { @@ -2154,14 +2162,14 @@ yyreduce: case 25: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 176 "web2c-parser.y" { doing_statements = true; } break; case 26: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 178 "web2c-parser.y" { if (block_level == 2) { @@ -2193,35 +2201,35 @@ yyreduce: case 28: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 208 "web2c-parser.y" { my_output("/*"); } break; case 29: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 210 "web2c-parser.y" { my_output("*/"); } break; case 32: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 218 "web2c-parser.y" { my_output(temp); } break; case 34: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 224 "web2c-parser.y" { new_line(); } break; case 37: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 233 "web2c-parser.y" { /* `#define' must be in column 1 for pcc. */ unsigned save = indent; @@ -2234,7 +2242,7 @@ yyreduce: case 38: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 241 "web2c-parser.y" { ii = add_to_table (last_id); sym_table[ii].typ = const_id_tok; @@ -2244,28 +2252,28 @@ yyreduce: case 39: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 245 "web2c-parser.y" { my_output ("("); } break; case 40: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 246 "web2c-parser.y" { my_output (")"); } break; case 41: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 247 "web2c-parser.y" { sym_table[ii].val = last_i_num; new_line(); } break; case 42: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 252 "web2c-parser.y" { sscanf (temp, "%ld", &last_i_num); @@ -2278,252 +2286,252 @@ yyreduce: case 43: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 259 "web2c-parser.y" { my_output(temp); (yyval) = ex_real; } break; case 44: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 260 "web2c-parser.y" { (yyval) = 0; } break; case 45: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 261 "web2c-parser.y" { (yyval) = ex_32; } break; case 46: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 266 "web2c-parser.y" { (yyval) = (yyvsp[(2) - (2)]); } break; case 47: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 267 "web2c-parser.y" { my_output ("+"); } break; case 48: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 268 "web2c-parser.y" { (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); } break; case 49: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 269 "web2c-parser.y" { my_output ("-"); } break; case 50: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 270 "web2c-parser.y" { (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); } break; case 51: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 271 "web2c-parser.y" { my_output ("*"); } break; case 52: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 272 "web2c-parser.y" { (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); } break; case 53: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 273 "web2c-parser.y" { my_output ("/"); } break; case 54: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 274 "web2c-parser.y" { (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); } break; case 55: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 275 "web2c-parser.y" { my_output ("=="); } break; case 56: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 276 "web2c-parser.y" { (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); } break; case 57: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 277 "web2c-parser.y" { my_output ("!="); } break; case 58: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 278 "web2c-parser.y" { (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); } break; case 59: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 279 "web2c-parser.y" { my_output ("%"); } break; case 60: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 280 "web2c-parser.y" { (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); } break; case 61: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 281 "web2c-parser.y" { my_output ("<"); } break; case 62: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 282 "web2c-parser.y" { (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); } break; case 63: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 283 "web2c-parser.y" { my_output (">"); } break; case 64: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 284 "web2c-parser.y" { (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); } break; case 65: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 285 "web2c-parser.y" { my_output ("<="); } break; case 66: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 286 "web2c-parser.y" { (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); } break; case 67: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 287 "web2c-parser.y" { my_output (">="); } break; case 68: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 288 "web2c-parser.y" { (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); } break; case 69: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 289 "web2c-parser.y" { my_output ("&&"); } break; case 70: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 290 "web2c-parser.y" { (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); } break; case 71: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 291 "web2c-parser.y" { my_output ("||"); } break; case 72: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 292 "web2c-parser.y" { (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); } break; case 73: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 293 "web2c-parser.y" { my_output ("/ ((double)"); } break; case 74: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 294 "web2c-parser.y" { (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); my_output (")"); } break; case 75: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 295 "web2c-parser.y" { (yyval) = (yyvsp[(1) - (1)]); } break; case 76: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 300 "web2c-parser.y" { my_output ("("); } break; case 77: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 302 "web2c-parser.y" { my_output (")"); (yyval) = (yyvsp[(1) - (4)]); } break; case 79: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 308 "web2c-parser.y" { char s[132]; @@ -2534,7 +2542,7 @@ yyreduce: case 80: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 314 "web2c-parser.y" { char s[5]; @@ -2545,21 +2553,21 @@ yyreduce: case 81: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 322 "web2c-parser.y" { my_output (last_id); } break; case 86: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 334 "web2c-parser.y" { my_output ("typedef"); } break; case 87: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 336 "web2c-parser.y" { ii = add_to_table(last_id); @@ -2571,7 +2579,7 @@ yyreduce: case 88: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 343 "web2c-parser.y" { array_bounds[0] = 0; @@ -2581,7 +2589,7 @@ yyreduce: case 89: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 348 "web2c-parser.y" { if (*array_offset) { @@ -2596,7 +2604,7 @@ yyreduce: case 92: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 366 "web2c-parser.y" { if (last_type >= 0) @@ -2634,7 +2642,7 @@ yyreduce: case 97: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 412 "web2c-parser.y" { lower_bound = upper_bound; @@ -2646,7 +2654,7 @@ yyreduce: case 98: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 419 "web2c-parser.y" { lower_bound = upper_bound; @@ -2658,7 +2666,7 @@ yyreduce: case 99: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 426 "web2c-parser.y" { /* We've changed some constants into dynamic variables. To avoid changing all the subrange decls, just use integer. @@ -2672,7 +2680,7 @@ yyreduce: case 100: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 435 "web2c-parser.y" { /* Same as var_id_tok, to avoid changing type definitions. Should keep track of the variables we use in this way @@ -2686,7 +2694,7 @@ yyreduce: case 101: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 447 "web2c-parser.y" { if (last_type >= 0) { @@ -2702,7 +2710,7 @@ yyreduce: case 102: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 461 "web2c-parser.y" { if (last_type >= 0) sym_table[last_type].var_not_needed = true; @@ -2711,7 +2719,7 @@ yyreduce: case 104: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 466 "web2c-parser.y" { if (last_type >= 0) sym_table[last_type].var_not_needed = true; @@ -2720,7 +2728,7 @@ yyreduce: case 105: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 470 "web2c-parser.y" { if (last_type >= 0) sym_table[last_type].var_not_needed = true; @@ -2729,7 +2737,7 @@ yyreduce: case 106: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 477 "web2c-parser.y" { if (last_type >= 0) { @@ -2746,14 +2754,14 @@ yyreduce: case 109: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 497 "web2c-parser.y" { compute_array_bounds(); } break; case 110: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 499 "web2c-parser.y" { lower_bound = sym_table[l_s].val; @@ -2766,28 +2774,28 @@ yyreduce: case 112: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 512 "web2c-parser.y" { my_output ("struct"); my_output ("{"); indent++; } break; case 113: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 514 "web2c-parser.y" { indent--; my_output ("}"); semicolon(); } break; case 116: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 522 "web2c-parser.y" { field_list[0] = 0; } break; case 117: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 524 "web2c-parser.y" { /*array_bounds[0] = 0; @@ -2797,7 +2805,7 @@ yyreduce: case 118: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 529 "web2c-parser.y" { int i=0, j; char ltemp[80]; while(field_list[i++] == '!') { @@ -2816,7 +2824,7 @@ yyreduce: case 122: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 550 "web2c-parser.y" { int i=0, j=0; while (field_list[i] == '!') @@ -2833,7 +2841,7 @@ yyreduce: case 123: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 562 "web2c-parser.y" { int i=0, j=0; while (field_list[i] == '!') @@ -2848,21 +2856,21 @@ yyreduce: case 124: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 575 "web2c-parser.y" { my_output ("text /* of "); } break; case 125: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 577 "web2c-parser.y" { my_output ("*/"); } break; case 130: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 591 "web2c-parser.y" { var_list[0] = 0; @@ -2875,7 +2883,7 @@ yyreduce: case 131: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 599 "web2c-parser.y" { array_bounds[0] = 0; @@ -2885,14 +2893,14 @@ yyreduce: case 132: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 604 "web2c-parser.y" { fixup_var_list(); } break; case 135: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 612 "web2c-parser.y" { int i=0, j=0; ii = add_to_table(last_id); @@ -2911,7 +2919,7 @@ yyreduce: case 136: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 626 "web2c-parser.y" { int i=0, j=0; ii = add_to_table(last_id); @@ -2930,7 +2938,7 @@ yyreduce: case 137: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 640 "web2c-parser.y" { int i=0, j=0; ii = add_to_table(last_id); @@ -2949,7 +2957,7 @@ yyreduce: case 139: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 658 "web2c-parser.y" { my_output ("void mainbody( void ) {"); indent++; @@ -2959,7 +2967,7 @@ yyreduce: case 140: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 663 "web2c-parser.y" { indent--; my_output ("}"); @@ -2969,28 +2977,28 @@ yyreduce: case 143: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 675 "web2c-parser.y" { new_line(); remove_locals(); } break; case 144: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 677 "web2c-parser.y" { new_line(); remove_locals(); } break; case 147: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 686 "web2c-parser.y" { proc_is_noreturn = 1; } break; case 149: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 692 "web2c-parser.y" { ii = add_to_table(last_id); if (debug) @@ -3007,7 +3015,7 @@ yyreduce: case 150: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 704 "web2c-parser.y" { strcpy(fn_return_type, "void"); do_proc_args(); @@ -3016,7 +3024,7 @@ yyreduce: case 151: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 708 "web2c-parser.y" { ii = l_s; if (debug) @@ -3029,7 +3037,7 @@ yyreduce: case 152: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 716 "web2c-parser.y" { strcpy(fn_return_type, "void"); do_proc_args(); @@ -3039,7 +3047,7 @@ yyreduce: case 153: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 724 "web2c-parser.y" { strcpy (z_id, last_id); @@ -3050,7 +3058,7 @@ yyreduce: case 154: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 730 "web2c-parser.y" { sprintf (z_id, "z%s", last_id); ids_paramed = 0; @@ -3064,14 +3072,14 @@ yyreduce: case 158: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 746 "web2c-parser.y" { ids_typed = ids_paramed; } break; case 159: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 748 "web2c-parser.y" { int i, need_var; i = search_table(last_id); @@ -3089,21 +3097,21 @@ yyreduce: case 160: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 762 "web2c-parser.y" {var_formals = 0; } break; case 162: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 763 "web2c-parser.y" {var_formals = 1; } break; case 167: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 775 "web2c-parser.y" { orig_out = out; @@ -3119,7 +3127,7 @@ yyreduce: case 168: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 786 "web2c-parser.y" { normal(); @@ -3130,7 +3138,7 @@ yyreduce: case 169: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 792 "web2c-parser.y" { get_result_type(fn_return_type); @@ -3141,7 +3149,7 @@ yyreduce: case 171: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 799 "web2c-parser.y" { orig_out = out; @@ -3156,7 +3164,7 @@ yyreduce: case 172: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 809 "web2c-parser.y" { normal(); array_bounds[0] = 0; @@ -3166,7 +3174,7 @@ yyreduce: case 173: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 814 "web2c-parser.y" { get_result_type(fn_return_type); do_proc_args(); @@ -3176,21 +3184,21 @@ yyreduce: case 179: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 832 "web2c-parser.y" { my_output ("{"); indent++; new_line(); } break; case 180: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 834 "web2c-parser.y" { indent--; my_output ("}"); new_line(); } break; case 185: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 847 "web2c-parser.y" {if (!doreturn(temp)) { sprintf(safe_string, "lab%s:", temp); @@ -3201,42 +3209,42 @@ yyreduce: case 186: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 855 "web2c-parser.y" { semicolon(); } break; case 187: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 857 "web2c-parser.y" { semicolon(); } break; case 192: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 865 "web2c-parser.y" { my_output ("break"); } break; case 193: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 869 "web2c-parser.y" { my_output ("="); } break; case 195: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 872 "web2c-parser.y" { my_output ("Result ="); } break; case 197: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 877 "web2c-parser.y" { if (strcmp(last_id, "mem") == 0) uses_mem = 1; @@ -3251,7 +3259,7 @@ yyreduce: case 199: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 888 "web2c-parser.y" { if (sym_table[l_s].var_formal) putchar('*'); @@ -3260,35 +3268,35 @@ yyreduce: case 200: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 894 "web2c-parser.y" { (yyval) = ex_32; } break; case 201: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 896 "web2c-parser.y" { (yyval) = ex_32; } break; case 204: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 904 "web2c-parser.y" { my_output ("["); } break; case 205: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 906 "web2c-parser.y" { my_output ("]"); } break; case 206: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 908 "web2c-parser.y" {if (tex || mf) { if (strcmp(last_id, "int")==0) @@ -3311,315 +3319,315 @@ yyreduce: case 207: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 926 "web2c-parser.y" { my_output (".hh.b0"); } break; case 208: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 928 "web2c-parser.y" { my_output (".hh.b1"); } break; case 210: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 933 "web2c-parser.y" { my_output ("]["); } break; case 212: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 938 "web2c-parser.y" { (yyval) = (yyvsp[(2) - (2)]); } break; case 213: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 939 "web2c-parser.y" { my_output ("+"); } break; case 214: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 940 "web2c-parser.y" { (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); } break; case 215: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 941 "web2c-parser.y" { my_output ("-"); } break; case 216: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 942 "web2c-parser.y" { (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); } break; case 217: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 943 "web2c-parser.y" { my_output ("*"); } break; case 218: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 944 "web2c-parser.y" { (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); } break; case 219: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 945 "web2c-parser.y" { my_output ("/"); } break; case 220: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 946 "web2c-parser.y" { (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); } break; case 221: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 947 "web2c-parser.y" { my_output ("=="); } break; case 222: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 948 "web2c-parser.y" { (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); } break; case 223: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 949 "web2c-parser.y" { my_output ("!="); } break; case 224: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 950 "web2c-parser.y" { (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); } break; case 225: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 951 "web2c-parser.y" { my_output ("%"); } break; case 226: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 952 "web2c-parser.y" { (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); } break; case 227: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 953 "web2c-parser.y" { my_output ("<"); } break; case 228: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 954 "web2c-parser.y" { (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); } break; case 229: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 955 "web2c-parser.y" { my_output (">"); } break; case 230: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 956 "web2c-parser.y" { (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); } break; case 231: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 957 "web2c-parser.y" { my_output ("<="); } break; case 232: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 958 "web2c-parser.y" { (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); } break; case 233: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 959 "web2c-parser.y" { my_output (">="); } break; case 234: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 960 "web2c-parser.y" { (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); } break; case 235: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 961 "web2c-parser.y" { my_output ("&&"); } break; case 236: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 962 "web2c-parser.y" { (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); } break; case 237: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 963 "web2c-parser.y" { my_output ("||"); } break; case 238: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 964 "web2c-parser.y" { (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); } break; case 239: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 966 "web2c-parser.y" { my_output ("/ ((double)"); } break; case 240: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 968 "web2c-parser.y" { (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); my_output (")"); } break; case 241: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 970 "web2c-parser.y" { (yyval) = (yyvsp[(1) - (1)]); } break; case 243: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 976 "web2c-parser.y" { my_output ("- (integer)"); } break; case 244: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 978 "web2c-parser.y" { my_output ("!"); } break; case 245: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 983 "web2c-parser.y" { my_output ("("); } break; case 246: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 985 "web2c-parser.y" { my_output (")"); (yyval) = (yyvsp[(1) - (4)]); } break; case 249: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 989 "web2c-parser.y" { my_output (last_id); my_output ("()"); } break; case 250: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 991 "web2c-parser.y" { my_output (last_id); } break; case 252: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 996 "web2c-parser.y" { my_output ("("); } break; case 253: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 997 "web2c-parser.y" { my_output (")"); } break; case 255: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1002 "web2c-parser.y" { my_output (","); } break; case 258: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1009 "web2c-parser.y" { my_output (last_id); } break; case 261: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1018 "web2c-parser.y" { my_output (last_id); my_output ("()"); } break; case 262: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1020 "web2c-parser.y" { my_output (last_id); ii = add_to_table(last_id); @@ -3630,14 +3638,14 @@ yyreduce: case 263: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1026 "web2c-parser.y" { my_output (last_id); } break; case 265: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1031 "web2c-parser.y" {if (doreturn(temp)) { if (strcmp(fn_return_type,"void")) @@ -3654,28 +3662,28 @@ yyreduce: case 272: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1057 "web2c-parser.y" { my_output ("if"); my_output ("("); } break; case 274: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1062 "web2c-parser.y" { my_output (")"); } break; case 276: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1067 "web2c-parser.y" { new_line (); } break; case 278: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1070 "web2c-parser.y" { my_output ("{"); indent++; new_line(); my_output ("if"); my_output ("("); } @@ -3683,28 +3691,28 @@ yyreduce: case 279: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1073 "web2c-parser.y" { indent--; my_output ("}"); new_line(); } break; case 282: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1079 "web2c-parser.y" { my_output ("else"); } break; case 284: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1084 "web2c-parser.y" { my_output ("switch"); my_output ("("); } break; case 285: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1086 "web2c-parser.y" { my_output (")"); new_line(); my_output ("{"); indent++; @@ -3713,21 +3721,21 @@ yyreduce: case 286: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1090 "web2c-parser.y" { indent--; my_output ("}"); new_line(); } break; case 289: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1098 "web2c-parser.y" { my_output ("break"); semicolon(); } break; case 292: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1106 "web2c-parser.y" { my_output ("case"); my_output (temp); @@ -3737,14 +3745,14 @@ yyreduce: case 293: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1111 "web2c-parser.y" { my_output ("default:"); new_line(); } break; case 299: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1124 "web2c-parser.y" { my_output ("while"); my_output ("("); @@ -3753,21 +3761,21 @@ yyreduce: case 300: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1128 "web2c-parser.y" { my_output (")"); } break; case 302: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1133 "web2c-parser.y" { my_output ("do"); my_output ("{"); indent++; } break; case 303: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1135 "web2c-parser.y" { indent--; my_output ("}"); my_output ("while"); my_output ("( ! ("); @@ -3776,14 +3784,14 @@ yyreduce: case 304: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1139 "web2c-parser.y" { my_output (") )"); } break; case 305: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1143 "web2c-parser.y" { my_output ("{"); @@ -3797,7 +3805,7 @@ yyreduce: case 306: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1152 "web2c-parser.y" { if (strict_for) my_output ("for_begin"); @@ -3808,7 +3816,7 @@ yyreduce: case 307: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1158 "web2c-parser.y" { my_output ("; if ("); if (strict_for) my_output ("for_begin"); @@ -3830,7 +3838,7 @@ yyreduce: case 308: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1175 "web2c-parser.y" { char *top = strrchr (for_stack, '#'); @@ -3851,21 +3859,21 @@ yyreduce: case 309: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1193 "web2c-parser.y" { strcpy(control_var, last_id); } break; case 310: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1197 "web2c-parser.y" { my_output (";"); } break; case 311: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1199 "web2c-parser.y" { strcpy(relation, "<="); @@ -3875,7 +3883,7 @@ yyreduce: case 312: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1204 "web2c-parser.y" { sprintf(for_stack + strlen(for_stack), @@ -3885,14 +3893,14 @@ yyreduce: case 313: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1209 "web2c-parser.y" { my_output (";"); } break; case 314: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1211 "web2c-parser.y" { strcpy(relation, ">="); @@ -3902,7 +3910,7 @@ yyreduce: case 315: -/* Line 1455 of yacc.c */ +/* Line 1464 of yacc.c */ #line 1216 "web2c-parser.y" { sprintf(for_stack + strlen(for_stack), @@ -3912,8 +3920,8 @@ yyreduce: -/* Line 1455 of yacc.c */ -#line 3917 "web2c-parser.c" +/* Line 1464 of yacc.c */ +#line 3925 "web2c-parser.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -4124,7 +4132,7 @@ yyreturn: -/* Line 1675 of yacc.c */ +/* Line 1684 of yacc.c */ #line 1221 "web2c-parser.y" diff --git a/Build/source/texk/web2c/web2c/web2c-parser.h b/Build/source/texk/web2c/web2c/web2c-parser.h index 5c2bc290c8b..f8454bbecd9 100644 --- a/Build/source/texk/web2c/web2c/web2c-parser.h +++ b/Build/source/texk/web2c/web2c/web2c-parser.h @@ -1,10 +1,9 @@ - -/* A Bison parser, made by GNU Bison 2.4.1. */ +/* A Bison parser, made by GNU Bison 2.4.3. */ /* Skeleton interface for Bison's Yacc-like parsers in C - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006, + 2009, 2010 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -- cgit v1.2.3