bison-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

FYI: lalr1.cc: Remove root


From: Akim Demaille
Subject: FYI: lalr1.cc: Remove root
Date: Wed, 15 Dec 2004 16:32:20 +0100
User-agent: Gnus/5.1007 (Gnus v5.10.7) Emacs/21.3 (gnu/linux)

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        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.

Index: data/lalr1.cc
===================================================================
RCS file: /cvsroot/bison/bison/data/lalr1.cc,v
retrieving revision 1.65
diff -u -u -r1.65 lalr1.cc
--- data/lalr1.cc 23 Nov 2004 19:56:12 -0000 1.65
+++ data/lalr1.cc 15 Dec 2004 15:32:09 -0000
@@ -62,25 +62,6 @@
 address@hidden([$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.
@@ -222,7 +203,7 @@
 
 namespace yy
 {
-  class ]b4_parser_class_name b4_inherit[
+  class ]b4_parser_class_name[
   {
   public:
 
@@ -236,15 +217,15 @@
     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,
-           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__




reply via email to

[Prev in Thread] Current Thread [Next in Thread]