X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/369342dd3a8f8cd9aa6be7df1721ed7879f6b8e9..74ce3cfbf611178310fa39f2c82500126bb18d85:/src/parse-gram.c

diff --git a/src/parse-gram.c b/src/parse-gram.c
index 62ae44cb..30e2a781 100644
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 2.6.5.977-6d58-dirty.  */
+/* A Bison parser, made by GNU Bison 2.7.1067-29fb-dirty.  */
 
 /* Bison implementation for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.6.5.977-6d58-dirty"
+#define YYBISON_VERSION "2.7.1067-29fb-dirty"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -65,18 +65,15 @@
 #define yyparse         gram_parse
 #define yylex           gram_lex
 #define yyerror         gram_error
-#define yylval          gram_lval
-#define yychar          gram_char
 #define yydebug         gram_debug
 #define yynerrs         gram_nerrs
-#define yylloc          gram_lloc
+
 
 /* Copy the first part of user declarations.  */
-/* Line 355 of yacc.c  */
-#line 1 "src/parse-gram.y"
+#line 1 "src/parse-gram.y" /* yacc.c:357  */
 /* Bison Grammar Parser                             -*- C -*-
 
-   Copyright (C) 2002-2012 Free Software Foundation, Inc.
+   Copyright (C) 2002-2013 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -116,7 +113,7 @@
 static YYLTYPE lloc_default (YYLTYPE const *, int);
 
 #define YY_LOCATION_PRINT(File, Loc) \
-          location_print (File, Loc)
+          location_print (Loc, File)
 
 static void version_check (location const *loc, char const *version);
 
@@ -129,8 +126,7 @@ static void gram_error (location const *, char const *);
 
 static char const *char_name (char);
 
-/* Line 355 of yacc.c  */
-#line 134 "src/parse-gram.c"
+#line 130 "src/parse-gram.c" /* yacc.c:357  */
 
 # ifndef YY_NULL
 #  if defined __cplusplus && 201103L <= __cplusplus
@@ -152,7 +148,7 @@ static char const *char_name (char);
    by #include "src/parse-gram.h".  */
 #ifndef YY_GRAM_SRC_PARSE_GRAM_H_INCLUDED
 # define YY_GRAM_SRC_PARSE_GRAM_H_INCLUDED
-/* Enabling traces.  */
+/* Debug traces.  */
 #ifndef GRAM_DEBUG
 # if defined YYDEBUG
 #if YYDEBUG
@@ -168,8 +164,7 @@ static char const *char_name (char);
 extern int gram_debug;
 #endif
 /* "%code requires" blocks.  */
-/* Line 371 of yacc.c  */
-#line 223 "src/parse-gram.y"
+#line 223 "src/parse-gram.y" /* yacc.c:373  */
 
 # ifndef PARAM_TYPE
 #  define PARAM_TYPE
@@ -183,14 +178,11 @@ extern int gram_debug;
 # endif
 
 
-/* Line 371 of yacc.c  */
-#line 188 "src/parse-gram.c"
+#line 182 "src/parse-gram.c" /* yacc.c:373  */
 
-/* Tokens.  */
+/* Token type.  */
 #ifndef GRAM_TOKENTYPE
 # define GRAM_TOKENTYPE
-  /* Put the tokens into the symbol table, so that GDB and other debuggers
-     know about them.  */
   enum gram_tokentype
   {
     GRAM_EOF = 0,
@@ -307,11 +299,12 @@ extern int gram_debug;
 #define PERCENT_PARAM 310
 #define PERCENT_UNION 311
 
+/* Value type.  */
 #if ! defined GRAM_STYPE && ! defined GRAM_STYPE_IS_DECLARED
-typedef union GRAM_STYPE
+typedef union GRAM_STYPE GRAM_STYPE;
+union GRAM_STYPE
 {
-/* Line 371 of yacc.c  */
-#line 109 "src/parse-gram.y"
+#line 109 "src/parse-gram.y" /* yacc.c:373  */
 
   assoc assoc;
   char *code;
@@ -323,46 +316,44 @@ typedef union GRAM_STYPE
   uniqstr uniqstr;
   unsigned char character;
 
-/* Line 371 of yacc.c  */
-#line 247 "src/parse-gram.y"
+#line 247 "src/parse-gram.y" /* yacc.c:373  */
 
   param_type param;
 
-/* Line 371 of yacc.c  */
-#line 423 "src/parse-gram.y"
+#line 423 "src/parse-gram.y" /* yacc.c:373  */
 code_props_type code_type;
 
-/* Line 371 of yacc.c  */
-#line 337 "src/parse-gram.c"
-} GRAM_STYPE;
+#line 327 "src/parse-gram.c" /* yacc.c:373  */
+};
 # define GRAM_STYPE_IS_TRIVIAL 1
 # define GRAM_STYPE_IS_DECLARED 1
 #endif
 
+/* Location type.  */
 #if ! defined GRAM_LTYPE && ! defined GRAM_LTYPE_IS_DECLARED
-typedef struct GRAM_LTYPE
+typedef struct GRAM_LTYPE GRAM_LTYPE;
+struct GRAM_LTYPE
 {
   int first_line;
   int first_column;
   int last_line;
   int last_column;
-} GRAM_LTYPE;
+};
 # define GRAM_LTYPE_IS_DECLARED 1
 # define GRAM_LTYPE_IS_TRIVIAL 1
 #endif
 
 
+
 int gram_parse (void);
 
 #endif /* !YY_GRAM_SRC_PARSE_GRAM_H_INCLUDED  */
 
 /* Copy the second part of user declarations.  */
 
-/* Line 374 of yacc.c  */
-#line 363 "src/parse-gram.c"
+#line 355 "src/parse-gram.c" /* yacc.c:376  */
 /* Unqualified %code blocks.  */
-/* Line 375 of yacc.c  */
-#line 58 "src/parse-gram.y"
+#line 58 "src/parse-gram.y" /* yacc.c:377  */
 
   static int current_prec = 0;
   static location current_lhs_location;
@@ -394,8 +385,7 @@ int gram_parse (void);
   #define YYTYPE_UINT16 uint_fast16_t
   #define YYTYPE_UINT8 uint_fast8_t
 
-/* Line 375 of yacc.c  */
-#line 236 "src/parse-gram.y"
+#line 236 "src/parse-gram.y" /* yacc.c:377  */
 
   /** Add a lex-param and/or a parse-param.
    *
@@ -407,8 +397,7 @@ int gram_parse (void);
   static param_type current_param = param_none;
 
 
-/* Line 375 of yacc.c  */
-#line 412 "src/parse-gram.c"
+#line 401 "src/parse-gram.c" /* yacc.c:377  */
 
 #ifdef short
 # undef short
@@ -640,7 +629,7 @@ static const yytype_uint8 yytranslate[] =
 };
 
 #if GRAM_DEBUG
-  /* YYRLINEYYN -- Source line where rule number YYN was defined.    */
+  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
        0,   272,   272,   280,   282,   286,   287,   297,   301,   306,
@@ -712,7 +701,7 @@ static const yytype_uint16 yytoknum[] =
   0
 
   /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-     STATE-NUM.    */
+     STATE-NUM.  */
 static const yytype_int16 yypact[] =
 {
      -74,    40,   101,   -74,   -74,   -74,   -48,   -74,   -74,   -74,
@@ -732,9 +721,9 @@ static const yytype_int16 yypact[] =
      -74,   -74,   -74
 };
 
-  /* YYDEFACT[S] -- default reduction number in state S.  Performed when
-     YYTABLE does not specify something else to do.  Zero means the default
-     is an error.    */
+  /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
+     Performed when YYTABLE does not specify something else to do.  Zero
+     means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
        3,     0,     0,     1,    47,    45,     0,    40,    41,    51,
@@ -754,7 +743,7 @@ static const yytype_uint8 yydefact[] =
       93,    89,    88
 };
 
-  /* YYPGOTO[NTERM-NUM].    */
+  /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
      -74,   -74,   -74,   -74,   -74,   -74,   140,   -74,   -74,   -74,
@@ -763,7 +752,7 @@ static const yytype_int16 yypgoto[] =
      -74,   -74,   -46,     6,   -74,   -32,   -73,   -74
 };
 
-  /* YYDEFGOTO[NTERM-NUM].    */
+  /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
       -1,     1,     2,    41,    79,   104,    74,    43,    81,    44,
@@ -772,9 +761,9 @@ static const yytype_int16 yydefgoto[] =
       55,    95,    52,    69,    78,   112,    71,   100
 };
 
-  /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
-     positive, shift that token.  If negative, reduce the rule which
-     number is the opposite.  If YYTABLE_NINF, syntax error.    */
+  /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
+     positive, shift that token.  If negative, reduce the rule whose
+     number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_int16 yytable[] =
 {
       70,  -108,    72,    53,    49,    92,     4,     5,     6,     7,
@@ -815,8 +804,8 @@ static const yytype_int16 yycheck[] =
       -1,    50,    51,    -1,    -1,    -1,    55,    56
 };
 
-  /* STOS_[STATE-NUM] -- The (internal number of the) accessing
-     symbol of state STATE-NUM.    */
+  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+     symbol of state STATE-NUM.  */
 static const yytype_uint8 yystos[] =
 {
        0,    58,    59,     0,     5,     6,     7,     8,     9,    10,
@@ -836,7 +825,7 @@ static const yytype_uint8 yystos[] =
       52,    86,    86
 };
 
-  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.    */
+  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint8 yyr1[] =
 {
        0,    57,    58,    59,    59,    60,    60,    60,    60,    60,
@@ -852,7 +841,7 @@ static const yytype_uint8 yyr1[] =
       88,    89,    90,    90,    91,    92,    92,    93,    94,    94
 };
 
-  /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.    */
+  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
 static const yytype_uint8 yyr2[] =
 {
        0,     2,     4,     0,     2,     1,     1,     1,     3,     1,
@@ -931,33 +920,6 @@ while (0)
 #define YYRHSLOC(Rhs, K) ((Rhs)[K])
 
 
-/* YY_LOCATION_PRINT -- Print the location on the stream.
-   This macro was not mandated originally: define only if we know
-   we won't break user code: when these are the locations we know.  */
-
-#ifndef YY_LOCATION_PRINT
-# if defined GRAM_LTYPE_IS_TRIVIAL && GRAM_LTYPE_IS_TRIVIAL
-#  define YY_LOCATION_PRINT(File, Loc)                                   \
-  do {                                                                   \
-    fprintf (File, "%d.%d", (Loc).first_line, (Loc).first_column);       \
-    if ((Loc).first_line < (Loc).last_line)                              \
-      fprintf (File, "-%d.%d", (Loc).last_line,  (Loc).last_column - 1); \
-    else if ((Loc).first_column < (Loc).last_column - 1)                 \
-      fprintf (File, "-%d", (Loc).last_column - 1);                      \
-  } while (0)
-# else
-#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-# endif
-#endif
-
-
-/* YYLEX -- calling `yylex' with the right arguments.  */
-#ifdef YYLEX_PARAM
-# define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM)
-#else
-# define YYLEX yylex (&yylval, &yylloc)
-#endif
-
 /* Enable debugging if requested.  */
 #if GRAM_DEBUG
 
@@ -972,6 +934,51 @@ do {                                            \
     YYFPRINTF Args;                             \
 } while (0)
 
+
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+   This macro was not mandated originally: define only if we know
+   we won't break user code: when these are the locations we know.  */
+
+#ifndef YY_LOCATION_PRINT
+# if defined GRAM_LTYPE_IS_TRIVIAL && GRAM_LTYPE_IS_TRIVIAL
+
+/* Print *YYLOCP on YYO.  Private, do not rely on its existence. */
+
+__attribute__((__unused__))
+static unsigned
+yy_location_print_ (FILE *yyo, YYLTYPE const * const yylocp)
+{
+  unsigned res = 0;
+  int end_col = 0 != yylocp->last_column ? yylocp->last_column - 1 : 0;
+  if (0 <= yylocp->first_line)
+    {
+      res += YYFPRINTF (yyo, "%d", yylocp->first_line);
+      if (0 <= yylocp->first_column)
+        res += YYFPRINTF (yyo, ".%d", yylocp->first_column);
+    }
+  if (0 <= yylocp->last_line)
+    {
+      if (yylocp->first_line < yylocp->last_line)
+        {
+          res += YYFPRINTF (yyo, "-%d", yylocp->last_line);
+          if (0 <= end_col)
+            res += YYFPRINTF (yyo, ".%d", end_col);
+        }
+      else if (0 <= end_col && yylocp->first_column < end_col)
+        res += YYFPRINTF (yyo, "-%d", end_col);
+    }
+  return res;
+ }
+
+#  define YY_LOCATION_PRINT(File, Loc)          \
+  yy_location_print_ (File, &(Loc))
+
+# else
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
+#endif
+
+
 # define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
 do {                                                                      \
   if (yydebug)                                                            \
@@ -992,7 +999,7 @@ static void
 yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp)
 {
   FILE *yyo = yyoutput;
-  YYUSE(yyo);
+  YYUSE (yyo);
   YYUSE (yylocationp);
   if (!yyvaluep)
     return;
@@ -1002,98 +1009,75 @@ yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvalue
 # endif
   switch (yytype)
     {
-            case 3: // "string"
-/* Line 711 of yacc.c  */
-#line 196 "src/parse-gram.y"
-        { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), yyo); }
-/* Line 711 of yacc.c  */
-#line 1011 "src/parse-gram.c"
+    case 3: /* "string"  */
+#line 196 "src/parse-gram.y" /* yacc.c:707  */
+      { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), yyo); }
+#line 1016 "src/parse-gram.c" /* yacc.c:707  */
         break;
 
-            case 4: // "integer"
-/* Line 711 of yacc.c  */
-#line 209 "src/parse-gram.y"
-        { fprintf (yyo, "%d", ((*yyvaluep).integer)); }
-/* Line 711 of yacc.c  */
-#line 1019 "src/parse-gram.c"
+    case 4: /* "integer"  */
+#line 209 "src/parse-gram.y" /* yacc.c:707  */
+      { fprintf (yyo, "%d", ((*yyvaluep).integer)); }
+#line 1022 "src/parse-gram.c" /* yacc.c:707  */
         break;
 
-            case 24: // "%<flag>"
-/* Line 711 of yacc.c  */
-#line 205 "src/parse-gram.y"
-        { fprintf (yyo, "%%%s", ((*yyvaluep).uniqstr)); }
-/* Line 711 of yacc.c  */
-#line 1027 "src/parse-gram.c"
+    case 24: /* "%<flag>"  */
+#line 205 "src/parse-gram.y" /* yacc.c:707  */
+      { fprintf (yyo, "%%%s", ((*yyvaluep).uniqstr)); }
+#line 1028 "src/parse-gram.c" /* yacc.c:707  */
         break;
 
-            case 40: // "{...}"
-/* Line 711 of yacc.c  */
-#line 198 "src/parse-gram.y"
-        { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).code)); }
-/* Line 711 of yacc.c  */
-#line 1035 "src/parse-gram.c"
+    case 40: /* "{...}"  */
+#line 198 "src/parse-gram.y" /* yacc.c:707  */
+      { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).code)); }
+#line 1034 "src/parse-gram.c" /* yacc.c:707  */
         break;
 
-            case 42: // "[identifier]"
-/* Line 711 of yacc.c  */
-#line 203 "src/parse-gram.y"
-        { fprintf (yyo, "[%s]", ((*yyvaluep).uniqstr)); }
-/* Line 711 of yacc.c  */
-#line 1043 "src/parse-gram.c"
+    case 42: /* "[identifier]"  */
+#line 203 "src/parse-gram.y" /* yacc.c:707  */
+      { fprintf (yyo, "[%s]", ((*yyvaluep).uniqstr)); }
+#line 1040 "src/parse-gram.c" /* yacc.c:707  */
         break;
 
-            case 43: // "char"
-/* Line 711 of yacc.c  */
-#line 190 "src/parse-gram.y"
-        { fputs (char_name (((*yyvaluep).character)), yyo); }
-/* Line 711 of yacc.c  */
-#line 1051 "src/parse-gram.c"
+    case 43: /* "char"  */
+#line 190 "src/parse-gram.y" /* yacc.c:707  */
+      { fputs (char_name (((*yyvaluep).character)), yyo); }
+#line 1046 "src/parse-gram.c" /* yacc.c:707  */
         break;
 
-            case 44: // "epilogue"
-/* Line 711 of yacc.c  */
-#line 198 "src/parse-gram.y"
-        { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); }
-/* Line 711 of yacc.c  */
-#line 1059 "src/parse-gram.c"
+    case 44: /* "epilogue"  */
+#line 198 "src/parse-gram.y" /* yacc.c:707  */
+      { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); }
+#line 1052 "src/parse-gram.c" /* yacc.c:707  */
         break;
 
-            case 46: // "identifier"
-/* Line 711 of yacc.c  */
-#line 202 "src/parse-gram.y"
-        { fputs (((*yyvaluep).uniqstr), yyo); }
-/* Line 711 of yacc.c  */
-#line 1067 "src/parse-gram.c"
+    case 46: /* "identifier"  */
+#line 202 "src/parse-gram.y" /* yacc.c:707  */
+      { fputs (((*yyvaluep).uniqstr), yyo); }
+#line 1058 "src/parse-gram.c" /* yacc.c:707  */
         break;
 
-            case 47: // "identifier:"
-/* Line 711 of yacc.c  */
-#line 204 "src/parse-gram.y"
-        { fprintf (yyo, "%s:", ((*yyvaluep).uniqstr)); }
-/* Line 711 of yacc.c  */
-#line 1075 "src/parse-gram.c"
+    case 47: /* "identifier:"  */
+#line 204 "src/parse-gram.y" /* yacc.c:707  */
+      { fprintf (yyo, "%s:", ((*yyvaluep).uniqstr)); }
+#line 1064 "src/parse-gram.c" /* yacc.c:707  */
         break;
 
-            case 50: // "%{...%}"
-/* Line 711 of yacc.c  */
-#line 198 "src/parse-gram.y"
-        { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); }
-/* Line 711 of yacc.c  */
-#line 1083 "src/parse-gram.c"
+    case 50: /* "%{...%}"  */
+#line 198 "src/parse-gram.y" /* yacc.c:707  */
+      { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); }
+#line 1070 "src/parse-gram.c" /* yacc.c:707  */
         break;
 
-            case 52: // "<tag>"
-/* Line 711 of yacc.c  */
-#line 206 "src/parse-gram.y"
-        { fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); }
-/* Line 711 of yacc.c  */
-#line 1091 "src/parse-gram.c"
+    case 52: /* "<tag>"  */
+#line 206 "src/parse-gram.y" /* yacc.c:707  */
+      { fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); }
+#line 1076 "src/parse-gram.c" /* yacc.c:707  */
         break;
 
-            case 55: // "%param"
-/* Line 711 of yacc.c  */
-#line 252 "src/parse-gram.y"
-        {
+    case 55: /* "%param"  */
+#line 252 "src/parse-gram.y" /* yacc.c:707  */
+      {
   switch (((*yyvaluep).param))
     {
 #define CASE(In, Out)                                           \
@@ -1105,88 +1089,67 @@ yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvalue
       case param_none: aver (false); break;
     }
 }
-/* Line 711 of yacc.c  */
-#line 1110 "src/parse-gram.c"
+#line 1093 "src/parse-gram.c" /* yacc.c:707  */
         break;
 
-            case 64: // code_props_type
-/* Line 711 of yacc.c  */
-#line 424 "src/parse-gram.y"
-        { fprintf (yyo, "%s", code_props_type_string (((*yyvaluep).code_type))); }
-/* Line 711 of yacc.c  */
-#line 1118 "src/parse-gram.c"
+    case 64: /* code_props_type  */
+#line 424 "src/parse-gram.y" /* yacc.c:707  */
+      { fprintf (yyo, "%s", code_props_type_string (((*yyvaluep).code_type))); }
+#line 1099 "src/parse-gram.c" /* yacc.c:707  */
         break;
 
-            case 73: // symbol.prec
-/* Line 711 of yacc.c  */
-#line 212 "src/parse-gram.y"
-        { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
-/* Line 711 of yacc.c  */
-#line 1126 "src/parse-gram.c"
+    case 73: /* symbol.prec  */
+#line 212 "src/parse-gram.y" /* yacc.c:707  */
+      { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
+#line 1105 "src/parse-gram.c" /* yacc.c:707  */
         break;
 
-            case 77: // tag
-/* Line 711 of yacc.c  */
-#line 206 "src/parse-gram.y"
-        { fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); }
-/* Line 711 of yacc.c  */
-#line 1134 "src/parse-gram.c"
+    case 77: /* tag  */
+#line 206 "src/parse-gram.y" /* yacc.c:707  */
+      { fprintf (yyo, "<%s>", ((*yyvaluep).uniqstr)); }
+#line 1111 "src/parse-gram.c" /* yacc.c:707  */
         break;
 
-            case 87: // variable
-/* Line 711 of yacc.c  */
-#line 202 "src/parse-gram.y"
-        { fputs (((*yyvaluep).uniqstr), yyo); }
-/* Line 711 of yacc.c  */
-#line 1142 "src/parse-gram.c"
+    case 87: /* variable  */
+#line 202 "src/parse-gram.y" /* yacc.c:707  */
+      { fputs (((*yyvaluep).uniqstr), yyo); }
+#line 1117 "src/parse-gram.c" /* yacc.c:707  */
         break;
 
-            case 88: // content.opt
-/* Line 711 of yacc.c  */
-#line 198 "src/parse-gram.y"
-        { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); }
-/* Line 711 of yacc.c  */
-#line 1150 "src/parse-gram.c"
+    case 88: /* content.opt  */
+#line 198 "src/parse-gram.y" /* yacc.c:707  */
+      { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); }
+#line 1123 "src/parse-gram.c" /* yacc.c:707  */
         break;
 
-            case 89: // braceless
-/* Line 711 of yacc.c  */
-#line 198 "src/parse-gram.y"
-        { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); }
-/* Line 711 of yacc.c  */
-#line 1158 "src/parse-gram.c"
+    case 89: /* braceless  */
+#line 198 "src/parse-gram.y" /* yacc.c:707  */
+      { fprintf (yyo, "{\n%s\n}", ((*yyvaluep).chars)); }
+#line 1129 "src/parse-gram.c" /* yacc.c:707  */
         break;
 
-            case 90: // id
-/* Line 711 of yacc.c  */
-#line 212 "src/parse-gram.y"
-        { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
-/* Line 711 of yacc.c  */
-#line 1166 "src/parse-gram.c"
+    case 90: /* id  */
+#line 212 "src/parse-gram.y" /* yacc.c:707  */
+      { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
+#line 1135 "src/parse-gram.c" /* yacc.c:707  */
         break;
 
-            case 91: // id_colon
-/* Line 711 of yacc.c  */
-#line 213 "src/parse-gram.y"
-        { fprintf (yyo, "%s:", ((*yyvaluep).symbol)->tag); }
-/* Line 711 of yacc.c  */
-#line 1174 "src/parse-gram.c"
+    case 91: /* id_colon  */
+#line 213 "src/parse-gram.y" /* yacc.c:707  */
+      { fprintf (yyo, "%s:", ((*yyvaluep).symbol)->tag); }
+#line 1141 "src/parse-gram.c" /* yacc.c:707  */
         break;
 
-            case 92: // symbol
-/* Line 711 of yacc.c  */
-#line 212 "src/parse-gram.y"
-        { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
-/* Line 711 of yacc.c  */
-#line 1182 "src/parse-gram.c"
+    case 92: /* symbol  */
+#line 212 "src/parse-gram.y" /* yacc.c:707  */
+      { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
+#line 1147 "src/parse-gram.c" /* yacc.c:707  */
         break;
 
-            case 93: // string_as_id
-/* Line 711 of yacc.c  */
-#line 212 "src/parse-gram.y"
-        { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
-/* Line 711 of yacc.c  */
-#line 1190 "src/parse-gram.c"
+    case 93: /* string_as_id  */
+#line 212 "src/parse-gram.y" /* yacc.c:707  */
+      { fprintf (yyo, "%s", ((*yyvaluep).symbol)->tag); }
+#line 1153 "src/parse-gram.c" /* yacc.c:707  */
         break;
 
       default:
@@ -1202,10 +1165,8 @@ yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvalue
 static void
 yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp)
 {
-  if (yytype < YYNTOKENS)
-    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-  else
-    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+  YYFPRINTF (yyoutput, "%s %s (",
+             yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
 
   YY_LOCATION_PRINT (yyoutput, *yylocationp);
   YYFPRINTF (yyoutput, ": ");
@@ -1631,7 +1592,6 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
 {
   YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]);
   YYSIZE_T yysize = yysize0;
-  YYSIZE_T yysize1;
   enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
   /* Internationalized format string. */
   const char *yyformat = YY_NULL;
@@ -1688,11 +1648,13 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
                     break;
                   }
                 yyarg[yycount++] = yytname[yyx];
-                yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]);
-                if (! (yysize <= yysize1
-                       && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-                  return 2;
-                yysize = yysize1;
+                {
+                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]);
+                  if (! (yysize <= yysize1
+                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+                    return 2;
+                  yysize = yysize1;
+                }
               }
         }
 # if GRAM_DEBUG
@@ -1716,10 +1678,12 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
 # undef YYCASE_
     }
 
-  yysize1 = yysize + yystrlen (yyformat);
-  if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-    return 2;
-  yysize = yysize1;
+  {
+    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
+    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+      return 2;
+    yysize = yysize1;
+  }
 
   if (*yymsg_alloc < yysize)
     {
@@ -1759,7 +1723,7 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
 static void
 yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp)
 {
-  YYUSE(yyvaluep);
+  YYUSE (yyvaluep);
   YYUSE (yylocationp);
   if (!yymsg)
     yymsg = "Deleting";
@@ -1800,6 +1764,11 @@ int yychar;
 static YYSTYPE yyval_default;
 # define YY_INITIAL_VALUE(Value) = Value
 #endif
+static YYLTYPE yyloc_default
+# if defined GRAM_LTYPE_IS_TRIVIAL && GRAM_LTYPE_IS_TRIVIAL
+  = { 1, 1, 1, 1 }
+# endif
+;
 #ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
 # define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
 # define YY_IGNORE_MAYBE_UNINITIALIZED_END
@@ -1812,11 +1781,7 @@ static YYSTYPE yyval_default;
 YYSTYPE yylval YY_INITIAL_VALUE(yyval_default);
 
 /* Location data for the lookahead symbol.  */
-YYLTYPE yylloc
-# if defined GRAM_LTYPE_IS_TRIVIAL && GRAM_LTYPE_IS_TRIVIAL
-  = { 1, 1, 1, 1 }
-# endif
-;
+YYLTYPE yylloc = yyloc_default;
 
 
     /* Number of syntax errors so far.  */
@@ -1899,16 +1864,14 @@ YYLTYPE yylloc
   yychar = YYEMPTY; /* Cause a token to be read.  */
 
 /* User initialization code.  */
-/* Line 1452 of yacc.c  */
-#line 101 "src/parse-gram.y"
+#line 101 "src/parse-gram.y" /* yacc.c:1452  */
 {
   /* Bison's grammar can initial empty locations, hence a default
      location is needed. */
   boundary_set (&yylloc.start, current_file, 1, 1);
   boundary_set (&yylloc.end, current_file, 1, 1);
 }
-/* Line 1452 of yacc.c  */
-#line 1912 "src/parse-gram.c"
+#line 1875 "src/parse-gram.c" /* yacc.c:1452  */
   yylsp[0] = yylloc;
   goto yysetstate;
 
@@ -2015,7 +1978,7 @@ yybackup:
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
-      yychar = YYLEX;
+      yychar = yylex (&yylval, &yylloc);
     }
 
   if (yychar <= YYEOF)
@@ -2102,8 +2065,7 @@ yyreduce:
     switch (yyn)
       {
           case 6:
-/* Line 1670 of yacc.c  */
-#line 288 "src/parse-gram.y"
+#line 288 "src/parse-gram.y" /* yacc.c:1669  */
     {
       code_props plain_code;
       code_props_plain_init (&plain_code, (yyvsp[0].chars), (yylsp[0]));
@@ -2113,99 +2075,79 @@ yyreduce:
                         plain_code.code, (yylsp[0]));
       code_scanner_last_string_free ();
     }
-/* Line 1670 of yacc.c  */
-#line 2118 "src/parse-gram.c"
+#line 2079 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 7:
-/* Line 1670 of yacc.c  */
-#line 298 "src/parse-gram.y"
+#line 298 "src/parse-gram.y" /* yacc.c:1669  */
     {
       muscle_percent_define_ensure ((yyvsp[0].uniqstr), (yylsp[0]), true);
     }
-/* Line 1670 of yacc.c  */
-#line 2128 "src/parse-gram.c"
+#line 2087 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 8:
-/* Line 1670 of yacc.c  */
-#line 302 "src/parse-gram.y"
+#line 302 "src/parse-gram.y" /* yacc.c:1669  */
     {
       muscle_percent_define_insert ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars),
                                     MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
     }
-/* Line 1670 of yacc.c  */
-#line 2139 "src/parse-gram.c"
+#line 2096 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 9:
-/* Line 1670 of yacc.c  */
-#line 306 "src/parse-gram.y"
+#line 306 "src/parse-gram.y" /* yacc.c:1669  */
     { defines_flag = true; }
-/* Line 1670 of yacc.c  */
-#line 2147 "src/parse-gram.c"
+#line 2102 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 10:
-/* Line 1670 of yacc.c  */
-#line 308 "src/parse-gram.y"
+#line 308 "src/parse-gram.y" /* yacc.c:1669  */
     {
       defines_flag = true;
       spec_defines_file = xstrdup ((yyvsp[0].chars));
     }
-/* Line 1670 of yacc.c  */
-#line 2158 "src/parse-gram.c"
+#line 2111 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 11:
-/* Line 1670 of yacc.c  */
-#line 313 "src/parse-gram.y"
+#line 313 "src/parse-gram.y" /* yacc.c:1669  */
     {
       muscle_percent_define_insert ("parse.error", (yylsp[0]), "verbose",
                                     MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
     }
-/* Line 1670 of yacc.c  */
-#line 2169 "src/parse-gram.c"
+#line 2120 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 12:
-/* Line 1670 of yacc.c  */
-#line 317 "src/parse-gram.y"
+#line 317 "src/parse-gram.y" /* yacc.c:1669  */
     { expected_sr_conflicts = (yyvsp[0].integer); }
-/* Line 1670 of yacc.c  */
-#line 2177 "src/parse-gram.c"
+#line 2126 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 13:
-/* Line 1670 of yacc.c  */
-#line 318 "src/parse-gram.y"
+#line 318 "src/parse-gram.y" /* yacc.c:1669  */
     { expected_rr_conflicts = (yyvsp[0].integer); }
-/* Line 1670 of yacc.c  */
-#line 2185 "src/parse-gram.c"
+#line 2132 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 14:
-/* Line 1670 of yacc.c  */
-#line 319 "src/parse-gram.y"
+#line 319 "src/parse-gram.y" /* yacc.c:1669  */
     { spec_file_prefix = (yyvsp[0].chars); }
-/* Line 1670 of yacc.c  */
-#line 2193 "src/parse-gram.c"
+#line 2138 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 15:
-/* Line 1670 of yacc.c  */
-#line 321 "src/parse-gram.y"
+#line 321 "src/parse-gram.y" /* yacc.c:1669  */
     {
       nondeterministic_parser = true;
       glr_parser = true;
     }
-/* Line 1670 of yacc.c  */
-#line 2204 "src/parse-gram.c"
+#line 2147 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 16:
-/* Line 1670 of yacc.c  */
-#line 326 "src/parse-gram.y"
+#line 326 "src/parse-gram.y" /* yacc.c:1669  */
     {
       code_props action;
       code_props_symbol_action_init (&action, (yyvsp[0].code), (yylsp[0]));
@@ -2214,77 +2156,59 @@ yyreduce:
       muscle_code_grow ("initial_action", action.code, (yylsp[0]));
       code_scanner_last_string_free ();
     }
-/* Line 1670 of yacc.c  */
-#line 2219 "src/parse-gram.c"
+#line 2160 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 17:
-/* Line 1670 of yacc.c  */
-#line 334 "src/parse-gram.y"
+#line 334 "src/parse-gram.y" /* yacc.c:1669  */
     { language_argmatch ((yyvsp[0].chars), grammar_prio, (yylsp[-1])); }
-/* Line 1670 of yacc.c  */
-#line 2227 "src/parse-gram.c"
+#line 2166 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 18:
-/* Line 1670 of yacc.c  */
-#line 335 "src/parse-gram.y"
+#line 335 "src/parse-gram.y" /* yacc.c:1669  */
     { spec_name_prefix = (yyvsp[0].chars); }
-/* Line 1670 of yacc.c  */
-#line 2235 "src/parse-gram.c"
+#line 2172 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 19:
-/* Line 1670 of yacc.c  */
-#line 336 "src/parse-gram.y"
+#line 336 "src/parse-gram.y" /* yacc.c:1669  */
     { no_lines_flag = true; }
-/* Line 1670 of yacc.c  */
-#line 2243 "src/parse-gram.c"
+#line 2178 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 20:
-/* Line 1670 of yacc.c  */
-#line 337 "src/parse-gram.y"
+#line 337 "src/parse-gram.y" /* yacc.c:1669  */
     { nondeterministic_parser = true; }
-/* Line 1670 of yacc.c  */
-#line 2251 "src/parse-gram.c"
+#line 2184 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 21:
-/* Line 1670 of yacc.c  */
-#line 338 "src/parse-gram.y"
+#line 338 "src/parse-gram.y" /* yacc.c:1669  */
     { spec_outfile = (yyvsp[0].chars); }
-/* Line 1670 of yacc.c  */
-#line 2259 "src/parse-gram.c"
+#line 2190 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 22:
-/* Line 1670 of yacc.c  */
-#line 339 "src/parse-gram.y"
+#line 339 "src/parse-gram.y" /* yacc.c:1669  */
     { current_param = (yyvsp[0].param); }
-/* Line 1670 of yacc.c  */
-#line 2267 "src/parse-gram.c"
+#line 2196 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 23:
-/* Line 1670 of yacc.c  */
-#line 339 "src/parse-gram.y"
+#line 339 "src/parse-gram.y" /* yacc.c:1669  */
     { current_param = param_none; }
-/* Line 1670 of yacc.c  */
-#line 2275 "src/parse-gram.c"
+#line 2202 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 24:
-/* Line 1670 of yacc.c  */
-#line 340 "src/parse-gram.y"
+#line 340 "src/parse-gram.y" /* yacc.c:1669  */
     { version_check (&(yylsp[0]), (yyvsp[0].chars)); }
-/* Line 1670 of yacc.c  */
-#line 2283 "src/parse-gram.c"
+#line 2208 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 25:
-/* Line 1670 of yacc.c  */
-#line 342 "src/parse-gram.y"
+#line 342 "src/parse-gram.y" /* yacc.c:1669  */
     {
       char const *skeleton_user = (yyvsp[0].chars);
       if (strchr (skeleton_user, '/'))
@@ -2308,63 +2232,49 @@ yyreduce:
         }
       skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1]));
     }
-/* Line 1670 of yacc.c  */
-#line 2313 "src/parse-gram.c"
+#line 2236 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 26:
-/* Line 1670 of yacc.c  */
-#line 365 "src/parse-gram.y"
+#line 365 "src/parse-gram.y" /* yacc.c:1669  */
     { token_table_flag = true; }
-/* Line 1670 of yacc.c  */
-#line 2321 "src/parse-gram.c"
+#line 2242 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 27:
-/* Line 1670 of yacc.c  */
-#line 366 "src/parse-gram.y"
+#line 366 "src/parse-gram.y" /* yacc.c:1669  */
     { report_flag |= report_states; }
-/* Line 1670 of yacc.c  */
-#line 2329 "src/parse-gram.c"
+#line 2248 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 28:
-/* Line 1670 of yacc.c  */
-#line 367 "src/parse-gram.y"
+#line 367 "src/parse-gram.y" /* yacc.c:1669  */
     { yacc_flag = true; }
-/* Line 1670 of yacc.c  */
-#line 2337 "src/parse-gram.c"
+#line 2254 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 30:
-/* Line 1670 of yacc.c  */
-#line 372 "src/parse-gram.y"
+#line 372 "src/parse-gram.y" /* yacc.c:1669  */
     { add_param (current_param, (yyvsp[0].code), (yylsp[0])); }
-/* Line 1670 of yacc.c  */
-#line 2345 "src/parse-gram.c"
+#line 2260 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 31:
-/* Line 1670 of yacc.c  */
-#line 373 "src/parse-gram.y"
+#line 373 "src/parse-gram.y" /* yacc.c:1669  */
     { add_param (current_param, (yyvsp[0].code), (yylsp[0])); }
-/* Line 1670 of yacc.c  */
-#line 2353 "src/parse-gram.c"
+#line 2266 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 34:
-/* Line 1670 of yacc.c  */
-#line 385 "src/parse-gram.y"
+#line 385 "src/parse-gram.y" /* yacc.c:1669  */
     {
       grammar_start_symbol_set ((yyvsp[0].symbol), (yylsp[0]));
     }
-/* Line 1670 of yacc.c  */
-#line 2363 "src/parse-gram.c"
+#line 2274 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 35:
-/* Line 1670 of yacc.c  */
-#line 389 "src/parse-gram.y"
+#line 389 "src/parse-gram.y" /* yacc.c:1669  */
     {
       code_props code;
       code_props_symbol_action_init (&code, (yyvsp[-1].code), (yylsp[-1]));
@@ -2376,139 +2286,111 @@ yyreduce:
         symbol_list_free ((yyvsp[0].list));
       }
     }
-/* Line 1670 of yacc.c  */
-#line 2381 "src/parse-gram.c"
+#line 2290 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 36:
-/* Line 1670 of yacc.c  */
-#line 401 "src/parse-gram.y"
+#line 401 "src/parse-gram.y" /* yacc.c:1669  */
     {
       default_prec = true;
     }
-/* Line 1670 of yacc.c  */
-#line 2391 "src/parse-gram.c"
+#line 2298 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 37:
-/* Line 1670 of yacc.c  */
-#line 405 "src/parse-gram.y"
+#line 405 "src/parse-gram.y" /* yacc.c:1669  */
     {
       default_prec = false;
     }
-/* Line 1670 of yacc.c  */
-#line 2401 "src/parse-gram.c"
+#line 2306 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 38:
-/* Line 1670 of yacc.c  */
-#line 409 "src/parse-gram.y"
+#line 409 "src/parse-gram.y" /* yacc.c:1669  */
     {
       /* Do not invoke muscle_percent_code_grow here since it invokes
          muscle_user_name_list_grow.  */
       muscle_code_grow ("percent_code()", (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }
-/* Line 1670 of yacc.c  */
-#line 2414 "src/parse-gram.c"
+#line 2317 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 39:
-/* Line 1670 of yacc.c  */
-#line 416 "src/parse-gram.y"
+#line 416 "src/parse-gram.y" /* yacc.c:1669  */
     {
       muscle_percent_code_grow ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }
-/* Line 1670 of yacc.c  */
-#line 2425 "src/parse-gram.c"
+#line 2326 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 40:
-/* Line 1670 of yacc.c  */
-#line 426 "src/parse-gram.y"
+#line 426 "src/parse-gram.y" /* yacc.c:1669  */
     { (yyval.code_type) = destructor; }
-/* Line 1670 of yacc.c  */
-#line 2433 "src/parse-gram.c"
+#line 2332 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 41:
-/* Line 1670 of yacc.c  */
-#line 427 "src/parse-gram.y"
+#line 427 "src/parse-gram.y" /* yacc.c:1669  */
     { (yyval.code_type) = printer; }
-/* Line 1670 of yacc.c  */
-#line 2441 "src/parse-gram.c"
+#line 2338 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 42:
-/* Line 1670 of yacc.c  */
-#line 437 "src/parse-gram.y"
+#line 437 "src/parse-gram.y" /* yacc.c:1669  */
     {}
-/* Line 1670 of yacc.c  */
-#line 2449 "src/parse-gram.c"
+#line 2344 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 43:
-/* Line 1670 of yacc.c  */
-#line 438 "src/parse-gram.y"
+#line 438 "src/parse-gram.y" /* yacc.c:1669  */
     { muscle_code_grow ("union_name", (yyvsp[0].uniqstr), (yylsp[0])); }
-/* Line 1670 of yacc.c  */
-#line 2457 "src/parse-gram.c"
+#line 2350 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 44:
-/* Line 1670 of yacc.c  */
-#line 443 "src/parse-gram.y"
+#line 443 "src/parse-gram.y" /* yacc.c:1669  */
     {
       union_seen = true;
       muscle_code_grow ("stype", (yyvsp[0].chars), (yylsp[0]));
       code_scanner_last_string_free ();
     }
-/* Line 1670 of yacc.c  */
-#line 2469 "src/parse-gram.c"
+#line 2360 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 45:
-/* Line 1670 of yacc.c  */
-#line 454 "src/parse-gram.y"
+#line 454 "src/parse-gram.y" /* yacc.c:1669  */
     { current_class = nterm_sym; }
-/* Line 1670 of yacc.c  */
-#line 2477 "src/parse-gram.c"
+#line 2366 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 46:
-/* Line 1670 of yacc.c  */
-#line 455 "src/parse-gram.y"
+#line 455 "src/parse-gram.y" /* yacc.c:1669  */
     {
       current_class = unknown_sym;
       current_type = NULL;
     }
-/* Line 1670 of yacc.c  */
-#line 2488 "src/parse-gram.c"
+#line 2375 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 47:
-/* Line 1670 of yacc.c  */
-#line 459 "src/parse-gram.y"
+#line 459 "src/parse-gram.y" /* yacc.c:1669  */
     { current_class = token_sym; }
-/* Line 1670 of yacc.c  */
-#line 2496 "src/parse-gram.c"
+#line 2381 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 48:
-/* Line 1670 of yacc.c  */
-#line 460 "src/parse-gram.y"
+#line 460 "src/parse-gram.y" /* yacc.c:1669  */
     {
       current_class = unknown_sym;
       current_type = NULL;
     }
-/* Line 1670 of yacc.c  */
-#line 2507 "src/parse-gram.c"
+#line 2390 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 49:
-/* Line 1670 of yacc.c  */
-#line 465 "src/parse-gram.y"
+#line 465 "src/parse-gram.y" /* yacc.c:1669  */
     {
       symbol_list *list;
       tag_seen = true;
@@ -2516,13 +2398,11 @@ yyreduce:
         symbol_type_set (list->content.sym, (yyvsp[-1].uniqstr), (yylsp[-1]));
       symbol_list_free ((yyvsp[0].list));
     }
-/* Line 1670 of yacc.c  */
-#line 2521 "src/parse-gram.c"
+#line 2402 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 50:
-/* Line 1670 of yacc.c  */
-#line 476 "src/parse-gram.y"
+#line 476 "src/parse-gram.y" /* yacc.c:1669  */
     {
       symbol_list *list;
       ++current_prec;
@@ -2534,358 +2414,276 @@ yyreduce:
       symbol_list_free ((yyvsp[0].list));
       current_type = NULL;
     }
-/* Line 1670 of yacc.c  */
-#line 2539 "src/parse-gram.c"
+#line 2418 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 51:
-/* Line 1670 of yacc.c  */
-#line 490 "src/parse-gram.y"
+#line 490 "src/parse-gram.y" /* yacc.c:1669  */
     { (yyval.assoc) = left_assoc; }
-/* Line 1670 of yacc.c  */
-#line 2547 "src/parse-gram.c"
+#line 2424 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 52:
-/* Line 1670 of yacc.c  */
-#line 491 "src/parse-gram.y"
+#line 491 "src/parse-gram.y" /* yacc.c:1669  */
     { (yyval.assoc) = right_assoc; }
-/* Line 1670 of yacc.c  */
-#line 2555 "src/parse-gram.c"
+#line 2430 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 53:
-/* Line 1670 of yacc.c  */
-#line 492 "src/parse-gram.y"
+#line 492 "src/parse-gram.y" /* yacc.c:1669  */
     { (yyval.assoc) = non_assoc; }
-/* Line 1670 of yacc.c  */
-#line 2563 "src/parse-gram.c"
+#line 2436 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 54:
-/* Line 1670 of yacc.c  */
-#line 493 "src/parse-gram.y"
+#line 493 "src/parse-gram.y" /* yacc.c:1669  */
     { (yyval.assoc) = precedence_assoc; }
-/* Line 1670 of yacc.c  */
-#line 2571 "src/parse-gram.c"
+#line 2442 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 55:
-/* Line 1670 of yacc.c  */
-#line 497 "src/parse-gram.y"
+#line 497 "src/parse-gram.y" /* yacc.c:1669  */
     { current_type = NULL; }
-/* Line 1670 of yacc.c  */
-#line 2579 "src/parse-gram.c"
+#line 2448 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 56:
-/* Line 1670 of yacc.c  */
-#line 498 "src/parse-gram.y"
+#line 498 "src/parse-gram.y" /* yacc.c:1669  */
     { current_type = (yyvsp[0].uniqstr); tag_seen = true; }
-/* Line 1670 of yacc.c  */
-#line 2587 "src/parse-gram.c"
+#line 2454 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 57:
-/* Line 1670 of yacc.c  */
-#line 504 "src/parse-gram.y"
+#line 504 "src/parse-gram.y" /* yacc.c:1669  */
     { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
-/* Line 1670 of yacc.c  */
-#line 2595 "src/parse-gram.c"
+#line 2460 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 58:
-/* Line 1670 of yacc.c  */
-#line 506 "src/parse-gram.y"
-    { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
-/* Line 1670 of yacc.c  */
-#line 2603 "src/parse-gram.c"
+#line 506 "src/parse-gram.y" /* yacc.c:1669  */
+    { (yyval.list) = symbol_list_append ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
+#line 2466 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 59:
-/* Line 1670 of yacc.c  */
-#line 510 "src/parse-gram.y"
+#line 510 "src/parse-gram.y" /* yacc.c:1669  */
     { (yyval.symbol) = (yyvsp[0].symbol); }
-/* Line 1670 of yacc.c  */
-#line 2611 "src/parse-gram.c"
+#line 2472 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 60:
-/* Line 1670 of yacc.c  */
-#line 511 "src/parse-gram.y"
+#line 511 "src/parse-gram.y" /* yacc.c:1669  */
     { (yyval.symbol) = (yyvsp[-1].symbol); symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0])); }
-/* Line 1670 of yacc.c  */
-#line 2619 "src/parse-gram.c"
+#line 2478 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 61:
-/* Line 1670 of yacc.c  */
-#line 517 "src/parse-gram.y"
+#line 517 "src/parse-gram.y" /* yacc.c:1669  */
     { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
-/* Line 1670 of yacc.c  */
-#line 2627 "src/parse-gram.c"
+#line 2484 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 62:
-/* Line 1670 of yacc.c  */
-#line 519 "src/parse-gram.y"
-    { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
-/* Line 1670 of yacc.c  */
-#line 2635 "src/parse-gram.c"
+#line 519 "src/parse-gram.y" /* yacc.c:1669  */
+    { (yyval.list) = symbol_list_append ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
+#line 2490 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 63:
-/* Line 1670 of yacc.c  */
-#line 523 "src/parse-gram.y"
+#line 523 "src/parse-gram.y" /* yacc.c:1669  */
     { (yyval.list) = (yyvsp[0].list); }
-/* Line 1670 of yacc.c  */
-#line 2643 "src/parse-gram.c"
+#line 2496 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 64:
-/* Line 1670 of yacc.c  */
-#line 524 "src/parse-gram.y"
-    { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].list)); }
-/* Line 1670 of yacc.c  */
-#line 2651 "src/parse-gram.c"
+#line 524 "src/parse-gram.y" /* yacc.c:1669  */
+    { (yyval.list) = symbol_list_append ((yyvsp[-1].list), (yyvsp[0].list)); }
+#line 2502 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 65:
-/* Line 1670 of yacc.c  */
-#line 528 "src/parse-gram.y"
+#line 528 "src/parse-gram.y" /* yacc.c:1669  */
     { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
-/* Line 1670 of yacc.c  */
-#line 2659 "src/parse-gram.c"
+#line 2508 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 66:
-/* Line 1670 of yacc.c  */
-#line 529 "src/parse-gram.y"
+#line 529 "src/parse-gram.y" /* yacc.c:1669  */
     { (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); }
-/* Line 1670 of yacc.c  */
-#line 2667 "src/parse-gram.c"
+#line 2514 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 68:
-/* Line 1670 of yacc.c  */
-#line 534 "src/parse-gram.y"
+#line 534 "src/parse-gram.y" /* yacc.c:1669  */
     { (yyval.uniqstr) = uniqstr_new ("*"); }
-/* Line 1670 of yacc.c  */
-#line 2675 "src/parse-gram.c"
+#line 2520 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 69:
-/* Line 1670 of yacc.c  */
-#line 535 "src/parse-gram.y"
+#line 535 "src/parse-gram.y" /* yacc.c:1669  */
     { (yyval.uniqstr) = uniqstr_new (""); }
-/* Line 1670 of yacc.c  */
-#line 2683 "src/parse-gram.c"
+#line 2526 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 70:
-/* Line 1670 of yacc.c  */
-#line 541 "src/parse-gram.y"
+#line 541 "src/parse-gram.y" /* yacc.c:1669  */
     {
-       current_type = (yyvsp[0].uniqstr);
-       tag_seen = true;
-     }
-/* Line 1670 of yacc.c  */
-#line 2694 "src/parse-gram.c"
+      current_type = (yyvsp[0].uniqstr);
+      tag_seen = true;
+    }
+#line 2535 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 71:
-/* Line 1670 of yacc.c  */
-#line 546 "src/parse-gram.y"
+#line 546 "src/parse-gram.y" /* yacc.c:1669  */
     {
-       symbol_class_set ((yyvsp[0].symbol), current_class, (yylsp[0]), true);
-       symbol_type_set ((yyvsp[0].symbol), current_type, (yylsp[0]));
-     }
-/* Line 1670 of yacc.c  */
-#line 2705 "src/parse-gram.c"
+      symbol_class_set ((yyvsp[0].symbol), current_class, (yylsp[0]), true);
+      symbol_type_set ((yyvsp[0].symbol), current_type, (yylsp[0]));
+    }
+#line 2544 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 72:
-/* Line 1670 of yacc.c  */
-#line 551 "src/parse-gram.y"
+#line 551 "src/parse-gram.y" /* yacc.c:1669  */
     {
       symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1]), true);
       symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1]));
       symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0]));
     }
-/* Line 1670 of yacc.c  */
-#line 2717 "src/parse-gram.c"
+#line 2554 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 73:
-/* Line 1670 of yacc.c  */
-#line 557 "src/parse-gram.y"
+#line 557 "src/parse-gram.y" /* yacc.c:1669  */
     {
       symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1]), true);
       symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1]));
       symbol_make_alias ((yyvsp[-1].symbol), (yyvsp[0].symbol), (yyloc));
     }
-/* Line 1670 of yacc.c  */
-#line 2729 "src/parse-gram.c"
+#line 2564 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 74:
-/* Line 1670 of yacc.c  */
-#line 563 "src/parse-gram.y"
+#line 563 "src/parse-gram.y" /* yacc.c:1669  */
     {
       symbol_class_set ((yyvsp[-2].symbol), current_class, (yylsp[-2]), true);
       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));
     }
-/* Line 1670 of yacc.c  */
-#line 2742 "src/parse-gram.c"
+#line 2575 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 81:
-/* Line 1670 of yacc.c  */
-#line 593 "src/parse-gram.y"
+#line 593 "src/parse-gram.y" /* yacc.c:1669  */
     {
       yyerrok;
     }
-/* Line 1670 of yacc.c  */
-#line 2752 "src/parse-gram.c"
+#line 2583 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 82:
-/* Line 1670 of yacc.c  */
-#line 599 "src/parse-gram.y"
+#line 599 "src/parse-gram.y" /* yacc.c:1669  */
     { current_lhs ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); }
-/* Line 1670 of yacc.c  */
-#line 2760 "src/parse-gram.c"
+#line 2589 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 83:
-/* Line 1670 of yacc.c  */
-#line 600 "src/parse-gram.y"
+#line 600 "src/parse-gram.y" /* yacc.c:1669  */
     {
     /* Free the current lhs. */
     current_lhs (0, (yylsp[-3]), 0);
   }
-/* Line 1670 of yacc.c  */
-#line 2771 "src/parse-gram.c"
+#line 2598 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 84:
-/* Line 1670 of yacc.c  */
-#line 607 "src/parse-gram.y"
+#line 607 "src/parse-gram.y" /* yacc.c:1669  */
     { grammar_current_rule_end ((yylsp[0])); }
-/* Line 1670 of yacc.c  */
-#line 2779 "src/parse-gram.c"
+#line 2604 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 85:
-/* Line 1670 of yacc.c  */
-#line 608 "src/parse-gram.y"
+#line 608 "src/parse-gram.y" /* yacc.c:1669  */
     { grammar_current_rule_end ((yylsp[0])); }
-/* Line 1670 of yacc.c  */
-#line 2787 "src/parse-gram.c"
+#line 2610 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 87:
-/* Line 1670 of yacc.c  */
-#line 614 "src/parse-gram.y"
+#line 614 "src/parse-gram.y" /* yacc.c:1669  */
     { grammar_current_rule_begin (current_lhs_symbol, current_lhs_location,
                                   current_lhs_named_ref); }
-/* Line 1670 of yacc.c  */
-#line 2796 "src/parse-gram.c"
+#line 2617 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 88:
-/* Line 1670 of yacc.c  */
-#line 617 "src/parse-gram.y"
+#line 617 "src/parse-gram.y" /* yacc.c:1669  */
     { grammar_current_rule_symbol_append ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); }
-/* Line 1670 of yacc.c  */
-#line 2804 "src/parse-gram.c"
+#line 2623 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 89:
-/* Line 1670 of yacc.c  */
-#line 619 "src/parse-gram.y"
+#line 619 "src/parse-gram.y" /* yacc.c:1669  */
     { grammar_current_rule_action_append ((yyvsp[-1].code), (yylsp[-1]), (yyvsp[0].named_ref), false); }
-/* Line 1670 of yacc.c  */
-#line 2812 "src/parse-gram.c"
+#line 2629 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 90:
-/* Line 1670 of yacc.c  */
-#line 621 "src/parse-gram.y"
+#line 621 "src/parse-gram.y" /* yacc.c:1669  */
     { grammar_current_rule_action_append ((yyvsp[0].code), (yylsp[0]), NULL, true); }
-/* Line 1670 of yacc.c  */
-#line 2820 "src/parse-gram.c"
+#line 2635 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 91:
-/* Line 1670 of yacc.c  */
-#line 623 "src/parse-gram.y"
+#line 623 "src/parse-gram.y" /* yacc.c:1669  */
     { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); }
-/* Line 1670 of yacc.c  */
-#line 2828 "src/parse-gram.c"
+#line 2641 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 92:
-/* Line 1670 of yacc.c  */
-#line 625 "src/parse-gram.y"
+#line 625 "src/parse-gram.y" /* yacc.c:1669  */
     { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); }
-/* Line 1670 of yacc.c  */
-#line 2836 "src/parse-gram.c"
+#line 2647 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 93:
-/* Line 1670 of yacc.c  */
-#line 627 "src/parse-gram.y"
+#line 627 "src/parse-gram.y" /* yacc.c:1669  */
     { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); }
-/* Line 1670 of yacc.c  */
-#line 2844 "src/parse-gram.c"
+#line 2653 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 94:
-/* Line 1670 of yacc.c  */
-#line 631 "src/parse-gram.y"
+#line 631 "src/parse-gram.y" /* yacc.c:1669  */
     { (yyval.named_ref) = 0; }
-/* Line 1670 of yacc.c  */
-#line 2852 "src/parse-gram.c"
+#line 2659 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 95:
-/* Line 1670 of yacc.c  */
-#line 633 "src/parse-gram.y"
+#line 633 "src/parse-gram.y" /* yacc.c:1669  */
     { (yyval.named_ref) = named_ref_new((yyvsp[0].uniqstr), (yylsp[0])); }
-/* Line 1670 of yacc.c  */
-#line 2860 "src/parse-gram.c"
+#line 2665 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 97:
-/* Line 1670 of yacc.c  */
-#line 644 "src/parse-gram.y"
+#line 644 "src/parse-gram.y" /* yacc.c:1669  */
     { (yyval.uniqstr) = uniqstr_new ((yyvsp[0].chars)); }
-/* Line 1670 of yacc.c  */
-#line 2868 "src/parse-gram.c"
+#line 2671 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 98:
-/* Line 1670 of yacc.c  */
-#line 649 "src/parse-gram.y"
+#line 649 "src/parse-gram.y" /* yacc.c:1669  */
     { (yyval.chars) = ""; }
-/* Line 1670 of yacc.c  */
-#line 2876 "src/parse-gram.c"
+#line 2677 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 99:
-/* Line 1670 of yacc.c  */
-#line 650 "src/parse-gram.y"
+#line 650 "src/parse-gram.y" /* yacc.c:1669  */
     { (yyval.chars) = (yyvsp[0].uniqstr); }
-/* Line 1670 of yacc.c  */
-#line 2884 "src/parse-gram.c"
+#line 2683 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 101:
-/* Line 1670 of yacc.c  */
-#line 661 "src/parse-gram.y"
+#line 661 "src/parse-gram.y" /* yacc.c:1669  */
     {
       code_props plain_code;
       (yyvsp[0].code)[strlen ((yyvsp[0].code)) - 1] = '\n';
@@ -2894,52 +2692,42 @@ yyreduce:
       gram_scanner_last_string_free ();
       (yyval.chars) = plain_code.code;
     }
-/* Line 1670 of yacc.c  */
-#line 2899 "src/parse-gram.c"
+#line 2696 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 102:
-/* Line 1670 of yacc.c  */
-#line 681 "src/parse-gram.y"
+#line 681 "src/parse-gram.y" /* yacc.c:1669  */
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
-/* Line 1670 of yacc.c  */
-#line 2907 "src/parse-gram.c"
+#line 2702 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 103:
-/* Line 1670 of yacc.c  */
-#line 683 "src/parse-gram.y"
+#line 683 "src/parse-gram.y" /* yacc.c:1669  */
     {
       (yyval.symbol) = symbol_get (char_name ((yyvsp[0].character)), (yylsp[0]));
       symbol_class_set ((yyval.symbol), token_sym, (yylsp[0]), false);
       symbol_user_token_number_set ((yyval.symbol), (yyvsp[0].character), (yylsp[0]));
     }
-/* Line 1670 of yacc.c  */
-#line 2919 "src/parse-gram.c"
+#line 2712 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 104:
-/* Line 1670 of yacc.c  */
-#line 691 "src/parse-gram.y"
+#line 691 "src/parse-gram.y" /* yacc.c:1669  */
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
-/* Line 1670 of yacc.c  */
-#line 2927 "src/parse-gram.c"
+#line 2718 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 107:
-/* Line 1670 of yacc.c  */
-#line 703 "src/parse-gram.y"
+#line 703 "src/parse-gram.y" /* yacc.c:1669  */
     {
       (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[0].chars)), (yylsp[0]));
       symbol_class_set ((yyval.symbol), token_sym, (yylsp[0]), false);
     }
-/* Line 1670 of yacc.c  */
-#line 2938 "src/parse-gram.c"
+#line 2727 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
   case 109:
-/* Line 1670 of yacc.c  */
-#line 712 "src/parse-gram.y"
+#line 712 "src/parse-gram.y" /* yacc.c:1669  */
     {
       code_props plain_code;
       code_props_plain_init (&plain_code, (yyvsp[0].chars), (yylsp[0]));
@@ -2948,13 +2736,11 @@ yyreduce:
       muscle_code_grow ("epilogue", plain_code.code, (yylsp[0]));
       code_scanner_last_string_free ();
     }
-/* Line 1670 of yacc.c  */
-#line 2953 "src/parse-gram.c"
+#line 2740 "src/parse-gram.c" /* yacc.c:1669  */
     break;
 
 
-/* Line 1670 of yacc.c  */
-#line 2958 "src/parse-gram.c"
+#line 2744 "src/parse-gram.c" /* yacc.c:1669  */
         default: break;
       }
     if (yychar_backup != yychar)
@@ -3084,7 +2870,7 @@ yyerrorlab:
      goto yyerrorlab;
 
   yyerror_range[1] = yylsp[1-yylen];
-  /* Do not reclaim the symbols of the rule which action triggered
+  /* Do not reclaim the symbols of the rule whose action triggered
      this YYERROR.  */
   YYPOPSTACK (yylen);
   yylen = 0;
@@ -3179,7 +2965,7 @@ yyreturn:
       yydestruct ("Cleanup: discarding lookahead",
                   yytoken, &yylval, &yylloc);
     }
-  /* Do not reclaim the symbols of the rule which action triggered
+  /* Do not reclaim the symbols of the rule whose action triggered
      this YYABORT or YYACCEPT.  */
   YYPOPSTACK (yylen);
   YY_STACK_PRINT (yyss, yyssp);
@@ -3201,8 +2987,7 @@ yyreturn:
 #endif
   return yyresult;
 }
-/* Line 1930 of yacc.c  */
-#line 722 "src/parse-gram.y"
+#line 722 "src/parse-gram.y" /* yacc.c:1929  */
 
 
 /* Return the location of the left-hand side of a rule whose