Merge remote-tracking branch 'origin/maint'

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

diff --git a/src/parse-gram.h b/src/parse-gram.h
index ffe1ac4a23304d18909b1419c30498ff6d7d0334..b64cfa4fcfc18ab68af6793c17a7881ce6365124 100644 (file)
--- a/src/parse-gram.h
+++ b/src/parse-gram.h
@@ -48,10 +48,8 @@
 extern int gram_debug;
 #endif
 /* "%code requires" blocks.  */
-#line 219 "src/parse-gram.y" /* yacc.c:1931  */
+#line 218 "src/parse-gram.y" /* yacc.c:1931  */
 
-# ifndef PARAM_TYPE
-#  define PARAM_TYPE
   typedef enum
   {
     param_none   = 0,
@@ -59,10 +57,11 @@ extern int gram_debug;
     param_parse  = 1 << 1,
     param_both   = param_lex | param_parse
   } param_type;
-# endif
 
+#line 649 "src/parse-gram.y" /* yacc.c:1931  */
+#include "muscle-tab.h"
 
-#line 66 "src/parse-gram.h" /* yacc.c:1931  */
+#line 65 "src/parse-gram.h" /* yacc.c:1931  */
 
 /* Token type.  */
 #ifndef GRAM_TOKENTYPE
@@ -71,57 +70,57 @@ extern int gram_debug;
   {
     GRAM_EOF = 0,
     STRING = 258,
-    INT = 259,
-    PERCENT_TOKEN = 260,
-    PERCENT_NTERM = 261,
-    PERCENT_TYPE = 262,
-    PERCENT_DESTRUCTOR = 263,
-    PERCENT_PRINTER = 264,
-    PERCENT_LEFT = 265,
-    PERCENT_RIGHT = 266,
-    PERCENT_NONASSOC = 267,
-    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_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,
-    BRACED_PREDICATE = 296,
-    BRACKETED_ID = 297,
-    CHAR = 298,
-    EPILOGUE = 299,
-    EQUAL = 300,
-    ID = 301,
-    ID_COLON = 302,
-    PERCENT_PERCENT = 303,
-    PIPE = 304,
-    PROLOGUE = 305,
-    SEMICOLON = 306,
-    TAG = 307,
-    TAG_ANY = 308,
-    TAG_NONE = 309,
+    PERCENT_TOKEN = 259,
+    PERCENT_NTERM = 260,
+    PERCENT_TYPE = 261,
+    PERCENT_DESTRUCTOR = 262,
+    PERCENT_PRINTER = 263,
+    PERCENT_LEFT = 264,
+    PERCENT_RIGHT = 265,
+    PERCENT_NONASSOC = 266,
+    PERCENT_PRECEDENCE = 267,
+    PERCENT_PREC = 268,
+    PERCENT_DPREC = 269,
+    PERCENT_MERGE = 270,
+    PERCENT_CODE = 271,
+    PERCENT_DEFAULT_PREC = 272,
+    PERCENT_DEFINE = 273,
+    PERCENT_DEFINES = 274,
+    PERCENT_ERROR_VERBOSE = 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_NAME_PREFIX = 283,
+    PERCENT_NO_DEFAULT_PREC = 284,
+    PERCENT_NO_LINES = 285,
+    PERCENT_NONDETERMINISTIC_PARSER = 286,
+    PERCENT_OUTPUT = 287,
+    PERCENT_REQUIRE = 288,
+    PERCENT_SKELETON = 289,
+    PERCENT_START = 290,
+    PERCENT_TOKEN_TABLE = 291,
+    PERCENT_VERBOSE = 292,
+    PERCENT_YACC = 293,
+    BRACED_CODE = 294,
+    BRACED_PREDICATE = 295,
+    BRACKETED_ID = 296,
+    CHAR = 297,
+    EPILOGUE = 298,
+    EQUAL = 299,
+    ID = 300,
+    ID_COLON = 301,
+    PERCENT_PERCENT = 302,
+    PIPE = 303,
+    PROLOGUE = 304,
+    SEMICOLON = 305,
+    TAG = 306,
+    TAG_ANY = 307,
+    TAG_NONE = 308,
+    INT = 309,
     PERCENT_PARAM = 310,
     PERCENT_UNION = 311,
     PERCENT_EMPTY = 312
@@ -133,26 +132,39 @@ extern int gram_debug;
 typedef union GRAM_STYPE GRAM_STYPE;
 union GRAM_STYPE
 {
-#line 105 "src/parse-gram.y" /* yacc.c:1931  */
+#line 170 "src/parse-gram.y" /* yacc.c:1931  */
+unsigned char character;
+#line 177 "src/parse-gram.y" /* yacc.c:1931  */
 
-  assoc assoc;
   char *code;
   char const *chars;
-  int integer;
-  named_ref *named_ref;
-  symbol *symbol;
-  symbol_list *list;
-  uniqstr uniqstr;
-  unsigned char character;
 
-#line 243 "src/parse-gram.y" /* yacc.c:1931  */
+#line 188 "src/parse-gram.y" /* yacc.c:1931  */
+uniqstr uniqstr;
+#line 196 "src/parse-gram.y" /* yacc.c:1931  */
+int integer;
+#line 200 "src/parse-gram.y" /* yacc.c:1931  */
+symbol *symbol;
+#line 205 "src/parse-gram.y" /* yacc.c:1931  */
+assoc assoc;
+#line 208 "src/parse-gram.y" /* yacc.c:1931  */
+symbol_list *list;
+#line 211 "src/parse-gram.y" /* yacc.c:1931  */
+named_ref *named_ref;
+#line 238 "src/parse-gram.y" /* yacc.c:1931  */
+param_type param;
+#line 413 "src/parse-gram.y" /* yacc.c:1931  */
+code_props_type code_type;
+#line 651 "src/parse-gram.y" /* yacc.c:1931  */
 
-  param_type param;
+  struct
+  {
+    char const *chars;
+    muscle_kind kind;
+  } value;
 
-#line 419 "src/parse-gram.y" /* yacc.c:1931  */
-code_props_type code_type;
 
-#line 156 "src/parse-gram.h" /* yacc.c:1931  */
+#line 168 "src/parse-gram.h" /* yacc.c:1931  */
 };
 # define GRAM_STYPE_IS_TRIVIAL 1
 # define GRAM_STYPE_IS_DECLARED 1