X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/7768896a2547cc05ffe9c177c9806b5d06d490bb..21667f64cd57381cdee86a536010b09a55703a51:/src/parse-gram.c?ds=sidebyside

diff --git a/src/parse-gram.c b/src/parse-gram.c
index 705b0f28..9b1b0937 100644
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,7 +1,7 @@
-/* A Bison parser, made by GNU Bison 2.0a.  */
+/* A Bison parser, made by GNU Bison 2.1a.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 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
@@ -15,8 +15,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, when this file is copied by Bison into a
    Bison output file, you may use that output file without restriction.
@@ -36,6 +36,9 @@
 /* Identify Bison output.  */
 #define YYBISON 1
 
+/* Bison version.  */
+#define YYBISON_VERSION "2.1a"
+
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
 
@@ -112,6 +115,7 @@
      BRACED_CODE = 305
    };
 #endif
+/* Tokens.  */
 #define GRAM_EOF 0
 #define STRING 258
 #define INT 259
@@ -166,7 +170,7 @@
 
 
 /* Copy the first part of user declarations.  */
-#line 1 "parse-gram.y"
+#line 1 "../../src/parse-gram.y"
 /* Bison Grammar Parser                             -*- C -*-
 
    Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
@@ -185,8 +189,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307  USA
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301  USA
 */
 
 #include "system.h"
@@ -215,18 +219,14 @@ static YYLTYPE lloc_default (YYLTYPE const *, int);
         gram_error (&yylloc, Msg)
 static void gram_error (location const *, char const *);
 
-#define YYPRINT(File, Type, Value) \
-	print_token_value (File, Type, &Value)
-static void print_token_value (FILE *, int, YYSTYPE const *);
-
 static void add_param (char const *, char *, location);
 
-symbol_class current_class = unknown_sym;
-uniqstr current_type = 0;
+static symbol_class current_class = unknown_sym;
+static uniqstr current_type = 0;
 symbol *current_lhs;
 location current_lhs_location;
 assoc current_assoc;
-int current_prec = 0;
+static int current_prec = 0;
 
 
 /* Enabling traces.  */
@@ -242,8 +242,13 @@ int current_prec = 0;
 # define YYERROR_VERBOSE 1
 #endif
 
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+
 #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 82 "parse-gram.y"
+#line 79 "../../src/parse-gram.y"
 typedef union YYSTYPE {
   symbol *symbol;
   symbol_list *list;
@@ -252,8 +257,8 @@ typedef union YYSTYPE {
   assoc assoc;
   uniqstr uniqstr;
 } YYSTYPE;
-/* Line 191 of yacc.c.  */
-#line 257 "parse-gram.c"
+/* Line 196 of yacc.c.  */
+#line 262 "../../src/parse-gram.c"
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
@@ -276,17 +281,37 @@ typedef struct YYLTYPE
 /* Copy the second part of user declarations.  */
 
 
-/* Line 214 of yacc.c.  */
-#line 281 "parse-gram.c"
+/* Line 219 of yacc.c.  */
+#line 286 "../../src/parse-gram.c"
 
-#if ! defined (yyoverflow) || YYERROR_VERBOSE
+#ifndef YYSIZE_T
+# if defined (__SIZE_TYPE__)
+#  define YYSIZE_T __SIZE_TYPE__
+# elif defined (size_t)
+#  define YYSIZE_T size_t
+# elif ! defined (YYSIZE_T) && (defined (__STDC__) || defined (__cplusplus))
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# else
+#  define YYSIZE_T unsigned int
+# endif
+#endif
+
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
-# ifndef YYFREE
-#  define YYFREE free
+#ifndef YY_
+# if YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#  endif
 # endif
-# ifndef YYMALLOC
-#  define YYMALLOC malloc
+# ifndef YY_
+#  define YY_(msgid) msgid
 # endif
+#endif
+
+#if ! defined (yyoverflow) || YYERROR_VERBOSE
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
@@ -294,8 +319,22 @@ typedef struct YYLTYPE
 #  if YYSTACK_USE_ALLOCA
 #   ifdef __GNUC__
 #    define YYSTACK_ALLOC __builtin_alloca
+#   elif defined (__BUILTIN_VA_ARG_INCR)
+#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
+#   elif defined (_AIX)
+#    define YYSTACK_ALLOC __alloca
+#   elif defined (_MSC_VER)
+#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
+#    define alloca _alloca
 #   else
 #    define YYSTACK_ALLOC alloca
+#    if (! defined (_ALLOCA_H) && ! defined (_STDLIB_H) \
+	 && (defined (__STDC__) || defined (__cplusplus)))
+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#     ifndef _STDLIB_H
+#      define _STDLIB_H 1
+#     endif
+#    endif
 #   endif
 #  endif
 # endif
@@ -311,16 +350,30 @@ typedef struct YYLTYPE
 #   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2005 */
 #  endif
 # else
-#  if defined (__STDC__) || defined (__cplusplus)
-#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   define YYSIZE_T size_t
-#  else
-#   define YYSIZE_T unsigned long int
-#  endif
 #  define YYSTACK_ALLOC YYMALLOC
 #  define YYSTACK_FREE YYFREE
 #  ifndef YYSTACK_ALLOC_MAXIMUM
-#   define YYSTACK_ALLOC_MAXIMUM ((YYSIZE_T) -1)
+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+#  endif
+#  ifdef __cplusplus
+extern "C" {
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if (! defined (malloc) && ! defined (_STDLIB_H) \
+	&& (defined (__STDC__) || defined (__cplusplus)))
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if (! defined (free) && ! defined (_STDLIB_H) \
+	&& (defined (__STDC__) || defined (__cplusplus)))
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifdef __cplusplus
+}
 #  endif
 # endif
 #endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
@@ -400,7 +453,7 @@ union yyalloc
 /* YYNNTS -- Number of nonterminals. */
 #define YYNNTS  25
 /* YYNRULES -- Number of rules. */
-#define YYNRULES  79
+#define YYNRULES  80
 /* YYNRULES -- Number of states. */
 #define YYNSTATES  108
 
@@ -408,7 +461,7 @@ union yyalloc
 #define YYUNDEFTOK  2
 #define YYMAXUTOK   305
 
-#define YYTRANSLATE(YYX) 						\
+#define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
 /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
@@ -452,14 +505,15 @@ static const unsigned char yytranslate[] =
    YYRHS.  */
 static const unsigned char yyprhs[] =
 {
-       0,     0,     3,     8,     9,    12,    14,    16,    18,    22,
-      24,    26,    29,    32,    36,    38,    40,    42,    44,    48,
-      50,    52,    56,    58,    60,    63,    65,    67,    69,    71,
-      73,    75,    78,    80,    83,    86,    88,    90,    91,    95,
-      96,   100,   104,   108,   110,   112,   114,   115,   117,   119,
-     122,   124,   126,   129,   132,   136,   138,   141,   143,   146,
-     148,   151,   154,   155,   159,   161,   165,   168,   169,   172,
-     175,   179,   183,   187,   189,   191,   193,   195,   197,   198
+       0,     0,     3,     8,     9,    12,    14,    16,    18,    21,
+      25,    27,    29,    32,    35,    39,    41,    43,    45,    47,
+      51,    53,    55,    59,    61,    63,    66,    68,    70,    72,
+      74,    76,    78,    81,    83,    86,    89,    91,    93,    94,
+      98,    99,   103,   107,   111,   113,   115,   117,   118,   120,
+     122,   125,   127,   129,   132,   135,   139,   141,   144,   146,
+     149,   151,   154,   157,   158,   162,   164,   168,   171,   172,
+     175,   178,   182,   186,   190,   192,   194,   196,   198,   200,
+     201
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS. */
@@ -467,56 +521,60 @@ static const yysigned_char yyrhs[] =
 {
       52,     0,    -1,    53,    47,    65,    75,    -1,    -1,    53,
       54,    -1,    55,    -1,    48,    -1,    17,    -1,    19,    74,
-      74,    -1,    20,    -1,    21,    -1,    22,     4,    -1,    23,
-       4,    -1,    24,    42,    74,    -1,    25,    -1,    26,    -1,
-      27,    -1,    28,    -1,    29,    42,    74,    -1,    31,    -1,
-      32,    -1,    33,    42,    74,    -1,    34,    -1,    35,    -1,
-      36,    74,    -1,    38,    -1,    39,    -1,    40,    -1,    43,
-      -1,    59,    -1,    56,    -1,    37,    71,    -1,    10,    -1,
-       8,    62,    -1,     9,    62,    -1,    18,    -1,    30,    -1,
-      -1,     6,    57,    64,    -1,    -1,     5,    58,    64,    -1,
-       7,    41,    62,    -1,    60,    61,    62,    -1,    11,    -1,
-      12,    -1,    13,    -1,    -1,    41,    -1,    71,    -1,    62,
-      71,    -1,    41,    -1,    45,    -1,    45,     4,    -1,    45,
-      73,    -1,    45,     4,    73,    -1,    63,    -1,    64,    63,
-      -1,    66,    -1,    65,    66,    -1,    67,    -1,    55,    43,
-      -1,     1,    43,    -1,    -1,    46,    68,    69,    -1,    70,
-      -1,    69,    44,    70,    -1,    69,    43,    -1,    -1,    70,
-      71,    -1,    70,    72,    -1,    70,    14,    71,    -1,    70,
-      15,     4,    -1,    70,    16,    41,    -1,    45,    -1,    73,
-      -1,    50,    -1,     3,    -1,     3,    -1,    -1,    47,    49,
-      -1
+      -1,    19,    74,    74,    -1,    20,    -1,    21,    -1,    22,
+       4,    -1,    23,     4,    -1,    24,    42,    74,    -1,    25,
+      -1,    26,    -1,    27,    -1,    28,    -1,    29,    42,    74,
+      -1,    31,    -1,    32,    -1,    33,    42,    74,    -1,    34,
+      -1,    35,    -1,    36,    74,    -1,    38,    -1,    39,    -1,
+      40,    -1,    43,    -1,    59,    -1,    56,    -1,    37,    71,
+      -1,    10,    -1,     8,    62,    -1,     9,    62,    -1,    18,
+      -1,    30,    -1,    -1,     6,    57,    64,    -1,    -1,     5,
+      58,    64,    -1,     7,    41,    62,    -1,    60,    61,    62,
+      -1,    11,    -1,    12,    -1,    13,    -1,    -1,    41,    -1,
+      71,    -1,    62,    71,    -1,    41,    -1,    45,    -1,    45,
+       4,    -1,    45,    73,    -1,    45,     4,    73,    -1,    63,
+      -1,    64,    63,    -1,    66,    -1,    65,    66,    -1,    67,
+      -1,    55,    43,    -1,     1,    43,    -1,    -1,    46,    68,
+      69,    -1,    70,    -1,    69,    44,    70,    -1,    69,    43,
+      -1,    -1,    70,    71,    -1,    70,    72,    -1,    70,    14,
+      71,    -1,    70,    15,     4,    -1,    70,    16,    41,    -1,
+      45,    -1,    73,    -1,    50,    -1,     3,    -1,     3,    -1,
+      -1,    47,    49,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const unsigned short int yyrline[] =
 {
-       0,   175,   175,   183,   185,   189,   190,   191,   192,   193,
-     194,   195,   196,   197,   198,   203,   207,   208,   209,   210,
-     211,   212,   213,   214,   215,   216,   217,   218,   219,   223,
-     224,   225,   229,   235,   242,   249,   253,   260,   260,   265,
-     265,   270,   280,   295,   296,   297,   301,   302,   308,   309,
-     314,   318,   323,   329,   335,   346,   347,   356,   357,   363,
-     364,   369,   376,   376,   380,   381,   382,   387,   388,   390,
-     392,   394,   396,   401,   402,   406,   412,   421,   426,   428
+       0,   188,   188,   196,   198,   202,   203,   204,   205,   206,
+     207,   208,   209,   210,   211,   212,   217,   221,   222,   223,
+     224,   225,   226,   227,   228,   229,   230,   231,   232,   233,
+     237,   238,   239,   243,   249,   256,   263,   267,   274,   274,
+     279,   279,   284,   294,   309,   310,   311,   315,   316,   322,
+     323,   328,   332,   337,   343,   349,   360,   361,   370,   371,
+     377,   378,   383,   390,   390,   394,   395,   396,   401,   402,
+     404,   406,   408,   410,   415,   416,   420,   426,   435,   440,
+     442
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE
-/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
    First, the terminals, then, starting at YYNTOKENS, nonterminals. */
 static const char *const yytname[] =
 {
-  "end of file", "error", "$undefined", "string", "integer", "%token",
-  "%nterm", "%type", "%destructor {...}", "%printer {...}", "%union {...}",
-  "%left", "%right", "%nonassoc", "%prec", "%dprec", "%merge", "%debug",
-  "%default-prec", "%define", "%defines", "%error-verbose", "%expect",
-  "%expect-rr", "%file-prefix", "%glr-parser", "%initial-action {...}",
-  "%lex-param {...}", "%locations", "%name-prefix", "%no-default-prec",
-  "%no-lines", "%nondeterministic-parser", "%output", "%parse-param {...}",
-  "%pure-parser", "%skeleton", "%start", "%token-table", "%verbose",
-  "%yacc", "type", "=", ";", "|", "identifier", "identifier:", "%%",
-  "%{...%}", "epilogue", "{...}", "$accept", "input", "declarations",
+  "\"end of file\"", "error", "$undefined", "\"string\"", "\"integer\"",
+  "\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor {...}\"",
+  "\"%printer {...}\"", "\"%union {...}\"", "\"%left\"", "\"%right\"",
+  "\"%nonassoc\"", "\"%prec\"", "\"%dprec\"", "\"%merge\"", "\"%debug\"",
+  "\"%default-prec\"", "\"%define\"", "\"%defines\"", "\"%error-verbose\"",
+  "\"%expect\"", "\"%expect-rr\"", "\"%file-prefix\"", "\"%glr-parser\"",
+  "\"%initial-action {...}\"", "\"%lex-param {...}\"", "\"%locations\"",
+  "\"%name-prefix\"", "\"%no-default-prec\"", "\"%no-lines\"",
+  "\"%nondeterministic-parser\"", "\"%output\"", "\"%parse-param {...}\"",
+  "\"%pure-parser\"", "\"%skeleton\"", "\"%start\"", "\"%token-table\"",
+  "\"%verbose\"", "\"%yacc\"", "\"type\"", "\"=\"", "\";\"", "\"|\"",
+  "\"identifier\"", "\"identifier:\"", "\"%%\"", "\"%{...%}\"",
+  "\"epilogue\"", "\"{...}\"", "$accept", "input", "declarations",
   "declaration", "grammar_declaration", "symbol_declaration", "@1", "@2",
   "precedence_declaration", "precedence_declarator", "type.opt",
   "symbols.1", "symbol_def", "symbol_defs.1", "grammar",
@@ -525,11 +583,6 @@ static const char *const yytname[] =
 };
 #endif
 
-/* INFRINGES ON USER NAME SPACE */
-#ifndef _
-# define _(msgid) msgid
-#endif
-
 # ifdef YYPRINT
 /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
    token YYLEX-NUM.  */
@@ -549,25 +602,27 @@ static const unsigned char yyr1[] =
 {
        0,    51,    52,    53,    53,    54,    54,    54,    54,    54,
       54,    54,    54,    54,    54,    54,    54,    54,    54,    54,
-      54,    54,    54,    54,    54,    54,    54,    54,    54,    55,
-      55,    55,    55,    55,    55,    55,    55,    57,    56,    58,
-      56,    56,    59,    60,    60,    60,    61,    61,    62,    62,
-      63,    63,    63,    63,    63,    64,    64,    65,    65,    66,
-      66,    66,    68,    67,    69,    69,    69,    70,    70,    70,
-      70,    70,    70,    71,    71,    72,    73,    74,    75,    75
+      54,    54,    54,    54,    54,    54,    54,    54,    54,    54,
+      55,    55,    55,    55,    55,    55,    55,    55,    57,    56,
+      58,    56,    56,    59,    60,    60,    60,    61,    61,    62,
+      62,    63,    63,    63,    63,    63,    64,    64,    65,    65,
+      66,    66,    66,    68,    67,    69,    69,    69,    70,    70,
+      70,    70,    70,    70,    71,    71,    72,    73,    74,    75,
+      75
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
 static const unsigned char yyr2[] =
 {
-       0,     2,     4,     0,     2,     1,     1,     1,     3,     1,
-       1,     2,     2,     3,     1,     1,     1,     1,     3,     1,
-       1,     3,     1,     1,     2,     1,     1,     1,     1,     1,
-       1,     2,     1,     2,     2,     1,     1,     0,     3,     0,
-       3,     3,     3,     1,     1,     1,     0,     1,     1,     2,
-       1,     1,     2,     2,     3,     1,     2,     1,     2,     1,
-       2,     2,     0,     3,     1,     3,     2,     0,     2,     2,
-       3,     3,     3,     1,     1,     1,     1,     1,     0,     2
+       0,     2,     4,     0,     2,     1,     1,     1,     2,     3,
+       1,     1,     2,     2,     3,     1,     1,     1,     1,     3,
+       1,     1,     3,     1,     1,     2,     1,     1,     1,     1,
+       1,     1,     2,     1,     2,     2,     1,     1,     0,     3,
+       0,     3,     3,     3,     1,     1,     1,     0,     1,     1,
+       2,     1,     1,     2,     2,     3,     1,     2,     1,     2,
+       1,     2,     2,     0,     3,     1,     3,     2,     0,     2,
+       2,     3,     3,     3,     1,     1,     1,     1,     1,     0,
+       2
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -575,17 +630,17 @@ static const unsigned char yyr2[] =
    means the default is an error.  */
 static const unsigned char yydefact[] =
 {
-       3,     0,     0,     1,    39,    37,     0,     0,     0,    32,
-      43,    44,    45,     7,    35,     0,     9,    10,     0,     0,
-       0,    14,    15,    16,    17,     0,    36,    19,    20,     0,
-      22,    23,     0,     0,    25,    26,    27,    28,     0,     6,
-       4,     5,    30,    29,    46,     0,     0,     0,    76,    73,
-      33,    48,    74,    34,    77,     0,    11,    12,     0,     0,
-       0,    24,    31,     0,    62,     0,     0,    57,    59,    47,
-       0,    50,    51,    55,    40,    38,    41,    49,     8,    13,
-      18,    21,    61,    67,    60,     0,    58,     2,    42,    52,
-      53,    56,    63,    64,    79,    54,    66,    67,     0,     0,
-       0,    75,    68,    69,    65,    70,    71,    72
+       3,     0,     0,     1,    40,    38,     0,     0,     0,    33,
+      44,    45,    46,     7,    36,     0,    10,    11,     0,     0,
+       0,    15,    16,    17,    18,     0,    37,    20,    21,     0,
+      23,    24,     0,     0,    26,    27,    28,    29,     0,     6,
+       4,     5,    31,    30,    47,     0,     0,     0,    77,    74,
+      34,    49,    75,    35,    78,     8,    12,    13,     0,     0,
+       0,    25,    32,     0,    63,     0,     0,    58,    60,    48,
+       0,    51,    52,    56,    41,    39,    42,    50,     9,    14,
+      19,    22,    62,    68,    61,     0,    59,     2,    43,    53,
+      54,    57,    64,    65,    80,    55,    67,    68,     0,     0,
+       0,    76,    69,    70,    66,    71,    72,    73
 };
 
 /* YYDEFGOTO[NTERM-NUM]. */
@@ -626,12 +681,12 @@ static const yysigned_char yypgoto[] =
    positive, shift that token.  If negative, reduce the rule which
    number is the opposite.  If zero, do what YYDEFACT says.
    If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -79
+#define YYTABLE_NINF -80
 static const yysigned_char yytable[] =
 {
       62,    53,    48,    48,    71,     3,    90,    47,    72,    48,
       89,    96,    97,    98,    99,   100,    54,    77,    91,    91,
-      77,   -78,    63,    95,    56,    58,     4,     5,     6,     7,
+      77,   -79,    63,    95,    56,    58,     4,     5,     6,     7,
        8,     9,    10,    11,    12,    57,    59,    60,    69,    14,
       76,    82,    48,    77,    49,    49,    84,   106,   107,   101,
       94,    26,    41,    86,    75,    77,   104,     0,    33,     0,
@@ -684,22 +739,6 @@ static const unsigned char yystos[] =
       16,    50,    71,    72,    70,    71,     4,    41
 };
 
-#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
-# define YYSIZE_T __SIZE_TYPE__
-#endif
-#if ! defined (YYSIZE_T) && defined (size_t)
-# define YYSIZE_T size_t
-#endif
-#if ! defined (YYSIZE_T)
-# if defined (__STDC__) || defined (__cplusplus)
-#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYSIZE_T size_t
-# endif
-#endif
-#if ! defined (YYSIZE_T)
-# define YYSIZE_T unsigned int
-#endif
-
 #define yyerrok		(yyerrstatus = 0)
 #define yyclearin	(yychar = YYEMPTY)
 #define YYEMPTY		(-2)
@@ -729,8 +768,8 @@ do								\
       goto yybackup;						\
     }								\
   else								\
-    { 								\
-      yyerror (_("syntax error: cannot back up")); \
+    {								\
+      yyerror (YY_("syntax error: cannot back up")); \
       YYERROR;							\
     }								\
 while (0)
@@ -809,7 +848,7 @@ do {								\
   if (yydebug)							\
     {								\
       YYFPRINTF (stderr, "%s ", Title);				\
-      yysymprint (stderr, 					\
+      yysymprint (stderr,					\
                   Type, Value, Location);	\
       YYFPRINTF (stderr, "\n");					\
     }								\
@@ -830,7 +869,7 @@ yy_stack_print (bottom, top)
     short int *top;
 #endif
 {
-  YYFPRINTF (stderr, _("Stack now"));
+  YYFPRINTF (stderr, "Stack now");
   for (/* Nothing. */; bottom <= top; ++bottom)
     YYFPRINTF (stderr, " %d", *bottom);
   YYFPRINTF (stderr, "\n");
@@ -857,13 +896,13 @@ yy_reduce_print (yyrule)
 #endif
 {
   int yyi;
-  unsigned int yylno = yyrline[yyrule];
-  YYFPRINTF (stderr, _("Reducing stack by rule %d (line %u), "),
+  unsigned long int yylno = yyrline[yyrule];
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu), ",
              yyrule - 1, yylno);
   /* Print the symbols being reduced, and their result.  */
   for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
-    YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
-  YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]);
+    YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]);
+  YYFPRINTF (stderr, "-> %s\n", yytname[yyr1[yyrule]]);
 }
 
 # define YY_REDUCE_PRINT(Rule)		\
@@ -952,8 +991,162 @@ yystpcpy (yydest, yysrc)
 #  endif
 # endif
 
-#endif /* !YYERROR_VERBOSE */
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
+   null, do not copy; instead, return the length of what the result
+   would have been.  */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
+    {
+      size_t yyn = 0;
+      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;
+	  }
+    do_not_strip_quotes: ;
+    }
+
+  if (! yyres)
+    return yystrlen (yystr);
+
+  return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
+
+/* Copy into YYRESULT an error message about the unexpected token
+   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
+   including the terminating null byte.  If YYRESULT is null, do not
+   copy anything; just return the number of bytes that would be
+   copied.  As a special case, return 0 if an ordinary "syntax error"
+   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
+   size calculation.  */
+static YYSIZE_T
+yysyntax_error (char *yyresult, int yystate, int yychar)
+{
+  int yyn = yypact[yystate];
 
+  if (! (YYPACT_NINF < yyn && yyn < YYLAST))
+    return 0;
+  else
+    {
+      int yytype = YYTRANSLATE (yychar);
+      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+      YYSIZE_T yysize = yysize0;
+      YYSIZE_T yysize1;
+      int yysize_overflow = 0;
+      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+      int yyx;
+
+# if 0
+      /* This is so xgettext sees the translatable formats that are
+         constructed on the fly.  */
+      YY_("syntax error, unexpected %s");
+      YY_("syntax error, unexpected %s, expecting %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+# endif
+      char *yyfmt;
+      char const *yyf;
+      static char const yyunexpected[] = "syntax error, unexpected %s";
+      static char const yyexpecting[] = ", expecting %s";
+      static char const yyor[] = " or %s";
+      char yyformat[sizeof yyunexpected
+                    + sizeof yyexpecting - 1
+                    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+                       * (sizeof yyor - 1))];
+      char const *yyprefix = yyexpecting;
+
+      /* Start YYX at -YYN if negative to avoid negative indexes in
+         YYCHECK.  */
+      int yyxbegin = yyn < 0 ? -yyn : 0;
+
+      /* Stay within bounds of both yycheck and yytname.  */
+      int yychecklim = YYLAST - yyn;
+      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+      int yycount = 1;
+
+      yyarg[0] = yytname[yytype];
+      yyfmt = yystpcpy (yyformat, yyunexpected);
+
+      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+        if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+          {
+            if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+              {
+                yycount = 1;
+                yysize = yysize0;
+                yyformat[sizeof yyunexpected - 1] = '\0';
+                break;
+              }
+            yyarg[yycount++] = yytname[yyx];
+            yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+            yysize_overflow |= yysize1 < yysize;
+            yysize = yysize1;
+            yyfmt = yystpcpy (yyfmt, yyprefix);
+            yyprefix = yyor;
+          }
+
+      yyf = YY_(yyformat);
+      yysize1 = yysize + yystrlen (yyf);
+      yysize_overflow |= yysize1 < yysize;
+      yysize = yysize1;
+
+      if (yysize_overflow)
+	return YYSIZE_MAXIMUM;
+
+      if (yyresult)
+	{
+          /* Avoid sprintf, as that infringes on the user's name space.
+             Don't have undefined behavior even if the translation
+             produced a string with the wrong number of "%s"s.  */
+          char *yyp = yyresult;
+          int yyi = 0;
+          while ((*yyp = *yyf))
+            {
+              if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+                {
+                  yyp += yytnamerr (yyp, yyarg[yyi++]);
+                  yyf += 2;
+                }
+              else
+                {
+                  yyp++;
+                  yyf++;
+                }
+            }
+        }
+      return yysize;
+    }
+}
+#endif /* YYERROR_VERBOSE */
 
 
 #if YYDEBUG
@@ -983,7 +1176,7 @@ yysymprint (yyoutput, yytype, yyvaluep, yylocationp)
     YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
 
   YY_LOCATION_PRINT (yyoutput, *yylocationp);
-  fprintf (yyoutput, ": ");
+  YYFPRINTF (yyoutput, ": ");
 
 # ifdef YYPRINT
   if (yytype < YYNTOKENS)
@@ -991,6 +1184,96 @@ yysymprint (yyoutput, yytype, yyvaluep, yylocationp)
 # endif
   switch (yytype)
     {
+      case 3: /* "\"string\"" */
+#line 165 "../../src/parse-gram.y"
+        { fprintf (stderr, "\"%s\"", (yyvaluep->chars)); };
+#line 1191 "../../src/parse-gram.c"
+        break;
+      case 4: /* "\"integer\"" */
+#line 178 "../../src/parse-gram.y"
+        { fprintf (stderr, "%d", (yyvaluep->integer)); };
+#line 1196 "../../src/parse-gram.c"
+        break;
+      case 8: /* "\"%destructor {...}\"" */
+#line 167 "../../src/parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+#line 1201 "../../src/parse-gram.c"
+        break;
+      case 9: /* "\"%printer {...}\"" */
+#line 171 "../../src/parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+#line 1206 "../../src/parse-gram.c"
+        break;
+      case 10: /* "\"%union {...}\"" */
+#line 172 "../../src/parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+#line 1211 "../../src/parse-gram.c"
+        break;
+      case 26: /* "\"%initial-action {...}\"" */
+#line 168 "../../src/parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+#line 1216 "../../src/parse-gram.c"
+        break;
+      case 27: /* "\"%lex-param {...}\"" */
+#line 169 "../../src/parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+#line 1221 "../../src/parse-gram.c"
+        break;
+      case 34: /* "\"%parse-param {...}\"" */
+#line 170 "../../src/parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+#line 1226 "../../src/parse-gram.c"
+        break;
+      case 41: /* "\"type\"" */
+#line 176 "../../src/parse-gram.y"
+        { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); };
+#line 1231 "../../src/parse-gram.c"
+        break;
+      case 45: /* "\"identifier\"" */
+#line 180 "../../src/parse-gram.y"
+        { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
+#line 1236 "../../src/parse-gram.c"
+        break;
+      case 46: /* "\"identifier:\"" */
+#line 182 "../../src/parse-gram.y"
+        { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); };
+#line 1241 "../../src/parse-gram.c"
+        break;
+      case 48: /* "\"%{...%}\"" */
+#line 174 "../../src/parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+#line 1246 "../../src/parse-gram.c"
+        break;
+      case 49: /* "\"epilogue\"" */
+#line 174 "../../src/parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+#line 1251 "../../src/parse-gram.c"
+        break;
+      case 50: /* "\"{...}\"" */
+#line 173 "../../src/parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+#line 1256 "../../src/parse-gram.c"
+        break;
+      case 71: /* "symbol" */
+#line 180 "../../src/parse-gram.y"
+        { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
+#line 1261 "../../src/parse-gram.c"
+        break;
+      case 72: /* "action" */
+#line 173 "../../src/parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+#line 1266 "../../src/parse-gram.c"
+        break;
+      case 73: /* "string_as_id" */
+#line 180 "../../src/parse-gram.y"
+        { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
+#line 1271 "../../src/parse-gram.c"
+        break;
+      case 74: /* "string_content" */
+#line 165 "../../src/parse-gram.y"
+        { fprintf (stderr, "\"%s\"", (yyvaluep->chars)); };
+#line 1276 "../../src/parse-gram.c"
+        break;
       default:
         break;
     }
@@ -1070,7 +1353,7 @@ yyparse (void)
 #else
 int
 yyparse ()
-
+    ;
 #endif
 #endif
 {
@@ -1092,6 +1375,12 @@ YYLTYPE yylloc;
   int yyerrstatus;
   /* Look-ahead token as an internal (translated) token number.  */
   int yytoken = 0;
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
 
   /* Three stacks and their tools:
      `yyss': related to states,
@@ -1154,7 +1443,7 @@ YYLTYPE yylloc;
 
 
   /* User initialization code. */
-#line 72 "parse-gram.y"
+#line 69 "../../src/parse-gram.y"
 {
   /* Bison's grammar can initial empty locations, hence a default
      location is needed. */
@@ -1162,11 +1451,9 @@ YYLTYPE yylloc;
   yylloc.start.line   = yylloc.end.line   = 1;
   yylloc.start.column = yylloc.end.column = 0;
 }
-/* Line 860 of yacc.c.  */
-#line 1167 "parse-gram.c"
-  yyvsp[0] = yylval;
-    yylsp[0] = yylloc;
-
+/* Line 1053 of yacc.c.  */
+#line 1456 "../../src/parse-gram.c"
+  yylsp[0] = yylloc;
   goto yysetstate;
 
 /*------------------------------------------------------------.
@@ -1199,7 +1486,7 @@ YYLTYPE yylloc;
 	   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 (_("parser stack overflow"),
+	yyoverflow (YY_("memory exhausted"),
 		    &yyss1, yysize * sizeof (*yyssp),
 		    &yyvs1, yysize * sizeof (*yyvsp),
 		    &yyls1, yysize * sizeof (*yylsp),
@@ -1210,11 +1497,11 @@ YYLTYPE yylloc;
       }
 #else /* no yyoverflow */
 # ifndef YYSTACK_RELOCATE
-      goto yyoverflowlab;
+      goto yyexhaustedlab;
 # else
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
-	goto yyoverflowlab;
+	goto yyexhaustedlab;
       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)
 	yystacksize = YYMAXDEPTH;
@@ -1224,7 +1511,7 @@ YYLTYPE yylloc;
 	union yyalloc *yyptr =
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
-	  goto yyoverflowlab;
+	  goto yyexhaustedlab;
 	YYSTACK_RELOCATE (yyss);
 	YYSTACK_RELOCATE (yyvs);
 	YYSTACK_RELOCATE (yyls);
@@ -1239,14 +1526,14 @@ YYLTYPE yylloc;
       yyvsp = yyvs + yysize - 1;
       yylsp = yyls + yysize - 1;
 
-      YYDPRINTF ((stderr, _("Stack size increased to %lu\n"),
+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
 		  (unsigned long int) yystacksize));
 
       if (yyss + yystacksize - 1 <= yyssp)
 	YYABORT;
     }
 
-  YYDPRINTF ((stderr, _("Entering state %d\n"), yystate));
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
 
   goto yybackup;
 
@@ -1270,19 +1557,19 @@ yybackup:
   /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
   if (yychar == YYEMPTY)
     {
-      YYDPRINTF ((stderr, _("Reading a token: ")));
+      YYDPRINTF ((stderr, "Reading a token: "));
       yychar = YYLEX;
     }
 
   if (yychar <= YYEOF)
     {
       yychar = yytoken = YYEOF;
-      YYDPRINTF ((stderr, _("Now at end of input.\n")));
+      YYDPRINTF ((stderr, "Now at end of input.\n"));
     }
   else
     {
       yytoken = YYTRANSLATE (yychar);
-      YY_SYMBOL_PRINT (_("Next token is"), yytoken, &yylval, &yylloc);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
     }
 
   /* If the proper action on seeing token YYTOKEN is to reduce or to
@@ -1303,7 +1590,7 @@ yybackup:
     YYACCEPT;
 
   /* Shift the look-ahead token.  */
-  YY_SYMBOL_PRINT (_("Shifting"), yytoken, &yylval, &yylloc);
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 
   /* Discard the token being shifted unless it is eof.  */
   if (yychar != YYEOF)
@@ -1354,129 +1641,134 @@ yyreduce:
   switch (yyn)
     {
         case 6:
-#line 190 "parse-gram.y"
+#line 203 "../../src/parse-gram.y"
     { prologue_augment ((yyvsp[0].chars), (yylsp[0])); }
     break;
 
   case 7:
-#line 191 "parse-gram.y"
+#line 204 "../../src/parse-gram.y"
     { debug_flag = true; }
     break;
 
   case 8:
-#line 192 "parse-gram.y"
-    { muscle_insert ((yyvsp[-1].chars), (yyvsp[0].chars)); }
+#line 205 "../../src/parse-gram.y"
+    { muscle_insert ((yyvsp[0].chars), "1"); }
     break;
 
   case 9:
-#line 193 "parse-gram.y"
-    { defines_flag = true; }
+#line 206 "../../src/parse-gram.y"
+    { muscle_insert ((yyvsp[-1].chars), (yyvsp[0].chars)); }
     break;
 
   case 10:
-#line 194 "parse-gram.y"
-    { error_verbose = true; }
+#line 207 "../../src/parse-gram.y"
+    { defines_flag = true; }
     break;
 
   case 11:
-#line 195 "parse-gram.y"
-    { expected_sr_conflicts = (yyvsp[0].integer); }
+#line 208 "../../src/parse-gram.y"
+    { error_verbose = true; }
     break;
 
   case 12:
-#line 196 "parse-gram.y"
-    { expected_rr_conflicts = (yyvsp[0].integer); }
+#line 209 "../../src/parse-gram.y"
+    { expected_sr_conflicts = (yyvsp[0].integer); }
     break;
 
   case 13:
-#line 197 "parse-gram.y"
-    { spec_file_prefix = (yyvsp[0].chars); }
+#line 210 "../../src/parse-gram.y"
+    { expected_rr_conflicts = (yyvsp[0].integer); }
     break;
 
   case 14:
-#line 199 "parse-gram.y"
+#line 211 "../../src/parse-gram.y"
+    { spec_file_prefix = (yyvsp[0].chars); }
+    break;
+
+  case 15:
+#line 213 "../../src/parse-gram.y"
     {
     nondeterministic_parser = true;
     glr_parser = true;
   }
     break;
 
-  case 15:
-#line 204 "parse-gram.y"
+  case 16:
+#line 218 "../../src/parse-gram.y"
     {
     muscle_code_grow ("initial_action", (yyvsp[0].chars), (yylsp[0]));
   }
     break;
 
-  case 16:
-#line 207 "parse-gram.y"
+  case 17:
+#line 221 "../../src/parse-gram.y"
     { add_param ("lex_param", (yyvsp[0].chars), (yylsp[0])); }
     break;
 
-  case 17:
-#line 208 "parse-gram.y"
+  case 18:
+#line 222 "../../src/parse-gram.y"
     { locations_flag = true; }
     break;
 
-  case 18:
-#line 209 "parse-gram.y"
+  case 19:
+#line 223 "../../src/parse-gram.y"
     { spec_name_prefix = (yyvsp[0].chars); }
     break;
 
-  case 19:
-#line 210 "parse-gram.y"
+  case 20:
+#line 224 "../../src/parse-gram.y"
     { no_lines_flag = true; }
     break;
 
-  case 20:
-#line 211 "parse-gram.y"
+  case 21:
+#line 225 "../../src/parse-gram.y"
     { nondeterministic_parser = true; }
     break;
 
-  case 21:
-#line 212 "parse-gram.y"
+  case 22:
+#line 226 "../../src/parse-gram.y"
     { spec_outfile = (yyvsp[0].chars); }
     break;
 
-  case 22:
-#line 213 "parse-gram.y"
+  case 23:
+#line 227 "../../src/parse-gram.y"
     { add_param ("parse_param", (yyvsp[0].chars), (yylsp[0])); }
     break;
 
-  case 23:
-#line 214 "parse-gram.y"
+  case 24:
+#line 228 "../../src/parse-gram.y"
     { pure_parser = true; }
     break;
 
-  case 24:
-#line 215 "parse-gram.y"
+  case 25:
+#line 229 "../../src/parse-gram.y"
     { skeleton = (yyvsp[0].chars); }
     break;
 
-  case 25:
-#line 216 "parse-gram.y"
+  case 26:
+#line 230 "../../src/parse-gram.y"
     { token_table_flag = true; }
     break;
 
-  case 26:
-#line 217 "parse-gram.y"
+  case 27:
+#line 231 "../../src/parse-gram.y"
     { report_flag = report_states; }
     break;
 
-  case 27:
-#line 218 "parse-gram.y"
+  case 28:
+#line 232 "../../src/parse-gram.y"
     { yacc_flag = true; }
     break;
 
-  case 31:
-#line 226 "parse-gram.y"
+  case 32:
+#line 240 "../../src/parse-gram.y"
     {
       grammar_start_symbol_set ((yyvsp[0].symbol), (yylsp[0]));
     }
     break;
 
-  case 32:
-#line 230 "parse-gram.y"
+  case 33:
+#line 244 "../../src/parse-gram.y"
     {
       typed = true;
       MUSCLE_INSERT_INT ("stype_line", (yylsp[0]).start.line);
@@ -1484,8 +1776,8 @@ yyreduce:
     }
     break;
 
-  case 33:
-#line 236 "parse-gram.y"
+  case 34:
+#line 250 "../../src/parse-gram.y"
     {
       symbol_list *list;
       for (list = (yyvsp[0].list); list; list = list->next)
@@ -1494,8 +1786,8 @@ yyreduce:
     }
     break;
 
-  case 34:
-#line 243 "parse-gram.y"
+  case 35:
+#line 257 "../../src/parse-gram.y"
     {
       symbol_list *list;
       for (list = (yyvsp[0].list); list; list = list->next)
@@ -1504,48 +1796,48 @@ yyreduce:
     }
     break;
 
-  case 35:
-#line 250 "parse-gram.y"
+  case 36:
+#line 264 "../../src/parse-gram.y"
     {
       default_prec = true;
     }
     break;
 
-  case 36:
-#line 254 "parse-gram.y"
+  case 37:
+#line 268 "../../src/parse-gram.y"
     {
       default_prec = false;
     }
     break;
 
-  case 37:
-#line 260 "parse-gram.y"
+  case 38:
+#line 274 "../../src/parse-gram.y"
     { current_class = nterm_sym; }
     break;
 
-  case 38:
-#line 261 "parse-gram.y"
+  case 39:
+#line 275 "../../src/parse-gram.y"
     {
       current_class = unknown_sym;
       current_type = NULL;
     }
     break;
 
-  case 39:
-#line 265 "parse-gram.y"
+  case 40:
+#line 279 "../../src/parse-gram.y"
     { current_class = token_sym; }
     break;
 
-  case 40:
-#line 266 "parse-gram.y"
+  case 41:
+#line 280 "../../src/parse-gram.y"
     {
       current_class = unknown_sym;
       current_type = NULL;
     }
     break;
 
-  case 41:
-#line 271 "parse-gram.y"
+  case 42:
+#line 285 "../../src/parse-gram.y"
     {
       symbol_list *list;
       for (list = (yyvsp[0].list); list; list = list->next)
@@ -1554,8 +1846,8 @@ yyreduce:
     }
     break;
 
-  case 42:
-#line 281 "parse-gram.y"
+  case 43:
+#line 295 "../../src/parse-gram.y"
     {
       symbol_list *list;
       ++current_prec;
@@ -1569,58 +1861,58 @@ yyreduce:
     }
     break;
 
-  case 43:
-#line 295 "parse-gram.y"
+  case 44:
+#line 309 "../../src/parse-gram.y"
     { (yyval.assoc) = left_assoc; }
     break;
 
-  case 44:
-#line 296 "parse-gram.y"
+  case 45:
+#line 310 "../../src/parse-gram.y"
     { (yyval.assoc) = right_assoc; }
     break;
 
-  case 45:
-#line 297 "parse-gram.y"
+  case 46:
+#line 311 "../../src/parse-gram.y"
     { (yyval.assoc) = non_assoc; }
     break;
 
-  case 46:
-#line 301 "parse-gram.y"
+  case 47:
+#line 315 "../../src/parse-gram.y"
     { current_type = NULL; }
     break;
 
-  case 47:
-#line 302 "parse-gram.y"
+  case 48:
+#line 316 "../../src/parse-gram.y"
     { current_type = (yyvsp[0].uniqstr); }
     break;
 
-  case 48:
-#line 308 "parse-gram.y"
+  case 49:
+#line 322 "../../src/parse-gram.y"
     { (yyval.list) = symbol_list_new ((yyvsp[0].symbol), (yylsp[0])); }
     break;
 
-  case 49:
-#line 309 "parse-gram.y"
+  case 50:
+#line 323 "../../src/parse-gram.y"
     { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].symbol), (yylsp[0])); }
     break;
 
-  case 50:
-#line 315 "parse-gram.y"
+  case 51:
+#line 329 "../../src/parse-gram.y"
     {
        current_type = (yyvsp[0].uniqstr);
      }
     break;
 
-  case 51:
-#line 319 "parse-gram.y"
+  case 52:
+#line 333 "../../src/parse-gram.y"
     {
        symbol_class_set ((yyvsp[0].symbol), current_class, (yylsp[0]));
        symbol_type_set ((yyvsp[0].symbol), current_type, (yylsp[0]));
      }
     break;
 
-  case 52:
-#line 324 "parse-gram.y"
+  case 53:
+#line 338 "../../src/parse-gram.y"
     {
       symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1]));
       symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1]));
@@ -1628,8 +1920,8 @@ yyreduce:
     }
     break;
 
-  case 53:
-#line 330 "parse-gram.y"
+  case 54:
+#line 344 "../../src/parse-gram.y"
     {
       symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1]));
       symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1]));
@@ -1637,8 +1929,8 @@ yyreduce:
     }
     break;
 
-  case 54:
-#line 336 "parse-gram.y"
+  case 55:
+#line 350 "../../src/parse-gram.y"
     {
       symbol_class_set ((yyvsp[-2].symbol), current_class, (yylsp[-2]));
       symbol_type_set ((yyvsp[-2].symbol), current_type, (yylsp[-2]));
@@ -1647,96 +1939,96 @@ yyreduce:
     }
     break;
 
-  case 60:
-#line 365 "parse-gram.y"
+  case 61:
+#line 379 "../../src/parse-gram.y"
     {
       if (yacc_flag)
 	complain_at ((yyloc), _("POSIX forbids declarations in the grammar"));
     }
     break;
 
-  case 61:
-#line 370 "parse-gram.y"
+  case 62:
+#line 384 "../../src/parse-gram.y"
     {
       yyerrok;
     }
     break;
 
-  case 62:
-#line 376 "parse-gram.y"
+  case 63:
+#line 390 "../../src/parse-gram.y"
     { current_lhs = (yyvsp[0].symbol); current_lhs_location = (yylsp[0]); }
     break;
 
-  case 64:
-#line 380 "parse-gram.y"
+  case 65:
+#line 394 "../../src/parse-gram.y"
     { grammar_rule_end ((yylsp[0])); }
     break;
 
-  case 65:
-#line 381 "parse-gram.y"
+  case 66:
+#line 395 "../../src/parse-gram.y"
     { grammar_rule_end ((yylsp[0])); }
     break;
 
-  case 67:
-#line 387 "parse-gram.y"
+  case 68:
+#line 401 "../../src/parse-gram.y"
     { grammar_rule_begin (current_lhs, current_lhs_location); }
     break;
 
-  case 68:
-#line 389 "parse-gram.y"
+  case 69:
+#line 403 "../../src/parse-gram.y"
     { grammar_current_rule_symbol_append ((yyvsp[0].symbol), (yylsp[0])); }
     break;
 
-  case 69:
-#line 391 "parse-gram.y"
+  case 70:
+#line 405 "../../src/parse-gram.y"
     { grammar_current_rule_action_append ((yyvsp[0].chars), (yylsp[0])); }
     break;
 
-  case 70:
-#line 393 "parse-gram.y"
+  case 71:
+#line 407 "../../src/parse-gram.y"
     { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); }
     break;
 
-  case 71:
-#line 395 "parse-gram.y"
+  case 72:
+#line 409 "../../src/parse-gram.y"
     { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); }
     break;
 
-  case 72:
-#line 397 "parse-gram.y"
+  case 73:
+#line 411 "../../src/parse-gram.y"
     { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); }
     break;
 
-  case 73:
-#line 401 "parse-gram.y"
+  case 74:
+#line 415 "../../src/parse-gram.y"
     { (yyval.symbol) = (yyvsp[0].symbol); }
     break;
 
-  case 74:
-#line 402 "parse-gram.y"
+  case 75:
+#line 416 "../../src/parse-gram.y"
     { (yyval.symbol) = (yyvsp[0].symbol); }
     break;
 
-  case 75:
-#line 407 "parse-gram.y"
+  case 76:
+#line 421 "../../src/parse-gram.y"
     { (yyval.chars) = (yyvsp[0].chars); }
     break;
 
-  case 76:
-#line 413 "parse-gram.y"
+  case 77:
+#line 427 "../../src/parse-gram.y"
     {
       (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[0].chars)), (yylsp[0]));
       symbol_class_set ((yyval.symbol), token_sym, (yylsp[0]));
     }
     break;
 
-  case 77:
-#line 422 "parse-gram.y"
+  case 78:
+#line 436 "../../src/parse-gram.y"
     { (yyval.chars) = (yyvsp[0].chars); }
     break;
 
-  case 79:
-#line 429 "parse-gram.y"
+  case 80:
+#line 443 "../../src/parse-gram.y"
     {
       muscle_code_grow ("epilogue", (yyvsp[0].chars), (yylsp[0]));
       scanner_last_string_free ();
@@ -1747,8 +2039,8 @@ yyreduce:
       default: break;
     }
 
-/* Line 1056 of yacc.c.  */
-#line 1752 "parse-gram.c"
+/* Line 1249 of yacc.c.  */
+#line 2044 "../../src/parse-gram.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -1782,107 +2074,41 @@ yyerrlab:
   if (!yyerrstatus)
     {
       ++yynerrs;
-#if YYERROR_VERBOSE
-      yyn = yypact[yystate];
-
-      if (YYPACT_NINF < yyn && yyn < YYLAST)
-	{
-	  int yytype = YYTRANSLATE (yychar);
-	  YYSIZE_T yysize0 = yystrlen (yytname[yytype]);
-	  YYSIZE_T yysize = yysize0;
-	  YYSIZE_T yysize1;
-	  int yysize_overflow = 0;
-	  char *yymsg = 0;
-#	  define YYERROR_VERBOSE_ARGS_MAXIMUM 5
-	  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-	  int yyx;
-
-#if 0
-	  /* This is so xgettext sees the translatable formats that are
-	     constructed on the fly.  */
-	  _("syntax error, unexpected %s");
-	  _("syntax error, unexpected %s, expecting %s");
-	  _("syntax error, unexpected %s, expecting %s or %s");
-	  _("syntax error, unexpected %s, expecting %s or %s or %s");
-	  _("syntax error, unexpected %s, expecting %s or %s or %s or %s");
-#endif
-	  char *yyfmt;
-	  char const *yyf;
-	  static char const yyunexpected[] = "syntax error, unexpected %s";
-	  static char const yyexpecting[] = ", expecting %s";
-	  static char const yyor[] = " or %s";
-	  char yyformat[sizeof yyunexpected
-			+ sizeof yyexpecting - 1
-			+ ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
-			   * (sizeof yyor - 1))];
-	  char const *yyprefix = yyexpecting;
-
-	  /* Start YYX at -YYN if negative to avoid negative indexes in
-	     YYCHECK.  */
-	  int yyxbegin = yyn < 0 ? -yyn : 0;
-
-	  /* Stay within bounds of both yycheck and yytname.  */
-	  int yychecklim = YYLAST - yyn;
-	  int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-	  int yycount = 1;
-
-	  yyarg[0] = yytname[yytype];
-	  yyfmt = yystpcpy (yyformat, yyunexpected);
-
-	  for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-	    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+#if ! YYERROR_VERBOSE
+      yyerror (YY_("syntax error"));
+#else
+      {
+	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
+	  {
+	    YYSIZE_T yyalloc = 2 * yysize;
+	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
+	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
+	    if (yymsg != yymsgbuf)
+	      YYSTACK_FREE (yymsg);
+	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
+	    if (yymsg)
+	      yymsg_alloc = yyalloc;
+	    else
 	      {
-		if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-		  {
-		    yycount = 1;
-		    yysize = yysize0;
-		    yyformat[sizeof yyunexpected - 1] = '\0';
-		    break;
-		  }
-		yyarg[yycount++] = yytname[yyx];
-		yysize1 = yysize + yystrlen (yytname[yyx]);
-		yysize_overflow |= yysize1 < yysize;
-		yysize = yysize1;
-		yyfmt = yystpcpy (yyfmt, yyprefix);
-		yyprefix = yyor;
+		yymsg = yymsgbuf;
+		yymsg_alloc = sizeof yymsgbuf;
 	      }
-
-	  yyf = _(yyformat);
-	  yysize1 = yysize + strlen (yyf);
-	  yysize_overflow |= yysize1 < yysize;
-	  yysize = yysize1;
-
-	  if (!yysize_overflow && yysize <= YYSTACK_ALLOC_MAXIMUM)
-	    yymsg = (char *) YYSTACK_ALLOC (yysize);
-	  if (yymsg)
-	    {
-	      /* Avoid sprintf, as that infringes on the user's name space.
-		 Don't have undefined behavior even if the translation
-		 produced a string with the wrong number of "%s"s.  */
-	      char *yyp = yymsg;
-	      int yyi = 0;
-	      while ((*yyp = *yyf))
-		{
-		  if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
-		    {
-		      yyp = yystpcpy (yyp, yyarg[yyi++]);
-		      yyf += 2;
-		    }
-		  else
-		    {
-		      yyp++;
-		      yyf++;
-		    }
-		}
-	      yyerror (yymsg);
-	      YYSTACK_FREE (yymsg);
-	    }
-	  else
-	    yyerror (_("syntax error; also memory exhausted"));
-	}
-      else
-#endif /* YYERROR_VERBOSE */
-	yyerror (_("syntax error"));
+	  }
+
+	if (0 < yysize && yysize <= yymsg_alloc)
+	  {
+	    (void) yysyntax_error (yymsg, yystate, yychar);
+	    yyerror (yymsg);
+	  }
+	else
+	  {
+	    yyerror (YY_("syntax error"));
+	    if (yysize != 0)
+	      goto yyexhaustedlab;
+	  }
+      }
+#endif
     }
 
   yyerror_range[0] = yylloc;
@@ -1894,14 +2120,13 @@ yyerrlab:
 
       if (yychar <= YYEOF)
         {
-          /* If at end of input, pop the error token,
-	     then the rest of the stack, then return failure.  */
+	  /* Return failure if at end of input.  */
 	  if (yychar == YYEOF)
 	    YYABORT;
         }
       else
 	{
-	  yydestruct (_("Error: discarding"), yytoken, &yylval, &yylloc);
+	  yydestruct ("Error: discarding", yytoken, &yylval, &yylloc);
 	  yychar = YYEMPTY;
 	}
     }
@@ -1955,7 +2180,7 @@ yyerrlab1:
 	YYABORT;
 
       yyerror_range[0] = *yylsp;
-      yydestruct (_("Error: popping"), yystos[yystate], yyvsp, yylsp);
+      yydestruct ("Error: popping", yystos[yystate], yyvsp, yylsp);
       YYPOPSTACK;
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
@@ -1973,7 +2198,7 @@ yyerrlab1:
   *++yylsp = yyloc;
 
   /* Shift the error token. */
-  YY_SYMBOL_PRINT (_("Shifting"), yystos[yyn], yyvsp, yylsp);
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
 
   yystate = yyn;
   goto yynewstate;
@@ -1990,44 +2215,42 @@ yyacceptlab:
 | yyabortlab -- YYABORT comes here.  |
 `-----------------------------------*/
 yyabortlab:
-  yydestruct (_("Error: discarding lookahead"),
-              yytoken, &yylval, &yylloc);
-  yychar = YYEMPTY;
   yyresult = 1;
   goto yyreturn;
 
 #ifndef yyoverflow
-/*----------------------------------------------.
-| yyoverflowlab -- parser overflow comes here.  |
-`----------------------------------------------*/
-yyoverflowlab:
-  yyerror (_("parser stack overflow"));
-  yydestruct (_("Error: discarding lookahead"),
-	      yytoken, &yylval, &yylloc);
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+  yyerror (YY_("memory exhausted"));
   yyresult = 2;
   /* Fall through.  */
 #endif
 
 yyreturn:
-  if (yyssp != yyss)
-    for (;;)
-      {
-	yyerror_range[0] = *yylsp;
-	YYPOPSTACK;
-	if (yyssp == yyss)
-	  break;
-	yydestruct (_("Error: popping"),
-		    yystos[*yyssp], yyvsp, yylsp);
-      }
+  if (yychar != YYEOF && yychar != YYEMPTY)
+     yydestruct ("Cleanup: discarding lookahead",
+		 yytoken, &yylval, &yylloc);
+  while (yyssp != yyss)
+    {
+      yydestruct ("Cleanup: popping",
+		  yystos[*yyssp], yyvsp, yylsp);
+      YYPOPSTACK;
+    }
 #ifndef yyoverflow
   if (yyss != yyssa)
     YYSTACK_FREE (yyss);
+#endif
+#if YYERROR_VERBOSE
+  if (yymsg != yymsgbuf)
+    YYSTACK_FREE (yymsg);
 #endif
   return yyresult;
 }
 
 
-#line 435 "parse-gram.y"
+#line 449 "../../src/parse-gram.y"
 
 
 
@@ -2112,49 +2335,6 @@ add_param (char const *type, char *decl, location loc)
   scanner_last_string_free ();
 }
 
-/*----------------------------------------------------.
-| When debugging the parser, display tokens' values.  |
-`----------------------------------------------------*/
-
-static void
-print_token_value (FILE *file, int type, YYSTYPE const *value)
-{
-  fputc (' ', file);
-  switch (type)
-    {
-    case ID:
-      fprintf (file, " = %s", value->symbol->tag);
-      break;
-
-    case INT:
-      fprintf (file, " = %d", value->integer);
-      break;
-
-    case STRING:
-      fprintf (file, " = \"%s\"", value->chars);
-      break;
-
-    case TYPE:
-      fprintf (file, " = <%s>", value->uniqstr);
-      break;
-
-    case BRACED_CODE:
-    case PERCENT_DESTRUCTOR:
-    case PERCENT_LEX_PARAM:
-    case PERCENT_PARSE_PARAM:
-    case PERCENT_PRINTER:
-    case PERCENT_UNION:
-    case PROLOGUE:
-    case EPILOGUE:
-      fprintf (file, " = {{ %s }}", value->chars);
-      break;
-
-    default:
-      fprintf (file, "unknown token type");
-      break;
-    }
-}
-
 static void
 gram_error (location const *loc, char const *msg)
 {
@@ -2164,6 +2344,6 @@ gram_error (location const *loc, char const *msg)
 char const *
 token_name (int type)
 {
-  return yytname[type];
+  return yytname[YYTRANSLATE (type)];
 }