Regenerate.

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

diff --git a/src/parse-gram.c b/src/parse-gram.c
index e5eac8213cc4fe9260eda72c98b42ce617d9af1d..afc959031cb7f61ca19c0d3a795240f2f8d23569 100644 (file)
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,7 +1,7 @@
-/* A Bison parser, made by GNU Bison 1.75c.  */
+/* A Bison parser, made by GNU Bison 2.1a.  */

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

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

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


@@ -15,8 +15,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software

-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */

 
 /* As a special exception, when this file is copied by Bison into a
    Bison output file, you may use that output file without restriction.
 
 /* As a special exception, when this file is copied by Bison into a
    Bison output file, you may use that output file without restriction.


@@ -36,6 +36,9 @@
 /* Identify Bison output.  */
 #define YYBISON 1
 
 /* Identify Bison output.  */
 #define YYBISON 1
 

+/* Bison version.  */
+#define YYBISON_VERSION "2.1a"
+

 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
 


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

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

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


@@ -78,37 +80,43 @@
      PERCENT_DPREC = 270,
      PERCENT_MERGE = 271,
      PERCENT_DEBUG = 272,
      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_OUTPUT = 283,
-     PERCENT_PARSE_PARAM = 284,
-     PERCENT_PURE_PARSER = 285,
-     PERCENT_SKELETON = 286,
-     PERCENT_START = 287,
-     PERCENT_TOKEN_TABLE = 288,
-     PERCENT_VERBOSE = 289,
-     PERCENT_YACC = 290,
-     TYPE = 291,
-     EQUAL = 292,
-     SEMICOLON = 293,
-     COLON = 294,
-     COMMA = 295,
-     PIPE = 296,
-     ID = 297,
-     PERCENT_PERCENT = 298,
-     PROLOGUE = 299,
-     EPILOGUE = 300,
-     BRACED_CODE = 301
+     PERCENT_DEFAULT_PREC = 273,
+     PERCENT_DEFINE = 274,
+     PERCENT_DEFINES = 275,
+     PERCENT_ERROR_VERBOSE = 276,
+     PERCENT_EXPECT = 277,
+     PERCENT_EXPECT_RR = 278,
+     PERCENT_FILE_PREFIX = 279,
+     PERCENT_GLR_PARSER = 280,
+     PERCENT_INITIAL_ACTION = 281,
+     PERCENT_LEX_PARAM = 282,
+     PERCENT_LOCATIONS = 283,
+     PERCENT_NAME_PREFIX = 284,
+     PERCENT_NO_DEFAULT_PREC = 285,
+     PERCENT_NO_LINES = 286,
+     PERCENT_NONDETERMINISTIC_PARSER = 287,
+     PERCENT_OUTPUT = 288,
+     PERCENT_PARSE_PARAM = 289,
+     PERCENT_PURE_PARSER = 290,
+     PERCENT_REQUIRE = 291,
+     PERCENT_SKELETON = 292,
+     PERCENT_START = 293,
+     PERCENT_TOKEN_TABLE = 294,
+     PERCENT_VERBOSE = 295,
+     PERCENT_YACC = 296,
+     TYPE = 297,
+     EQUAL = 298,
+     SEMICOLON = 299,
+     PIPE = 300,
+     ID = 301,
+     ID_COLON = 302,
+     PERCENT_PERCENT = 303,
+     PROLOGUE = 304,
+     EPILOGUE = 305,
+     BRACED_CODE = 306

    };
 #endif
    };
 #endif

+/* Tokens.  */

 #define GRAM_EOF 0
 #define STRING 258
 #define INT 259
 #define GRAM_EOF 0
 #define STRING 258
 #define INT 259


@@ -125,94 +133,105 @@
 #define PERCENT_DPREC 270
 #define PERCENT_MERGE 271
 #define PERCENT_DEBUG 272
 #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_OUTPUT 283
-#define PERCENT_PARSE_PARAM 284
-#define PERCENT_PURE_PARSER 285
-#define PERCENT_SKELETON 286
-#define PERCENT_START 287
-#define PERCENT_TOKEN_TABLE 288
-#define PERCENT_VERBOSE 289
-#define PERCENT_YACC 290
-#define TYPE 291
-#define EQUAL 292
-#define SEMICOLON 293
-#define COLON 294
-#define COMMA 295
-#define PIPE 296
-#define ID 297
-#define PERCENT_PERCENT 298
-#define PROLOGUE 299
-#define EPILOGUE 300
-#define BRACED_CODE 301
+#define PERCENT_DEFAULT_PREC 273
+#define PERCENT_DEFINE 274
+#define PERCENT_DEFINES 275
+#define PERCENT_ERROR_VERBOSE 276
+#define PERCENT_EXPECT 277
+#define PERCENT_EXPECT_RR 278
+#define PERCENT_FILE_PREFIX 279
+#define PERCENT_GLR_PARSER 280
+#define PERCENT_INITIAL_ACTION 281
+#define PERCENT_LEX_PARAM 282
+#define PERCENT_LOCATIONS 283
+#define PERCENT_NAME_PREFIX 284
+#define PERCENT_NO_DEFAULT_PREC 285
+#define PERCENT_NO_LINES 286
+#define PERCENT_NONDETERMINISTIC_PARSER 287
+#define PERCENT_OUTPUT 288
+#define PERCENT_PARSE_PARAM 289
+#define PERCENT_PURE_PARSER 290
+#define PERCENT_REQUIRE 291
+#define PERCENT_SKELETON 292
+#define PERCENT_START 293
+#define PERCENT_TOKEN_TABLE 294
+#define PERCENT_VERBOSE 295
+#define PERCENT_YACC 296
+#define TYPE 297
+#define EQUAL 298
+#define SEMICOLON 299
+#define PIPE 300
+#define ID 301
+#define ID_COLON 302
+#define PERCENT_PERCENT 303
+#define PROLOGUE 304
+#define EPILOGUE 305
+#define BRACED_CODE 306

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

-#line 31 "parse-gram.y"
+#line 1 "parse-gram.y"
+/* Bison Grammar Parser                             -*- C -*-
+
+   Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+
+   This file is part of Bison, the GNU Compiler Compiler.
+
+   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
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301  USA
+*/

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

+

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

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

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

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

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

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

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

-#include "conflicts.h"
+#include "symlist.h"
+#include "strverscmp.h"
+
+#define YYLLOC_DEFAULT(Current, Rhs, N)  (Current) = lloc_default (Rhs, N)
+static YYLTYPE lloc_default (YYLTYPE const *, int);

 
 

-/* Produce verbose syntax errors.  */
-#define YYERROR_VERBOSE 1
-#define YYLLOC_DEFAULT(Current, Rhs, N)                        \
-do {                                                   \
-  if (N)                                               \
-  {                                                    \
-    Current.first_column  = Rhs[1].first_column;       \
-    Current.first_line    = Rhs[1].first_line;         \
-    Current.last_column   = Rhs[N].last_column;                \
-    Current.last_line     = Rhs[N].last_line;          \
-  }                                                    \
-  else                                                 \
-  {                                                    \
-    Current = Rhs[0];                                  \
-  }                                                    \
-} while (0)
-
-/* 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 YY_LOCATION_PRINT(File, Loc) \
+          location_print (File, Loc)
+
+static void version_check (location const *loc, char const *version);

 
 /* Request detailed syntax 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.t */
+   FIXME: depends on the undocumented availability of YYLLOC.  */

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

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

 
 

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

 
 

-symbol_class current_class = unknown_sym;
-struniq_t current_type = 0;
-symbol_t *current_lhs;
-location_t current_lhs_location;
-assoc_t current_assoc;
-int current_prec = 0;
-braced_code_t current_braced_code = action_braced_code;
+static symbol_class current_class = unknown_sym;
+static uniqstr current_type = 0;
+symbol *current_lhs;
+location current_lhs_location;
+assoc current_assoc;
+static int current_prec = 0;

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


@@ -225,56 +244,104 @@ braced_code_t current_braced_code = action_braced_code;
 # undef YYERROR_VERBOSE
 # define YYERROR_VERBOSE 1
 #else
 # undef YYERROR_VERBOSE
 # define YYERROR_VERBOSE 1
 #else

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

 #endif
 
 #endif
 

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

   int integer;
   int integer;

-  char *string;
-  assoc_t assoc;
-  struniq_t struniq;
-} yystype;
-/* Line 195 of /usr/local/share/bison/yacc.c.  */
-#line 242 "parse-gram.c"
-# define YYSTYPE yystype
+  char *chars;
+  assoc assoc;
+  uniqstr uniqstr;
+} YYSTYPE;
+/* Line 196 of yacc.c.  */
+#line 267 "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 __line__ of __file__.  */
-#line 263 "parse-gram.c"
+/* Line 219 of yacc.c.  */
+#line 291 "parse-gram.c"
+
+#ifndef YYSIZE_T
+# if defined (__SIZE_TYPE__)
+#  define YYSIZE_T __SIZE_TYPE__
+# elif defined (size_t)
+#  define YYSIZE_T size_t
+# elif ! defined (YYSIZE_T) && (defined (__STDC__) || defined (__cplusplus))
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# else
+#  define YYSIZE_T unsigned int
+# endif
+#endif
+
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+
+#ifndef YY_
+# if YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(msgid) msgid
+# endif
+#endif
+
+/* Suppress unused-variable warnings by "using" E.  */
+#define YYUSE(e) do {;} while (/*CONSTCOND*/ 0 && (e))

 
 #if ! defined (yyoverflow) || YYERROR_VERBOSE
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
 
 #if ! defined (yyoverflow) || YYERROR_VERBOSE
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 

-# if YYSTACK_USE_ALLOCA
-#  define YYSTACK_ALLOC alloca
-# else
-#  ifndef YYSTACK_USE_ALLOCA
-#   if defined (alloca) || defined (_ALLOCA_H)
-#    define YYSTACK_ALLOC alloca
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
+#   elif defined (__BUILTIN_VA_ARG_INCR)
+#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
+#   elif defined (_AIX)
+#    define YYSTACK_ALLOC __alloca
+#   elif defined (_MSC_VER)
+#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
+#    define alloca _alloca

 #   else
 #   else

-#    ifdef __GNUC__
-#     define YYSTACK_ALLOC __builtin_alloca
+#    define YYSTACK_ALLOC alloca
+#    if (! defined (_ALLOCA_H) && ! defined (_STDLIB_H) \
+        && (defined (__STDC__) || defined (__cplusplus)))
+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#     ifndef _STDLIB_H
+#      define _STDLIB_H 1
+#     endif

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


@@ -283,53 +350,80 @@ typedef struct yyltype
 # ifdef YYSTACK_ALLOC
    /* Pacify GCC's `empty if-body' warning. */
 #  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
 # ifdef YYSTACK_ALLOC
    /* Pacify GCC's `empty if-body' warning. */
 #  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)

+#  ifndef YYSTACK_ALLOC_MAXIMUM
+    /* The OS might guarantee only one guard page at the bottom of the stack,
+       and a page size can be as small as 4096 bytes.  So we cannot safely
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2005 */
+#  endif

 # else
 # else

-#  if defined (__STDC__) || defined (__cplusplus)
-#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   define YYSIZE_T size_t
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+#  endif
+#  ifdef __cplusplus
+extern "C" {
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if (! defined (malloc) && ! defined (_STDLIB_H) \
+       && (defined (__STDC__) || defined (__cplusplus)))
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if (! defined (free) && ! defined (_STDLIB_H) \
+       && (defined (__STDC__) || defined (__cplusplus)))
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifdef __cplusplus
+}

 #  endif
 #  endif

-#  define YYSTACK_ALLOC malloc
-#  define YYSTACK_FREE free

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

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

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

-  short yyss;
+  short int yyss;

   YYSTYPE yyvs;
     YYLTYPE yyls;
 };
 
 /* The size of the maximum gap between one aligned stack and the next.  */
   YYSTYPE yyvs;
     YYLTYPE yyls;
 };
 
 /* The size of the maximum gap between one aligned stack and the next.  */

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

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

-     ((N) * (sizeof (short) + sizeof (YYSTYPE) + sizeof (YYLTYPE))     \
-      + 2 * YYSTACK_GAP_MAX)
+     ((N) * (sizeof (short int) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \
+      + 2 * YYSTACK_GAP_MAXIMUM)

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

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

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

-         register YYSIZE_T yyi;                \
+         YYSIZE_T yyi;                         \

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

-      while (0)
+      while (/*CONSTCOND*/ 0)

 #  endif
 # endif
 
 #  endif
 # endif
 


@@ -344,40 +438,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);                          \
       }                                                                        \
        yyptr += yynewbytes / sizeof (*yyptr);                          \
       }                                                                        \

-    while (0)
+    while (/*CONSTCOND*/ 0)

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

-   typedef short yysigned_char;
+   typedef short int yysigned_char;

 #endif
 
 /* YYFINAL -- State number of the termination state. */
 #define YYFINAL  3
 /* YYLAST -- Last index in YYTABLE.  */
 #endif
 
 /* YYFINAL -- State number of the termination state. */
 #define YYFINAL  3
 /* YYLAST -- Last index in YYTABLE.  */

-#define YYLAST   152
+#define YYLAST   161

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

-#define YYNTOKENS  47
+#define YYNTOKENS  52

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

-#define YYNNTS  29
+#define YYNNTS  25

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

-#define YYNRULES  77
+#define YYNRULES  81

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

-#define YYNSTATES  116
+#define YYNSTATES  110

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

-#define YYMAXUTOK   301
+#define YYMAXUTOK   306

 
 

-#define YYTRANSLATE(YYX)                                               \
-  ((YYX <= 0) ? YYEOF :                                                        \
-   (unsigned)(YYX) <= YYMAXUTOK ? yytranslate[YYX] : 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[] =


@@ -412,7 +505,7 @@ static const unsigned char yytranslate[] =
       15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
       25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
       35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
       15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
       25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
       35,    36,    37,    38,    39,    40,    41,    42,    43,    44,

-      45,    46
+      45,    46,    47,    48,    49,    50,    51

 };
 
 #if YYDEBUG
 };
 
 #if YYDEBUG


@@ -420,118 +513,125 @@ 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,    41,    43,    47,    49,    53,
-      58,    60,    63,    65,    67,    69,    71,    73,    76,    79,
-      80,    85,    86,    91,    92,    96,    97,   101,   105,   109,
-     111,   113,   115,   116,   118,   120,   123,   125,   127,   130,
-     133,   137,   139,   142,   144,   147,   149,   152,   155,   156,
-     162,   164,   168,   169,   172,   175,   179,   183,   187,   189,
-     191,   193,   195,   197,   199,   200,   203,   204
+       0,     0,     3,     8,     9,    12,    14,    16,    18,    21,
+      25,    27,    29,    32,    35,    39,    41,    43,    45,    47,
+      51,    53,    55,    59,    61,    63,    66,    69,    71,    73,
+      75,    77,    79,    81,    84,    86,    89,    92,    94,    96,
+      97,   101,   102,   106,   110,   114,   116,   118,   120,   121,
+     123,   125,   128,   130,   132,   135,   138,   142,   144,   147,
+     149,   152,   154,   157,   160,   161,   165,   167,   171,   174,
+     175,   178,   181,   185,   189,   193,   195,   197,   199,   201,
+     203,   204

 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS. */
 static const yysigned_char yyrhs[] =
 {
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS. */
 static const yysigned_char yyrhs[] =
 {

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

 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */

-static const unsigned short yyrline[] =
+static const unsigned short int yyrline[] =

 {
 {

-       0,   170,   170,   182,   184,   187,   189,   190,   191,   192,
-     193,   194,   195,   196,   197,   202,   203,   204,   205,   206,
-     211,   212,   213,   214,   215,   218,   220,   221,   225,   232,
-     231,   242,   241,   254,   253,   259,   259,   264,   273,   288,
-     290,   291,   294,   296,   301,   303,   307,   312,   317,   323,
-     329,   339,   342,   351,   353,   359,   361,   366,   373,   372,
-     377,   379,   382,   385,   387,   389,   391,   393,   397,   399,
-     402,   408,   417,   426,   434,   436,   443,   445
+       0,   192,   192,   200,   202,   206,   207,   208,   209,   210,
+     211,   212,   213,   214,   215,   216,   221,   225,   226,   227,
+     228,   229,   230,   231,   232,   233,   234,   235,   236,   237,
+     238,   242,   243,   244,   248,   254,   261,   268,   272,   279,
+     279,   284,   284,   289,   299,   314,   315,   316,   320,   321,
+     327,   328,   333,   337,   342,   348,   354,   365,   366,   375,
+     376,   382,   383,   388,   395,   395,   399,   400,   401,   406,
+     407,   409,   411,   413,   415,   420,   421,   425,   431,   440,
+     445,   447

 };
 #endif
 
 };
 #endif
 

-#if YYDEBUG || YYERROR_VERBOSE
-/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.

    First, the terminals, then, starting at YYNTOKENS, nonterminals. */
 static const char *const yytname[] =
 {
    First, the terminals, then, starting at YYNTOKENS, nonterminals. */
 static const char *const yytname[] =
 {

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

 };
 #endif
 
 # ifdef YYPRINT
 /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
    token YYLEX-NUM.  */
 };
 #endif
 
 # ifdef YYPRINT
 /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
    token YYLEX-NUM.  */

-static const unsigned short yytoknum[] =
+static const unsigned short int 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,

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

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

-       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,    51,    51,    51,    51,    52,
-      51,    53,    51,    55,    54,    56,    54,    54,    57,    58,
-      58,    58,    59,    59,    60,    60,    61,    61,    61,    61,
-      61,    62,    62,    63,    63,    64,    64,    64,    66,    65,
-      67,    67,    68,    68,    68,    68,    68,    68,    69,    69,
-      70,    71,    72,    73,    74,    74,    75,    75
+       0,    52,    53,    54,    54,    55,    55,    55,    55,    55,
+      55,    55,    55,    55,    55,    55,    55,    55,    55,    55,
+      55,    55,    55,    55,    55,    55,    55,    55,    55,    55,
+      55,    56,    56,    56,    56,    56,    56,    56,    56,    58,
+      57,    59,    57,    57,    60,    61,    61,    61,    62,    62,
+      63,    63,    64,    64,    64,    64,    64,    65,    65,    66,
+      66,    67,    67,    67,    69,    68,    70,    70,    70,    71,
+      71,    71,    71,    71,    71,    72,    72,    73,    74,    75,
+      76,    76

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

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


@@ -539,142 +639,126 @@ static const unsigned char yyr2[] =
    means the default is an error.  */
 static const unsigned char yydefact[] =
 {
    means the default is an error.  */
 static const unsigned char yydefact[] =
 {

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

 };
 
 /* YYDEFGOTO[NTERM-NUM]. */
 static const yysigned_char yydefgoto[] =
 {
 };
 
 /* YYDEFGOTO[NTERM-NUM]. */
 static const yysigned_char yydefgoto[] =
 {

-      -1,     1,     2,    34,    61,    42,    43,    36,    40,    39,
-      37,    38,    68,    74,    71,    72,    62,    63,    64,    99,
-     102,   103,    75,   111,    58,    46,    50,    89,    66
+      -1,     1,     2,    41,    67,    43,    47,    46,    44,    45,
+      72,    51,    75,    76,    68,    69,    70,    85,    94,    95,
+      52,   105,    53,    56,    89

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

-#define YYPACT_NINF -66
+#define YYPACT_NINF -69

 static const yysigned_char yypact[] =
 {
 static const yysigned_char yypact[] =
 {

-     -66,     6,   108,   -66,   -66,   -66,   -16,   -66,   -66,   -21,
-     -66,   -66,   -66,   -66,    19,   -66,   -66,    32,     5,   -66,
-       3,   -66,    10,   -66,    11,     3,   -66,    19,     1,   -66,
-     -66,   -66,    80,   -66,    12,   -66,   -66,   -66,    16,   -19,
-     -19,     1,     7,     8,   -66,   -66,    19,   -66,    19,   -66,
-      18,    19,    19,    20,   -66,   -66,   -66,   -66,   -66,    13,
-      24,    17,     2,   -66,   -66,   -66,   -66,   -66,     1,   -66,
-      29,   -66,   -19,   -19,     1,   -66,     1,     1,   -66,   -66,
-       3,   -66,   -66,     3,   -66,   -66,   -66,    21,   -66,   -66,
-       1,    61,   -66,   -66,   -66,     1,     1,   -66,   -66,   -66,
-     -66,   -66,   -17,    15,   -66,   -66,     1,    65,    34,   -66,
-     -66,   -66,    15,   -66,   -66,   -66
+     -69,     5,   112,   -69,   -69,   -69,   -35,     0,     0,   -69,
+     -69,   -69,   -69,   -69,   -69,    13,   -69,   -69,    20,    31,
+     -18,   -69,   -69,   -69,   -69,    -6,   -69,   -69,   -69,    -5,
+     -69,   -69,    13,    13,     0,   -69,   -69,   -69,   -69,    69,
+     -69,   -69,   -69,   -69,   -69,    -2,   -38,   -38,     0,   -69,
+     -69,     0,   -69,   -69,     0,   -69,    13,   -69,   -69,    13,
+      13,    13,   -69,   -69,   -69,    -8,   -69,     3,    21,   -69,
+     -69,   -69,     0,   -69,     6,   -69,   -38,   -38,     0,   -69,
+     -69,   -69,   -69,   -69,   -69,   -69,   -69,     2,   -69,   -69,
+       0,    39,   -69,   -69,   -33,    -1,   -69,   -69,   -69,   -69,
+       0,    44,     1,   -69,   -69,   -69,    -1,   -69,   -69,   -69

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

-     -66,   -66,   -66,   -66,    63,   -66,   -66,   -66,   -66,   -66,
-     -66,   -66,   -66,   -49,   -34,    31,   -66,    14,   -66,   -66,
-     -66,   -33,   -28,   -66,   -65,   -11,   -24,   -66,   -66
+     -69,   -69,   -69,   -69,    47,   -69,   -69,   -69,   -69,   -69,
+     -69,    -7,   -58,     7,   -69,   -15,   -69,   -69,   -69,   -44,
+     -34,   -69,   -68,    30,   -69

 };
 
 /* 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.
    If YYTABLE_NINF, syntax error.  */
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
    number is the opposite.  If zero, do what YYDEFACT says.
    If YYTABLE_NINF, syntax error.  */

-#define YYTABLE_NINF -75
+#define YYTABLE_NINF -81

 static const yysigned_char yytable[] =
 {
 static const yysigned_char yytable[] =
 {

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

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

-      28,    25,     0,     1,     3,    70,     0,     5,     6,     7,
-       8,     9,    10,    11,    12,    13,    27,    36,     3,    68,
-      36,    38,     3,    42,    41,    46,    91,    76,    77,    14,
-      15,    16,     3,     4,    32,    46,     4,    48,    72,    73,
-      51,    52,    37,    42,    42,    43,    74,    37,    37,    46,
-      38,    38,    36,    46,    46,    38,    80,    42,    40,    83,
-      40,    46,    90,    39,     3,     2,    45,    95,    96,     4,
-      36,    40,   105,    -1,    -1,   103,    62,    -1,   106,    -1,
-      -1,     1,    -1,    -1,   112,     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,    32,     5,     6,     7,     8,     9,    10,    11,
-      12,    13,    42,    -1,    -1,    17,    18,    19,    20,    21,
-      22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
-      32,    33,    34,    35,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    43,    44
+      34,     8,     3,     3,    42,     0,    74,    42,    46,     3,
+       4,    44,    45,    14,    15,    16,     3,    51,    76,    77,
+      54,     0,     1,    91,     4,    43,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,     4,    44,    43,    43,    18,
+      42,    48,     3,    42,    78,    46,    46,    44,     4,     2,
+      51,    30,    50,    68,    47,    99,    90,    -1,    -1,    38,
+      -1,    95,    32,    33,    -1,    72,   100,    -1,    47,    48,
+       1,    -1,   106,    -1,     5,     6,     7,     8,     9,    10,
+      11,    12,    13,    -1,    -1,    -1,    56,    18,    -1,    59,
+      60,    61,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    30,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    38,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    47,     5,     6,     7,
+       8,     9,    10,    11,    12,    13,    -1,    -1,    -1,    17,
+      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
+      28,    29,    30,    31,    32,    33,    34,    35,    36,    37,
+      38,    39,    40,    41,    -1,    -1,    44,    -1,    -1,    -1,
+      48,    49

 };
 
 /* 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,    48,    49,     0,     5,     6,     7,     8,     9,    10,
+       0,    53,    54,     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,
       11,    12,    13,    17,    18,    19,    20,    21,    22,    23,
       24,    25,    26,    27,    28,    29,    30,    31,    32,    33,

-      34,    35,    43,    44,    50,    51,    54,    57,    58,    56,
-      55,    36,    52,    53,    46,     3,    72,     4,    37,    46,
-      73,    37,    37,    73,    72,     3,    42,    69,    71,     1,
-      42,    51,    63,    64,    65,    38,    75,    36,    59,    36,
-      42,    61,    62,    62,    60,    69,    46,    46,    72,    72,
-      40,    72,    72,    40,    38,    39,    38,    43,    64,    74,
-      60,     4,    71,    61,    69,    60,    60,    73,    73,    66,
-      45,    71,    67,    68,    38,    41,    14,    15,    16,    46,
-      69,    70,    68,    69,     4,    36
+      34,    35,    36,    37,    38,    39,    40,    41,    44,    48,
+      49,    55,    56,    57,    60,    61,    59,    58,    42,     3,
+      46,    63,    72,    74,    63,     3,    75,     4,     4,    43,
+      43,    43,    75,    75,    72,     1,    47,    56,    66,    67,
+      68,    42,    62,    42,    46,    64,    65,    65,    63,    72,
+      75,    75,    75,    75,    44,    69,    44,    48,    67,    76,
+      63,     4,    74,    64,    70,    71,    50,    74,    44,    45,
+      14,    15,    16,    51,    72,    73,    71,    72,     4,    42

 };
 
 };
 

-#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
-# define YYSIZE_T __SIZE_TYPE__
-#endif
-#if ! defined (YYSIZE_T) && defined (size_t)
-# define YYSIZE_T size_t
-#endif
-#if ! defined (YYSIZE_T)
-# if defined (__STDC__) || defined (__cplusplus)
-#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYSIZE_T size_t
-# endif
-#endif
-#if ! defined (YYSIZE_T)
-# define YYSIZE_T unsigned int
-#endif
-

 #define yyerrok                (yyerrstatus = 0)
 #define yyerrok                (yyerrstatus = 0)

-#define yyclearin      (yytoken = YYEMPTY)
-#define YYEMPTY                -2
+#define yyclearin      (yychar = YYEMPTY)
+#define YYEMPTY                (-2)

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

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

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


@@ -686,7 +770,7 @@ static const unsigned char yystos[] =
 
 #define YYBACKUP(Token, Value)                                 \
 do                                                             \
 
 #define YYBACKUP(Token, Value)                                 \
 do                                                             \

-  if (yytoken == YYEMPTY && yylen == 1)                                \
+  if (yychar == YYEMPTY && yylen == 1)                         \

     {                                                          \
       yychar = (Token);                                                \
       yylval = (Value);                                                \
     {                                                          \
       yychar = (Token);                                                \
       yylval = (Value);                                                \


@@ -695,26 +779,59 @@ do                                                                \
       goto yybackup;                                           \
     }                                                          \
   else                                                         \
       goto yybackup;                                           \
     }                                                          \
   else                                                         \

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

       YYERROR;                                                 \
     }                                                          \
       YYERROR;                                                 \
     }                                                          \

-while (0)
+while (/*CONSTCOND*/ 0)
+

 
 #define YYTERROR       1
 #define YYERRCODE      256
 
 
 #define YYTERROR       1
 #define YYERRCODE      256
 

-/* YYLLOC_DEFAULT -- Compute the default location (before the actions
-   are run).  */

 
 

+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */
+
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])

 #ifndef YYLLOC_DEFAULT
 #ifndef YYLLOC_DEFAULT

-# define YYLLOC_DEFAULT(Current, Rhs, N)         \
-  Current.first_line   = Rhs[1].first_line;      \
-  Current.first_column = Rhs[1].first_column;    \
-  Current.last_line    = Rhs[N].last_line;       \
-  Current.last_column  = Rhs[N].last_column;
+# define YYLLOC_DEFAULT(Current, Rhs, N)                               \
+    do                                                                 \
+      if (N)                                                           \
+       {                                                               \
+         (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;        \
+         (Current).first_column = YYRHSLOC (Rhs, 1).first_column;      \
+         (Current).last_line    = YYRHSLOC (Rhs, N).last_line;         \
+         (Current).last_column  = YYRHSLOC (Rhs, N).last_column;       \
+       }                                                               \
+      else                                                             \
+       {                                                               \
+         (Current).first_line   = (Current).last_line   =              \
+           YYRHSLOC (Rhs, 0).last_line;                                \
+         (Current).first_column = (Current).last_column =              \
+           YYRHSLOC (Rhs, 0).last_column;                              \
+       }                                                               \
+    while (/*CONSTCOND*/ 0)
+#endif
+
+
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+   This macro was not mandated originally: define only if we know
+   we won't break user code: when these are the locations we know.  */
+
+#ifndef YY_LOCATION_PRINT
+# if YYLTYPE_IS_TRIVIAL
+#  define YY_LOCATION_PRINT(File, Loc)                 \
+     fprintf (File, "%d.%d-%d.%d",                     \
+              (Loc).first_line, (Loc).first_column,    \
+              (Loc).last_line,  (Loc).last_column)
+# else
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif

 #endif
 
 #endif
 

+

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


@@ -735,32 +852,87 @@ while (0)
 do {                                           \
   if (yydebug)                                 \
     YYFPRINTF Args;                            \
 do {                                           \
   if (yydebug)                                 \
     YYFPRINTF Args;                            \

-} while (0)
-# define YYDSYMPRINT(Args)                     \
-do {                                           \
-  if (yydebug)                                 \
-    yysymprint Args;                           \
-} while (0)
-# define YYDSYMPRINTF(Title, Token, Value, Location)           \
+} while (/*CONSTCOND*/ 0)
+
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)         \

 do {                                                           \
   if (yydebug)                                                 \
     {                                                          \
       YYFPRINTF (stderr, "%s ", Title);                                \
 do {                                                           \
   if (yydebug)                                                 \
     {                                                          \
       YYFPRINTF (stderr, "%s ", Title);                                \

-      yysymprint (stderr,                                      \
-                  Token, Value, Location);     \
+      yysymprint (stderr,                                      \
+                  Type, Value, Location);      \

       YYFPRINTF (stderr, "\n");                                        \
     }                                                          \
       YYFPRINTF (stderr, "\n");                                        \
     }                                                          \

-} while (0)
+} while (/*CONSTCOND*/ 0)
+
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (included).                                                   |
+`------------------------------------------------------------------*/
+
+#if defined (__STDC__) || defined (__cplusplus)
+static void
+yy_stack_print (short int *bottom, short int *top)
+#else
+static void
+yy_stack_print (bottom, top)
+    short int *bottom;
+    short int *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 (/*CONSTCOND*/ 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 long int yylno = yyrline[yyrule];
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu), ",
+             yyrule - 1, yylno);
+  /* Print the symbols being reduced, and their result.  */
+  for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
+    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 (/*CONSTCOND*/ 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_SYMBOL_PRINT(Title, Type, 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


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

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

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

-#if YYMAXDEPTH == 0
-# undef YYMAXDEPTH
-#endif
-

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


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

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

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


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

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

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


@@ -834,68 +1002,317 @@ yystpcpy (yydest, yysrc)
 #  endif
 # endif
 
 #  endif
 # endif
 

-#endif /* !YYERROR_VERBOSE */
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
+   null, do not copy; instead, return the length of what the result
+   would have been.  */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
+    {
+      size_t yyn = 0;
+      char const *yyp = yystr;
+
+      for (;;)
+       switch (*++yyp)
+         {
+         case '\'':
+         case ',':
+           goto do_not_strip_quotes;
+
+         case '\\':
+           if (*++yyp != '\\')
+             goto do_not_strip_quotes;
+           /* Fall through.  */
+         default:
+           if (yyres)
+             yyres[yyn] = *yyp;
+           yyn++;
+           break;
+
+         case '"':
+           if (yyres)
+             yyres[yyn] = '\0';
+           return yyn;
+         }
+    do_not_strip_quotes: ;
+    }
+
+  if (! yyres)
+    return yystrlen (yystr);
+
+  return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
+
+/* Copy into YYRESULT an error message about the unexpected token
+   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
+   including the terminating null byte.  If YYRESULT is null, do not
+   copy anything; just return the number of bytes that would be
+   copied.  As a special case, return 0 if an ordinary "syntax error"
+   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
+   size calculation.  */
+static YYSIZE_T
+yysyntax_error (char *yyresult, int yystate, int yychar)
+{
+  int yyn = yypact[yystate];

 
 

+  if (! (YYPACT_NINF < yyn && yyn < YYLAST))
+    return 0;
+  else
+    {
+      int yytype = YYTRANSLATE (yychar);
+      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+      YYSIZE_T yysize = yysize0;
+      YYSIZE_T yysize1;
+      int yysize_overflow = 0;
+      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+      int yyx;
+
+# if 0
+      /* This is so xgettext sees the translatable formats that are
+         constructed on the fly.  */
+      YY_("syntax error, unexpected %s");
+      YY_("syntax error, unexpected %s, expecting %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+# endif
+      char *yyfmt;
+      char const *yyf;
+      static char const yyunexpected[] = "syntax error, unexpected %s";
+      static char const yyexpecting[] = ", expecting %s";
+      static char const yyor[] = " or %s";
+      char yyformat[sizeof yyunexpected
+                    + sizeof yyexpecting - 1
+                    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+                       * (sizeof yyor - 1))];
+      char const *yyprefix = yyexpecting;
+
+      /* Start YYX at -YYN if negative to avoid negative indexes in
+         YYCHECK.  */
+      int yyxbegin = yyn < 0 ? -yyn : 0;
+
+      /* Stay within bounds of both yycheck and yytname.  */
+      int yychecklim = YYLAST - yyn;
+      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+      int yycount = 1;
+
+      yyarg[0] = yytname[yytype];
+      yyfmt = yystpcpy (yyformat, yyunexpected);
+
+      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+        if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+          {
+            if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+              {
+                yycount = 1;
+                yysize = yysize0;
+                yyformat[sizeof yyunexpected - 1] = '\0';
+                break;
+              }
+            yyarg[yycount++] = yytname[yyx];
+            yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+            yysize_overflow |= yysize1 < yysize;
+            yysize = yysize1;
+            yyfmt = yystpcpy (yyfmt, yyprefix);
+            yyprefix = yyor;
+          }
+
+      yyf = YY_(yyformat);
+      yysize1 = yysize + yystrlen (yyf);
+      yysize_overflow |= yysize1 < yysize;
+      yysize = yysize1;
+
+      if (yysize_overflow)
+       return YYSIZE_MAXIMUM;
+
+      if (yyresult)
+       {
+          /* Avoid sprintf, as that infringes on the user's name space.
+             Don't have undefined behavior even if the translation
+             produced a string with the wrong number of "%s"s.  */
+          char *yyp = yyresult;
+          int yyi = 0;
+          while ((*yyp = *yyf))
+            {
+              if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+                {
+                  yyp += yytnamerr (yyp, yyarg[yyi++]);
+                  yyf += 2;
+                }
+              else
+                {
+                  yyp++;
+                  yyf++;
+                }
+            }
+        }
+      return yysize;
+    }
+}
+#endif /* YYERROR_VERBOSE */

 \f
 
 #if YYDEBUG
 \f
 
 #if YYDEBUG

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

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

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

 #else
 static void
 #else
 static void

-yysymprint (yyout, yytype, yyvaluep, yylocationp)
-    FILE *yyout;
+yysymprint (yyoutput, yytype, yyvaluep, yylocationp)
+    FILE *yyoutput;

     int yytype;
     YYSTYPE *yyvaluep;
     YYLTYPE *yylocationp;
 #endif
 {
     int yytype;
     YYSTYPE *yyvaluep;
     YYLTYPE *yylocationp;
 #endif
 {

-  /* Pacify ``unused variable'' warnings.  */
-  (void) yyvaluep;
-  (void) yylocationp;
+  YYUSE (yyvaluep);
+  YYUSE (yylocationp);

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

-    {
-      YYFPRINTF (yyout, "token %s (", yytname[yytype]);
-# ifdef YYPRINT
-      YYPRINT (yyout, yytoknum[yytype], *yyvaluep);
-# endif
-    }
+    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);

   else
   else

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

 
 

+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# endif

   switch (yytype)
     {
   switch (yytype)
     {

+      case 3: /* "\"string\"" */
+#line 169 "parse-gram.y"
+        { fprintf (stderr, "\"%s\"", (yyvaluep->chars)); };
+#line 1201 "parse-gram.c"
+        break;
+      case 4: /* "\"integer\"" */
+#line 182 "parse-gram.y"
+        { fprintf (stderr, "%d", (yyvaluep->integer)); };
+#line 1206 "parse-gram.c"
+        break;
+      case 8: /* "\"%destructor {...}\"" */
+#line 171 "parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+#line 1211 "parse-gram.c"
+        break;
+      case 9: /* "\"%printer {...}\"" */
+#line 175 "parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+#line 1216 "parse-gram.c"
+        break;
+      case 10: /* "\"%union {...}\"" */
+#line 176 "parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+#line 1221 "parse-gram.c"
+        break;
+      case 26: /* "\"%initial-action {...}\"" */
+#line 172 "parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+#line 1226 "parse-gram.c"
+        break;
+      case 27: /* "\"%lex-param {...}\"" */
+#line 173 "parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+#line 1231 "parse-gram.c"
+        break;
+      case 34: /* "\"%parse-param {...}\"" */
+#line 174 "parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+#line 1236 "parse-gram.c"
+        break;
+      case 42: /* "\"type\"" */
+#line 180 "parse-gram.y"
+        { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); };
+#line 1241 "parse-gram.c"
+        break;
+      case 46: /* "\"identifier\"" */
+#line 184 "parse-gram.y"
+        { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
+#line 1246 "parse-gram.c"
+        break;
+      case 47: /* "\"identifier:\"" */
+#line 186 "parse-gram.y"
+        { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); };
+#line 1251 "parse-gram.c"
+        break;
+      case 49: /* "\"%{...%}\"" */
+#line 178 "parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+#line 1256 "parse-gram.c"
+        break;
+      case 50: /* "\"epilogue\"" */
+#line 178 "parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+#line 1261 "parse-gram.c"
+        break;
+      case 51: /* "\"{...}\"" */
+#line 177 "parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+#line 1266 "parse-gram.c"
+        break;
+      case 72: /* "symbol" */
+#line 184 "parse-gram.y"
+        { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
+#line 1271 "parse-gram.c"
+        break;
+      case 73: /* "action" */
+#line 177 "parse-gram.y"
+        { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
+#line 1276 "parse-gram.c"
+        break;
+      case 74: /* "string_as_id" */
+#line 184 "parse-gram.y"
+        { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
+#line 1281 "parse-gram.c"
+        break;
+      case 75: /* "string_content" */
+#line 169 "parse-gram.y"
+        { fprintf (stderr, "\"%s\"", (yyvaluep->chars)); };
+#line 1286 "parse-gram.c"
+        break;

       default:
         break;
     }
       default:
         break;
     }

-  YYFPRINTF (yyout, ")");
+  YYFPRINTF (yyoutput, ")");

 }
 
 }
 

-#endif /* YYDEBUG. */
+#endif /* ! YYDEBUG */

 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
 
 #if defined (__STDC__) || defined (__cplusplus)
 static void
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
 
 #if defined (__STDC__) || defined (__cplusplus)
 static void

-yydestruct (int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp)
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp)

 #else
 static void
 #else
 static void

-yydestruct (yytype, yyvaluep, yylocationp)
+yydestruct (yymsg, yytype, yyvaluep, yylocationp)
+    const char *yymsg;

     int yytype;
     YYSTYPE *yyvaluep;
     YYLTYPE *yylocationp;
 #endif
 {
     int yytype;
     YYSTYPE *yyvaluep;
     YYLTYPE *yylocationp;
 #endif
 {

-  /* Pacify ``unused variable'' warnings.  */
-  (void) yyvaluep;
-  (void) yylocationp;
+  YYUSE (yyvaluep);
+  YYUSE (yylocationp);
+
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);

 
   switch (yytype)
     {
 
   switch (yytype)
     {


@@ -920,7 +1337,7 @@ int yyparse (void);
 #else
 int yyparse ();
 #endif
 #else
 int yyparse ();
 #endif

-#endif
+#endif /* ! YYPARSE_PARAM */

 
 
 
 
 
 


@@ -949,24 +1366,30 @@ yyparse ()
 #endif
 #endif
 {
 #endif
 #endif
 {

-  /* The lookahead symbol.  */
+  /* The look-ahead symbol.  */

 int yychar;
 
 int yychar;
 

-/* The semantic value of the lookahead symbol.  */
+/* The semantic value of the look-ahead symbol.  */

 YYSTYPE yylval;
 
 /* Number of syntax errors so far.  */
 int yynerrs;
 YYSTYPE yylval;
 
 /* Number of syntax errors so far.  */
 int yynerrs;

-/* Location data for the lookahead symbol.  */
+/* Location data for the look-ahead symbol.  */

 YYLTYPE yylloc;
 
 YYLTYPE yylloc;
 

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

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

-  /* Lookahead token as an internal (translated) token number.  */
+  /* Look-ahead token as an internal (translated) token number.  */

   int yytoken = 0;
   int yytoken = 0;

+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif

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


@@ -977,19 +1400,21 @@ YYLTYPE yylloc;
      to reallocate them elsewhere.  */
 
   /* The state stack.  */
      to reallocate them elsewhere.  */
 
   /* The state stack.  */

-  short        yyssa[YYINITDEPTH];
-  short *yyss = yyssa;
-  register short *yyssp;
+  short int yyssa[YYINITDEPTH];
+  short int *yyss = yyssa;
+  short int *yyssp;

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

-  register YYSTYPE *yyvsp;
+  YYSTYPE *yyvsp;

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

+  /* The locations where the error started and ended. */
+  YYLTYPE yyerror_range[2];

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


@@ -1009,7 +1434,7 @@ YYLTYPE yylloc;
   yystate = 0;
   yyerrstatus = 0;
   yynerrs = 0;
   yystate = 0;
   yyerrstatus = 0;
   yynerrs = 0;

-  yychar = yytoken = YYEMPTY;          /* Cause a token to be read.  */
+  yychar = YYEMPTY;            /* Cause a token to be read.  */

 
   /* Initialize stack pointers.
      Waste one element of value and location stack
 
   /* Initialize stack pointers.
      Waste one element of value and location stack


@@ -1019,6 +1444,25 @@ YYLTYPE yylloc;
   yyssp = yyss;
   yyvsp = yyvs;
   yylsp = yyls;
   yyssp = yyss;
   yyvsp = yyvs;
   yylsp = yyls;

+#if YYLTYPE_IS_TRIVIAL
+  /* Initialize the default location before parsing starts.  */
+  yylloc.first_line   = yylloc.last_line   = 1;
+  yylloc.first_column = yylloc.last_column = 0;
+#endif
+
+
+  /* User initialization code. */
+#line 72 "parse-gram.y"
+{
+  /* Bison's grammar can initial empty locations, hence a default
+     location is needed. */
+  yylloc.start.file   = yylloc.end.file   = current_file;
+  yylloc.start.line   = yylloc.end.line   = 1;
+  yylloc.start.column = yylloc.end.column = 0;
+}
+/* Line 1056 of yacc.c.  */
+#line 1465 "parse-gram.c"
+  yylsp[0] = yylloc;

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


@@ -1044,14 +1488,14 @@ YYLTYPE yylloc;
           these so that the &'s don't force the real ones into
           memory.  */
        YYSTYPE *yyvs1 = yyvs;
           these so that the &'s don't force the real ones into
           memory.  */
        YYSTYPE *yyvs1 = yyvs;

-       short *yyss1 = yyss;
+       short int *yyss1 = yyss;

        YYLTYPE *yyls1 = yyls;
 
        /* Each stack pointer address is followed by the size of the
           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.  */
        YYLTYPE *yyls1 = yyls;
 
        /* Each stack pointer address is followed by the size of the
           data in use in that stack, in bytes.  This used to be a
           conditional around just the two extra args, but that might
           be undefined if yyoverflow is a macro.  */

-       yyoverflow ("parser stack overflow",
+       yyoverflow (YY_("memory exhausted"),

                    &yyss1, yysize * sizeof (*yyssp),
                    &yyvs1, yysize * sizeof (*yyvsp),
                    &yyls1, yysize * sizeof (*yylsp),
                    &yyss1, yysize * sizeof (*yyssp),
                    &yyvs1, yysize * sizeof (*yyvsp),
                    &yyls1, yysize * sizeof (*yylsp),


@@ -1062,21 +1506,21 @@ YYLTYPE yylloc;
       }
 #else /* no yyoverflow */
 # ifndef YYSTACK_RELOCATE
       }
 #else /* no yyoverflow */
 # ifndef YYSTACK_RELOCATE

-      goto yyoverflowlab;
+      goto yyexhaustedlab;

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

-       goto yyoverflowlab;
+       goto yyexhaustedlab;

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

-       short *yyss1 = yyss;
+       short int *yyss1 = yyss;

        union yyalloc *yyptr =
          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
        if (! yyptr)
        union yyalloc *yyptr =
          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
        if (! yyptr)

-         goto yyoverflowlab;
+         goto yyexhaustedlab;

        YYSTACK_RELOCATE (yyss);
        YYSTACK_RELOCATE (yyvs);
        YYSTACK_RELOCATE (yyls);
        YYSTACK_RELOCATE (yyss);
        YYSTACK_RELOCATE (yyvs);
        YYSTACK_RELOCATE (yyls);


@@ -1108,34 +1552,33 @@ YYLTYPE yylloc;
 yybackup:
 
 /* Do appropriate processing given the current state.  */
 yybackup:
 
 /* Do appropriate processing given the current state.  */

-/* Read a lookahead token if we need one and don't already have one.  */
+/* Read a look-ahead token if we need one and don't already have one.  */

 /* yyresume: */
 
 /* yyresume: */
 

-  /* First try to decide what to do without reference to lookahead token.  */
+  /* First try to decide what to do without reference to look-ahead token.  */

 
   yyn = yypact[yystate];
   if (yyn == YYPACT_NINF)
     goto yydefault;
 
 
   yyn = yypact[yystate];
   if (yyn == YYPACT_NINF)
     goto yydefault;
 

-  /* Not known => get a lookahead token if don't already have one.  */
+  /* Not known => get a look-ahead token if don't already have one.  */

 
 

-  /* YYTOKEN is either YYEMPTY or YYEOF or a valid token.  */
-  if (yytoken == YYEMPTY)
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
+  if (yychar == YYEMPTY)

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

-      yytoken = YYTRANSLATE (yychar);

     }
 
     }
 

-  if (yytoken == YYEOF)
+  if (yychar <= YYEOF)

     {
     {

+      yychar = yytoken = YYEOF;

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

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

     }
 
   /* If the proper action on seeing token YYTOKEN is to reduce or to
     }
 
   /* If the proper action on seeing token YYTOKEN is to reduce or to


@@ -1155,12 +1598,12 @@ yybackup:
   if (yyn == YYFINAL)
     YYACCEPT;
 
   if (yyn == YYFINAL)
     YYACCEPT;
 

-  /* Shift the lookahead token.  */
-  YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken]));
+  /* Shift the look-ahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);

 
   /* Discard the token being shifted unless it is eof.  */
 
   /* Discard the token being shifted unless it is eof.  */

-  if (yytoken != YYEOF)
-    yytoken = YYEMPTY;
+  if (yychar != YYEOF)
+    yychar = YYEMPTY;

 
   *++yyvsp = yylval;
   *++yylsp = yylloc;
 
   *++yyvsp = yylval;
   *++yylsp = yylloc;


@@ -1202,453 +1645,422 @@ yyreduce:
   yyval = yyvsp[1-yylen];
 
   /* Default location. */
   yyval = yyvsp[1-yylen];
 
   /* Default location. */

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

   switch (yyn)
     {
   switch (yyn)
     {

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

     break;
 
   case 7:
     break;
 
   case 7:

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

     break;
 
   case 8:
     break;
 
   case 8:

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

     break;
 
   case 9:
     break;
 
   case 9:

-#line 192 "parse-gram.y"
-    { defines_flag = 1; }
+#line 210 "parse-gram.y"
+    { muscle_insert ((yyvsp[-1].chars), (yyvsp[0].chars)); }

     break;
 
   case 10:
     break;
 
   case 10:

-#line 193 "parse-gram.y"
-    { error_verbose = 1; }
+#line 211 "parse-gram.y"
+    { defines_flag = true; }

     break;
 
   case 11:
     break;
 
   case 11:

-#line 194 "parse-gram.y"
-    { expected_conflicts = yyvsp[0].integer; }
+#line 212 "parse-gram.y"
+    { error_verbose = true; }

     break;
 
   case 12:
     break;
 
   case 12:

-#line 195 "parse-gram.y"
-    { spec_file_prefix = yyvsp[0].string; }
+#line 213 "parse-gram.y"
+    { expected_sr_conflicts = (yyvsp[0].integer); }

     break;
 
   case 13:
     break;
 
   case 13:

-#line 196 "parse-gram.y"
-    { glr_parser = 1; }
+#line 214 "parse-gram.y"
+    { expected_rr_conflicts = (yyvsp[0].integer); }

     break;
 
   case 14:
     break;
 
   case 14:

-#line 198 "parse-gram.y"
-    {
-                            muscle_pair_list_grow ("lex_param", yyvsp[-2].string, yyvsp[0].string);
-                            scanner_last_string_free ();
-                          }
+#line 215 "parse-gram.y"
+    { spec_file_prefix = (yyvsp[0].chars); }

     break;
 
   case 15:
     break;
 
   case 15:

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

     break;
 
   case 16:
     break;
 
   case 16:

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

     break;
 
   case 17:
     break;
 
   case 17:

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

     break;
 
   case 18:
     break;
 
   case 18:

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

     break;
 
   case 19:
     break;
 
   case 19:

-#line 207 "parse-gram.y"
-    {
-                            muscle_pair_list_grow ("parse_param", yyvsp[-2].string, yyvsp[0].string);
-                            scanner_last_string_free ();
-                          }
+#line 227 "parse-gram.y"
+    { spec_name_prefix = (yyvsp[0].chars); }

     break;
 
   case 20:
     break;
 
   case 20:

-#line 211 "parse-gram.y"
-    { pure_parser = 1; }
+#line 228 "parse-gram.y"
+    { no_lines_flag = true; }

     break;
 
   case 21:
     break;
 
   case 21:

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

     break;
 
   case 22:
     break;
 
   case 22:

-#line 213 "parse-gram.y"
-    { token_table_flag = 1; }
+#line 230 "parse-gram.y"
+    { spec_outfile = (yyvsp[0].chars); }

     break;
 
   case 23:
     break;
 
   case 23:

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

     break;
 
   case 24:
     break;
 
   case 24:

-#line 215 "parse-gram.y"
-    { yacc_flag = 1; }
+#line 232 "parse-gram.y"
+    { pure_parser = true; }
+    break;
+
+  case 25:
+#line 233 "parse-gram.y"
+    { version_check (&(yylsp[0]), (yyvsp[0].chars)); }
+    break;
+
+  case 26:
+#line 234 "parse-gram.y"
+    { skeleton = (yyvsp[0].chars); }

     break;
 
   case 27:
     break;
 
   case 27:

-#line 222 "parse-gram.y"
+#line 235 "parse-gram.y"
+    { token_table_flag = true; }
+    break;
+
+  case 28:
+#line 236 "parse-gram.y"
+    { report_flag = report_states; }
+    break;
+
+  case 29:
+#line 237 "parse-gram.y"
+    { yacc_flag = true; }
+    break;
+
+  case 33:
+#line 245 "parse-gram.y"

     {
     {

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

     }
     break;
 
     }
     break;
 

-  case 28:
-#line 226 "parse-gram.y"
+  case 34:
+#line 249 "parse-gram.y"

     {
     {

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

     }
     break;
 
     }
     break;
 

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

     break;
 
     break;
 

-  case 30:
-#line 234 "parse-gram.y"
+  case 36:
+#line 262 "parse-gram.y"

     {
     {

-      symbol_list_t *list;
-      for (list = yyvsp[0].list; list; list = list->next)
-       symbol_destructor_set (list->sym, yyvsp[-1].string, yylsp[-1]);
-      symbol_list_free (yyvsp[0].list);
-      current_braced_code = action_braced_code;
+      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;
 
     }
     break;
 

-  case 31:
-#line 242 "parse-gram.y"
-    { current_braced_code = printer_braced_code; }
+  case 37:
+#line 269 "parse-gram.y"
+    {
+      default_prec = true;
+    }

     break;
 
     break;
 

-  case 32:
-#line 244 "parse-gram.y"
+  case 38:
+#line 273 "parse-gram.y"

     {
     {

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

     }
     break;
 
     }
     break;
 

-  case 33:
-#line 254 "parse-gram.y"
+  case 39:
+#line 279 "parse-gram.y"

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

-  case 34:
-#line 255 "parse-gram.y"
+  case 40:
+#line 280 "parse-gram.y"

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

-  case 35:
-#line 259 "parse-gram.y"
+  case 41:
+#line 284 "parse-gram.y"

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

-  case 36:
-#line 260 "parse-gram.y"
+  case 42:
+#line 285 "parse-gram.y"

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

-  case 37:
-#line 265 "parse-gram.y"
+  case 43:
+#line 290 "parse-gram.y"

     {
     {

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

     }
     break;
 
     }
     break;
 

-  case 38:
-#line 275 "parse-gram.y"
+  case 44:
+#line 300 "parse-gram.y"

     {
     {

-      symbol_list_t *list;
+      symbol_list *list;

       ++current_prec;
       ++current_prec;

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

        {
        {

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

        }
        }

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

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

-  case 39:
-#line 289 "parse-gram.y"
-    { yyval.assoc = left_assoc; }
+  case 45:
+#line 314 "parse-gram.y"
+    { (yyval.assoc) = left_assoc; }

     break;
 
     break;
 

-  case 40:
-#line 290 "parse-gram.y"
-    { yyval.assoc = right_assoc; }
+  case 46:
+#line 315 "parse-gram.y"
+    { (yyval.assoc) = right_assoc; }

     break;
 
     break;
 

-  case 41:
-#line 291 "parse-gram.y"
-    { yyval.assoc = non_assoc; }
+  case 47:
+#line 316 "parse-gram.y"
+    { (yyval.assoc) = non_assoc; }

     break;
 
     break;
 

-  case 42:
-#line 295 "parse-gram.y"
+  case 48:
+#line 320 "parse-gram.y"

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

-  case 43:
-#line 296 "parse-gram.y"
-    { current_type = yyvsp[0].struniq; }
+  case 49:
+#line 321 "parse-gram.y"
+    { current_type = (yyvsp[0].uniqstr); }

     break;
 
     break;
 

-  case 44:
-#line 302 "parse-gram.y"
-    { yyval.list = symbol_list_new (yyvsp[0].symbol, yylsp[0]); }
+  case 50:
+#line 327 "parse-gram.y"
+    { (yyval.list) = symbol_list_new ((yyvsp[0].symbol), (yylsp[0])); }

     break;
 
     break;
 

-  case 45:
-#line 303 "parse-gram.y"
-    { yyval.list = symbol_list_prepend (yyvsp[-1].list, yyvsp[0].symbol, yylsp[0]); }
+  case 51:
+#line 328 "parse-gram.y"
+    { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].symbol), (yylsp[0])); }

     break;
 
     break;
 

-  case 46:
-#line 309 "parse-gram.y"
+  case 52:
+#line 334 "parse-gram.y"

     {
     {

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

      }
     break;
 
      }
     break;
 

-  case 47:
-#line 313 "parse-gram.y"
+  case 53:
+#line 338 "parse-gram.y"

     {
     {

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

      }
     break;
 
      }
     break;
 

-  case 48:
-#line 318 "parse-gram.y"
+  case 54:
+#line 343 "parse-gram.y"

     {
     {

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

     }
     break;
 
     }
     break;
 

-  case 49:
-#line 324 "parse-gram.y"
+  case 55:
+#line 349 "parse-gram.y"

     {
     {

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

     }
     break;
 
     }
     break;
 

-  case 50:
-#line 330 "parse-gram.y"
+  case 56:
+#line 355 "parse-gram.y"

     {
     {

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

     }
     break;
 
     }
     break;
 

-  case 51:
-#line 341 "parse-gram.y"
-    {;}
-    break;
-
-  case 52:
-#line 343 "parse-gram.y"
-    {;}
-    break;
-
-  case 56:
-#line 362 "parse-gram.y"
+  case 62:
+#line 384 "parse-gram.y"

     {
       if (yacc_flag)
     {
       if (yacc_flag)

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

     }
     break;
 
     }
     break;
 

-  case 57:
-#line 367 "parse-gram.y"
+  case 63:
+#line 389 "parse-gram.y"

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

-  case 58:
-#line 373 "parse-gram.y"
-    { current_lhs = yyvsp[-1].symbol; current_lhs_location = yylsp[-1]; }
-    break;
-
-  case 59:
-#line 374 "parse-gram.y"
-    {;}
+  case 64:
+#line 395 "parse-gram.y"
+    { current_lhs = (yyvsp[0].symbol); current_lhs_location = (yylsp[0]); }

     break;
 
     break;
 

-  case 60:
-#line 378 "parse-gram.y"
-    { grammar_rule_end (yylsp[0]); }
+  case 66:
+#line 399 "parse-gram.y"
+    { grammar_rule_end ((yylsp[0])); }

     break;
 
     break;
 

-  case 61:
-#line 379 "parse-gram.y"
-    { grammar_rule_end (yylsp[0]); }
+  case 67:
+#line 400 "parse-gram.y"
+    { grammar_rule_end ((yylsp[0])); }

     break;
 
     break;
 

-  case 62:
-#line 384 "parse-gram.y"
+  case 69:
+#line 406 "parse-gram.y"

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

-  case 63:
-#line 386 "parse-gram.y"
-    { grammar_current_rule_symbol_append (yyvsp[0].symbol, yylsp[0]); }
-    break;
-
-  case 64:
-#line 388 "parse-gram.y"
-    { grammar_current_rule_action_append (yyvsp[0].string, yylsp[0]); }
+  case 70:
+#line 408 "parse-gram.y"
+    { grammar_current_rule_symbol_append ((yyvsp[0].symbol), (yylsp[0])); }

     break;
 
     break;
 

-  case 65:
-#line 390 "parse-gram.y"
-    { grammar_current_rule_prec_set (yyvsp[0].symbol, yylsp[0]); }
+  case 71:
+#line 410 "parse-gram.y"
+    { grammar_current_rule_action_append ((yyvsp[0].chars), (yylsp[0])); }

     break;
 
     break;
 

-  case 66:
-#line 392 "parse-gram.y"
-    { grammar_current_rule_dprec_set (yyvsp[0].integer, yylsp[0]); }
+  case 72:
+#line 412 "parse-gram.y"
+    { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); }

     break;
 
     break;
 

-  case 67:
-#line 394 "parse-gram.y"
-    { grammar_current_rule_merge_set (yyvsp[0].struniq, yylsp[0]); }
+  case 73:
+#line 414 "parse-gram.y"
+    { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); }

     break;
 
     break;
 

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

     break;
 
     break;
 

-  case 69:
-#line 399 "parse-gram.y"
-    { yyval.symbol = yyvsp[0].symbol; }
+  case 75:
+#line 420 "parse-gram.y"
+    { (yyval.symbol) = (yyvsp[0].symbol); }

     break;
 
     break;
 

-  case 70:
-#line 404 "parse-gram.y"
-    { yyval.string = yyvsp[0].string; }
+  case 76:
+#line 421 "parse-gram.y"
+    { (yyval.symbol) = (yyvsp[0].symbol); }

     break;
 
     break;
 

-  case 71:
-#line 410 "parse-gram.y"
-    {
-      yyval.symbol = symbol_get (yyvsp[0].string, yylsp[0]);
-      symbol_class_set (yyval.symbol, token_sym, yylsp[0]);
-    }
+  case 77:
+#line 426 "parse-gram.y"
+    { (yyval.chars) = (yyvsp[0].chars); }

     break;
 
     break;
 

-  case 72:
-#line 419 "parse-gram.y"
+  case 78:
+#line 432 "parse-gram.y"

     {
     {

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

     }
     break;
 
     }
     break;
 

-  case 73:
-#line 428 "parse-gram.y"
-    {
-      yyval.string = yyvsp[0].string + 1;
-      yyval.string[strlen (yyval.string) - 1] = '\0';
-    }
+  case 79:
+#line 441 "parse-gram.y"
+    { (yyval.chars) = (yyvsp[0].chars); }

     break;
 
     break;
 

-  case 75:
-#line 437 "parse-gram.y"
+  case 81:
+#line 448 "parse-gram.y"

     {
     {

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

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

+      default: break;

     }
 
     }
 

-/* Line 959 of /usr/local/share/bison/yacc.c.  */
-#line 1636 "parse-gram.c"
+/* Line 1252 of yacc.c.  */
+#line 2058 "parse-gram.c"

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

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

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


@@ -1676,90 +2088,91 @@ yyerrlab:
   if (!yyerrstatus)
     {
       ++yynerrs;
   if (!yyerrstatus)
     {
       ++yynerrs;

-#if YYERROR_VERBOSE
-      yyn = yypact[yystate];
-
-      if (YYPACT_NINF < yyn && yyn < YYLAST)
-       {
-         YYSIZE_T yysize = 0;
-         int yytype = YYTRANSLATE (yychar);
-         char *yymsg;
-         int yyx, yycount;
-
-         yycount = 0;
-         /* Start YYX at -YYN if negative to avoid negative indexes in
-            YYCHECK.  */
-         for (yyx = yyn < 0 ? -yyn : 0;
-              yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
-           if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-             yysize += yystrlen (yytname[yyx]) + 15, yycount++;
-         yysize += yystrlen ("syntax error, unexpected ") + 1;
-         yysize += yystrlen (yytname[yytype]);
-         yymsg = (char *) YYSTACK_ALLOC (yysize);
-         if (yymsg != 0)
-           {
-             char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
-             yyp = yystpcpy (yyp, yytname[yytype]);
-
-             if (yycount < 5)
-               {
-                 yycount = 0;
-                 for (yyx = yyn < 0 ? -yyn : 0;
-                      yyx < (int) (sizeof (yytname) / sizeof (char *));
-                      yyx++)
-                   if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-                     {
-                       const char *yyq = ! yycount ? ", expecting " : " or ";
-                       yyp = yystpcpy (yyp, yyq);
-                       yyp = yystpcpy (yyp, yytname[yyx]);
-                       yycount++;
-                     }
-               }
-             yyerror (yymsg);
+#if ! YYERROR_VERBOSE
+      yyerror (YY_("syntax error"));
+#else
+      {
+       YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+       if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
+         {
+           YYSIZE_T yyalloc = 2 * yysize;
+           if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
+             yyalloc = YYSTACK_ALLOC_MAXIMUM;
+           if (yymsg != yymsgbuf)

              YYSTACK_FREE (yymsg);
              YYSTACK_FREE (yymsg);

-           }
-         else
-           yyerror ("syntax error; also virtual memory exhausted");
-       }
-      else
-#endif /* YYERROR_VERBOSE */
-       yyerror ("syntax error");
+           yymsg = (char *) YYSTACK_ALLOC (yyalloc);
+           if (yymsg)
+             yymsg_alloc = yyalloc;
+           else
+             {
+               yymsg = yymsgbuf;
+               yymsg_alloc = sizeof yymsgbuf;
+             }
+         }
+
+       if (0 < yysize && yysize <= yymsg_alloc)
+         {
+           (void) yysyntax_error (yymsg, yystate, yychar);
+           yyerror (yymsg);
+         }
+       else
+         {
+           yyerror (YY_("syntax error"));
+           if (yysize != 0)
+             goto yyexhaustedlab;
+         }
+      }
+#endif

     }
     }

-  goto yyerrlab1;

 
 

+  yyerror_range[0] = yylloc;

 
 

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

   if (yyerrstatus == 3)
     {
   if (yyerrstatus == 3)
     {

-      /* If just tried and failed to reuse lookahead token after an
+      /* If just tried and failed to reuse look-ahead token after an

         error, discard it.  */
 
         error, discard it.  */
 

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

         {
         {

-         /* 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;
+         /* Return failure if at end of input.  */
+         if (yychar == YYEOF)
+           YYABORT;

         }
         }

-
-      YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
-      yydestruct (yytoken, &yylval, &yylloc);
-      yytoken = YYEMPTY;
+      else
+       {
+         yydestruct ("Error: discarding", yytoken, &yylval, &yylloc);
+         yychar = YYEMPTY;
+       }

     }
 
     }
 

-  /* Else will try to reuse lookahead token after shifting the error
+  /* Else will try to reuse look-ahead token after shifting the error

      token.  */
      token.  */

+  goto yyerrlab1;
+

 
 

+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
+
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+  if (/*CONSTCOND*/ 0)
+     goto yyerrorlab;
+
+  yyerror_range[0] = yylsp[1-yylen];
+  yylsp -= yylen;
+  yyvsp -= yylen;
+  yyssp -= yylen;
+  yystate = *yyssp;
+  goto yyerrlab1;
+
+
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:

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


@@ -1780,31 +2193,26 @@ yyerrlab1:
       if (yyssp == yyss)
        YYABORT;
 
       if (yyssp == yyss)
        YYABORT;
 

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

     }
 
   if (yyn == YYFINAL)
     YYACCEPT;
 
     }
 
   if (yyn == YYFINAL)
     YYACCEPT;
 

-  YYDPRINTF ((stderr, "Shifting error token, "));
-

   *++yyvsp = yylval;
   *++yyvsp = yylval;

-  *++yylsp = yylloc;
+
+  yyerror_range[1] = yylloc;
+  /* Using YYLLOC is tempting, but would change the location of
+     the look-ahead.  YYLOC is available though. */
+  YYLLOC_DEFAULT (yyloc, yyerror_range - 1, 2);
+  *++yylsp = yyloc;
+
+  /* Shift the error token. */
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);

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


@@ -1825,68 +2233,139 @@ yyabortlab:
   goto yyreturn;
 
 #ifndef yyoverflow
   goto yyreturn;
 
 #ifndef yyoverflow

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

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

+  if (yychar != YYEOF && yychar != YYEMPTY)
+     yydestruct ("Cleanup: discarding lookahead",
+                yytoken, &yylval, &yylloc);
+  while (yyssp != yyss)
+    {
+      yydestruct ("Cleanup: popping",
+                 yystos[*yyssp], yyvsp, yylsp);
+      YYPOPSTACK;
+    }

 #ifndef yyoverflow
   if (yyss != yyssa)
     YYSTACK_FREE (yyss);
 #ifndef yyoverflow
   if (yyss != yyssa)
     YYSTACK_FREE (yyss);

+#endif
+#if YYERROR_VERBOSE
+  if (yymsg != yymsgbuf)
+    YYSTACK_FREE (yymsg);

 #endif
   return yyresult;
 }
 
 
 #endif
   return yyresult;
 }
 
 

-#line 447 "parse-gram.y"
+#line 454 "parse-gram.y"

 
 

-/*------------------------------------------------------------------.
-| When debugging the parser, display tokens' locations and values.  |
-`------------------------------------------------------------------*/
+
+
+/* Return the location of the left-hand side of a rule whose
+   right-hand side is RHS[1] ... RHS[N].  Ignore empty nonterminals in
+   the right-hand side, and return an empty location equal to the end
+   boundary of RHS[0] if the right-hand side is empty.  */
+
+static YYLTYPE
+lloc_default (YYLTYPE const *rhs, int n)
+{
+  int i;
+  YYLTYPE loc;
+
+  /* SGI MIPSpro 7.4.1m miscompiles "loc.start = loc.end = rhs[n].end;".
+     The bug is fixed in 7.4.2m, but play it safe for now.  */
+  loc.start = rhs[n].end;
+  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,
-         int type, const yystype *value)
+add_param (char const *type, char *decl, location loc)

 {
 {

-  fputc (' ', file);
-  switch (type)
+  static char const alphanum[26 + 26 + 1 + 10] =
+    "abcdefghijklmnopqrstuvwxyz"
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+    "_"
+    "0123456789";
+  char const *name_start = NULL;
+  char *p;
+
+  /* Stop on last actual character.  */
+  for (p = decl; p[1]; p++)
+    if ((p == decl
+        || ! memchr (alphanum, p[-1], sizeof alphanum))
+       && memchr (alphanum, p[0], sizeof alphanum - 10))
+      name_start = p;
+
+  /* Strip the surrounding '{' and '}', and any blanks just inside
+     the braces.  */
+  while (*--p == ' ' || *p == '\t')
+    continue;
+  p[1] = '\0';
+  while (*++decl == ' ' || *decl == '\t')
+    continue;
+
+  if (! name_start)
+    complain_at (loc, _("missing identifier in parameter declaration"));
+  else

     {
     {

-    case ID:
-      fprintf (file, " = %s", value->symbol->tag);
-      break;
-
-    case INT:
-      fprintf (file, " = %d", value->integer);
-      break;
-
-    case STRING:
-      fprintf (file, " = \"%s\"", value->string);
-      break;
-
-    case TYPE:
-      fprintf (file, " = <%s>", value->struniq);
-      break;
-
-    case BRACED_CODE:
-    case PROLOGUE:
-    case EPILOGUE:
-      fprintf (file, " = {{ %s }}", value->string);
-      break;
-
-    default:
-      fprintf (file, "unknown token type");
-      break;
+      char *name;
+      size_t name_len;
+
+      for (name_len = 1;
+          memchr (alphanum, name_start[name_len], sizeof alphanum);
+          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 ();
+}
+
+static void
+version_check (location const *loc, char const *version)
+{
+  if (strverscmp (version, PACKAGE_VERSION) > 0)
+    complain_at (*loc, "require bison %s, but have %s",
+                version, PACKAGE_VERSION);
+}
+
+static void
+gram_error (location const *loc, char const *msg)
+{
+  complain_at (*loc, "%s", msg);

 }
 
 }
 

-void
-gram_error (location_t *yylloc, const char *msg)
+char const *
+token_name (int type)

 {
 {

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

 }
 
 }