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 b44a8ec32a798b44b04376fd9de84ba311d8366b..53e552ae80277716c98c257919d050e2e7266eb1 100644 (file)
--- a/src/parse-gram.h
+++ b/src/parse-gram.h
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 2.4.555-5c9e.  */
+/* A Bison parser, made by GNU Bison 2.5.1.815-22b0.  */
 
 /* Bison interface for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2011 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
@@ -29,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 2001 of yacc.c  */
-#line 202 "src/parse-gram.y"
+/* Line 1996 of yacc.c  */
+#line 221 "src/parse-gram.y"
 
 # ifndef PARAM_TYPE
 #  define PARAM_TYPE
@@ -45,8 +55,8 @@
 # endif
 
 
-/* Line 2001 of yacc.c  */
-#line 50 "src/parse-gram.h"
+/* Line 1996 of yacc.c  */
+#line 60 "src/parse-gram.h"
 
 /* Tokens.  */
 #ifndef YYTOKENTYPE
@@ -170,12 +180,11 @@
 
 
 
-
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {
-/* Line 2001 of yacc.c  */
-#line 88 "src/parse-gram.y"
+/* Line 1996 of yacc.c  */
+#line 107 "src/parse-gram.y"
 
   assoc assoc;
   char *code;
@@ -187,22 +196,20 @@ typedef union YYSTYPE
   uniqstr uniqstr;
   unsigned char character;
 
-/* Line 2001 of yacc.c  */
-#line 226 "src/parse-gram.y"
+/* Line 1996 of yacc.c  */
+#line 245 "src/parse-gram.y"
 
   param_type param;
 
 
-/* Line 2001 of yacc.c  */
-#line 198 "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
 {
@@ -217,4 +224,20 @@ typedef struct YYLTYPE
 #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  */