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 7fcaa05fea16292db5cb774f0591c81d5c077f3f..9c807e1a7559f8852906e72cdf43751f061c72d7 100644 (file)
--- a/src/parse-gram.h
+++ b/src/parse-gram.h
@@ -1,9 +1,8 @@
-/* A Bison parser, made by GNU Bison 2.4.404-c6ab.  */
+/* A Bison parser, made by GNU Bison 2.5.1.779-71bff.  */
 
-/* Interface for Bison's Yacc-like parsers in C
+/* Bison interface for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2012 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
@@ -30,9 +29,19 @@
 
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
+
+#ifndef GRAM_______SRC_PARSE_GRAM_H
+# define GRAM_______SRC_PARSE_GRAM_H
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 1
+#endif
+#if YYDEBUG
+extern int gram_debug;
+#endif
 /* "%code requires" blocks.  */
-/* Line 1616 of yacc.c  */
-#line 201 "src/parse-gram.y"
+/* Line 1996 of yacc.c  */
+#line 221 "src/parse-gram.y"
 
 # ifndef PARAM_TYPE
 #  define PARAM_TYPE
@@ -46,8 +55,8 @@
 # endif
 
 
-/* Line 1616 of yacc.c  */
-#line 51 "src/parse-gram.h"
+/* Line 1996 of yacc.c  */
+#line 60 "src/parse-gram.h"
 
 /* Tokens.  */
 #ifndef YYTOKENTYPE
@@ -94,21 +103,22 @@
      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
+     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_PARAM = 310,
+     PERCENT_UNION = 311
    };
 #endif
 /* Tokens.  */
@@ -151,30 +161,30 @@
 #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
-
+#define BRACED_PREDICATE 296
+#define BRACKETED_ID 297
+#define CHAR 298
+#define EPILOGUE 299
+#define EQUAL 300
+#define ID 301
+#define ID_COLON 302
+#define PERCENT_PERCENT 303
+#define PIPE 304
+#define PROLOGUE 305
+#define SEMICOLON 306
+#define TAG 307
+#define TAG_ANY 308
+#define TAG_NONE 309
+#define PERCENT_PARAM 310
+#define PERCENT_UNION 311
 
 
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {
-/* Line 1616 of yacc.c  */
-#line 88 "src/parse-gram.y"
+/* Line 1996 of yacc.c  */
+#line 107 "src/parse-gram.y"
 
   assoc assoc;
   char *code;
@@ -186,22 +196,20 @@ typedef union YYSTYPE
   uniqstr uniqstr;
   unsigned char character;
 
-/* Line 1616 of yacc.c  */
-#line 225 "src/parse-gram.y"
+/* Line 1996 of yacc.c  */
+#line 245 "src/parse-gram.y"
 
   param_type param;
 
 
-/* Line 1616 of yacc.c  */
-#line 197 "src/parse-gram.h"
+/* Line 1996 of yacc.c  */
+#line 207 "src/parse-gram.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 #endif
 
-
-
 #if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
 typedef struct YYLTYPE
 {
@@ -215,5 +223,21 @@ typedef struct YYLTYPE
 # define YYLTYPE_IS_TRIVIAL 1
 #endif
 
+#ifdef YYPARSE_PARAM
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int gram_parse (void *YYPARSE_PARAM);
+#else
+int gram_parse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int gram_parse (void);
+#else
+int gram_parse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
 
 
+#endif /* !GRAM_______SRC_PARSE_GRAM_H  */