* lib/bitset.h (__INT_TO_PTR): Define to a value that presumes C89.

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

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

 
 

-/* Skeleton output parser for Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software
-   Foundation, Inc.
+/* Skeleton parser for Yacc-like parsing with Bison,
+   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


@@ -25,10 +23,8 @@
    This special exception was added by the Free Software Foundation
    in version 1.24 of Bison.  */
 
    This special exception was added by the Free Software Foundation
    in version 1.24 of Bison.  */
 

-/* This is the parser code that is written into each bison parser when
-   the %semantic_parser declaration is not specified in the grammar.
-   It was written by Richard Stallman by simplifying the original so
-   called ``semantic'' parser.  */
+/* Written by Richard Stallman by simplifying the original so called
+   ``semantic'' parser.  */

 
 /* All symbols defined below should begin with yy or YY, to avoid
    infringing on user name space.  This should be done even for local
 
 /* All symbols defined below should begin with yy or YY, to avoid
    infringing on user name space.  This should be done even for local


@@ -38,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


@@ -55,159 +54,152 @@
 #define yychar  gram_char
 #define yydebug gram_debug
 #define yynerrs gram_nerrs
 #define yychar  gram_char
 #define yydebug gram_debug
 #define yynerrs gram_nerrs

-#if YYLSP_NEEDED
-# define yylloc gram_lloc
+#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_DEFINE = 273,
+     PERCENT_DEFINES = 274,
+     PERCENT_ERROR_VERBOSE = 275,
+     PERCENT_EXPECT = 276,
+     PERCENT_FILE_PREFIX = 277,
+     PERCENT_GLR_PARSER = 278,
+     PERCENT_LEX_PARAM = 279,
+     PERCENT_LOCATIONS = 280,
+     PERCENT_NAME_PREFIX = 281,
+     PERCENT_NO_LINES = 282,
+     PERCENT_NONDETERMINISTIC_PARSER = 283,
+     PERCENT_OUTPUT = 284,
+     PERCENT_PARSE_PARAM = 285,
+     PERCENT_PURE_PARSER = 286,
+     PERCENT_SKELETON = 287,
+     PERCENT_START = 288,
+     PERCENT_TOKEN_TABLE = 289,
+     PERCENT_VERBOSE = 290,
+     PERCENT_YACC = 291,
+     TYPE = 292,
+     EQUAL = 293,
+     SEMICOLON = 294,
+     PIPE = 295,
+     ID = 296,
+     ID_COLON = 297,
+     PERCENT_PERCENT = 298,
+     PROLOGUE = 299,
+     EPILOGUE = 300,
+     BRACED_CODE = 301
+   };

 #endif
 #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_DEFINE 273
+#define PERCENT_DEFINES 274
+#define PERCENT_ERROR_VERBOSE 275
+#define PERCENT_EXPECT 276
+#define PERCENT_FILE_PREFIX 277
+#define PERCENT_GLR_PARSER 278
+#define PERCENT_LEX_PARAM 279
+#define PERCENT_LOCATIONS 280
+#define PERCENT_NAME_PREFIX 281
+#define PERCENT_NO_LINES 282
+#define PERCENT_NONDETERMINISTIC_PARSER 283
+#define PERCENT_OUTPUT 284
+#define PERCENT_PARSE_PARAM 285
+#define PERCENT_PURE_PARSER 286
+#define PERCENT_SKELETON 287
+#define PERCENT_START 288
+#define PERCENT_TOKEN_TABLE 289
+#define PERCENT_VERBOSE 290
+#define PERCENT_YACC 291
+#define TYPE 292
+#define EQUAL 293
+#define SEMICOLON 294
+#define PIPE 295
+#define ID 296
+#define ID_COLON 297
+#define PERCENT_PERCENT 298
+#define PROLOGUE 299
+#define EPILOGUE 300
+#define BRACED_CODE 301
+
+

 
 
 /* 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 "muscle_tab.h"
+
+#include "complain.h"
+#include "conflicts.h"

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

-#include "output.h"

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

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

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

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

 
 

-/* Produce verbose parse errors.  */
+/* Produce verbose syntax errors.  */

 #define YYERROR_VERBOSE 1
 #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)

 
 

-/* 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. */
+/* Request detailed syntax error messages, and pass them to GRAM_ERROR.
+   FIXME: depends on the undocumented availability of YYLLOC.  */

 #undef  yyerror
 #define yyerror(Msg) \
 #undef  yyerror
 #define yyerror(Msg) \

-        gram_error (yycontrol, &yylloc, Msg)
+        gram_error (&yylloc, Msg)
+static void gram_error (location const *, char const *);

 
 

-/* When debugging our pure parser, we want to see values and locations
-   of the tokens.  */

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

-        yyprint (File, &yylloc, Type, &Value)
-static void yyprint (FILE *file, const location_t *loc,
-                     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;
-associativity current_assoc;
+uniqstr current_type = 0;
+symbol *current_lhs;
+location current_lhs_location;
+assoc current_assoc;

 int current_prec = 0;
 
 
 int current_prec = 0;
 
 

-/* 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_UNION = 264,
-     PERCENT_LEFT = 265,
-     PERCENT_RIGHT = 266,
-     PERCENT_NONASSOC = 267,
-     PERCENT_EXPECT = 268,
-     PERCENT_START = 269,
-     PERCENT_PREC = 270,
-     PERCENT_VERBOSE = 271,
-     PERCENT_ERROR_VERBOSE = 272,
-     PERCENT_OUTPUT = 273,
-     PERCENT_FILE_PREFIX = 274,
-     PERCENT_NAME_PREFIX = 275,
-     PERCENT_DEFINE = 276,
-     PERCENT_PURE_PARSER = 277,
-     PERCENT_DEFINES = 278,
-     PERCENT_YACC = 279,
-     PERCENT_DEBUG = 280,
-     PERCENT_LOCATIONS = 281,
-     PERCENT_NO_LINES = 282,
-     PERCENT_SKELETON = 283,
-     PERCENT_TOKEN_TABLE = 284,
-     TYPE = 285,
-     EQUAL = 286,
-     SEMICOLON = 287,
-     COLON = 288,
-     PIPE = 289,
-     ID = 290,
-     PERCENT_PERCENT = 291,
-     PROLOGUE = 292,
-     EPILOGUE = 293,
-     BRACED_CODE = 294
-   };
-# 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_UNION 264
-#define PERCENT_LEFT 265
-#define PERCENT_RIGHT 266
-#define PERCENT_NONASSOC 267
-#define PERCENT_EXPECT 268
-#define PERCENT_START 269
-#define PERCENT_PREC 270
-#define PERCENT_VERBOSE 271
-#define PERCENT_ERROR_VERBOSE 272
-#define PERCENT_OUTPUT 273
-#define PERCENT_FILE_PREFIX 274
-#define PERCENT_NAME_PREFIX 275
-#define PERCENT_DEFINE 276
-#define PERCENT_PURE_PARSER 277
-#define PERCENT_DEFINES 278
-#define PERCENT_YACC 279
-#define PERCENT_DEBUG 280
-#define PERCENT_LOCATIONS 281
-#define PERCENT_NO_LINES 282
-#define PERCENT_SKELETON 283
-#define PERCENT_TOKEN_TABLE 284
-#define TYPE 285
-#define EQUAL 286
-#define SEMICOLON 287
-#define COLON 288
-#define PIPE 289
-#define ID 290
-#define PERCENT_PERCENT 291
-#define PROLOGUE 292
-#define EPILOGUE 293
-#define BRACED_CODE 294
-
-
-
-

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


@@ -221,38 +213,42 @@ int current_prec = 0;
 # define YYERROR_VERBOSE 0
 #endif
 
 # define YYERROR_VERBOSE 0
 #endif
 

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

   symbol_list *list;
   int integer;
   symbol_list *list;
   int integer;

-  char *string;
-  associativity assoc;
-} yystype;
-/* Line 199 of /usr/local/share/bison/bison.simple.  */
-#line 235 "parse-gram.c"
-# define YYSTYPE yystype
+  char *chars;
+  assoc assoc;
+  uniqstr uniqstr;
+} YYSTYPE;
+/* Line 191 of yacc.c.  */
+#line 228 "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 219 of /usr/local/share/bison/bison.simple.  */
-#line 256 "parse-gram.c"
+/* Line 214 of yacc.c.  */
+#line 252 "parse-gram.c"

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


@@ -295,25 +291,17 @@ union yyalloc
 {
   short yyss;
   YYSTYPE yyvs;
 {
   short yyss;
   YYSTYPE yyvs;

-# if YYLSP_NEEDED
-  YYLTYPE yyls;
-# endif
+    YYLTYPE yyls;

 };
 
 /* 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.  */
 
 /* The size of an array large to enough to hold all stacks, each with
    N elements.  */

-# if YYLSP_NEEDED
-#  define YYSTACK_BYTES(N) \
+# define YYSTACK_BYTES(N) \

      ((N) * (sizeof (short) + sizeof (YYSTYPE) + sizeof (YYLTYPE))     \
      ((N) * (sizeof (short) + sizeof (YYSTYPE) + sizeof (YYLTYPE))     \

-      + 2 * YYSTACK_GAP_MAX)
-# else
-#  define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (short) + sizeof (YYSTYPE))                                \
-      + YYSTACK_GAP_MAX)
-# endif
+      + 2 * YYSTACK_GAP_MAXIMUM)

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


@@ -327,7 +315,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


@@ -344,33 +332,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 YYFLAG  -32768
-#define YYLAST   111
+/* YYLAST -- Last index in YYTABLE.  */
+#define YYLAST   147

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

-#define YYNTOKENS  40
+#define YYNTOKENS  47

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

-#define YYNNTS  26
+#define YYNNTS  25

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

-#define YYNRULES  67
+#define YYNRULES  75

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

-#define YYNSTATES  93
+#define YYNSTATES  102

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

-#define YYMAXUTOK   294
+#define YYMAXUTOK   301

 
 

-#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[] =


@@ -404,7 +398,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
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    46

 };
 
 #if YYDEBUG
 };
 
 #if YYDEBUG


@@ -412,48 +407,51 @@ 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,    51,
-      53,    55,    57,    59,    61,    64,    67,    68,    72,    73,
-      77,    81,    85,    87,    89,    91,    92,    94,    96,    99,
-     101,   103,   106,   109,   113,   115,   118,   120,   123,   125,
-     128,   129,   135,   137,   141,   142,   145,   148,   152,   154,
-     156,   158,   160,   162,   164,   165,   168,   169
+       0,     0,     3,     8,     9,    12,    14,    16,    18,    22,
+      24,    26,    29,    33,    35,    37,    39,    43,    45,    47,
+      51,    53,    55,    58,    60,    62,    64,    66,    68,    70,
+      73,    75,    78,    81,    82,    86,    87,    91,    95,    99,
+     101,   103,   105,   106,   108,   110,   113,   115,   117,   120,
+     123,   127,   129,   132,   134,   137,   139,   141,   144,   146,
+     147,   151,   153,   157,   158,   161,   164,   168,   172,   176,
+     178,   180,   182,   184,   186,   187

 };
 
 /* 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[] =

 {
 {

-      41,     0,    -1,    42,    36,    54,    64,    -1,    -1,    42,
-      43,    65,    -1,    44,    -1,    37,    -1,    25,    -1,    21,
-      63,    63,    -1,    23,    -1,    17,    -1,    13,     5,    -1,
-      19,    31,    63,    -1,    26,    -1,    20,    31,    63,    -1,
-      27,    -1,    18,    31,    63,    -1,    22,    -1,    28,    63,
-      -1,    29,    -1,    16,    -1,    24,    -1,    48,    -1,    45,
-      -1,    14,    60,    -1,     9,    39,    -1,    -1,     7,    46,
-      53,    -1,    -1,     6,    47,    53,    -1,     8,    30,    51,
-      -1,    49,    50,    51,    -1,    10,    -1,    11,    -1,    12,
-      -1,    -1,    30,    -1,    60,    -1,    51,    60,    -1,    30,
-      -1,    35,    -1,    35,     5,    -1,    35,    62,    -1,    35,
-       5,    62,    -1,    52,    -1,    53,    52,    -1,    55,    -1,
-      54,    55,    -1,    56,    -1,    44,    32,    -1,    -1,    35,
-      33,    57,    58,    32,    -1,    59,    -1,    58,    34,    59,
-      -1,    -1,    59,    60,    -1,    59,    61,    -1,    59,    15,
-      60,    -1,    35,    -1,    62,    -1,     4,    -1,    39,    -1,
-       3,    -1,     3,    -1,    -1,    36,    38,    -1,    -1,    32,
-      -1
+      48,     0,    -1,    49,    43,    61,    71,    -1,    -1,    49,
+      50,    -1,    51,    -1,    44,    -1,    17,    -1,    18,    70,
+      70,    -1,    19,    -1,    20,    -1,    21,     4,    -1,    22,
+      38,    70,    -1,    23,    -1,    24,    -1,    25,    -1,    26,
+      38,    70,    -1,    27,    -1,    28,    -1,    29,    38,    70,
+      -1,    30,    -1,    31,    -1,    32,    70,    -1,    34,    -1,
+      35,    -1,    36,    -1,    39,    -1,    55,    -1,    52,    -1,
+      33,    67,    -1,    10,    -1,     8,    58,    -1,     9,    58,
+      -1,    -1,     6,    53,    60,    -1,    -1,     5,    54,    60,
+      -1,     7,    37,    58,    -1,    56,    57,    58,    -1,    11,
+      -1,    12,    -1,    13,    -1,    -1,    37,    -1,    67,    -1,
+      58,    67,    -1,    37,    -1,    41,    -1,    41,     4,    -1,
+      41,    69,    -1,    41,     4,    69,    -1,    59,    -1,    60,
+      59,    -1,    62,    -1,    61,    62,    -1,    63,    -1,    51,
+      -1,     1,    39,    -1,    39,    -1,    -1,    42,    64,    65,
+      -1,    66,    -1,    65,    40,    66,    -1,    -1,    66,    67,
+      -1,    66,    68,    -1,    66,    14,    67,    -1,    66,    15,
+       4,    -1,    66,    16,    37,    -1,    41,    -1,    69,    -1,
+      46,    -1,     3,    -1,     3,    -1,    -1,    43,    45,    -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,   151,   151,   164,   166,   169,   171,   172,   173,   174,
-     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
-     185,   186,   189,   191,   192,   196,   204,   204,   210,   210,
-     215,   224,   239,   241,   242,   245,   247,   252,   254,   258,
-     263,   268,   274,   280,   290,   293,   302,   304,   310,   312,
-     315,   315,   320,   322,   325,   328,   330,   332,   336,   338,
-     339,   342,   348,   357,   365,   370,   376,   378
+       0,   162,   162,   170,   172,   176,   177,   178,   179,   180,
+     181,   182,   183,   184,   186,   187,   188,   189,   190,   191,
+     192,   193,   194,   195,   196,   197,   198,   202,   203,   204,
+     208,   214,   221,   231,   231,   236,   236,   241,   251,   266,
+     267,   268,   272,   273,   279,   280,   285,   289,   294,   300,
+     306,   317,   318,   327,   328,   334,   335,   340,   344,   348,
+     348,   352,   353,   358,   359,   361,   363,   365,   367,   372,
+     373,   377,   383,   392,   399,   401

 };
 #endif
 
 };
 #endif
 


@@ -462,160 +460,176 @@ 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\"", "\"%union\"", "\"%left\"", 
-  "\"%right\"", "\"%nonassoc\"", "\"%expect\"", "\"%start\"", "\"%prec\"", 
-  "\"%verbose\"", "\"%error-verbose\"", "\"%output\"", "\"%file-prefix\"", 
-  "\"%name-prefix\"", "\"%define\"", "\"%pure-parser\"", "\"%defines\"", 
-  "\"%yacc\"", "\"%debug\"", "\"%locations\"", "\"%no-lines\"", 
-  "\"%skeleton\"", "\"%token-table\"", "TYPE", "\"=\"", "\";\"", "\":\"", 
-  "\"|\"", "\"identifier\"", "\"%%\"", "PROLOGUE", "EPILOGUE", 
-  "BRACED_CODE", "$axiom", "input", "declarations", "declaration", 
-  "grammar_declaration", "symbol_declaration", "@1", "@2", 
+  "\"end of file\"", "error", "$undefined", "\"string\"", "\"integer\"", 
+  "\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor {...}\"", 
+  "\"%printer {...}\"", "\"%union {...}\"", "\"%left\"", "\"%right\"", 
+  "\"%nonassoc\"", "\"%prec\"", "\"%dprec\"", "\"%merge\"", "\"%debug\"", 
+  "\"%define\"", "\"%defines\"", "\"%error-verbose\"", "\"%expect\"", 
+  "\"%file-prefix\"", "\"%glr-parser\"", "\"%lex-param {...}\"", 
+  "\"%locations\"", "\"%name-prefix\"", "\"%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", 
   "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", 
-  "semi_colon.opt", 0
+  "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.  */
 /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
    token YYLEX-NUM.  */

-static const short yytoknum[] =
+static const unsigned short yytoknum[] =

 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
      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,
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
      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,

-      -1
+     295,   296,   297,   298,   299,   300,   301

 };
 };

+# 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,    40,    41,    42,    42,    43,    43,    43,    43,    43,
-      43,    43,    43,    43,    43,    43,    43,    43,    43,    43,
-      43,    43,    44,    44,    44,    44,    46,    45,    47,    45,
-      45,    48,    49,    49,    49,    50,    50,    51,    51,    52,
-      52,    52,    52,    52,    53,    53,    54,    54,    55,    55,
-      57,    56,    58,    58,    59,    59,    59,    59,    60,    60,
-      60,    61,    62,    63,    64,    64,    65,    65
+       0,    47,    48,    49,    49,    50,    50,    50,    50,    50,
+      50,    50,    50,    50,    50,    50,    50,    50,    50,    50,
+      50,    50,    50,    50,    50,    50,    50,    51,    51,    51,
+      51,    51,    51,    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,    62,    64,
+      63,    65,    65,    66,    66,    66,    66,    66,    66,    67,
+      67,    68,    69,    70,    71,    71

 };
 
 /* 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,     2,     1,
-       1,     1,     1,     1,     2,     2,     0,     3,     0,     3,
-       3,     3,     1,     1,     1,     0,     1,     1,     2,     1,
-       1,     2,     2,     3,     1,     2,     1,     2,     1,     2,
-       0,     5,     1,     3,     0,     2,     2,     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,     3,     1,     1,     3,
+       1,     1,     2,     1,     1,     1,     1,     1,     1,     2,
+       1,     2,     2,     0,     3,     0,     3,     3,     3,     1,
+       1,     1,     0,     1,     1,     2,     1,     1,     2,     2,
+       3,     1,     2,     1,     2,     1,     1,     2,     1,     0,
+       3,     1,     3,     0,     2,     2,     3,     3,     3,     1,
+       1,     1,     1,     1,     0,     2

 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
    STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
    means the default is an error.  */
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
    STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
    means the default is an error.  */

-static const short yydefact[] =
+static const unsigned char yydefact[] =

 {
 {

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

 };
 
 };
 

-/* YYPGOTO[NTERM-NUM]. */
-static const short yydefgoto[] =
+/* YYDEFGOTO[NTERM-NUM]. */
+static const yysigned_char yydefgoto[] =

 {
 {

-      -1,     1,     2,    29,    51,    31,    35,    34,    32,    33,
-      58,    64,    61,    62,    52,    53,    54,    80,    83,    84,
-      65,    90,    43,    48,    74,    56
+      -1,     1,     2,    36,    61,    38,    42,    41,    39,    40,
+      66,    46,    69,    70,    62,    63,    64,    79,    87,    88,
+      47,    97,    48,    51,    82

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

-static const short yypact[] =
+#define YYPACT_NINF -65
+static const yysigned_char yypact[] =

 {
 {

-  -32768,    23,    74,-32768,-32768,-32768,     1,   -31,-32768,-32768,
-  -32768,    29,     0,-32768,-32768,     7,    10,    14,    39,-32768,
-  -32768,-32768,-32768,-32768,-32768,    39,-32768,    18,-32768,    15,
-  -32768,-32768,-32768,    16,   -24,   -24,     0,-32768,-32768,-32768,
-  -32768,-32768,-32768,-32768,    39,    39,    39,-32768,    39,-32768,
-      17,    19,     8,-32768,-32768,-32768,-32768,-32768,     0,-32768,
-       4,-32768,   -24,   -24,     0,-32768,-32768,-32768,-32768,-32768,
-  -32768,-32768,    20,-32768,-32768,     0,    45,-32768,-32768,-32768,
-  -32768,-32768,-32768,   -22,    -2,-32768,-32768,     0,-32768,-32768,
-  -32768,    -2,-32768
+     -65,    27,   103,   -65,   -65,   -65,   -15,    -2,    -2,   -65,
+     -65,   -65,   -65,   -65,    25,   -65,   -65,    28,    -5,   -65,
+     -65,   -65,    -3,   -65,   -65,     0,   -65,   -65,    25,    -2,
+     -65,   -65,   -65,   -65,    65,   -65,   -65,   -65,   -65,   -65,
+       4,   -18,   -18,    -2,   -65,   -65,    -2,   -65,   -65,    -2,
+     -65,    25,   -65,    25,    25,    25,   -65,   -65,     1,   -65,
+     -65,   -65,     3,   -65,   -65,   -65,    -2,   -65,    22,   -65,
+     -18,   -18,    -2,   -65,   -65,   -65,   -65,   -65,   -65,   -65,
+     -11,   -65,   -65,    -2,    41,   -65,   -65,     8,    15,   -65,
+     -65,   -65,    -2,    48,    16,   -65,   -65,   -65,    15,   -65,
+     -65,   -65

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

-static const short yypgoto[] =
+static const yysigned_char yypgoto[] =

 {
 {

-  -32768,-32768,-32768,-32768,    47,-32768,-32768,-32768,-32768,-32768,
-  -32768,    -4,   -23,    25,-32768,     9,-32768,-32768,-32768,   -21,
-     -12,-32768,   -55,    11,-32768,-32768
+     -65,   -65,   -65,   -65,    53,   -65,   -65,   -65,   -65,   -65,
+     -65,    -6,   -64,    20,   -65,     2,   -65,   -65,   -65,   -34,
+     -29,   -65,   -63,    -4,   -65

 };
 
 /* 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.  */
-static const short yytable[] =
+   number is the opposite.  If zero, do what YYDEFACT says.
+   If YYTABLE_NINF, syntax error.  */
+#define YYTABLE_NINF -75
+static const yysigned_char yytable[] =

 {
 {

-      42,    39,    40,    39,    40,    77,    59,    39,    37,    76,
-      85,    60,    86,    87,     4,     5,     6,     7,     8,     9,
-      10,    82,    12,     3,     4,     5,     6,     7,     8,     9,
-      10,    36,    12,    41,    38,    41,    49,    88,    44,    78,
-      78,    45,    47,    50,    72,    46,    57,    55,    39,    30,
-      70,    71,    79,    50,    75,    66,    67,    68,    81,    69,
-      63,    73,     0,    79,     0,    91,     0,     0,     0,     0,
-       0,     0,    89,     0,     0,    92,     0,     0,     0,    89,
+      57,    44,    49,   -74,    58,    85,    86,    86,     4,     5,
+       6,     7,     8,     9,    10,    11,    12,    73,    44,    67,
+      73,    90,    43,    68,    56,    44,    84,     3,    50,    92,
+      93,    94,    52,    53,    89,    54,    29,    72,    55,    45,
+      78,    65,    59,    73,    44,    60,    80,    74,    91,    75,
+      76,    77,   100,   101,    73,    37,    45,    98,     0,    96,
+      83,    95,    71,    99,    81,     0,    58,     0,     0,    96,

        4,     5,     6,     7,     8,     9,    10,    11,    12,     0,
        4,     5,     6,     7,     8,     9,    10,    11,    12,     0,

+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    29,     0,
+       0,     0,     0,     0,    59,     0,     0,    60,     4,     5,
+       6,     7,     8,     9,    10,    11,    12,     0,     0,     0,

       13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
       13,    14,    15,    16,    17,    18,    19,    20,    21,    22,

-      23,    24,    25,    26,     0,     0,     0,     0,     0,     0,
-      27,    28
+      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
+       0,     0,    33,     0,     0,     0,    34,    35

 };
 
 };
 

-static const short yycheck[] =
+static const yysigned_char yycheck[] =

 {
 {

-      12,     3,     4,     3,     4,    60,    30,     3,    39,     5,
-      32,    35,    34,    15,     6,     7,     8,     9,    10,    11,
-      12,    76,    14,     0,     6,     7,     8,     9,    10,    11,
-      12,    30,    14,    35,     5,    35,    25,    39,    31,    62,
-      63,    31,     3,    35,    36,    31,    30,    32,     3,     2,
-      33,    32,    64,    35,    58,    44,    45,    46,    38,    48,
-      35,    52,    -1,    75,    -1,    86,    -1,    -1,    -1,    -1,
-      -1,    -1,    84,    -1,    -1,    87,    -1,    -1,    -1,    91,
-       6,     7,     8,     9,    10,    11,    12,    13,    14,    -1,
-      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29,    -1,    -1,    -1,    -1,    -1,    -1,
-      36,    37
+      29,     3,     8,     0,     1,    68,    70,    71,     5,     6,
+       7,     8,     9,    10,    11,    12,    13,    46,     3,    37,
+      49,    84,    37,    41,    28,     3,     4,     0,     3,    14,
+      15,    16,     4,    38,    45,    38,    33,    43,    38,    41,
+      39,    37,    39,    72,     3,    42,    43,    51,    40,    53,
+      54,    55,     4,    37,    83,     2,    41,    91,    -1,    88,
+      66,    46,    42,    92,    62,    -1,     1,    -1,    -1,    98,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    33,    -1,
+      -1,    -1,    -1,    -1,    39,    -1,    -1,    42,     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,
+      -1,    -1,    39,    -1,    -1,    -1,    43,    44

 };
 
 };
 

-#if YYDEBUG

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

 };
 };

-#endif

 
 #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
 # define YYSIZE_T __SIZE_TYPE__
 
 #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
 # define YYSIZE_T __SIZE_TYPE__


@@ -635,12 +649,19 @@ 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                do                              \
+                         {                             \
+                           yylerrsp = yylsp;           \
+                           *++yylerrsp = yyloc;        \
+                           goto yyerrlab1;             \
+                         }                             \
+                       while (0)
+

 
 /* 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.


@@ -656,13 +677,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)


@@ -674,7 +695,7 @@ while (0)
    are run).  */
 
 #ifndef YYLLOC_DEFAULT
    are run).  */
 
 #ifndef YYLLOC_DEFAULT

-# define YYLLOC_DEFAULT(Current, Rhs, N)           \
+# 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.first_line   = Rhs[1].first_line;      \
   Current.first_column = Rhs[1].first_column;    \
   Current.last_line    = Rhs[N].last_line;       \


@@ -683,23 +704,11 @@ while (0)
 
 /* YYLEX -- calling `yylex' with the right arguments.  */
 
 
 /* YYLEX -- calling `yylex' with the right arguments.  */
 

-#if YYPURE
-# if YYLSP_NEEDED
-#  ifdef YYLEX_PARAM
-#   define YYLEX               yylex (&yylval, &yylloc, YYLEX_PARAM)
-#  else
-#   define YYLEX               yylex (&yylval, &yylloc)
-#  endif
-# else /* !YYLSP_NEEDED */
-#  ifdef YYLEX_PARAM
-#   define YYLEX               yylex (&yylval, YYLEX_PARAM)
-#  else
-#   define YYLEX               yylex (&yylval)
-#  endif
-# endif /* !YYLSP_NEEDED */
-#else /* !YYPURE */
-# define YYLEX                 yylex ()
-#endif /* !YYPURE */
+#ifdef YYLEX_PARAM
+# define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM)
+#else
+# define YYLEX yylex (&yylval, &yylloc)
+#endif

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


@@ -714,13 +723,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 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 (cinluded).                                                   |
+`------------------------------------------------------------------*/
+
+#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)
 /* 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


@@ -798,72 +887,127 @@ yystpcpy (yydest, yysrc)
 
 \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.  */
+#if YYDEBUG
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+#if defined (__STDC__) || defined (__cplusplus)
+static void
+yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp)
+#else
+static void
+yysymprint (yyoutput, yytype, yyvaluep, yylocationp)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE *yyvaluep;
+    YYLTYPE *yylocationp;
+#endif
+{
+  /* Pacify ``unused variable'' warnings.  */
+  (void) yyvaluep;
+  (void) yylocationp;
+
+  if (yytype < YYNTOKENS)
+    {
+      YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+# ifdef YYPRINT
+      YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# endif
+    }
+  else
+    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+
+  switch (yytype)
+    {
+      default:
+        break;
+    }
+  YYFPRINTF (yyoutput, ")");
+}
+
+#endif /* ! YYDEBUG */
+/*-----------------------------------------------.
+| Release the memory associated to this symbol.  |
+`-----------------------------------------------*/
+
+#if defined (__STDC__) || defined (__cplusplus)
+static void
+yydestruct (int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp)
+#else
+static void
+yydestruct (yytype, yyvaluep, yylocationp)
+    int yytype;
+    YYSTYPE *yyvaluep;
+    YYLTYPE *yylocationp;
+#endif
+{
+  /* Pacify ``unused variable'' warnings.  */
+  (void) yyvaluep;
+  (void) yylocationp;
+
+  switch (yytype)
+    {
+
+      default:
+        break;
+    }
+}
+\f
+
+/* 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 */

 
 

-/* YY_DECL_VARIABLES -- depending whether we use a pure parser,
-   variables are global, or local to YYPARSE.  */
-
-#define YY_DECL_NON_LSP_VARIABLES                      \
-/* The lookahead symbol.  */                           \
-int yychar;                                            \
-                                                       \
-/* The semantic value of the lookahead symbol.  */     \
-YYSTYPE yylval;                                                \
-                                                       \
-/* Number of parse errors so far.  */                  \
-int yynerrs;

 
 

-#if YYLSP_NEEDED
-# define YY_DECL_VARIABLES                     \
-YY_DECL_NON_LSP_VARIABLES                      \
-                                               \
-/* Location data for the lookahead symbol.  */ \
-YYLTYPE yylloc;
-#else
-# define YY_DECL_VARIABLES                     \
-YY_DECL_NON_LSP_VARIABLES
-#endif

 
 

-/* If nonreentrant, generate the variables here.  */

 
 

-#if !YYPURE
-YY_DECL_VARIABLES
-#endif  /* !YYPURE */

 
 

+
+/*----------.
+| 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
 int

-yyparse (YYPARSE_PARAM_ARG)
-     YYPARSE_PARAM_DECL
+yyparse (void)
+#else
+int
+yyparse ()
+
+#endif
+#endif

 {
 {

-  /* If reentrant, generate the variables here.  */
-#if YYPURE
-  YY_DECL_VARIABLES
-#endif  /* !YYPURE */
+  /* The lookahead symbol.  */
+int yychar;
+
+/* The semantic value of the lookahead symbol.  */
+YYSTYPE yylval;
+
+/* Number of syntax errors so far.  */
+int yynerrs;
+/* Location data for the lookahead symbol.  */
+YYLTYPE yylloc;

 
   register int yystate;
   register int yyn;
 
   register int yystate;
   register int yyn;


@@ -871,7 +1015,7 @@ yyparse (YYPARSE_PARAM_ARG)
   /* 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,


@@ -891,27 +1035,20 @@ yyparse (YYPARSE_PARAM_ARG)
   YYSTYPE *yyvs = yyvsa;
   register YYSTYPE *yyvsp;
 
   YYSTYPE *yyvs = yyvsa;
   register YYSTYPE *yyvsp;
 

-#if YYLSP_NEEDED

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

-#endif
+  YYLTYPE *yylerrsp;

 
 

-#if YYLSP_NEEDED
-# define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
-#else
-# define YYPOPSTACK   (yyvsp--, yyssp--)
-#endif
+#define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)

 
   YYSIZE_T yystacksize = YYINITDEPTH;
 
   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;
 
   YYSIZE_T yystacksize = YYINITDEPTH;
 
   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;

-#if YYLSP_NEEDED

   YYLTYPE yyloc;
   YYLTYPE yyloc;

-#endif

 
   /* When reducing, the number of symbols on the RHS of the reduced
      rule.  */
 
   /* When reducing, the number of symbols on the RHS of the reduced
      rule.  */


@@ -931,9 +1068,7 @@ yyparse (YYPARSE_PARAM_ARG)
 
   yyssp = yyss;
   yyvsp = yyvs;
 
   yyssp = yyss;
   yyvsp = yyvs;

-#if YYLSP_NEEDED

   yylsp = yyls;
   yylsp = yyls;

-#endif

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


@@ -948,7 +1083,7 @@ yyparse (YYPARSE_PARAM_ARG)
  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;


@@ -960,25 +1095,18 @@ yyparse (YYPARSE_PARAM_ARG)
           memory.  */
        YYSTYPE *yyvs1 = yyvs;
        short *yyss1 = yyss;
           memory.  */
        YYSTYPE *yyvs1 = yyvs;
        short *yyss1 = yyss;

+       YYLTYPE *yyls1 = yyls;

 
        /* Each stack pointer address is followed by the size of the
 
        /* Each stack pointer address is followed by the size of the

-          data in use in that stack, in bytes.  */
-# if YYLSP_NEEDED
-       YYLTYPE *yyls1 = yyls;
-       /* This used to be a conditional around just the two extra args,
-          but that might be undefined if yyoverflow is a macro.  */
+          data in use in that stack, in bytes.  This used to be a
+          conditional around just the two extra args, but that might
+          be undefined if yyoverflow is a macro.  */

        yyoverflow ("parser stack overflow",
                    &yyss1, yysize * sizeof (*yyssp),
                    &yyvs1, yysize * sizeof (*yyvsp),
                    &yyls1, yysize * sizeof (*yylsp),
                    &yystacksize);
        yyls = yyls1;
        yyoverflow ("parser stack overflow",
                    &yyss1, yysize * sizeof (*yyssp),
                    &yyvs1, yysize * sizeof (*yyvsp),
                    &yyls1, yysize * sizeof (*yylsp),
                    &yystacksize);
        yyls = yyls1;

-# else
-       yyoverflow ("parser stack overflow",
-                   &yyss1, yysize * sizeof (*yyssp),
-                   &yyvs1, yysize * sizeof (*yyvsp),
-                   &yystacksize);
-# endif

        yyss = yyss1;
        yyvs = yyvs1;
       }
        yyss = yyss1;
        yyvs = yyvs1;
       }


@@ -987,10 +1115,10 @@ yyparse (YYPARSE_PARAM_ARG)
       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;
 
       {


@@ -1001,9 +1129,7 @@ yyparse (YYPARSE_PARAM_ARG)
          goto yyoverflowlab;
        YYSTACK_RELOCATE (yyss);
        YYSTACK_RELOCATE (yyvs);
          goto yyoverflowlab;
        YYSTACK_RELOCATE (yyss);
        YYSTACK_RELOCATE (yyvs);

-#  if YYLSP_NEEDED

        YYSTACK_RELOCATE (yyls);
        YYSTACK_RELOCATE (yyls);

-#  endif

 #  undef YYSTACK_RELOCATE
        if (yyss1 != yyssa)
          YYSTACK_FREE (yyss1);
 #  undef YYSTACK_RELOCATE
        if (yyss1 != yyssa)
          YYSTACK_FREE (yyss1);


@@ -1013,14 +1139,12 @@ yyparse (YYPARSE_PARAM_ARG)
 
       yyssp = yyss + yysize - 1;
       yyvsp = yyvs + yysize - 1;
 
       yyssp = yyss + yysize - 1;
       yyvsp = yyvs + yysize - 1;

-#if YYLSP_NEEDED

       yylsp = yyls + yysize - 1;
       yylsp = yyls + yysize - 1;

-#endif

 
       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;
     }
 


@@ -1040,88 +1164,55 @@ yybackup:
   /* First try to decide what to do without reference to lookahead token.  */
 
   yyn = yypact[yystate];
   /* First try to decide what to do without reference to lookahead token.  */
 
   yyn = yypact[yystate];

-  if (yyn == YYFLAG)
+  if (yyn == YYPACT_NINF)

     goto yydefault;
 
   /* Not known => get a lookahead token if don't already have one.  */
 
     goto yydefault;
 
   /* 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);
-
-#if YYDEBUG
-     /* We have to keep this `#if YYDEBUG', since we use variables
-       which are defined only if `YYDEBUG' is set.  */
-      if (yydebug)
-       {
-         YYFPRINTF (stderr, "Next token is %d (%s",
-                    yychar, yytname[yychar1]);
-         /* Give the individual parser a way to print the precise
-            meaning of a token, for further debugging info.  */
-# ifdef YYPRINT
-         YYPRINT (stderr, yychar, yylval);
-# endif
-         YYFPRINTF (stderr, ")\n");
-       }
-#endif
+      yytoken = YYTRANSLATE (yychar);
+      YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);

     }
 
     }
 

-  yyn += yychar1;
-  if (yyn < 0 || yyn > YYLAST || 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 == YYFLAG)
+      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)
     yychar = YYEMPTY;
 
   *++yyvsp = yylval;
 
   /* Discard the token being shifted unless it is eof.  */
   if (yychar != YYEOF)
     yychar = YYEMPTY;
 
   *++yyvsp = yylval;

-#if YYLSP_NEEDED

   *++yylsp = yylloc;
   *++yylsp = yylloc;

-#endif

 
   /* Count tokens shifted since error; after three, turn off error
      status.  */
 
   /* Count tokens shifted since error; after three, turn off error
      status.  */


@@ -1152,396 +1243,397 @@ yyreduce:
   /* If YYLEN is nonzero, implement the default value of the action:
      `$$ = $1'.
 
   /* If YYLEN is nonzero, implement the default value of the action:
      `$$ = $1'.
 

-     Otherwise, the following line sets YYVAL to the semantic value of
-     the lookahead token.  This behavior is undocumented and Bison
+     Otherwise, the following line sets YYVAL to garbage.
+     This behavior is undocumented and Bison

      users should not rely upon it.  Assigning to YYVAL
      unconditionally makes the parser a bit smaller, and it avoids a
      GCC warning that YYVAL may be used uninitialized.  */
   yyval = yyvsp[1-yylen];
 
      users should not rely upon it.  Assigning to YYVAL
      unconditionally makes the parser a bit smaller, and it avoids a
      GCC warning that YYVAL may be used uninitialized.  */
   yyval = yyvsp[1-yylen];
 

-#if YYLSP_NEEDED

   /* Default location. */
   YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
   /* Default location. */
   YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);

-#endif
-
-#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
+  YY_REDUCE_PRINT (yyn);

   switch (yyn)
     {
   switch (yyn)
     {

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

     break;
 
   case 7:
     break;
 
   case 7:

-#line 172 "parse-gram.y"
+#line 178 "parse-gram.y"

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

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

     break;
 
   case 9:
     break;
 
   case 9:

-#line 174 "parse-gram.y"
+#line 180 "parse-gram.y"

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

-#line 175 "parse-gram.y"
+#line 181 "parse-gram.y"

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

-#line 176 "parse-gram.y"
+#line 182 "parse-gram.y"

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

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

     break;
 
   case 13:
     break;
 
   case 13:

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

     break;
 
   case 14:
     break;
 
   case 14:

-#line 179 "parse-gram.y"
-    { spec_name_prefix = yyvsp[0].string; }
+#line 186 "parse-gram.y"
+    { add_param ("lex_param", yyvsp[0].chars, yylsp[0]); }

     break;
 
   case 15:
     break;
 
   case 15:

-#line 180 "parse-gram.y"
-    { no_lines_flag = 1; }
+#line 187 "parse-gram.y"
+    { locations_flag = 1; }

     break;
 
   case 16:
     break;
 
   case 16:

-#line 181 "parse-gram.y"
-    { spec_outfile = yyvsp[0].string; }
+#line 188 "parse-gram.y"
+    { spec_name_prefix = yyvsp[0].chars; }

     break;
 
   case 17:
     break;
 
   case 17:

-#line 182 "parse-gram.y"
-    { pure_parser = 1; }
+#line 189 "parse-gram.y"
+    { no_lines_flag = 1; }

     break;
 
   case 18:
     break;
 
   case 18:

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

     break;
 
   case 19:
     break;
 
   case 19:

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

     break;
 
   case 20:
     break;
 
   case 20:

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

     break;
 
   case 21:
     break;
 
   case 21:

-#line 186 "parse-gram.y"
-    { yacc_flag = 1; }
+#line 193 "parse-gram.y"
+    { pure_parser = true; }
+    break;
+
+  case 22:
+#line 194 "parse-gram.y"
+    { skeleton = yyvsp[0].chars; }
+    break;
+
+  case 23:
+#line 195 "parse-gram.y"
+    { token_table_flag = 1; }

     break;
 
   case 24:
     break;
 
   case 24:

-#line 193 "parse-gram.y"
+#line 196 "parse-gram.y"
+    { report_flag = report_states; }
+    break;
+
+  case 25:
+#line 197 "parse-gram.y"
+    { yacc_flag = 1; }
+    break;
+
+  case 29:
+#line 205 "parse-gram.y"

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

-  case 25:
-#line 197 "parse-gram.y"
+  case 30:
+#line 209 "parse-gram.y"

     {
       typed = 1;
     {
       typed = 1;

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

     }
     break;
 
     }
     break;
 

-  case 26:
-#line 205 "parse-gram.y"
+  case 31:
+#line 215 "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;
+
+  case 32:
+#line 222 "parse-gram.y"
+    {
+      symbol_list *list;
+      for (list = yyvsp[0].list; list; list = list->next)
+       symbol_printer_set (list->sym, yyvsp[-1].chars, list->location);
+      symbol_list_free (yyvsp[0].list);
+    }
+    break;
+
+  case 33:
+#line 231 "parse-gram.y"

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

-  case 27:
-#line 206 "parse-gram.y"
+  case 34:
+#line 232 "parse-gram.y"

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

-  case 28:
-#line 210 "parse-gram.y"
+  case 35:
+#line 236 "parse-gram.y"

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

-  case 29:
-#line 211 "parse-gram.y"
+  case 36:
+#line 237 "parse-gram.y"

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

-  case 30:
-#line 216 "parse-gram.y"
+  case 37:
+#line 242 "parse-gram.y"

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

-       symbol_type_set (list->sym, list->location, yyvsp[-1].string);
-      LIST_FREE (symbol_list, yyvsp[0].list);
+       symbol_type_set (list->sym, yyvsp[-1].uniqstr, yylsp[-1]);
+      symbol_list_free (yyvsp[0].list);

     }
     break;
 
     }
     break;
 

-  case 31:
-#line 226 "parse-gram.y"
+  case 38:
+#line 252 "parse-gram.y"

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

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

        }
        }

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

       current_type = NULL;
     }
     break;
 
       current_type = NULL;
     }
     break;
 

-  case 32:
-#line 240 "parse-gram.y"
+  case 39:
+#line 266 "parse-gram.y"

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

-  case 33:
-#line 241 "parse-gram.y"
+  case 40:
+#line 267 "parse-gram.y"

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

-  case 34:
-#line 242 "parse-gram.y"
+  case 41:
+#line 268 "parse-gram.y"

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

-  case 35:
-#line 246 "parse-gram.y"
-    { current_type = NULL;}
+  case 42:
+#line 272 "parse-gram.y"
+    { current_type = NULL; }

     break;
 
     break;
 

-  case 36:
-#line 247 "parse-gram.y"
-    { current_type = yyvsp[0].string; }
+  case 43:
+#line 273 "parse-gram.y"
+    { current_type = yyvsp[0].uniqstr; }

     break;
 
     break;
 

-  case 37:
-#line 253 "parse-gram.y"
+  case 44:
+#line 279 "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 38:
-#line 254 "parse-gram.y"
+  case 45:
+#line 280 "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 39:
-#line 260 "parse-gram.y"
+  case 46:
+#line 286 "parse-gram.y"

     {
     {

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

      }
     break;
 
      }
     break;
 

-  case 40:
-#line 264 "parse-gram.y"
+  case 47:
+#line 290 "parse-gram.y"

     {
     {

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

      }
     break;
 
      }
     break;
 

-  case 41:
-#line 269 "parse-gram.y"
+  case 48:
+#line 295 "parse-gram.y"

     {
     {

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

     }
     break;
 
     }
     break;
 

-  case 42:
-#line 275 "parse-gram.y"
+  case 49:
+#line 301 "parse-gram.y"

     {
     {

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

     }
     break;
 
     }
     break;
 

-  case 43:
-#line 281 "parse-gram.y"
+  case 50:
+#line 307 "parse-gram.y"

     {
     {

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

     }
     break;
 
     }
     break;
 

-  case 44:
-#line 292 "parse-gram.y"
-    {;}
-    break;
-
-  case 45:
-#line 294 "parse-gram.y"
-    {;}
+  case 56:
+#line 336 "parse-gram.y"
+    {
+      if (yacc_flag)
+       complain_at (yyloc, _("POSIX forbids declarations in the grammar"));
+    }

     break;
 
     break;
 

-  case 50:
-#line 316 "parse-gram.y"
-    { current_lhs = yyvsp[-1].symbol; current_lhs_location = yylsp[-1]; }
+  case 57:
+#line 341 "parse-gram.y"
+    {
+      yyerrok;
+    }

     break;
 
     break;
 

-  case 51:
-#line 317 "parse-gram.y"
-    {;}
+  case 59:
+#line 348 "parse-gram.y"
+    { current_lhs = yyvsp[0].symbol; current_lhs_location = yylsp[0]; }

     break;
 
     break;
 

-  case 52:
-#line 321 "parse-gram.y"
+  case 61:
+#line 352 "parse-gram.y"

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

-  case 53:
-#line 322 "parse-gram.y"
+  case 62:
+#line 353 "parse-gram.y"

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

-  case 54:
-#line 327 "parse-gram.y"
+  case 63:
+#line 358 "parse-gram.y"

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

-  case 55:
-#line 329 "parse-gram.y"
+  case 64:
+#line 360 "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 56:
-#line 331 "parse-gram.y"
-    { grammar_current_rule_action_append (yyvsp[0].string, yylsp[0]); }
+  case 65:
+#line 362 "parse-gram.y"
+    { grammar_current_rule_action_append (yyvsp[0].chars, yylsp[0]); }

     break;
 
     break;
 

-  case 57:
-#line 333 "parse-gram.y"
-    { grammar_current_rule_prec_set (yyvsp[0].symbol); }
+  case 66:
+#line 364 "parse-gram.y"
+    { grammar_current_rule_prec_set (yyvsp[0].symbol, yylsp[0]); }

     break;
 
     break;
 

-  case 58:
-#line 337 "parse-gram.y"
-    { yyval.symbol = yyvsp[0].symbol; }
+  case 67:
+#line 366 "parse-gram.y"
+    { grammar_current_rule_dprec_set (yyvsp[0].integer, yylsp[0]); }

     break;
 
     break;
 

-  case 59:
-#line 338 "parse-gram.y"
-    { yyval.symbol = yyvsp[0].symbol; }
+  case 68:
+#line 368 "parse-gram.y"
+    { grammar_current_rule_merge_set (yyvsp[0].uniqstr, yylsp[0]); }

     break;
 
     break;
 

-  case 60:
-#line 339 "parse-gram.y"
-    { yyval.symbol = getsym (yyvsp[0].string, yylsp[0]); }
+  case 69:
+#line 372 "parse-gram.y"
+    { yyval.symbol = yyvsp[0].symbol; }

     break;
 
     break;
 

-  case 61:
-#line 344 "parse-gram.y"
-    { yyval.string = yyvsp[0].string; }
+  case 70:
+#line 373 "parse-gram.y"
+    { yyval.symbol = yyvsp[0].symbol; }

     break;
 
     break;
 

-  case 62:
-#line 350 "parse-gram.y"
-    {
-      yyval.symbol = getsym (yyvsp[0].string, yylsp[0]);
-      symbol_class_set (yyval.symbol, token_sym);
-    }
+  case 71:
+#line 378 "parse-gram.y"
+    { yyval.chars = yyvsp[0].chars; }

     break;
 
     break;
 

-  case 63:
-#line 359 "parse-gram.y"
+  case 72:
+#line 384 "parse-gram.y"

     {
     {

-      yyval.string = yyvsp[0].string + 1;
-      yyval.string[strlen (yyval.string) - 1] = '\0';
+      yyval.symbol = symbol_get (yyvsp[0].chars, yylsp[0]);
+      symbol_class_set (yyval.symbol, token_sym, yylsp[0]);

     }
     break;
 
     }
     break;
 

-  case 64:
-#line 367 "parse-gram.y"
+  case 73:
+#line 393 "parse-gram.y"

     {
     {

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

     }
     break;
 
     }
     break;
 

-  case 65:
-#line 371 "parse-gram.y"
+  case 75:
+#line 402 "parse-gram.y"

     {
     {

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

     }
     break;
 
 
     }
 
     }
     break;
 
 
     }
 

-/* Line 1012 of /usr/local/share/bison/bison.simple.  */
-#line 1523 "parse-gram.c"
+/* Line 999 of yacc.c.  */
+#line 1628 "parse-gram.c"

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

-#if YYLSP_NEEDED

   yylsp -= yylen;
   yylsp -= yylen;

-#endif

 
 

-#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;
 
   *++yyvsp = yyval;

-#if YYLSP_NEEDED

   *++yylsp = yyloc;
   *++yylsp = yyloc;

-#endif

 
   /* Now `shift' the result of the reduction.  Determine what state
      that goes to, based on the state we popped back to and the rule
 
   /* Now `shift' the result of the reduction.  Determine what state
      that goes to, based on the state we popped back to and the rule


@@ -1550,7 +1642,7 @@ yyreduce:
   yyn = yyr1[yyn];
 
   yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
   yyn = yyr1[yyn];
 
   yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;

-  if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)

     yystate = yytable[yystate];
   else
     yystate = yydefgoto[yyn - YYNTOKENS];
     yystate = yytable[yystate];
   else
     yystate = yydefgoto[yyn - YYNTOKENS];


@@ -1566,62 +1658,70 @@ yyerrlab:
   if (!yyerrstatus)
     {
       ++yynerrs;
   if (!yyerrstatus)
     {
       ++yynerrs;

-

 #if YYERROR_VERBOSE
       yyn = yypact[yystate];
 
 #if YYERROR_VERBOSE
       yyn = yypact[yystate];
 

-      if (yyn > YYFLAG && yyn < YYLAST)
+      if (YYPACT_NINF < yyn && yyn < YYLAST)

        {
          YYSIZE_T yysize = 0;
        {
          YYSIZE_T yysize = 0;

+         int yytype = YYTRANSLATE (yychar);
+         const char* yyprefix;

          char *yymsg;
          char *yymsg;

-         int yyx, yycount;
+         int yyx;

 
 

-         yycount = 0;

          /* Start YYX at -YYN if negative to avoid negative indexes in
             YYCHECK.  */
          /* 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)
-             yysize += yystrlen (yytname[yyx]) + 15, yycount++;
-         yysize += yystrlen ("parse error, unexpected ") + 1;
-         yysize += yystrlen (yytname[YYTRANSLATE (yychar)]);
+         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)
            {
          yymsg = (char *) YYSTACK_ALLOC (yysize);
          if (yymsg != 0)
            {

-             char *yyp = yystpcpy (yymsg, "parse error, unexpected ");
-             yyp = yystpcpy (yyp, yytname[YYTRANSLATE (yychar)]);
+             char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
+             yyp = yystpcpy (yyp, yytname[yytype]);

 
              if (yycount < 5)
                {
 
              if (yycount < 5)
                {

-                 yycount = 0;
-                 for (yyx = yyn < 0 ? -yyn : 0;
-                      yyx < (int) (sizeof (yytname) / sizeof (char *));
-                      yyx++)
-                   if (yycheck[yyx + yyn] == yyx)
+                 yyprefix = ", expecting ";
+                 for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+                   if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)

                      {
                      {

-                       const char *yyq = ! yycount ? ", expecting " : " or ";
-                       yyp = yystpcpy (yyp, yyq);
+                       yyp = yystpcpy (yyp, yyprefix);

                        yyp = yystpcpy (yyp, yytname[yyx]);
                        yyp = yystpcpy (yyp, yytname[yyx]);

-                       yycount++;
+                       yyprefix = " or ";

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

-           }
-         else
-           yyerror ("parse error; also virtual memory exhausted");
-        }
+           }
+         else
+           yyerror ("syntax error; also virtual memory exhausted");
+       }

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

-        yyerror ("parse error");
+       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
   if (yyerrstatus == 3)
     {
       /* If just tried and failed to reuse lookahead token after an


@@ -1629,21 +1729,40 @@ yyerrlab1:
 
       /* Return failure if at end of input.  */
       if (yychar == YYEOF)
 
       /* Return failure if at end of input.  */
       if (yychar == YYEOF)

-       YYABORT;
-      YYDPRINTF ((stderr, "Discarding token %d (%s).\n",
-                 yychar, yytname[yychar1]));
+        {
+         /* Pop the error token.  */
+          YYPOPSTACK;
+         /* Pop the rest of the stack.  */
+         while (yyss < yyssp)
+           {
+             YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
+             yydestruct (yystos[*yyssp], yyvsp, yylsp);
+             YYPOPSTACK;
+           }
+         YYABORT;
+        }
+
+      YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
+      yydestruct (yytoken, &yylval, &yylloc);

       yychar = YYEMPTY;
       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;

 
 

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

   yyerrstatus = 3;     /* Each real token shifted decrements this.  */
 
   for (;;)
     {
       yyn = yypact[yystate];
   yyerrstatus = 3;     /* Each real token shifted decrements this.  */
 
   for (;;)
     {
       yyn = yypact[yystate];

-      if (yyn != YYFLAG)
+      if (yyn != YYPACT_NINF)

        {
          yyn += YYTERROR;
          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
        {
          yyn += YYTERROR;
          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)


@@ -1658,42 +1777,12 @@ yyerrlab1:
       if (yyssp == yyss)
        YYABORT;
 
       if (yyssp == yyss)
        YYABORT;
 

-#if YYDEBUG
-      if (yydebug)
-       {
-         if (yystos[yystate] < YYNTOKENS)
-           {
-             YYFPRINTF (stderr, "Error: popping token %d (%s",
-                        yytoknum[yystos[yystate]], yytname[yystos[yystate]]);
-# ifdef YYPRINT
-             YYPRINT (stderr, yytoknum[yystos[yystate]], *yyvsp);
-# endif
-             YYFPRINTF (stderr, ")\n");
-           }
-         else
-           {
-             YYFPRINTF (stderr, "Error: popping nonterminal (%s)\n",
-                        yytname[yystos[yystate]]);
-           }
-       }
-#endif
-
+      YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
+      yydestruct (yystos[yystate], yyvsp, yylsp);

       yyvsp--;
       yystate = *--yyssp;
       yyvsp--;
       yystate = *--yyssp;

-#if YYLSP_NEEDED

       yylsp--;
       yylsp--;

-#endif
-
-#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
+      YY_STACK_PRINT (yyss, yyssp);

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


@@ -1702,9 +1791,8 @@ yyerrlab1:
   YYDPRINTF ((stderr, "Shifting error token, "));
 
   *++yyvsp = yylval;
   YYDPRINTF ((stderr, "Shifting error token, "));
 
   *++yyvsp = yylval;

-#if YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
+  YYLLOC_DEFAULT (yyloc, yylsp, (yylerrsp - yylsp));
+  *++yylsp = yyloc;

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


@@ -1724,13 +1812,15 @@ yyabortlab:
   yyresult = 1;
   goto yyreturn;
 
   yyresult = 1;
   goto yyreturn;
 

-/*---------------------------------------------.
-| yyoverflowab -- parser overflow comes here.  |
-`---------------------------------------------*/
+#ifndef yyoverflow
+/*----------------------------------------------.
+| yyoverflowlab -- parser overflow comes here.  |
+`----------------------------------------------*/

 yyoverflowlab:
   yyerror ("parser stack overflow");
   yyresult = 2;
   /* Fall through.  */
 yyoverflowlab:
   yyerror ("parser stack overflow");
   yyresult = 2;
   /* Fall through.  */

+#endif

 
 yyreturn:
 #ifndef yyoverflow
 
 yyreturn:
 #ifndef yyoverflow


@@ -1740,25 +1830,92 @@ yyreturn:
   return yyresult;
 }
 
   return yyresult;
 }
 

-#line 380 "parse-gram.y"

 
 

-/*------------------------------------------------------------------.
-| When debugging the parser, display tokens' locations and values.  |
-`------------------------------------------------------------------*/
+#line 408 "parse-gram.y"
+
+
+
+/* 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
 
 static void

-yyprint (FILE *file,
-         const location_t *loc, int type, const yystype *value)
+add_param (char const *type, char *decl, location loc)

 {
 {

-  fputs (" (", file);
-  LOCATION_PRINT (file, *loc);
-  fputs (")", file);
-  switch (type)
+  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

     {
     {

-    case CHARACTER:
-      fprintf (file, " = '%s'", value->string);
-      break;
+      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
+print_token_value (FILE *file, int type, YYSTYPE const *value)
+{
+  fputc (' ', file);
+  switch (type)
+    {

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


@@ -1768,26 +1925,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 (gram_control_t *control ATTRIBUTE_UNUSED,
-           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)

 {
 {

-  LOCATION_PRINT (stderr, *yylloc);
-  fprintf (stderr, ": %s\n", msg);
+  return yytname[type];

 }
 
 }