* bootstrap: Comment out the AM_CPPFLAGS line, since we don't use

[bison.git] / data / glr.cc

diff --git a/data/glr.cc b/data/glr.cc
index 7b265e5c0f8443cbe7978ce27081a97d1332459f..adb5b34e2ff7d6a5728a0546986f97fd593c94a4 100644 (file)
--- a/data/glr.cc
+++ b/data/glr.cc
@@ -73,10 +73,10 @@ m4_define([b4_yy_symbol_print_generate],
     [static void],
     [[FILE *],               []],
     [[int yytype],           [yytype]],
-    [[const yy::b4_parser_class_name::semantic_type *yyvaluep],
-                             [yyvaluep]],
-    [[const yy::b4_parser_class_name::location_type *yylocationp],
-                             [yylocationp]],
+    [[const b4_namespace::b4_parser_class_name::semantic_type *yyvaluep],
+                            [yyvaluep]],
+    [[const b4_namespace::b4_parser_class_name::location_type *yylocationp],
+                            [yylocationp]],
     b4_parse_param)[
 {
 ]b4_parse_param_use[]dnl
@@ -92,7 +92,7 @@ b4_syncline([@oline@], [@ofile@])
 
 b4_c_ansi_function_decl([yyerror],
     [static void],
-    [[yy::b4_parser_class_name::location_type *yylocationp], [yylocationp]],
+    [[b4_namespace::b4_parser_class_name::location_type *yylocationp], [yylocationp]],
     b4_parse_param,
     [[const char* msg], [msg]])])
 
@@ -107,7 +107,7 @@ b4_syncline([@oline@], [@ofile@])[
 
 ]b4_c_ansi_function_def([yyerror],
     [static void],
-    [[yy::b4_parser_class_name::location_type *yylocationp], [yylocationp]],
+    [[b4_namespace::b4_parser_class_name::location_type *yylocationp], [yylocationp]],
     b4_parse_param,
     [[const char* msg], [msg]])[
 {
@@ -116,7 +116,7 @@ b4_syncline([@oline@], [@ofile@])[
 }
 
 
-namespace yy
+namespace ]b4_namespace[
 {
 ]dnl In this section, the parse param are the original parse_params.
 m4_pushdef([b4_parse_param], m4_defn([b4_parse_param_orig]))dnl
@@ -143,7 +143,7 @@ m4_pushdef([b4_parse_param], m4_defn([b4_parse_param_orig]))dnl
 
   inline void
   ]b4_parser_class_name[::yy_symbol_value_print_ (int yytype,
-                           const semantic_type* yyvaluep, const location_type* yylocationp)
+                          const semantic_type* yyvaluep, const location_type* yylocationp)
   {
     /* Pacify ``unused variable'' warnings.  */
     YYUSE (yyvaluep);
@@ -152,18 +152,18 @@ m4_pushdef([b4_parse_param], m4_defn([b4_parse_param_orig]))dnl
       {
   ]m4_map([b4_symbol_actions], m4_defn([b4_symbol_printers]))dnl
 [        default:
-          break;
+         break;
       }
   }
 
 
   void
   ]b4_parser_class_name[::yy_symbol_print_ (int yytype,
-                           const semantic_type* yyvaluep, const location_type* yylocationp)
+                          const semantic_type* yyvaluep, const location_type* yylocationp)
   {
     *yycdebug_ << (yytype < YYNTOKENS ? "token" : "nterm")
-              << ' ' << yytname[yytype] << " ("
-               << *yylocationp << ": ";
+              << ' ' << yytname[yytype] << " ("
+              << *yylocationp << ": ";
     yy_symbol_value_print_ (yytype, yyvaluep, yylocationp);
     *yycdebug_ << ')';
   }
@@ -195,7 +195,7 @@ m4_pushdef([b4_parse_param], m4_defn([b4_parse_param_orig]))dnl
 
 #endif /* ! YYDEBUG */
 ]m4_popdef([b4_parse_param])dnl
-[} // namespace yy
+[} // namespace ]b4_namespace[
 
 ]])
 
@@ -203,10 +203,10 @@ m4_pushdef([b4_parse_param], m4_defn([b4_parse_param_orig]))dnl
 # Let glr.c believe that the user arguments include the parser itself.
 m4_ifset([b4_parse_param],
 [m4_pushdef([b4_parse_param],
-            m4_dquote([[[yy::b4_parser_class_name& yyparser], [[yyparser]]],]
+           m4_dquote([[[b4_namespace::b4_parser_class_name& yyparser], [[yyparser]]],]
 m4_defn([b4_parse_param])))],
 [m4_pushdef([b4_parse_param],
-            [[[[yy::b4_parser_class_name& yyparser], [[yyparser]]]]])
+           [[[[b4_namespace::b4_parser_class_name& yyparser], [[yyparser]]]]])
 ])
 m4_include(b4_pkgdatadir/[glr.c])
 m4_popdef([b4_parse_param])
@@ -214,7 +214,7 @@ m4_popdef([b4_parse_param])
 
 @output @output_header_name@
 b4_copyright([C++ Skeleton parser for GLALR(1) parsing with Bison],
-             [2002, 2003, 2004, 2005])[
+            [2002, 2003, 2004, 2005, 2006])[
 
 /* C++ GLR parser skeleton written by Akim Demaille.  */
 
@@ -227,7 +227,7 @@ b4_copyright([C++ Skeleton parser for GLALR(1) parsing with Bison],
 /* Using locations.  */
 #define YYLSP_NEEDED ]b4_locations_flag[
 
-namespace yy
+namespace ]b4_namespace[
 {
   class position;
   class location;
@@ -287,19 +287,20 @@ b4_syncline([@oline@], [@ofile@])[
     while (/*CONSTCOND*/ 0)
 #endif
 
-namespace yy
+namespace ]b4_namespace[
 {
   /// A Bison parser.
   class ]b4_parser_class_name[
   {
   public:
     /// Symbol semantic values.
-#if ! defined (YYSTYPE)
+#ifndef YYSTYPE
 ]m4_ifdef([b4_stype],
-[b4_syncline([b4_stype_line], [b4_file_name])
-    union semantic_type b4_stype;
+[    union semantic_type
+b4_stype
 /* Line __line__ of lalr1.cc.  */
-b4_syncline([@oline@], [@ofile@])],
+b4_syncline([@oline@], [@ofile@])
+       ;],
 [    typedef int semantic_type;])[
 #else
     typedef YYSTYPE semantic_type;
@@ -311,6 +312,8 @@ b4_syncline([@oline@], [@ofile@])],
     {
       ]b4_token_enums(b4_tokens)[
     };
+    /// Token type.
+    typedef token::yytokentype token_type;
 
     /// Build a parser object.
     ]b4_parser_class_name[ (]b4_parse_param_decl[);
@@ -348,15 +351,15 @@ b4_syncline([@oline@], [@ofile@])],
     /// \param yyvaluep     Its semantic value.
     /// \param yylocationp  Its location.
     virtual void yy_symbol_value_print_ (int yytype,
-                                        const semantic_type* yyvaluep,
-                                        const location_type* yylocationp);
+                                        const semantic_type* yyvaluep,
+                                        const location_type* yylocationp);
     /// \brief Report a symbol on the debug stream.
     /// \param yytype       The token type.
     /// \param yyvaluep     Its semantic value.
     /// \param yylocationp  Its location.
     virtual void yy_symbol_print_ (int yytype,
-                                  const semantic_type* yyvaluep,
-                                  const location_type* yylocationp);
+                                  const semantic_type* yyvaluep,
+                                  const location_type* yylocationp);
   private:
 #endif /* ! YYDEBUG */
 
@@ -367,9 +370,9 @@ b4_syncline([@oline@], [@ofile@])],
     /// \param yyvaluep     Its semantic value.
     /// \param yylocationp  Its location.
     inline void yydestruct_ (const char* yymsg,
-                             int yytype,
-                             semantic_type* yyvaluep,
-                             location_type* yylocationp);
+                            int yytype,
+                            semantic_type* yyvaluep,
+                            location_type* yylocationp);
 
     /* Debugging.  */
     std::ostream* yycdebug_;
@@ -381,10 +384,10 @@ m4_ifset([b4_global_tokens_and_yystype],
 [b4_token_defines(b4_tokens)])
 [
 #ifndef YYSTYPE
-# define YYSTYPE yy::]b4_parser_class_name[::semantic_type
+# define YYSTYPE ]b4_namespace[::]b4_parser_class_name[::semantic_type
 #endif
 #ifndef YYLTYPE
-# define YYLTYPE yy::]b4_parser_class_name[::location_type
+# define YYLTYPE ]b4_namespace[::]b4_parser_class_name[::location_type
 #endif
 
 }