Rename struniq -> uniqstr to avoid collision with <string.h>.

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

diff --git a/src/parse-gram.c b/src/parse-gram.c
index 3b29bbfa36fe9c0f5b8a9b5fd40b480ba7a1f560..e5eac8213cc4fe9260eda72c98b42ce617d9af1d 100644 (file)
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1,69 +1,193 @@
-/* A Bison parser, made from parse-gram.y
-   by GNU bison 1.35.  */
+/* A Bison parser, made by GNU Bison 1.75c.  */

 
 

-#define YYBISON 1  /* Identify Bison output.  */
+/* Skeleton parser for Yacc-like parsing with Bison,
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 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
+   the Free Software Foundation; either version 2, 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., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, 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.
+   This special exception was added by the Free Software Foundation
+   in version 1.24 of Bison.  */
+
+/* Written by Richard Stallman by simplifying the original so called
+   ``semantic'' parser.  */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+   infringing on user name space.  This should be done even for local
+   variables, as they might otherwise be expanded by user macros.
+   There are some unavoidable exceptions within include files to
+   define necessary library symbols; they are noted "INFRINGES ON
+   USER NAME SPACE" below.  */
+
+/* Identify Bison output.  */
+#define YYBISON 1
+
+/* Skeleton name.  */
+#define YYSKELETON_NAME "yacc.c"
+
+/* Pure parsers.  */
+#define YYPURE 1
+
+/* Using locations.  */
+#define YYLSP_NEEDED 1
+
+/* If NAME_PREFIX is specified substitute the variables and functions
+   names.  */

 #define yyparse gram_parse
 #define yyparse gram_parse

-#define yylex gram_lex
+#define yylex   gram_lex

 #define yyerror gram_error
 #define yyerror gram_error

-#define yylval gram_lval
-#define yychar gram_char
+#define yylval  gram_lval
+#define yychar  gram_char

 #define yydebug gram_debug
 #define yynerrs gram_nerrs
 #define yydebug gram_debug
 #define yynerrs gram_nerrs

-#define YYLSP_NEEDED 1
-
-# define       GRAM_EOF        0
-# define       STRING  257
-# define       CHARACTER       258
-# define       INT     259
-# define       PERCENT_TOKEN   260
-# define       PERCENT_NTERM   261
-# define       PERCENT_TYPE    262
-# define       PERCENT_UNION   263
-# define       PERCENT_EXPECT  264
-# define       PERCENT_START   265
-# define       PERCENT_LEFT    266
-# define       PERCENT_RIGHT   267
-# define       PERCENT_NONASSOC        268
-# define       PERCENT_PREC    269
-# define       PERCENT_VERBOSE 270
-# define       PERCENT_ERROR_VERBOSE   271
-# define       PERCENT_OUTPUT  272
-# define       PERCENT_FILE_PREFIX     273
-# define       PERCENT_NAME_PREFIX     274
-# define       PERCENT_DEFINE  275
-# define       PERCENT_PURE_PARSER     276
-# define       PERCENT_DEFINES 277
-# define       PERCENT_YACC    278
-# define       PERCENT_DEBUG   279
-# define       PERCENT_LOCATIONS       280
-# define       PERCENT_NO_LINES        281
-# define       PERCENT_SKELETON        282
-# define       PERCENT_TOKEN_TABLE     283
-# define       TYPE    284
-# define       EQUAL   285
-# define       SEMICOLON       286
-# define       COLON   287
-# define       PIPE    288
-# define       ID      289
-# define       PERCENT_PERCENT 290
-# define       PROLOGUE        291
-# define       EPILOGUE        292
-# define       BRACED_CODE     293
-
+#define yylloc gram_lloc
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     GRAM_EOF = 0,
+     STRING = 258,
+     INT = 259,
+     PERCENT_TOKEN = 260,
+     PERCENT_NTERM = 261,
+     PERCENT_TYPE = 262,
+     PERCENT_DESTRUCTOR = 263,
+     PERCENT_PRINTER = 264,
+     PERCENT_UNION = 265,
+     PERCENT_LEFT = 266,
+     PERCENT_RIGHT = 267,
+     PERCENT_NONASSOC = 268,
+     PERCENT_PREC = 269,
+     PERCENT_DPREC = 270,
+     PERCENT_MERGE = 271,
+     PERCENT_DEBUG = 272,
+     PERCENT_DEFINE = 273,
+     PERCENT_DEFINES = 274,
+     PERCENT_ERROR_VERBOSE = 275,
+     PERCENT_EXPECT = 276,
+     PERCENT_FILE_PREFIX = 277,
+     PERCENT_GLR_PARSER = 278,
+     PERCENT_LEX_PARAM = 279,
+     PERCENT_LOCATIONS = 280,
+     PERCENT_NAME_PREFIX = 281,
+     PERCENT_NO_LINES = 282,
+     PERCENT_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
+   };
+#endif
+#define GRAM_EOF 0
+#define STRING 258
+#define INT 259
+#define PERCENT_TOKEN 260
+#define PERCENT_NTERM 261
+#define PERCENT_TYPE 262
+#define PERCENT_DESTRUCTOR 263
+#define PERCENT_PRINTER 264
+#define PERCENT_UNION 265
+#define PERCENT_LEFT 266
+#define PERCENT_RIGHT 267
+#define PERCENT_NONASSOC 268
+#define PERCENT_PREC 269
+#define PERCENT_DPREC 270
+#define PERCENT_MERGE 271
+#define PERCENT_DEBUG 272
+#define PERCENT_DEFINE 273
+#define PERCENT_DEFINES 274
+#define PERCENT_ERROR_VERBOSE 275
+#define PERCENT_EXPECT 276
+#define PERCENT_FILE_PREFIX 277
+#define PERCENT_GLR_PARSER 278
+#define PERCENT_LEX_PARAM 279
+#define PERCENT_LOCATIONS 280
+#define PERCENT_NAME_PREFIX 281
+#define PERCENT_NO_LINES 282
+#define PERCENT_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
+
+
+
+
+/* Copy the first part of user declarations.  */

 #line 31 "parse-gram.y"
 
 #include "system.h"
 #line 31 "parse-gram.y"
 
 #include "system.h"

+#include "complain.h"

 #include "muscle_tab.h"
 #include "files.h"
 #include "getargs.h"
 #include "output.h"
 #include "muscle_tab.h"
 #include "files.h"
 #include "getargs.h"
 #include "output.h"

+#include "symlist.h"

 #include "gram.h"
 #include "reader.h"
 #include "conflicts.h"
 
 #include "gram.h"
 #include "reader.h"
 #include "conflicts.h"
 

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

 #define YYERROR_VERBOSE 1
 #define YYERROR_VERBOSE 1

+#define YYLLOC_DEFAULT(Current, Rhs, N)                        \
+do {                                                   \
+  if (N)                                               \
+  {                                                    \
+    Current.first_column  = Rhs[1].first_column;       \
+    Current.first_line    = Rhs[1].first_line;         \
+    Current.last_column   = Rhs[N].last_column;                \
+    Current.last_line     = Rhs[N].last_line;          \
+  }                                                    \
+  else                                                 \
+  {                                                    \
+    Current = Rhs[0];                                  \
+  }                                                    \
+} while (0)

 
 /* Pass the control structure to YYPARSE and YYLEX. */
 #define YYPARSE_PARAM gram_control
 
 /* Pass the control structure to YYPARSE and YYLEX. */
 #define YYPARSE_PARAM gram_control


@@ -72,34 +196,50 @@
    correctly typed access to it.  */
 #define yycontrol ((gram_control_t *) gram_control)
 
    correctly typed access to it.  */
 #define yycontrol ((gram_control_t *) gram_control)
 

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

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

-        gram_error (yycontrol, &yylloc, Msg)
+        gram_error (&yylloc, Msg)

 
 

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

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

-        yyprint (File, &yylloc, Type, &Value)
-static void yyprint (FILE *file, const location_t *loc,
-                     int type, const yystype *value);
+        yyprint (File, Type, &Value)
+static void yyprint (FILE *file, int type, const yystype *value);

 
 symbol_class current_class = unknown_sym;
 
 symbol_class current_class = unknown_sym;

-char *current_type = 0;
+struniq_t current_type = 0;

 symbol_t *current_lhs;
 symbol_t *current_lhs;

-associativity current_assoc;
+location_t current_lhs_location;
+assoc_t current_assoc;

 int current_prec = 0;
 int current_prec = 0;

+braced_code_t current_braced_code = action_braced_code;
+
+
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 1
+#endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif

 
 

-#line 73 "parse-gram.y"

 #ifndef YYSTYPE
 #ifndef YYSTYPE

-typedef union
-{
+#line 89 "parse-gram.y"
+typedef union {

   symbol_t *symbol;
   symbol_t *symbol;

+  symbol_list_t *list;

   int integer;
   char *string;
   int integer;
   char *string;

-  associativity assoc;
+  assoc_t assoc;
+  struniq_t struniq;

 } yystype;
 } yystype;

+/* Line 195 of /usr/local/share/bison/yacc.c.  */
+#line 242 "parse-gram.c"

 # define YYSTYPE yystype
 # define YYSTYPE_IS_TRIVIAL 1
 #endif
 # define YYSTYPE yystype
 # define YYSTYPE_IS_TRIVIAL 1
 #endif


@@ -109,282 +249,20 @@ typedef struct yyltype
 {
   int first_line;
   int first_column;
 {
   int first_line;
   int first_column;

-

   int last_line;
   int last_column;
 } yyltype;
   int last_line;
   int last_column;
 } yyltype;

-

 # define YYLTYPE yyltype
 # define YYLTYPE_IS_TRIVIAL 1
 #endif
 
 # define YYLTYPE yyltype
 # define YYLTYPE_IS_TRIVIAL 1
 #endif
 

-#ifndef YYDEBUG
-# define YYDEBUG 1
-#endif
-
-
-
-#define        YYFINAL         94
-#define        YYFLAG          -32768
-#define        YYNTBASE        41
-
-/* YYTRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */
-#define YYTRANSLATE(x) ((unsigned)(x) <= 293 ? yytranslate[x] : 68)
-
-/* YYTRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX. */
-static const char yytranslate[] =
-{
-       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     1,     4,     5,     6,
-       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
-      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
-      37,    38,    39,    40
-};
-
-#if YYDEBUG
-static const short yyprhs[] =
-{
-       0,     0,     1,     7,     8,    11,    13,    15,    17,    21,
-      23,    25,    28,    32,    34,    38,    40,    44,    46,    49,
-      51,    53,    55,    57,    58,    62,    65,    66,    70,    71,
-      76,    80,    81,    86,    88,    90,    92,    93,    95,    97,
-     100,   102,   105,   107,   109,   112,   115,   119,   121,   124,
-     126,   129,   130,   136,   138,   142,   143,   146,   149,   153,
-     155,   157,   159,   161,   163,   165,   166,   169,   170
-};
-static const short yyrhs[] =
-{
-      -1,    42,    43,    37,    57,    66,     0,     0,    43,    44,
-       0,    45,     0,    38,     0,    26,     0,    22,    65,    65,
-       0,    24,     0,    18,     0,    11,     6,     0,    20,    32,
-      65,     0,    27,     0,    21,    32,    65,     0,    28,     0,
-      19,    32,    65,     0,    23,     0,    29,    65,     0,    30,
-       0,    17,     0,    25,     0,    49,     0,     0,     8,    46,
-      56,     0,    12,    62,     0,     0,     7,    47,    56,     0,
-       0,     9,    31,    48,    53,     0,    10,    40,    67,     0,
-       0,    51,    52,    50,    54,     0,    13,     0,    14,     0,
-      15,     0,     0,    31,     0,    36,     0,    53,    36,     0,
-      62,     0,    54,    62,     0,    31,     0,    36,     0,    36,
-       6,     0,    36,    64,     0,    36,     6,    64,     0,    55,
-       0,    56,    55,     0,    58,     0,    57,    58,     0,     0,
-      36,    34,    59,    60,    33,     0,    61,     0,    60,    35,
-      61,     0,     0,    61,    62,     0,    61,    63,     0,    61,
-      16,    62,     0,    36,     0,    64,     0,     5,     0,    40,
-       0,     4,     0,     4,     0,     0,    37,    39,     0,     0,
-      33,     0
-};
-
-#endif
-
-#if YYDEBUG
-/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
-static const short yyrline[] =
-{
-       0,   132,   132,   140,   142,   145,   147,   151,   152,   153,
-     154,   155,   156,   157,   158,   159,   160,   161,   162,   163,
-     164,   165,   168,   170,   170,   175,   179,   179,   184,   184,
-     188,   196,   196,   203,   205,   206,   209,   211,   215,   217,
-     221,   227,   236,   241,   246,   252,   258,   268,   271,   275,
-     277,   280,   280,   285,   287,   290,   293,   295,   297,   301,
-     303,   304,   307,   313,   322,   330,   335,   341,   343
-};
-#endif
-
+/* Copy the second part of user declarations.  */

 
 

-#if (YYDEBUG) || defined YYERROR_VERBOSE

 
 

-/* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */
-static const char *const yytname[] =
-{
-  "$", "error", "$undefined.", "\"end of string\"", "STRING", "CHARACTER", 
-  "INT", "\"%token\"", "\"%nterm\"", "\"%type\"", "\"%union\"", 
-  "\"%expect\"", "\"%start\"", "\"%left\"", "\"%right\"", "\"%nonassoc\"", 
-  "\"%prec\"", "\"%verbose\"", "\"%error-verbose\"", "\"%output\"", 
-  "\"%file-prefix\"", "\"%name-prefix\"", "\"%define\"", 
-  "\"%pure-parser\"", "\"%defines\"", "\"%yacc\"", "\"%debug\"", 
-  "\"%locations\"", "\"%no-lines\"", "\"%skeleton\"", "\"%token-table\"", 
-  "TYPE", "\"=\"", "\";\"", "\":\"", "\"|\"", "\"identifier\"", "\"%%\"", 
-  "PROLOGUE", "EPILOGUE", "BRACED_CODE", "input", "@1", "directives", 
-  "directive", "grammar_directives", "@2", "@3", "@4", 
-  "precedence_directives", "@5", "precedence_directive", "type.opt", 
-  "nterms_to_type.1", "terms_to_prec.1", "symbol_def", "symbol_defs.1", 
-  "gram", "rules", "@6", "rhses.1", "rhs", "symbol", "action", 
-  "string_as_id", "string_content", "epilogue.opt", "semi_colon_opt", 0
-};
-#endif
-
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
-static const short yyr1[] =
-{
-       0,    42,    41,    43,    43,    44,    44,    44,    44,    44,
-      44,    44,    44,    44,    44,    44,    44,    44,    44,    44,
-      44,    44,    45,    46,    45,    45,    47,    45,    48,    45,
-      45,    50,    49,    51,    51,    51,    52,    52,    53,    53,
-      54,    54,    55,    55,    55,    55,    55,    56,    56,    57,
-      57,    59,    58,    60,    60,    61,    61,    61,    61,    62,
-      62,    62,    63,    64,    65,    66,    66,    67,    67
-};
-
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
-static const short yyr2[] =
-{
-       0,     0,     5,     0,     2,     1,     1,     1,     3,     1,
-       1,     2,     3,     1,     3,     1,     3,     1,     2,     1,
-       1,     1,     1,     0,     3,     2,     0,     3,     0,     4,
-       3,     0,     4,     1,     1,     1,     0,     1,     1,     2,
-       1,     2,     1,     1,     2,     2,     3,     1,     2,     1,
-       2,     0,     5,     1,     3,     0,     2,     2,     3,     1,
-       1,     1,     1,     1,     1,     0,     2,     0,     1
-};
-
-/* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE
-   doesn't specify something else to do.  Zero means the default is an
-   error. */
-static const short yydefact[] =
-{
-       1,     3,     0,    26,    23,     0,     0,     0,     0,    33,
-      34,    35,    20,    10,     0,     0,     0,     0,    17,     9,
-      21,     7,    13,    15,     0,    19,     0,     6,     4,     5,
-      22,    36,     0,     0,    28,    67,    11,    63,    61,    59,
-      25,    60,     0,     0,     0,    64,     0,    18,     0,    65,
-      49,    37,    31,    42,    43,    47,    27,    24,     0,    68,
-      30,    16,    12,    14,     8,    51,     0,    50,     2,     0,
-      44,    45,    48,    38,    29,    55,    66,    32,    40,    46,
-      39,     0,    53,    41,    52,    55,     0,    62,    56,    57,
-      54,    58,     0,     0,     0
-};
-
-static const short yydefgoto[] =
-{
-      92,     1,     2,    28,    29,    33,    32,    58,    30,    69,
-      31,    52,    74,    77,    55,    56,    49,    50,    75,    81,
-      82,    88,    89,    41,    46,    68,    60
-};
-
-static const short yypact[] =
-{
-  -32768,-32768,    72,-32768,-32768,   -22,   -29,     8,    -1,-32768,
-  -32768,-32768,-32768,-32768,   -16,   -14,   -11,    22,-32768,-32768,
-  -32768,-32768,-32768,-32768,    22,-32768,    -6,-32768,-32768,-32768,
-  -32768,     0,   -24,   -24,-32768,     1,-32768,-32768,-32768,-32768,
-  -32768,-32768,    22,    22,    22,-32768,    22,-32768,    -2,   -17,
-  -32768,-32768,-32768,-32768,     4,-32768,   -24,   -24,     2,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,     3,-32768,-32768,    -1,
-      32,-32768,-32768,-32768,     5,-32768,-32768,    -1,-32768,-32768,
-  -32768,   -18,    -3,-32768,-32768,-32768,    -1,-32768,-32768,-32768,
-      -3,-32768,    39,    40,-32768
-};
-
-static const short yypgoto[] =
-{
-  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-  -32768,-32768,-32768,-32768,   -28,    10,-32768,    -5,-32768,-32768,
-     -40,    -8,-32768,   -48,   -19,-32768,-32768
-};
-
-
-#define        YYLAST          110
-
-
-static const short yytable[] =
-{
-      40,    37,    38,    37,    38,    47,    71,    53,    37,    34,
-      70,    35,    54,    86,    36,    84,    42,    85,    43,    48,
-      66,    44,    79,    61,    62,    63,    45,    64,    72,    72,
-      48,    51,    65,    39,    59,    39,    37,    87,    73,    93,
-      94,    80,    76,    57,    67,    90,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    78,     0,     0,     0,     0,     0,     0,     0,    83,
-       0,     0,     0,     0,     0,     0,     0,     0,    91,     3,
-       4,     5,     6,     7,     8,     9,    10,    11,     0,    12,
-      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,     0,     0,     0,     0,     0,     0,    26,
-      27
-};
-
-static const short yycheck[] =
-{
-       8,     4,     5,     4,     5,    24,    54,    31,     4,    31,
-       6,    40,    36,    16,     6,    33,    32,    35,    32,    36,
-      37,    32,    70,    42,    43,    44,     4,    46,    56,    57,
-      36,    31,    34,    36,    33,    36,     4,    40,    36,     0,
-       0,    36,    39,    33,    49,    85,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    69,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    77,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    86,     7,
-       8,     9,    10,    11,    12,    13,    14,    15,    -1,    17,
-      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
-      28,    29,    30,    -1,    -1,    -1,    -1,    -1,    -1,    37,
-      38
-};
-#define YYPURE 1
-
-/* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/usr/share/bison/bison.simple"
-
-/* Skeleton output parser for bison,
-
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 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
-   the Free Software Foundation; either version 2, 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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, 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.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
-
-/* This is the parser code that is written into each bison parser when
-   the %semantic_parser declaration is not specified in the grammar.
-   It was written by Richard Stallman by simplifying the hairy parser
-   used when %semantic_parser is specified.  */
-
-/* All symbols defined below should begin with yy or YY, to avoid
-   infringing on user name space.  This should be done even for local
-   variables, as they might otherwise be expanded by user macros.
-   There are some unavoidable exceptions within include files to
-   define necessary library symbols; they are noted "INFRINGES ON
-   USER NAME SPACE" below.  */
+/* Line __line__ of __file__.  */
+#line 263 "parse-gram.c"

 
 

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

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


@@ -413,7 +291,7 @@ static const short yycheck[] =
 #  define YYSTACK_ALLOC malloc
 #  define YYSTACK_FREE free
 # endif
 #  define YYSTACK_ALLOC malloc
 #  define YYSTACK_FREE free
 # endif

-#endif /* ! defined (yyoverflow) || defined (YYERROR_VERBOSE) */
+#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */

 
 
 #if (! defined (yyoverflow) \
 
 
 #if (! defined (yyoverflow) \


@@ -425,9 +303,7 @@ union yyalloc
 {
   short yyss;
   YYSTYPE yyvs;
 {
   short yyss;
   YYSTYPE yyvs;

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

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


@@ -435,15 +311,9 @@ union yyalloc
 
 /* The size of an array large to enough to hold all stacks, each with
    N elements.  */
 
 /* The size of an array large to enough to hold all stacks, each with
    N elements.  */

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

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

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

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


@@ -481,6 +351,305 @@ union yyalloc
 
 #endif
 
 
 #endif
 

+#if defined (__STDC__) || defined (__cplusplus)
+   typedef signed char yysigned_char;
+#else
+   typedef short yysigned_char;
+#endif
+
+/* YYFINAL -- State number of the termination state. */
+#define YYFINAL  3
+/* YYLAST -- Last index in YYTABLE.  */
+#define YYLAST   152
+
+/* YYNTOKENS -- Number of terminals. */
+#define YYNTOKENS  47
+/* YYNNTS -- Number of nonterminals. */
+#define YYNNTS  29
+/* YYNRULES -- Number of rules. */
+#define YYNRULES  77
+/* YYNRULES -- Number of states. */
+#define YYNSTATES  116
+
+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+#define YYUNDEFTOK  2
+#define YYMAXUTOK   301
+
+#define YYTRANSLATE(YYX)                                               \
+  ((YYX <= 0) ? YYEOF :                                                        \
+   (unsigned)(YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+
+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
+static const unsigned char yytranslate[] =
+{
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    46
+};
+
+#if YYDEBUG
+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
+   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
+};
+
+/* 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
+};
+
+/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+static const unsigned short 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
+};
+#endif
+
+#if YYDEBUG || YYERROR_VERBOSE
+/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   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
+};
+#endif
+
+# ifdef YYPRINT
+/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
+   token YYLEX-NUM.  */
+static const unsigned short yytoknum[] =
+{
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
+     295,   296,   297,   298,   299,   300,   301
+};
+# 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
+};
+
+/* 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
+};
+
+/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
+   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
+   means the default is an error.  */
+static const 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
+};
+
+/* 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
+};
+
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+   STATE-NUM.  */
+#define YYPACT_NINF -66
+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
+};
+
+/* 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
+};
+
+/* 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
+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
+};
+
+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
+};
+
+/* 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,
+      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
+};

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


@@ -499,30 +668,35 @@ union yyalloc
 #endif
 
 #define yyerrok                (yyerrstatus = 0)
 #endif
 
 #define yyerrok                (yyerrstatus = 0)

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

 #define YYEMPTY                -2
 #define YYEOF          0
 #define YYEMPTY                -2
 #define YYEOF          0

+

 #define YYACCEPT       goto yyacceptlab
 #define YYACCEPT       goto yyacceptlab

-#define YYABORT        goto yyabortlab
+#define YYABORT                goto yyabortlab

 #define YYERROR                goto yyerrlab1
 #define YYERROR                goto yyerrlab1

+

 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
    Once GCC version 2 has supplanted version 1, this can go.  */
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
    Once GCC version 2 has supplanted version 1, this can go.  */

+

 #define YYFAIL         goto yyerrlab
 #define YYFAIL         goto yyerrlab

+

 #define YYRECOVERING()  (!!yyerrstatus)
 #define YYRECOVERING()  (!!yyerrstatus)

+

 #define YYBACKUP(Token, Value)                                 \
 do                                                             \
 #define YYBACKUP(Token, Value)                                 \
 do                                                             \

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

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

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

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

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

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


@@ -530,41 +704,24 @@ while (0)
 #define YYTERROR       1
 #define YYERRCODE      256
 
 #define YYTERROR       1
 #define YYERRCODE      256
 

-

 /* YYLLOC_DEFAULT -- Compute the default location (before the actions
 /* YYLLOC_DEFAULT -- Compute the default location (before the actions

-   are run).
-
-   When YYLLOC_DEFAULT is run, CURRENT is set the location of the
-   first token.  By default, to implement support for ranges, extend
-   its range to the last symbol.  */
+   are run).  */

 
 #ifndef YYLLOC_DEFAULT
 
 #ifndef YYLLOC_DEFAULT

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

 #endif
 
 #endif
 

-

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

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

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


@@ -579,11 +736,29 @@ do {                                              \
   if (yydebug)                                 \
     YYFPRINTF Args;                            \
 } while (0)
   if (yydebug)                                 \
     YYFPRINTF Args;                            \
 } while (0)

+# define YYDSYMPRINT(Args)                     \
+do {                                           \
+  if (yydebug)                                 \
+    yysymprint Args;                           \
+} while (0)
+# define YYDSYMPRINTF(Title, Token, Value, Location)           \
+do {                                                           \
+  if (yydebug)                                                 \
+    {                                                          \
+      YYFPRINTF (stderr, "%s ", Title);                                \
+      yysymprint (stderr,                                      \
+                  Token, Value, Location);     \
+      YYFPRINTF (stderr, "\n");                                        \
+    }                                                          \
+} while (0)
+

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

 #endif /* !YYDEBUG */
 
 /* YYINITDEPTH -- initial size of the parser's stacks.  */
 #endif /* !YYDEBUG */
 
 /* YYINITDEPTH -- initial size of the parser's stacks.  */


@@ -605,8 +780,10 @@ int yydebug;
 #ifndef YYMAXDEPTH
 # define YYMAXDEPTH 10000
 #endif
 #ifndef YYMAXDEPTH
 # define YYMAXDEPTH 10000
 #endif

+

 \f
 \f

-#ifdef YYERROR_VERBOSE
+
+#if YYERROR_VERBOSE

 
 # ifndef yystrlen
 #  if defined (__GLIBC__) && defined (_STRING_H)
 
 # ifndef yystrlen
 #  if defined (__GLIBC__) && defined (_STRING_H)


@@ -656,78 +833,132 @@ yystpcpy (yydest, yysrc)
 }
 #  endif
 # endif
 }
 #  endif
 # endif

-#endif
+
+#endif /* !YYERROR_VERBOSE */
+

 \f
 \f

-#line 315 "/usr/share/bison/bison.simple"

 
 

+#if YYDEBUG
+/*-----------------------------.
+| Print this symbol on YYOUT.  |
+`-----------------------------*/

 
 

-/* The user can define YYPARSE_PARAM as the name of an argument to be passed
-   into yyparse.  The argument should have type void *.
-   It should actually point to an object.
-   Grammar actions can access the variable by casting it
-   to the proper pointer type.  */
+#if defined (__STDC__) || defined (__cplusplus)
+static void
+yysymprint (FILE *yyout, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp)
+#else
+static void
+yysymprint (yyout, yytype, yyvaluep, yylocationp)
+    FILE *yyout;
+    int yytype;
+    YYSTYPE *yyvaluep;
+    YYLTYPE *yylocationp;
+#endif
+{
+  /* Pacify ``unused variable'' warnings.  */
+  (void) yyvaluep;
+  (void) yylocationp;
+
+  if (yytype < YYNTOKENS)
+    {
+      YYFPRINTF (yyout, "token %s (", yytname[yytype]);
+# ifdef YYPRINT
+      YYPRINT (yyout, yytoknum[yytype], *yyvaluep);
+# endif
+    }
+  else
+    YYFPRINTF (yyout, "nterm %s (", yytname[yytype]);
+
+  switch (yytype)
+    {
+      default:
+        break;
+    }
+  YYFPRINTF (yyout, ")");
+}
+
+#endif /* YYDEBUG. */
+/*-----------------------------------------------.
+| Release the memory associated to this symbol.  |
+`-----------------------------------------------*/
+
+#if defined (__STDC__) || defined (__cplusplus)
+static void
+yydestruct (int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp)
+#else
+static void
+yydestruct (yytype, yyvaluep, yylocationp)
+    int yytype;
+    YYSTYPE *yyvaluep;
+    YYLTYPE *yylocationp;
+#endif
+{
+  /* Pacify ``unused variable'' warnings.  */
+  (void) yyvaluep;
+  (void) yylocationp;
+
+  switch (yytype)
+    {
+
+      default:
+        break;
+    }
+}
+\f
+
+/* Prevent warnings from -Wmissing-prototypes.  */

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

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

 # else
 # else

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

 # endif
 # endif

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

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

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

 #endif
 
 #endif
 

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

 
 

-#if YYLSP_NEEDED
-# define YY_DECL_VARIABLES                     \
-YY_DECL_NON_LSP_VARIABLES                      \
-                                               \
-/* Location data for the lookahead symbol.  */ \
-YYLTYPE yylloc;
+
+
+
+
+/*----------.
+| yyparse.  |
+`----------*/
+
+#ifdef YYPARSE_PARAM
+# if defined (__STDC__) || defined (__cplusplus)
+int yyparse (void *YYPARSE_PARAM)
+# else
+int yyparse (YYPARSE_PARAM)
+  void *YYPARSE_PARAM;
+# endif
+#else /* ! YYPARSE_PARAM */
+#if defined (__STDC__) || defined (__cplusplus)
+int
+yyparse (void)

 #else
 #else

-# define YY_DECL_VARIABLES                     \
-YY_DECL_NON_LSP_VARIABLES
-#endif
-
+int
+yyparse ()

 
 

-/* If nonreentrant, generate the variables here. */
+#endif
+#endif
+{
+  /* The lookahead symbol.  */
+int yychar;

 
 

-#if !YYPURE
-YY_DECL_VARIABLES
-#endif  /* !YYPURE */
+/* The semantic value of the lookahead symbol.  */
+YYSTYPE yylval;

 
 

-int
-yyparse (YYPARSE_PARAM_ARG)
-     YYPARSE_PARAM_DECL
-{
-  /* If reentrant, generate the variables here. */
-#if YYPURE
-  YY_DECL_VARIABLES
-#endif  /* !YYPURE */
+/* Number of syntax errors so far.  */
+int yynerrs;
+/* Location data for the lookahead symbol.  */
+YYLTYPE yylloc;

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


@@ -735,7 +966,7 @@ yyparse (YYPARSE_PARAM_ARG)
   /* Number of tokens to shift before error messages enabled.  */
   int yyerrstatus;
   /* Lookahead token as an internal (translated) token number.  */
   /* Number of tokens to shift before error messages enabled.  */
   int yyerrstatus;
   /* Lookahead token as an internal (translated) token number.  */

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

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


@@ -745,7 +976,7 @@ yyparse (YYPARSE_PARAM_ARG)
      Refer to the stacks thru separate pointers, to allow yyoverflow
      to reallocate them elsewhere.  */
 
      Refer to the stacks thru separate pointers, to allow yyoverflow
      to reallocate them elsewhere.  */
 

-  /* The state stack. */
+  /* The state stack.  */

   short        yyssa[YYINITDEPTH];
   short *yyss = yyssa;
   register short *yyssp;
   short        yyssa[YYINITDEPTH];
   short *yyss = yyssa;
   register short *yyssp;


@@ -755,31 +986,22 @@ yyparse (YYPARSE_PARAM_ARG)
   YYSTYPE *yyvs = yyvsa;
   register YYSTYPE *yyvsp;
 
   YYSTYPE *yyvs = yyvsa;
   register YYSTYPE *yyvsp;
 

-#if YYLSP_NEEDED

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

-#endif

 
 

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

 
   YYSIZE_T yystacksize = YYINITDEPTH;
 
 
   YYSIZE_T yystacksize = YYINITDEPTH;
 

-

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

-#if YYLSP_NEEDED

   YYLTYPE yyloc;
   YYLTYPE yyloc;

-#endif

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

-     rule. */
+     rule.  */

   int yylen;
 
   YYDPRINTF ((stderr, "Starting parse\n"));
   int yylen;
 
   YYDPRINTF ((stderr, "Starting parse\n"));


@@ -787,7 +1009,7 @@ yyparse (YYPARSE_PARAM_ARG)
   yystate = 0;
   yyerrstatus = 0;
   yynerrs = 0;
   yystate = 0;
   yyerrstatus = 0;
   yynerrs = 0;

-  yychar = YYEMPTY;            /* Cause a token to be read.  */
+  yychar = yytoken = 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


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

-#if YYLSP_NEEDED

   yylsp = yyls;
   yylsp = yyls;

-#endif

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


@@ -813,7 +1033,7 @@ yyparse (YYPARSE_PARAM_ARG)
  yysetstate:
   *yyssp = yystate;
 
  yysetstate:
   *yyssp = yystate;
 

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

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


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

+       YYLTYPE *yyls1 = yyls;

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

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

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

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

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


@@ -852,10 +1065,10 @@ yyparse (YYPARSE_PARAM_ARG)
       goto yyoverflowlab;
 # else
       /* Extend the stack our own way.  */
       goto yyoverflowlab;
 # else
       /* Extend the stack our own way.  */

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

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

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

        yystacksize = YYMAXDEPTH;
 
       {
        yystacksize = YYMAXDEPTH;
 
       {


@@ -866,10 +1079,8 @@ yyparse (YYPARSE_PARAM_ARG)
          goto yyoverflowlab;
        YYSTACK_RELOCATE (yyss);
        YYSTACK_RELOCATE (yyvs);
          goto yyoverflowlab;
        YYSTACK_RELOCATE (yyss);
        YYSTACK_RELOCATE (yyvs);

-# if YYLSP_NEEDED

        YYSTACK_RELOCATE (yyls);
        YYSTACK_RELOCATE (yyls);

-# endif
-# undef YYSTACK_RELOCATE
+#  undef YYSTACK_RELOCATE

        if (yyss1 != yyssa)
          YYSTACK_FREE (yyss1);
       }
        if (yyss1 != yyssa)
          YYSTACK_FREE (yyss1);
       }


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

-#if YYLSP_NEEDED

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

-#endif

 
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
                  (unsigned long int) yystacksize));
 
 
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
                  (unsigned long int) yystacksize));
 

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

        YYABORT;
     }
 
        YYABORT;
     }
 


@@ -893,7 +1102,6 @@ yyparse (YYPARSE_PARAM_ARG)
 
   goto yybackup;
 
 
   goto yybackup;
 

-

 /*-----------.
 | yybackup.  |
 `-----------*/
 /*-----------.
 | yybackup.  |
 `-----------*/


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

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

     goto yydefault;
 
   /* Not known => get a lookahead token if don't already have one.  */
 
     goto yydefault;
 
   /* Not known => get a lookahead token if don't already have one.  */
 

-  /* yychar is either YYEMPTY or YYEOF
-     or a valid token in external form.  */
-
-  if (yychar == YYEMPTY)
+  /* YYTOKEN is either YYEMPTY or YYEOF or a valid token.  */
+  if (yytoken == YYEMPTY)

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

+      yytoken = YYTRANSLATE (yychar);

     }
 
     }
 

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

     {
     {

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

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

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

     }
 
     }
 

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

     goto yydefault;
     goto yydefault;

-

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

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

     {
     {

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

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

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

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

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

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

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

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

-#if YYLSP_NEEDED

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

-#endif

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


@@ -1018,19 +1194,15 @@ yyreduce:
   /* If YYLEN is nonzero, implement the default value of the action:
      `$$ = $1'.
 
   /* If YYLEN is nonzero, implement the default value of the action:
      `$$ = $1'.
 

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

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

-#if YYLSP_NEEDED
-  /* Similarly for the default location.  Let the user run additional
-     commands if for instance locations are ranges.  */
-  yyloc = yylsp[1-yylen];
+  /* Default location. */

   YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
   YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);

-#endif

 
 #if YYDEBUG
   /* We have to keep this `#if YYDEBUG', since we use variables which
 
 #if YYDEBUG
   /* We have to keep this `#if YYDEBUG', since we use variables which


@@ -1039,321 +1211,433 @@ yyreduce:
     {
       int yyi;
 
     {
       int yyi;
 

-      YYFPRINTF (stderr, "Reducing via rule %d (line %d), ",
-                yyn, yyrline[yyn]);
+      YYFPRINTF (stderr, "Reducing by rule %d (line %d), ",
+                yyn - 1, yyrline[yyn]);

 
       /* Print the symbols being reduced, and their result.  */
 
       /* Print the symbols being reduced, and their result.  */

-      for (yyi = yyprhs[yyn]; yyrhs[yyi] > 0; yyi++)
+      for (yyi = yyprhs[yyn]; 0 <= yyrhs[yyi]; yyi++)

        YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]);
        YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]);

-      YYFPRINTF (stderr, " -> %s\n", yytname[yyr1[yyn]]);
+      YYFPRINTF (stderr, "-> %s\n", yytname[yyr1[yyn]]);

     }
 #endif
     }
 #endif

+  switch (yyn)
+    {
+        case 2:
+#line 172 "parse-gram.y"
+    {
+      yycontrol->errcode = 0;
+    }
+    break;

 
 

-  switch (yyn) {
+  case 6:
+#line 189 "parse-gram.y"
+    { prologue_augment (yyvsp[0].string, yylsp[0]); }
+    break;

 
 

-case 1:
-#line 132 "parse-gram.y"
-{ LOCATION_RESET (yylloc); }
+  case 7:
+#line 190 "parse-gram.y"
+    { debug_flag = 1; }

     break;
     break;

-case 2:
-#line 134 "parse-gram.y"
-{
-      yycontrol->errcode = 0;
-      epilogue_set (yyvsp[0].string, yylsp[0]);
-    }
+
+  case 8:
+#line 191 "parse-gram.y"
+    { muscle_insert (yyvsp[-1].string, yyvsp[0].string); }

     break;
     break;

-case 6:
-#line 148 "parse-gram.y"
-{
-     prologue_augment (yyvsp[0].string, yylsp[0]);
-   }
+
+  case 9:
+#line 192 "parse-gram.y"
+    { defines_flag = 1; }
+    break;
+
+  case 10:
+#line 193 "parse-gram.y"
+    { error_verbose = 1; }
+    break;
+
+  case 11:
+#line 194 "parse-gram.y"
+    { expected_conflicts = yyvsp[0].integer; }

     break;
     break;

-case 7:
-#line 151 "parse-gram.y"
-{ debug_flag = 1; }
+
+  case 12:
+#line 195 "parse-gram.y"
+    { spec_file_prefix = yyvsp[0].string; }

     break;
     break;

-case 8:
-#line 152 "parse-gram.y"
-{ muscle_insert (yyvsp[-1].string, yyvsp[0].string); }
+
+  case 13:
+#line 196 "parse-gram.y"
+    { glr_parser = 1; }

     break;
     break;

-case 9:
-#line 153 "parse-gram.y"
-{ defines_flag = 1; }
+
+  case 14:
+#line 198 "parse-gram.y"
+    {
+                            muscle_pair_list_grow ("lex_param", yyvsp[-2].string, yyvsp[0].string);
+                            scanner_last_string_free ();
+                          }

     break;
     break;

-case 10:
-#line 154 "parse-gram.y"
-{ error_verbose = 1; }
+
+  case 15:
+#line 202 "parse-gram.y"
+    { locations_flag = 1; }

     break;
     break;

-case 11:
-#line 155 "parse-gram.y"
-{ expected_conflicts = yyvsp[0].integer; }
+
+  case 16:
+#line 203 "parse-gram.y"
+    { spec_name_prefix = yyvsp[0].string; }

     break;
     break;

-case 12:
-#line 156 "parse-gram.y"
-{ spec_file_prefix = yyvsp[0].string; }
+
+  case 17:
+#line 204 "parse-gram.y"
+    { no_lines_flag = 1; }

     break;
     break;

-case 13:
-#line 157 "parse-gram.y"
-{ locations_flag = 1; }
+
+  case 18:
+#line 205 "parse-gram.y"
+    { spec_outfile = yyvsp[0].string; }

     break;
     break;

-case 14:
-#line 158 "parse-gram.y"
-{ spec_name_prefix = yyvsp[0].string; }
+
+  case 19:
+#line 207 "parse-gram.y"
+    {
+                            muscle_pair_list_grow ("parse_param", yyvsp[-2].string, yyvsp[0].string);
+                            scanner_last_string_free ();
+                          }

     break;
     break;

-case 15:
-#line 159 "parse-gram.y"
-{ no_lines_flag = 1; }
+
+  case 20:
+#line 211 "parse-gram.y"
+    { pure_parser = 1; }

     break;
     break;

-case 16:
-#line 160 "parse-gram.y"
-{ spec_outfile = yyvsp[0].string; }
+
+  case 21:
+#line 212 "parse-gram.y"
+    { skeleton = yyvsp[0].string; }

     break;
     break;

-case 17:
-#line 161 "parse-gram.y"
-{ pure_parser = 1; }
+
+  case 22:
+#line 213 "parse-gram.y"
+    { token_table_flag = 1; }

     break;
     break;

-case 18:
-#line 162 "parse-gram.y"
-{ skeleton = yyvsp[0].string; }
+
+  case 23:
+#line 214 "parse-gram.y"
+    { report_flag = 1; }

     break;
     break;

-case 19:
-#line 163 "parse-gram.y"
-{ token_table_flag = 1; }
+
+  case 24:
+#line 215 "parse-gram.y"
+    { yacc_flag = 1; }

     break;
     break;

-case 20:
-#line 164 "parse-gram.y"
-{ report_flag = 1; }
+
+  case 27:
+#line 222 "parse-gram.y"
+    {
+      grammar_start_symbol_set (yyvsp[0].symbol, yylsp[0]);
+    }

     break;
     break;

-case 21:
-#line 165 "parse-gram.y"
-{ yacc_flag = 1; }
+
+  case 28:
+#line 226 "parse-gram.y"
+    {
+      typed = 1;
+      MUSCLE_INSERT_INT ("stype_line", yylsp[0].first_line);
+      muscle_insert ("stype", yyvsp[0].string);
+    }

     break;
     break;

-case 23:
-#line 170 "parse-gram.y"
-{ current_class = nterm_sym; }
+
+  case 29:
+#line 232 "parse-gram.y"
+    { current_braced_code = destructor_braced_code; }

     break;
     break;

-case 24:
-#line 171 "parse-gram.y"
-{
-      current_class = unknown_sym;
-      current_type = NULL;
+
+  case 30:
+#line 234 "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;

     }
     break;
     }
     break;

-case 25:
-#line 176 "parse-gram.y"
-{
-      grammar_start_symbol_set (yyvsp[0].symbol);
+
+  case 31:
+#line 242 "parse-gram.y"
+    { current_braced_code = printer_braced_code; }
+    break;
+
+  case 32:
+#line 244 "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;

     }
     break;
     }
     break;

-case 26:
-#line 179 "parse-gram.y"
-{ current_class = token_sym; }
+
+  case 33:
+#line 254 "parse-gram.y"
+    { current_class = nterm_sym; }

     break;
     break;

-case 27:
-#line 180 "parse-gram.y"
-{
+
+  case 34:
+#line 255 "parse-gram.y"
+    {

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

-case 28:
-#line 184 "parse-gram.y"
-{current_type = yyvsp[0].string; }
+
+  case 35:
+#line 259 "parse-gram.y"
+    { current_class = token_sym; }

     break;
     break;

-case 29:
-#line 185 "parse-gram.y"
-{
+
+  case 36:
+#line 260 "parse-gram.y"
+    {
+      current_class = unknown_sym;

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

-case 30:
-#line 189 "parse-gram.y"
-{
-      typed = 1;
-      MUSCLE_INSERT_INT ("stype_line", yylsp[-1].first_line);
-      muscle_insert ("stype", yyvsp[-1].string);
+
+  case 37:
+#line 265 "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);

     }
     break;
     }
     break;

-case 31:
-#line 198 "parse-gram.y"
-{ current_assoc = yyvsp[-1].assoc; ++current_prec; }
+
+  case 38:
+#line 275 "parse-gram.y"
+    {
+      symbol_list_t *list;
+      ++current_prec;
+      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_list_free (yyvsp[0].list);
+      current_type = NULL;
+    }

     break;
     break;

-case 32:
-#line 200 "parse-gram.y"
-{ current_assoc = non_assoc; current_type = NULL; }
+
+  case 39:
+#line 289 "parse-gram.y"
+    { yyval.assoc = left_assoc; }

     break;
     break;

-case 33:
-#line 204 "parse-gram.y"
-{ yyval.assoc = left_assoc; }
+
+  case 40:
+#line 290 "parse-gram.y"
+    { yyval.assoc = right_assoc; }

     break;
     break;

-case 34:
-#line 205 "parse-gram.y"
-{ yyval.assoc = right_assoc; }
+
+  case 41:
+#line 291 "parse-gram.y"
+    { yyval.assoc = non_assoc; }

     break;
     break;

-case 35:
-#line 206 "parse-gram.y"
-{ yyval.assoc = non_assoc; }
+
+  case 42:
+#line 295 "parse-gram.y"
+    { current_type = NULL; }

     break;
     break;

-case 36:
-#line 210 "parse-gram.y"
-{ current_type = NULL;}
+
+  case 43:
+#line 296 "parse-gram.y"
+    { current_type = yyvsp[0].struniq; }

     break;
     break;

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

     break;
     break;

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

     break;
     break;

-case 39:
-#line 217 "parse-gram.y"
-{ symbol_type_set (yyvsp[0].symbol, current_type); }
+
+  case 46:
+#line 309 "parse-gram.y"
+    {
+       current_type = yyvsp[0].struniq;
+     }

     break;
     break;

-case 40:
-#line 223 "parse-gram.y"
-{
-      symbol_type_set (yyvsp[0].symbol, current_type);
-      symbol_precedence_set (yyvsp[0].symbol, current_prec, current_assoc);
+
+  case 47:
+#line 313 "parse-gram.y"
+    {
+       symbol_class_set (yyvsp[0].symbol, current_class, yylsp[0]);
+       symbol_type_set (yyvsp[0].symbol, current_type, yylsp[0]);
+     }
+    break;
+
+  case 48:
+#line 318 "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]);

     }
     break;
     }
     break;

-case 41:
-#line 228 "parse-gram.y"
-{
-      symbol_type_set (yyvsp[0].symbol, current_type);
-      symbol_precedence_set (yyvsp[0].symbol, current_prec, current_assoc);
+
+  case 49:
+#line 324 "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);

     }
     break;
     }
     break;

-case 42:
-#line 238 "parse-gram.y"
-{
-       current_type = yyvsp[0].string;
-     }
+
+  case 50:
+#line 330 "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);
+    }

     break;
     break;

-case 43:
-#line 242 "parse-gram.y"
-{
-       symbol_class_set (yyvsp[0].symbol, current_class);
-       symbol_type_set (yyvsp[0].symbol, current_type);
-     }
+
+  case 51:
+#line 341 "parse-gram.y"
+    {;}

     break;
     break;

-case 44:
-#line 247 "parse-gram.y"
-{
-      symbol_class_set (yyvsp[-1].symbol, current_class);
-      symbol_type_set (yyvsp[-1].symbol, current_type);
-      symbol_user_token_number_set (yyvsp[-1].symbol, yyvsp[0].integer);
-    }
+
+  case 52:
+#line 343 "parse-gram.y"
+    {;}

     break;
     break;

-case 45:
-#line 253 "parse-gram.y"
-{
-      symbol_class_set (yyvsp[-1].symbol, current_class);
-      symbol_type_set (yyvsp[-1].symbol, current_type);
-      symbol_make_alias (yyvsp[-1].symbol, yyvsp[0].symbol);
+
+  case 56:
+#line 362 "parse-gram.y"
+    {
+      if (yacc_flag)
+       complain_at (yyloc, _("POSIX forbids declarations in the grammar"));

     }
     break;
     }
     break;

-case 46:
-#line 259 "parse-gram.y"
-{
-      symbol_class_set (yyvsp[-2].symbol, current_class);
-      symbol_type_set (yyvsp[-2].symbol, current_type);
-      symbol_user_token_number_set (yyvsp[-2].symbol, yyvsp[-1].integer);
-      symbol_make_alias (yyvsp[-2].symbol, yyvsp[0].symbol);
+
+  case 57:
+#line 367 "parse-gram.y"
+    {
+      yyerrok;

     }
     break;
     }
     break;

-case 47:
-#line 270 "parse-gram.y"
-{;}
-    break;
-case 48:
-#line 272 "parse-gram.y"
-{;}
+
+  case 58:
+#line 373 "parse-gram.y"
+    { current_lhs = yyvsp[-1].symbol; current_lhs_location = yylsp[-1]; }

     break;
     break;

-case 51:
-#line 281 "parse-gram.y"
-{ current_lhs = yyvsp[-1].symbol; }
+
+  case 59:
+#line 374 "parse-gram.y"
+    {;}

     break;
     break;

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

     break;
     break;

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

     break;
     break;

-case 54:
-#line 287 "parse-gram.y"
-{ grammar_rule_end (); }
+
+  case 62:
+#line 384 "parse-gram.y"
+    { grammar_rule_begin (current_lhs, current_lhs_location); }

     break;
     break;

-case 55:
-#line 292 "parse-gram.y"
-{ grammar_rule_begin (current_lhs); }
+
+  case 63:
+#line 386 "parse-gram.y"
+    { grammar_current_rule_symbol_append (yyvsp[0].symbol, yylsp[0]); }

     break;
     break;

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

     break;
     break;

-case 57:
-#line 296 "parse-gram.y"
-{ grammar_current_rule_action_append (yyvsp[0].string, yylsp[0].first_line); }
+
+  case 65:
+#line 390 "parse-gram.y"
+    { grammar_current_rule_prec_set (yyvsp[0].symbol, yylsp[0]); }

     break;
     break;

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

     break;
     break;

-case 59:
-#line 302 "parse-gram.y"
-{ yyval.symbol = yyvsp[0].symbol; }
+
+  case 67:
+#line 394 "parse-gram.y"
+    { grammar_current_rule_merge_set (yyvsp[0].struniq, yylsp[0]); }

     break;
     break;

-case 60:
-#line 303 "parse-gram.y"
-{ yyval.symbol = yyvsp[0].symbol; }
+
+  case 68:
+#line 398 "parse-gram.y"
+    { yyval.symbol = yyvsp[0].symbol; }

     break;
     break;

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

     break;
     break;

-case 62:
-#line 309 "parse-gram.y"
-{ yyval.string = yyvsp[0].string; }
+
+  case 70:
+#line 404 "parse-gram.y"
+    { yyval.string = yyvsp[0].string; }

     break;
     break;

-case 63:
-#line 315 "parse-gram.y"
-{
-      yyval.symbol = getsym (yyvsp[0].string);
-      symbol_class_set (yyval.symbol, token_sym);
+
+  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]);

     }
     break;
     }
     break;

-case 64:
-#line 324 "parse-gram.y"
-{
+
+  case 72:
+#line 419 "parse-gram.y"
+    {

       yyval.string = yyvsp[0].string + 1;
       yyval.string[strlen (yyval.string) - 1] = '\0';
     }
     break;
       yyval.string = yyvsp[0].string + 1;
       yyval.string[strlen (yyval.string) - 1] = '\0';
     }
     break;

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

     }
     break;
     }
     break;

-case 66:
-#line 336 "parse-gram.y"
-{
-      yyval.string = yyvsp[0].string;
+
+  case 75:
+#line 437 "parse-gram.y"
+    {
+      epilogue_augment (yyvsp[0].string, yylsp[0]);
+      scanner_last_string_free ();

     }
     break;
     }
     break;

-}

 
 

-#line 705 "/usr/share/bison/bison.simple"

 
 

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

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

-#if YYLSP_NEEDED

   yylsp -= yylen;
   yylsp -= yylen;

-#endif

 
 #if YYDEBUG
   if (yydebug)
 
 #if YYDEBUG
   if (yydebug)


@@ -1367,9 +1651,7 @@ case 66:
 #endif
 
   *++yyvsp = yyval;
 #endif
 
   *++yyvsp = yyval;

-#if YYLSP_NEEDED

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

-#endif

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


@@ -1377,11 +1659,11 @@ case 66:
 
   yyn = yyr1[yyn];
 
 
   yyn = yyr1[yyn];
 

-  yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
-  if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
+  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)

     yystate = yytable[yystate];
   else
     yystate = yytable[yystate];
   else

-    yystate = yydefgoto[yyn - YYNTBASE];
+    yystate = yydefgoto[yyn - YYNTOKENS];

 
   goto yynewstate;
 
 
   goto yynewstate;
 


@@ -1394,13 +1676,13 @@ yyerrlab:
   if (!yyerrstatus)
     {
       ++yynerrs;
   if (!yyerrstatus)
     {
       ++yynerrs;

-
-#ifdef YYERROR_VERBOSE
+#if YYERROR_VERBOSE

       yyn = yypact[yystate];
 
       yyn = yypact[yystate];
 

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

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

+         int yytype = YYTRANSLATE (yychar);

          char *yymsg;
          int yyx, yycount;
 
          char *yymsg;
          int yyx, yycount;
 


@@ -1409,15 +1691,15 @@ yyerrlab:
             YYCHECK.  */
          for (yyx = yyn < 0 ? -yyn : 0;
               yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
             YYCHECK.  */
          for (yyx = yyn < 0 ? -yyn : 0;
               yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)

-           if (yycheck[yyx + yyn] == yyx)
+           if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)

              yysize += yystrlen (yytname[yyx]) + 15, yycount++;
              yysize += yystrlen (yytname[yyx]) + 15, yycount++;

-         yysize += yystrlen ("parse error, unexpected ") + 1;
-         yysize += yystrlen (yytname[YYTRANSLATE (yychar)]);
+         yysize += yystrlen ("syntax error, unexpected ") + 1;
+         yysize += yystrlen (yytname[yytype]);

          yymsg = (char *) YYSTACK_ALLOC (yysize);
          if (yymsg != 0)
            {
          yymsg = (char *) YYSTACK_ALLOC (yysize);
          if (yymsg != 0)
            {

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

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


@@ -1425,7 +1707,7 @@ yyerrlab:
                  for (yyx = yyn < 0 ? -yyn : 0;
                       yyx < (int) (sizeof (yytname) / sizeof (char *));
                       yyx++)
                  for (yyx = yyn < 0 ? -yyn : 0;
                       yyx < (int) (sizeof (yytname) / sizeof (char *));
                       yyx++)

-                   if (yycheck[yyx + yyn] == yyx)
+                   if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)

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


@@ -1437,102 +1719,84 @@ yyerrlab:
              YYSTACK_FREE (yymsg);
            }
          else
              YYSTACK_FREE (yymsg);
            }
          else

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

        }
       else
        }
       else

-#endif /* defined (YYERROR_VERBOSE) */
-       yyerror ("parse error");
+#endif /* YYERROR_VERBOSE */
+       yyerror ("syntax error");

     }
   goto yyerrlab1;
 
 
     }
   goto yyerrlab1;
 
 

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

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

-      /* return failure if at end of input */
-      if (yychar == YYEOF)
-       YYABORT;
-      YYDPRINTF ((stderr, "Discarding token %d (%s).\n",
-                 yychar, yytname[yychar1]));
-      yychar = YYEMPTY;
+      /* Return failure if at end of input.  */
+      if (yytoken == 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;
+        }
+
+      YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
+      yydestruct (yytoken, &yylval, &yylloc);
+      yytoken = YYEMPTY;

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

-  yyerrstatus = 3;             /* Each real token shifted decrements this */
-
-  goto yyerrhandle;
-
+  yyerrstatus = 3;     /* Each real token shifted decrements this.  */

 
 

-/*-------------------------------------------------------------------.
-| yyerrdefault -- current state does not do anything special for the |
-| error token.                                                       |
-`-------------------------------------------------------------------*/
-yyerrdefault:
-#if 0
-  /* This is wrong; only states that explicitly want error tokens
-     should shift them.  */
-
-  /* If its default is to accept any token, ok.  Otherwise pop it.  */
-  yyn = yydefact[yystate];
-  if (yyn)
-    goto yydefault;
-#endif
+  for (;;)
+    {
+      yyn = yypact[yystate];
+      if (yyn != YYPACT_NINF)
+       {
+         yyn += YYTERROR;
+         if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+           {
+             yyn = yytable[yyn];
+             if (0 < yyn)
+               break;
+           }
+       }

 
 

+      /* Pop the current state because it cannot handle the error token.  */
+      if (yyssp == yyss)
+       YYABORT;

 
 

-/*---------------------------------------------------------------.
-| yyerrpop -- pop the current state because it cannot handle the |
-| error token                                                    |
-`---------------------------------------------------------------*/
-yyerrpop:
-  if (yyssp == yyss)
-    YYABORT;
-  yyvsp--;
-  yystate = *--yyssp;
-#if YYLSP_NEEDED
-  yylsp--;
-#endif
+      YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
+      yydestruct (yystos[yystate], yyvsp, yylsp);
+      yyvsp--;
+      yystate = *--yyssp;
+      yylsp--;

 
 #if YYDEBUG
 
 #if YYDEBUG

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

 #endif
 #endif

-
-/*--------------.
-| yyerrhandle.  |
-`--------------*/
-yyerrhandle:
-  yyn = yypact[yystate];
-  if (yyn == YYFLAG)
-    goto yyerrdefault;
-
-  yyn += YYTERROR;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
-    goto yyerrdefault;
-
-  yyn = yytable[yyn];
-  if (yyn < 0)
-    {
-      if (yyn == YYFLAG)
-       goto yyerrpop;
-      yyn = -yyn;
-      goto yyreduce;

     }
     }

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

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


@@ -1540,9 +1804,7 @@ yyerrhandle:
   YYDPRINTF ((stderr, "Shifting error token, "));
 
   *++yyvsp = yylval;
   YYDPRINTF ((stderr, "Shifting error token, "));
 
   *++yyvsp = yylval;

-#if YYLSP_NEEDED

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

-#endif

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


@@ -1562,13 +1824,15 @@ yyabortlab:
   yyresult = 1;
   goto yyreturn;
 
   yyresult = 1;
   goto yyreturn;
 

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

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

+#endif

 
 yyreturn:
 #ifndef yyoverflow
 
 yyreturn:
 #ifndef yyoverflow


@@ -1577,7 +1841,9 @@ yyreturn:
 #endif
   return yyresult;
 }
 #endif
   return yyresult;
 }

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

 
 /*------------------------------------------------------------------.
 | When debugging the parser, display tokens' locations and values.  |
 
 /*------------------------------------------------------------------.
 | When debugging the parser, display tokens' locations and values.  |


@@ -1585,17 +1851,11 @@ yyreturn:
 
 static void
 yyprint (FILE *file,
 
 static void
 yyprint (FILE *file,

-         const location_t *loc, int type, const yystype *value)
+         int type, const yystype *value)

 {
 {

-  fputs (" (", file);
-  LOCATION_PRINT (file, *loc);
-  fputs (")", file);
+  fputc (' ', file);

   switch (type)
     {
   switch (type)
     {

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

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


@@ -1609,7 +1869,7 @@ yyprint (FILE *file,
       break;
 
     case TYPE:
       break;
 
     case TYPE:

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

       break;
 
     case BRACED_CODE:
       break;
 
     case BRACED_CODE:


@@ -1617,13 +1877,16 @@ yyprint (FILE *file,
     case EPILOGUE:
       fprintf (file, " = {{ %s }}", value->string);
       break;
     case EPILOGUE:
       fprintf (file, " = {{ %s }}", value->string);
       break;

+
+    default:
+      fprintf (file, "unknown token type");
+      break;

     }
 }
 
 void
     }
 }
 
 void

-gram_error (gram_control_t *control ATTRIBUTE_UNUSED,
-           location_t *yylloc, const char *msg)
+gram_error (location_t *yylloc, const char *msg)

 {
 {

-  LOCATION_PRINT (stderr, *yylloc);
-  fprintf (stderr, ": %s\n", msg);
+  complain_at (*yylloc, "%s", msg);

 }
 }

+