Fix unexpanded macros in GLR defines file.

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

diff --git a/src/parse-gram.h b/src/parse-gram.h
index e9e27ac914486647122d35b5e4924a59bfca7abc..5094ef8cf112ed934c74fff65b7d6b80fd8a1126 100644 (file)
--- a/src/parse-gram.h
+++ b/src/parse-gram.h
@@ -1,20 +1,20 @@
-/* A Bison parser, made by GNU Bison 2.4.79-c85be.  */
+/* A Bison parser, made by GNU Bison 2.4.170-dd704.  */

 
 /* Interface for Bison's Yacc-like parsers in C
 
 /* Interface for Bison's Yacc-like parsers in C

-   
+

    Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
    2007, 2008 Free Software Foundation, Inc.
    Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
    2007, 2008 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
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
    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
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.

-   
+

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

-   
+

    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 


@@ -27,7 +27,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.

-   
+

    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.  */
 


@@ -89,9 +89,9 @@
      PIPE = 306,
      PROLOGUE = 307,
      SEMICOLON = 308,
      PIPE = 306,
      PROLOGUE = 307,
      SEMICOLON = 308,

-     TYPE = 309,
-     TYPE_TAG_ANY = 310,
-     TYPE_TAG_NONE = 311,
+     TAG = 309,
+     TAG_ANY = 310,
+     TAG_NONE = 311,

      PERCENT_UNION = 312
    };
 #endif
      PERCENT_UNION = 312
    };
 #endif


@@ -148,9 +148,9 @@
 #define PIPE 306
 #define PROLOGUE 307
 #define SEMICOLON 308
 #define PIPE 306
 #define PROLOGUE 307
 #define SEMICOLON 308

-#define TYPE 309
-#define TYPE_TAG_ANY 310
-#define TYPE_TAG_NONE 311
+#define TAG 309
+#define TAG_ANY 310
+#define TAG_NONE 311

 #define PERCENT_UNION 312
 
 
 #define PERCENT_UNION 312
 
 


@@ -160,7 +160,7 @@
 typedef union YYSTYPE
 {
 
 typedef union YYSTYPE
 {
 

-/* Line 1678 of yacc.c  */
+/* Line 1680 of yacc.c  */

 #line 92 "parse-gram.y"
 
   symbol *symbol;
 #line 92 "parse-gram.y"
 
   symbol *symbol;


@@ -174,8 +174,8 @@ typedef union YYSTYPE
 
 
 
 
 
 

-/* Line 1678 of yacc.c  */
-#line 179 "../../../src/parse-gram.h"
+/* Line 1680 of yacc.c  */
+#line 179 "../../src/parse-gram.h"

 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */