Remove b4_root related material: failure experiment

(which goal was to allow to derive from an class).
* data/lalr1.cc (b4_root, b4_param, b4_constructor): Remove
definitions and uses.

diff --git a/ChangeLog b/ChangeLog
index 1ad740cc973572e0e05c45f17400c8de84976ae0..f6835dbfd6accba2b31af50b2b35351d8279b8a9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-12-15  Akim Demaille  <akim@epita.fr>
+
+       Remove b4_root related material: failure experiment
+       (which goal was to allow to derive from an class).
+
+       * data/lalr1.cc (b4_root, b4_param, b4_constructor): Remove
+       definitions and uses.
+

 2004-12-14  Paul Eggert  <eggert@cs.ucla.edu>
 
        * data/glr.c (struct yyGLRStack): yyerror_range now has 3 items,
 2004-12-14  Paul Eggert  <eggert@cs.ucla.edu>
 
        * data/glr.c (struct yyGLRStack): yyerror_range now has 3 items,

diff --git a/data/lalr1.cc b/data/lalr1.cc
index 817b3833b333d35868508cb33b2624ad8ce4c640..a68eecc34ce004dc0f4010bc9a136995aae62f2f 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -62,25 +62,6 @@ m4_define([b4_rhs_location],
 [location_stack_@{m4_eval([$1 - $2])@}])
 
 
 [location_stack_@{m4_eval([$1 - $2])@}])
 
 

-m4_define([b4_inherit],
-          [m4_ifdef([b4_root],
-                   [: public b4_root
-],
-                   [])])
-
-m4_define([b4_param],
-         [m4_ifdef([b4_root],
-                   [,
-            const Param& param],
-                   [])])
-
-m4_define([b4_constructor],
-         [m4_ifdef([b4_root],
-                   [b4_root (param),
-      ],
-                   [])])
-
-

 # b4_parse_param_decl
 # -------------------
 # Extra formal arguments of the constructor.
 # b4_parse_param_decl
 # -------------------
 # Extra formal arguments of the constructor.


@@ -222,7 +203,7 @@ namespace yy
 
 namespace yy
 {
 
 namespace yy
 {

-  class ]b4_parser_class_name b4_inherit[
+  class ]b4_parser_class_name[

   {
   public:
 
   {
   public:
 


@@ -236,15 +217,15 @@ namespace yy
     typedef Stack<SemanticType> SemanticStack;
     typedef Stack<LocationType> LocationStack;
 
     typedef Stack<SemanticType> SemanticStack;
     typedef Stack<LocationType> LocationStack;
 

-    ]b4_parser_class_name[ (bool debug][]b4_param[]b4_parse_param_decl[) :
-      ]b4_constructor[][debug_ (debug),
+    ]b4_parser_class_name[ (bool debug]b4_parse_param_decl[) :
+      debug_ (debug),

       yycdebug_ (&std::cerr)]b4_parse_param_cons[
     {
     }
 
     ]b4_parser_class_name[ (bool debug,
       yycdebug_ (&std::cerr)]b4_parse_param_cons[
     {
     }
 
     ]b4_parser_class_name[ (bool debug,

-           LocationType][]b4_param[]b4_parse_param_decl[) :
-      ]b4_constructor[][debug_ (debug),
+           LocationType]b4_parse_param_decl[) :
+      debug_ (debug),

       yycdebug_ (&std::cerr)]b4_parse_param_cons[
     {
       *yycdebug_ << __FILE__ << ':' << __LINE__
       yycdebug_ (&std::cerr)]b4_parse_param_cons[
     {
       *yycdebug_ << __FILE__ << ':' << __LINE__