Minor code cleanup.

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

diff --git a/src/parse-gram.h b/src/parse-gram.h
index 7a64824b2a98f5a30dbc7ff6ee5b0013ee0fa8f2..894b5dd45fc1d5e2f125ddfcefb3e22ca5c832ce 100644 (file)
--- a/src/parse-gram.h
+++ b/src/parse-gram.h
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 2.4.305-d937.  */
+/* A Bison parser, made by GNU Bison 2.4.434-7439c.  */
 
 /* Interface for Bison's Yacc-like parsers in C
 
@@ -30,6 +30,24 @@
 
    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 202 "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
@@ -56,27 +74,27 @@
      PERCENT_DEFAULT_PREC = 273,
      PERCENT_DEFINE = 274,
      PERCENT_DEFINES = 275,
-     PERCENT_EXPECT = 276,
-     PERCENT_EXPECT_RR = 277,
-     PERCENT_FLAG = 278,
-     PERCENT_FILE_PREFIX = 279,
-     PERCENT_GLR_PARSER = 280,
-     PERCENT_INITIAL_ACTION = 281,
-     PERCENT_LANGUAGE = 282,
-     PERCENT_LEX_PARAM = 283,
+     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_LANGUAGE = 283,
      PERCENT_NAME_PREFIX = 284,
      PERCENT_NO_DEFAULT_PREC = 285,
      PERCENT_NO_LINES = 286,
      PERCENT_NONDETERMINISTIC_PARSER = 287,
      PERCENT_OUTPUT = 288,
-     PERCENT_PARSE_PARAM = 289,
-     PERCENT_REQUIRE = 290,
-     PERCENT_SKELETON = 291,
-     PERCENT_START = 292,
-     PERCENT_TOKEN_TABLE = 293,
-     PERCENT_VERBOSE = 294,
-     PERCENT_YACC = 295,
-     BRACED_CODE = 296,
+     PERCENT_REQUIRE = 289,
+     PERCENT_SKELETON = 290,
+     PERCENT_START = 291,
+     PERCENT_TOKEN_TABLE = 292,
+     PERCENT_VERBOSE = 293,
+     PERCENT_YACC = 294,
+     BRACED_CODE = 295,
+     BRACKETED_ID = 296,
      CHAR = 297,
      EPILOGUE = 298,
      EQUAL = 299,
@@ -89,7 +107,8 @@
      TAG = 306,
      TAG_ANY = 307,
      TAG_NONE = 308,
-     PERCENT_UNION = 309
+     PERCENT_PARAM = 309,
+     PERCENT_UNION = 310
    };
 #endif
 /* Tokens.  */
@@ -112,27 +131,27 @@
 #define PERCENT_DEFAULT_PREC 273
 #define PERCENT_DEFINE 274
 #define PERCENT_DEFINES 275
-#define PERCENT_EXPECT 276
-#define PERCENT_EXPECT_RR 277
-#define PERCENT_FLAG 278
-#define PERCENT_FILE_PREFIX 279
-#define PERCENT_GLR_PARSER 280
-#define PERCENT_INITIAL_ACTION 281
-#define PERCENT_LANGUAGE 282
-#define PERCENT_LEX_PARAM 283
+#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_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_PARSE_PARAM 289
-#define PERCENT_REQUIRE 290
-#define PERCENT_SKELETON 291
-#define PERCENT_START 292
-#define PERCENT_TOKEN_TABLE 293
-#define PERCENT_VERBOSE 294
-#define PERCENT_YACC 295
-#define BRACED_CODE 296
+#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 BRACKETED_ID 296
 #define CHAR 297
 #define EPILOGUE 298
 #define EQUAL 299
@@ -145,7 +164,8 @@
 #define TAG 306
 #define TAG_ANY 307
 #define TAG_NONE 308
-#define PERCENT_UNION 309
+#define PERCENT_PARAM 309
+#define PERCENT_UNION 310
 
 
 
@@ -153,21 +173,27 @@
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {
-/* Line 1663 of yacc.c  */
-#line 92 "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;
-  int integer;
-  char const *chars;
-  char *code;
-  assoc assoc;
   uniqstr uniqstr;
   unsigned char character;
 
+/* Line 1624 of yacc.c  */
+#line 226 "src/parse-gram.y"
+
+  param_type param;
+
 
-/* Line 1663 of yacc.c  */
-#line 171 "src/parse-gram.h"
+/* Line 1624 of yacc.c  */
+#line 197 "src/parse-gram.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */