yysyntax_error: avoid duplicate lookahead collection.

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

diff --git a/src/parse-gram.h b/src/parse-gram.h
index 54e07e6b9e018f431eaf65bf11d6ba0fae09d556..d519cdafe777936d2239a4aaa68d483e1be0f317 100644 (file)
--- a/src/parse-gram.h
+++ b/src/parse-gram.h
@@ -1,14 +1,14 @@
-/* A Bison parser, made by GNU Bison 2.3+.  */
+/* A Bison parser, made by GNU Bison 2.4.425-305c-dirty.  */

 
 

-/* Skeleton interface for Bison's Yacc-like parsers in C
+/* Interface for Bison's Yacc-like parsers in C

 
 

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

 
 

-   This program is free software; you can redistribute it and/or modify
+   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
    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.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.

 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of


@@ -16,9 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License

-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work


@@ -32,7 +30,24 @@
 
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */

+/* "%code requires" blocks.  */
+/* Line 1624 of yacc.c  */
+#line 201 "src/parse-gram.y"

 
 

+# ifndef PARAM_TYPE
+#  define PARAM_TYPE
+  typedef enum
+  {
+    param_none   = 0,
+    param_lex    = 1 << 0,
+    param_parse  = 1 << 1,
+    param_both   = param_lex | param_parse
+  } param_type;
+# endif
+
+
+/* Line 1624 of yacc.c  */
+#line 51 "src/parse-gram.h"

 
 /* Tokens.  */
 #ifndef YYTOKENTYPE
 
 /* Tokens.  */
 #ifndef YYTOKENTYPE


@@ -51,48 +66,49 @@
      PERCENT_LEFT = 265,
      PERCENT_RIGHT = 266,
      PERCENT_NONASSOC = 267,
      PERCENT_LEFT = 265,
      PERCENT_RIGHT = 266,
      PERCENT_NONASSOC = 267,

-     PERCENT_PREC = 268,
-     PERCENT_DPREC = 269,
-     PERCENT_MERGE = 270,
-     PERCENT_AFTER_DEFINITIONS = 271,
-     PERCENT_BEFORE_DEFINITIONS = 272,
-     PERCENT_DEBUG = 273,
-     PERCENT_DEFAULT_PREC = 274,
-     PERCENT_DEFINE = 275,
-     PERCENT_DEFINES = 276,
-     PERCENT_ERROR_VERBOSE = 277,
-     PERCENT_EXPECT = 278,
-     PERCENT_EXPECT_RR = 279,
+     PERCENT_PRECEDENCE = 268,
+     PERCENT_PREC = 269,
+     PERCENT_DPREC = 270,
+     PERCENT_MERGE = 271,
+     PERCENT_CODE = 272,
+     PERCENT_DEFAULT_PREC = 273,
+     PERCENT_DEFINE = 274,
+     PERCENT_DEFINES = 275,
+     PERCENT_ERROR_VERBOSE = 276,
+     PERCENT_EXPECT = 277,
+     PERCENT_EXPECT_RR = 278,
+     PERCENT_FLAG = 279,

      PERCENT_FILE_PREFIX = 280,
      PERCENT_GLR_PARSER = 281,
      PERCENT_INITIAL_ACTION = 282,
      PERCENT_FILE_PREFIX = 280,
      PERCENT_GLR_PARSER = 281,
      PERCENT_INITIAL_ACTION = 282,

-     PERCENT_LEX_PARAM = 283,
-     PERCENT_LOCATIONS = 284,
-     PERCENT_NAME_PREFIX = 285,
-     PERCENT_NO_DEFAULT_PREC = 286,
-     PERCENT_NO_LINES = 287,
-     PERCENT_NONDETERMINISTIC_PARSER = 288,
-     PERCENT_OUTPUT = 289,
-     PERCENT_PARSE_PARAM = 290,
-     PERCENT_PURE_PARSER = 291,
-     PERCENT_REQUIRE = 292,
-     PERCENT_SKELETON = 293,
-     PERCENT_START = 294,
-     PERCENT_TOKEN_TABLE = 295,
-     PERCENT_VERBOSE = 296,
-     PERCENT_YACC = 297,
-     BRACED_CODE = 298,
-     CHAR = 299,
-     EPILOGUE = 300,
-     EQUAL = 301,
-     ID = 302,
-     ID_COLON = 303,
-     PERCENT_PERCENT = 304,
-     PIPE = 305,
-     PROLOGUE = 306,
-     SEMICOLON = 307,
-     TYPE = 308,
-     PERCENT_UNION = 309
+     PERCENT_LANGUAGE = 283,
+     PERCENT_NAME_PREFIX = 284,
+     PERCENT_NO_DEFAULT_PREC = 285,
+     PERCENT_NO_LINES = 286,
+     PERCENT_NONDETERMINISTIC_PARSER = 287,
+     PERCENT_OUTPUT = 288,
+     PERCENT_REQUIRE = 289,
+     PERCENT_SKELETON = 290,
+     PERCENT_START = 291,
+     PERCENT_TOKEN_TABLE = 292,
+     PERCENT_VERBOSE = 293,
+     PERCENT_YACC = 294,
+     BRACED_CODE = 295,
+     CHAR = 296,
+     EPILOGUE = 297,
+     EQUAL = 298,
+     ID = 299,
+     ID_COLON = 300,
+     PERCENT_PERCENT = 301,
+     PIPE = 302,
+     PROLOGUE = 303,
+     SEMICOLON = 304,
+     TAG = 305,
+     TAG_ANY = 306,
+     TAG_NONE = 307,
+     BRACKETED_ID = 308,
+     PERCENT_PARAM = 309,
+     PERCENT_UNION = 310

    };
 #endif
 /* Tokens.  */
    };
 #endif
 /* Tokens.  */


@@ -107,70 +123,81 @@
 #define PERCENT_LEFT 265
 #define PERCENT_RIGHT 266
 #define PERCENT_NONASSOC 267
 #define PERCENT_LEFT 265
 #define PERCENT_RIGHT 266
 #define PERCENT_NONASSOC 267

-#define PERCENT_PREC 268
-#define PERCENT_DPREC 269
-#define PERCENT_MERGE 270
-#define PERCENT_AFTER_DEFINITIONS 271
-#define PERCENT_BEFORE_DEFINITIONS 272
-#define PERCENT_DEBUG 273
-#define PERCENT_DEFAULT_PREC 274
-#define PERCENT_DEFINE 275
-#define PERCENT_DEFINES 276
-#define PERCENT_ERROR_VERBOSE 277
-#define PERCENT_EXPECT 278
-#define PERCENT_EXPECT_RR 279
+#define PERCENT_PRECEDENCE 268
+#define PERCENT_PREC 269
+#define PERCENT_DPREC 270
+#define PERCENT_MERGE 271
+#define PERCENT_CODE 272
+#define PERCENT_DEFAULT_PREC 273
+#define PERCENT_DEFINE 274
+#define PERCENT_DEFINES 275
+#define PERCENT_ERROR_VERBOSE 276
+#define PERCENT_EXPECT 277
+#define PERCENT_EXPECT_RR 278
+#define PERCENT_FLAG 279

 #define PERCENT_FILE_PREFIX 280
 #define PERCENT_GLR_PARSER 281
 #define PERCENT_INITIAL_ACTION 282
 #define PERCENT_FILE_PREFIX 280
 #define PERCENT_GLR_PARSER 281
 #define PERCENT_INITIAL_ACTION 282

-#define PERCENT_LEX_PARAM 283
-#define PERCENT_LOCATIONS 284
-#define PERCENT_NAME_PREFIX 285
-#define PERCENT_NO_DEFAULT_PREC 286
-#define PERCENT_NO_LINES 287
-#define PERCENT_NONDETERMINISTIC_PARSER 288
-#define PERCENT_OUTPUT 289
-#define PERCENT_PARSE_PARAM 290
-#define PERCENT_PURE_PARSER 291
-#define PERCENT_REQUIRE 292
-#define PERCENT_SKELETON 293
-#define PERCENT_START 294
-#define PERCENT_TOKEN_TABLE 295
-#define PERCENT_VERBOSE 296
-#define PERCENT_YACC 297
-#define BRACED_CODE 298
-#define CHAR 299
-#define EPILOGUE 300
-#define EQUAL 301
-#define ID 302
-#define ID_COLON 303
-#define PERCENT_PERCENT 304
-#define PIPE 305
-#define PROLOGUE 306
-#define SEMICOLON 307
-#define TYPE 308
-#define PERCENT_UNION 309
+#define PERCENT_LANGUAGE 283
+#define PERCENT_NAME_PREFIX 284
+#define PERCENT_NO_DEFAULT_PREC 285
+#define PERCENT_NO_LINES 286
+#define PERCENT_NONDETERMINISTIC_PARSER 287
+#define PERCENT_OUTPUT 288
+#define PERCENT_REQUIRE 289
+#define PERCENT_SKELETON 290
+#define PERCENT_START 291
+#define PERCENT_TOKEN_TABLE 292
+#define PERCENT_VERBOSE 293
+#define PERCENT_YACC 294
+#define BRACED_CODE 295
+#define CHAR 296
+#define EPILOGUE 297
+#define EQUAL 298
+#define ID 299
+#define ID_COLON 300
+#define PERCENT_PERCENT 301
+#define PIPE 302
+#define PROLOGUE 303
+#define SEMICOLON 304
+#define TAG 305
+#define TAG_ANY 306
+#define TAG_NONE 307
+#define BRACKETED_ID 308
+#define PERCENT_PARAM 309
+#define PERCENT_UNION 310

 
 
 
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 
 
 
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE

-#line 97 "parse-gram.y"

 {
 {

+/* Line 1624 of yacc.c  */
+#line 88 "src/parse-gram.y"
+
+  assoc assoc;
+  char *code;
+  char const *chars;
+  int integer;
+  named_ref *named_ref;

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

-  int integer;
-  char *chars;
-  assoc assoc;

   uniqstr uniqstr;
   unsigned char character;
   uniqstr uniqstr;
   unsigned char character;

-}
-/* Line 1544 of yacc.c.  */
-#line 170 "parse-gram.h"
-       YYSTYPE;
+
+/* Line 1624 of yacc.c  */
+#line 225 "src/parse-gram.y"
+
+  param_type param;
+
+
+/* Line 1624 of yacc.c  */
+#line 197 "src/parse-gram.h"
+} YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1

 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1

-# define YYSTYPE_IS_TRIVIAL 1

 #endif
 
 
 #endif