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 a43fe4ebad92f93def37020323eed0cafb003b4e..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.388-53f03.  */
+/* 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
 
    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


@@ -31,6 +30,34 @@
    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.  */
 

+#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 1996 of yacc.c  */
+#line 221 "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 1996 of yacc.c  */
+#line 60 "src/parse-gram.h"
+

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


@@ -64,20 +91,20 @@
      PERCENT_GLR_PARSER = 281,
      PERCENT_INITIAL_ACTION = 282,
      PERCENT_LANGUAGE = 283,
      PERCENT_GLR_PARSER = 281,
      PERCENT_INITIAL_ACTION = 282,
      PERCENT_LANGUAGE = 283,

-     PERCENT_LEX_PARAM = 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_REQUIRE = 291,
-     PERCENT_SKELETON = 292,
-     PERCENT_START = 293,
-     PERCENT_TOKEN_TABLE = 294,
-     PERCENT_VERBOSE = 295,
-     PERCENT_YACC = 296,
-     BRACED_CODE = 297,
+     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,
      CHAR = 298,
      EPILOGUE = 299,
      EQUAL = 300,


@@ -90,7 +117,7 @@
      TAG = 307,
      TAG_ANY = 308,
      TAG_NONE = 309,
      TAG = 307,
      TAG_ANY = 308,
      TAG_NONE = 309,

-     BRACKETED_ID = 310,
+     PERCENT_PARAM = 310,

      PERCENT_UNION = 311
    };
 #endif
      PERCENT_UNION = 311
    };
 #endif


@@ -122,20 +149,20 @@
 #define PERCENT_GLR_PARSER 281
 #define PERCENT_INITIAL_ACTION 282
 #define PERCENT_LANGUAGE 283
 #define PERCENT_GLR_PARSER 281
 #define PERCENT_INITIAL_ACTION 282
 #define PERCENT_LANGUAGE 283

-#define PERCENT_LEX_PARAM 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_REQUIRE 291
-#define PERCENT_SKELETON 292
-#define PERCENT_START 293
-#define PERCENT_TOKEN_TABLE 294
-#define PERCENT_VERBOSE 295
-#define PERCENT_YACC 296
-#define BRACED_CODE 297
+#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 BRACED_PREDICATE 296
+#define BRACKETED_ID 297

 #define CHAR 298
 #define EPILOGUE 299
 #define EQUAL 300
 #define CHAR 298
 #define EPILOGUE 299
 #define EQUAL 300


@@ -148,39 +175,41 @@
 #define TAG 307
 #define TAG_ANY 308
 #define TAG_NONE 309
 #define TAG 307
 #define TAG_ANY 308
 #define TAG_NONE 309

-#define BRACKETED_ID 310
+#define PERCENT_PARAM 310

 #define PERCENT_UNION 311
 
 
 
 #define PERCENT_UNION 311
 
 
 

-

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

-/* Line 1609 of yacc.c  */
-#line 94 "parse-gram.y"
+/* Line 1996 of yacc.c  */
+#line 107 "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 const *chars;
-  char *code;
-  assoc assoc;

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

-  named_ref *named_ref;

 
 

+/* Line 1996 of yacc.c  */
+#line 245 "src/parse-gram.y"
+
+  param_type param;

 
 

-/* Line 1609 of yacc.c  */
-#line 176 "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
 
 } 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
 {
 #if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
 typedef struct YYLTYPE
 {


@@ -194,5 +223,21 @@ typedef struct YYLTYPE
 # define YYLTYPE_IS_TRIVIAL 1
 #endif
 
 # 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  */