* data/bison.c++: Copy the prologue of bison.simple to fetch

useful M4 definitions, such as b4_header_guard.

diff --git a/ChangeLog b/ChangeLog
index 71879b2aa1c15f5f6700bb4a18bcf18efb96d923..3f720adc4b564e47f9da4359e41d3a674803a7df 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,13 @@
+2002-02-28  Akim Demaille  <akim@epita.fr>
+
+       * data/bison.c++: Copy the prologue of bison.simple to fetch
+       useful M4 definitions, such as b4_header_guard.
+

 2002-02-25  Akim Demaille  <akim@epita.fr>
 
        * src/getargs.c (version): Give the name of the authors, and use a
 2002-02-25  Akim Demaille  <akim@epita.fr>
 
        * src/getargs.c (version): Give the name of the authors, and use a

-       translator friendly scheme for the copyright notice.
+       translator friendly scheme for the bgr
+       copyright notice.

 
 2002-02-25  Akim Demaille  <akim@epita.fr>
 
 
 2002-02-25  Akim Demaille  <akim@epita.fr>
 

diff --git a/data/bison.c++ b/data/bison.c++
index c29e62540d78c5784df5a9d85585634a7ea061ed..bf5026746f98cfb65e71533b4771334e24a39354 100644 (file)
--- a/data/bison.c++
+++ b/data/bison.c++
@@ -1,3 +1,31 @@
+m4_divert(-1)
+
+# m4_define_default(MACRO, VALUE)
+# -------------------------------
+# Define MACRO to VALUE, unless already defined.
+m4_define([m4_define_default],
+[m4_ifdef([$1], [], [m4_define($@)])])
+
+m4_define_default([b4_input_suffix], [.y])
+
+m4_define_default([b4_output_parser_suffix],
+[m4_translit(b4_input_suffix, [yY], [cC])])
+
+m4_define_default([b4_output_parser_name],
+[b4_output_prefix[]b4_output_infix[]b4_output_parser_suffix[]])
+
+
+m4_define_default([b4_output_header_suffix],
+[m4_translit(b4_input_suffix, [yY], [hH])])
+
+m4_define_default([b4_output_header_name],
+[b4_output_prefix[]b4_output_infix[]b4_output_header_suffix[]])
+
+m4_define_default([b4_header_guard],
+                  [m4_bpatsubst(m4_toupper([BISON_]b4_output_header_name),
+                                [[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]], [_])])
+
+m4_divert(0)dnl

 #output "b4_output_prefix[]b4_output_infix[]-class.hh"
 /* -*- C++ -*- */
 
 #output "b4_output_prefix[]b4_output_infix[]-class.hh"
 /* -*- C++ -*- */
 


@@ -272,7 +300,7 @@ yy::b4_name::parse ()
     }
   else if (n_ == 0)
     goto yyerrlab;
     }
   else if (n_ == 0)
     goto yyerrlab;

-  
+

   /* Accept?  */
   if (n_ == final_)
     goto yyacceptlab;
   /* Accept?  */
   if (n_ == final_)
     goto yyacceptlab;


@@ -326,7 +354,7 @@ yy::b4_name::parse ()
       YYFPRINTF (stderr, "-> %s\n", name_[[r1_[n_]]]);
     }
 #endif
       YYFPRINTF (stderr, "-> %s\n", name_[[r1_[n_]]]);
     }
 #endif

-  
+

   {
     SemanticType& yyval (value);
     LocationType& yyloc (location);
   {
     SemanticType& yyval (value);
     LocationType& yyloc (location);


@@ -338,7 +366,7 @@ yy::b4_name::parse ()
        b4_actions
       }
   }
        b4_actions
       }
   }

-  
+

   state_stack_.pop (len_);
   semantic_stack_.pop (len_);
   location_stack_.pop (len_);
   state_stack_.pop (len_);
   semantic_stack_.pop (len_);
   location_stack_.pop (len_);


@@ -347,13 +375,13 @@ yy::b4_name::parse ()
   if (debug_)
     {
       YYFPRINTF (stderr, "state stack now");
   if (debug_)
     {
       YYFPRINTF (stderr, "state stack now");

-      for (StateStack::ConstIterator i = state_stack_.begin (); 
+      for (StateStack::ConstIterator i = state_stack_.begin ();

           i != state_stack_.end (); ++i)
        YYFPRINTF (stderr, " %d", *i);
       YYFPRINTF (stderr, "\n");
     }
 #endif
           i != state_stack_.end (); ++i)
        YYFPRINTF (stderr, " %d", *i);
       YYFPRINTF (stderr, "\n");
     }
 #endif

-  
+

   semantic_stack_.push (value);
   location_stack_.push (location);
 
   semantic_stack_.push (value);
   location_stack_.push (location);
 


@@ -372,7 +400,7 @@ yy::b4_name::parse ()
   if (!errstatus)
     {
       ++nerrs;
   if (!errstatus)
     {
       ++nerrs;

-      
+

 #if YYERROR_VERBOSE
       n_ = pact_[[state_]];
       if (n_ > flag_ && n_ < last_)
 #if YYERROR_VERBOSE
       n_ = pact_[[state_]];
       if (n_ > flag_ && n_ < last_)


@@ -390,7 +418,7 @@ yy::b4_name::parse ()
                for (int x = (n_ < 0 ? -n_ : 0); x < ntokens_ + nnts_; ++x)
                  if (check_[[x + n_]] == x)
                    {
                for (int x = (n_ < 0 ? -n_ : 0); x < ntokens_ + nnts_; ++x)
                  if (check_[[x + n_]] == x)
                    {

-                     message += (!count++) ? ", expecting " : " or "; 
+                     message += (!count++) ? ", expecting " : " or ";

                      message += name_[[x]];
                    }
              }
                      message += name_[[x]];
                    }
              }


@@ -402,7 +430,7 @@ yy::b4_name::parse ()
       error_ ();
     }
   goto yyerrlab1;
       error_ ();
     }
   goto yyerrlab1;

-  
+

   /* Error raised explicitly by an action.  */
  yyerrlab1:
   if (errstatus == 3)
   /* Error raised explicitly by an action.  */
  yyerrlab1:
   if (errstatus == 3)


@@ -436,10 +464,10 @@ yy::b4_name::parse ()
   if (debug_)
     {
       YYFPRINTF (stderr, "Error: state stack now");
   if (debug_)
     {
       YYFPRINTF (stderr, "Error: state stack now");

-      for (StateStack::ConstIterator i = state_stack_.begin (); 
+      for (StateStack::ConstIterator i = state_stack_.begin ();

           i != state_stack_.end (); ++i)
        YYFPRINTF (stderr, " %d", *i);
           i != state_stack_.end (); ++i)
        YYFPRINTF (stderr, " %d", *i);

-      YYFPRINTF (stderr, "\n"); 
+      YYFPRINTF (stderr, "\n");

     }
 #endif
 
     }
 #endif
 


@@ -541,14 +569,14 @@ yy::b4_name::check_[[]] =
 };
 
 /* YYR1[[YYN]] -- Symbol number of symbol that rule YYN derives.  */
 };
 
 /* YYR1[[YYN]] -- Symbol number of symbol that rule YYN derives.  */

-const short 
+const short

 yy::b4_name::r1_[[]] =
 {
   b4_r1
 };
 
 /* YYR2[[YYN]] -- Number of symbols composing right hand side of rule YYN.  */
 yy::b4_name::r1_[[]] =
 {
   b4_r1
 };
 
 /* YYR2[[YYN]] -- Number of symbols composing right hand side of rule YYN.  */

-const short 
+const short

 yy::b4_name::r2_[[]] =
 {
   b4_r2
 yy::b4_name::r2_[[]] =
 {
   b4_r2


@@ -566,7 +594,7 @@ const yy::b4_name::name_[[]] =
 
 #if YYDEBUG
 /* YYRHS -- A `-1'-separated list of the rules' RHS. */
 
 #if YYDEBUG
 /* YYRHS -- A `-1'-separated list of the rules' RHS. */

-const short 
+const short

 yy::b4_name::rhs_[[]] =
 {
   b4_rhs
 yy::b4_name::rhs_[[]] =
 {
   b4_rhs


@@ -592,8 +620,8 @@ yy::b4_name::rline_[[]] =
 char
 yy::b4_name::translate_ (int token)
 {
 char
 yy::b4_name::translate_ (int token)
 {

-  static 
-  const char 
+  static
+  const char

   translate_[[]] =
   {
     b4_translate
   translate_[[]] =
   {
     b4_translate


@@ -669,7 +697,7 @@ namespace yy
       for (; n; --n)
        seq_.pop_back ();
     }
       for (; n; --n)
        seq_.pop_back ();
     }

-    
+

     inline
     void
     reserve (unsigned n)
     inline
     void
     reserve (unsigned n)