Rearrange initialization of the parser state variables so that the

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

diff --git a/src/parse-gram.h b/src/parse-gram.h
index e40c420929497a1d36996c5684858c9db9f55581..d55903ac93e59690882c1a4027d604e7484c042c 100644 (file)
--- a/src/parse-gram.h
+++ b/src/parse-gram.h
@@ -48,25 +48,25 @@
      PERCENT_TYPE = 262,
      PERCENT_DESTRUCTOR = 263,
      PERCENT_PRINTER = 264,
-     PERCENT_SYMBOL_DEFAULT = 265,
-     PERCENT_LEFT = 266,
-     PERCENT_RIGHT = 267,
-     PERCENT_NONASSOC = 268,
-     PERCENT_PREC = 269,
-     PERCENT_DPREC = 270,
-     PERCENT_MERGE = 271,
-     PERCENT_CODE = 272,
-     PERCENT_CODE_TOP = 273,
-     PERCENT_DEBUG = 274,
-     PERCENT_DEFAULT_PREC = 275,
-     PERCENT_DEFINE = 276,
-     PERCENT_DEFINES = 277,
-     PERCENT_ERROR_VERBOSE = 278,
-     PERCENT_EXPECT = 279,
-     PERCENT_EXPECT_RR = 280,
-     PERCENT_FILE_PREFIX = 281,
-     PERCENT_GLR_PARSER = 282,
-     PERCENT_INITIAL_ACTION = 283,
+     PERCENT_LEFT = 265,
+     PERCENT_RIGHT = 266,
+     PERCENT_NONASSOC = 267,
+     PERCENT_PREC = 268,
+     PERCENT_DPREC = 269,
+     PERCENT_MERGE = 270,
+     PERCENT_CODE = 271,
+     PERCENT_CODE_TOP = 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_FILE_PREFIX = 280,
+     PERCENT_GLR_PARSER = 281,
+     PERCENT_INITIAL_ACTION = 282,
+     PERCENT_LANGUAGE = 283,
      PERCENT_LEX_PARAM = 284,
      PERCENT_LOCATIONS = 285,
      PERCENT_NAME_PREFIX = 286,
@@ -96,7 +96,9 @@
      PROLOGUE = 310,
      SEMICOLON = 311,
      TYPE = 312,
-     PERCENT_UNION = 313
+     TYPE_TAG_ANY = 313,
+     TYPE_TAG_NONE = 314,
+     PERCENT_UNION = 315
    };
 #endif
 /* Tokens.  */
@@ -108,25 +110,25 @@
 #define PERCENT_TYPE 262
 #define PERCENT_DESTRUCTOR 263
 #define PERCENT_PRINTER 264
-#define PERCENT_SYMBOL_DEFAULT 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_CODE 272
-#define PERCENT_CODE_TOP 273
-#define PERCENT_DEBUG 274
-#define PERCENT_DEFAULT_PREC 275
-#define PERCENT_DEFINE 276
-#define PERCENT_DEFINES 277
-#define PERCENT_ERROR_VERBOSE 278
-#define PERCENT_EXPECT 279
-#define PERCENT_EXPECT_RR 280
-#define PERCENT_FILE_PREFIX 281
-#define PERCENT_GLR_PARSER 282
-#define PERCENT_INITIAL_ACTION 283
+#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_CODE 271
+#define PERCENT_CODE_TOP 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_FILE_PREFIX 280
+#define PERCENT_GLR_PARSER 281
+#define PERCENT_INITIAL_ACTION 282
+#define PERCENT_LANGUAGE 283
 #define PERCENT_LEX_PARAM 284
 #define PERCENT_LOCATIONS 285
 #define PERCENT_NAME_PREFIX 286
@@ -156,7 +158,9 @@
 #define PROLOGUE 310
 #define SEMICOLON 311
 #define TYPE 312
-#define PERCENT_UNION 313
+#define TYPE_TAG_ANY 313
+#define TYPE_TAG_NONE 314
+#define PERCENT_UNION 315
 
 
 
@@ -164,20 +168,21 @@
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {
-/* Line 1535 of yacc.c  */
-#line 98 "parse-gram.y"
+/* Line 1487 of yacc.c  */
+#line 97 "parse-gram.y"
 
   symbol *symbol;
   symbol_list *list;
   int integer;
-  char *chars;
+  char const *chars;
+  char *code;
   assoc assoc;
   uniqstr uniqstr;
   unsigned char character;
 }
 
-/* Line 1535 of yacc.c  */
-#line 181 "parse-gram.h"
+/* Line 1487 of yacc.c  */
+#line 186 "parse-gram.h"
        YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -201,3 +206,5 @@ typedef struct YYLTYPE
 
 
 
+
+