bison 3.0

git-svn-id: svn://tug.org/texlive/trunk@31304 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 543 insertions, 766 deletions

diff --git a/Build/source/texk/web2c/otps/otp-parser.c b/Build/source/texk/web2c/otps/otp-parser.c
index 295e0daf694..9998802d22d 100644
--- a/Build/source/texk/web2c/otps/otp-parser.c
+++ b/Build/source/texk/web2c/otps/otp-parser.c
@@ -1,19 +1,19 @@
-/* A Bison parser, made by GNU Bison 2.6.2.  */
+/* A Bison parser, made by GNU Bison 3.0.  */
 
 /* Bison implementation for Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
-   
+
+   Copyright (C) 1984, 1989-1990, 2000-2013 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
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
@@ -26,7 +26,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-   
+
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
@@ -44,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.6.2"
+#define YYBISON_VERSION "3.0"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -62,8 +62,7 @@
 
 
 /* Copy the first part of user declarations.  */
-/* Line 336 of yacc.c  */
-#line 25 "otp-parser.y"
+#line 25 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:339  */
 
 #include "otp.h"
 #include "routines.h"
@@ -76,8 +75,7 @@ yyerror(const char *msg)
 fprintf(stderr, "line %d: %s\n", line_number, msg);
 }
 
-/* Line 336 of yacc.c  */
-#line 81 "../../../../tex-live-2012-07-09/texk/web2c/otps/otp-parser.c"
+#line 79 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:339  */
 
 # ifndef YY_NULL
 #  if defined __cplusplus && 201103L <= __cplusplus
@@ -97,9 +95,9 @@ fprintf(stderr, "line %d: %s\n", line_number, msg);
 
 /* 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 YY_YY__TEX_LIVE_TEXK_WEB_C_OTPS_OTP_PARSER_H_INCLUDED
+# define YY_YY__TEX_LIVE_TEXK_WEB_C_OTPS_OTP_PARSER_H_INCLUDED
+/* Debug traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 0
 #endif
@@ -107,30 +105,29 @@ fprintf(stderr, "line %d: %s\n", line_number, msg);
 extern int yydebug;
 #endif
 
-/* Tokens.  */
+/* Token type.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     NUMBER = 258,
-     ID = 259,
-     STRING = 260,
-     LEFTARROW = 261,
-     RIGHTARROW = 262,
-     INPUT = 263,
-     OUTPUT = 264,
-     ALIASES = 265,
-     STATES = 266,
-     TABLES = 267,
-     EXPRESSIONS = 268,
-     PUSH = 269,
-     POP = 270,
-     DIV = 271,
-     MOD = 272,
-     BEG = 273,
-     END = 274
-   };
+  enum yytokentype
+  {
+    NUMBER = 258,
+    ID = 259,
+    STRING = 260,
+    LEFTARROW = 261,
+    RIGHTARROW = 262,
+    INPUT = 263,
+    OUTPUT = 264,
+    ALIASES = 265,
+    STATES = 266,
+    TABLES = 267,
+    EXPRESSIONS = 268,
+    PUSH = 269,
+    POP = 270,
+    DIV = 271,
+    MOD = 272,
+    BEG = 273,
+    END = 274
+  };
 #endif
 /* Tokens.  */
 #define NUMBER 258
@@ -151,37 +148,23 @@ extern int yydebug;
 #define BEG 273
 #define END 274
 
-
-
+/* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 #endif
 
+
 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_Y_TAB_H  */
+#endif /* !YY_YY__TEX_LIVE_TEXK_WEB_C_OTPS_OTP_PARSER_H_INCLUDED  */
 
 /* Copy the second part of user declarations.  */
 
-/* Line 353 of yacc.c  */
-#line 185 "../../../../tex-live-2012-07-09/texk/web2c/otps/otp-parser.c"
+#line 168 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -195,11 +178,8 @@ typedef unsigned char yytype_uint8;
 
 #ifdef YYTYPE_INT8
 typedef YYTYPE_INT8 yytype_int8;
-#elif (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-typedef signed char yytype_int8;
 #else
-typedef short int yytype_int8;
+typedef signed char yytype_int8;
 #endif
 
 #ifdef YYTYPE_UINT16
@@ -219,8 +199,7 @@ typedef short int yytype_int16;
 #  define YYSIZE_T __SIZE_TYPE__
 # elif defined size_t
 #  define YYSIZE_T size_t
-# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+# elif ! defined YYSIZE_T
 #  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
 #  define YYSIZE_T size_t
 # else
@@ -234,39 +213,49 @@ typedef short int yytype_int16;
 # if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
 #  endif
 # endif
 # ifndef YY_
-#  define YY_(msgid) msgid
+#  define YY_(Msgid) Msgid
+# endif
+#endif
+
+#ifndef __attribute__
+/* This feature is available in gcc versions 2.5 and later.  */
+# if (! defined __GNUC__ || __GNUC__ < 2 \
+      || (__GNUC__ == 2 && __GNUC_MINOR__ < 5))
+#  define __attribute__(Spec) /* empty */
 # endif
 #endif
 
 /* Suppress unused-variable warnings by "using" E.  */
 #if ! defined lint || defined __GNUC__
-# define YYUSE(e) ((void) (e))
+# define YYUSE(E) ((void) (E))
 #else
-# define YYUSE(e) /* empty */
+# define YYUSE(E) /* empty */
 #endif
 
-/* Identity function, used to suppress warnings about constant conditions.  */
-#ifndef lint
-# define YYID(n) (n)
+#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+    _Pragma ("GCC diagnostic push") \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
+    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
+    _Pragma ("GCC diagnostic pop")
 #else
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static int
-YYID (int yyi)
-#else
-static int
-YYID (yyi)
-    int yyi;
+# define YY_INITIAL_VALUE(Value) Value
 #endif
-{
-  return yyi;
-}
+#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END
+#endif
+#ifndef YY_INITIAL_VALUE
+# define YY_INITIAL_VALUE(Value) /* Nothing. */
 #endif
 
+
 #if ! defined yyoverflow || YYERROR_VERBOSE
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
@@ -284,8 +273,7 @@ YYID (yyi)
 #    define alloca _alloca
 #   else
 #    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
       /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
 #     ifndef EXIT_SUCCESS
@@ -297,8 +285,8 @@ YYID (yyi)
 # endif
 
 # ifdef YYSTACK_ALLOC
-   /* Pacify GCC's `empty if-body' warning.  */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+   /* Pacify GCC's 'empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
 #  ifndef YYSTACK_ALLOC_MAXIMUM
     /* The OS might guarantee only one guard page at the bottom of the stack,
        and a page size can be as small as 4096 bytes.  So we cannot safely
@@ -314,7 +302,7 @@ YYID (yyi)
 #  endif
 #  if (defined __cplusplus && ! defined EXIT_SUCCESS \
        && ! ((defined YYMALLOC || defined malloc) \
-	     && (defined YYFREE || defined free)))
+             && (defined YYFREE || defined free)))
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
 #   ifndef EXIT_SUCCESS
 #    define EXIT_SUCCESS 0
@@ -322,15 +310,13 @@ YYID (yyi)
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc
-#   if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#   if ! defined malloc && ! defined EXIT_SUCCESS
 void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 #  ifndef YYFREE
 #   define YYFREE free
-#   if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#   if ! defined free && ! defined EXIT_SUCCESS
 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
@@ -340,7 +326,7 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
 
 #if (! defined yyoverflow \
      && (! defined __cplusplus \
-	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
@@ -365,16 +351,16 @@ union yyalloc
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
-    do									\
-      {									\
-	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
-	Stack = &yyptr->Stack_alloc;					\
-	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-	yyptr += yynewbytes / sizeof (*yyptr);				\
-      }									\
-    while (YYID (0))
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
+    do                                                                  \
+      {                                                                 \
+        YYSIZE_T yynewbytes;                                            \
+        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
+        Stack = &yyptr->Stack_alloc;                                    \
+        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+        yyptr += yynewbytes / sizeof (*yyptr);                          \
+      }                                                                 \
+    while (0)
 
 #endif
 
@@ -393,7 +379,7 @@ union yyalloc
           for (yyi = 0; yyi < (Count); yyi++)   \
             (Dst)[yyi] = (Src)[yyi];            \
         }                                       \
-      while (YYID (0))
+      while (0)
 #  endif
 # endif
 #endif /* !YYCOPY_NEEDED */
@@ -409,17 +395,19 @@ union yyalloc
 #define YYNNTS  36
 /* YYNRULES -- Number of rules.  */
 #define YYNRULES  87
-/* YYNRULES -- Number of states.  */
+/* YYNSTATES -- Number of states.  */
 #define YYNSTATES  161
 
-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
+   by yylex, with out-of-bounds checking.  */
 #define YYUNDEFTOK  2
 #define YYMAXUTOK   274
 
-#define YYTRANSLATE(YYX)						\
+#define YYTRANSLATE(YYX)                                                \
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
-/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
+/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
+   as returned by yylex, without out-of-bounds checking.  */
 static const yytype_uint8 yytranslate[] =
 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -453,56 +441,7 @@ static const yytype_uint8 yytranslate[] =
 };
 
 #if YYDEBUG
-/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
-   YYRHS.  */
-static const yytype_uint16 yyprhs[] =
-{
-       0,     0,     3,    10,    11,    15,    16,    20,    21,    24,
-      26,    29,    30,    41,    42,    44,    46,    50,    51,    55,
-      57,    61,    62,    65,    67,    70,    75,    77,    84,    90,
-      95,    97,    99,   103,   105,   110,   114,   118,   120,   124,
-     127,   129,   132,   133,   134,   135,   146,   147,   150,   151,
-     155,   159,   162,   163,   165,   166,   168,   170,   173,   174,
-     177,   179,   181,   184,   187,   194,   197,   204,   211,   220,
-     223,   225,   229,   233,   237,   241,   245,   246,   252,   254,
-     257,   260,   267,   271,   272,   275,   279,   284
-};
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
-static const yytype_int8 yyrhs[] =
-{
-      41,     0,    -1,    42,    43,    44,    50,    52,    58,    -1,
-      -1,     8,     3,    23,    -1,    -1,     9,     3,    23,    -1,
-      -1,    12,    45,    -1,    46,    -1,    45,    46,    -1,    -1,
-       4,    24,     3,    25,    47,    26,    27,    48,    28,    23,
-      -1,    -1,    49,    -1,     3,    -1,    49,    29,     3,    -1,
-      -1,    11,    51,    23,    -1,     4,    -1,    51,    29,     4,
-      -1,    -1,    10,    53,    -1,    54,    -1,    53,    54,    -1,
-       4,    26,    55,    23,    -1,     5,    -1,    56,    30,     3,
-      29,     3,    31,    -1,    56,    30,     3,    29,    31,    -1,
-      56,    30,     3,    31,    -1,    56,    -1,     3,    -1,     3,
-      21,     3,    -1,    32,    -1,    33,    34,    57,    35,    -1,
-      34,    57,    35,    -1,    27,     4,    28,    -1,    56,    -1,
-      57,    36,    56,    -1,    13,    59,    -1,    60,    -1,    59,
-      60,    -1,    -1,    -1,    -1,    65,    61,    66,    62,     7,
-      70,    63,    64,    75,    23,    -1,    -1,     6,    70,    -1,
-      -1,    30,     4,    31,    -1,    67,    69,    68,    -1,    67,
-      68,    -1,    -1,    18,    -1,    -1,    19,    -1,    55,    -1,
-      69,    55,    -1,    -1,    70,    71,    -1,     5,    -1,     3,
-      -1,    37,     3,    -1,    37,    38,    -1,    37,    34,    38,
-      21,     3,    35,    -1,    37,    22,    -1,    37,    34,    22,
-      20,     3,    35,    -1,    37,    34,    22,    21,     3,    35,
-      -1,    37,    34,    22,    20,     3,    21,     3,    35,    -1,
-      39,    74,    -1,    74,    -1,    72,    20,    74,    -1,    72,
-      21,    74,    -1,    72,    22,    74,    -1,    72,    16,    74,
-      -1,    72,    17,    74,    -1,    -1,     4,    73,    24,    72,
-      25,    -1,     3,    -1,    37,     3,    -1,    37,    38,    -1,
-      37,    34,    38,    21,     3,    35,    -1,    34,    72,    35,
-      -1,    -1,    30,    31,    -1,    30,     4,    31,    -1,    30,
-      14,     4,    31,    -1,    30,    15,    31,    -1
-};
-
-/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
        0,    62,    62,    72,    73,    79,    80,    84,    86,    90,
@@ -538,8 +477,8 @@ static const char *const yytname[] =
 #endif
 
 # ifdef YYPRINT
-/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
-   token YYLEX-NUM.  */
+/* YYTOKNUM[NUM] -- (External) token number corresponding to the
+   (internal) symbol number NUM (which must be that of a token).  */
 static const yytype_uint16 yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
@@ -549,70 +488,18 @@ static const yytype_uint16 yytoknum[] =
 };
 # endif
 
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint8 yyr1[] =
-{
-       0,    40,    41,    42,    42,    43,    43,    44,    44,    45,
-      45,    47,    46,    48,    48,    49,    49,    50,    50,    51,
-      51,    52,    52,    53,    53,    54,    55,    55,    55,    55,
-      55,    56,    56,    56,    56,    56,    56,    57,    57,    58,
-      59,    59,    61,    62,    63,    60,    64,    64,    65,    65,
-      66,    66,    67,    67,    68,    68,    69,    69,    70,    70,
-      71,    71,    71,    71,    71,    71,    71,    71,    71,    71,
-      72,    72,    72,    72,    72,    72,    73,    72,    74,    74,
-      74,    74,    74,    75,    75,    75,    75,    75
-};
+#define YYPACT_NINF -97
 
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-static const yytype_uint8 yyr2[] =
-{
-       0,     2,     6,     0,     3,     0,     3,     0,     2,     1,
-       2,     0,    10,     0,     1,     1,     3,     0,     3,     1,
-       3,     0,     2,     1,     2,     4,     1,     6,     5,     4,
-       1,     1,     3,     1,     4,     3,     3,     1,     3,     2,
-       1,     2,     0,     0,     0,    10,     0,     2,     0,     3,
-       3,     2,     0,     1,     0,     1,     1,     2,     0,     2,
-       1,     1,     2,     2,     6,     2,     6,     6,     8,     2,
-       1,     3,     3,     3,     3,     3,     0,     5,     1,     2,
-       2,     6,     3,     0,     2,     3,     4,     3
-};
+#define yypact_value_is_default(Yystate) \
+  (!!((Yystate) == (-97)))
 
-/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
-   Performed when YYTABLE doesn't specify something else to do.  Zero
-   means the default is an error.  */
-static const yytype_uint8 yydefact[] =
-{
-       3,     0,     0,     5,     0,     1,     0,     7,     4,     0,
-       0,    17,     6,     0,     8,     9,     0,    21,     0,    10,
-      19,     0,     0,     0,     0,    18,     0,     0,    22,    23,
-      48,     2,    11,    20,     0,    24,     0,    48,    40,    42,
-       0,    31,    26,     0,    33,     0,     0,     0,    30,     0,
-      41,    52,     0,     0,     0,     0,    37,     0,    25,     0,
-      49,    53,    43,    54,    13,    32,    36,     0,    35,     0,
-       0,     0,    55,    56,    51,    54,    15,     0,    14,    34,
-      38,     0,    29,    58,    57,    50,     0,     0,     0,    28,
-      44,    12,    16,    27,    61,    60,     0,     0,    46,    59,
-      62,    65,     0,    63,    78,     0,     0,    69,    58,    83,
-       0,     0,    76,     0,    70,    79,     0,    80,    47,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      82,     0,     0,     0,     0,    84,    45,     0,     0,     0,
-       0,    74,    75,    71,    72,    73,     0,    85,     0,    87,
-       0,    66,    67,    64,     0,     0,    86,     0,    77,    81,
-      68
-};
+#define YYTABLE_NINF -40
 
-/* YYDEFGOTO[NTERM-NUM].  */
-static const yytype_int8 yydefgoto[] =
-{
-      -1,     2,     3,     7,    11,    14,    15,    40,    77,    78,
-      17,    21,    23,    28,    29,    47,    48,    57,    31,    37,
-      38,    51,    71,    98,   109,    39,    62,    63,    74,    75,
-      90,    99,   113,   124,   114,   120
-};
+#define yytable_value_is_error(Yytable_value) \
+  0
 
-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-   STATE-NUM.  */
-#define YYPACT_NINF -97
+  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+     STATE-NUM.  */
 static const yytype_int16 yypact[] =
 {
        0,    13,    18,    11,    34,   -97,    69,    66,   -97,    65,
@@ -634,7 +521,31 @@ static const yytype_int16 yypact[] =
      -97
 };
 
-/* YYPGOTO[NTERM-NUM].  */
+  /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
+     Performed when YYTABLE does not specify something else to do.  Zero
+     means the default is an error.  */
+static const yytype_uint8 yydefact[] =
+{
+       3,     0,     0,     5,     0,     1,     0,     7,     4,     0,
+       0,    17,     6,     0,     8,     9,     0,    21,     0,    10,
+      19,     0,     0,     0,     0,    18,     0,     0,    22,    23,
+      48,     2,    11,    20,     0,    24,     0,    48,    40,    42,
+       0,    31,    26,     0,    33,     0,     0,     0,    30,     0,
+      41,    52,     0,     0,     0,     0,    37,     0,    25,     0,
+      49,    53,    43,    54,    13,    32,    36,     0,    35,     0,
+       0,     0,    55,    56,    51,    54,    15,     0,    14,    34,
+      38,     0,    29,    58,    57,    50,     0,     0,     0,    28,
+      44,    12,    16,    27,    61,    60,     0,     0,    46,    59,
+      62,    65,     0,    63,    78,     0,     0,    69,    58,    83,
+       0,     0,    76,     0,    70,    79,     0,    80,    47,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      82,     0,     0,     0,     0,    84,    45,     0,     0,     0,
+       0,    74,    75,    71,    72,    73,     0,    85,     0,    87,
+       0,    66,    67,    64,     0,     0,    86,     0,    77,    81,
+      68
+};
+
+  /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int8 yypgoto[] =
 {
      -97,   -97,   -97,   -97,   -97,   -97,   125,   -97,   -97,   -97,
@@ -643,10 +554,18 @@ static const yytype_int8 yypgoto[] =
       30,   -97,     2,   -97,   -96,   -97
 };
 
-/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
-   positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -40
+  /* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int8 yydefgoto[] =
+{
+      -1,     2,     3,     7,    11,    14,    15,    40,    77,    78,
+      17,    21,    23,    28,    29,    47,    48,    57,    31,    37,
+      38,    51,    71,    98,   109,    39,    62,    63,    74,    75,
+      90,    99,   113,   124,   114,   120
+};
+
+  /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
+     positive, shift that token.  If negative, reduce the rule whose
+     number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_int16 yytable[] =
 {
       94,   107,    95,    56,   100,   110,   115,    73,     1,   104,
@@ -669,12 +588,6 @@ static const yytype_int16 yytable[] =
        0,     0,     0,    67
 };
 
-#define yypact_value_is_default(yystate) \
-  ((yystate) == (-97))
-
-#define yytable_value_is_error(yytable_value) \
-  YYID (0)
-
 static const yytype_int16 yycheck[] =
 {
        3,    97,     5,    46,     3,    22,     3,    63,     8,     3,
@@ -697,8 +610,8 @@ static const yytype_int16 yycheck[] =
       -1,    -1,    -1,    55
 };
 
-/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-   symbol of state STATE-NUM.  */
+  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+     symbol of state STATE-NUM.  */
 static const yytype_uint8 yystos[] =
 {
        0,     8,    41,    42,     3,     0,     9,    43,    23,     3,
@@ -720,30 +633,44 @@ static const yytype_uint8 yystos[] =
       35
 };
 
-#define yyerrok		(yyerrstatus = 0)
-#define yyclearin	(yychar = YYEMPTY)
-#define YYEMPTY		(-2)
-#define YYEOF		0
-
-#define YYACCEPT	goto yyacceptlab
-#define YYABORT		goto yyabortlab
-#define YYERROR		goto yyerrorlab
-
-
-/* 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.  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
+  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1[] =
+{
+       0,    40,    41,    42,    42,    43,    43,    44,    44,    45,
+      45,    47,    46,    48,    48,    49,    49,    50,    50,    51,
+      51,    52,    52,    53,    53,    54,    55,    55,    55,    55,
+      55,    56,    56,    56,    56,    56,    56,    57,    57,    58,
+      59,    59,    61,    62,    63,    60,    64,    64,    65,    65,
+      66,    66,    67,    67,    68,    68,    69,    69,    70,    70,
+      71,    71,    71,    71,    71,    71,    71,    71,    71,    71,
+      72,    72,    72,    72,    72,    72,    73,    72,    74,    74,
+      74,    74,    74,    75,    75,    75,    75,    75
+};
+
+  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
+{
+       0,     2,     6,     0,     3,     0,     3,     0,     2,     1,
+       2,     0,    10,     0,     1,     1,     3,     0,     3,     1,
+       3,     0,     2,     1,     2,     4,     1,     6,     5,     4,
+       1,     1,     3,     1,     4,     3,     3,     1,     3,     2,
+       1,     2,     0,     0,     0,    10,     0,     2,     0,     3,
+       3,     2,     0,     1,     0,     1,     1,     2,     0,     2,
+       1,     1,     2,     2,     6,     2,     6,     6,     8,     2,
+       1,     3,     3,     3,     3,     3,     0,     5,     1,     2,
+       2,     6,     3,     0,     2,     3,     4,     3
+};
+
+
+#define yyerrok         (yyerrstatus = 0)
+#define yyclearin       (yychar = YYEMPTY)
+#define YYEMPTY         (-2)
+#define YYEOF           0
+
+#define YYACCEPT        goto yyacceptlab
+#define YYABORT         goto yyabortlab
+#define YYERROR         goto yyerrorlab
+
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
@@ -760,56 +687,15 @@ do                                                              \
   else                                                          \
     {                                                           \
       yyerror (YY_("syntax error: cannot back up")); \
-      YYERROR;							\
-    }								\
-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).  */
-
-#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;                              \
-        }                                                               \
-    while (YYID (0))
-#endif
-
-#define YYRHSLOC(Rhs, K) ((Rhs)[K])
-
-
-
-/* This macro is provided for backward compatibility. */
-
-#ifndef YY_LOCATION_PRINT
-# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-#endif
+      YYERROR;                                                  \
+    }                                                           \
+while (0)
 
+/* Error token number */
+#define YYTERROR        1
+#define YYERRCODE       256
 
-/* YYLEX -- calling `yylex' with the right arguments.  */
 
-#ifdef YYLEX_PARAM
-# define YYLEX yylex (YYLEX_PARAM)
-#else
-# define YYLEX yylex ()
-#endif
 
 /* Enable debugging if requested.  */
 #if YYDEBUG
@@ -819,40 +705,36 @@ while (YYID (0))
 #  define YYFPRINTF fprintf
 # endif
 
-# define YYDPRINTF(Args)			\
-do {						\
-  if (yydebug)					\
-    YYFPRINTF Args;				\
-} while (YYID (0))
+# define YYDPRINTF(Args)                        \
+do {                                            \
+  if (yydebug)                                  \
+    YYFPRINTF Args;                             \
+} while (0)
+
+/* This macro is provided for backward compatibility. */
+#ifndef YY_LOCATION_PRINT
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+#endif
+
 
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \
-do {									  \
-  if (yydebug)								  \
-    {									  \
-      YYFPRINTF (stderr, "%s ", Title);					  \
-      yy_symbol_print (stderr,						  \
-		  Type, Value); \
-      YYFPRINTF (stderr, "\n");						  \
-    }									  \
-} while (YYID (0))
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
+do {                                                                      \
+  if (yydebug)                                                            \
+    {                                                                     \
+      YYFPRINTF (stderr, "%s ", Title);                                   \
+      yy_symbol_print (stderr,                                            \
+                  Type, Value); \
+      YYFPRINTF (stderr, "\n");                                           \
+    }                                                                     \
+} while (0)
 
 
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
+/*----------------------------------------.
+| Print this symbol's value on YYOUTPUT.  |
+`----------------------------------------*/
 
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
 yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
-static void
-yy_symbol_value_print (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE const * const yyvaluep;
-#endif
 {
   FILE *yyo = yyoutput;
   YYUSE (yyo);
@@ -861,14 +743,8 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep)
 # ifdef YYPRINT
   if (yytype < YYNTOKENS)
     YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# else
-  YYUSE (yyoutput);
 # endif
-  switch (yytype)
-    {
-      default:
-	break;
-    }
+  YYUSE (yytype);
 }
 
 
@@ -876,22 +752,11 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep)
 | Print this symbol on YYOUTPUT.  |
 `--------------------------------*/
 
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
 yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
-static void
-yy_symbol_print (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE const * const yyvaluep;
-#endif
 {
-  if (yytype < YYNTOKENS)
-    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-  else
-    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+  YYFPRINTF (yyoutput, "%s %s (",
+             yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
 
   yy_symbol_value_print (yyoutput, yytype, yyvaluep);
   YYFPRINTF (yyoutput, ")");
@@ -902,16 +767,8 @@ yy_symbol_print (yyoutput, yytype, yyvaluep)
 | TOP (included).                                                   |
 `------------------------------------------------------------------*/
 
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
 yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
-#else
-static void
-yy_stack_print (yybottom, yytop)
-    yytype_int16 *yybottom;
-    yytype_int16 *yytop;
-#endif
 {
   YYFPRINTF (stderr, "Stack now");
   for (; yybottom <= yytop; yybottom++)
@@ -922,49 +779,42 @@ yy_stack_print (yybottom, yytop)
   YYFPRINTF (stderr, "\n");
 }
 
-# define YY_STACK_PRINT(Bottom, Top)				\
-do {								\
-  if (yydebug)							\
-    yy_stack_print ((Bottom), (Top));				\
-} while (YYID (0))
+# define YY_STACK_PRINT(Bottom, Top)                            \
+do {                                                            \
+  if (yydebug)                                                  \
+    yy_stack_print ((Bottom), (Top));                           \
+} while (0)
 
 
 /*------------------------------------------------.
 | Report that the YYRULE is going to be reduced.  |
 `------------------------------------------------*/
 
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
-yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
-#else
-static void
-yy_reduce_print (yyvsp, yyrule)
-    YYSTYPE *yyvsp;
-    int yyrule;
-#endif
+yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
 {
+  unsigned long int yylno = yyrline[yyrule];
   int yynrhs = yyr2[yyrule];
   int yyi;
-  unsigned long int yylno = yyrline[yyrule];
   YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
-	     yyrule - 1, yylno);
+             yyrule - 1, yylno);
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
       YYFPRINTF (stderr, "   $%d = ", yyi + 1);
-      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
-		       &(yyvsp[(yyi + 1) - (yynrhs)])
-		       		       );
+      yy_symbol_print (stderr,
+                       yystos[yyssp[yyi + 1 - yynrhs]],
+                       &(yyvsp[(yyi + 1) - (yynrhs)])
+                                              );
       YYFPRINTF (stderr, "\n");
     }
 }
 
-# define YY_REDUCE_PRINT(Rule)		\
-do {					\
-  if (yydebug)				\
-    yy_reduce_print (yyvsp, Rule); \
-} while (YYID (0))
+# define YY_REDUCE_PRINT(Rule)          \
+do {                                    \
+  if (yydebug)                          \
+    yy_reduce_print (yyssp, yyvsp, Rule); \
+} while (0)
 
 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */
@@ -978,7 +828,7 @@ int yydebug;
 
 
 /* YYINITDEPTH -- initial size of the parser's stacks.  */
-#ifndef	YYINITDEPTH
+#ifndef YYINITDEPTH
 # define YYINITDEPTH 200
 #endif
 
@@ -1001,15 +851,8 @@ int yydebug;
 #   define yystrlen strlen
 #  else
 /* Return the length of YYSTR.  */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static YYSIZE_T
 yystrlen (const char *yystr)
-#else
-static YYSIZE_T
-yystrlen (yystr)
-    const char *yystr;
-#endif
 {
   YYSIZE_T yylen;
   for (yylen = 0; yystr[yylen]; yylen++)
@@ -1025,16 +868,8 @@ yystrlen (yystr)
 #  else
 /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
    YYDEST.  */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static char *
 yystpcpy (char *yydest, const char *yysrc)
-#else
-static char *
-yystpcpy (yydest, yysrc)
-    char *yydest;
-    const char *yysrc;
-#endif
 {
   char *yyd = yydest;
   const char *yys = yysrc;
@@ -1064,27 +899,27 @@ yytnamerr (char *yyres, const char *yystr)
       char const *yyp = yystr;
 
       for (;;)
-	switch (*++yyp)
-	  {
-	  case '\'':
-	  case ',':
-	    goto do_not_strip_quotes;
-
-	  case '\\':
-	    if (*++yyp != '\\')
-	      goto do_not_strip_quotes;
-	    /* Fall through.  */
-	  default:
-	    if (yyres)
-	      yyres[yyn] = *yyp;
-	    yyn++;
-	    break;
-
-	  case '"':
-	    if (yyres)
-	      yyres[yyn] = '\0';
-	    return yyn;
-	  }
+        switch (*++yyp)
+          {
+          case '\'':
+          case ',':
+            goto do_not_strip_quotes;
+
+          case '\\':
+            if (*++yyp != '\\')
+              goto do_not_strip_quotes;
+            /* Fall through.  */
+          default:
+            if (yyres)
+              yyres[yyn] = *yyp;
+            yyn++;
+            break;
+
+          case '"':
+            if (yyres)
+              yyres[yyn] = '\0';
+            return yyn;
+          }
     do_not_strip_quotes: ;
     }
 
@@ -1109,7 +944,6 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
 {
   YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]);
   YYSIZE_T yysize = yysize0;
-  YYSIZE_T yysize1;
   enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
   /* Internationalized format string. */
   const char *yyformat = YY_NULL;
@@ -1120,10 +954,6 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
   int yycount = 0;
 
   /* There are many possibilities here to consider:
-     - Assume YYFAIL is not used.  It's too flawed to consider.  See
-       <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
-       for details.  YYERROR is fine as it does not invoke this
-       function.
      - If this state is a consistent state with a default action, then
        the only way this function was invoked is if the default action
        is an error action.  In that case, don't check for expected
@@ -1172,11 +1002,13 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
                     break;
                   }
                 yyarg[yycount++] = yytname[yyx];
-                yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]);
-                if (! (yysize <= yysize1
-                       && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-                  return 2;
-                yysize = yysize1;
+                {
+                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]);
+                  if (! (yysize <= yysize1
+                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+                    return 2;
+                  yysize = yysize1;
+                }
               }
         }
     }
@@ -1196,10 +1028,12 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
 # undef YYCASE_
     }
 
-  yysize1 = yysize + yystrlen (yyformat);
-  if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-    return 2;
-  yysize = yysize1;
+  {
+    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
+    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+      return 2;
+    yysize = yysize1;
+  }
 
   if (*yymsg_alloc < yysize)
     {
@@ -1236,31 +1070,17 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
 
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
 yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
-#else
-static void
-yydestruct (yymsg, yytype, yyvaluep)
-    const char *yymsg;
-    int yytype;
-    YYSTYPE *yyvaluep;
-#endif
 {
   YYUSE (yyvaluep);
-
   if (!yymsg)
     yymsg = "Deleting";
   YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
 
-  switch (yytype)
-    {
-
-      default:
-	break;
-    }
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  YYUSE (yytype);
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 }
 
 
@@ -1271,7 +1091,6 @@ int yychar;
 
 /* The semantic value of the lookahead symbol.  */
 YYSTYPE yylval;
-
 /* Number of syntax errors so far.  */
 int yynerrs;
 
@@ -1280,35 +1099,16 @@ int yynerrs;
 | yyparse.  |
 `----------*/
 
-#ifdef YYPARSE_PARAM
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-int
-yyparse (void *YYPARSE_PARAM)
-#else
-int
-yyparse (YYPARSE_PARAM)
-    void *YYPARSE_PARAM;
-#endif
-#else /* ! YYPARSE_PARAM */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 int
 yyparse (void)
-#else
-int
-yyparse ()
-
-#endif
-#endif
 {
     int yystate;
     /* Number of tokens to shift before error messages enabled.  */
     int yyerrstatus;
 
     /* The stacks and their tools:
-       `yyss': related to states.
-       `yyvs': related to semantic values.
+       'yyss': related to states.
+       'yyvs': related to semantic values.
 
        Refer to the stacks through separate pointers, to allow yyoverflow
        to reallocate them elsewhere.  */
@@ -1328,7 +1128,7 @@ yyparse ()
   int yyn;
   int yyresult;
   /* Lookahead token as an internal (translated) token number.  */
-  int yytoken;
+  int yytoken = 0;
   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;
@@ -1346,9 +1146,8 @@ yyparse ()
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
-  yytoken = 0;
-  yyss = yyssa;
-  yyvs = yyvsa;
+  yyssp = yyss = yyssa;
+  yyvsp = yyvs = yyvsa;
   yystacksize = YYINITDEPTH;
 
   YYDPRINTF ((stderr, "Starting parse\n"));
@@ -1357,13 +1156,6 @@ yyparse ()
   yyerrstatus = 0;
   yynerrs = 0;
   yychar = YYEMPTY; /* Cause a token to be read.  */
-
-  /* Initialize stack pointers.
-     Waste one element of value and location stack
-     so that they stay on the same level as the state stack.
-     The wasted elements are never initialized.  */
-  yyssp = yyss;
-  yyvsp = yyvs;
   goto yysetstate;
 
 /*------------------------------------------------------------.
@@ -1384,23 +1176,23 @@ yyparse ()
 
 #ifdef yyoverflow
       {
-	/* Give user a chance to reallocate the stack.  Use copies of
-	   these so that the &'s don't force the real ones into
-	   memory.  */
-	YYSTYPE *yyvs1 = yyvs;
-	yytype_int16 *yyss1 = yyss;
-
-	/* Each stack pointer address is followed by the size of the
-	   data in use in that stack, in bytes.  This used to be a
-	   conditional around just the two extra args, but that might
-	   be undefined if yyoverflow is a macro.  */
-	yyoverflow (YY_("memory exhausted"),
-		    &yyss1, yysize * sizeof (*yyssp),
-		    &yyvs1, yysize * sizeof (*yyvsp),
-		    &yystacksize);
-
-	yyss = yyss1;
-	yyvs = yyvs1;
+        /* Give user a chance to reallocate the stack.  Use copies of
+           these so that the &'s don't force the real ones into
+           memory.  */
+        YYSTYPE *yyvs1 = yyvs;
+        yytype_int16 *yyss1 = yyss;
+
+        /* Each stack pointer address is followed by the size of the
+           data in use in that stack, in bytes.  This used to be a
+           conditional around just the two extra args, but that might
+           be undefined if yyoverflow is a macro.  */
+        yyoverflow (YY_("memory exhausted"),
+                    &yyss1, yysize * sizeof (*yyssp),
+                    &yyvs1, yysize * sizeof (*yyvsp),
+                    &yystacksize);
+
+        yyss = yyss1;
+        yyvs = yyvs1;
       }
 #else /* no yyoverflow */
 # ifndef YYSTACK_RELOCATE
@@ -1408,22 +1200,22 @@ yyparse ()
 # else
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
-	goto yyexhaustedlab;
+        goto yyexhaustedlab;
       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)
-	yystacksize = YYMAXDEPTH;
+        yystacksize = YYMAXDEPTH;
 
       {
-	yytype_int16 *yyss1 = yyss;
-	union yyalloc *yyptr =
-	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
-	if (! yyptr)
-	  goto yyexhaustedlab;
-	YYSTACK_RELOCATE (yyss_alloc, yyss);
-	YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+        yytype_int16 *yyss1 = yyss;
+        union yyalloc *yyptr =
+          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+        if (! yyptr)
+          goto yyexhaustedlab;
+        YYSTACK_RELOCATE (yyss_alloc, yyss);
+        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
 #  undef YYSTACK_RELOCATE
-	if (yyss1 != yyssa)
-	  YYSTACK_FREE (yyss1);
+        if (yyss1 != yyssa)
+          YYSTACK_FREE (yyss1);
       }
 # endif
 #endif /* no yyoverflow */
@@ -1432,10 +1224,10 @@ yyparse ()
       yyvsp = yyvs + yysize - 1;
 
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-		  (unsigned long int) yystacksize));
+                  (unsigned long int) yystacksize));
 
       if (yyss + yystacksize - 1 <= yyssp)
-	YYABORT;
+        YYABORT;
     }
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
@@ -1464,7 +1256,7 @@ yybackup:
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
-      yychar = YYLEX;
+      yychar = yylex ();
     }
 
   if (yychar <= YYEOF)
@@ -1504,7 +1296,9 @@ yybackup:
   yychar = YYEMPTY;
 
   yystate = yyn;
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
   goto yynewstate;
 
@@ -1527,7 +1321,7 @@ yyreduce:
   yylen = yyr2[yyn];
 
   /* If YYLEN is nonzero, implement the default value of the action:
-     `$$ = $1'.
+     '$$ = $1'.
 
      Otherwise, the following line sets YYVAL to garbage.
      This behavior is undocumented and Bison
@@ -1541,146 +1335,145 @@ yyreduce:
   switch (yyn)
     {
         case 3:
-/* Line 1787 of yacc.c  */
-#line 72 "otp-parser.y"
+#line 72 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
     { input_bytes=2; }
+#line 1341 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 4:
-/* Line 1787 of yacc.c  */
-#line 74 "otp-parser.y"
-    { input_bytes=(yyvsp[(2) - (3)]).yint; }
+#line 74 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
+    { input_bytes=(yyvsp[-1]).yint; }
+#line 1347 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 5:
-/* Line 1787 of yacc.c  */
-#line 79 "otp-parser.y"
+#line 79 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
     { output_bytes=2; }
+#line 1353 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 6:
-/* Line 1787 of yacc.c  */
-#line 81 "otp-parser.y"
-    { output_bytes=(yyvsp[(2) - (3)]).yint; }
+#line 81 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
+    { output_bytes=(yyvsp[-1]).yint; }
+#line 1359 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 11:
-/* Line 1787 of yacc.c  */
-#line 96 "otp-parser.y"
-    { store_table((yyvsp[(1) - (4)]).ystring, (yyvsp[(3) - (4)]).yint); }
+#line 96 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
+    { store_table((yyvsp[-3]).ystring, (yyvsp[-1]).yint); }
+#line 1365 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 15:
-/* Line 1787 of yacc.c  */
-#line 107 "otp-parser.y"
-    { add_to_table((yyvsp[(1) - (1)]).yint); }
+#line 107 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
+    { add_to_table((yyvsp[0]).yint); }
+#line 1371 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 16:
-/* Line 1787 of yacc.c  */
-#line 109 "otp-parser.y"
-    { add_to_table((yyvsp[(3) - (3)]).yint); }
+#line 109 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
+    { add_to_table((yyvsp[0]).yint); }
+#line 1377 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 19:
-/* Line 1787 of yacc.c  */
-#line 119 "otp-parser.y"
-    { store_state((yyvsp[(1) - (1)]).ystring); }
+#line 119 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
+    { store_state((yyvsp[0]).ystring); }
+#line 1383 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 20:
-/* Line 1787 of yacc.c  */
-#line 121 "otp-parser.y"
-    { store_state((yyvsp[(3) - (3)]).ystring); }
+#line 121 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
+    { store_state((yyvsp[0]).ystring); }
+#line 1389 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 25:
-/* Line 1787 of yacc.c  */
-#line 136 "otp-parser.y"
-    { store_alias((yyvsp[(1) - (4)]).ystring, (yyvsp[(3) - (4)]).yleft); }
+#line 136 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
+    { store_alias((yyvsp[-3]).ystring, (yyvsp[-1]).yleft); }
+#line 1395 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 26:
-/* Line 1787 of yacc.c  */
-#line 141 "otp-parser.y"
-    { (yyval).yleft = StringLeft((yyvsp[(1) - (1)]).ystring); }
+#line 141 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
+    { (yyval).yleft = StringLeft((yyvsp[0]).ystring); }
+#line 1401 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 27:
-/* 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); }
+#line 143 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
+    { (yyval).yleft = CompleteLeft((yyvsp[-5]).yleft, (yyvsp[-3]).yint, (yyvsp[-1]).yint); }
+#line 1407 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 28:
-/* Line 1787 of yacc.c  */
-#line 145 "otp-parser.y"
-    { (yyval).yleft = PlusLeft((yyvsp[(1) - (5)]).yleft, (yyvsp[(3) - (5)]).yint); }
+#line 145 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
+    { (yyval).yleft = PlusLeft((yyvsp[-4]).yleft, (yyvsp[-2]).yint); }
+#line 1413 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 29:
-/* 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); }
+#line 147 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
+    { (yyval).yleft = CompleteLeft((yyvsp[-3]).yleft, (yyvsp[-1]).yint, (yyvsp[-1]).yint); }
+#line 1419 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 30:
-/* Line 1787 of yacc.c  */
-#line 149 "otp-parser.y"
-    { (yyval).yleft = (yyvsp[(1) - (1)]).yleft; }
+#line 149 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
+    { (yyval).yleft = (yyvsp[0]).yleft; }
+#line 1425 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 31:
-/* Line 1787 of yacc.c  */
-#line 154 "otp-parser.y"
-    { (yyval).yleft = SingleLeft((yyvsp[(1) - (1)]).yint); }
+#line 154 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
+    { (yyval).yleft = SingleLeft((yyvsp[0]).yint); }
+#line 1431 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 32:
-/* Line 1787 of yacc.c  */
-#line 156 "otp-parser.y"
-    { (yyval).yleft = DoubleLeft((yyvsp[(1) - (3)]).yint, (yyvsp[(3) - (3)]).yint); }
+#line 156 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
+    { (yyval).yleft = DoubleLeft((yyvsp[-2]).yint, (yyvsp[0]).yint); }
+#line 1437 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 33:
-/* Line 1787 of yacc.c  */
-#line 158 "otp-parser.y"
+#line 158 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
     { (yyval).yleft = WildCard(); }
+#line 1443 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 34:
-/* Line 1787 of yacc.c  */
-#line 160 "otp-parser.y"
-    { (yyval).yleft = NotChoiceLeft((yyvsp[(3) - (4)]).ylleft); }
+#line 160 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
+    { (yyval).yleft = NotChoiceLeft((yyvsp[-1]).ylleft); }
+#line 1449 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 35:
-/* Line 1787 of yacc.c  */
-#line 162 "otp-parser.y"
-    { (yyval).yleft = ChoiceLeft((yyvsp[(2) - (3)]).ylleft); }
+#line 162 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
+    { (yyval).yleft = ChoiceLeft((yyvsp[-1]).ylleft); }
+#line 1455 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 36:
-/* Line 1787 of yacc.c  */
-#line 164 "otp-parser.y"
-    { (yyval).yleft = lookup_alias((yyvsp[(2) - (3)]).ystring); }
+#line 164 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
+    { (yyval).yleft = lookup_alias((yyvsp[-1]).ystring); }
+#line 1461 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 37:
-/* Line 1787 of yacc.c  */
-#line 169 "otp-parser.y"
-    { (yyval).ylleft = llist1((yyvsp[(1) - (1)]).yleft); }
+#line 169 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
+    { (yyval).ylleft = llist1((yyvsp[0]).yleft); }
+#line 1467 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 38:
-/* Line 1787 of yacc.c  */
-#line 171 "otp-parser.y"
-    { (yyval).ylleft = lappend1((yyvsp[(1) - (3)]).ylleft, (yyvsp[(3) - (3)]).yleft); }
+#line 171 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
+    { (yyval).ylleft = lappend1((yyvsp[-2]).ylleft, (yyvsp[0]).yleft); }
+#line 1473 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 39:
-/* Line 1787 of yacc.c  */
-#line 176 "otp-parser.y"
+#line 176 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
     {
 	  for(cur_state=0; cur_state<no_states; cur_state++) {
 		  if ((states[cur_state].no_exprs)==0) {
@@ -1692,262 +1485,262 @@ yyreduce:
 		  out_int(OTP_STOP, 0);
 	  }
 	}
+#line 1489 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 42:
-/* Line 1787 of yacc.c  */
-#line 196 "otp-parser.y"
+#line 196 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
     { states[cur_state].no_exprs++; }
+#line 1495 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 43:
-/* Line 1787 of yacc.c  */
-#line 198 "otp-parser.y"
-    { out_left((yyvsp[(3) - (3)]).ylleft); right_offset=0; }
+#line 198 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
+    { out_left((yyvsp[0]).ylleft); right_offset=0; }
+#line 1501 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 44:
-/* Line 1787 of yacc.c  */
-#line 200 "otp-parser.y"
+#line 200 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
     { right_offset=OTP_PBACK_OFFSET; }
+#line 1507 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 45:
-/* Line 1787 of yacc.c  */
-#line 202 "otp-parser.y"
+#line 202 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
     { fill_in_left(); }
+#line 1513 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 48:
-/* Line 1787 of yacc.c  */
-#line 212 "otp-parser.y"
+#line 212 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
     { cur_state = 0; }
+#line 1519 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 49:
-/* Line 1787 of yacc.c  */
-#line 214 "otp-parser.y"
-    { cur_state = lookup_state((yyvsp[(2) - (3)]).ystring); }
+#line 214 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
+    { cur_state = lookup_state((yyvsp[-1]).ystring); }
+#line 1525 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 50:
-/* 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)); }
+#line 219 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
+    { (yyval).ylleft = lappend((yyvsp[-2]).ylleft, lappend((yyvsp[-1]).ylleft, (yyvsp[0]).ylleft)); }
+#line 1531 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 51:
-/* Line 1787 of yacc.c  */
-#line 221 "otp-parser.y"
-    { (yyval).ylleft = lappend((yyvsp[(1) - (2)]).ylleft, (yyvsp[(2) - (2)]).ylleft); }
+#line 221 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
+    { (yyval).ylleft = lappend((yyvsp[-1]).ylleft, (yyvsp[0]).ylleft); }
+#line 1537 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 52:
-/* Line 1787 of yacc.c  */
-#line 226 "otp-parser.y"
+#line 226 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
     { (yyval).ylleft = nil; }
+#line 1543 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 53:
-/* Line 1787 of yacc.c  */
-#line 228 "otp-parser.y"
+#line 228 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
     { (yyval).ylleft = llist1(BeginningLeft()); }
+#line 1549 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 54:
-/* Line 1787 of yacc.c  */
-#line 233 "otp-parser.y"
+#line 233 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
     { (yyval).ylleft = nil; }
+#line 1555 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 55:
-/* Line 1787 of yacc.c  */
-#line 235 "otp-parser.y"
+#line 235 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
     { (yyval).ylleft = llist1(EndLeft()); }
+#line 1561 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 56:
-/* Line 1787 of yacc.c  */
-#line 240 "otp-parser.y"
-    { (yyval).ylleft = llist1((yyvsp[(1) - (1)]).yleft); }
+#line 240 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
+    { (yyval).ylleft = llist1((yyvsp[0]).yleft); }
+#line 1567 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 57:
-/* Line 1787 of yacc.c  */
-#line 242 "otp-parser.y"
-    { (yyval).ylleft = lappend1((yyvsp[(1) - (2)]).ylleft, (yyvsp[(2) - (2)]).yleft); }
+#line 242 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
+    { (yyval).ylleft = lappend1((yyvsp[-1]).ylleft, (yyvsp[0]).yleft); }
+#line 1573 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 60:
-/* Line 1787 of yacc.c  */
-#line 252 "otp-parser.y"
+#line 252 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
     {
-	 len=strlen((yyvsp[(1) - (1)]).ystring);
+	 len=strlen((yyvsp[0]).ystring);
 	 for (k=0; k<len; k++) {
-            out_right(OTP_RIGHT_NUM, ((yyvsp[(1) - (1)]).ystring)[k]);
+            out_right(OTP_RIGHT_NUM, ((yyvsp[0]).ystring)[k]);
          }
 	}
+#line 1584 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 61:
-/* Line 1787 of yacc.c  */
-#line 259 "otp-parser.y"
-    { out_right(OTP_RIGHT_NUM, (yyvsp[(1) - (1)]).yint); }
+#line 259 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
+    { out_right(OTP_RIGHT_NUM, (yyvsp[0]).yint); }
+#line 1590 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 62:
-/* Line 1787 of yacc.c  */
-#line 261 "otp-parser.y"
-    { out_right(OTP_RIGHT_CHAR, (yyvsp[(2) - (2)]).yint); }
+#line 261 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
+    { out_right(OTP_RIGHT_CHAR, (yyvsp[0]).yint); }
+#line 1596 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 63:
-/* Line 1787 of yacc.c  */
-#line 263 "otp-parser.y"
+#line 263 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
     { out_right(OTP_RIGHT_LCHAR, 0); }
+#line 1602 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 64:
-/* Line 1787 of yacc.c  */
-#line 265 "otp-parser.y"
-    { out_right(OTP_RIGHT_LCHAR, (yyvsp[(5) - (6)]).yint); }
+#line 265 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
+    { out_right(OTP_RIGHT_LCHAR, (yyvsp[-1]).yint); }
+#line 1608 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 65:
-/* Line 1787 of yacc.c  */
-#line 267 "otp-parser.y"
+#line 267 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
     {
 	 out_right(OTP_RIGHT_SOME, 0); 
 	 out_int(0,0);
 	}
+#line 1617 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 66:
-/* Line 1787 of yacc.c  */
-#line 272 "otp-parser.y"
+#line 272 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
     {
-	 out_right(OTP_RIGHT_SOME, (yyvsp[(5) - (6)]).yint);
+	 out_right(OTP_RIGHT_SOME, (yyvsp[-1]).yint);
 	 out_int(0, 0);
 	}
+#line 1626 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 67:
-/* Line 1787 of yacc.c  */
-#line 277 "otp-parser.y"
+#line 277 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
     {
 	 out_right(OTP_RIGHT_SOME, 0);
-	 out_int(0, (yyvsp[(5) - (6)]).yint);
+	 out_int(0, (yyvsp[-1]).yint);
 	}
+#line 1635 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 68:
-/* Line 1787 of yacc.c  */
-#line 282 "otp-parser.y"
+#line 282 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
     {
-	 out_right(OTP_RIGHT_SOME, (yyvsp[(5) - (8)]).yint);
-	 out_int(0, (yyvsp[(7) - (8)]).yint);
+	 out_right(OTP_RIGHT_SOME, (yyvsp[-3]).yint);
+	 out_int(0, (yyvsp[-1]).yint);
 	}
+#line 1644 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 69:
-/* Line 1787 of yacc.c  */
-#line 287 "otp-parser.y"
+#line 287 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
     { out_right(OTP_RIGHT_OUTPUT, 0); }
+#line 1650 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 71:
-/* Line 1787 of yacc.c  */
-#line 293 "otp-parser.y"
+#line 293 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
     { out_int(OTP_ADD, 0); }
+#line 1656 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 72:
-/* Line 1787 of yacc.c  */
-#line 295 "otp-parser.y"
+#line 295 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
     { out_int(OTP_SUB, 0); }
+#line 1662 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 73:
-/* Line 1787 of yacc.c  */
-#line 297 "otp-parser.y"
+#line 297 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
     { out_int(OTP_MULT, 0); }
+#line 1668 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 74:
-/* Line 1787 of yacc.c  */
-#line 299 "otp-parser.y"
+#line 299 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
     { out_int(OTP_DIV, 0); }
+#line 1674 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 75:
-/* Line 1787 of yacc.c  */
-#line 301 "otp-parser.y"
+#line 301 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
     { out_int(OTP_MOD, 0); }
+#line 1680 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 76:
-/* Line 1787 of yacc.c  */
-#line 303 "otp-parser.y"
-    { out_int(OTP_PUSH_NUM, lookup_table((yyvsp[(1) - (1)]).ystring)); }
+#line 303 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
+    { out_int(OTP_PUSH_NUM, lookup_table((yyvsp[0]).ystring)); }
+#line 1686 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 77:
-/* Line 1787 of yacc.c  */
-#line 305 "otp-parser.y"
+#line 305 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
     { out_int(OTP_LOOKUP, 0); }
+#line 1692 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 78:
-/* Line 1787 of yacc.c  */
-#line 310 "otp-parser.y"
-    { out_int(OTP_PUSH_NUM, (yyvsp[(1) - (1)]).yint); }
+#line 310 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
+    { out_int(OTP_PUSH_NUM, (yyvsp[0]).yint); }
+#line 1698 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 79:
-/* Line 1787 of yacc.c  */
-#line 312 "otp-parser.y"
-    { out_int(OTP_PUSH_CHAR, (yyvsp[(2) - (2)]).yint); }
+#line 312 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
+    { out_int(OTP_PUSH_CHAR, (yyvsp[0]).yint); }
+#line 1704 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 80:
-/* Line 1787 of yacc.c  */
-#line 314 "otp-parser.y"
+#line 314 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
     { out_int(OTP_PUSH_LCHAR, 0); }
+#line 1710 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 81:
-/* Line 1787 of yacc.c  */
-#line 316 "otp-parser.y"
-    { out_int(OTP_PUSH_LCHAR, (yyvsp[(5) - (6)]).yint); }
+#line 316 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
+    { out_int(OTP_PUSH_LCHAR, (yyvsp[-1]).yint); }
+#line 1716 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 84:
-/* Line 1787 of yacc.c  */
-#line 323 "otp-parser.y"
+#line 323 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
     { out_int(OTP_STATE_CHANGE, 0); }
+#line 1722 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 85:
-/* Line 1787 of yacc.c  */
-#line 325 "otp-parser.y"
-    { out_int(OTP_STATE_CHANGE, lookup_state((yyvsp[(2) - (3)]).ystring)); }
+#line 325 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
+    { out_int(OTP_STATE_CHANGE, lookup_state((yyvsp[-1]).ystring)); }
+#line 1728 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 86:
-/* Line 1787 of yacc.c  */
-#line 327 "otp-parser.y"
-    { out_int(OTP_STATE_PUSH, lookup_state((yyvsp[(3) - (4)]).ystring)); }
+#line 327 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
+    { out_int(OTP_STATE_PUSH, lookup_state((yyvsp[-1]).ystring)); }
+#line 1734 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
   case 87:
-/* Line 1787 of yacc.c  */
-#line 329 "otp-parser.y"
+#line 329 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1646  */
     { out_int(OTP_STATE_POP, 0); }
+#line 1740 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
     break;
 
 
-/* Line 1787 of yacc.c  */
-#line 1951 "../../../../tex-live-2012-07-09/texk/web2c/otps/otp-parser.c"
+#line 1744 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.c" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -1969,7 +1762,7 @@ yyreduce:
 
   *++yyvsp = yyval;
 
-  /* Now `shift' the result of the reduction.  Determine what state
+  /* Now 'shift' the result of the reduction.  Determine what state
      that goes to, based on the state we popped back to and the rule
      number reduced by.  */
 
@@ -1984,9 +1777,9 @@ yyreduce:
   goto yynewstate;
 
 
-/*------------------------------------.
-| yyerrlab -- here on detecting error |
-`------------------------------------*/
+/*--------------------------------------.
+| yyerrlab -- here on detecting error.  |
+`--------------------------------------*/
 yyerrlab:
   /* Make sure we have latest lookahead translation.  See comments at
      user semantic actions for why this is necessary.  */
@@ -2037,20 +1830,20 @@ yyerrlab:
   if (yyerrstatus == 3)
     {
       /* If just tried and failed to reuse lookahead token after an
-	 error, discard it.  */
+         error, discard it.  */
 
       if (yychar <= YYEOF)
-	{
-	  /* Return failure if at end of input.  */
-	  if (yychar == YYEOF)
-	    YYABORT;
-	}
+        {
+          /* Return failure if at end of input.  */
+          if (yychar == YYEOF)
+            YYABORT;
+        }
       else
-	{
-	  yydestruct ("Error: discarding",
-		      yytoken, &yylval);
-	  yychar = YYEMPTY;
-	}
+        {
+          yydestruct ("Error: discarding",
+                      yytoken, &yylval);
+          yychar = YYEMPTY;
+        }
     }
 
   /* Else will try to reuse lookahead token after shifting the error
@@ -2069,7 +1862,7 @@ yyerrorlab:
   if (/*CONSTCOND*/ 0)
      goto yyerrorlab;
 
-  /* Do not reclaim the symbols of the rule which action triggered
+  /* Do not reclaim the symbols of the rule whose action triggered
      this YYERROR.  */
   YYPOPSTACK (yylen);
   yylen = 0;
@@ -2082,35 +1875,37 @@ yyerrorlab:
 | yyerrlab1 -- common code for both syntax error and YYERROR.  |
 `-------------------------------------------------------------*/
 yyerrlab1:
-  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
+  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
 
   for (;;)
     {
       yyn = yypact[yystate];
       if (!yypact_value_is_default (yyn))
-	{
-	  yyn += YYTERROR;
-	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
-	    {
-	      yyn = yytable[yyn];
-	      if (0 < yyn)
-		break;
-	    }
-	}
+        {
+          yyn += YYTERROR;
+          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+            {
+              yyn = yytable[yyn];
+              if (0 < yyn)
+                break;
+            }
+        }
 
       /* Pop the current state because it cannot handle the error token.  */
       if (yyssp == yyss)
-	YYABORT;
+        YYABORT;
 
 
       yydestruct ("Error: popping",
-		  yystos[yystate], yyvsp);
+                  yystos[yystate], yyvsp);
       YYPOPSTACK (1);
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
     }
 
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
 
   /* Shift the error token.  */
@@ -2153,14 +1948,14 @@ yyreturn:
       yydestruct ("Cleanup: discarding lookahead",
                   yytoken, &yylval);
     }
-  /* Do not reclaim the symbols of the rule which action triggered
+  /* Do not reclaim the symbols of the rule whose action triggered
      this YYABORT or YYACCEPT.  */
   YYPOPSTACK (yylen);
   YY_STACK_PRINT (yyss, yyssp);
   while (yyssp != yyss)
     {
       yydestruct ("Cleanup: popping",
-		  yystos[*yyssp], yyvsp);
+                  yystos[*yyssp], yyvsp);
       YYPOPSTACK (1);
     }
 #ifndef yyoverflow
@@ -2171,11 +1966,7 @@ yyreturn:
   if (yymsg != yymsgbuf)
     YYSTACK_FREE (yymsg);
 #endif
-  /* Make sure YYID is used.  */
-  return YYID (yyresult);
+  return yyresult;
 }
-
-
-/* Line 2048 of yacc.c  */
-#line 331 "otp-parser.y"
+#line 331 "../../../../tex-live-2013-06-24/texk/web2c/otps/otp-parser.y" /* yacc.c:1906  */
 
diff --git a/Build/source/texk/web2c/otps/otp-parser.h b/Build/source/texk/web2c/otps/otp-parser.h
index 32181a0bcb5..7087305ece4 100644
--- a/Build/source/texk/web2c/otps/otp-parser.h
+++ b/Build/source/texk/web2c/otps/otp-parser.h
@@ -1,19 +1,19 @@
-/* A Bison parser, made by GNU Bison 2.6.2.  */
+/* A Bison parser, made by GNU Bison 3.0.  */
 
 /* Bison interface for Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
-   
+
+   Copyright (C) 1984, 1989-1990, 2000-2013 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
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
@@ -26,13 +26,13 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-   
+
    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 YY_YY__TEX_LIVE_TEXK_WEB_C_OTPS_OTP_PARSER_H_INCLUDED
+# define YY_YY__TEX_LIVE_TEXK_WEB_C_OTPS_OTP_PARSER_H_INCLUDED
+/* Debug traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 0
 #endif
@@ -40,30 +40,29 @@
 extern int yydebug;
 #endif
 
-/* Tokens.  */
+/* Token type.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     NUMBER = 258,
-     ID = 259,
-     STRING = 260,
-     LEFTARROW = 261,
-     RIGHTARROW = 262,
-     INPUT = 263,
-     OUTPUT = 264,
-     ALIASES = 265,
-     STATES = 266,
-     TABLES = 267,
-     EXPRESSIONS = 268,
-     PUSH = 269,
-     POP = 270,
-     DIV = 271,
-     MOD = 272,
-     BEG = 273,
-     END = 274
-   };
+  enum yytokentype
+  {
+    NUMBER = 258,
+    ID = 259,
+    STRING = 260,
+    LEFTARROW = 261,
+    RIGHTARROW = 262,
+    INPUT = 263,
+    OUTPUT = 264,
+    ALIASES = 265,
+    STATES = 266,
+    TABLES = 267,
+    EXPRESSIONS = 268,
+    PUSH = 269,
+    POP = 270,
+    DIV = 271,
+    MOD = 272,
+    BEG = 273,
+    END = 274
+  };
 #endif
 /* Tokens.  */
 #define NUMBER 258
@@ -84,29 +83,16 @@ extern int yydebug;
 #define BEG 273
 #define END 274
 
-
-
+/* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 #endif
 
+
 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  */
+#endif /* !YY_YY__TEX_LIVE_TEXK_WEB_C_OTPS_OTP_PARSER_H_INCLUDED  */