summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-08-06 11:59:43 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-08-06 11:59:43 +0000
commitf54865196404f260583c8ff41e001801413a9e57 (patch)
tree127784f153ebebe3d8dc88881092c14139b7beb6
parent0c53c9b5c5e27c54d13b7e73353393794155cead (diff)
bison 2.6.2
git-svn-id: svn://tug.org/texlive/trunk@27319 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/README.hacking2
-rw-r--r--Build/source/texk/web2c/omegafonts/pl-parser.c353
-rw-r--r--Build/source/texk/web2c/omegafonts/pl-parser.h26
-rw-r--r--Build/source/texk/web2c/otps/otp-parser.c308
-rw-r--r--Build/source/texk/web2c/otps/otp-parser.h26
-rw-r--r--Build/source/texk/web2c/web2c/web2c-parser.c737
-rw-r--r--Build/source/texk/web2c/web2c/web2c-parser.h26
7 files changed, 591 insertions, 887 deletions
diff --git a/Build/source/README.hacking b/Build/source/README.hacking
index 86023bfd750..ae17731d8b0 100644
--- a/Build/source/README.hacking
+++ b/Build/source/README.hacking
@@ -18,7 +18,7 @@ automake (GNU automake) 1.12.2
ltmain.sh (GNU libtool) 2.4.2
-bison (GNU Bison) 2.5.1
+bison (GNU Bison) 2.6.2
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 f28a81f718b..8bd4b09a6cc 100644
--- a/Build/source/texk/web2c/omegafonts/pl-parser.c
+++ b/Build/source/texk/web2c/omegafonts/pl-parser.c
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 2.5.1. */
+/* A Bison parser, made by GNU Bison 2.6.2. */
/* Bison implementation for Yacc-like parsers in C
@@ -44,7 +44,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.5.1"
+#define YYBISON_VERSION "2.6.2"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -58,14 +58,11 @@
/* Pull parsers. */
#define YYPULL 1
-/* Using locations. */
-#define YYLSP_NEEDED 0
/* Copy the first part of user declarations. */
-
-/* Line 268 of yacc.c */
+/* Line 336 of yacc.c */
#line 1 "pl-parser.y"
/* pl-parser.y: Grammar for reading property list files
@@ -108,9 +105,8 @@ along with Omega; if not, write to the Free Software Foundation, Inc.,
#include "extra_routines.h"
-
-/* Line 268 of yacc.c */
-#line 114 "pl-parser.c"
+/* Line 336 of yacc.c */
+#line 110 "../../../../tex-live-2012-07-09/texk/web2c/omegafonts/pl-parser.c"
# ifndef YY_NULL
# if defined __cplusplus && 201103L <= __cplusplus
@@ -120,11 +116,6 @@ along with Omega; if not, write to the Free Software Foundation, Inc.,
# endif
# endif
-/* Enabling traces. */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-
/* Enabling verbose error messages. */
#ifdef YYERROR_VERBOSE
# undef YYERROR_VERBOSE
@@ -133,11 +124,17 @@ along with Omega; if not, write to the Free Software Foundation, Inc.,
# define YYERROR_VERBOSE 0
#endif
-/* Enabling the token table. */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
+/* In a future release of Bison, this section will be replaced
+ by #include "y.tab.h". */
+#ifndef YY_Y_TAB_H
+# define YY_Y_TAB_H
+/* Enabling traces. */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG
+extern int yydebug;
#endif
-
/* Tokens. */
#ifndef YYTOKENTYPE
@@ -317,7 +314,6 @@ along with Omega; if not, write to the Free Software Foundation, Inc.,
-
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef int YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
@@ -325,12 +321,28 @@ typedef int YYSTYPE;
# define YYSTYPE_IS_DECLARED 1
#endif
+extern YYSTYPE yylval;
-/* Copy the second part of user declarations. */
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void *YYPARSE_PARAM);
+#else
+int yyparse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void);
+#else
+int yyparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
+
+#endif /* !YY_Y_TAB_H */
+/* Copy the second part of user declarations. */
-/* Line 345 of yacc.c */
-#line 334 "pl-parser.c"
+/* Line 353 of yacc.c */
+#line 346 "../../../../tex-live-2012-07-09/texk/web2c/omegafonts/pl-parser.c"
#ifdef short
# undef short
@@ -703,7 +715,7 @@ static const yytype_uint16 yyrline[] =
};
#endif
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+#if YYDEBUG || YYERROR_VERBOSE || 0
/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
First, the terminals, then, starting at YYNTOKENS, nonterminals. */
static const char *const yytname[] =
@@ -1037,32 +1049,33 @@ while (YYID (0))
#define YYTERROR 1
#define YYERRCODE 256
-
/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
If N is 0, then set CURRENT to the empty location which ends
the previous symbol: RHS[0] (always defined). */
-#define YYRHSLOC(Rhs, K) ((Rhs)[K])
#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N) \
- do \
- if (YYID (N)) \
- { \
- (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \
- (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \
- (Current).last_line = YYRHSLOC (Rhs, N).last_line; \
- (Current).last_column = YYRHSLOC (Rhs, N).last_column; \
- } \
- else \
- { \
- (Current).first_line = (Current).last_line = \
- YYRHSLOC (Rhs, 0).last_line; \
- (Current).first_column = (Current).last_column = \
- YYRHSLOC (Rhs, 0).last_column; \
- } \
+# define YYLLOC_DEFAULT(Current, Rhs, N) \
+ do \
+ if (YYID (N)) \
+ { \
+ (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \
+ (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \
+ (Current).last_line = YYRHSLOC (Rhs, N).last_line; \
+ (Current).last_column = YYRHSLOC (Rhs, N).last_column; \
+ } \
+ else \
+ { \
+ (Current).first_line = (Current).last_line = \
+ YYRHSLOC (Rhs, 0).last_line; \
+ (Current).first_column = (Current).last_column = \
+ YYRHSLOC (Rhs, 0).last_column; \
+ } \
while (YYID (0))
#endif
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
+
+
/* This macro is provided for backward compatibility. */
@@ -1532,20 +1545,6 @@ yydestruct (yymsg, yytype, yyvaluep)
}
-/* Prevent warnings from -Wmissing-prototypes. */
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void *YYPARSE_PARAM);
-#else
-int yyparse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
/* The lookahead symbol. */
@@ -1646,7 +1645,6 @@ yyparse ()
The wasted elements are never initialized. */
yyssp = yyss;
yyvsp = yyvs;
-
goto yysetstate;
/*------------------------------------------------------------.
@@ -1824,562 +1822,482 @@ yyreduce:
switch (yyn)
{
case 5:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 170 "pl-parser.y"
{ set_check_sum((yyvsp[(2) - (2)]).yint); }
break;
case 6:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 172 "pl-parser.y"
{ set_design_size((yyvsp[(2) - (2)]).yfix); }
break;
case 7:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 174 "pl-parser.y"
{ set_design_units((yyvsp[(2) - (2)]).yfix); }
break;
case 8:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 176 "pl-parser.y"
{ set_coding_scheme((yyvsp[(1) - (1)]).ystring); }
break;
case 9:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 178 "pl-parser.y"
{ set_family((yyvsp[(1) - (1)]).ystring); }
break;
case 10:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 180 "pl-parser.y"
{ set_face((yyvsp[(2) - (2)]).yint); }
break;
case 11:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 182 "pl-parser.y"
{ set_seven_bit_safe_flag((yyvsp[(1) - (1)]).yint); }
break;
case 12:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 184 "pl-parser.y"
{ set_header_word((yyvsp[(2) - (3)]).yint, (yyvsp[(3) - (3)]).yint); }
break;
case 13:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 186 "pl-parser.y"
{ init_parameters(); }
break;
case 15:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 189 "pl-parser.y"
{ init_ligkern(); }
break;
case 17:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 192 "pl-parser.y"
{ set_boundary_character((yyvsp[(2) - (2)]).yint); }
break;
case 18:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 194 "pl-parser.y"
{ init_character((yyvsp[(2) - (2)]).yint, NULL); }
break;
case 21:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 201 "pl-parser.y"
{ set_vtitle((yyvsp[(1) - (1)]).ystring); }
break;
case 22:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 203 "pl-parser.y"
{ init_map_font((yyvsp[(2) - (2)]).yint); }
break;
case 24:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 209 "pl-parser.y"
{ set_ofm_level((yyvsp[(2) - (2)]).yint); }
break;
case 25:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 211 "pl-parser.y"
{ set_font_dir((yyvsp[(1) - (1)]).yint); }
break;
case 26:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 213 "pl-parser.y"
{ init_character((yyvsp[(2) - (3)]).yint,NULL); }
break;
case 27:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 215 "pl-parser.y"
{ copy_characters((yyvsp[(2) - (5)]).yint,(yyvsp[(3) - (5)]).yint); }
break;
case 28:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 217 "pl-parser.y"
{init_font_ivalue((yyvsp[(2) - (2)]).yint);}
break;
case 30:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 220 "pl-parser.y"
{ init_font_mvalue((yyvsp[(2) - (2)]).yint);}
break;
case 32:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 223 "pl-parser.y"
{ init_font_fvalue((yyvsp[(2) - (2)]).yint);}
break;
case 34:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 226 "pl-parser.y"
{ init_font_penalty((yyvsp[(2) - (2)]).yint);}
break;
case 36:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 229 "pl-parser.y"
{ init_font_rule((yyvsp[(2) - (2)]).yint);}
break;
case 38:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 232 "pl-parser.y"
{ init_font_glue((yyvsp[(2) - (2)]).yint);}
break;
case 42:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 244 "pl-parser.y"
{ set_param_word((yyvsp[(1) - (2)]).yint, (yyvsp[(2) - (2)]).yfix); }
break;
case 43:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 246 "pl-parser.y"
{ set_param_word((yyvsp[(2) - (3)]).yint, (yyvsp[(3) - (3)]).yfix); }
break;
case 47:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 258 "pl-parser.y"
{ set_label_command((yyvsp[(2) - (2)]).yint); }
break;
case 48:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 260 "pl-parser.y"
{ set_label_command(CHAR_BOUNDARY); }
break;
case 49:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 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 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 264 "pl-parser.y"
{ set_kerning_command((yyvsp[(2) - (3)]).yint, (yyvsp[(3) - (3)]).yfix); }
break;
case 51:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 266 "pl-parser.y"
{ set_stop_command(); }
break;
case 52:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 268 "pl-parser.y"
{ set_skip_command((yyvsp[(2) - (2)]).yint); }
break;
case 54:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 274 "pl-parser.y"
{ set_c_label_command((yyvsp[(2) - (2)]).yint); }
break;
case 55:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 276 "pl-parser.y"
{ set_c_kerning_command((yyvsp[(2) - (3)]).yint, (yyvsp[(3) - (3)]).yfix); }
break;
case 56:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 278 "pl-parser.y"
{ set_c_glue_command((yyvsp[(2) - (3)]).yint, (yyvsp[(3) - (3)]).yint); }
break;
case 57:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 280 "pl-parser.y"
{ set_c_penalty_command((yyvsp[(2) - (3)]).yint, (yyvsp[(3) - (3)]).yint); }
break;
case 58:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 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 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 293 "pl-parser.y"
{ set_character_measure((yyvsp[(1) - (2)]).yint, (yyvsp[(2) - (2)]).yfix); }
break;
case 62:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 295 "pl-parser.y"
{ set_next_larger((yyvsp[(2) - (2)]).yint); }
break;
case 63:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 297 "pl-parser.y"
{ init_var_character(); }
break;
case 66:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 304 "pl-parser.y"
{ init_map(); }
break;
case 67:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 306 "pl-parser.y"
{ end_map(); }
break;
case 68:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 311 "pl-parser.y"
{ set_accent((yyvsp[(1) - (1)]).yint); }
break;
case 69:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 313 "pl-parser.y"
{ set_character_ivalue((yyvsp[(2) - (3)]).yint, (yyvsp[(3) - (3)]).yint); }
break;
case 70:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 315 "pl-parser.y"
{ set_character_mvalue((yyvsp[(2) - (3)]).yint, (yyvsp[(3) - (3)]).yint); }
break;
case 71:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 317 "pl-parser.y"
{ set_character_fvalue((yyvsp[(2) - (3)]).yint, (yyvsp[(3) - (3)]).yint); }
break;
case 72:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 319 "pl-parser.y"
{ set_character_penalty((yyvsp[(2) - (3)]).yint, (yyvsp[(3) - (3)]).yint); }
break;
case 73:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 321 "pl-parser.y"
{ set_character_rule((yyvsp[(2) - (3)]).yint, (yyvsp[(3) - (3)]).yint); }
break;
case 74:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 323 "pl-parser.y"
{ set_character_glue((yyvsp[(2) - (3)]).yint, (yyvsp[(3) - (3)]).yint); }
break;
case 77:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 335 "pl-parser.y"
{ set_extensible_piece((yyvsp[(1) - (2)]).yint, (yyvsp[(2) - (2)]).yint); }
break;
case 81:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 350 "pl-parser.y"
{ set_font_name((yyvsp[(1) - (1)]).ystring); }
break;
case 82:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 352 "pl-parser.y"
{ set_font_area((yyvsp[(1) - (1)]).ystring); }
break;
case 83:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 354 "pl-parser.y"
{ set_font_check_sum((yyvsp[(2) - (2)]).yint); }
break;
case 84:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 356 "pl-parser.y"
{ set_font_at((yyvsp[(2) - (2)]).yfix); }
break;
case 85:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 358 "pl-parser.y"
{ set_font_design_size((yyvsp[(2) - (2)]).yfix); }
break;
case 89:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 370 "pl-parser.y"
{ set_select_font((yyvsp[(2) - (2)]).yint); }
break;
case 90:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 372 "pl-parser.y"
{ set_set_char((yyvsp[(2) - (2)]).yint); }
break;
case 91:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 374 "pl-parser.y"
{ set_set_rule((yyvsp[(2) - (3)]).yfix, (yyvsp[(3) - (3)]).yfix); }
break;
case 92:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 376 "pl-parser.y"
{ set_move((yyvsp[(1) - (2)]).yint, (yyvsp[(2) - (2)]).yfix); }
break;
case 93:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 378 "pl-parser.y"
{ set_push(); }
break;
case 94:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 380 "pl-parser.y"
{ set_pop(); }
break;
case 95:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 382 "pl-parser.y"
{ set_special((yyvsp[(1) - (1)]).ystring); }
break;
case 96:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 384 "pl-parser.y"
{ set_special_hex((yyvsp[(1) - (1)]).ystring); }
break;
case 99:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 397 "pl-parser.y"
{ init_font_ivalue_entry((yyvsp[(2) - (2)]).yint); }
break;
case 104:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 410 "pl-parser.y"
{ set_font_ivalue_definition((yyvsp[(2) - (2)]).yint); }
break;
case 108:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 422 "pl-parser.y"
{ init_font_mvalue_entry((yyvsp[(2) - (2)]).yint); }
break;
case 113:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 435 "pl-parser.y"
{ set_font_mvalue_definition((yyvsp[(2) - (2)]).yfix); }
break;
case 117:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 447 "pl-parser.y"
{ init_font_fvalue_entry((yyvsp[(2) - (2)]).yint); }
break;
case 122:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 460 "pl-parser.y"
{ set_font_fvalue_definition((yyvsp[(2) - (2)]).yfix); }
break;
case 126:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 472 "pl-parser.y"
{ init_font_penalty_entry((yyvsp[(2) - (2)]).yint); }
break;
case 131:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 485 "pl-parser.y"
{ set_font_penalty_definition((yyvsp[(2) - (2)]).yint); }
break;
case 135:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 497 "pl-parser.y"
{ init_font_rule_entry((yyvsp[(2) - (2)]).yint); }
break;
case 140:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 510 "pl-parser.y"
{ set_font_rule_measure((yyvsp[(1) - (2)]).yint, (yyvsp[(2) - (2)]).yfix); }
break;
case 144:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 522 "pl-parser.y"
{ init_font_glue_entry((yyvsp[(2) - (2)]).yint); }
break;
case 149:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 535 "pl-parser.y"
{ set_font_glue_type((yyvsp[(2) - (2)]).yint); }
break;
case 150:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 537 "pl-parser.y"
{ set_font_glue_width((yyvsp[(2) - (2)]).yfix); }
break;
case 151:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 539 "pl-parser.y"
{ set_font_glue_character((yyvsp[(2) - (2)]).yint); }
break;
case 152:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 541 "pl-parser.y"
{ set_font_glue_rule((yyvsp[(2) - (3)]).yint, (yyvsp[(3) - (3)]).yint); }
break;
case 153:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 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 1810 of yacc.c */
-#line 2383 "pl-parser.c"
+/* Line 1787 of yacc.c */
+#line 2301 "../../../../tex-live-2012-07-09/texk/web2c/omegafonts/pl-parser.c"
default: break;
}
/* User semantic actions sometimes alter yychar, and that requires
@@ -2608,4 +2526,3 @@ yyreturn:
}
-
diff --git a/Build/source/texk/web2c/omegafonts/pl-parser.h b/Build/source/texk/web2c/omegafonts/pl-parser.h
index 1e12da0e01f..af8fe93054c 100644
--- a/Build/source/texk/web2c/omegafonts/pl-parser.h
+++ b/Build/source/texk/web2c/omegafonts/pl-parser.h
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 2.5.1. */
+/* A Bison parser, made by GNU Bison 2.6.2. */
/* Bison interface for Yacc-like parsers in C
@@ -30,6 +30,15 @@
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
+#ifndef YY_____________TEX_LIVE____________TEXK_WEB_C_OMEGAFONTS_PL_PARSER_H
+# define YY_____________TEX_LIVE____________TEXK_WEB_C_OMEGAFONTS_PL_PARSER_H
+/* Enabling traces. */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG
+extern int yydebug;
+#endif
/* Tokens. */
#ifndef YYTOKENTYPE
@@ -209,7 +218,6 @@
-
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef int YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
@@ -219,4 +227,18 @@ typedef int YYSTYPE;
extern YYSTYPE yylval;
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void *YYPARSE_PARAM);
+#else
+int yyparse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void);
+#else
+int yyparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
+#endif /* !YY_____________TEX_LIVE____________TEXK_WEB_C_OMEGAFONTS_PL_PARSER_H */
diff --git a/Build/source/texk/web2c/otps/otp-parser.c b/Build/source/texk/web2c/otps/otp-parser.c
index 233b66be905..295e0daf694 100644
--- a/Build/source/texk/web2c/otps/otp-parser.c
+++ b/Build/source/texk/web2c/otps/otp-parser.c
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 2.5.1. */
+/* A Bison parser, made by GNU Bison 2.6.2. */
/* Bison implementation for Yacc-like parsers in C
@@ -44,7 +44,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.5.1"
+#define YYBISON_VERSION "2.6.2"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -58,14 +58,11 @@
/* Pull parsers. */
#define YYPULL 1
-/* Using locations. */
-#define YYLSP_NEEDED 0
/* Copy the first part of user declarations. */
-
-/* Line 268 of yacc.c */
+/* Line 336 of yacc.c */
#line 25 "otp-parser.y"
#include "otp.h"
@@ -79,9 +76,8 @@ yyerror(const char *msg)
fprintf(stderr, "line %d: %s\n", line_number, msg);
}
-
-/* Line 268 of yacc.c */
-#line 85 "otp-parser.c"
+/* Line 336 of yacc.c */
+#line 81 "../../../../tex-live-2012-07-09/texk/web2c/otps/otp-parser.c"
# ifndef YY_NULL
# if defined __cplusplus && 201103L <= __cplusplus
@@ -91,11 +87,6 @@ fprintf(stderr, "line %d: %s\n", line_number, msg);
# endif
# endif
-/* Enabling traces. */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-
/* Enabling verbose error messages. */
#ifdef YYERROR_VERBOSE
# undef YYERROR_VERBOSE
@@ -104,11 +95,17 @@ fprintf(stderr, "line %d: %s\n", line_number, msg);
# define YYERROR_VERBOSE 0
#endif
-/* Enabling the token table. */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
+/* In a future release of Bison, this section will be replaced
+ by #include "y.tab.h". */
+#ifndef YY_Y_TAB_H
+# define YY_Y_TAB_H
+/* Enabling traces. */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG
+extern int yydebug;
#endif
-
/* Tokens. */
#ifndef YYTOKENTYPE
@@ -156,7 +153,6 @@ fprintf(stderr, "line %d: %s\n", line_number, msg);
-
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef int YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
@@ -164,12 +160,28 @@ typedef int YYSTYPE;
# define YYSTYPE_IS_DECLARED 1
#endif
+extern YYSTYPE yylval;
-/* Copy the second part of user declarations. */
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void *YYPARSE_PARAM);
+#else
+int yyparse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void);
+#else
+int yyparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
+
+#endif /* !YY_Y_TAB_H */
+/* Copy the second part of user declarations. */
-/* Line 345 of yacc.c */
-#line 173 "otp-parser.c"
+/* Line 353 of yacc.c */
+#line 185 "../../../../tex-live-2012-07-09/texk/web2c/otps/otp-parser.c"
#ifdef short
# undef short
@@ -505,7 +517,7 @@ static const yytype_uint16 yyrline[] =
};
#endif
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+#if YYDEBUG || YYERROR_VERBOSE || 0
/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
First, the terminals, then, starting at YYNTOKENS, nonterminals. */
static const char *const yytname[] =
@@ -756,32 +768,33 @@ while (YYID (0))
#define YYTERROR 1
#define YYERRCODE 256
-
/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
If N is 0, then set CURRENT to the empty location which ends
the previous symbol: RHS[0] (always defined). */
-#define YYRHSLOC(Rhs, K) ((Rhs)[K])
#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N) \
- do \
- if (YYID (N)) \
- { \
- (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \
- (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \
- (Current).last_line = YYRHSLOC (Rhs, N).last_line; \
- (Current).last_column = YYRHSLOC (Rhs, N).last_column; \
- } \
- else \
- { \
- (Current).first_line = (Current).last_line = \
- YYRHSLOC (Rhs, 0).last_line; \
- (Current).first_column = (Current).last_column = \
- YYRHSLOC (Rhs, 0).last_column; \
- } \
+# define YYLLOC_DEFAULT(Current, Rhs, N) \
+ do \
+ if (YYID (N)) \
+ { \
+ (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \
+ (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \
+ (Current).last_line = YYRHSLOC (Rhs, N).last_line; \
+ (Current).last_column = YYRHSLOC (Rhs, N).last_column; \
+ } \
+ else \
+ { \
+ (Current).first_line = (Current).last_line = \
+ YYRHSLOC (Rhs, 0).last_line; \
+ (Current).first_column = (Current).last_column = \
+ YYRHSLOC (Rhs, 0).last_column; \
+ } \
while (YYID (0))
#endif
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
+
+
/* This macro is provided for backward compatibility. */
@@ -1251,20 +1264,6 @@ yydestruct (yymsg, yytype, yyvaluep)
}
-/* Prevent warnings from -Wmissing-prototypes. */
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void *YYPARSE_PARAM);
-#else
-int yyparse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
/* The lookahead symbol. */
@@ -1365,7 +1364,6 @@ yyparse ()
The wasted elements are never initialized. */
yyssp = yyss;
yyvsp = yyvs;
-
goto yysetstate;
/*------------------------------------------------------------.
@@ -1543,169 +1541,145 @@ yyreduce:
switch (yyn)
{
case 3:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 72 "otp-parser.y"
{ input_bytes=2; }
break;
case 4:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 74 "otp-parser.y"
{ input_bytes=(yyvsp[(2) - (3)]).yint; }
break;
case 5:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 79 "otp-parser.y"
{ output_bytes=2; }
break;
case 6:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 81 "otp-parser.y"
{ output_bytes=(yyvsp[(2) - (3)]).yint; }
break;
case 11:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 96 "otp-parser.y"
{ store_table((yyvsp[(1) - (4)]).ystring, (yyvsp[(3) - (4)]).yint); }
break;
case 15:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 107 "otp-parser.y"
{ add_to_table((yyvsp[(1) - (1)]).yint); }
break;
case 16:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 109 "otp-parser.y"
{ add_to_table((yyvsp[(3) - (3)]).yint); }
break;
case 19:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 119 "otp-parser.y"
{ store_state((yyvsp[(1) - (1)]).ystring); }
break;
case 20:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 121 "otp-parser.y"
{ store_state((yyvsp[(3) - (3)]).ystring); }
break;
case 25:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 136 "otp-parser.y"
{ store_alias((yyvsp[(1) - (4)]).ystring, (yyvsp[(3) - (4)]).yleft); }
break;
case 26:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 141 "otp-parser.y"
{ (yyval).yleft = StringLeft((yyvsp[(1) - (1)]).ystring); }
break;
case 27:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 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 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 145 "otp-parser.y"
{ (yyval).yleft = PlusLeft((yyvsp[(1) - (5)]).yleft, (yyvsp[(3) - (5)]).yint); }
break;
case 29:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 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 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 149 "otp-parser.y"
{ (yyval).yleft = (yyvsp[(1) - (1)]).yleft; }
break;
case 31:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 154 "otp-parser.y"
{ (yyval).yleft = SingleLeft((yyvsp[(1) - (1)]).yint); }
break;
case 32:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 156 "otp-parser.y"
{ (yyval).yleft = DoubleLeft((yyvsp[(1) - (3)]).yint, (yyvsp[(3) - (3)]).yint); }
break;
case 33:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 158 "otp-parser.y"
{ (yyval).yleft = WildCard(); }
break;
case 34:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 160 "otp-parser.y"
{ (yyval).yleft = NotChoiceLeft((yyvsp[(3) - (4)]).ylleft); }
break;
case 35:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 162 "otp-parser.y"
{ (yyval).yleft = ChoiceLeft((yyvsp[(2) - (3)]).ylleft); }
break;
case 36:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 164 "otp-parser.y"
{ (yyval).yleft = lookup_alias((yyvsp[(2) - (3)]).ystring); }
break;
case 37:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 169 "otp-parser.y"
{ (yyval).ylleft = llist1((yyvsp[(1) - (1)]).yleft); }
break;
case 38:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 171 "otp-parser.y"
{ (yyval).ylleft = lappend1((yyvsp[(1) - (3)]).ylleft, (yyvsp[(3) - (3)]).yleft); }
break;
case 39:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 176 "otp-parser.y"
{
for(cur_state=0; cur_state<no_states; cur_state++) {
@@ -1721,106 +1695,91 @@ yyreduce:
break;
case 42:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 196 "otp-parser.y"
{ states[cur_state].no_exprs++; }
break;
case 43:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 198 "otp-parser.y"
{ out_left((yyvsp[(3) - (3)]).ylleft); right_offset=0; }
break;
case 44:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 200 "otp-parser.y"
{ right_offset=OTP_PBACK_OFFSET; }
break;
case 45:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 202 "otp-parser.y"
{ fill_in_left(); }
break;
case 48:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 212 "otp-parser.y"
{ cur_state = 0; }
break;
case 49:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 214 "otp-parser.y"
{ cur_state = lookup_state((yyvsp[(2) - (3)]).ystring); }
break;
case 50:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 219 "otp-parser.y"
{ (yyval).ylleft = lappend((yyvsp[(1) - (3)]).ylleft, lappend((yyvsp[(2) - (3)]).ylleft, (yyvsp[(3) - (3)]).ylleft)); }
break;
case 51:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 221 "otp-parser.y"
{ (yyval).ylleft = lappend((yyvsp[(1) - (2)]).ylleft, (yyvsp[(2) - (2)]).ylleft); }
break;
case 52:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 226 "otp-parser.y"
{ (yyval).ylleft = nil; }
break;
case 53:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 228 "otp-parser.y"
{ (yyval).ylleft = llist1(BeginningLeft()); }
break;
case 54:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 233 "otp-parser.y"
{ (yyval).ylleft = nil; }
break;
case 55:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 235 "otp-parser.y"
{ (yyval).ylleft = llist1(EndLeft()); }
break;
case 56:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 240 "otp-parser.y"
{ (yyval).ylleft = llist1((yyvsp[(1) - (1)]).yleft); }
break;
case 57:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 242 "otp-parser.y"
{ (yyval).ylleft = lappend1((yyvsp[(1) - (2)]).ylleft, (yyvsp[(2) - (2)]).yleft); }
break;
case 60:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 252 "otp-parser.y"
{
len=strlen((yyvsp[(1) - (1)]).ystring);
@@ -1831,36 +1790,31 @@ yyreduce:
break;
case 61:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 259 "otp-parser.y"
{ out_right(OTP_RIGHT_NUM, (yyvsp[(1) - (1)]).yint); }
break;
case 62:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 261 "otp-parser.y"
{ out_right(OTP_RIGHT_CHAR, (yyvsp[(2) - (2)]).yint); }
break;
case 63:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 263 "otp-parser.y"
{ out_right(OTP_RIGHT_LCHAR, 0); }
break;
case 64:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 265 "otp-parser.y"
{ out_right(OTP_RIGHT_LCHAR, (yyvsp[(5) - (6)]).yint); }
break;
case 65:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 267 "otp-parser.y"
{
out_right(OTP_RIGHT_SOME, 0);
@@ -1869,8 +1823,7 @@ yyreduce:
break;
case 66:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 272 "otp-parser.y"
{
out_right(OTP_RIGHT_SOME, (yyvsp[(5) - (6)]).yint);
@@ -1879,8 +1832,7 @@ yyreduce:
break;
case 67:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 277 "otp-parser.y"
{
out_right(OTP_RIGHT_SOME, 0);
@@ -1889,8 +1841,7 @@ yyreduce:
break;
case 68:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 282 "otp-parser.y"
{
out_right(OTP_RIGHT_SOME, (yyvsp[(5) - (8)]).yint);
@@ -1899,121 +1850,104 @@ yyreduce:
break;
case 69:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 287 "otp-parser.y"
{ out_right(OTP_RIGHT_OUTPUT, 0); }
break;
case 71:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 293 "otp-parser.y"
{ out_int(OTP_ADD, 0); }
break;
case 72:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 295 "otp-parser.y"
{ out_int(OTP_SUB, 0); }
break;
case 73:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 297 "otp-parser.y"
{ out_int(OTP_MULT, 0); }
break;
case 74:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 299 "otp-parser.y"
{ out_int(OTP_DIV, 0); }
break;
case 75:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 301 "otp-parser.y"
{ out_int(OTP_MOD, 0); }
break;
case 76:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 303 "otp-parser.y"
{ out_int(OTP_PUSH_NUM, lookup_table((yyvsp[(1) - (1)]).ystring)); }
break;
case 77:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 305 "otp-parser.y"
{ out_int(OTP_LOOKUP, 0); }
break;
case 78:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 310 "otp-parser.y"
{ out_int(OTP_PUSH_NUM, (yyvsp[(1) - (1)]).yint); }
break;
case 79:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 312 "otp-parser.y"
{ out_int(OTP_PUSH_CHAR, (yyvsp[(2) - (2)]).yint); }
break;
case 80:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 314 "otp-parser.y"
{ out_int(OTP_PUSH_LCHAR, 0); }
break;
case 81:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 316 "otp-parser.y"
{ out_int(OTP_PUSH_LCHAR, (yyvsp[(5) - (6)]).yint); }
break;
case 84:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 323 "otp-parser.y"
{ out_int(OTP_STATE_CHANGE, 0); }
break;
case 85:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 325 "otp-parser.y"
{ out_int(OTP_STATE_CHANGE, lookup_state((yyvsp[(2) - (3)]).ystring)); }
break;
case 86:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 327 "otp-parser.y"
{ out_int(OTP_STATE_PUSH, lookup_state((yyvsp[(3) - (4)]).ystring)); }
break;
case 87:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 329 "otp-parser.y"
{ out_int(OTP_STATE_POP, 0); }
break;
-
-/* Line 1810 of yacc.c */
-#line 2017 "otp-parser.c"
+/* Line 1787 of yacc.c */
+#line 1951 "../../../../tex-live-2012-07-09/texk/web2c/otps/otp-parser.c"
default: break;
}
/* User semantic actions sometimes alter yychar, and that requires
@@ -2242,8 +2176,6 @@ yyreturn:
}
-
-/* Line 2071 of yacc.c */
+/* Line 2048 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 5b282d7b966..32181a0bcb5 100644
--- a/Build/source/texk/web2c/otps/otp-parser.h
+++ b/Build/source/texk/web2c/otps/otp-parser.h
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 2.5.1. */
+/* A Bison parser, made by GNU Bison 2.6.2. */
/* Bison interface for Yacc-like parsers in C
@@ -30,6 +30,15 @@
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
+#ifndef YY_____________TEX_LIVE____________TEXK_WEB_C_OTPS_OTP_PARSER_H
+# define YY_____________TEX_LIVE____________TEXK_WEB_C_OTPS_OTP_PARSER_H
+/* Enabling traces. */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG
+extern int yydebug;
+#endif
/* Tokens. */
#ifndef YYTOKENTYPE
@@ -77,7 +86,6 @@
-
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef int YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
@@ -87,4 +95,18 @@ typedef int YYSTYPE;
extern YYSTYPE yylval;
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void *YYPARSE_PARAM);
+#else
+int yyparse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void);
+#else
+int yyparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
+#endif /* !YY_____________TEX_LIVE____________TEXK_WEB_C_OTPS_OTP_PARSER_H */
diff --git a/Build/source/texk/web2c/web2c/web2c-parser.c b/Build/source/texk/web2c/web2c/web2c-parser.c
index 6197c588b2b..afdddddacba 100644
--- a/Build/source/texk/web2c/web2c/web2c-parser.c
+++ b/Build/source/texk/web2c/web2c/web2c-parser.c
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 2.5.1. */
+/* A Bison parser, made by GNU Bison 2.6.2. */
/* Bison implementation for Yacc-like parsers in C
@@ -44,7 +44,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.5.1"
+#define YYBISON_VERSION "2.6.2"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -58,14 +58,11 @@
/* Pull parsers. */
#define YYPULL 1
-/* Using locations. */
-#define YYLSP_NEEDED 0
/* Copy the first part of user declarations. */
-
-/* Line 268 of yacc.c */
+/* Line 336 of yacc.c */
#line 24 "web2c-parser.y"
#include "web2c.h"
@@ -102,9 +99,8 @@ static void do_proc_args (void);
static void gen_function_head (void);
static boolean doreturn (string);
-
-/* Line 268 of yacc.c */
-#line 108 "web2c-parser.c"
+/* Line 336 of yacc.c */
+#line 104 "../../../../tex-live-2012-07-09/texk/web2c/web2c/web2c-parser.c"
# ifndef YY_NULL
# if defined __cplusplus && 201103L <= __cplusplus
@@ -114,11 +110,6 @@ static boolean doreturn (string);
# endif
# endif
-/* Enabling traces. */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-
/* Enabling verbose error messages. */
#ifdef YYERROR_VERBOSE
# undef YYERROR_VERBOSE
@@ -127,11 +118,17 @@ static boolean doreturn (string);
# define YYERROR_VERBOSE 0
#endif
-/* Enabling the token table. */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
+/* In a future release of Bison, this section will be replaced
+ by #include "y.tab.h". */
+#ifndef YY_Y_TAB_H
+# define YY_Y_TAB_H
+/* Enabling traces. */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG
+extern int yydebug;
#endif
-
/* Tokens. */
#ifndef YYTOKENTYPE
@@ -259,7 +256,6 @@ static boolean doreturn (string);
-
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef int YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
@@ -267,12 +263,28 @@ typedef int YYSTYPE;
# define YYSTYPE_IS_DECLARED 1
#endif
+extern YYSTYPE yylval;
-/* Copy the second part of user declarations. */
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void *YYPARSE_PARAM);
+#else
+int yyparse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void);
+#else
+int yyparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
+
+#endif /* !YY_Y_TAB_H */
+/* Copy the second part of user declarations. */
-/* Line 345 of yacc.c */
-#line 276 "web2c-parser.c"
+/* Line 353 of yacc.c */
+#line 288 "../../../../tex-live-2012-07-09/texk/web2c/web2c/web2c-parser.c"
#ifdef short
# undef short
@@ -717,7 +729,7 @@ static const yytype_uint16 yyrline[] =
};
#endif
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+#if YYDEBUG || YYERROR_VERBOSE || 0
/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
First, the terminals, then, starting at YYNTOKENS, nonterminals. */
static const char *const yytname[] =
@@ -1261,32 +1273,33 @@ while (YYID (0))
#define YYTERROR 1
#define YYERRCODE 256
-
/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
If N is 0, then set CURRENT to the empty location which ends
the previous symbol: RHS[0] (always defined). */
-#define YYRHSLOC(Rhs, K) ((Rhs)[K])
#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N) \
- do \
- if (YYID (N)) \
- { \
- (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \
- (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \
- (Current).last_line = YYRHSLOC (Rhs, N).last_line; \
- (Current).last_column = YYRHSLOC (Rhs, N).last_column; \
- } \
- else \
- { \
- (Current).first_line = (Current).last_line = \
- YYRHSLOC (Rhs, 0).last_line; \
- (Current).first_column = (Current).last_column = \
- YYRHSLOC (Rhs, 0).last_column; \
- } \
+# define YYLLOC_DEFAULT(Current, Rhs, N) \
+ do \
+ if (YYID (N)) \
+ { \
+ (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \
+ (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \
+ (Current).last_line = YYRHSLOC (Rhs, N).last_line; \
+ (Current).last_column = YYRHSLOC (Rhs, N).last_column; \
+ } \
+ else \
+ { \
+ (Current).first_line = (Current).last_line = \
+ YYRHSLOC (Rhs, 0).last_line; \
+ (Current).first_column = (Current).last_column = \
+ YYRHSLOC (Rhs, 0).last_column; \
+ } \
while (YYID (0))
#endif
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
+
+
/* This macro is provided for backward compatibility. */
@@ -1756,20 +1769,6 @@ yydestruct (yymsg, yytype, yyvaluep)
}
-/* Prevent warnings from -Wmissing-prototypes. */
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void *YYPARSE_PARAM);
-#else
-int yyparse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
/* The lookahead symbol. */
@@ -1870,7 +1869,6 @@ yyparse ()
The wasted elements are never initialized. */
yyssp = yyss;
yyvsp = yyvs;
-
goto yysetstate;
/*------------------------------------------------------------.
@@ -2048,8 +2046,7 @@ yyreduce:
switch (yyn)
{
case 2:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 66 "web2c-parser.y"
{
printf ("#define %s\n", uppercasify (program_name));
@@ -2059,22 +2056,19 @@ yyreduce:
break;
case 3:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 73 "web2c-parser.y"
{ printf ("\n#include \"%s\"\n", coerce_name); }
break;
case 4:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 76 "web2c-parser.y"
{ YYACCEPT; }
break;
case 7:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 86 "web2c-parser.y"
{
ii = add_to_table (last_id);
@@ -2083,8 +2077,7 @@ yyreduce:
break;
case 8:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 91 "web2c-parser.y"
{
ii = add_to_table (last_id);
@@ -2093,8 +2086,7 @@ yyreduce:
break;
case 9:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 96 "web2c-parser.y"
{
ii = add_to_table (last_id);
@@ -2103,8 +2095,7 @@ yyreduce:
break;
case 10:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 101 "web2c-parser.y"
{
ii = add_to_table (last_id);
@@ -2113,8 +2104,7 @@ yyreduce:
break;
case 11:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 106 "web2c-parser.y"
{
ii = add_to_table (last_id);
@@ -2123,8 +2113,7 @@ yyreduce:
break;
case 12:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 111 "web2c-parser.y"
{
ii = add_to_table (last_id);
@@ -2133,8 +2122,7 @@ yyreduce:
break;
case 13:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 116 "web2c-parser.y"
{
ii = add_to_table (last_id);
@@ -2143,8 +2131,7 @@ yyreduce:
break;
case 14:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 121 "web2c-parser.y"
{
ii = add_to_table (last_id);
@@ -2157,8 +2144,7 @@ yyreduce:
break;
case 15:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 130 "web2c-parser.y"
{
ii = add_to_table (last_id);
@@ -2167,8 +2153,7 @@ yyreduce:
break;
case 23:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 157 "web2c-parser.y"
{ if (block_level > 0) my_output("{\n ");
indent++; block_level++;
@@ -2176,8 +2161,7 @@ yyreduce:
break;
case 24:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 162 "web2c-parser.y"
{ if (block_level == 2) {
if (strcmp(fn_return_type, "void")) {
@@ -2195,15 +2179,13 @@ yyreduce:
break;
case 25:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 176 "web2c-parser.y"
{ doing_statements = true; }
break;
case 26:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 178 "web2c-parser.y"
{
if (block_level == 2) {
@@ -2234,36 +2216,31 @@ yyreduce:
break;
case 28:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 208 "web2c-parser.y"
{ my_output("/*"); }
break;
case 29:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 210 "web2c-parser.y"
{ my_output("*/"); }
break;
case 32:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 218 "web2c-parser.y"
{ my_output(temp); }
break;
case 34:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 224 "web2c-parser.y"
{ new_line(); }
break;
case 37:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 233 "web2c-parser.y"
{ /* `#define' must be in column 1 for pcc. */
unsigned save = indent;
@@ -2275,8 +2252,7 @@ yyreduce:
break;
case 38:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 241 "web2c-parser.y"
{ ii = add_to_table (last_id);
sym_table[ii].typ = const_id_tok;
@@ -2285,29 +2261,25 @@ yyreduce:
break;
case 39:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 245 "web2c-parser.y"
{ my_output ("("); }
break;
case 40:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 246 "web2c-parser.y"
{ my_output (")"); }
break;
case 41:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 247 "web2c-parser.y"
{ sym_table[ii].val = last_i_num; new_line(); }
break;
case 42:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 252 "web2c-parser.y"
{
sscanf (temp, "%ld", &last_i_num);
@@ -2319,253 +2291,217 @@ yyreduce:
break;
case 43:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 259 "web2c-parser.y"
{ my_output(temp); (yyval) = ex_real; }
break;
case 44:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 260 "web2c-parser.y"
{ (yyval) = 0; }
break;
case 45:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 261 "web2c-parser.y"
{ (yyval) = ex_32; }
break;
case 46:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 266 "web2c-parser.y"
{ (yyval) = (yyvsp[(2) - (2)]); }
break;
case 47:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 267 "web2c-parser.y"
{ my_output ("+"); }
break;
case 48:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 268 "web2c-parser.y"
{ (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); }
break;
case 49:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 269 "web2c-parser.y"
{ my_output ("-"); }
break;
case 50:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 270 "web2c-parser.y"
{ (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); }
break;
case 51:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 271 "web2c-parser.y"
{ my_output ("*"); }
break;
case 52:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 272 "web2c-parser.y"
{ (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); }
break;
case 53:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 273 "web2c-parser.y"
{ my_output ("/"); }
break;
case 54:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 274 "web2c-parser.y"
{ (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); }
break;
case 55:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 275 "web2c-parser.y"
{ my_output ("=="); }
break;
case 56:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 276 "web2c-parser.y"
{ (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); }
break;
case 57:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 277 "web2c-parser.y"
{ my_output ("!="); }
break;
case 58:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 278 "web2c-parser.y"
{ (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); }
break;
case 59:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 279 "web2c-parser.y"
{ my_output ("%"); }
break;
case 60:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 280 "web2c-parser.y"
{ (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); }
break;
case 61:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 281 "web2c-parser.y"
{ my_output ("<"); }
break;
case 62:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 282 "web2c-parser.y"
{ (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); }
break;
case 63:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 283 "web2c-parser.y"
{ my_output (">"); }
break;
case 64:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 284 "web2c-parser.y"
{ (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); }
break;
case 65:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 285 "web2c-parser.y"
{ my_output ("<="); }
break;
case 66:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 286 "web2c-parser.y"
{ (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); }
break;
case 67:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 287 "web2c-parser.y"
{ my_output (">="); }
break;
case 68:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 288 "web2c-parser.y"
{ (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); }
break;
case 69:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 289 "web2c-parser.y"
{ my_output ("&&"); }
break;
case 70:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 290 "web2c-parser.y"
{ (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); }
break;
case 71:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 291 "web2c-parser.y"
{ my_output ("||"); }
break;
case 72:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 292 "web2c-parser.y"
{ (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); }
break;
case 73:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 293 "web2c-parser.y"
{ my_output ("/ ((double)"); }
break;
case 74:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 294 "web2c-parser.y"
{ (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); my_output (")"); }
break;
case 75:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 295 "web2c-parser.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 76:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 300 "web2c-parser.y"
{ my_output ("("); }
break;
case 77:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 302 "web2c-parser.y"
{ my_output (")"); (yyval) = (yyvsp[(1) - (4)]); }
break;
case 79:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 308 "web2c-parser.y"
{
char s[132];
@@ -2575,8 +2511,7 @@ yyreduce:
break;
case 80:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 314 "web2c-parser.y"
{
char s[5];
@@ -2586,22 +2521,19 @@ yyreduce:
break;
case 81:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 322 "web2c-parser.y"
{ my_output (last_id); }
break;
case 86:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 334 "web2c-parser.y"
{ my_output ("typedef"); }
break;
case 87:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 336 "web2c-parser.y"
{
ii = add_to_table(last_id);
@@ -2612,8 +2544,7 @@ yyreduce:
break;
case 88:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 343 "web2c-parser.y"
{
array_bounds[0] = 0;
@@ -2622,8 +2553,7 @@ yyreduce:
break;
case 89:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 348 "web2c-parser.y"
{
if (*array_offset) {
@@ -2637,8 +2567,7 @@ yyreduce:
break;
case 92:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 366 "web2c-parser.y"
{
if (last_type >= 0)
@@ -2675,8 +2604,7 @@ yyreduce:
break;
case 97:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 412 "web2c-parser.y"
{
lower_bound = upper_bound;
@@ -2687,8 +2615,7 @@ yyreduce:
break;
case 98:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 419 "web2c-parser.y"
{
lower_bound = upper_bound;
@@ -2699,8 +2626,7 @@ yyreduce:
break;
case 99:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 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.
@@ -2713,8 +2639,7 @@ yyreduce:
break;
case 100:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 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
@@ -2727,8 +2652,7 @@ yyreduce:
break;
case 101:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 447 "web2c-parser.y"
{
if (last_type >= 0) {
@@ -2743,8 +2667,7 @@ yyreduce:
break;
case 102:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 461 "web2c-parser.y"
{ if (last_type >= 0)
sym_table[last_type].var_not_needed = true;
@@ -2752,8 +2675,7 @@ yyreduce:
break;
case 104:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 466 "web2c-parser.y"
{ if (last_type >= 0)
sym_table[last_type].var_not_needed = true;
@@ -2761,8 +2683,7 @@ yyreduce:
break;
case 105:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 470 "web2c-parser.y"
{ if (last_type >= 0)
sym_table[last_type].var_not_needed = true;
@@ -2770,8 +2691,7 @@ yyreduce:
break;
case 106:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 477 "web2c-parser.y"
{
if (last_type >= 0) {
@@ -2787,15 +2707,13 @@ yyreduce:
break;
case 109:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 497 "web2c-parser.y"
{ compute_array_bounds(); }
break;
case 110:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 499 "web2c-parser.y"
{
lower_bound = sym_table[l_s].val;
@@ -2807,29 +2725,25 @@ yyreduce:
break;
case 112:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 512 "web2c-parser.y"
{ my_output ("struct"); my_output ("{"); indent++; }
break;
case 113:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 514 "web2c-parser.y"
{ indent--; my_output ("}"); semicolon(); }
break;
case 116:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 522 "web2c-parser.y"
{ field_list[0] = 0; }
break;
case 117:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 524 "web2c-parser.y"
{
/*array_bounds[0] = 0;
@@ -2838,8 +2752,7 @@ yyreduce:
break;
case 118:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 529 "web2c-parser.y"
{ int i=0, j; char ltemp[80];
while(field_list[i++] == '!') {
@@ -2857,8 +2770,7 @@ yyreduce:
break;
case 122:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 550 "web2c-parser.y"
{ int i=0, j=0;
while (field_list[i] == '!')
@@ -2874,8 +2786,7 @@ yyreduce:
break;
case 123:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 562 "web2c-parser.y"
{ int i=0, j=0;
while (field_list[i] == '!')
@@ -2889,22 +2800,19 @@ yyreduce:
break;
case 124:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 575 "web2c-parser.y"
{ my_output ("text /* of "); }
break;
case 125:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 577 "web2c-parser.y"
{ my_output ("*/"); }
break;
case 130:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 591 "web2c-parser.y"
{
var_list[0] = 0;
@@ -2916,8 +2824,7 @@ yyreduce:
break;
case 131:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 599 "web2c-parser.y"
{
array_bounds[0] = 0;
@@ -2926,15 +2833,13 @@ yyreduce:
break;
case 132:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 604 "web2c-parser.y"
{ fixup_var_list(); }
break;
case 135:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 612 "web2c-parser.y"
{ int i=0, j=0;
ii = add_to_table(last_id);
@@ -2952,8 +2857,7 @@ yyreduce:
break;
case 136:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 626 "web2c-parser.y"
{ int i=0, j=0;
ii = add_to_table(last_id);
@@ -2971,8 +2875,7 @@ yyreduce:
break;
case 137:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 640 "web2c-parser.y"
{ int i=0, j=0;
ii = add_to_table(last_id);
@@ -2990,8 +2893,7 @@ yyreduce:
break;
case 139:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 658 "web2c-parser.y"
{ my_output ("void mainbody( void ) {");
indent++;
@@ -3000,8 +2902,7 @@ yyreduce:
break;
case 140:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 663 "web2c-parser.y"
{ indent--;
my_output ("}");
@@ -3010,29 +2911,25 @@ yyreduce:
break;
case 143:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 675 "web2c-parser.y"
{ new_line(); remove_locals(); }
break;
case 144:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 677 "web2c-parser.y"
{ new_line(); remove_locals(); }
break;
case 147:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 686 "web2c-parser.y"
{ proc_is_noreturn = 1; }
break;
case 149:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 692 "web2c-parser.y"
{ ii = add_to_table(last_id);
if (debug)
@@ -3048,8 +2945,7 @@ yyreduce:
break;
case 150:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 704 "web2c-parser.y"
{ strcpy(fn_return_type, "void");
do_proc_args();
@@ -3057,8 +2953,7 @@ yyreduce:
break;
case 151:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 708 "web2c-parser.y"
{ ii = l_s;
if (debug)
@@ -3070,8 +2965,7 @@ yyreduce:
break;
case 152:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 716 "web2c-parser.y"
{ strcpy(fn_return_type, "void");
do_proc_args();
@@ -3080,8 +2974,7 @@ yyreduce:
break;
case 153:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 724 "web2c-parser.y"
{
strcpy (z_id, last_id);
@@ -3091,8 +2984,7 @@ yyreduce:
break;
case 154:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 730 "web2c-parser.y"
{ sprintf (z_id, "z%s", last_id);
ids_paramed = 0;
@@ -3105,15 +2997,13 @@ yyreduce:
break;
case 158:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 746 "web2c-parser.y"
{ ids_typed = ids_paramed; }
break;
case 159:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 748 "web2c-parser.y"
{ int i, need_var;
i = search_table(last_id);
@@ -3130,22 +3020,19 @@ yyreduce:
break;
case 160:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 762 "web2c-parser.y"
{var_formals = 0; }
break;
case 162:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 763 "web2c-parser.y"
{var_formals = 1; }
break;
case 167:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 775 "web2c-parser.y"
{
orig_out = out;
@@ -3160,8 +3047,7 @@ yyreduce:
break;
case 168:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 786 "web2c-parser.y"
{
normal();
@@ -3171,8 +3057,7 @@ yyreduce:
break;
case 169:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 792 "web2c-parser.y"
{
get_result_type(fn_return_type);
@@ -3182,8 +3067,7 @@ yyreduce:
break;
case 171:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 799 "web2c-parser.y"
{
orig_out = out;
@@ -3197,8 +3081,7 @@ yyreduce:
break;
case 172:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 809 "web2c-parser.y"
{ normal();
array_bounds[0] = 0;
@@ -3207,8 +3090,7 @@ yyreduce:
break;
case 173:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 814 "web2c-parser.y"
{ get_result_type(fn_return_type);
do_proc_args();
@@ -3217,22 +3099,19 @@ yyreduce:
break;
case 179:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 832 "web2c-parser.y"
{ my_output ("{"); indent++; new_line(); }
break;
case 180:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 834 "web2c-parser.y"
{ indent--; my_output ("}"); new_line(); }
break;
case 185:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 847 "web2c-parser.y"
{if (!doreturn(temp)) {
sprintf(safe_string, "lab%s:", temp);
@@ -3242,43 +3121,37 @@ yyreduce:
break;
case 186:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 855 "web2c-parser.y"
{ semicolon(); }
break;
case 187:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 857 "web2c-parser.y"
{ semicolon(); }
break;
case 192:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 865 "web2c-parser.y"
{ my_output ("break"); }
break;
case 193:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 869 "web2c-parser.y"
{ my_output ("="); }
break;
case 195:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 872 "web2c-parser.y"
{ my_output ("Result ="); }
break;
case 197:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 877 "web2c-parser.y"
{ if (strcmp(last_id, "mem") == 0)
uses_mem = 1;
@@ -3292,8 +3165,7 @@ yyreduce:
break;
case 199:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 888 "web2c-parser.y"
{ if (sym_table[l_s].var_formal)
putchar('*');
@@ -3301,36 +3173,31 @@ yyreduce:
break;
case 200:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 894 "web2c-parser.y"
{ (yyval) = ex_32; }
break;
case 201:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 896 "web2c-parser.y"
{ (yyval) = ex_32; }
break;
case 204:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 904 "web2c-parser.y"
{ my_output ("["); }
break;
case 205:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 906 "web2c-parser.y"
{ my_output ("]"); }
break;
case 206:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 908 "web2c-parser.y"
{if (tex || mf) {
if (strcmp(last_id, "int")==0)
@@ -3352,316 +3219,271 @@ yyreduce:
break;
case 207:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 926 "web2c-parser.y"
{ my_output (".hh.b0"); }
break;
case 208:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 928 "web2c-parser.y"
{ my_output (".hh.b1"); }
break;
case 210:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 933 "web2c-parser.y"
{ my_output ("]["); }
break;
case 212:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 938 "web2c-parser.y"
{ (yyval) = (yyvsp[(2) - (2)]); }
break;
case 213:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 939 "web2c-parser.y"
{ my_output ("+"); }
break;
case 214:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 940 "web2c-parser.y"
{ (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); }
break;
case 215:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 941 "web2c-parser.y"
{ my_output ("-"); }
break;
case 216:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 942 "web2c-parser.y"
{ (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); }
break;
case 217:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 943 "web2c-parser.y"
{ my_output ("*"); }
break;
case 218:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 944 "web2c-parser.y"
{ (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); }
break;
case 219:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 945 "web2c-parser.y"
{ my_output ("/"); }
break;
case 220:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 946 "web2c-parser.y"
{ (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); }
break;
case 221:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 947 "web2c-parser.y"
{ my_output ("=="); }
break;
case 222:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 948 "web2c-parser.y"
{ (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); }
break;
case 223:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 949 "web2c-parser.y"
{ my_output ("!="); }
break;
case 224:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 950 "web2c-parser.y"
{ (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); }
break;
case 225:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 951 "web2c-parser.y"
{ my_output ("%"); }
break;
case 226:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 952 "web2c-parser.y"
{ (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); }
break;
case 227:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 953 "web2c-parser.y"
{ my_output ("<"); }
break;
case 228:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 954 "web2c-parser.y"
{ (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); }
break;
case 229:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 955 "web2c-parser.y"
{ my_output (">"); }
break;
case 230:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 956 "web2c-parser.y"
{ (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); }
break;
case 231:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 957 "web2c-parser.y"
{ my_output ("<="); }
break;
case 232:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 958 "web2c-parser.y"
{ (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); }
break;
case 233:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 959 "web2c-parser.y"
{ my_output (">="); }
break;
case 234:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 960 "web2c-parser.y"
{ (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); }
break;
case 235:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 961 "web2c-parser.y"
{ my_output ("&&"); }
break;
case 236:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 962 "web2c-parser.y"
{ (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); }
break;
case 237:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 963 "web2c-parser.y"
{ my_output ("||"); }
break;
case 238:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 964 "web2c-parser.y"
{ (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); }
break;
case 239:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 966 "web2c-parser.y"
{ my_output ("/ ((double)"); }
break;
case 240:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 968 "web2c-parser.y"
{ (yyval) = max ((yyvsp[(1) - (4)]), (yyvsp[(4) - (4)])); my_output (")"); }
break;
case 241:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 970 "web2c-parser.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 243:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 976 "web2c-parser.y"
{ my_output ("- (integer)"); }
break;
case 244:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 978 "web2c-parser.y"
{ my_output ("!"); }
break;
case 245:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 983 "web2c-parser.y"
{ my_output ("("); }
break;
case 246:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 985 "web2c-parser.y"
{ my_output (")"); (yyval) = (yyvsp[(1) - (4)]); }
break;
case 249:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 989 "web2c-parser.y"
{ my_output (last_id); my_output ("()"); }
break;
case 250:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 991 "web2c-parser.y"
{ my_output (last_id); }
break;
case 252:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 996 "web2c-parser.y"
{ my_output ("("); }
break;
case 253:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 997 "web2c-parser.y"
{ my_output (")"); }
break;
case 255:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 1002 "web2c-parser.y"
{ my_output (","); }
break;
case 258:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 1009 "web2c-parser.y"
{ my_output (last_id); }
break;
case 261:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 1018 "web2c-parser.y"
{ my_output (last_id); my_output ("()"); }
break;
case 262:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 1020 "web2c-parser.y"
{ my_output (last_id);
ii = add_to_table(last_id);
@@ -3671,15 +3493,13 @@ yyreduce:
break;
case 263:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 1026 "web2c-parser.y"
{ my_output (last_id); }
break;
case 265:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 1031 "web2c-parser.y"
{if (doreturn(temp)) {
if (strcmp(fn_return_type,"void"))
@@ -3695,58 +3515,50 @@ yyreduce:
break;
case 272:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 1057 "web2c-parser.y"
{ my_output ("if"); my_output ("("); }
break;
case 274:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 1062 "web2c-parser.y"
{ my_output (")"); }
break;
case 276:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 1067 "web2c-parser.y"
{ new_line (); }
break;
case 278:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 1070 "web2c-parser.y"
{ my_output ("{"); indent++; new_line();
my_output ("if"); my_output ("("); }
break;
case 279:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 1073 "web2c-parser.y"
{ indent--; my_output ("}"); new_line(); }
break;
case 282:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 1079 "web2c-parser.y"
{ my_output ("else"); }
break;
case 284:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 1084 "web2c-parser.y"
{ my_output ("switch"); my_output ("("); }
break;
case 285:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 1086 "web2c-parser.y"
{ my_output (")"); new_line();
my_output ("{"); indent++;
@@ -3754,22 +3566,19 @@ yyreduce:
break;
case 286:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 1090 "web2c-parser.y"
{ indent--; my_output ("}"); new_line(); }
break;
case 289:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 1098 "web2c-parser.y"
{ my_output ("break"); semicolon(); }
break;
case 292:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 1106 "web2c-parser.y"
{ my_output ("case");
my_output (temp);
@@ -3778,15 +3587,13 @@ yyreduce:
break;
case 293:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 1111 "web2c-parser.y"
{ my_output ("default:"); new_line(); }
break;
case 299:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 1124 "web2c-parser.y"
{ my_output ("while");
my_output ("(");
@@ -3794,22 +3601,19 @@ yyreduce:
break;
case 300:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 1128 "web2c-parser.y"
{ my_output (")"); }
break;
case 302:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 1133 "web2c-parser.y"
{ my_output ("do"); my_output ("{"); indent++; }
break;
case 303:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 1135 "web2c-parser.y"
{ indent--; my_output ("}");
my_output ("while"); my_output ("( ! (");
@@ -3817,15 +3621,13 @@ yyreduce:
break;
case 304:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 1139 "web2c-parser.y"
{ my_output (") )"); }
break;
case 305:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 1143 "web2c-parser.y"
{
my_output ("{");
@@ -3838,8 +3640,7 @@ yyreduce:
break;
case 306:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 1152 "web2c-parser.y"
{ if (strict_for)
my_output ("for_begin");
@@ -3849,8 +3650,7 @@ yyreduce:
break;
case 307:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 1158 "web2c-parser.y"
{ my_output ("; if (");
if (strict_for) my_output ("for_begin");
@@ -3871,8 +3671,7 @@ yyreduce:
break;
case 308:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 1175 "web2c-parser.y"
{
char *top = strrchr (for_stack, '#');
@@ -3892,22 +3691,19 @@ yyreduce:
break;
case 309:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 1193 "web2c-parser.y"
{ strcpy(control_var, last_id); }
break;
case 310:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 1197 "web2c-parser.y"
{ my_output (";"); }
break;
case 311:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 1199 "web2c-parser.y"
{
strcpy(relation, "<=");
@@ -3916,8 +3712,7 @@ yyreduce:
break;
case 312:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 1204 "web2c-parser.y"
{
sprintf(for_stack + strlen(for_stack),
@@ -3926,15 +3721,13 @@ yyreduce:
break;
case 313:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 1209 "web2c-parser.y"
{ my_output (";"); }
break;
case 314:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 1211 "web2c-parser.y"
{
strcpy(relation, ">=");
@@ -3943,8 +3736,7 @@ yyreduce:
break;
case 315:
-
-/* Line 1810 of yacc.c */
+/* Line 1787 of yacc.c */
#line 1216 "web2c-parser.y"
{
sprintf(for_stack + strlen(for_stack),
@@ -3953,9 +3745,8 @@ yyreduce:
break;
-
-/* Line 1810 of yacc.c */
-#line 3959 "web2c-parser.c"
+/* Line 1787 of yacc.c */
+#line 3750 "../../../../tex-live-2012-07-09/texk/web2c/web2c/web2c-parser.c"
default: break;
}
/* User semantic actions sometimes alter yychar, and that requires
@@ -4184,8 +3975,7 @@ yyreturn:
}
-
-/* Line 2071 of yacc.c */
+/* Line 2048 of yacc.c */
#line 1221 "web2c-parser.y"
@@ -4370,4 +4160,3 @@ gen_function_head (void)
my_output (")");
new_line ();
}
-
diff --git a/Build/source/texk/web2c/web2c/web2c-parser.h b/Build/source/texk/web2c/web2c/web2c-parser.h
index 3aa948374da..b9bdffea68c 100644
--- a/Build/source/texk/web2c/web2c/web2c-parser.h
+++ b/Build/source/texk/web2c/web2c/web2c-parser.h
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 2.5.1. */
+/* A Bison parser, made by GNU Bison 2.6.2. */
/* Bison interface for Yacc-like parsers in C
@@ -30,6 +30,15 @@
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
+#ifndef YY_____________TEX_LIVE____________TEXK_WEB_C_WEB_C_WEB_C_PARSER_H
+# define YY_____________TEX_LIVE____________TEXK_WEB_C_WEB_C_WEB_C_PARSER_H
+/* Enabling traces. */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG
+extern int yydebug;
+#endif
/* Tokens. */
#ifndef YYTOKENTYPE
@@ -157,7 +166,6 @@
-
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef int YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
@@ -167,4 +175,18 @@ typedef int YYSTYPE;
extern YYSTYPE yylval;
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void *YYPARSE_PARAM);
+#else
+int yyparse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void);
+#else
+int yyparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
+#endif /* !YY_____________TEX_LIVE____________TEXK_WEB_C_WEB_C_WEB_C_PARSER_H */