2007-01-23 Paolo Bonzini <bonzini@gnu.org>

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

diff --git a/src/parse-gram.c b/src/parse-gram.c
index 349192b070c86dfac839f0dcad0c57645d853c0b..6bf88c779fadf1fbb0c7cf341f183a13371866f6 100644 (file)
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -77,8 +77,8 @@
 
 /* Copy the first part of user declarations.  */
 
 
 /* Copy the first part of user declarations.  */
 

-/* Line 171 of yacc.c  */
-#line 1 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 1 "../../src/parse-gram.y"

 /* Bison Grammar Parser                             -*- C -*-
 
    Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation,
 /* Bison Grammar Parser                             -*- C -*-
 
    Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation,


@@ -157,8 +157,8 @@ static int current_prec = 0;
 #define YYTYPE_UINT8 uint_fast8_t
 
 
 #define YYTYPE_UINT8 uint_fast8_t
 
 

-/* Line 171 of yacc.c  */
-#line 162 "parse-gram.c"
+/* Line 1537 of yacc.c  */
+#line 162 "../../src/parse-gram.c"

 
 /* Enabling traces.  */
 #ifndef YYDEBUG
 
 /* Enabling traces.  */
 #ifndef YYDEBUG


@@ -309,8 +309,9 @@ static int current_prec = 0;
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {

-/* Line 205 of yacc.c  */
-#line 98 "parse-gram.y"
+
+/* Line 1537 of yacc.c  */
+#line 97 "../../src/parse-gram.y"

 
   symbol *symbol;
   symbol_list *list;
 
   symbol *symbol;
   symbol_list *list;


@@ -320,11 +321,12 @@ typedef union YYSTYPE
   assoc assoc;
   uniqstr uniqstr;
   unsigned char character;
   assoc assoc;
   uniqstr uniqstr;
   unsigned char character;

-}

 
 

-/* Line 205 of yacc.c  */
-#line 327 "parse-gram.c"
-       YYSTYPE;
+
+
+/* Line 1537 of yacc.c  */
+#line 329 "../../src/parse-gram.c"
+} YYSTYPE;

 # define YYSTYPE_IS_TRIVIAL 1
 # 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


@@ -347,8 +349,8 @@ typedef struct YYLTYPE
 /* Copy the second part of user declarations.  */
 
 
 /* Copy the second part of user declarations.  */
 
 

-/* Line 228 of yacc.c  */
-#line 352 "parse-gram.c"
+/* Line 1537 of yacc.c  */
+#line 354 "../../src/parse-gram.c"

 
 #ifdef short
 # undef short
 
 #ifdef short
 # undef short


@@ -565,7 +567,7 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  3
 /* YYLAST -- Last index in YYTABLE.  */
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  3
 /* YYLAST -- Last index in YYTABLE.  */

-#define YYLAST   187
+#define YYLAST   158

 
 /* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  59
 
 /* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  59


@@ -642,7 +644,7 @@ static const yytype_uint16 yyprhs[] =
 static const yytype_int8 yyrhs[] =
 {
       60,     0,    -1,    61,    51,    76,    89,    -1,    -1,    61,
 static const yytype_int8 yyrhs[] =
 {
       60,     0,    -1,    61,    51,    76,    89,    -1,    -1,    61,

-      62,    -1,    63,    -1,    53,    -1,    17,    -1,    19,     3,
+      62,    -1,    63,    -1,    53,    -1,    17,    -1,    19,    82,

       83,    -1,    20,    -1,    20,     3,    -1,    21,    -1,    22,
        4,    -1,    23,     4,    -1,    24,     3,    -1,    24,    48,
        3,    -1,    25,    -1,    26,    45,    -1,    27,     3,    -1,
       83,    -1,    20,    -1,    20,     3,    -1,    21,    -1,    22,
        4,    -1,    23,     4,    -1,    24,     3,    -1,    24,    48,
        3,    -1,    25,    -1,    26,    45,    -1,    27,     3,    -1,


@@ -652,8 +654,8 @@ static const yytype_int8 yyrhs[] =
       38,    -1,    39,     3,    -1,    40,     3,    -1,    42,    -1,
       43,    -1,    44,    -1,    54,    -1,    68,    -1,    65,    -1,
       41,    87,    -1,     8,    45,    72,    -1,     9,    45,    72,
       38,    -1,    39,     3,    -1,    40,     3,    -1,    42,    -1,
       43,    -1,    44,    -1,    54,    -1,    68,    -1,    65,    -1,
       41,    87,    -1,     8,    45,    72,    -1,     9,    45,    72,

-      -1,    18,    -1,    31,    -1,    16,    84,    -1,    16,     3,
-      84,    -1,    -1,    49,    -1,    58,    64,    45,    -1,    -1,
+      -1,    18,    -1,    31,    -1,    16,    84,    -1,    16,    49,
+      84,    -1,    -1,    49,    -1,    58,    64,    84,    -1,    -1,

        6,    66,    75,    -1,    -1,     5,    67,    75,    -1,     7,
       55,    71,    -1,    69,    70,    71,    -1,    10,    -1,    11,
       -1,    12,    -1,    -1,    55,    -1,    87,    -1,    71,    87,
        6,    66,    75,    -1,    -1,     5,    67,    75,    -1,     7,
       55,    71,    -1,    69,    70,    71,    -1,    10,    -1,    11,
       -1,    12,    -1,    -1,    55,    -1,    87,    -1,    71,    87,


@@ -664,8 +666,8 @@ static const yytype_int8 yyrhs[] =
       63,    54,    -1,     1,    54,    -1,    -1,    86,    79,    80,
       -1,    81,    -1,    80,    52,    81,    -1,    80,    54,    -1,
       -1,    81,    87,    -1,    81,    45,    -1,    81,    13,    87,
       63,    54,    -1,     1,    54,    -1,    -1,    86,    79,    80,
       -1,    81,    -1,    80,    52,    81,    -1,    80,    54,    -1,
       -1,    81,    87,    -1,    81,    45,    -1,    81,    13,    87,

-      -1,    81,    14,     4,    -1,    81,    15,    55,    -1,     3,
-      -1,    84,    -1,    -1,    82,    -1,    45,    -1,    49,    -1,
+      -1,    81,    14,     4,    -1,    81,    15,    55,    -1,    49,
+      -1,     3,    -1,    -1,     3,    -1,    45,    -1,    49,    -1,

       46,    -1,    50,    -1,    85,    -1,    88,    -1,     3,    -1,
       -1,    51,    47,    -1
 };
       46,    -1,    50,    -1,    85,    -1,    88,    -1,     3,    -1,
       -1,    51,    47,    -1
 };


@@ -673,17 +675,17 @@ static const yytype_int8 yyrhs[] =
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {

-       0,   211,   211,   219,   221,   225,   226,   235,   236,   237,
-     238,   243,   244,   245,   246,   247,   248,   253,   262,   263,
-     264,   265,   266,   267,   268,   269,   270,   271,   272,   273,
-     274,   275,   276,   277,   278,   279,   280,   284,   285,   286,
-     290,   297,   304,   308,   312,   317,   340,   341,   345,   374,
-     374,   379,   379,   384,   395,   410,   411,   412,   416,   417,
-     422,   424,   429,   430,   434,   435,   436,   437,   442,   447,
-     452,   458,   464,   475,   476,   485,   486,   492,   493,   494,
-     501,   501,   505,   506,   507,   512,   513,   515,   517,   519,
-     521,   531,   532,   538,   542,   547,   567,   569,   578,   583,
-     584,   589,   596,   598
+       0,   210,   210,   218,   220,   224,   225,   235,   236,   250,
+     251,   256,   257,   258,   259,   260,   261,   266,   275,   276,
+     277,   278,   279,   280,   281,   282,   283,   284,   285,   286,
+     287,   288,   289,   313,   314,   315,   316,   320,   321,   322,
+     326,   333,   340,   344,   348,   353,   376,   377,   381,   393,
+     393,   398,   398,   403,   414,   429,   430,   431,   435,   436,
+     441,   443,   448,   449,   453,   454,   455,   456,   461,   466,
+     471,   477,   483,   494,   495,   504,   505,   511,   512,   513,
+     520,   520,   524,   525,   526,   531,   532,   534,   536,   538,
+     540,   550,   551,   557,   560,   569,   589,   591,   600,   605,
+     606,   611,   618,   620

 };
 #endif
 
 };
 #endif
 


@@ -712,7 +714,7 @@ static const char *const yytname[] =
   "precedence_declarator", "type.opt", "symbols.1", "generic_symlist",
   "generic_symlist_item", "symbol_def", "symbol_defs.1", "grammar",
   "rules_or_grammar_declaration", "rules", "$@3", "rhses.1", "rhs",
   "precedence_declarator", "type.opt", "symbols.1", "generic_symlist",
   "generic_symlist_item", "symbol_def", "symbol_defs.1", "grammar",
   "rules_or_grammar_declaration", "rules", "$@3", "rhses.1", "rhs",

-  "content", "content.opt", "braceless", "id", "id_colon", "symbol",
+  "variable", "content.opt", "braceless", "id", "id_colon", "symbol",

   "string_as_id", "epilogue.opt", 0
 };
 #endif
   "string_as_id", "epilogue.opt", 0
 };
 #endif


@@ -773,12 +775,12 @@ static const yytype_uint8 yydefact[] =
        0,    16,     0,     0,     0,    20,     0,    43,    23,    24,
        0,     0,    28,    29,    30,     0,     0,     0,    33,    34,
       35,     0,     6,    36,    46,     4,     5,    38,    37,    58,
        0,    16,     0,     0,     0,    20,     0,    43,    23,    24,
        0,     0,    28,    29,    30,     0,     0,     0,    33,    34,
       35,     0,     6,    36,    46,     4,     5,    38,    37,    58,

-       0,     0,     0,     0,     0,     0,    95,    44,    93,    10,
-      12,    13,    14,     0,    17,    18,    19,    21,     0,    25,
-       0,    27,    31,    32,   101,    97,    96,    99,    39,   100,
-       0,    98,     0,     0,    75,    77,    80,    47,     0,    59,
-       0,    68,    73,    52,    69,    50,    53,    60,    65,    66,
-      67,    40,    62,    64,    41,    45,    91,    94,     8,    92,
+       0,     0,     0,     0,     0,    95,     0,    44,    92,    91,
+      93,    10,    12,    13,    14,     0,    17,    18,    19,    21,
+       0,    25,     0,    27,    31,    32,   101,    97,    96,    99,
+      39,   100,     0,    98,     0,     0,    75,    77,    80,    47,
+       0,    59,     0,    68,    73,    52,    69,    50,    53,    60,
+      65,    66,    67,    40,    62,    64,    41,    45,    94,     8,

       15,    22,    26,    79,    78,     0,    76,     2,    85,    48,
       54,    74,    70,    71,    61,    63,   103,    81,    82,    72,
       85,    84,     0,     0,     0,    87,    86,    83,    88,    89,
       15,    22,    26,    79,    78,     0,    76,     2,    85,    48,
       54,    74,    70,    71,    61,    63,   103,    81,    82,    72,
       85,    84,     0,     0,     0,    87,    86,    83,    88,    89,


@@ -788,41 +790,41 @@ static const yytype_uint8 yydefact[] =
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {

-      -1,     1,     2,    45,    82,    88,    47,    51,    50,    48,
-      49,    90,    96,   101,   102,    92,    93,    83,    84,    85,
-     118,   127,   128,   107,   108,    57,    77,    86,   103,    79,
+      -1,     1,     2,    45,    84,    90,    47,    51,    50,    48,
+      49,    92,    98,   103,   104,    94,    95,    85,    86,    87,
+     118,   127,   128,    60,   109,    57,    79,    88,   105,    81,

      117
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
      117
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */

-#define YYPACT_NINF -93
+#define YYPACT_NINF -79

 static const yytype_int16 yypact[] =
 {
 static const yytype_int16 yypact[] =
 {

-     -93,    14,    96,   -93,   -93,   -93,    -4,    20,    30,   -93,
-     -93,   -93,    21,   -93,   -93,    73,    75,   -93,    76,    77,
-       6,   -93,    34,    79,    39,   -93,    22,   -93,   -93,   -93,
-      23,    41,   -93,   -93,   -93,    84,    85,    -2,   -93,   -93,
-     -93,    27,   -93,   -93,    40,   -93,   -93,   -93,   -93,    35,
-     -42,   -42,    -2,     0,     0,    47,   -93,   -93,    28,   -93,
-     -93,   -93,   -93,    90,   -93,   -93,   -93,   -93,    91,   -93,
-      93,   -93,   -93,   -93,   -93,   -93,   -93,   -93,   -93,   -93,
-      43,   -93,    44,    11,   -93,   -93,   -93,   -93,    54,   -93,
-      -2,   -93,   -93,   -42,    37,   -42,    -2,   -93,   -93,   -93,
-     -93,     0,   -93,   -93,     0,   -93,   -93,   -93,   -93,   -93,
-     -93,   -93,   -93,   -93,   -93,    62,   -93,   -93,   -93,   -93,
-      -2,   -93,   107,   -93,   -93,   -93,   -93,   -44,   138,   -93,
-     -93,   -93,    -2,   139,    56,   -93,   -93,   138,   -93,   -93,
-     -93
+     -79,     5,    96,   -79,   -79,   -79,    -6,    13,    18,   -79,
+     -79,   -79,    -8,   -79,   -79,    27,    66,   -79,    74,    82,
+      31,   -79,    43,    86,    45,   -79,    32,   -79,   -79,   -79,
+      33,    47,   -79,   -79,   -79,    91,    93,    26,   -79,   -79,
+     -79,    15,   -79,   -79,    48,   -79,   -79,   -79,   -79,    44,
+      38,    38,    26,    11,    11,   -79,    53,   -79,   -79,   -79,
+     106,   -79,   -79,   -79,   -79,   107,   -79,   -79,   -79,   -79,
+     108,   -79,   138,   -79,   -79,   -79,   -79,   -79,   -79,   -79,
+     -79,   -79,    88,   -79,    89,     1,   -79,   -79,   -79,   -79,
+      53,   -79,    26,   -79,   -79,    38,    50,    38,    26,   -79,
+     -79,   -79,   -79,    11,   -79,   -79,    11,   -79,   -79,   -79,
+     -79,   -79,   -79,   -79,   -79,    97,   -79,   -79,   -79,   -79,
+      26,   -79,   142,   -79,   -79,   -79,   -79,    -7,    25,   -79,
+     -79,   -79,    26,   144,    98,   -79,   -79,    25,   -79,   -79,
+     -79

 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {

-     -93,   -93,   -93,   -93,   140,   -93,   -93,   -93,   -93,   -93,
-     -93,   -93,    55,    92,   -41,   -21,    97,   -93,    61,   -93,
-     -93,   -93,    25,   -93,   -93,     9,   -45,   -93,   -37,   -92,
-     -93
+     -79,   -79,   -79,   -79,   149,   -79,   -79,   -79,   -79,   -79,
+     -79,   -79,    54,   101,   -21,   -33,   105,   -79,    67,   -79,
+     -79,   -79,    28,   -79,   -79,   -13,   -47,   -79,   -37,   -78,
+     -79

 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If


@@ -832,48 +834,42 @@ static const yytype_int16 yypgoto[] =
 #define YYTABLE_NINF -103
 static const yytype_int16 yytable[] =
 {
 #define YYTABLE_NINF -103
 static const yytype_int16 yytable[] =
 {

-      78,    74,   123,    74,    75,    94,    94,    76,   130,    62,
-     131,  -102,    80,    91,     3,    97,     4,     5,     6,     7,
-       8,     9,    10,    11,    55,    67,    69,    12,    80,    14,
-     129,   106,     4,     5,     6,     7,     8,     9,    10,    11,
-      74,   122,    27,    12,    75,    14,    75,    76,    94,    76,
-      94,    52,    37,    97,    63,    98,    99,   100,    27,   124,
-     125,    81,   115,   125,   105,    53,    56,   109,    37,    44,
-      68,    70,   121,    56,   121,    54,    58,    81,    59,    64,
-      60,    61,    65,   124,    66,    44,    71,    72,    73,    87,
-      89,   136,    56,   110,   111,   138,   112,   113,   114,   119,
-     136,     4,     5,     6,     7,     8,     9,    10,    11,   126,
-      74,   140,    12,    13,    14,    15,    16,    17,    18,    19,
+      80,  -102,    82,    96,    96,     3,     4,     5,     6,     7,
+       8,     9,    10,    11,    76,    99,    82,    12,   123,    14,
+       4,     5,     6,     7,     8,     9,    10,    11,    76,    76,
+      58,    12,    27,    14,    64,    69,    71,    55,   132,   133,
+     134,    56,    37,   107,   129,   130,    27,   131,    96,    52,
+      96,    83,   115,    76,   122,    99,    37,    77,    53,    44,
+      78,   124,   121,    54,   121,    83,   100,   101,   102,    61,
+     135,    77,    77,    44,    78,    78,    59,   119,    62,    65,
+      70,    72,   125,   124,    77,   125,    63,    78,    66,    67,
+      68,   136,    73,    93,    74,   138,    75,    89,    55,    91,
+     136,     4,     5,     6,     7,     8,     9,    10,    11,   108,
+     110,   111,    12,    13,    14,    15,    16,    17,    18,    19,

       20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
       30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
       20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
       30,    31,    32,    33,    34,    35,    36,    37,    38,    39,

-      40,    74,    46,   139,   116,   120,   104,    41,    95,    42,
-      43,   132,   133,   134,    44,   137,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   135,    75,     0,     0,    76
+      40,   112,   113,   114,   126,    76,   120,    41,   139,    42,
+      43,    46,   116,   140,    44,   106,    97,     0,   137

 };
 
 static const yytype_int16 yycheck[] =
 {
 };
 
 static const yytype_int16 yycheck[] =
 {

-      37,     3,    94,     3,    46,    50,    51,    49,    52,     3,
-      54,     0,     1,    55,     0,    52,     5,     6,     7,     8,
-       9,    10,    11,    12,     3,     3,     3,    16,     1,    18,
-     122,     3,     5,     6,     7,     8,     9,    10,    11,    12,
-       3,     4,    31,    16,    46,    18,    46,    49,    93,    49,
-      95,    55,    41,    90,    48,    55,    56,    57,    31,    96,
-     101,    50,    51,   104,    55,    45,    45,    58,    41,    58,
-      48,    48,    93,    45,    95,    45,     3,    50,     3,    45,
-       4,     4,     3,   120,    45,    58,    45,     3,     3,    49,
-      55,   128,    45,     3,     3,   132,     3,    54,    54,    45,
-     137,     5,     6,     7,     8,     9,    10,    11,    12,    47,
-       3,    55,    16,    17,    18,    19,    20,    21,    22,    23,
+      37,     0,     1,    50,    51,     0,     5,     6,     7,     8,
+       9,    10,    11,    12,     3,    52,     1,    16,    96,    18,
+       5,     6,     7,     8,     9,    10,    11,    12,     3,     3,
+       3,    16,    31,    18,     3,     3,     3,    45,    13,    14,
+      15,    49,    41,    56,   122,    52,    31,    54,    95,    55,
+      97,    50,    51,     3,     4,    92,    41,    46,    45,    58,
+      49,    98,    95,    45,    97,    50,    55,    56,    57,     3,
+      45,    46,    46,    58,    49,    49,    49,    90,     4,    48,
+      48,    48,   103,   120,    46,   106,     4,    49,    45,     3,
+      45,   128,    45,    55,     3,   132,     3,    49,    45,    55,
+     137,     5,     6,     7,     8,     9,    10,    11,    12,     3,
+       3,     3,    16,    17,    18,    19,    20,    21,    22,    23,

       24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
       34,    35,    36,    37,    38,    39,    40,    41,    42,    43,
       24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
       34,    35,    36,    37,    38,    39,    40,    41,    42,    43,

-      44,     3,     2,     4,    83,    90,    54,    51,    51,    53,
-      54,    13,    14,    15,    58,   130,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    45,    46,    -1,    -1,    49
+      44,     3,    54,    54,    47,     3,    92,    51,     4,    53,
+      54,     2,    85,    55,    58,    54,    51,    -1,   130

 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing


@@ -885,13 +881,13 @@ static const yytype_uint8 yystos[] =
       24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
       34,    35,    36,    37,    38,    39,    40,    41,    42,    43,
       44,    51,    53,    54,    58,    62,    63,    65,    68,    69,
       24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
       34,    35,    36,    37,    38,    39,    40,    41,    42,    43,
       44,    51,    53,    54,    58,    62,    63,    65,    68,    69,

-      67,    66,    55,    45,    45,     3,    45,    84,     3,     3,
-       4,     4,     3,    48,    45,     3,    45,     3,    48,     3,
-      48,    45,     3,     3,     3,    46,    49,    85,    87,    88,
-       1,    50,    63,    76,    77,    78,    86,    49,    64,    55,
-      70,    55,    74,    75,    85,    75,    71,    87,    55,    56,
-      57,    72,    73,    87,    72,    84,     3,    82,    83,    84,
-       3,     3,     3,    54,    54,    51,    77,    89,    79,    45,
+      67,    66,    55,    45,    45,    45,    49,    84,     3,    49,
+      82,     3,     4,     4,     3,    48,    45,     3,    45,     3,
+      48,     3,    48,    45,     3,     3,     3,    46,    49,    85,
+      87,    88,     1,    50,    63,    76,    77,    78,    86,    49,
+      64,    55,    70,    55,    74,    75,    85,    75,    71,    87,
+      55,    56,    57,    72,    73,    87,    72,    84,     3,    83,
+       3,     3,     3,    54,    54,    51,    77,    89,    79,    84,

       71,    74,     4,    88,    87,    73,    47,    80,    81,    88,
       52,    54,    13,    14,    15,    45,    87,    81,    87,     4,
       55
       71,    74,     4,    88,    87,    73,    47,    80,    81,    88,
       52,    54,    13,    14,    15,    45,    87,    81,    87,     4,
       55


@@ -1044,147 +1040,147 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
     {
       case 3: /* "\"string\"" */
 
     {
       case 3: /* "\"string\"" */
 

-/* Line 681 of yacc.c  */
-#line 189 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 188 "../../src/parse-gram.y"

        { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); };
 
        { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); };
 

-/* Line 681 of yacc.c  */
-#line 1053 "parse-gram.c"
+/* Line 1537 of yacc.c  */
+#line 1049 "../../src/parse-gram.c"

        break;
       case 4: /* "\"integer\"" */
 
        break;
       case 4: /* "\"integer\"" */
 

-/* Line 681 of yacc.c  */
-#line 200 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 199 "../../src/parse-gram.y"

        { fprintf (stderr, "%d", (yyvaluep->integer)); };
 
        { fprintf (stderr, "%d", (yyvaluep->integer)); };
 

-/* Line 681 of yacc.c  */
-#line 1062 "parse-gram.c"
+/* Line 1537 of yacc.c  */
+#line 1058 "../../src/parse-gram.c"

        break;
       case 45: /* "\"{...}\"" */
 
        break;
       case 45: /* "\"{...}\"" */
 

-/* Line 681 of yacc.c  */
-#line 191 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 190 "../../src/parse-gram.y"

        { fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); };
 
        { fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); };
 

-/* Line 681 of yacc.c  */
-#line 1071 "parse-gram.c"
+/* Line 1537 of yacc.c  */
+#line 1067 "../../src/parse-gram.c"

        break;
       case 46: /* "\"char\"" */
 
        break;
       case 46: /* "\"char\"" */
 

-/* Line 681 of yacc.c  */
-#line 183 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 182 "../../src/parse-gram.y"

        { fputs (char_name ((yyvaluep->character)), stderr); };
 
        { fputs (char_name ((yyvaluep->character)), stderr); };
 

-/* Line 681 of yacc.c  */
-#line 1080 "parse-gram.c"
+/* Line 1537 of yacc.c  */
+#line 1076 "../../src/parse-gram.c"

        break;
       case 47: /* "\"epilogue\"" */
 
        break;
       case 47: /* "\"epilogue\"" */
 

-/* Line 681 of yacc.c  */
-#line 191 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 190 "../../src/parse-gram.y"

        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 
        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 

-/* Line 681 of yacc.c  */
-#line 1089 "parse-gram.c"
+/* Line 1537 of yacc.c  */
+#line 1085 "../../src/parse-gram.c"

        break;
       case 49: /* "\"identifier\"" */
 
        break;
       case 49: /* "\"identifier\"" */
 

-/* Line 681 of yacc.c  */
-#line 196 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 195 "../../src/parse-gram.y"

        { fputs ((yyvaluep->uniqstr), stderr); };
 
        { fputs ((yyvaluep->uniqstr), stderr); };
 

-/* Line 681 of yacc.c  */
-#line 1098 "parse-gram.c"
+/* Line 1537 of yacc.c  */
+#line 1094 "../../src/parse-gram.c"

        break;
       case 50: /* "\"identifier:\"" */
 
        break;
       case 50: /* "\"identifier:\"" */
 

-/* Line 681 of yacc.c  */
-#line 197 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 196 "../../src/parse-gram.y"

        { fprintf (stderr, "%s:", (yyvaluep->uniqstr)); };
 
        { fprintf (stderr, "%s:", (yyvaluep->uniqstr)); };
 

-/* Line 681 of yacc.c  */
-#line 1107 "parse-gram.c"
+/* Line 1537 of yacc.c  */
+#line 1103 "../../src/parse-gram.c"

        break;
       case 53: /* "\"%{...%}\"" */
 
        break;
       case 53: /* "\"%{...%}\"" */
 

-/* Line 681 of yacc.c  */
-#line 191 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 190 "../../src/parse-gram.y"

        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 
        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 

-/* Line 681 of yacc.c  */
-#line 1116 "parse-gram.c"
+/* Line 1537 of yacc.c  */
+#line 1112 "../../src/parse-gram.c"

        break;
       case 55: /* "\"type\"" */
 
        break;
       case 55: /* "\"type\"" */
 

-/* Line 681 of yacc.c  */
-#line 195 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 194 "../../src/parse-gram.y"

        { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); };
 
        { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); };
 

-/* Line 681 of yacc.c  */
-#line 1125 "parse-gram.c"
+/* Line 1537 of yacc.c  */
+#line 1121 "../../src/parse-gram.c"

        break;
        break;

-      case 82: /* "content" */
+      case 82: /* "variable" */

 
 

-/* Line 681 of yacc.c  */
-#line 191 "parse-gram.y"
-       { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+/* Line 1537 of yacc.c  */
+#line 195 "../../src/parse-gram.y"
+       { fputs ((yyvaluep->uniqstr), stderr); };

 
 

-/* Line 681 of yacc.c  */
-#line 1134 "parse-gram.c"
+/* Line 1537 of yacc.c  */
+#line 1130 "../../src/parse-gram.c"

        break;
       case 83: /* "content.opt" */
 
        break;
       case 83: /* "content.opt" */
 

-/* Line 681 of yacc.c  */
-#line 191 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 190 "../../src/parse-gram.y"

        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 
        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 

-/* Line 681 of yacc.c  */
-#line 1143 "parse-gram.c"
+/* Line 1537 of yacc.c  */
+#line 1139 "../../src/parse-gram.c"

        break;
       case 84: /* "braceless" */
 
        break;
       case 84: /* "braceless" */
 

-/* Line 681 of yacc.c  */
-#line 191 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 190 "../../src/parse-gram.y"

        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 
        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
 

-/* Line 681 of yacc.c  */
-#line 1152 "parse-gram.c"
+/* Line 1537 of yacc.c  */
+#line 1148 "../../src/parse-gram.c"

        break;
       case 85: /* "id" */
 
        break;
       case 85: /* "id" */
 

-/* Line 681 of yacc.c  */
-#line 203 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 202 "../../src/parse-gram.y"

        { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
 
        { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
 

-/* Line 681 of yacc.c  */
-#line 1161 "parse-gram.c"
+/* Line 1537 of yacc.c  */
+#line 1157 "../../src/parse-gram.c"

        break;
       case 86: /* "id_colon" */
 
        break;
       case 86: /* "id_colon" */
 

-/* Line 681 of yacc.c  */
-#line 204 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 203 "../../src/parse-gram.y"

        { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); };
 
        { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); };
 

-/* Line 681 of yacc.c  */
-#line 1170 "parse-gram.c"
+/* Line 1537 of yacc.c  */
+#line 1166 "../../src/parse-gram.c"

        break;
       case 87: /* "symbol" */
 
        break;
       case 87: /* "symbol" */
 

-/* Line 681 of yacc.c  */
-#line 203 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 202 "../../src/parse-gram.y"

        { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
 
        { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
 

-/* Line 681 of yacc.c  */
-#line 1179 "parse-gram.c"
+/* Line 1537 of yacc.c  */
+#line 1175 "../../src/parse-gram.c"

        break;
       case 88: /* "string_as_id" */
 
        break;
       case 88: /* "string_as_id" */
 

-/* Line 681 of yacc.c  */
-#line 203 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 202 "../../src/parse-gram.y"

        { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
 
        { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
 

-/* Line 681 of yacc.c  */
-#line 1188 "parse-gram.c"
+/* Line 1537 of yacc.c  */
+#line 1184 "../../src/parse-gram.c"

        break;
       default:
        break;
        break;
       default:
        break;


@@ -1698,8 +1694,8 @@ YYLTYPE yylloc;
 
   /* User initialization code.  */
   
 
   /* User initialization code.  */
   

-/* Line 1093 of yacc.c  */
-#line 90 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 89 "../../src/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. */


@@ -1707,8 +1703,8 @@ YYLTYPE yylloc;
   boundary_set (&yylloc.end, current_file, 1, 1);
 }
 
   boundary_set (&yylloc.end, current_file, 1, 1);
 }
 

-/* Line 1093 of yacc.c  */
-#line 1712 "parse-gram.c"
+/* Line 1537 of yacc.c  */
+#line 1708 "../../src/parse-gram.c"

   yylsp[0] = yylloc;
   goto yysetstate;
 
   yylsp[0] = yylloc;
   goto yysetstate;
 


@@ -1893,43 +1889,56 @@ yyreduce:
     {
         case 6:
 
     {
         case 6:
 

-/* Line 1280 of yacc.c  */
-#line 227 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 226 "../../src/parse-gram.y"

     {
       code_props plain_code;
       code_props_plain_init (&plain_code, (yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)]));
       code_props_translate_code (&plain_code);
       gram_scanner_last_string_free ();
     {
       code_props plain_code;
       code_props_plain_init (&plain_code, (yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)]));
       code_props_translate_code (&plain_code);
       gram_scanner_last_string_free ();

-      prologue_augment (plain_code.code, (yylsp[(1) - (1)]), union_seen);
+      muscle_code_grow (union_seen ? "post_prologue" : "pre_prologue",
+                        plain_code.code, (yylsp[(1) - (1)]));

       code_scanner_last_string_free ();
     }
     break;
 
   case 7:
 
       code_scanner_last_string_free ();
     }
     break;
 
   case 7:
 

-/* Line 1280 of yacc.c  */
-#line 235 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 235 "../../src/parse-gram.y"

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

-/* Line 1280 of yacc.c  */
-#line 236 "parse-gram.y"
-    { muscle_insert ((yyvsp[(2) - (3)].chars), (yyvsp[(3) - (3)].chars)); }
+/* Line 1537 of yacc.c  */
+#line 237 "../../src/parse-gram.y"
+    {
+      char const name_prefix[] = "percent_define(";
+      size_t length = strlen ((yyvsp[(2) - (3)].uniqstr));
+      char *name = xmalloc (sizeof name_prefix + length + 1);
+      strcpy (name, name_prefix);
+      strcpy (name + sizeof name_prefix - 1, (yyvsp[(2) - (3)].uniqstr));
+      strcpy (name + sizeof name_prefix - 1 + length, ")");
+      if (muscle_find_const (name))
+        warn_at ((yylsp[(2) - (3)]), _("%s `%s' redefined"), "%define variable", (yyvsp[(2) - (3)].uniqstr));
+      MUSCLE_INSERT_STRING (uniqstr_new (name), (yyvsp[(3) - (3)].chars));
+      free (name);
+      muscle_grow_user_name_list ("percent_define_user_variables", (yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]));
+    }

     break;
 
   case 9:
 
     break;
 
   case 9:
 

-/* Line 1280 of yacc.c  */
-#line 237 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 250 "../../src/parse-gram.y"

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

-/* Line 1280 of yacc.c  */
-#line 239 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 252 "../../src/parse-gram.y"

     {
       defines_flag = true;
       spec_defines_file = xstrdup ((yyvsp[(2) - (2)].chars));
     {
       defines_flag = true;
       spec_defines_file = xstrdup ((yyvsp[(2) - (2)].chars));


@@ -1938,43 +1947,43 @@ yyreduce:
 
   case 11:
 
 
   case 11:
 

-/* Line 1280 of yacc.c  */
-#line 243 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 256 "../../src/parse-gram.y"

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

-/* Line 1280 of yacc.c  */
-#line 244 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 257 "../../src/parse-gram.y"

     { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); }
     break;
 
   case 13:
 
     { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); }
     break;
 
   case 13:
 

-/* Line 1280 of yacc.c  */
-#line 245 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 258 "../../src/parse-gram.y"

     { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); }
     break;
 
   case 14:
 
     { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); }
     break;
 
   case 14:
 

-/* Line 1280 of yacc.c  */
-#line 246 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 259 "../../src/parse-gram.y"

     { spec_file_prefix = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 15:
 
     { spec_file_prefix = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 15:
 

-/* Line 1280 of yacc.c  */
-#line 247 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 260 "../../src/parse-gram.y"

     { spec_file_prefix = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 16:
 
     { spec_file_prefix = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 16:
 

-/* Line 1280 of yacc.c  */
-#line 249 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 262 "../../src/parse-gram.y"

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


@@ -1983,8 +1992,8 @@ yyreduce:
 
   case 17:
 
 
   case 17:
 

-/* Line 1280 of yacc.c  */
-#line 254 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 267 "../../src/parse-gram.y"

     {
       code_props action;
       code_props_symbol_action_init (&action, (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)]));
     {
       code_props action;
       code_props_symbol_action_init (&action, (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)]));


@@ -1997,134 +2006,156 @@ yyreduce:
 
   case 18:
 
 
   case 18:
 

-/* Line 1280 of yacc.c  */
-#line 262 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 275 "../../src/parse-gram.y"

     { language_argmatch ((yyvsp[(2) - (2)].chars), 1, &(yylsp[(1) - (2)])); }
     break;
 
   case 19:
 
     { language_argmatch ((yyvsp[(2) - (2)].chars), 1, &(yylsp[(1) - (2)])); }
     break;
 
   case 19:
 

-/* Line 1280 of yacc.c  */
-#line 263 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 276 "../../src/parse-gram.y"

     { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
     break;
 
   case 20:
 
     { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
     break;
 
   case 20:
 

-/* Line 1280 of yacc.c  */
-#line 264 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 277 "../../src/parse-gram.y"

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

-/* Line 1280 of yacc.c  */
-#line 265 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 278 "../../src/parse-gram.y"

     { spec_name_prefix = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 22:
 
     { spec_name_prefix = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 22:
 

-/* Line 1280 of yacc.c  */
-#line 266 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 279 "../../src/parse-gram.y"

     { spec_name_prefix = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 23:
 
     { spec_name_prefix = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 23:
 

-/* Line 1280 of yacc.c  */
-#line 267 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 280 "../../src/parse-gram.y"

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

-/* Line 1280 of yacc.c  */
-#line 268 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 281 "../../src/parse-gram.y"

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

-/* Line 1280 of yacc.c  */
-#line 269 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 282 "../../src/parse-gram.y"

     { spec_outfile = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 26:
 
     { spec_outfile = (yyvsp[(2) - (2)].chars); }
     break;
 
   case 26:
 

-/* Line 1280 of yacc.c  */
-#line 270 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 283 "../../src/parse-gram.y"

     { spec_outfile = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 27:
 
     { spec_outfile = (yyvsp[(3) - (3)].chars); }
     break;
 
   case 27:
 

-/* Line 1280 of yacc.c  */
-#line 271 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 284 "../../src/parse-gram.y"

     { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
     break;
 
   case 28:
 
     { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
     break;
 
   case 28:
 

-/* Line 1280 of yacc.c  */
-#line 272 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 285 "../../src/parse-gram.y"

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

-/* Line 1280 of yacc.c  */
-#line 273 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 286 "../../src/parse-gram.y"

     { push_parser = true; pull_parser = false; }
     break;
 
   case 30:
 
     { push_parser = true; pull_parser = false; }
     break;
 
   case 30:
 

-/* Line 1280 of yacc.c  */
-#line 274 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 287 "../../src/parse-gram.y"

     { push_parser = true; pull_parser = true; }
     break;
 
   case 31:
 
     { push_parser = true; pull_parser = true; }
     break;
 
   case 31:
 

-/* Line 1280 of yacc.c  */
-#line 275 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 288 "../../src/parse-gram.y"

     { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
     break;
 
   case 32:
 
     { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
     break;
 
   case 32:
 

-/* Line 1280 of yacc.c  */
-#line 276 "parse-gram.y"
-    { skeleton_arg ((yyvsp[(2) - (2)].chars), 1, &(yylsp[(1) - (2)])); }
+/* Line 1537 of yacc.c  */
+#line 290 "../../src/parse-gram.y"
+    {
+      char const *skeleton_user = (yyvsp[(2) - (2)].chars);
+      if (strchr (skeleton_user, '/'))
+        {
+          size_t dir_length = strlen (current_file);
+          char *skeleton_build;
+          while (dir_length && current_file[dir_length - 1] != '/')
+            --dir_length;
+          while (dir_length && current_file[dir_length - 1] == '/')
+            --dir_length;
+          skeleton_build =
+            xmalloc (dir_length + 1 + strlen (skeleton_user) + 1);
+          if (dir_length > 0)
+            {
+              strncpy (skeleton_build, current_file, dir_length);
+              skeleton_build[dir_length++] = '/';
+            }
+          strcpy (skeleton_build + dir_length, skeleton_user);
+          skeleton_user = uniqstr_new (skeleton_build);
+          free (skeleton_build);
+        }
+      skeleton_arg (skeleton_user, 1, &(yylsp[(1) - (2)]));
+    }

     break;
 
   case 33:
 
     break;
 
   case 33:
 

-/* Line 1280 of yacc.c  */
-#line 277 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 313 "../../src/parse-gram.y"

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

-/* Line 1280 of yacc.c  */
-#line 278 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 314 "../../src/parse-gram.y"

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

-/* Line 1280 of yacc.c  */
-#line 279 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 315 "../../src/parse-gram.y"

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

-/* Line 1280 of yacc.c  */
-#line 287 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 323 "../../src/parse-gram.y"

     {
       grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]));
     }
     {
       grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]));
     }


@@ -2132,8 +2163,8 @@ yyreduce:
 
   case 40:
 
 
   case 40:
 

-/* Line 1280 of yacc.c  */
-#line 291 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 327 "../../src/parse-gram.y"

     {
       symbol_list *list;
       for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
     {
       symbol_list *list;
       for (list = (yyvsp[(3) - (3)].list); list; list = list->next)


@@ -2144,8 +2175,8 @@ yyreduce:
 
   case 41:
 
 
   case 41:
 

-/* Line 1280 of yacc.c  */
-#line 298 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 334 "../../src/parse-gram.y"

     {
       symbol_list *list;
       for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
     {
       symbol_list *list;
       for (list = (yyvsp[(3) - (3)].list); list; list = list->next)


@@ -2156,8 +2187,8 @@ yyreduce:
 
   case 42:
 
 
   case 42:
 

-/* Line 1280 of yacc.c  */
-#line 305 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 341 "../../src/parse-gram.y"

     {
       default_prec = true;
     }
     {
       default_prec = true;
     }


@@ -2165,8 +2196,8 @@ yyreduce:
 
   case 43:
 
 
   case 43:
 

-/* Line 1280 of yacc.c  */
-#line 309 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 345 "../../src/parse-gram.y"

     {
       default_prec = false;
     }
     {
       default_prec = false;
     }


@@ -2174,85 +2205,68 @@ yyreduce:
 
   case 44:
 
 
   case 44:
 

-/* Line 1280 of yacc.c  */
-#line 313 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 349 "../../src/parse-gram.y"

     {
     {

-      muscle_code_grow ("percent_code", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]));
+      muscle_code_grow ("percent_code()", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]));

       code_scanner_last_string_free ();
     }
     break;
 
   case 45:
 
       code_scanner_last_string_free ();
     }
     break;
 
   case 45:
 

-/* Line 1280 of yacc.c  */
-#line 318 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 354 "../../src/parse-gram.y"

     {
     {

-      char const name_prefix[] = "percent_code_";
-      char *name = xmalloc (sizeof name_prefix + strlen ((yyvsp[(2) - (3)].chars)));
+      char const name_prefix[] = "percent_code(";
+      size_t length = strlen ((yyvsp[(2) - (3)].uniqstr));
+      char *name = xmalloc (sizeof name_prefix + length + 1);

       strcpy (name, name_prefix);
       strcpy (name, name_prefix);

-      strcpy (name + sizeof name_prefix - 1, (yyvsp[(2) - (3)].chars));
+      strcpy (name + sizeof name_prefix - 1, (yyvsp[(2) - (3)].uniqstr));
+      strcpy (name + sizeof name_prefix - 1 + length, ")");

       muscle_code_grow (uniqstr_new (name), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
       free (name);
       code_scanner_last_string_free ();
       muscle_code_grow (uniqstr_new (name), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
       free (name);
       code_scanner_last_string_free ();

-      muscle_grow ("used_percent_code_qualifiers", "[[", ",");
-      muscle_grow ("used_percent_code_qualifiers", (yyvsp[(2) - (3)].chars), "");
-      muscle_grow ("used_percent_code_qualifiers", "]]", "");
+      muscle_grow_user_name_list ("percent_code_user_qualifiers", (yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]));

     }
     break;
 
   case 46:
 
     }
     break;
 
   case 46:
 

-/* Line 1280 of yacc.c  */
-#line 340 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 376 "../../src/parse-gram.y"

     {}
     break;
 
   case 47:
 
     {}
     break;
 
   case 47:
 

-/* Line 1280 of yacc.c  */
-#line 341 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 377 "../../src/parse-gram.y"

     { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 48:
 
     { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 48:
 

-/* Line 1280 of yacc.c  */
-#line 346 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 382 "../../src/parse-gram.y"

     {
     {

-      char const *body = (yyvsp[(3) - (3)].code);
-
-      /* Concatenate the %union bodies.  If this is the first %union, make sure
-        the synchronization line appears after the opening '{' so as not to
-        confuse Doxygen.  Otherwise, turn the previous %union's trailing '}'
-        into '\n', and omit the new %union's leading '{'.  */
-      if (!union_seen)
-       {
-         muscle_grow ("stype", "{", "");
-       }
-      else
-       {
-         char *code = muscle_find ("stype");
-         code[strlen (code) - 1] = '\n';
-       }
-      body++;
-

       union_seen = true;
       union_seen = true;

-      muscle_code_grow ("stype", body, (yylsp[(3) - (3)]));
-      gram_scanner_last_string_free ();
+      muscle_code_grow ("stype", (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
+      code_scanner_last_string_free ();

     }
     break;
 
   case 49:
 
     }
     break;
 
   case 49:
 

-/* Line 1280 of yacc.c  */
-#line 374 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 393 "../../src/parse-gram.y"

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

-/* Line 1280 of yacc.c  */
-#line 375 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 394 "../../src/parse-gram.y"

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


@@ -2261,15 +2275,15 @@ yyreduce:
 
   case 51:
 
 
   case 51:
 

-/* Line 1280 of yacc.c  */
-#line 379 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 398 "../../src/parse-gram.y"

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

-/* Line 1280 of yacc.c  */
-#line 380 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 399 "../../src/parse-gram.y"

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


@@ -2278,8 +2292,8 @@ yyreduce:
 
   case 53:
 
 
   case 53:
 

-/* Line 1280 of yacc.c  */
-#line 385 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 404 "../../src/parse-gram.y"

     {
       symbol_list *list;
       tag_seen = true;
     {
       symbol_list *list;
       tag_seen = true;


@@ -2291,8 +2305,8 @@ yyreduce:
 
   case 54:
 
 
   case 54:
 

-/* Line 1280 of yacc.c  */
-#line 396 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 415 "../../src/parse-gram.y"

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


@@ -2308,99 +2322,99 @@ yyreduce:
 
   case 55:
 
 
   case 55:
 

-/* Line 1280 of yacc.c  */
-#line 410 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 429 "../../src/parse-gram.y"

     { (yyval.assoc) = left_assoc; }
     break;
 
   case 56:
 
     { (yyval.assoc) = left_assoc; }
     break;
 
   case 56:
 

-/* Line 1280 of yacc.c  */
-#line 411 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 430 "../../src/parse-gram.y"

     { (yyval.assoc) = right_assoc; }
     break;
 
   case 57:
 
     { (yyval.assoc) = right_assoc; }
     break;
 
   case 57:
 

-/* Line 1280 of yacc.c  */
-#line 412 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 431 "../../src/parse-gram.y"

     { (yyval.assoc) = non_assoc; }
     break;
 
   case 58:
 
     { (yyval.assoc) = non_assoc; }
     break;
 
   case 58:
 

-/* Line 1280 of yacc.c  */
-#line 416 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 435 "../../src/parse-gram.y"

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

-/* Line 1280 of yacc.c  */
-#line 417 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 436 "../../src/parse-gram.y"

     { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; }
     break;
 
   case 60:
 
     { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; }
     break;
 
   case 60:
 

-/* Line 1280 of yacc.c  */
-#line 423 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 442 "../../src/parse-gram.y"

     { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
     break;
 
   case 61:
 
     { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
     break;
 
   case 61:
 

-/* Line 1280 of yacc.c  */
-#line 425 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 444 "../../src/parse-gram.y"

     { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }
     break;
 
   case 62:
 
     { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }
     break;
 
   case 62:
 

-/* Line 1280 of yacc.c  */
-#line 429 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 448 "../../src/parse-gram.y"

     { (yyval.list) = (yyvsp[(1) - (1)].list); }
     break;
 
   case 63:
 
     { (yyval.list) = (yyvsp[(1) - (1)].list); }
     break;
 
   case 63:
 

-/* Line 1280 of yacc.c  */
-#line 430 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 449 "../../src/parse-gram.y"

     { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
     break;
 
   case 64:
 
     { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
     break;
 
   case 64:
 

-/* Line 1280 of yacc.c  */
-#line 434 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 453 "../../src/parse-gram.y"

     { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
     break;
 
   case 65:
 
     { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
     break;
 
   case 65:
 

-/* Line 1280 of yacc.c  */
-#line 435 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 454 "../../src/parse-gram.y"

     { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 66:
 
     { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 66:
 

-/* Line 1280 of yacc.c  */
-#line 436 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 455 "../../src/parse-gram.y"

     { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); }
     break;
 
   case 67:
 
     { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); }
     break;
 
   case 67:
 

-/* Line 1280 of yacc.c  */
-#line 437 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 456 "../../src/parse-gram.y"

     { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); }
     break;
 
   case 68:
 
     { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); }
     break;
 
   case 68:
 

-/* Line 1280 of yacc.c  */
-#line 443 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 462 "../../src/parse-gram.y"

     {
        current_type = (yyvsp[(1) - (1)].uniqstr);
        tag_seen = true;
     {
        current_type = (yyvsp[(1) - (1)].uniqstr);
        tag_seen = true;


@@ -2409,8 +2423,8 @@ yyreduce:
 
   case 69:
 
 
   case 69:
 

-/* Line 1280 of yacc.c  */
-#line 448 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 467 "../../src/parse-gram.y"

     {
        symbol_class_set ((yyvsp[(1) - (1)].symbol), current_class, (yylsp[(1) - (1)]), true);
        symbol_type_set ((yyvsp[(1) - (1)].symbol), current_type, (yylsp[(1) - (1)]));
     {
        symbol_class_set ((yyvsp[(1) - (1)].symbol), current_class, (yylsp[(1) - (1)]), true);
        symbol_type_set ((yyvsp[(1) - (1)].symbol), current_type, (yylsp[(1) - (1)]));


@@ -2419,8 +2433,8 @@ yyreduce:
 
   case 70:
 
 
   case 70:
 

-/* Line 1280 of yacc.c  */
-#line 453 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 472 "../../src/parse-gram.y"

     {
       symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
       symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)]));
     {
       symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
       symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)]));


@@ -2430,8 +2444,8 @@ yyreduce:
 
   case 71:
 
 
   case 71:
 

-/* Line 1280 of yacc.c  */
-#line 459 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 478 "../../src/parse-gram.y"

     {
       symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
       symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)]));
     {
       symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
       symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)]));


@@ -2441,8 +2455,8 @@ yyreduce:
 
   case 72:
 
 
   case 72:
 

-/* Line 1280 of yacc.c  */
-#line 465 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 484 "../../src/parse-gram.y"

     {
       symbol_class_set ((yyvsp[(1) - (3)].symbol), current_class, (yylsp[(1) - (3)]), true);
       symbol_type_set ((yyvsp[(1) - (3)].symbol), current_type, (yylsp[(1) - (3)]));
     {
       symbol_class_set ((yyvsp[(1) - (3)].symbol), current_class, (yylsp[(1) - (3)]), true);
       symbol_type_set ((yyvsp[(1) - (3)].symbol), current_type, (yylsp[(1) - (3)]));


@@ -2453,8 +2467,8 @@ yyreduce:
 
   case 79:
 
 
   case 79:
 

-/* Line 1280 of yacc.c  */
-#line 495 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 514 "../../src/parse-gram.y"

     {
       yyerrok;
     }
     {
       yyerrok;
     }


@@ -2462,81 +2476,87 @@ yyreduce:
 
   case 80:
 
 
   case 80:
 

-/* Line 1280 of yacc.c  */
-#line 501 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 520 "../../src/parse-gram.y"

     { current_lhs = (yyvsp[(1) - (1)].symbol); current_lhs_location = (yylsp[(1) - (1)]); }
     break;
 
   case 82:
 
     { current_lhs = (yyvsp[(1) - (1)].symbol); current_lhs_location = (yylsp[(1) - (1)]); }
     break;
 
   case 82:
 

-/* Line 1280 of yacc.c  */
-#line 505 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 524 "../../src/parse-gram.y"

     { grammar_current_rule_end ((yylsp[(1) - (1)])); }
     break;
 
   case 83:
 
     { grammar_current_rule_end ((yylsp[(1) - (1)])); }
     break;
 
   case 83:
 

-/* Line 1280 of yacc.c  */
-#line 506 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 525 "../../src/parse-gram.y"

     { grammar_current_rule_end ((yylsp[(3) - (3)])); }
     break;
 
   case 85:
 
     { grammar_current_rule_end ((yylsp[(3) - (3)])); }
     break;
 
   case 85:
 

-/* Line 1280 of yacc.c  */
-#line 512 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 531 "../../src/parse-gram.y"

     { grammar_current_rule_begin (current_lhs, current_lhs_location); }
     break;
 
   case 86:
 
     { grammar_current_rule_begin (current_lhs, current_lhs_location); }
     break;
 
   case 86:
 

-/* Line 1280 of yacc.c  */
-#line 514 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 533 "../../src/parse-gram.y"

     { grammar_current_rule_symbol_append ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); }
     break;
 
   case 87:
 
     { grammar_current_rule_symbol_append ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)])); }
     break;
 
   case 87:
 

-/* Line 1280 of yacc.c  */
-#line 516 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 535 "../../src/parse-gram.y"

     { grammar_current_rule_action_append ((yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
     break;
 
   case 88:
 
     { grammar_current_rule_action_append ((yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
     break;
 
   case 88:
 

-/* Line 1280 of yacc.c  */
-#line 518 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 537 "../../src/parse-gram.y"

     { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); }
     break;
 
   case 89:
 
     { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); }
     break;
 
   case 89:
 

-/* Line 1280 of yacc.c  */
-#line 520 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 539 "../../src/parse-gram.y"

     { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); }
     break;
 
   case 90:
 
     { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); }
     break;
 
   case 90:
 

-/* Line 1280 of yacc.c  */
-#line 522 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 541 "../../src/parse-gram.y"

     { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); }
     break;
 
     { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); }
     break;
 

+  case 92:
+
+/* Line 1537 of yacc.c  */
+#line 551 "../../src/parse-gram.y"
+    { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); }
+    break;
+

   case 93:
 
   case 93:
 

-/* Line 1280 of yacc.c  */
-#line 538 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 557 "../../src/parse-gram.y"

     {
     {

-      static char one[] = "1";
-      (yyval.chars) = one;
+      (yyval.chars) = "";

     }
     break;
 
   case 95:
 
     }
     break;
 
   case 95:
 

-/* Line 1280 of yacc.c  */
-#line 548 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 570 "../../src/parse-gram.y"

     {
       code_props plain_code;
       (yyvsp[(1) - (1)].code)[strlen ((yyvsp[(1) - (1)].code)) - 1] = '\n';
     {
       code_props plain_code;
       (yyvsp[(1) - (1)].code)[strlen ((yyvsp[(1) - (1)].code)) - 1] = '\n';


@@ -2549,15 +2569,15 @@ yyreduce:
 
   case 96:
 
 
   case 96:
 

-/* Line 1280 of yacc.c  */
-#line 568 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 590 "../../src/parse-gram.y"

     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 97:
 
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 97:
 

-/* Line 1280 of yacc.c  */
-#line 570 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 592 "../../src/parse-gram.y"

     {
       (yyval.symbol) = symbol_get (char_name ((yyvsp[(1) - (1)].character)), (yylsp[(1) - (1)]));
       symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false);
     {
       (yyval.symbol) = symbol_get (char_name ((yyvsp[(1) - (1)].character)), (yylsp[(1) - (1)]));
       symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false);


@@ -2567,15 +2587,15 @@ yyreduce:
 
   case 98:
 
 
   case 98:
 

-/* Line 1280 of yacc.c  */
-#line 578 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 600 "../../src/parse-gram.y"

     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 101:
 
     { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
     break;
 
   case 101:
 

-/* Line 1280 of yacc.c  */
-#line 590 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 612 "../../src/parse-gram.y"

     {
       (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[(1) - (1)].chars)), (yylsp[(1) - (1)]));
       symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false);
     {
       (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[(1) - (1)].chars)), (yylsp[(1) - (1)]));
       symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false);


@@ -2584,8 +2604,8 @@ yyreduce:
 
   case 103:
 
 
   case 103:
 

-/* Line 1280 of yacc.c  */
-#line 599 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 621 "../../src/parse-gram.y"

     {
       code_props plain_code;
       code_props_plain_init (&plain_code, (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]));
     {
       code_props plain_code;
       code_props_plain_init (&plain_code, (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]));


@@ -2598,8 +2618,8 @@ yyreduce:
 
 
 
 
 
 

-/* Line 1280 of yacc.c  */
-#line 2603 "parse-gram.c"
+/* Line 1537 of yacc.c  */
+#line 2623 "../../src/parse-gram.c"

       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);


@@ -2817,8 +2837,8 @@ yyreturn:
 
 
 
 
 
 

-/* Line 1497 of yacc.c  */
-#line 609 "parse-gram.y"
+/* Line 1537 of yacc.c  */
+#line 631 "../../src/parse-gram.y"