* src/symtab.h (struct symbol): Declare the printer and destructor

[bison.git] / src / parse-gram.c

diff --git a/src/parse-gram.c b/src/parse-gram.c
index 266b4e8a8e23f90083248715060bd2f11283ce38..b951f2fbc6d210d3031268c1b92ac3b09b104587 100644 (file)
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,7 +1,7 @@
-/* A Bison parser, made by GNU Bison 1.875e.  */
+/* A Bison parser, made by GNU Bison 2.0c.  */

 
 /* Skeleton parser for Yacc-like parsing with Bison,
 
 /* 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
 
    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
 
    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.
 
 /* As a special exception, when this file is copied by Bison into a
    Bison output file, you may use that output file without restriction.


@@ -45,8 +45,7 @@
 /* Using locations.  */
 #define YYLSP_NEEDED 1
 
 /* Using locations.  */
 #define YYLSP_NEEDED 1
 

-/* If NAME_PREFIX is specified substitute the variables and functions
-   names.  */
+/* Substitute the variable and function names.  */

 #define yyparse gram_parse
 #define yylex   gram_lex
 #define yyerror gram_error
 #define yyparse gram_parse
 #define yylex   gram_lex
 #define yyerror gram_error


@@ -167,10 +166,10 @@
 
 
 /* Copy the first part of user declarations.  */
 
 
 /* Copy the first part of user declarations.  */

-#line 1 "../../src/parse-gram.y"
+#line 1 "parse-gram.y"

 /* Bison Grammar Parser                             -*- C -*-
 
 /* Bison Grammar Parser                             -*- C -*-
 

-   Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -186,8 +185,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
 
    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"
 */
 
 #include "system.h"


@@ -199,6 +198,7 @@
 #include "gram.h"
 #include "muscle_tab.h"
 #include "output.h"
 #include "gram.h"
 #include "muscle_tab.h"
 #include "output.h"

+#include "quotearg.h"

 #include "reader.h"
 #include "symlist.h"
 
 #include "reader.h"
 #include "symlist.h"
 


@@ -215,18 +215,14 @@ static YYLTYPE lloc_default (YYLTYPE const *, int);
         gram_error (&yylloc, Msg)
 static void gram_error (location const *, char const *);
 
         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);
 
 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;
 symbol *current_lhs;
 location current_lhs_location;
 assoc current_assoc;

-int current_prec = 0;
+static int current_prec = 0;

 
 
 /* Enabling traces.  */
 
 
 /* Enabling traces.  */


@@ -242,8 +238,13 @@ int current_prec = 0;
 # define YYERROR_VERBOSE 1
 #endif
 
 # define YYERROR_VERBOSE 1
 #endif
 

+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+

 #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
 #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)

-#line 81 "../../src/parse-gram.y"
+#line 79 "parse-gram.y"

 typedef union YYSTYPE {
   symbol *symbol;
   symbol_list *list;
 typedef union YYSTYPE {
   symbol *symbol;
   symbol_list *list;


@@ -252,8 +253,8 @@ typedef union YYSTYPE {
   assoc assoc;
   uniqstr uniqstr;
 } YYSTYPE;
   assoc assoc;
   uniqstr uniqstr;
 } YYSTYPE;

-/* Line 191 of yacc.c.  */
-#line 257 "../../src/parse-gram.c"
+/* Line 196 of yacc.c.  */
+#line 258 "parse-gram.c"

 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1


@@ -276,30 +277,49 @@ typedef struct YYLTYPE
 /* Copy the second part of user declarations.  */
 
 
 /* Copy the second part of user declarations.  */
 
 

-/* Line 214 of yacc.c.  */
-#line 281 "../../src/parse-gram.c"
+/* Line 219 of yacc.c.  */
+#line 282 "parse-gram.c"

 
 

-#if ! defined (yyoverflow) || YYERROR_VERBOSE
+#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) && (defined (__STDC__) || defined (__cplusplus))
+# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+# define YYSIZE_T size_t
+#endif
+#if ! defined (YYSIZE_T)
+# define YYSIZE_T unsigned int
+#endif

 
 

-# 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
 # endif

-# ifndef YYMALLOC
-#  define YYMALLOC malloc
+# ifndef YY_
+#  define YY_(msgid) msgid

 # endif
 # endif

+#endif
+
+#if ! defined (yyoverflow) || YYERROR_VERBOSE

 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
 # ifdef YYSTACK_USE_ALLOCA
 #  if YYSTACK_USE_ALLOCA
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
 # ifdef YYSTACK_USE_ALLOCA
 #  if YYSTACK_USE_ALLOCA

-#   define YYSTACK_ALLOC alloca
-#  endif
-# else
-#  if defined (alloca) || defined (_ALLOCA_H)
-#   define YYSTACK_ALLOC alloca
-#  else

 #   ifdef __GNUC__
 #    define YYSTACK_ALLOC __builtin_alloca
 #   ifdef __GNUC__
 #    define YYSTACK_ALLOC __builtin_alloca

+#   else
+#    define YYSTACK_ALLOC alloca
+#    if defined (__STDC__) || defined (__cplusplus)
+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#     define YYINCLUDED_STDLIB_H
+#    endif

 #   endif
 #  endif
 # endif
 #   endif
 #  endif
 # endif


@@ -307,13 +327,39 @@ typedef struct YYLTYPE
 # ifdef YYSTACK_ALLOC
    /* Pacify GCC's `empty if-body' warning. */
 #  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
 # ifdef YYSTACK_ALLOC
    /* Pacify GCC's `empty if-body' warning. */
 #  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)

-# else
-#  if defined (__STDC__) || defined (__cplusplus)
-#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   define YYSIZE_T size_t
+#  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
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2005 */

 #  endif
 #  endif

+# else

 #  define YYSTACK_ALLOC YYMALLOC
 #  define YYSTACK_FREE YYFREE
 #  define YYSTACK_ALLOC YYMALLOC
 #  define YYSTACK_FREE YYFREE

+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM ((YYSIZE_T) -1)
+#  endif
+#  ifdef __cplusplus
+extern "C" {
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if (! defined (malloc) && ! defined (YYINCLUDED_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 (YYINCLUDED_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 */
 
 # endif
 #endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
 


@@ -350,7 +396,7 @@ union yyalloc
 #   define YYCOPY(To, From, Count)             \
       do                                       \
        {                                       \
 #   define YYCOPY(To, From, Count)             \
       do                                       \
        {                                       \

-         register YYSIZE_T yyi;                \
+         YYSIZE_T yyi;                         \

          for (yyi = 0; yyi < (Count); yyi++)   \
            (To)[yyi] = (From)[yyi];            \
        }                                       \
          for (yyi = 0; yyi < (Count); yyi++)   \
            (To)[yyi] = (From)[yyi];            \
        }                                       \


@@ -400,7 +446,7 @@ union yyalloc
 #define YYUNDEFTOK  2
 #define YYMAXUTOK   305
 
 #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.  */
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
 /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */


@@ -483,19 +529,19 @@ static const yysigned_char yyrhs[] =
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const unsigned short int yyrline[] =
 {
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const unsigned short int yyrline[] =
 {

-       0,   174,   174,   182,   184,   188,   189,   190,   191,   192,
-     193,   194,   195,   196,   197,   202,   206,   207,   208,   209,
-     210,   211,   212,   213,   214,   215,   216,   217,   218,   222,
-     223,   224,   228,   234,   241,   248,   252,   259,   259,   264,
-     264,   269,   279,   294,   295,   296,   300,   301,   307,   308,
-     313,   317,   322,   328,   334,   345,   346,   355,   356,   362,
-     363,   368,   375,   375,   379,   380,   381,   386,   387,   389,
-     391,   393,   395,   400,   401,   405,   411,   420,   427,   429
+       0,   188,   188,   196,   198,   202,   203,   204,   205,   206,
+     207,   208,   209,   210,   211,   216,   220,   221,   222,   223,
+     224,   225,   226,   227,   228,   229,   230,   231,   232,   236,
+     237,   238,   242,   248,   255,   262,   266,   273,   273,   278,
+     278,   283,   293,   308,   309,   310,   314,   315,   321,   322,
+     327,   331,   336,   342,   348,   359,   360,   369,   370,   376,
+     377,   382,   389,   389,   393,   394,   395,   400,   401,   403,
+     405,   407,   409,   414,   415,   419,   425,   434,   439,   441

 };
 #endif
 
 };
 #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[] =
 {
    First, the terminals, then, starting at YYNTOKENS, nonterminals. */
 static const char *const yytname[] =
 {


@@ -674,22 +720,6 @@ static const unsigned char yystos[] =
       16,    50,    71,    72,    70,    71,     4,    41
 };
 
       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)
 #define yyerrok                (yyerrstatus = 0)
 #define yyclearin      (yychar = YYEMPTY)
 #define YYEMPTY                (-2)


@@ -719,8 +749,8 @@ do                                                          \
       goto yybackup;                                           \
     }                                                          \
   else                                                         \
       goto yybackup;                                           \
     }                                                          \
   else                                                         \

-    {                                                          \
-      yyerror ("syntax error: cannot back up");\
+    {                                                          \
+      yyerror (YY_("syntax error: cannot back up")); \

       YYERROR;                                                 \
     }                                                          \
 while (0)
       YYERROR;                                                 \
     }                                                          \
 while (0)


@@ -734,22 +764,25 @@ while (0)
    If N is 0, then set CURRENT to the empty location which ends
    the previous symbol: RHS[0] (always defined).  */
 
    If N is 0, then set CURRENT to the empty location which ends
    the previous symbol: RHS[0] (always defined).  */
 

+#define YYRHSLOC(Rhs, K) ((Rhs)[K])

 #ifndef YYLLOC_DEFAULT
 #ifndef YYLLOC_DEFAULT

-# define YYLLOC_DEFAULT(Current, Rhs, N)                                    \
-do {                                                                        \
-  if (N)                                                                    \
-    {                                                                       \
-      (Current).first_line   = (Rhs)[1].first_line;                         \
-      (Current).first_column = (Rhs)[1].first_column;                       \
-      (Current).last_line    = (Rhs)[N].last_line;                          \
-      (Current).last_column  = (Rhs)[N].last_column;                        \
-    }                                                                       \
-  else                                                                      \
-    {                                                                       \
-      (Current).first_line   = (Current).last_line   = (Rhs)[0].last_line;   \
-      (Current).first_column = (Current).last_column = (Rhs)[0].last_column; \
-    }                                                                       \
-} while(0)
+# define YYLLOC_DEFAULT(Current, Rhs, N)                               \
+    do                                                                 \
+      if (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 (0)

 #endif
 
 
 #endif
 
 


@@ -796,7 +829,7 @@ do {                                                                \
   if (yydebug)                                                 \
     {                                                          \
       YYFPRINTF (stderr, "%s ", Title);                                \
   if (yydebug)                                                 \
     {                                                          \
       YYFPRINTF (stderr, "%s ", Title);                                \

-      yysymprint (stderr,                                      \
+      yysymprint (stderr,                                      \

                   Type, Value, Location);      \
       YYFPRINTF (stderr, "\n");                                        \
     }                                                          \
                   Type, Value, Location);      \
       YYFPRINTF (stderr, "\n");                                        \
     }                                                          \


@@ -844,13 +877,13 @@ yy_reduce_print (yyrule)
 #endif
 {
   int yyi;
 #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++)
              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)         \
 }
 
 # define YY_REDUCE_PRINT(Rule)         \


@@ -879,13 +912,9 @@ int yydebug;
    if the built-in stack extension method is used).
 
    Do not make this value too large; the results are undefined if
    if the built-in stack extension method is used).
 
    Do not make this value too large; the results are undefined if

-   SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)

    evaluated with infinite-precision integer arithmetic.  */
 
    evaluated with infinite-precision integer arithmetic.  */
 

-#if defined (YYMAXDEPTH) && YYMAXDEPTH == 0
-# undef YYMAXDEPTH
-#endif
-

 #ifndef YYMAXDEPTH
 # define YYMAXDEPTH 10000
 #endif
 #ifndef YYMAXDEPTH
 # define YYMAXDEPTH 10000
 #endif


@@ -907,7 +936,7 @@ yystrlen (yystr)
      const char *yystr;
 #   endif
 {
      const char *yystr;
 #   endif
 {

-  register const char *yys = yystr;
+  const char *yys = yystr;

 
   while (*yys++ != '\0')
     continue;
 
   while (*yys++ != '\0')
     continue;


@@ -932,8 +961,8 @@ yystpcpy (yydest, yysrc)
      const char *yysrc;
 #   endif
 {
      const char *yysrc;
 #   endif
 {

-  register char *yyd = yydest;
-  register const char *yys = yysrc;
+  char *yyd = yydest;
+  const char *yys = yysrc;

 
   while ((*yyd++ = *yys++) != '\0')
     continue;
 
   while ((*yyd++ = *yys++) != '\0')
     continue;


@@ -943,7 +972,55 @@ yystpcpy (yydest, yysrc)
 #  endif
 # endif
 
 #  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
+
+#endif /* YYERROR_VERBOSE */

 
 \f
 
 
 \f
 


@@ -974,7 +1051,7 @@ yysymprint (yyoutput, yytype, yyvaluep, yylocationp)
     YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
 
   YY_LOCATION_PRINT (yyoutput, *yylocationp);
     YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
 
   YY_LOCATION_PRINT (yyoutput, *yylocationp);

-  fprintf (yyoutput, ": ");
+  YYFPRINTF (yyoutput, ": ");

 
 # ifdef YYPRINT
   if (yytype < YYNTOKENS)
 
 # ifdef YYPRINT
   if (yytype < YYNTOKENS)


@@ -982,6 +1059,96 @@ yysymprint (yyoutput, yytype, yyvaluep, yylocationp)
 # endif
   switch (yytype)
     {
 # endif
   switch (yytype)
     {

+      case 3: /* "\"string\"" */
+#line 165 "parse-gram.y"
+        { fprintf (stderr, "\"%s\"", (yyvaluep->chars)); };
+#line 1066 "parse-gram.c"
+        break;
+      case 4: /* "\"integer\"" */
+#line 178 "parse-gram.y"
+        { fprintf (stderr, "%d", (yyvaluep->integer)); };
+#line 1071 "parse-gram.c"
+        break;
+      case 8: /* "\"%destructor {...}\"" */
+#line 167 "parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+#line 1076 "parse-gram.c"
+        break;
+      case 9: /* "\"%printer {...}\"" */
+#line 171 "parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+#line 1081 "parse-gram.c"
+        break;
+      case 10: /* "\"%union {...}\"" */
+#line 172 "parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+#line 1086 "parse-gram.c"
+        break;
+      case 26: /* "\"%initial-action {...}\"" */
+#line 168 "parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+#line 1091 "parse-gram.c"
+        break;
+      case 27: /* "\"%lex-param {...}\"" */
+#line 169 "parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+#line 1096 "parse-gram.c"
+        break;
+      case 34: /* "\"%parse-param {...}\"" */
+#line 170 "parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+#line 1101 "parse-gram.c"
+        break;
+      case 41: /* "\"type\"" */
+#line 176 "parse-gram.y"
+        { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); };
+#line 1106 "parse-gram.c"
+        break;
+      case 45: /* "\"identifier\"" */
+#line 180 "parse-gram.y"
+        { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
+#line 1111 "parse-gram.c"
+        break;
+      case 46: /* "\"identifier:\"" */
+#line 182 "parse-gram.y"
+        { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); };
+#line 1116 "parse-gram.c"
+        break;
+      case 48: /* "\"%{...%}\"" */
+#line 174 "parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+#line 1121 "parse-gram.c"
+        break;
+      case 49: /* "\"epilogue\"" */
+#line 174 "parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+#line 1126 "parse-gram.c"
+        break;
+      case 50: /* "\"{...}\"" */
+#line 173 "parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+#line 1131 "parse-gram.c"
+        break;
+      case 71: /* "symbol" */
+#line 180 "parse-gram.y"
+        { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
+#line 1136 "parse-gram.c"
+        break;
+      case 72: /* "action" */
+#line 173 "parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+#line 1141 "parse-gram.c"
+        break;
+      case 73: /* "string_as_id" */
+#line 180 "parse-gram.y"
+        { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
+#line 1146 "parse-gram.c"
+        break;
+      case 74: /* "string_content" */
+#line 165 "parse-gram.y"
+        { fprintf (stderr, "\"%s\"", (yyvaluep->chars)); };
+#line 1151 "parse-gram.c"
+        break;

       default:
         break;
     }
       default:
         break;
     }


@@ -1061,7 +1228,7 @@ yyparse (void)
 #else
 int
 yyparse ()
 #else
 int
 yyparse ()

-
+    ;

 #endif
 #endif
 {
 #endif
 #endif
 {


@@ -1076,8 +1243,8 @@ int yynerrs;
 /* Location data for the look-ahead symbol.  */
 YYLTYPE yylloc;
 
 /* Location data for the look-ahead symbol.  */
 YYLTYPE yylloc;
 

-  register int yystate;
-  register int yyn;
+  int yystate;
+  int yyn;

   int yyresult;
   /* Number of tokens to shift before error messages enabled.  */
   int yyerrstatus;
   int yyresult;
   /* Number of tokens to shift before error messages enabled.  */
   int yyerrstatus;


@@ -1095,12 +1262,12 @@ YYLTYPE yylloc;
   /* The state stack.  */
   short int yyssa[YYINITDEPTH];
   short int *yyss = yyssa;
   /* The state stack.  */
   short int yyssa[YYINITDEPTH];
   short int *yyss = yyssa;

-  register short int *yyssp;
+  short int *yyssp;

 
   /* The semantic value stack.  */
   YYSTYPE yyvsa[YYINITDEPTH];
   YYSTYPE *yyvs = yyvsa;
 
   /* The semantic value stack.  */
   YYSTYPE yyvsa[YYINITDEPTH];
   YYSTYPE *yyvs = yyvsa;

-  register YYSTYPE *yyvsp;
+  YYSTYPE *yyvsp;

 
   /* The location stack.  */
   YYLTYPE yylsa[YYINITDEPTH];
 
   /* The location stack.  */
   YYLTYPE yylsa[YYINITDEPTH];


@@ -1145,7 +1312,7 @@ YYLTYPE yylloc;
 
 
   /* User initialization code. */
 
 
   /* User initialization code. */

-  #line 71 "../../src/parse-gram.y"
+#line 69 "parse-gram.y"

 {
   /* Bison's grammar can initial empty locations, hence a default
      location is needed. */
 {
   /* Bison's grammar can initial empty locations, hence a default
      location is needed. */


@@ -1153,11 +1320,9 @@ YYLTYPE yylloc;
   yylloc.start.line   = yylloc.end.line   = 1;
   yylloc.start.column = yylloc.end.column = 0;
 }
   yylloc.start.line   = yylloc.end.line   = 1;
   yylloc.start.column = yylloc.end.column = 0;
 }

-/* Line 848 of yacc.c.  */
-#line 1158 "../../src/parse-gram.c"
-  yyvsp[0] = yylval;
-    yylsp[0] = yylloc;
-
+/* Line 930 of yacc.c.  */
+#line 1325 "parse-gram.c"
+  yylsp[0] = yylloc;

   goto yysetstate;
 
 /*------------------------------------------------------------.
   goto yysetstate;
 
 /*------------------------------------------------------------.


@@ -1190,7 +1355,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.  */
           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),
                    &yyss1, yysize * sizeof (*yyssp),
                    &yyvs1, yysize * sizeof (*yyvsp),
                    &yyls1, yysize * sizeof (*yylsp),


@@ -1201,11 +1366,11 @@ YYLTYPE yylloc;
       }
 #else /* no yyoverflow */
 # ifndef YYSTACK_RELOCATE
       }
 #else /* no yyoverflow */
 # ifndef YYSTACK_RELOCATE

-      goto yyoverflowlab;
+      goto yyexhaustedlab;

 # else
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
 # else
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)

-       goto yyoverflowlab;
+       goto yyexhaustedlab;

       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)
        yystacksize = YYMAXDEPTH;
       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)
        yystacksize = YYMAXDEPTH;


@@ -1215,7 +1380,7 @@ YYLTYPE yylloc;
        union yyalloc *yyptr =
          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
        if (! yyptr)
        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);
        YYSTACK_RELOCATE (yyss);
        YYSTACK_RELOCATE (yyvs);
        YYSTACK_RELOCATE (yyls);


@@ -1345,47 +1510,47 @@ yyreduce:
   switch (yyn)
     {
         case 6:
   switch (yyn)
     {
         case 6:

-#line 189 "../../src/parse-gram.y"
-    { prologue_augment (yyvsp[0].chars, yylsp[0]); }
+#line 203 "parse-gram.y"
+    { prologue_augment ((yyvsp[0].chars), (yylsp[0])); }

     break;
 
   case 7:
     break;
 
   case 7:

-#line 190 "../../src/parse-gram.y"
+#line 204 "parse-gram.y"

     { debug_flag = true; }
     break;
 
   case 8:
     { debug_flag = true; }
     break;
 
   case 8:

-#line 191 "../../src/parse-gram.y"
-    { muscle_insert (yyvsp[-1].chars, yyvsp[0].chars); }
+#line 205 "parse-gram.y"
+    { muscle_insert ((yyvsp[-1].chars), (yyvsp[0].chars)); }

     break;
 
   case 9:
     break;
 
   case 9:

-#line 192 "../../src/parse-gram.y"
+#line 206 "parse-gram.y"

     { defines_flag = true; }
     break;
 
   case 10:
     { defines_flag = true; }
     break;
 
   case 10:

-#line 193 "../../src/parse-gram.y"
+#line 207 "parse-gram.y"

     { error_verbose = true; }
     break;
 
   case 11:
     { error_verbose = true; }
     break;
 
   case 11:

-#line 194 "../../src/parse-gram.y"
-    { expected_sr_conflicts = yyvsp[0].integer; }
+#line 208 "parse-gram.y"
+    { expected_sr_conflicts = (yyvsp[0].integer); }

     break;
 
   case 12:
     break;
 
   case 12:

-#line 195 "../../src/parse-gram.y"
-    { expected_rr_conflicts = yyvsp[0].integer; }
+#line 209 "parse-gram.y"
+    { expected_rr_conflicts = (yyvsp[0].integer); }

     break;
 
   case 13:
     break;
 
   case 13:

-#line 196 "../../src/parse-gram.y"
-    { spec_file_prefix = yyvsp[0].chars; }
+#line 210 "parse-gram.y"
+    { spec_file_prefix = (yyvsp[0].chars); }

     break;
 
   case 14:
     break;
 
   case 14:

-#line 198 "../../src/parse-gram.y"
+#line 212 "parse-gram.y"

     {
     nondeterministic_parser = true;
     glr_parser = true;
     {
     nondeterministic_parser = true;
     glr_parser = true;


@@ -1393,129 +1558,129 @@ yyreduce:
     break;
 
   case 15:
     break;
 
   case 15:

-#line 203 "../../src/parse-gram.y"
+#line 217 "parse-gram.y"

     {
     {

-    muscle_code_grow ("initial_action", yyvsp[0].chars, yylsp[0]);
+    muscle_code_grow ("initial_action", (yyvsp[0].chars), (yylsp[0]));

   }
     break;
 
   case 16:
   }
     break;
 
   case 16:

-#line 206 "../../src/parse-gram.y"
-    { add_param ("lex_param", yyvsp[0].chars, yylsp[0]); }
+#line 220 "parse-gram.y"
+    { add_param ("lex_param", (yyvsp[0].chars), (yylsp[0])); }

     break;
 
   case 17:
     break;
 
   case 17:

-#line 207 "../../src/parse-gram.y"
+#line 221 "parse-gram.y"

     { locations_flag = true; }
     break;
 
   case 18:
     { locations_flag = true; }
     break;
 
   case 18:

-#line 208 "../../src/parse-gram.y"
-    { spec_name_prefix = yyvsp[0].chars; }
+#line 222 "parse-gram.y"
+    { spec_name_prefix = (yyvsp[0].chars); }

     break;
 
   case 19:
     break;
 
   case 19:

-#line 209 "../../src/parse-gram.y"
+#line 223 "parse-gram.y"

     { no_lines_flag = true; }
     break;
 
   case 20:
     { no_lines_flag = true; }
     break;
 
   case 20:

-#line 210 "../../src/parse-gram.y"
+#line 224 "parse-gram.y"

     { nondeterministic_parser = true; }
     break;
 
   case 21:
     { nondeterministic_parser = true; }
     break;
 
   case 21:

-#line 211 "../../src/parse-gram.y"
-    { spec_outfile = yyvsp[0].chars; }
+#line 225 "parse-gram.y"
+    { spec_outfile = (yyvsp[0].chars); }

     break;
 
   case 22:
     break;
 
   case 22:

-#line 212 "../../src/parse-gram.y"
-    { add_param ("parse_param", yyvsp[0].chars, yylsp[0]); }
+#line 226 "parse-gram.y"
+    { add_param ("parse_param", (yyvsp[0].chars), (yylsp[0])); }

     break;
 
   case 23:
     break;
 
   case 23:

-#line 213 "../../src/parse-gram.y"
+#line 227 "parse-gram.y"

     { pure_parser = true; }
     break;
 
   case 24:
     { pure_parser = true; }
     break;
 
   case 24:

-#line 214 "../../src/parse-gram.y"
-    { skeleton = yyvsp[0].chars; }
+#line 228 "parse-gram.y"
+    { skeleton = (yyvsp[0].chars); }

     break;
 
   case 25:
     break;
 
   case 25:

-#line 215 "../../src/parse-gram.y"
+#line 229 "parse-gram.y"

     { token_table_flag = true; }
     break;
 
   case 26:
     { token_table_flag = true; }
     break;
 
   case 26:

-#line 216 "../../src/parse-gram.y"
+#line 230 "parse-gram.y"

     { report_flag = report_states; }
     break;
 
   case 27:
     { report_flag = report_states; }
     break;
 
   case 27:

-#line 217 "../../src/parse-gram.y"
+#line 231 "parse-gram.y"

     { yacc_flag = true; }
     break;
 
   case 31:
     { yacc_flag = true; }
     break;
 
   case 31:

-#line 225 "../../src/parse-gram.y"
+#line 239 "parse-gram.y"

     {
     {

-      grammar_start_symbol_set (yyvsp[0].symbol, yylsp[0]);
+      grammar_start_symbol_set ((yyvsp[0].symbol), (yylsp[0]));

     }
     break;
 
   case 32:
     }
     break;
 
   case 32:

-#line 229 "../../src/parse-gram.y"
+#line 243 "parse-gram.y"

     {
       typed = true;
     {
       typed = true;

-      MUSCLE_INSERT_INT ("stype_line", yylsp[0].start.line);
-      muscle_insert ("stype", yyvsp[0].chars);
+      MUSCLE_INSERT_INT ("stype_line", (yylsp[0]).start.line);
+      muscle_insert ("stype", (yyvsp[0].chars));

     }
     break;
 
   case 33:
     }
     break;
 
   case 33:

-#line 235 "../../src/parse-gram.y"
+#line 249 "parse-gram.y"

     {
       symbol_list *list;
     {
       symbol_list *list;

-      for (list = yyvsp[0].list; list; list = list->next)
-       symbol_destructor_set (list->sym, yyvsp[-1].chars, yylsp[-1]);
-      symbol_list_free (yyvsp[0].list);
+      for (list = (yyvsp[0].list); list; list = list->next)
+       symbol_destructor_set (list->sym, (yyvsp[-1].chars), (yylsp[-1]));
+      symbol_list_free ((yyvsp[0].list));

     }
     break;
 
   case 34:
     }
     break;
 
   case 34:

-#line 242 "../../src/parse-gram.y"
+#line 256 "parse-gram.y"

     {
       symbol_list *list;
     {
       symbol_list *list;

-      for (list = yyvsp[0].list; list; list = list->next)
-       symbol_printer_set (list->sym, yyvsp[-1].chars, list->location);
-      symbol_list_free (yyvsp[0].list);
+      for (list = (yyvsp[0].list); list; list = list->next)
+       symbol_printer_set (list->sym, (yyvsp[-1].chars), list->location);
+      symbol_list_free ((yyvsp[0].list));

     }
     break;
 
   case 35:
     }
     break;
 
   case 35:

-#line 249 "../../src/parse-gram.y"
+#line 263 "parse-gram.y"

     {
       default_prec = true;
     }
     break;
 
   case 36:
     {
       default_prec = true;
     }
     break;
 
   case 36:

-#line 253 "../../src/parse-gram.y"
+#line 267 "parse-gram.y"

     {
       default_prec = false;
     }
     break;
 
   case 37:
     {
       default_prec = false;
     }
     break;
 
   case 37:

-#line 259 "../../src/parse-gram.y"
+#line 273 "parse-gram.y"

     { current_class = nterm_sym; }
     break;
 
   case 38:
     { current_class = nterm_sym; }
     break;
 
   case 38:

-#line 260 "../../src/parse-gram.y"
+#line 274 "parse-gram.y"

     {
       current_class = unknown_sym;
       current_type = NULL;
     {
       current_class = unknown_sym;
       current_type = NULL;


@@ -1523,12 +1688,12 @@ yyreduce:
     break;
 
   case 39:
     break;
 
   case 39:

-#line 264 "../../src/parse-gram.y"
+#line 278 "parse-gram.y"

     { current_class = token_sym; }
     break;
 
   case 40:
     { current_class = token_sym; }
     break;
 
   case 40:

-#line 265 "../../src/parse-gram.y"
+#line 279 "parse-gram.y"

     {
       current_class = unknown_sym;
       current_type = NULL;
     {
       current_class = unknown_sym;
       current_type = NULL;


@@ -1536,212 +1701,210 @@ yyreduce:
     break;
 
   case 41:
     break;
 
   case 41:

-#line 270 "../../src/parse-gram.y"
+#line 284 "parse-gram.y"

     {
       symbol_list *list;
     {
       symbol_list *list;

-      for (list = yyvsp[0].list; list; list = list->next)
-       symbol_type_set (list->sym, yyvsp[-1].uniqstr, yylsp[-1]);
-      symbol_list_free (yyvsp[0].list);
+      for (list = (yyvsp[0].list); list; list = list->next)
+       symbol_type_set (list->sym, (yyvsp[-1].uniqstr), (yylsp[-1]));
+      symbol_list_free ((yyvsp[0].list));

     }
     break;
 
   case 42:
     }
     break;
 
   case 42:

-#line 280 "../../src/parse-gram.y"
+#line 294 "parse-gram.y"

     {
       symbol_list *list;
       ++current_prec;
     {
       symbol_list *list;
       ++current_prec;

-      for (list = yyvsp[0].list; list; list = list->next)
+      for (list = (yyvsp[0].list); list; list = list->next)

        {
        {

-         symbol_type_set (list->sym, current_type, yylsp[-1]);
-         symbol_precedence_set (list->sym, current_prec, yyvsp[-2].assoc, yylsp[-2]);
+         symbol_type_set (list->sym, current_type, (yylsp[-1]));
+         symbol_precedence_set (list->sym, current_prec, (yyvsp[-2].assoc), (yylsp[-2]));

        }
        }

-      symbol_list_free (yyvsp[0].list);
+      symbol_list_free ((yyvsp[0].list));

       current_type = NULL;
     }
     break;
 
   case 43:
       current_type = NULL;
     }
     break;
 
   case 43:

-#line 294 "../../src/parse-gram.y"
-    { yyval.assoc = left_assoc; }
+#line 308 "parse-gram.y"
+    { (yyval.assoc) = left_assoc; }

     break;
 
   case 44:
     break;
 
   case 44:

-#line 295 "../../src/parse-gram.y"
-    { yyval.assoc = right_assoc; }
+#line 309 "parse-gram.y"
+    { (yyval.assoc) = right_assoc; }

     break;
 
   case 45:
     break;
 
   case 45:

-#line 296 "../../src/parse-gram.y"
-    { yyval.assoc = non_assoc; }
+#line 310 "parse-gram.y"
+    { (yyval.assoc) = non_assoc; }

     break;
 
   case 46:
     break;
 
   case 46:

-#line 300 "../../src/parse-gram.y"
+#line 314 "parse-gram.y"

     { current_type = NULL; }
     break;
 
   case 47:
     { current_type = NULL; }
     break;
 
   case 47:

-#line 301 "../../src/parse-gram.y"
-    { current_type = yyvsp[0].uniqstr; }
+#line 315 "parse-gram.y"
+    { current_type = (yyvsp[0].uniqstr); }

     break;
 
   case 48:
     break;
 
   case 48:

-#line 307 "../../src/parse-gram.y"
-    { yyval.list = symbol_list_new (yyvsp[0].symbol, yylsp[0]); }
+#line 321 "parse-gram.y"
+    { (yyval.list) = symbol_list_new ((yyvsp[0].symbol), (yylsp[0])); }

     break;
 
   case 49:
     break;
 
   case 49:

-#line 308 "../../src/parse-gram.y"
-    { yyval.list = symbol_list_prepend (yyvsp[-1].list, yyvsp[0].symbol, yylsp[0]); }
+#line 322 "parse-gram.y"
+    { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].symbol), (yylsp[0])); }

     break;
 
   case 50:
     break;
 
   case 50:

-#line 314 "../../src/parse-gram.y"
+#line 328 "parse-gram.y"

     {
     {

-       current_type = yyvsp[0].uniqstr;
+       current_type = (yyvsp[0].uniqstr);

      }
     break;
 
   case 51:
      }
     break;
 
   case 51:

-#line 318 "../../src/parse-gram.y"
+#line 332 "parse-gram.y"

     {
     {

-       symbol_class_set (yyvsp[0].symbol, current_class, yylsp[0]);
-       symbol_type_set (yyvsp[0].symbol, current_type, yylsp[0]);
+       symbol_class_set ((yyvsp[0].symbol), current_class, (yylsp[0]));
+       symbol_type_set ((yyvsp[0].symbol), current_type, (yylsp[0]));

      }
     break;
 
   case 52:
      }
     break;
 
   case 52:

-#line 323 "../../src/parse-gram.y"
+#line 337 "parse-gram.y"

     {
     {

-      symbol_class_set (yyvsp[-1].symbol, current_class, yylsp[-1]);
-      symbol_type_set (yyvsp[-1].symbol, current_type, yylsp[-1]);
-      symbol_user_token_number_set (yyvsp[-1].symbol, yyvsp[0].integer, yylsp[0]);
+      symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1]));
+      symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1]));
+      symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0]));

     }
     break;
 
   case 53:
     }
     break;
 
   case 53:

-#line 329 "../../src/parse-gram.y"
+#line 343 "parse-gram.y"

     {
     {

-      symbol_class_set (yyvsp[-1].symbol, current_class, yylsp[-1]);
-      symbol_type_set (yyvsp[-1].symbol, current_type, yylsp[-1]);
-      symbol_make_alias (yyvsp[-1].symbol, yyvsp[0].symbol, yyloc);
+      symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1]));
+      symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1]));
+      symbol_make_alias ((yyvsp[-1].symbol), (yyvsp[0].symbol), (yyloc));

     }
     break;
 
   case 54:
     }
     break;
 
   case 54:

-#line 335 "../../src/parse-gram.y"
+#line 349 "parse-gram.y"

     {
     {

-      symbol_class_set (yyvsp[-2].symbol, current_class, yylsp[-2]);
-      symbol_type_set (yyvsp[-2].symbol, current_type, yylsp[-2]);
-      symbol_user_token_number_set (yyvsp[-2].symbol, yyvsp[-1].integer, yylsp[-1]);
-      symbol_make_alias (yyvsp[-2].symbol, yyvsp[0].symbol, yyloc);
+      symbol_class_set ((yyvsp[-2].symbol), current_class, (yylsp[-2]));
+      symbol_type_set ((yyvsp[-2].symbol), current_type, (yylsp[-2]));
+      symbol_user_token_number_set ((yyvsp[-2].symbol), (yyvsp[-1].integer), (yylsp[-1]));
+      symbol_make_alias ((yyvsp[-2].symbol), (yyvsp[0].symbol), (yyloc));

     }
     break;
 
   case 60:
     }
     break;
 
   case 60:

-#line 364 "../../src/parse-gram.y"
+#line 378 "parse-gram.y"

     {
       if (yacc_flag)
     {
       if (yacc_flag)

-       complain_at (yyloc, _("POSIX forbids declarations in the grammar"));
+       complain_at ((yyloc), _("POSIX forbids declarations in the grammar"));

     }
     break;
 
   case 61:
     }
     break;
 
   case 61:

-#line 369 "../../src/parse-gram.y"
+#line 383 "parse-gram.y"

     {
       yyerrok;
     }
     break;
 
   case 62:
     {
       yyerrok;
     }
     break;
 
   case 62:

-#line 375 "../../src/parse-gram.y"
-    { current_lhs = yyvsp[0].symbol; current_lhs_location = yylsp[0]; }
+#line 389 "parse-gram.y"
+    { current_lhs = (yyvsp[0].symbol); current_lhs_location = (yylsp[0]); }

     break;
 
   case 64:
     break;
 
   case 64:

-#line 379 "../../src/parse-gram.y"
-    { grammar_rule_end (yylsp[0]); }
+#line 393 "parse-gram.y"
+    { grammar_rule_end ((yylsp[0])); }

     break;
 
   case 65:
     break;
 
   case 65:

-#line 380 "../../src/parse-gram.y"
-    { grammar_rule_end (yylsp[0]); }
+#line 394 "parse-gram.y"
+    { grammar_rule_end ((yylsp[0])); }

     break;
 
   case 67:
     break;
 
   case 67:

-#line 386 "../../src/parse-gram.y"
+#line 400 "parse-gram.y"

     { grammar_rule_begin (current_lhs, current_lhs_location); }
     break;
 
   case 68:
     { grammar_rule_begin (current_lhs, current_lhs_location); }
     break;
 
   case 68:

-#line 388 "../../src/parse-gram.y"
-    { grammar_current_rule_symbol_append (yyvsp[0].symbol, yylsp[0]); }
+#line 402 "parse-gram.y"
+    { grammar_current_rule_symbol_append ((yyvsp[0].symbol), (yylsp[0])); }

     break;
 
   case 69:
     break;
 
   case 69:

-#line 390 "../../src/parse-gram.y"
-    { grammar_current_rule_action_append (yyvsp[0].chars, yylsp[0]); }
+#line 404 "parse-gram.y"
+    { grammar_current_rule_action_append ((yyvsp[0].chars), (yylsp[0])); }

     break;
 
   case 70:
     break;
 
   case 70:

-#line 392 "../../src/parse-gram.y"
-    { grammar_current_rule_prec_set (yyvsp[0].symbol, yylsp[0]); }
+#line 406 "parse-gram.y"
+    { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); }

     break;
 
   case 71:
     break;
 
   case 71:

-#line 394 "../../src/parse-gram.y"
-    { grammar_current_rule_dprec_set (yyvsp[0].integer, yylsp[0]); }
+#line 408 "parse-gram.y"
+    { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); }

     break;
 
   case 72:
     break;
 
   case 72:

-#line 396 "../../src/parse-gram.y"
-    { grammar_current_rule_merge_set (yyvsp[0].uniqstr, yylsp[0]); }
+#line 410 "parse-gram.y"
+    { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); }

     break;
 
   case 73:
     break;
 
   case 73:

-#line 400 "../../src/parse-gram.y"
-    { yyval.symbol = yyvsp[0].symbol; }
+#line 414 "parse-gram.y"
+    { (yyval.symbol) = (yyvsp[0].symbol); }

     break;
 
   case 74:
     break;
 
   case 74:

-#line 401 "../../src/parse-gram.y"
-    { yyval.symbol = yyvsp[0].symbol; }
+#line 415 "parse-gram.y"
+    { (yyval.symbol) = (yyvsp[0].symbol); }

     break;
 
   case 75:
     break;
 
   case 75:

-#line 406 "../../src/parse-gram.y"
-    { yyval.chars = yyvsp[0].chars; }
+#line 420 "parse-gram.y"
+    { (yyval.chars) = (yyvsp[0].chars); }

     break;
 
   case 76:
     break;
 
   case 76:

-#line 412 "../../src/parse-gram.y"
+#line 426 "parse-gram.y"

     {
     {

-      yyval.symbol = symbol_get (yyvsp[0].chars, yylsp[0]);
-      symbol_class_set (yyval.symbol, token_sym, yylsp[0]);
+      (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:
     }
     break;
 
   case 77:

-#line 421 "../../src/parse-gram.y"
-    {
-      yyval.chars = yyvsp[0].chars + 1;
-      yyval.chars[strlen (yyval.chars) - 1] = '\0';
-    }
+#line 435 "parse-gram.y"
+    { (yyval.chars) = (yyvsp[0].chars); }

     break;
 
   case 79:
     break;
 
   case 79:

-#line 430 "../../src/parse-gram.y"
+#line 442 "parse-gram.y"

     {
     {

-      muscle_code_grow ("epilogue", yyvsp[0].chars, yylsp[0]);
+      muscle_code_grow ("epilogue", (yyvsp[0].chars), (yylsp[0]));

       scanner_last_string_free ();
     }
     break;
 
 
       scanner_last_string_free ();
     }
     break;
 
 

+      default: break;

     }
 
     }
 

-/* Line 1043 of yacc.c.  */
-#line 1745 "../../src/parse-gram.c"
+/* Line 1126 of yacc.c.  */
+#line 1908 "parse-gram.c"

 \f
   yyvsp -= yylen;
   yyssp -= yylen;
 \f
   yyvsp -= yylen;
   yyssp -= yylen;


@@ -1780,12 +1943,36 @@ yyerrlab:
 
       if (YYPACT_NINF < yyn && yyn < YYLAST)
        {
 
       if (YYPACT_NINF < yyn && yyn < YYLAST)
        {

-         YYSIZE_T yysize = 0;

          int yytype = YYTRANSLATE (yychar);
          int yytype = YYTRANSLATE (yychar);

-         const char* yyprefix;
-         char *yymsg;
+         YYSIZE_T yysize0 = yytnamerr (0, 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;
 
          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;
          /* Start YYX at -YYN if negative to avoid negative indexes in
             YYCHECK.  */
          int yyxbegin = yyn < 0 ? -yyn : 0;


@@ -1793,48 +1980,68 @@ yyerrlab:
          /* Stay within bounds of both yycheck and yytname.  */
          int yychecklim = YYLAST - yyn;
          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
          /* Stay within bounds of both yycheck and yytname.  */
          int yychecklim = YYLAST - yyn;
          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;

-         int yycount = 0;
+         int yycount = 1;
+
+         yyarg[0] = yytname[yytype];
+         yyfmt = yystpcpy (yyformat, yyunexpected);

 
 

-         yyprefix = ", expecting ";

          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
              {
          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
              {

-               yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]);
-               yycount += 1;
-               if (yycount == 5)
+               if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)

                  {
                  {

-                   yysize = 0;
+                   yycount = 1;
+                   yysize = yysize0;
+                   yyformat[sizeof yyunexpected - 1] = '\0';

                    break;
                  }
                    break;
                  }

+               yyarg[yycount++] = yytname[yyx];
+               yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+               yysize_overflow |= yysize1 < yysize;
+               yysize = yysize1;
+               yyfmt = yystpcpy (yyfmt, yyprefix);
+               yyprefix = yyor;

              }
              }

-         yysize += (sizeof ("syntax error, unexpected ")
-                    + yystrlen (yytname[yytype]));
-         yymsg = (char *) YYSTACK_ALLOC (yysize);
-         if (yymsg != 0)
-           {
-             char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
-             yyp = yystpcpy (yyp, yytname[yytype]);

 
 

-             if (yycount < 5)
+         yyf = YY_(yyformat);
+         yysize1 = yysize + yystrlen (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))

                {
                {

-                 yyprefix = ", expecting ";
-                 for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-                   if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-                     {
-                       yyp = yystpcpy (yyp, yyprefix);
-                       yyp = yystpcpy (yyp, yytname[yyx]);
-                       yyprefix = " or ";
-                     }
+                 if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+                   {
+                     yyp += yytnamerr (yyp, yyarg[yyi++]);
+                     yyf += 2;
+                   }
+                 else
+                   {
+                     yyp++;
+                     yyf++;
+                   }

                }
              yyerror (yymsg);
              YYSTACK_FREE (yymsg);
            }
          else
                }
              yyerror (yymsg);
              YYSTACK_FREE (yymsg);
            }
          else

-           yyerror ("syntax error; also virtual memory exhausted");
+           {
+             yyerror (YY_("syntax error"));
+             goto yyexhaustedlab;
+           }

        }
       else
 #endif /* YYERROR_VERBOSE */
        }
       else
 #endif /* YYERROR_VERBOSE */

-       yyerror ("syntax error");
+       yyerror (YY_("syntax error"));

     }
 
   yyerror_range[0] = yylloc;
     }
 
   yyerror_range[0] = yylloc;


@@ -1846,18 +2053,9 @@ yyerrlab:
 
       if (yychar <= YYEOF)
         {
 
       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)
          if (yychar == YYEOF)

-            for (;;)
-              {
-                 yyerror_range[0] = *yylsp;
-                YYPOPSTACK;
-                if (yyssp == yyss)
-                  YYABORT;
-                yydestruct ("Error: popping",
-                             yystos[*yyssp], yyvsp, yylsp);
-              }
+           YYABORT;

         }
       else
        {
         }
       else
        {


@@ -1876,12 +2074,11 @@ yyerrlab:
 `---------------------------------------------------*/
 yyerrorlab:
 
 `---------------------------------------------------*/
 yyerrorlab:
 

-#ifdef __GNUC__
-  /* Pacify GCC when the user code never invokes YYERROR and the label
-     yyerrorlab therefore never appears in user code.  */
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */

   if (0)
      goto yyerrorlab;
   if (0)
      goto yyerrorlab;

-#endif

 
   yyerror_range[0] = yylsp[1-yylen];
   yylsp -= yylen;
 
   yyerror_range[0] = yylsp[1-yylen];
   yylsp -= yylen;


@@ -1951,23 +2148,29 @@ yyacceptlab:
 | yyabortlab -- YYABORT comes here.  |
 `-----------------------------------*/
 yyabortlab:
 | yyabortlab -- YYABORT comes here.  |
 `-----------------------------------*/
 yyabortlab:

-  yydestruct ("Error: discarding lookahead",
-              yytoken, &yylval, &yylloc);
-  yychar = YYEMPTY;

   yyresult = 1;
   goto yyreturn;
 
 #ifndef yyoverflow
   yyresult = 1;
   goto yyreturn;
 
 #ifndef yyoverflow

-/*----------------------------------------------.
-| yyoverflowlab -- parser overflow comes here.  |
-`----------------------------------------------*/
-yyoverflowlab:
-  yyerror ("parser stack overflow");
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+  yyerror (YY_("memory exhausted"));

   yyresult = 2;
   /* Fall through.  */
 #endif
 
 yyreturn:
   yyresult = 2;
   /* Fall through.  */
 #endif
 
 yyreturn:

+  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);
 #ifndef yyoverflow
   if (yyss != yyssa)
     YYSTACK_FREE (yyss);


@@ -1976,7 +2179,7 @@ yyreturn:
 }
 
 
 }
 
 

-#line 436 "../../src/parse-gram.y"
+#line 448 "parse-gram.y"

 
 
 
 
 
 


@@ -2024,7 +2227,8 @@ add_param (char const *type, char *decl, location loc)
   char const *name_start = NULL;
   char *p;
 
   char const *name_start = NULL;
   char *p;
 

-  for (p = decl; *p; p++)
+  /* Stop on last actual character.  */
+  for (p = decl; p[1]; p++)

     if ((p == decl
         || ! memchr (alphanum, p[-1], sizeof alphanum))
        && memchr (alphanum, p[0], sizeof alphanum - 10))
     if ((p == decl
         || ! memchr (alphanum, p[-1], sizeof alphanum))
        && memchr (alphanum, p[0], sizeof alphanum - 10))


@@ -2034,7 +2238,7 @@ add_param (char const *type, char *decl, location loc)
      the braces.  */
   while (*--p == ' ' || *p == '\t')
     continue;
      the braces.  */
   while (*--p == ' ' || *p == '\t')
     continue;

-  *p = '\0';
+  p[1] = '\0';

   while (*++decl == ' ' || *decl == '\t')
     continue;
 
   while (*++decl == ' ' || *decl == '\t')
     continue;
 


@@ -2060,49 +2264,6 @@ add_param (char const *type, char *decl, location loc)
   scanner_last_string_free ();
 }
 
   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)
 {
 static void
 gram_error (location const *loc, char const *msg)
 {


@@ -2112,6 +2273,6 @@ gram_error (location const *loc, char const *msg)
 char const *
 token_name (int type)
 {
 char const *
 token_name (int type)
 {

-  return yytname[type];
+  return yytname[YYTRANSLATE (type)];

 }
 
 }