Add Makevars.template, stamp-po.

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

diff --git a/src/parse-gram.c b/src/parse-gram.c
index 11b6e22e03ed4ae4c41455385ce8b801617a0325..c2f4f27f63c3203765a2574b75f0ebdaaf8c4fea 100644 (file)
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,7 +1,7 @@
-/* A Bison parser, made from parse-gram.y, by GNU bison 1.49b.  */
+/* A Bison parser, made by GNU Bison 1.875c.  */

 
 /* Skeleton parser for Yacc-like parsing with Bison,
 
 /* Skeleton parser for Yacc-like parsing with Bison,

-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.

 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by


@@ -34,10 +34,13 @@
    USER NAME SPACE" below.  */
 
 /* Identify Bison output.  */
    USER NAME SPACE" below.  */
 
 /* Identify Bison output.  */

-#define YYBISON        1
+#define YYBISON 1
+
+/* Skeleton name.  */
+#define YYSKELETON_NAME "yacc.c"

 
 /* Pure parsers.  */
 
 /* Pure parsers.  */

-#define YYPURE 1
+#define YYPURE 1

 
 /* Using locations.  */
 #define YYLSP_NEEDED 1
 
 /* Using locations.  */
 #define YYLSP_NEEDED 1


@@ -53,162 +56,151 @@
 #define yynerrs gram_nerrs
 #define yylloc gram_lloc
 
 #define yynerrs gram_nerrs
 #define yylloc gram_lloc
 

+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     GRAM_EOF = 0,
+     STRING = 258,
+     INT = 259,
+     PERCENT_TOKEN = 260,
+     PERCENT_NTERM = 261,
+     PERCENT_TYPE = 262,
+     PERCENT_DESTRUCTOR = 263,
+     PERCENT_PRINTER = 264,
+     PERCENT_UNION = 265,
+     PERCENT_LEFT = 266,
+     PERCENT_RIGHT = 267,
+     PERCENT_NONASSOC = 268,
+     PERCENT_PREC = 269,
+     PERCENT_DPREC = 270,
+     PERCENT_MERGE = 271,
+     PERCENT_DEBUG = 272,
+     PERCENT_DEFAULT_PREC = 273,
+     PERCENT_DEFINE = 274,
+     PERCENT_DEFINES = 275,
+     PERCENT_ERROR_VERBOSE = 276,
+     PERCENT_EXPECT = 277,
+     PERCENT_FILE_PREFIX = 278,
+     PERCENT_GLR_PARSER = 279,
+     PERCENT_INITIAL_ACTION = 280,
+     PERCENT_LEX_PARAM = 281,
+     PERCENT_LOCATIONS = 282,
+     PERCENT_NAME_PREFIX = 283,
+     PERCENT_NO_DEFAULT_PREC = 284,
+     PERCENT_NO_LINES = 285,
+     PERCENT_NONDETERMINISTIC_PARSER = 286,
+     PERCENT_OUTPUT = 287,
+     PERCENT_PARSE_PARAM = 288,
+     PERCENT_PURE_PARSER = 289,
+     PERCENT_SKELETON = 290,
+     PERCENT_START = 291,
+     PERCENT_TOKEN_TABLE = 292,
+     PERCENT_VERBOSE = 293,
+     PERCENT_YACC = 294,
+     TYPE = 295,
+     EQUAL = 296,
+     SEMICOLON = 297,
+     PIPE = 298,
+     ID = 299,
+     ID_COLON = 300,
+     PERCENT_PERCENT = 301,
+     PROLOGUE = 302,
+     EPILOGUE = 303,
+     BRACED_CODE = 304
+   };
+#endif
+#define GRAM_EOF 0
+#define STRING 258
+#define INT 259
+#define PERCENT_TOKEN 260
+#define PERCENT_NTERM 261
+#define PERCENT_TYPE 262
+#define PERCENT_DESTRUCTOR 263
+#define PERCENT_PRINTER 264
+#define PERCENT_UNION 265
+#define PERCENT_LEFT 266
+#define PERCENT_RIGHT 267
+#define PERCENT_NONASSOC 268
+#define PERCENT_PREC 269
+#define PERCENT_DPREC 270
+#define PERCENT_MERGE 271
+#define PERCENT_DEBUG 272
+#define PERCENT_DEFAULT_PREC 273
+#define PERCENT_DEFINE 274
+#define PERCENT_DEFINES 275
+#define PERCENT_ERROR_VERBOSE 276
+#define PERCENT_EXPECT 277
+#define PERCENT_FILE_PREFIX 278
+#define PERCENT_GLR_PARSER 279
+#define PERCENT_INITIAL_ACTION 280
+#define PERCENT_LEX_PARAM 281
+#define PERCENT_LOCATIONS 282
+#define PERCENT_NAME_PREFIX 283
+#define PERCENT_NO_DEFAULT_PREC 284
+#define PERCENT_NO_LINES 285
+#define PERCENT_NONDETERMINISTIC_PARSER 286
+#define PERCENT_OUTPUT 287
+#define PERCENT_PARSE_PARAM 288
+#define PERCENT_PURE_PARSER 289
+#define PERCENT_SKELETON 290
+#define PERCENT_START 291
+#define PERCENT_TOKEN_TABLE 292
+#define PERCENT_VERBOSE 293
+#define PERCENT_YACC 294
+#define TYPE 295
+#define EQUAL 296
+#define SEMICOLON 297
+#define PIPE 298
+#define ID 299
+#define ID_COLON 300
+#define PERCENT_PERCENT 301
+#define PROLOGUE 302
+#define EPILOGUE 303
+#define BRACED_CODE 304
+
+
+
+

 /* Copy the first part of user declarations.  */
 /* Copy the first part of user declarations.  */

-#line 31 "parse-gram.y"
+#line 32 "parse-gram.y"

 
 #include "system.h"
 
 #include "system.h"

+

 #include "complain.h"
 #include "complain.h"

-#include "muscle_tab.h"
+#include "conflicts.h"

 #include "files.h"
 #include "getargs.h"
 #include "files.h"
 #include "getargs.h"

-#include "output.h"
-#include "symlist.h"

 #include "gram.h"
 #include "gram.h"

+#include "muscle_tab.h"
+#include "output.h"

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

-#include "conflicts.h"
-
-/* Produce verbose parse errors.  */
-#define YYERROR_VERBOSE 1
-#define YYLLOC_DEFAULT(Current, Rhs, N)                        \
-do {                                                   \
-  if (N)                                               \
-  {                                                    \
-    Current.first_column  = Rhs[1].first_column;       \
-    Current.first_line    = Rhs[1].first_line;         \
-    Current.last_column   = Rhs[N].last_column;                \
-    Current.last_line     = Rhs[N].last_line;          \
-  }                                                    \
-  else                                                 \
-  {                                                    \
-    Current = Rhs[0];                                  \
-  }                                                    \
-} while (0)
+#include "symlist.h"

 
 

-/* Pass the control structure to YYPARSE and YYLEX. */
-#define YYPARSE_PARAM gram_control
-#define YYLEX_PARAM gram_control
-/* YYPARSE receives GRAM_CONTROL as a void *.  Provide a
-   correctly typed access to it.  */
-#define yycontrol ((gram_control_t *) gram_control)
+#define YYLLOC_DEFAULT(Current, Rhs, N)  (Current) = lloc_default (Rhs, N)
+static YYLTYPE lloc_default (YYLTYPE const *, int);

 
 

-/* Request detailed parse error messages, and pass them to GRAM_ERROR.
-   FIXME: depends on the undocumented availability of YYLLOC.t */
+/* Request detailed syntax error messages, and pass them to GRAM_ERROR.
+   FIXME: depends on the undocumented availability of YYLLOC.  */

 #undef  yyerror
 #define yyerror(Msg) \
         gram_error (&yylloc, Msg)
 #undef  yyerror
 #define yyerror(Msg) \
         gram_error (&yylloc, Msg)

+static void gram_error (location const *, char const *);

 
 #define YYPRINT(File, Type, Value) \
 
 #define YYPRINT(File, Type, Value) \

-        yyprint (File, Type, &Value)
-static void yyprint (FILE *file, int type, const yystype *value);
+       print_token_value (File, Type, &Value)
+static void print_token_value (FILE *, int, YYSTYPE const *);
+
+static void add_param (char const *, char *, location);

 
 symbol_class current_class = unknown_sym;
 
 symbol_class current_class = unknown_sym;

-char *current_type = 0;
-symbol_t *current_lhs;
-location_t current_lhs_location;
-assoc_t current_assoc;
+uniqstr current_type = 0;
+symbol *current_lhs;
+location current_lhs_location;
+assoc current_assoc;

 int current_prec = 0;
 int current_prec = 0;

-braced_code_t current_braced_code = action_braced_code;
-
-
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# if defined (__STDC__) || defined (__cplusplus)
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     GRAM_EOF = 0,
-     STRING = 258,
-     CHARACTER = 259,
-     INT = 260,
-     PERCENT_TOKEN = 261,
-     PERCENT_NTERM = 262,
-     PERCENT_TYPE = 263,
-     PERCENT_DESTRUCTOR = 264,
-     PERCENT_PRINTER = 265,
-     PERCENT_UNION = 266,
-     PERCENT_LEFT = 267,
-     PERCENT_RIGHT = 268,
-     PERCENT_NONASSOC = 269,
-     PERCENT_EXPECT = 270,
-     PERCENT_START = 271,
-     PERCENT_PREC = 272,
-     PERCENT_DPREC = 273,
-     PERCENT_MERGE = 274,
-     PERCENT_VERBOSE = 275,
-     PERCENT_ERROR_VERBOSE = 276,
-     PERCENT_OUTPUT = 277,
-     PERCENT_FILE_PREFIX = 278,
-     PERCENT_NAME_PREFIX = 279,
-     PERCENT_DEFINE = 280,
-     PERCENT_PURE_PARSER = 281,
-     PERCENT_GLR_PARSER = 282,
-     PERCENT_DEFINES = 283,
-     PERCENT_YACC = 284,
-     PERCENT_DEBUG = 285,
-     PERCENT_LOCATIONS = 286,
-     PERCENT_NO_LINES = 287,
-     PERCENT_SKELETON = 288,
-     PERCENT_TOKEN_TABLE = 289,
-     TYPE = 290,
-     EQUAL = 291,
-     SEMICOLON = 292,
-     COLON = 293,
-     PIPE = 294,
-     ID = 295,
-     PERCENT_PERCENT = 296,
-     PROLOGUE = 297,
-     EPILOGUE = 298,
-     BRACED_CODE = 299
-   };
-# endif
-  /* POSIX requires `int' for tokens in interfaces.  */
-# define YYTOKENTYPE int
-#endif /* !YYTOKENTYPE */
-#define GRAM_EOF 0
-#define STRING 258
-#define CHARACTER 259
-#define INT 260
-#define PERCENT_TOKEN 261
-#define PERCENT_NTERM 262
-#define PERCENT_TYPE 263
-#define PERCENT_DESTRUCTOR 264
-#define PERCENT_PRINTER 265
-#define PERCENT_UNION 266
-#define PERCENT_LEFT 267
-#define PERCENT_RIGHT 268
-#define PERCENT_NONASSOC 269
-#define PERCENT_EXPECT 270
-#define PERCENT_START 271
-#define PERCENT_PREC 272
-#define PERCENT_DPREC 273
-#define PERCENT_MERGE 274
-#define PERCENT_VERBOSE 275
-#define PERCENT_ERROR_VERBOSE 276
-#define PERCENT_OUTPUT 277
-#define PERCENT_FILE_PREFIX 278
-#define PERCENT_NAME_PREFIX 279
-#define PERCENT_DEFINE 280
-#define PERCENT_PURE_PARSER 281
-#define PERCENT_GLR_PARSER 282
-#define PERCENT_DEFINES 283
-#define PERCENT_YACC 284
-#define PERCENT_DEBUG 285
-#define PERCENT_LOCATIONS 286
-#define PERCENT_NO_LINES 287
-#define PERCENT_SKELETON 288
-#define PERCENT_TOKEN_TABLE 289
-#define TYPE 290
-#define EQUAL 291
-#define SEMICOLON 292
-#define COLON 293
-#define PIPE 294
-#define ID 295
-#define PERCENT_PERCENT 296
-#define PROLOGUE 297
-#define EPILOGUE 298
-#define BRACED_CODE 299
-
-

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


@@ -221,56 +213,67 @@ braced_code_t current_braced_code = action_braced_code;
 # undef YYERROR_VERBOSE
 # define YYERROR_VERBOSE 1
 #else
 # undef YYERROR_VERBOSE
 # define YYERROR_VERBOSE 1
 #else

-# define YYERROR_VERBOSE 0
+# define YYERROR_VERBOSE 1

 #endif
 
 #endif
 

-#ifndef YYSTYPE
-#line 89 "parse-gram.y"
-typedef union {
-  symbol_t *symbol;
-  symbol_list_t *list;
+#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
+#line 80 "parse-gram.y"
+typedef union YYSTYPE {
+  symbol *symbol;
+  symbol_list *list;

   int integer;
   int integer;

-  char *string;
-  assoc_t assoc;
-} yystype;
-/* Line 188 of /tmp/prefix/share/bison/yacc.c.  */
-#line 238 "parse-gram.c"
-# define YYSTYPE yystype
+  char *chars;
+  assoc assoc;
+  uniqstr uniqstr;
+} YYSTYPE;
+/* Line 191 of yacc.c.  */
+#line 231 "parse-gram.c"
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1

 # define YYSTYPE_IS_TRIVIAL 1
 #endif
 
 # define YYSTYPE_IS_TRIVIAL 1
 #endif
 

-#ifndef YYLTYPE
-typedef struct yyltype
+#if ! defined (YYLTYPE) && ! defined (YYLTYPE_IS_DECLARED)
+typedef struct YYLTYPE

 {
   int first_line;
   int first_column;
   int last_line;
   int last_column;
 {
   int first_line;
   int first_column;
   int last_line;
   int last_column;

-} yyltype;
-# define YYLTYPE yyltype
+} YYLTYPE;
+# define yyltype YYLTYPE /* obsolescent; will be withdrawn */
+# define YYLTYPE_IS_DECLARED 1

 # define YYLTYPE_IS_TRIVIAL 1
 #endif
 
 # define YYLTYPE_IS_TRIVIAL 1
 #endif
 

+

 /* Copy the second part of user declarations.  */
 
 
 /* Copy the second part of user declarations.  */
 
 

-/* Line 208 of /tmp/prefix/share/bison/yacc.c.  */
-#line 259 "parse-gram.c"
+/* Line 214 of yacc.c.  */
+#line 255 "parse-gram.c"

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

+# ifndef YYFREE
+#  define YYFREE free
+# endif
+# ifndef YYMALLOC
+#  define YYMALLOC malloc
+# endif
+

 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 

-# if YYSTACK_USE_ALLOCA
-#  define YYSTACK_ALLOC alloca
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   define YYSTACK_ALLOC alloca
+#  endif

 # else
 # else

-#  ifndef YYSTACK_USE_ALLOCA
-#   if defined (alloca) || defined (_ALLOCA_H)
-#    define YYSTACK_ALLOC alloca
-#   else
-#    ifdef __GNUC__
-#     define YYSTACK_ALLOC __builtin_alloca
-#    endif
+#  if defined (alloca) || defined (_ALLOCA_H)
+#   define YYSTACK_ALLOC alloca
+#  else
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca

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


@@ -283,15 +286,16 @@ typedef struct yyltype
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
 #   define YYSIZE_T size_t
 #  endif
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
 #   define YYSIZE_T size_t
 #  endif

-#  define YYSTACK_ALLOC malloc
-#  define YYSTACK_FREE free
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE

 # endif
 #endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
 
 
 #if (! defined (yyoverflow) \
      && (! defined (__cplusplus) \
 # endif
 #endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
 
 
 #if (! defined (yyoverflow) \
      && (! defined (__cplusplus) \

-        || (YYLTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+        || (defined (YYLTYPE_IS_TRIVIAL) && YYLTYPE_IS_TRIVIAL \
+             && defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))

 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc


@@ -302,18 +306,18 @@ union yyalloc
 };
 
 /* The size of the maximum gap between one aligned stack and the next.  */
 };
 
 /* The size of the maximum gap between one aligned stack and the next.  */

-# define YYSTACK_GAP_MAX (sizeof (union yyalloc) - 1)
+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)

 
 /* The size of an array large to enough to hold all stacks, each with
    N elements.  */
 # define YYSTACK_BYTES(N) \
      ((N) * (sizeof (short) + sizeof (YYSTYPE) + sizeof (YYLTYPE))     \
 
 /* The size of an array large to enough to hold all stacks, each with
    N elements.  */
 # define YYSTACK_BYTES(N) \
      ((N) * (sizeof (short) + sizeof (YYSTYPE) + sizeof (YYLTYPE))     \

-      + 2 * YYSTACK_GAP_MAX)
+      + 2 * YYSTACK_GAP_MAXIMUM)

 
 /* Copy COUNT objects from FROM to TO.  The source and destination do
    not overlap.  */
 # ifndef YYCOPY
 
 /* Copy COUNT objects from FROM to TO.  The source and destination do
    not overlap.  */
 # ifndef YYCOPY

-#  if 1 < __GNUC__
+#  if defined (__GNUC__) && 1 < __GNUC__

 #   define YYCOPY(To, From, Count) \
       __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
 #  else
 #   define YYCOPY(To, From, Count) \
       __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
 #  else


@@ -322,7 +326,7 @@ union yyalloc
        {                                       \
          register YYSIZE_T yyi;                \
          for (yyi = 0; yyi < (Count); yyi++)   \
        {                                       \
          register YYSIZE_T yyi;                \
          for (yyi = 0; yyi < (Count); yyi++)   \

-           (To)[yyi] = (From)[yyi];    \
+           (To)[yyi] = (From)[yyi];            \

        }                                       \
       while (0)
 #  endif
        }                                       \
       while (0)
 #  endif


@@ -339,32 +343,39 @@ union yyalloc
        YYSIZE_T yynewbytes;                                            \
        YYCOPY (&yyptr->Stack, Stack, yysize);                          \
        Stack = &yyptr->Stack;                                          \
        YYSIZE_T yynewbytes;                                            \
        YYCOPY (&yyptr->Stack, Stack, yysize);                          \
        Stack = &yyptr->Stack;                                          \

-       yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAX;   \
+       yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \

        yyptr += yynewbytes / sizeof (*yyptr);                          \
       }                                                                        \
     while (0)
 
 #endif
 
        yyptr += yynewbytes / sizeof (*yyptr);                          \
       }                                                                        \
     while (0)
 
 #endif
 

+#if defined (__STDC__) || defined (__cplusplus)
+   typedef signed char yysigned_char;
+#else
+   typedef short yysigned_char;
+#endif
+

 /* YYFINAL -- State number of the termination state. */
 #define YYFINAL  3
 /* YYFINAL -- State number of the termination state. */
 #define YYFINAL  3

-#define YYLAST   127
+/* YYLAST -- Last index in YYTABLE.  */
+#define YYLAST   156

 
 /* YYNTOKENS -- Number of terminals. */
 
 /* YYNTOKENS -- Number of terminals. */

-#define YYNTOKENS  45
+#define YYNTOKENS  50

 /* YYNNTS -- Number of nonterminals. */
 /* YYNNTS -- Number of nonterminals. */

-#define YYNNTS  28
+#define YYNNTS  25

 /* YYNRULES -- Number of rules. */
 /* YYNRULES -- Number of rules. */

-#define YYNRULES  75
+#define YYNRULES  78

 /* YYNRULES -- Number of states. */
 /* YYNRULES -- Number of states. */

-#define YYNSTATES  108
+#define YYNSTATES  106

 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2

-#define YYMAXUTOK   299
+#define YYMAXUTOK   304

 
 

-#define YYTRANSLATE(X) \
-  ((unsigned)(X) <= YYMAXUTOK ? yytranslate[X] : YYUNDEFTOK)
+#define YYTRANSLATE(YYX)                                               \
+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)

 
 /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
 static const unsigned char yytranslate[] =
 
 /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
 static const unsigned char yytranslate[] =


@@ -398,7 +409,8 @@ static const unsigned char yytranslate[] =
        5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
       15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
       25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
        5,     6,     7,     8,     9,    10,    11,    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,    40,    41,    42,    43,    44
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,    49

 };
 
 #if YYDEBUG
 };
 
 #if YYDEBUG


@@ -406,52 +418,52 @@ static const unsigned char yytranslate[] =
    YYRHS.  */
 static const unsigned char yyprhs[] =
 {
    YYRHS.  */
 static const unsigned char yyprhs[] =
 {

-       0,     0,     3,     8,     9,    13,    15,    17,    19,    23,
-      25,    27,    30,    34,    36,    40,    42,    46,    48,    50,
-      53,    55,    57,    59,    61,    63,    66,    69,    70,    75,
-      76,    81,    82,    86,    87,    91,    95,    99,   101,   103,
-     105,   106,   108,   110,   113,   115,   117,   120,   123,   127,
-     129,   132,   134,   137,   139,   142,   145,   146,   152,   154,
-     158,   159,   162,   165,   169,   173,   177,   179,   181,   183,
-     185,   187,   189,   190,   193,   194
+       0,     0,     3,     8,     9,    12,    14,    16,    18,    22,
+      24,    26,    29,    33,    35,    37,    39,    41,    45,    47,
+      49,    53,    55,    57,    60,    62,    64,    66,    68,    70,
+      72,    75,    77,    80,    83,    85,    87,    88,    92,    93,
+      97,   101,   105,   107,   109,   111,   112,   114,   116,   119,
+     121,   123,   126,   129,   133,   135,   138,   140,   143,   145,
+     148,   151,   152,   156,   158,   162,   165,   166,   169,   172,
+     176,   180,   184,   186,   188,   190,   192,   194,   195

 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS. */
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS. */

-static const signed char yyrhs[] =
+static const yysigned_char yyrhs[] =

 {
 {

-      46,     0,    -1,    47,    41,    61,    71,    -1,    -1,    47,
-      48,    72,    -1,    49,    -1,    42,    -1,    30,    -1,    25,
-      70,    70,    -1,    28,    -1,    21,    -1,    15,     5,    -1,
-      23,    36,    70,    -1,    31,    -1,    24,    36,    70,    -1,
-      32,    -1,    22,    36,    70,    -1,    26,    -1,    27,    -1,
-      33,    70,    -1,    34,    -1,    20,    -1,    29,    -1,    55,
-      -1,    52,    -1,    16,    67,    -1,    11,    44,    -1,    -1,
-       9,    50,    44,    58,    -1,    -1,    10,    51,    44,    58,
-      -1,    -1,     7,    53,    60,    -1,    -1,     6,    54,    60,
-      -1,     8,    35,    58,    -1,    56,    57,    58,    -1,    12,
-      -1,    13,    -1,    14,    -1,    -1,    35,    -1,    67,    -1,
-      58,    67,    -1,    35,    -1,    40,    -1,    40,     5,    -1,
-      40,    69,    -1,    40,     5,    69,    -1,    59,    -1,    60,
-      59,    -1,    62,    -1,    61,    62,    -1,    63,    -1,    49,
-      37,    -1,     1,    37,    -1,    -1,    40,    38,    64,    65,
-      37,    -1,    66,    -1,    65,    39,    66,    -1,    -1,    66,
-      67,    -1,    66,    68,    -1,    66,    17,    67,    -1,    66,
-      18,     5,    -1,    66,    19,    35,    -1,    40,    -1,    69,
-      -1,     4,    -1,    44,    -1,     3,    -1,     3,    -1,    -1,
-      41,    43,    -1,    -1,    37,    -1
+      51,     0,    -1,    52,    46,    64,    74,    -1,    -1,    52,
+      53,    -1,    54,    -1,    47,    -1,    17,    -1,    19,    73,
+      73,    -1,    20,    -1,    21,    -1,    22,     4,    -1,    23,
+      41,    73,    -1,    24,    -1,    25,    -1,    26,    -1,    27,
+      -1,    28,    41,    73,    -1,    30,    -1,    31,    -1,    32,
+      41,    73,    -1,    33,    -1,    34,    -1,    35,    73,    -1,
+      37,    -1,    38,    -1,    39,    -1,    42,    -1,    58,    -1,
+      55,    -1,    36,    70,    -1,    10,    -1,     8,    61,    -1,
+       9,    61,    -1,    18,    -1,    29,    -1,    -1,     6,    56,
+      63,    -1,    -1,     5,    57,    63,    -1,     7,    40,    61,
+      -1,    59,    60,    61,    -1,    11,    -1,    12,    -1,    13,
+      -1,    -1,    40,    -1,    70,    -1,    61,    70,    -1,    40,
+      -1,    44,    -1,    44,     4,    -1,    44,    72,    -1,    44,
+       4,    72,    -1,    62,    -1,    63,    62,    -1,    65,    -1,
+      64,    65,    -1,    66,    -1,    54,    42,    -1,     1,    42,
+      -1,    -1,    45,    67,    68,    -1,    69,    -1,    68,    43,
+      69,    -1,    68,    42,    -1,    -1,    69,    70,    -1,    69,
+      71,    -1,    69,    14,    70,    -1,    69,    15,     4,    -1,
+      69,    16,    40,    -1,    44,    -1,    72,    -1,    49,    -1,
+       3,    -1,     3,    -1,    -1,    46,    48,    -1

 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const unsigned short yyrline[] =
 {
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const unsigned short yyrline[] =
 {

-       0,   159,   159,   172,   174,   177,   179,   180,   181,   182,
-     183,   184,   185,   186,   187,   188,   189,   190,   191,   192,
-     193,   194,   195,   198,   200,   201,   205,   212,   211,   222,
-     221,   234,   233,   239,   239,   244,   253,   268,   270,   271,
-     274,   276,   281,   283,   287,   292,   297,   303,   309,   319,
-     322,   331,   333,   339,   341,   346,   353,   352,   357,   359,
-     362,   365,   367,   369,   371,   373,   377,   379,   380,   383,
-     389,   398,   406,   411,   417,   419
+       0,   172,   172,   180,   182,   186,   187,   188,   189,   190,
+     191,   192,   193,   194,   199,   203,   204,   205,   206,   207,
+     208,   209,   210,   211,   212,   213,   214,   215,   219,   220,
+     221,   225,   231,   238,   245,   249,   256,   256,   261,   261,
+     266,   276,   291,   292,   293,   297,   298,   304,   305,   310,
+     314,   319,   325,   331,   342,   343,   352,   353,   359,   360,
+     365,   372,   372,   376,   377,   378,   383,   384,   386,   388,
+     390,   392,   397,   398,   402,   408,   417,   424,   426

 };
 #endif
 
 };
 #endif
 


@@ -460,26 +472,28 @@ static const unsigned short yyrline[] =
    First, the terminals, then, starting at YYNTOKENS, nonterminals. */
 static const char *const yytname[] =
 {
    First, the terminals, then, starting at YYNTOKENS, nonterminals. */
 static const char *const yytname[] =
 {

-  "\"end of string\"", "error", "$undefined", "STRING", "CHARACTER", "INT", 
-  "\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor\"", 
-  "\"%printer\"", "\"%union\"", "\"%left\"", "\"%right\"", 
-  "\"%nonassoc\"", "\"%expect\"", "\"%start\"", "\"%prec\"", "\"%dprec\"", 
-  "\"%merge\"", "\"%verbose\"", "\"%error-verbose\"", "\"%output\"", 
-  "\"%file-prefix\"", "\"%name-prefix\"", "\"%define\"", 
-  "\"%pure-parser\"", "\"%glr-parser\"", "\"%defines\"", "\"%yacc\"", 
-  "\"%debug\"", "\"%locations\"", "\"%no-lines\"", "\"%skeleton\"", 
-  "\"%token-table\"", "TYPE", "\"=\"", "\";\"", "\":\"", "\"|\"", 
-  "\"identifier\"", "\"%%\"", "PROLOGUE", "EPILOGUE", "BRACED_CODE", 
-  "$accept", "input", "declarations", "declaration", 
-  "grammar_declaration", "@1", "@2", "symbol_declaration", "@3", "@4", 
-  "precedence_declaration", "precedence_declarator", "type.opt", 
-  "symbols.1", "symbol_def", "symbol_defs.1", "grammar", 
-  "rules_or_grammar_declaration", "rules", "@5", "rhses.1", "rhs", 
-  "symbol", "action", "string_as_id", "string_content", "epilogue.opt", 
-  "semi_colon.opt", 0
+  "\"end of file\"", "error", "$undefined", "\"string\"", "\"integer\"",
+  "\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor {...}\"",
+  "\"%printer {...}\"", "\"%union {...}\"", "\"%left\"", "\"%right\"",
+  "\"%nonassoc\"", "\"%prec\"", "\"%dprec\"", "\"%merge\"", "\"%debug\"",
+  "\"%default-prec\"", "\"%define\"", "\"%defines\"", "\"%error-verbose\"",
+  "\"%expect\"", "\"%file-prefix\"", "\"%glr-parser\"",
+  "\"%initial-action {...}\"", "\"%lex-param {...}\"", "\"%locations\"",
+  "\"%name-prefix\"", "\"%no-default-prec\"", "\"%no-lines\"",
+  "\"%nondeterministic-parser\"", "\"%output\"", "\"%parse-param {...}\"",
+  "\"%pure-parser\"", "\"%skeleton\"", "\"%start\"", "\"%token-table\"",
+  "\"%verbose\"", "\"%yacc\"", "\"type\"", "\"=\"", "\";\"", "\"|\"",
+  "\"identifier\"", "\"identifier:\"", "\"%%\"", "\"%{...%}\"",
+  "\"epilogue\"", "\"{...}\"", "$accept", "input", "declarations",
+  "declaration", "grammar_declaration", "symbol_declaration", "@1", "@2",
+  "precedence_declaration", "precedence_declarator", "type.opt",
+  "symbols.1", "symbol_def", "symbol_defs.1", "grammar",
+  "rules_or_grammar_declaration", "rules", "@3", "rhses.1", "rhs",
+  "symbol", "action", "string_as_id", "string_content", "epilogue.opt", 0

 };
 #endif
 
 };
 #endif
 

+# ifdef YYPRINT

 /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
    token YYLEX-NUM.  */
 static const unsigned short yytoknum[] =
 /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
    token YYLEX-NUM.  */
 static const unsigned short yytoknum[] =


@@ -488,33 +502,34 @@ static const unsigned short yytoknum[] =
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
      275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
      285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
      275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
      285,   286,   287,   288,   289,   290,   291,   292,   293,   294,

-     295,   296,   297,   298,   299
+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304

 };
 };

+# endif

 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const unsigned char yyr1[] =
 {
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const unsigned char yyr1[] =
 {

-       0,    45,    46,    47,    47,    48,    48,    48,    48,    48,
-      48,    48,    48,    48,    48,    48,    48,    48,    48,    48,
-      48,    48,    48,    49,    49,    49,    49,    50,    49,    51,
-      49,    53,    52,    54,    52,    52,    55,    56,    56,    56,
-      57,    57,    58,    58,    59,    59,    59,    59,    59,    60,
-      60,    61,    61,    62,    62,    62,    64,    63,    65,    65,
-      66,    66,    66,    66,    66,    66,    67,    67,    67,    68,
-      69,    70,    71,    71,    72,    72
+       0,    50,    51,    52,    52,    53,    53,    53,    53,    53,
+      53,    53,    53,    53,    53,    53,    53,    53,    53,    53,
+      53,    53,    53,    53,    53,    53,    53,    53,    54,    54,
+      54,    54,    54,    54,    54,    54,    56,    55,    57,    55,
+      55,    58,    59,    59,    59,    60,    60,    61,    61,    62,
+      62,    62,    62,    62,    63,    63,    64,    64,    65,    65,
+      65,    67,    66,    68,    68,    68,    69,    69,    69,    69,
+      69,    69,    70,    70,    71,    72,    73,    74,    74

 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
 static const unsigned char yyr2[] =
 {
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
 static const unsigned char yyr2[] =
 {

-       0,     2,     4,     0,     3,     1,     1,     1,     3,     1,
-       1,     2,     3,     1,     3,     1,     3,     1,     1,     2,
-       1,     1,     1,     1,     1,     2,     2,     0,     4,     0,
-       4,     0,     3,     0,     3,     3,     3,     1,     1,     1,
-       0,     1,     1,     2,     1,     1,     2,     2,     3,     1,
-       2,     1,     2,     1,     2,     2,     0,     5,     1,     3,
-       0,     2,     2,     3,     3,     3,     1,     1,     1,     1,
-       1,     1,     0,     2,     0,     1
+       0,     2,     4,     0,     2,     1,     1,     1,     3,     1,
+       1,     2,     3,     1,     1,     1,     1,     3,     1,     1,
+       3,     1,     1,     2,     1,     1,     1,     1,     1,     1,
+       2,     1,     2,     2,     1,     1,     0,     3,     0,     3,
+       3,     3,     1,     1,     1,     0,     1,     1,     2,     1,
+       1,     2,     2,     3,     1,     2,     1,     2,     1,     2,
+       2,     0,     3,     1,     3,     2,     0,     2,     2,     3,
+       3,     3,     1,     1,     1,     1,     1,     0,     2

 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state


@@ -522,106 +537,113 @@ static const unsigned char yyr2[] =
    means the default is an error.  */
 static const unsigned char yydefact[] =
 {
    means the default is an error.  */
 static const unsigned char yydefact[] =
 {

-       3,     0,     0,     1,    33,    31,     0,    27,    29,     0,
-      37,    38,    39,     0,     0,    21,    10,     0,     0,     0,
-       0,    17,    18,     9,    22,     7,    13,    15,     0,    20,
-       0,     6,    74,     5,    24,    23,    40,     0,     0,     0,
-       0,     0,    26,    11,    70,    68,    66,    25,    67,     0,
-       0,     0,    71,     0,    19,     0,     0,     0,     0,    51,
-      53,    75,     4,    41,     0,    44,    45,    49,    34,    32,
-      35,    42,     0,     0,    16,    12,    14,     8,    55,    56,
-      54,     0,    52,     2,    36,    46,    47,    50,    43,    28,
-      30,    60,    73,    48,     0,    58,    57,    60,     0,     0,
-       0,    69,    61,    62,    59,    63,    64,    65
+       3,     0,     0,     1,    38,    36,     0,     0,     0,    31,
+      42,    43,    44,     7,    34,     0,     9,    10,     0,     0,
+      13,    14,    15,    16,     0,    35,    18,    19,     0,    21,
+      22,     0,     0,    24,    25,    26,    27,     0,     6,     4,
+       5,    29,    28,    45,     0,     0,     0,    75,    72,    32,
+      47,    73,    33,    76,     0,    11,     0,     0,     0,    23,
+      30,     0,    61,     0,     0,    56,    58,    46,     0,    49,
+      50,    54,    39,    37,    40,    48,     8,    12,    17,    20,
+      60,    66,    59,     0,    57,     2,    41,    51,    52,    55,
+      62,    63,    78,    53,    65,    66,     0,     0,     0,    74,
+      67,    68,    64,    69,    70,    71

 };
 
 /* YYDEFGOTO[NTERM-NUM]. */
 };
 
 /* YYDEFGOTO[NTERM-NUM]. */

-static const signed char yydefgoto[] =
+static const yysigned_char yydefgoto[] =

 {
 {

-      -1,     1,     2,    32,    57,    40,    41,    34,    38,    37,
-      35,    36,    64,    70,    67,    68,    58,    59,    60,    91,
-      94,    95,    71,   103,    48,    53,    83,    62
+      -1,     1,     2,    39,    63,    41,    45,    44,    42,    43,
+      68,    49,    71,    72,    64,    65,    66,    81,    90,    91,
+      50,   101,    51,    54,    85

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

-#define YYPACT_NINF -61
-static const signed char yypact[] =
+#define YYPACT_NINF -67
+static const yysigned_char yypact[] =

 {
 {

-     -61,    35,    85,   -61,   -61,   -61,     2,   -61,   -61,    -5,
-     -61,   -61,   -61,    31,     0,   -61,   -61,    18,    21,    22,
-      59,   -61,   -61,   -61,   -61,   -61,   -61,   -61,    59,   -61,
-      37,   -61,    26,   -61,   -61,   -61,    29,   -19,   -19,     0,
-      23,    24,   -61,   -61,   -61,   -61,   -61,   -61,   -61,    59,
-      59,    59,   -61,    59,   -61,    28,    33,    32,     1,   -61,
-     -61,   -61,   -61,   -61,     0,   -61,    17,   -61,   -19,   -19,
-       0,   -61,     0,     0,   -61,   -61,   -61,   -61,   -61,   -61,
-     -61,    30,   -61,   -61,     0,    63,   -61,   -61,   -61,     0,
-       0,   -61,   -61,   -61,    -8,    15,   -61,   -61,     0,    67,
-      39,   -61,   -61,   -61,    15,   -61,   -61,   -61
+     -67,     8,   109,   -67,   -67,   -67,   -30,     0,     0,   -67,
+     -67,   -67,   -67,   -67,   -67,    13,   -67,   -67,    20,   -16,
+     -67,   -67,   -67,   -67,   -15,   -67,   -67,   -67,    -5,   -67,
+     -67,    13,     0,   -67,   -67,   -67,   -67,    68,   -67,   -67,
+     -67,   -67,   -67,    -3,   -35,   -35,     0,   -67,   -67,     0,
+     -67,   -67,     0,   -67,    13,   -67,    13,    13,    13,   -67,
+     -67,    -4,   -67,     4,    22,   -67,   -67,   -67,     0,   -67,
+       3,   -67,   -35,   -35,     0,   -67,   -67,   -67,   -67,   -67,
+     -67,   -67,   -67,     1,   -67,   -67,     0,    38,   -67,   -67,
+     -31,    -1,   -67,   -67,   -67,   -67,     0,    41,     7,   -67,
+     -67,   -67,    -1,   -67,   -67,   -67

 };
 
 /* YYPGOTO[NTERM-NUM].  */
 };
 
 /* YYPGOTO[NTERM-NUM].  */

-static const signed char yypgoto[] =
+static const yysigned_char yypgoto[] =

 {
 {

-     -61,   -61,   -61,   -61,    76,   -61,   -61,   -61,   -61,   -61,
-     -61,   -61,   -61,   -12,   -45,    41,   -61,    25,   -61,   -61,
-     -61,   -17,   -14,   -61,   -60,   -23,   -61,   -61
+     -67,   -67,   -67,   -67,    48,   -67,   -67,   -67,   -67,   -67,
+     -67,    -7,   -54,    10,   -67,   -12,   -67,   -67,   -67,   -42,
+     -32,   -67,   -66,    31,   -67

 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
 };
 
 /* 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 zero, do what YYDEFACT says.  */
-#define YYTABLE_NINF -62
-static const signed char yytable[] =
+   number is the opposite.  If zero, do what YYDEFACT says.
+   If YYTABLE_NINF, syntax error.  */
+#define YYTABLE_NINF -78
+static const yysigned_char yytable[] =

 {
 {

-      47,   -72,    55,    44,    45,    54,    86,     4,     5,     6,
-       7,     8,     9,    10,    11,    12,    65,    14,    44,    45,
-      44,    66,    85,    87,    87,    93,    74,    75,    76,    96,
-      77,    97,    98,    99,   100,     3,    43,    39,    55,    42,
-      46,    56,    81,     4,     5,     6,     7,     8,     9,    10,
-      11,    12,    84,    14,    49,    46,    88,    50,    51,   101,
-      89,    90,    52,    61,    63,    78,    44,    72,    73,    80,
-      88,    79,   106,    92,   107,    88,    88,    56,    33,    69,
-     104,   102,     0,    82,   105,     0,     0,     0,     0,     0,
-     102,     4,     5,     6,     7,     8,     9,    10,    11,    12,
-      13,    14,     0,     0,     0,    15,    16,    17,    18,    19,
-      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
-       0,     0,     0,     0,     0,     0,    30,    31
+      60,    52,    47,    47,    88,    69,    47,    87,     3,    70,
+      46,    94,    95,    96,    97,    98,    53,    75,    89,    89,
+      75,    93,   -77,    61,    55,    56,    57,     4,     5,     6,
+       7,     8,     9,    10,    11,    12,    58,    67,    80,    74,
+      14,    47,    75,    48,    48,   104,    82,   105,    99,    92,
+      40,    25,    84,   102,    75,    73,     0,     0,    32,   100,
+       0,    86,    59,     0,   103,     0,     0,    62,    83,    61,
+     100,     0,     0,     4,     5,     6,     7,     8,     9,    10,
+      11,    12,     0,     0,     0,    76,    14,    77,    78,    79,
+       0,     0,     0,     0,     0,     0,     0,    25,     0,     0,
+       0,     0,     0,     0,    32,     0,     0,     0,     0,     0,
+       0,     0,     0,    62,     4,     5,     6,     7,     8,     9,
+      10,    11,    12,     0,     0,     0,    13,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
+      27,    28,    29,    30,    31,    32,    33,    34,    35,     0,
+       0,    36,     0,     0,     0,    37,    38

 };
 
 };
 

-static const signed char yycheck[] =
+static const yysigned_char yycheck[] =

 {
 {

-      14,     0,     1,     3,     4,    28,    66,     6,     7,     8,
-       9,    10,    11,    12,    13,    14,    35,    16,     3,     4,
-       3,    40,     5,    68,    69,    85,    49,    50,    51,    37,
-      53,    39,    17,    18,    19,     0,     5,    35,     1,    44,
-      40,    40,    41,     6,     7,     8,     9,    10,    11,    12,
-      13,    14,    64,    16,    36,    40,    70,    36,    36,    44,
-      72,    73,     3,    37,    35,    37,     3,    44,    44,    37,
-      84,    38,     5,    43,    35,    89,    90,    40,     2,    38,
-      97,    95,    -1,    58,    98,    -1,    -1,    -1,    -1,    -1,
-     104,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    -1,    -1,    -1,    20,    21,    22,    23,    24,
-      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
-      -1,    -1,    -1,    -1,    -1,    -1,    41,    42
+      32,     8,     3,     3,    70,    40,     3,     4,     0,    44,
+      40,    42,    43,    14,    15,    16,     3,    49,    72,    73,
+      52,    87,     0,     1,     4,    41,    41,     5,     6,     7,
+       8,     9,    10,    11,    12,    13,    41,    40,    42,    46,
+      18,     3,    74,    44,    44,     4,    42,    40,    49,    48,
+       2,    29,    64,    95,    86,    45,    -1,    -1,    36,    91,
+      -1,    68,    31,    -1,    96,    -1,    -1,    45,    46,     1,
+     102,    -1,    -1,     5,     6,     7,     8,     9,    10,    11,
+      12,    13,    -1,    -1,    -1,    54,    18,    56,    57,    58,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    29,    -1,    -1,
+      -1,    -1,    -1,    -1,    36,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    45,     5,     6,     7,     8,     9,    10,
+      11,    12,    13,    -1,    -1,    -1,    17,    18,    19,    20,
+      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
+      31,    32,    33,    34,    35,    36,    37,    38,    39,    -1,
+      -1,    42,    -1,    -1,    -1,    46,    47

 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
 static const unsigned char yystos[] =
 {
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
 static const unsigned char yystos[] =
 {

-       0,    46,    47,     0,     6,     7,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,    20,    21,    22,    23,    24,
-      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
-      41,    42,    48,    49,    52,    55,    56,    54,    53,    35,
-      50,    51,    44,     5,     3,     4,    40,    67,    69,    36,
-      36,    36,     3,    70,    70,     1,    40,    49,    61,    62,
-      63,    37,    72,    35,    57,    35,    40,    59,    60,    60,
-      58,    67,    44,    44,    70,    70,    70,    70,    37,    38,
-      37,    41,    62,    71,    58,     5,    69,    59,    67,    58,
-      58,    64,    43,    69,    65,    66,    37,    39,    17,    18,
-      19,    44,    67,    68,    66,    67,     5,    35
+       0,    51,    52,     0,     5,     6,     7,     8,     9,    10,
+      11,    12,    13,    17,    18,    19,    20,    21,    22,    23,
+      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
+      34,    35,    36,    37,    38,    39,    42,    46,    47,    53,
+      54,    55,    58,    59,    57,    56,    40,     3,    44,    61,
+      70,    72,    61,     3,    73,     4,    41,    41,    41,    73,
+      70,     1,    45,    54,    64,    65,    66,    40,    60,    40,
+      44,    62,    63,    63,    61,    70,    73,    73,    73,    73,
+      42,    67,    42,    46,    65,    74,    61,     4,    72,    62,
+      68,    69,    48,    72,    42,    43,    14,    15,    16,    49,
+      70,    71,    69,    70,     4,    40

 };
 
 #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
 };
 
 #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)


@@ -642,12 +664,13 @@ static const unsigned char yystos[] =
 
 #define yyerrok                (yyerrstatus = 0)
 #define yyclearin      (yychar = YYEMPTY)
 
 #define yyerrok                (yyerrstatus = 0)
 #define yyclearin      (yychar = YYEMPTY)

-#define YYEMPTY                -2
+#define YYEMPTY                (-2)

 #define YYEOF          0
 
 #define YYACCEPT       goto yyacceptlab
 #define YYABORT                goto yyabortlab
 #define YYEOF          0
 
 #define YYACCEPT       goto yyacceptlab
 #define YYABORT                goto yyabortlab

-#define YYERROR                goto yyerrlab1
+#define YYERROR                goto yyerrorlab
+

 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.


@@ -663,13 +686,13 @@ do                                                                \
     {                                                          \
       yychar = (Token);                                                \
       yylval = (Value);                                                \
     {                                                          \
       yychar = (Token);                                                \
       yylval = (Value);                                                \

-      yychar1 = YYTRANSLATE (yychar);                          \
+      yytoken = YYTRANSLATE (yychar);                          \

       YYPOPSTACK;                                              \
       goto yybackup;                                           \
     }                                                          \
   else                                                         \
     {                                                          \
       YYPOPSTACK;                                              \
       goto yybackup;                                           \
     }                                                          \
   else                                                         \
     {                                                          \

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

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


@@ -681,19 +704,19 @@ while (0)
    are run).  */
 
 #ifndef YYLLOC_DEFAULT
    are run).  */
 
 #ifndef YYLLOC_DEFAULT

-# define YYLLOC_DEFAULT(Current, Rhs, N)           \
-  Current.first_line   = Rhs[1].first_line;      \
-  Current.first_column = Rhs[1].first_column;    \
-  Current.last_line    = Rhs[N].last_line;       \
-  Current.last_column  = Rhs[N].last_column;
+# define YYLLOC_DEFAULT(Current, Rhs, N)               \
+   ((Current).first_line   = (Rhs)[1].first_line,      \
+    (Current).first_column = (Rhs)[1].first_column,    \
+    (Current).last_line    = (Rhs)[N].last_line,       \
+    (Current).last_column  = (Rhs)[N].last_column)

 #endif
 
 /* YYLEX -- calling `yylex' with the right arguments.  */
 
 #ifdef YYLEX_PARAM
 #endif
 
 /* YYLEX -- calling `yylex' with the right arguments.  */
 
 #ifdef YYLEX_PARAM

-# define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM)
+# define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM)

 #else
 #else

-# define YYLEX yylex (&yylval, &yylloc)
+# define YYLEX yylex (&yylval, &yylloc)

 #endif
 
 /* Enable debugging if requested.  */
 #endif
 
 /* Enable debugging if requested.  */


@@ -709,19 +732,93 @@ do {                                              \
   if (yydebug)                                 \
     YYFPRINTF Args;                            \
 } while (0)
   if (yydebug)                                 \
     YYFPRINTF Args;                            \
 } while (0)

+

 # define YYDSYMPRINT(Args)                     \
 do {                                           \
   if (yydebug)                                 \
     yysymprint Args;                           \
 } while (0)
 # define YYDSYMPRINT(Args)                     \
 do {                                           \
   if (yydebug)                                 \
     yysymprint Args;                           \
 } while (0)

+
+# define YYDSYMPRINTF(Title, Token, Value, Location)           \
+do {                                                           \
+  if (yydebug)                                                 \
+    {                                                          \
+      YYFPRINTF (stderr, "%s ", Title);                                \
+      yysymprint (stderr,                                      \
+                  Token, Value, Location);     \
+      YYFPRINTF (stderr, "\n");                                        \
+    }                                                          \
+} while (0)
+
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (included).                                                   |
+`------------------------------------------------------------------*/
+
+#if defined (__STDC__) || defined (__cplusplus)
+static void
+yy_stack_print (short *bottom, short *top)
+#else
+static void
+yy_stack_print (bottom, top)
+    short *bottom;
+    short *top;
+#endif
+{
+  YYFPRINTF (stderr, "Stack now");
+  for (/* Nothing. */; bottom <= top; ++bottom)
+    YYFPRINTF (stderr, " %d", *bottom);
+  YYFPRINTF (stderr, "\n");
+}
+
+# define YY_STACK_PRINT(Bottom, Top)                           \
+do {                                                           \
+  if (yydebug)                                                 \
+    yy_stack_print ((Bottom), (Top));                          \
+} while (0)
+
+
+/*------------------------------------------------.
+| Report that the YYRULE is going to be reduced.  |
+`------------------------------------------------*/
+
+#if defined (__STDC__) || defined (__cplusplus)
+static void
+yy_reduce_print (int yyrule)
+#else
+static void
+yy_reduce_print (yyrule)
+    int yyrule;
+#endif
+{
+  int yyi;
+  unsigned int yylno = yyrline[yyrule];
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
+             yyrule - 1, yylno);
+  /* Print the symbols being reduced, and their result.  */
+  for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
+    YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
+  YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]);
+}
+
+# define YY_REDUCE_PRINT(Rule)         \
+do {                                   \
+  if (yydebug)                         \
+    yy_reduce_print (Rule);            \
+} while (0)
+

 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */
 int yydebug;
 #else /* !YYDEBUG */
 # define YYDPRINTF(Args)
 # define YYDSYMPRINT(Args)
 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */
 int yydebug;
 #else /* !YYDEBUG */
 # define YYDPRINTF(Args)
 # define YYDSYMPRINT(Args)

+# define YYDSYMPRINTF(Title, Token, Value, Location)
+# define YY_STACK_PRINT(Bottom, Top)
+# define YY_REDUCE_PRINT(Rule)

 #endif /* !YYDEBUG */
 
 #endif /* !YYDEBUG */
 

+

 /* YYINITDEPTH -- initial size of the parser's stacks.  */
 #ifndef        YYINITDEPTH
 # define YYINITDEPTH 200
 /* YYINITDEPTH -- initial size of the parser's stacks.  */
 #ifndef        YYINITDEPTH
 # define YYINITDEPTH 200


@@ -734,7 +831,7 @@ int yydebug;
    SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
    evaluated with infinite-precision integer arithmetic.  */
 
    SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
    evaluated with infinite-precision integer arithmetic.  */
 

-#if YYMAXDEPTH == 0
+#if defined (YYMAXDEPTH) && YYMAXDEPTH == 0

 # undef YYMAXDEPTH
 #endif
 
 # undef YYMAXDEPTH
 #endif
 


@@ -800,178 +897,115 @@ yystpcpy (yydest, yysrc)
 \f
 
 #if YYDEBUG
 \f
 
 #if YYDEBUG

-/*-----------------------------.
-| Print this symbol on YYOUT.  |
-`-----------------------------*/
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/

 
 

-static void

 #if defined (__STDC__) || defined (__cplusplus)
 #if defined (__STDC__) || defined (__cplusplus)

-yysymprint (FILE* yyout, int yytype, YYSTYPE yyvalue, YYLTYPE yylocation)
+static void
+yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp)

 #else
 #else

-yysymprint (yyout, yytype, yyvalue, yylocation)
-    FILE* yyout;
+static void
+yysymprint (yyoutput, yytype, yyvaluep, yylocationp)
+    FILE *yyoutput;

     int yytype;
     int yytype;

-    YYSTYPE yyvalue;
-    YYLTYPE yylocation;
+    YYSTYPE *yyvaluep;
+    YYLTYPE *yylocationp;

 #endif
 {
   /* Pacify ``unused variable'' warnings.  */
 #endif
 {
   /* Pacify ``unused variable'' warnings.  */

-  (void) yyvalue;
-  (void) yylocation;
+  (void) yyvaluep;
+  (void) yylocationp;

 
   if (yytype < YYNTOKENS)
     {
 
   if (yytype < YYNTOKENS)
     {

-      YYFPRINTF (yyout, "token %s (", yytname[yytype]);
+      YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);

 # ifdef YYPRINT
 # ifdef YYPRINT

-      YYPRINT (yyout, yytoknum[yytype], yyvalue);
+      YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);

 # endif
     }
   else
 # endif
     }
   else

-    YYFPRINTF (yyout, "nterm %s (", yytname[yytype]);
+    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);

 
   switch (yytype)
     {
       default:
         break;
     }
 
   switch (yytype)
     {
       default:
         break;
     }

-  YYFPRINTF (yyout, ")");
-}
-#endif /* YYDEBUG. */
-
-
-/*----------------------------------------------------------.
-| yyreport_parse_error -- report a parse error in YYSTATE.  |
-`----------------------------------------------------------*/
-
-static void
-#if defined (__STDC__) || defined (__cplusplus)
-yyreport_parse_error (int yystate, int yychar, YYSTYPE yyvalue, YYLTYPE yylloc)
-#else
-yyreport_parse_error (yystate, yychar, yyvalue, yylloc)
-    int yystate;
-    int yychar;
-    YYSTYPE yyvalue;
-    YYLTYPE yylloc;
-#endif
-{
-#if YYERROR_VERBOSE
-  int yyn = yypact[yystate];
-
-  if (YYPACT_NINF < yyn && yyn < YYLAST)
-    {
-      YYSIZE_T yysize = 0;
-      int yytype = YYTRANSLATE (yychar);
-      char *yymsg;
-      int yyx, yycount;
-
-      yycount = 0;
-      /* Start YYX at -YYN if negative to avoid negative indexes in
-        YYCHECK.  */
-      for (yyx = yyn < 0 ? -yyn : 0;
-          yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
-       if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-         yysize += yystrlen (yytname[yyx]) + 15, yycount++;
-      yysize += yystrlen ("parse error, unexpected ") + 1;
-      yysize += yystrlen (yytname[yytype]);
-      yymsg = (char *) YYSTACK_ALLOC (yysize);
-      if (yymsg != 0)
-       {
-         char *yyp = yystpcpy (yymsg, "parse error, unexpected ");
-         yyp = yystpcpy (yyp, yytname[yytype]);
-
-         if (yycount < 5)
-           {
-             yycount = 0;
-             for (yyx = yyn < 0 ? -yyn : 0;
-                  yyx < (int) (sizeof (yytname) / sizeof (char *));
-                  yyx++)
-               if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-                 {
-                   const char *yyq = ! yycount ? ", expecting " : " or ";
-                   yyp = yystpcpy (yyp, yyq);
-                   yyp = yystpcpy (yyp, yytname[yyx]);
-                   yycount++;
-                 }
-           }
-         yyerror (yymsg);
-         YYSTACK_FREE (yymsg);
-       }
-      else
-       yyerror ("parse error; also virtual memory exhausted");
-    }
-  else
-#endif /* YYERROR_VERBOSE */
-    yyerror ("parse error");
-
-  /* Pacify ``unused variable'' warnings.  */
-  (void) yystate;
-  (void) yychar;
-  (void) yyvalue;
-  (void) yylloc;
+  YYFPRINTF (yyoutput, ")");

 }
 
 }
 

-
+#endif /* ! YYDEBUG */

 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
 
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
 

-static void

 #if defined (__STDC__) || defined (__cplusplus)
 #if defined (__STDC__) || defined (__cplusplus)

-yydestruct (int yytype, YYSTYPE yyvalue, YYLTYPE yylocation)
+static void
+yydestruct (int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp)

 #else
 #else

-yydestruct (yytype, yyvalue, yylocation)
+static void
+yydestruct (yytype, yyvaluep, yylocationp)

     int yytype;
     int yytype;

-    YYSTYPE yyvalue;
-    YYLTYPE yylocation;
+    YYSTYPE *yyvaluep;
+    YYLTYPE *yylocationp;

 #endif
 {
   /* Pacify ``unused variable'' warnings.  */
 #endif
 {
   /* Pacify ``unused variable'' warnings.  */

-  (void) yyvalue;
-  (void) yylocation;
+  (void) yyvaluep;
+  (void) yylocationp;

 
   switch (yytype)
     {
 
   switch (yytype)
     {

+

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

-

 \f
 
 \f
 

-/* The user can define YYPARSE_PARAM as the name of an argument to be passed
-   into yyparse.  The argument should have type void *.
-   It should actually point to an object.
-   Grammar actions can access the variable by casting it
-   to the proper pointer type.  */
+/* Prevent warnings from -Wmissing-prototypes.  */

 
 #ifdef YYPARSE_PARAM
 # if defined (__STDC__) || defined (__cplusplus)
 
 #ifdef YYPARSE_PARAM
 # if defined (__STDC__) || defined (__cplusplus)

-#  define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
-#  define YYPARSE_PARAM_DECL
+int yyparse (void *YYPARSE_PARAM);

 # else
 # else

-#  define YYPARSE_PARAM_ARG YYPARSE_PARAM
-#  define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
+int yyparse ();

 # endif
 # endif

-#else /* !YYPARSE_PARAM */
-# define YYPARSE_PARAM_ARG
-# define YYPARSE_PARAM_DECL
-#endif /* !YYPARSE_PARAM */
-
-/* Prevent warning if -Wstrict-prototypes.  */
-#ifdef __GNUC__
-# ifdef YYPARSE_PARAM
-int yyparse (void *);
-# else
+#else /* ! YYPARSE_PARAM */
+#if defined (__STDC__) || defined (__cplusplus)

 int yyparse (void);
 int yyparse (void);

-# endif
+#else
+int yyparse ();

 #endif
 #endif

+#endif /* ! YYPARSE_PARAM */

 
 
 
 
 
 
 
 

+
+
+/*----------.
+| yyparse.  |
+`----------*/
+
+#ifdef YYPARSE_PARAM
+# if defined (__STDC__) || defined (__cplusplus)
+int yyparse (void *YYPARSE_PARAM)
+# else
+int yyparse (YYPARSE_PARAM)
+  void *YYPARSE_PARAM;
+# endif
+#else /* ! YYPARSE_PARAM */
+#if defined (__STDC__) || defined (__cplusplus)
+int
+yyparse (void)
+#else

 int
 int

-yyparse (YYPARSE_PARAM_ARG)
-     YYPARSE_PARAM_DECL
+yyparse ()
+
+#endif
+#endif

 {
   /* The lookahead symbol.  */
 int yychar;
 {
   /* The lookahead symbol.  */
 int yychar;


@@ -979,7 +1013,7 @@ int yychar;
 /* The semantic value of the lookahead symbol.  */
 YYSTYPE yylval;
 
 /* The semantic value of the lookahead symbol.  */
 YYSTYPE yylval;
 

-/* Number of parse errors so far.  */
+/* Number of syntax errors so far.  */

 int yynerrs;
 /* Location data for the lookahead symbol.  */
 YYLTYPE yylloc;
 int yynerrs;
 /* Location data for the lookahead symbol.  */
 YYLTYPE yylloc;


@@ -990,7 +1024,7 @@ YYLTYPE yylloc;
   /* Number of tokens to shift before error messages enabled.  */
   int yyerrstatus;
   /* Lookahead token as an internal (translated) token number.  */
   /* Number of tokens to shift before error messages enabled.  */
   int yyerrstatus;
   /* Lookahead token as an internal (translated) token number.  */

-  int yychar1 = 0;
+  int yytoken = 0;

 
   /* Three stacks and their tools:
      `yyss': related to states,
 
   /* Three stacks and their tools:
      `yyss': related to states,


@@ -1014,6 +1048,7 @@ YYLTYPE yylloc;
   YYLTYPE yylsa[YYINITDEPTH];
   YYLTYPE *yyls = yylsa;
   YYLTYPE *yylsp;
   YYLTYPE yylsa[YYINITDEPTH];
   YYLTYPE *yyls = yylsa;
   YYLTYPE *yylsp;

+  YYLTYPE *yylerrsp;

 
 #define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
 
 
 #define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
 


@@ -1043,6 +1078,18 @@ YYLTYPE yylloc;
   yyssp = yyss;
   yyvsp = yyvs;
   yylsp = yyls;
   yyssp = yyss;
   yyvsp = yyvs;
   yylsp = yyls;

+
+  /* User initialization code. */
+  #line 70 "parse-gram.y"
+{
+  /* Bison's grammar can initial empty locations, hence a default
+     location is needed. */
+  (*yylsp).start.file   = (*yylsp).end.file   = current_file;
+  (*yylsp).start.line   = (*yylsp).end.line   = 1;
+  (*yylsp).start.column = (*yylsp).end.column = 0;
+}
+/* Line 818 of yacc.c.  */
+#line 1093 "parse-gram.c"

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


@@ -1057,7 +1104,7 @@ YYLTYPE yylloc;
  yysetstate:
   *yyssp = yystate;
 
  yysetstate:
   *yyssp = yystate;
 

-  if (yyssp >= yyss + yystacksize - 1)
+  if (yyss + yystacksize - 1 <= yyssp)

     {
       /* Get the current used size of the three stacks, in elements.  */
       YYSIZE_T yysize = yyssp - yyss + 1;
     {
       /* Get the current used size of the three stacks, in elements.  */
       YYSIZE_T yysize = yyssp - yyss + 1;


@@ -1089,10 +1136,10 @@ YYLTYPE yylloc;
       goto yyoverflowlab;
 # else
       /* Extend the stack our own way.  */
       goto yyoverflowlab;
 # else
       /* Extend the stack our own way.  */

-      if (yystacksize >= YYMAXDEPTH)
+      if (YYMAXDEPTH <= yystacksize)

        goto yyoverflowlab;
       yystacksize *= 2;
        goto yyoverflowlab;
       yystacksize *= 2;

-      if (yystacksize > YYMAXDEPTH)
+      if (YYMAXDEPTH < yystacksize)

        yystacksize = YYMAXDEPTH;
 
       {
        yystacksize = YYMAXDEPTH;
 
       {


@@ -1118,7 +1165,7 @@ YYLTYPE yylloc;
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
                  (unsigned long int) yystacksize));
 
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
                  (unsigned long int) yystacksize));
 

-      if (yyssp >= yyss + yystacksize - 1)
+      if (yyss + yystacksize - 1 <= yyssp)

        YYABORT;
     }
 
        YYABORT;
     }
 


@@ -1143,64 +1190,43 @@ yybackup:
 
   /* Not known => get a lookahead token if don't already have one.  */
 
 
   /* Not known => get a lookahead token if don't already have one.  */
 

-  /* yychar is either YYEMPTY or YYEOF
-     or a valid token in external form.  */
-
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */

   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
       yychar = YYLEX;
     }
 
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
       yychar = YYLEX;
     }
 

-  /* Convert token to internal form (in yychar1) for indexing tables with.  */
-
-  if (yychar <= 0)             /* This means end of input.  */
+  if (yychar <= YYEOF)

     {
     {

-      yychar1 = 0;
-      yychar = YYEOF;          /* Don't call YYLEX any more.  */
-
+      yychar = yytoken = YYEOF;

       YYDPRINTF ((stderr, "Now at end of input.\n"));
     }
   else
     {
       YYDPRINTF ((stderr, "Now at end of input.\n"));
     }
   else
     {

-      yychar1 = YYTRANSLATE (yychar);
-
-      /* We have to keep this `#if YYDEBUG', since we use variables
-        which are defined only if `YYDEBUG' is set.  */
-      YYDPRINTF ((stderr, "Next token is "));
-      YYDSYMPRINT ((stderr, yychar1, yylval, yyloc));
-      YYDPRINTF ((stderr, "\n"));
+      yytoken = YYTRANSLATE (yychar);
+      YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);

     }
 
     }
 

-  yyn += yychar1;
-  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yychar1)
+  /* If the proper action on seeing token YYTOKEN is to reduce or to
+     detect an error, take that action.  */
+  yyn += yytoken;
+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)

     goto yydefault;
     goto yydefault;

-

   yyn = yytable[yyn];
   yyn = yytable[yyn];

-
-  /* yyn is what to do for this token type in this state.
-     Negative => reduce, -yyn is rule number.
-     Positive => shift, yyn is new state.
-       New state is final state => don't bother to shift,
-       just return success.
-     0, or most negative number => error.  */
-
-  if (yyn < 0)
+  if (yyn <= 0)

     {
     {

-      if (yyn == YYTABLE_NINF)
+      if (yyn == 0 || yyn == YYTABLE_NINF)

        goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
        goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }

-  else if (yyn == 0)
-    goto yyerrlab;

 
   if (yyn == YYFINAL)
     YYACCEPT;
 
   /* Shift the lookahead token.  */
 
   if (yyn == YYFINAL)
     YYACCEPT;
 
   /* Shift the lookahead token.  */

-  YYDPRINTF ((stderr, "Shifting token %d (%s), ",
-             yychar, yytname[yychar1]));
+  YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken]));

 
   /* Discard the token being shifted unless it is eof.  */
   if (yychar != YYEOF)
 
   /* Discard the token being shifted unless it is eof.  */
   if (yychar != YYEOF)


@@ -1246,207 +1272,210 @@ yyreduce:
   yyval = yyvsp[1-yylen];
 
   /* Default location. */
   yyval = yyvsp[1-yylen];
 
   /* Default location. */

-  YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
-
-#if YYDEBUG
-  /* We have to keep this `#if YYDEBUG', since we use variables which
-     are defined only if `YYDEBUG' is set.  */
-  if (yydebug)
-    {
-      int yyi;
-
-      YYFPRINTF (stderr, "Reducing via rule %d (line %d), ",
-                yyn - 1, yyrline[yyn]);
-
-      /* Print the symbols being reduced, and their result.  */
-      for (yyi = yyprhs[yyn]; yyrhs[yyi] >= 0; yyi++)
-       YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]);
-      YYFPRINTF (stderr, " -> %s\n", yytname[yyr1[yyn]]);
-    }
-#endif
+  YYLLOC_DEFAULT (yyloc, yylsp - yylen, yylen);
+  YY_REDUCE_PRINT (yyn);

   switch (yyn)
     {
   switch (yyn)
     {

-        case 2:
-#line 161 "parse-gram.y"
-    {
-      yycontrol->errcode = 0;
-      epilogue_set (yyvsp[0].string, yylsp[0]);
-    }
-    break;
-
-  case 6:
-#line 179 "parse-gram.y"
-    { prologue_augment (yyvsp[0].string, yylsp[0]); }
+        case 6:
+#line 187 "parse-gram.y"
+    { prologue_augment (yyvsp[0].chars, yylsp[0]); }

     break;
 
   case 7:
     break;
 
   case 7:

-#line 180 "parse-gram.y"
-    { debug_flag = 1; }
+#line 188 "parse-gram.y"
+    { debug_flag = true; }

     break;
 
   case 8:
     break;
 
   case 8:

-#line 181 "parse-gram.y"
-    { muscle_insert (yyvsp[-1].string, yyvsp[0].string); }
+#line 189 "parse-gram.y"
+    { muscle_insert (yyvsp[-1].chars, yyvsp[0].chars); }

     break;
 
   case 9:
     break;
 
   case 9:

-#line 182 "parse-gram.y"
-    { defines_flag = 1; }
+#line 190 "parse-gram.y"
+    { defines_flag = true; }

     break;
 
   case 10:
     break;
 
   case 10:

-#line 183 "parse-gram.y"
-    { error_verbose = 1; }
+#line 191 "parse-gram.y"
+    { error_verbose = true; }

     break;
 
   case 11:
     break;
 
   case 11:

-#line 184 "parse-gram.y"
+#line 192 "parse-gram.y"

     { expected_conflicts = yyvsp[0].integer; }
     break;
 
   case 12:
     { expected_conflicts = yyvsp[0].integer; }
     break;
 
   case 12:

-#line 185 "parse-gram.y"
-    { spec_file_prefix = yyvsp[0].string; }
+#line 193 "parse-gram.y"
+    { spec_file_prefix = yyvsp[0].chars; }

     break;
 
   case 13:
     break;
 
   case 13:

-#line 186 "parse-gram.y"
-    { locations_flag = 1; }
+#line 195 "parse-gram.y"
+    {
+    nondeterministic_parser = true;
+    glr_parser = true;
+  }

     break;
 
   case 14:
     break;
 
   case 14:

-#line 187 "parse-gram.y"
-    { spec_name_prefix = yyvsp[0].string; }
+#line 200 "parse-gram.y"
+    {
+    muscle_code_grow ("initial_action", yyvsp[0].chars, yylsp[0]);
+  }

     break;
 
   case 15:
     break;
 
   case 15:

-#line 188 "parse-gram.y"
-    { no_lines_flag = 1; }
+#line 203 "parse-gram.y"
+    { add_param ("lex_param", yyvsp[0].chars, yylsp[0]); }

     break;
 
   case 16:
     break;
 
   case 16:

-#line 189 "parse-gram.y"
-    { spec_outfile = yyvsp[0].string; }
+#line 204 "parse-gram.y"
+    { locations_flag = true; }

     break;
 
   case 17:
     break;
 
   case 17:

-#line 190 "parse-gram.y"
-    { pure_parser = 1; }
+#line 205 "parse-gram.y"
+    { spec_name_prefix = yyvsp[0].chars; }

     break;
 
   case 18:
     break;
 
   case 18:

-#line 191 "parse-gram.y"
-    { glr_parser = 1; }
+#line 206 "parse-gram.y"
+    { no_lines_flag = true; }

     break;
 
   case 19:
     break;
 
   case 19:

-#line 192 "parse-gram.y"
-    { skeleton = yyvsp[0].string; }
+#line 207 "parse-gram.y"
+    { nondeterministic_parser = true; }

     break;
 
   case 20:
     break;
 
   case 20:

-#line 193 "parse-gram.y"
-    { token_table_flag = 1; }
+#line 208 "parse-gram.y"
+    { spec_outfile = yyvsp[0].chars; }

     break;
 
   case 21:
     break;
 
   case 21:

-#line 194 "parse-gram.y"
-    { report_flag = 1; }
+#line 209 "parse-gram.y"
+    { add_param ("parse_param", yyvsp[0].chars, yylsp[0]); }

     break;
 
   case 22:
     break;
 
   case 22:

-#line 195 "parse-gram.y"
-    { yacc_flag = 1; }
+#line 210 "parse-gram.y"
+    { pure_parser = true; }
+    break;
+
+  case 23:
+#line 211 "parse-gram.y"
+    { skeleton = yyvsp[0].chars; }
+    break;
+
+  case 24:
+#line 212 "parse-gram.y"
+    { token_table_flag = true; }

     break;
 
   case 25:
     break;
 
   case 25:

-#line 202 "parse-gram.y"
+#line 213 "parse-gram.y"
+    { report_flag = report_states; }
+    break;
+
+  case 26:
+#line 214 "parse-gram.y"
+    { yacc_flag = true; }
+    break;
+
+  case 30:
+#line 222 "parse-gram.y"

     {
       grammar_start_symbol_set (yyvsp[0].symbol, yylsp[0]);
     }
     break;
 
     {
       grammar_start_symbol_set (yyvsp[0].symbol, yylsp[0]);
     }
     break;
 

-  case 26:
-#line 206 "parse-gram.y"
+  case 31:
+#line 226 "parse-gram.y"

     {
     {

-      typed = 1;
-      MUSCLE_INSERT_INT ("stype_line", yylsp[0].first_line);
-      muscle_insert ("stype", yyvsp[0].string);
+      typed = true;
+      MUSCLE_INSERT_INT ("stype_line", yylsp[0].start.line);
+      muscle_insert ("stype", yyvsp[0].chars);

     }
     break;
 
     }
     break;
 

-  case 27:
-#line 212 "parse-gram.y"
-    { current_braced_code = destructor_braced_code; }
+  case 32:
+#line 232 "parse-gram.y"
+    {
+      symbol_list *list;
+      for (list = yyvsp[0].list; list; list = list->next)
+       symbol_destructor_set (list->sym, yyvsp[-1].chars, yylsp[-1]);
+      symbol_list_free (yyvsp[0].list);
+    }

     break;
 
     break;
 

-  case 28:
-#line 214 "parse-gram.y"
+  case 33:
+#line 239 "parse-gram.y"

     {
     {

-      symbol_list_t *list;
+      symbol_list *list;

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

-       symbol_destructor_set (list->sym, yyvsp[-1].string, yylsp[-1]);
+       symbol_printer_set (list->sym, yyvsp[-1].chars, list->location);

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

-      current_braced_code = action_braced_code;

     }
     break;
 
     }
     break;
 

-  case 29:
-#line 222 "parse-gram.y"
-    { current_braced_code = printer_braced_code; }
+  case 34:
+#line 246 "parse-gram.y"
+    {
+      default_prec = true;
+    }

     break;
 
     break;
 

-  case 30:
-#line 224 "parse-gram.y"
+  case 35:
+#line 250 "parse-gram.y"

     {
     {

-      symbol_list_t *list;
-      for (list = yyvsp[0].list; list; list = list->next)
-       symbol_printer_set (list->sym, yyvsp[-1].string, list->location);
-      symbol_list_free (yyvsp[0].list);
-      current_braced_code = action_braced_code;
+      default_prec = false;

     }
     break;
 
     }
     break;
 

-  case 31:
-#line 234 "parse-gram.y"
+  case 36:
+#line 256 "parse-gram.y"

     { current_class = nterm_sym; }
     break;
 
     { current_class = nterm_sym; }
     break;
 

-  case 32:
-#line 235 "parse-gram.y"
+  case 37:
+#line 257 "parse-gram.y"

     {
       current_class = unknown_sym;
       current_type = NULL;
     }
     break;
 
     {
       current_class = unknown_sym;
       current_type = NULL;
     }
     break;
 

-  case 33:
-#line 239 "parse-gram.y"
+  case 38:
+#line 261 "parse-gram.y"

     { current_class = token_sym; }
     break;
 
     { current_class = token_sym; }
     break;
 

-  case 34:
-#line 240 "parse-gram.y"
+  case 39:
+#line 262 "parse-gram.y"

     {
       current_class = unknown_sym;
       current_type = NULL;
     }
     break;
 
     {
       current_class = unknown_sym;
       current_type = NULL;
     }
     break;
 

-  case 35:
-#line 245 "parse-gram.y"
+  case 40:
+#line 267 "parse-gram.y"

     {
     {

-      symbol_list_t *list;
+      symbol_list *list;

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

-       symbol_type_set (list->sym, yyvsp[-1].string, yylsp[-1]);
+       symbol_type_set (list->sym, yyvsp[-1].uniqstr, yylsp[-1]);

       symbol_list_free (yyvsp[0].list);
     }
     break;
 
       symbol_list_free (yyvsp[0].list);
     }
     break;
 

-  case 36:
-#line 255 "parse-gram.y"
+  case 41:
+#line 277 "parse-gram.y"

     {
     {

-      symbol_list_t *list;
+      symbol_list *list;

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


@@ -1458,58 +1487,58 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 37:
-#line 269 "parse-gram.y"
+  case 42:
+#line 291 "parse-gram.y"

     { yyval.assoc = left_assoc; }
     break;
 
     { yyval.assoc = left_assoc; }
     break;
 

-  case 38:
-#line 270 "parse-gram.y"
+  case 43:
+#line 292 "parse-gram.y"

     { yyval.assoc = right_assoc; }
     break;
 
     { yyval.assoc = right_assoc; }
     break;
 

-  case 39:
-#line 271 "parse-gram.y"
+  case 44:
+#line 293 "parse-gram.y"

     { yyval.assoc = non_assoc; }
     break;
 
     { yyval.assoc = non_assoc; }
     break;
 

-  case 40:
-#line 275 "parse-gram.y"
-    { current_type = NULL;}
+  case 45:
+#line 297 "parse-gram.y"
+    { current_type = NULL; }

     break;
 
     break;
 

-  case 41:
-#line 276 "parse-gram.y"
-    { current_type = yyvsp[0].string; }
+  case 46:
+#line 298 "parse-gram.y"
+    { current_type = yyvsp[0].uniqstr; }

     break;
 
     break;
 

-  case 42:
-#line 282 "parse-gram.y"
+  case 47:
+#line 304 "parse-gram.y"

     { yyval.list = symbol_list_new (yyvsp[0].symbol, yylsp[0]); }
     break;
 
     { yyval.list = symbol_list_new (yyvsp[0].symbol, yylsp[0]); }
     break;
 

-  case 43:
-#line 283 "parse-gram.y"
+  case 48:
+#line 305 "parse-gram.y"

     { yyval.list = symbol_list_prepend (yyvsp[-1].list, yyvsp[0].symbol, yylsp[0]); }
     break;
 
     { yyval.list = symbol_list_prepend (yyvsp[-1].list, yyvsp[0].symbol, yylsp[0]); }
     break;
 

-  case 44:
-#line 289 "parse-gram.y"
+  case 49:
+#line 311 "parse-gram.y"

     {
     {

-       current_type = yyvsp[0].string;
+       current_type = yyvsp[0].uniqstr;

      }
     break;
 
      }
     break;
 

-  case 45:
-#line 293 "parse-gram.y"
+  case 50:
+#line 315 "parse-gram.y"

     {
        symbol_class_set (yyvsp[0].symbol, current_class, yylsp[0]);
        symbol_type_set (yyvsp[0].symbol, current_type, yylsp[0]);
      }
     break;
 
     {
        symbol_class_set (yyvsp[0].symbol, current_class, yylsp[0]);
        symbol_type_set (yyvsp[0].symbol, current_type, yylsp[0]);
      }
     break;
 

-  case 46:
-#line 298 "parse-gram.y"
+  case 51:
+#line 320 "parse-gram.y"

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


@@ -1517,8 +1546,8 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 47:
-#line 304 "parse-gram.y"
+  case 52:
+#line 326 "parse-gram.y"

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


@@ -1526,8 +1555,8 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 48:
-#line 310 "parse-gram.y"
+  case 53:
+#line 332 "parse-gram.y"

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


@@ -1536,151 +1565,116 @@ yyreduce:
     }
     break;
 
     }
     break;
 

-  case 49:
-#line 321 "parse-gram.y"
-    {;}
-    break;
-
-  case 50:
-#line 323 "parse-gram.y"
-    {;}
-    break;
-
-  case 54:
-#line 342 "parse-gram.y"
+  case 59:
+#line 361 "parse-gram.y"

     {
       if (yacc_flag)
        complain_at (yyloc, _("POSIX forbids declarations in the grammar"));
     }
     break;
 
     {
       if (yacc_flag)
        complain_at (yyloc, _("POSIX forbids declarations in the grammar"));
     }
     break;
 

-  case 55:
-#line 347 "parse-gram.y"
+  case 60:
+#line 366 "parse-gram.y"

     {
       yyerrok;
     }
     break;
 
     {
       yyerrok;
     }
     break;
 

-  case 56:
-#line 353 "parse-gram.y"
-    { current_lhs = yyvsp[-1].symbol; current_lhs_location = yylsp[-1]; }
-    break;
-
-  case 57:
-#line 354 "parse-gram.y"
-    {;}
+  case 61:
+#line 372 "parse-gram.y"
+    { current_lhs = yyvsp[0].symbol; current_lhs_location = yylsp[0]; }

     break;
 
     break;
 

-  case 58:
-#line 358 "parse-gram.y"
+  case 63:
+#line 376 "parse-gram.y"

     { grammar_rule_end (yylsp[0]); }
     break;
 
     { grammar_rule_end (yylsp[0]); }
     break;
 

-  case 59:
-#line 359 "parse-gram.y"
+  case 64:
+#line 377 "parse-gram.y"

     { grammar_rule_end (yylsp[0]); }
     break;
 
     { grammar_rule_end (yylsp[0]); }
     break;
 

-  case 60:
-#line 364 "parse-gram.y"
+  case 66:
+#line 383 "parse-gram.y"

     { grammar_rule_begin (current_lhs, current_lhs_location); }
     break;
 
     { grammar_rule_begin (current_lhs, current_lhs_location); }
     break;
 

-  case 61:
-#line 366 "parse-gram.y"
+  case 67:
+#line 385 "parse-gram.y"

     { grammar_current_rule_symbol_append (yyvsp[0].symbol, yylsp[0]); }
     break;
 
     { grammar_current_rule_symbol_append (yyvsp[0].symbol, yylsp[0]); }
     break;
 

-  case 62:
-#line 368 "parse-gram.y"
-    { grammar_current_rule_action_append (yyvsp[0].string, yylsp[0]); }
+  case 68:
+#line 387 "parse-gram.y"
+    { grammar_current_rule_action_append (yyvsp[0].chars, yylsp[0]); }

     break;
 
     break;
 

-  case 63:
-#line 370 "parse-gram.y"
+  case 69:
+#line 389 "parse-gram.y"

     { grammar_current_rule_prec_set (yyvsp[0].symbol, yylsp[0]); }
     break;
 
     { grammar_current_rule_prec_set (yyvsp[0].symbol, yylsp[0]); }
     break;
 

-  case 64:
-#line 372 "parse-gram.y"
+  case 70:
+#line 391 "parse-gram.y"

     { grammar_current_rule_dprec_set (yyvsp[0].integer, yylsp[0]); }
     break;
 
     { grammar_current_rule_dprec_set (yyvsp[0].integer, yylsp[0]); }
     break;
 

-  case 65:
-#line 374 "parse-gram.y"
-    { grammar_current_rule_merge_set (yyvsp[0].string, yylsp[0]); }
+  case 71:
+#line 393 "parse-gram.y"
+    { grammar_current_rule_merge_set (yyvsp[0].uniqstr, yylsp[0]); }

     break;
 
     break;
 

-  case 66:
-#line 378 "parse-gram.y"
+  case 72:
+#line 397 "parse-gram.y"

     { yyval.symbol = yyvsp[0].symbol; }
     break;
 
     { yyval.symbol = yyvsp[0].symbol; }
     break;
 

-  case 67:
-#line 379 "parse-gram.y"
+  case 73:
+#line 398 "parse-gram.y"

     { yyval.symbol = yyvsp[0].symbol; }
     break;
 
     { yyval.symbol = yyvsp[0].symbol; }
     break;
 

-  case 68:
-#line 380 "parse-gram.y"
-    { yyval.symbol = symbol_get (yyvsp[0].string, yylsp[0]); }
-    break;
-
-  case 69:
-#line 385 "parse-gram.y"
-    { yyval.string = yyvsp[0].string; }
+  case 74:
+#line 403 "parse-gram.y"
+    { yyval.chars = yyvsp[0].chars; }

     break;
 
     break;
 

-  case 70:
-#line 391 "parse-gram.y"
+  case 75:
+#line 409 "parse-gram.y"

     {
     {

-      yyval.symbol = symbol_get (yyvsp[0].string, yylsp[0]);
+      yyval.symbol = symbol_get (yyvsp[0].chars, yylsp[0]);

       symbol_class_set (yyval.symbol, token_sym, yylsp[0]);
     }
     break;
 
       symbol_class_set (yyval.symbol, token_sym, yylsp[0]);
     }
     break;
 

-  case 71:
-#line 400 "parse-gram.y"
-    {
-      yyval.string = yyvsp[0].string + 1;
-      yyval.string[strlen (yyval.string) - 1] = '\0';
-    }
-    break;
-
-  case 72:
-#line 408 "parse-gram.y"
+  case 76:
+#line 418 "parse-gram.y"

     {
     {

-      yyval.string = xstrdup ("");
+      yyval.chars = yyvsp[0].chars + 1;
+      yyval.chars[strlen (yyval.chars) - 1] = '\0';

     }
     break;
 
     }
     break;
 

-  case 73:
-#line 412 "parse-gram.y"
+  case 78:
+#line 427 "parse-gram.y"

     {
     {

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

     }
     break;
 
 
     }
 
     }
     break;
 
 
     }
 

-/* Line 1079 of /tmp/prefix/share/bison/yacc.c.  */
-#line 1669 "parse-gram.c"
+/* Line 1010 of yacc.c.  */
+#line 1672 "parse-gram.c"

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

-#if YYDEBUG
-  if (yydebug)
-    {
-      short *yyssp1 = yyss - 1;
-      YYFPRINTF (stderr, "state stack now");
-      while (yyssp1 != yyssp)
-       YYFPRINTF (stderr, " %d", *++yyssp1);
-      YYFPRINTF (stderr, "\n");
-    }
-#endif
+  YY_STACK_PRINT (yyss, yyssp);

 
   *++yyvsp = yyval;
   *++yylsp = yyloc;
 
   *++yyvsp = yyval;
   *++yylsp = yyloc;


@@ -1708,48 +1702,128 @@ yyerrlab:
   if (!yyerrstatus)
     {
       ++yynerrs;
   if (!yyerrstatus)
     {
       ++yynerrs;

-      yyreport_parse_error (yystate, yychar, yylval, yylloc);
+#if YYERROR_VERBOSE
+      yyn = yypact[yystate];
+
+      if (YYPACT_NINF < yyn && yyn < YYLAST)
+       {
+         YYSIZE_T yysize = 0;
+         int yytype = YYTRANSLATE (yychar);
+         const char* yyprefix;
+         char *yymsg;
+         int yyx;
+
+         /* Start YYX at -YYN if negative to avoid negative indexes in
+            YYCHECK.  */
+         int yyxbegin = yyn < 0 ? -yyn : 0;
+
+         /* Stay within bounds of both yycheck and yytname.  */
+         int yychecklim = YYLAST - yyn;
+         int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+         int yycount = 0;
+
+         yyprefix = ", expecting ";
+         for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+           if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+             {
+               yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]);
+               yycount += 1;
+               if (yycount == 5)
+                 {
+                   yysize = 0;
+                   break;
+                 }
+             }
+         yysize += (sizeof ("syntax error, unexpected ")
+                    + yystrlen (yytname[yytype]));
+         yymsg = (char *) YYSTACK_ALLOC (yysize);
+         if (yymsg != 0)
+           {
+             char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
+             yyp = yystpcpy (yyp, yytname[yytype]);
+
+             if (yycount < 5)
+               {
+                 yyprefix = ", expecting ";
+                 for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+                   if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+                     {
+                       yyp = yystpcpy (yyp, yyprefix);
+                       yyp = yystpcpy (yyp, yytname[yyx]);
+                       yyprefix = " or ";
+                     }
+               }
+             yyerror (yymsg);
+             YYSTACK_FREE (yymsg);
+           }
+         else
+           yyerror ("syntax error; also virtual memory exhausted");
+       }
+      else
+#endif /* YYERROR_VERBOSE */
+       yyerror ("syntax error");

     }
     }

-  goto yyerrlab1;

 
 

+  yylerrsp = yylsp;

 
 

-/*----------------------------------------------------.
-| yyerrlab1 -- error raised explicitly by an action.  |
-`----------------------------------------------------*/
-yyerrlab1:

   if (yyerrstatus == 3)
     {
       /* If just tried and failed to reuse lookahead token after an
         error, discard it.  */
 
   if (yyerrstatus == 3)
     {
       /* If just tried and failed to reuse lookahead token after an
         error, discard it.  */
 

-      /* Return failure if at end of input.  */
-      if (yychar == YYEOF)
+      if (yychar <= YYEOF)

         {
         {

-         /* Pop the error token.  */
-          YYPOPSTACK;
-         /* Pop the rest of the stack.  */
-         while (yyssp > yyss)
-           {
-             YYDPRINTF ((stderr, "Error: popping "));
-             YYDSYMPRINT ((stderr,
-                           yystos[*yyssp],
-                           *yyvsp, *yylsp));
-             YYDPRINTF ((stderr, "\n"));
-             yydestruct (yystos[*yyssp], *yyvsp, *yylsp);
-             YYPOPSTACK;
-           }
-         YYABORT;
+          /* If at end of input, pop the error token,
+            then the rest of the stack, then return failure.  */
+         if (yychar == YYEOF)
+            for (;;)
+              {
+                YYPOPSTACK;
+                if (yyssp == yyss)
+                  YYABORT;
+                YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
+                yydestruct (yystos[*yyssp], yyvsp, yylsp);
+              }

         }
         }

-
-      YYDPRINTF ((stderr, "Discarding token %d (%s).\n",
-                 yychar, yytname[yychar1]));
-      yydestruct (yychar1, yylval, yylloc);
-      yychar = YYEMPTY;
+      else
+       {
+         YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
+         yydestruct (yytoken, &yylval, &yylloc);
+         yychar = YYEMPTY;
+         *++yylerrsp = yylloc;
+       }

     }
 
   /* Else will try to reuse lookahead token after shifting the error
      token.  */
     }
 
   /* Else will try to reuse lookahead token after shifting the error
      token.  */

+  goto yyerrlab1;
+
+
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:

 
 

+#ifdef __GNUC__
+  /* Pacify GCC when the user code never invokes YYERROR and the label
+     yyerrorlab therefore never appears in user code.  */
+  if (0)
+     goto yyerrorlab;
+#endif
+
+  yyvsp -= yylen;
+  yyssp -= yylen;
+  yystate = *yyssp;
+  yylerrsp = yylsp;
+  *++yylerrsp = yyloc;
+  yylsp -= yylen;
+  goto yyerrlab1;
+
+
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:

   yyerrstatus = 3;     /* Each real token shifted decrements this.  */
 
   for (;;)
   yyerrstatus = 3;     /* Each real token shifted decrements this.  */
 
   for (;;)


@@ -1770,26 +1844,11 @@ yyerrlab1:
       if (yyssp == yyss)
        YYABORT;
 
       if (yyssp == yyss)
        YYABORT;
 

-      YYDPRINTF ((stderr, "Error: popping "));
-      YYDSYMPRINT ((stderr,
-                   yystos[*yyssp], *yyvsp, *yylsp));
-      YYDPRINTF ((stderr, "\n"));
-
-      yydestruct (yystos[yystate], *yyvsp, *yylsp);
-      yyvsp--;
-      yystate = *--yyssp;
-      yylsp--;
-
-#if YYDEBUG
-      if (yydebug)
-       {
-         short *yyssp1 = yyss - 1;
-         YYFPRINTF (stderr, "Error: state stack now");
-         while (yyssp1 != yyssp)
-           YYFPRINTF (stderr, " %d", *++yyssp1);
-         YYFPRINTF (stderr, "\n");
-       }
-#endif
+      YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
+      yydestruct (yystos[yystate], yyvsp, yylsp);
+      YYPOPSTACK;
+      yystate = *yyssp;
+      YY_STACK_PRINT (yyss, yyssp);

     }
 
   if (yyn == YYFINAL)
     }
 
   if (yyn == YYFINAL)


@@ -1798,7 +1857,8 @@ yyerrlab1:
   YYDPRINTF ((stderr, "Shifting error token, "));
 
   *++yyvsp = yylval;
   YYDPRINTF ((stderr, "Shifting error token, "));
 
   *++yyvsp = yylval;

-  *++yylsp = yylloc;
+  YYLLOC_DEFAULT (yyloc, yylsp, yylerrsp - yylsp);
+  *++yylsp = yyloc;

 
   yystate = yyn;
   goto yynewstate;
 
   yystate = yyn;
   goto yynewstate;


@@ -1837,23 +1897,91 @@ yyreturn:
 }
 
 
 }
 
 

-#line 421 "parse-gram.y"
+#line 433 "parse-gram.y"

 
 

-/*------------------------------------------------------------------.
-| When debugging the parser, display tokens' locations and values.  |
-`------------------------------------------------------------------*/
+
+
+/* Return the location of the left-hand side of a rule whose
+   right-hand side is RHS[1] ... RHS[N].  Ignore empty nonterminals in
+   the right-hand side, and return an empty location equal to the end
+   boundary of RHS[0] if the right-hand side is empty.  */
+
+static YYLTYPE
+lloc_default (YYLTYPE const *rhs, int n)
+{
+  int i;
+  YYLTYPE loc;
+  loc.start = loc.end = rhs[n].end;
+
+  /* Ignore empty nonterminals the start of the the right-hand side.
+     Do not bother to ignore them at the end of the right-hand side,
+     since empty nonterminals have the same end as their predecessors.  */
+  for (i = 1; i <= n; i++)
+    if (! equal_boundaries (rhs[i].start, rhs[i].end))
+      {
+       loc.start = rhs[i].start;
+       break;
+      }
+
+  return loc;
+}
+
+
+/* Add a lex-param or a parse-param (depending on TYPE) with
+   declaration DECL and location LOC.  */
+
+static void
+add_param (char const *type, char *decl, location loc)
+{
+  static char const alphanum[] =
+    "0123456789"
+    "abcdefghijklmnopqrstuvwxyz"
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+    "_";
+  char const *alpha = alphanum + 10;
+  char const *name_start = NULL;
+  char *p;
+
+  for (p = decl; *p; p++)
+    if ((p == decl || ! strchr (alphanum, p[-1])) && strchr (alpha, p[0]))
+      name_start = p;
+
+  /* Strip the surrounding '{' and '}'.  */
+  decl++;
+  p[-1] = '\0';
+
+  if (! name_start)
+    complain_at (loc, _("missing identifier in parameter declaration"));
+  else
+    {
+      char *name;
+      size_t name_len;
+
+      for (name_len = 1;
+          name_start[name_len] && strchr (alphanum, name_start[name_len]);
+          name_len++)
+       continue;
+
+      name = xmalloc (name_len + 1);
+      memcpy (name, name_start, name_len);
+      name[name_len] = '\0';
+      muscle_pair_list_grow (type, decl, name);
+      free (name);
+    }
+
+  scanner_last_string_free ();
+}
+
+/*----------------------------------------------------.
+| When debugging the parser, display tokens' values.  |
+`----------------------------------------------------*/

 
 static void
 
 static void

-yyprint (FILE *file,
-         int type, const yystype *value)
+print_token_value (FILE *file, int type, YYSTYPE const *value)

 {
   fputc (' ', file);
   switch (type)
     {
 {
   fputc (' ', file);
   switch (type)
     {

-    case CHARACTER:
-      fprintf (file, " = '%s'", value->string);
-      break;
-

     case ID:
       fprintf (file, " = %s", value->symbol->tag);
       break;
     case ID:
       fprintf (file, " = %s", value->symbol->tag);
       break;


@@ -1863,24 +1991,39 @@ yyprint (FILE *file,
       break;
 
     case STRING:
       break;
 
     case STRING:

-      fprintf (file, " = \"%s\"", value->string);
+      fprintf (file, " = \"%s\"", value->chars);

       break;
 
     case TYPE:
       break;
 
     case TYPE:

-      fprintf (file, " = <%s>", value->string);
+      fprintf (file, " = <%s>", value->uniqstr);

       break;
 
     case BRACED_CODE:
       break;
 
     case BRACED_CODE:

+    case PERCENT_DESTRUCTOR:
+    case PERCENT_LEX_PARAM:
+    case PERCENT_PARSE_PARAM:
+    case PERCENT_PRINTER:
+    case PERCENT_UNION:

     case PROLOGUE:
     case EPILOGUE:
     case PROLOGUE:
     case EPILOGUE:

-      fprintf (file, " = {{ %s }}", value->string);
+      fprintf (file, " = {{ %s }}", value->chars);
+      break;
+
+    default:
+      fprintf (file, "unknown token type");

       break;
     }
 }
 
       break;
     }
 }
 

-void
-gram_error (location_t *yylloc, const char *msg)
+static void
+gram_error (location const *loc, char const *msg)
+{
+  complain_at (*loc, "%s", msg);
+}
+
+char const *
+token_name (int type)

 {
 {

-  complain_at (*yylloc, "%s", msg);
+  return yytname[type];

 }
 
 }