* data/bison.c++: Make the user able to add members to the generated

parser by subclassing.

diff --git a/ChangeLog b/ChangeLog
index e2c8506cf1710c9d0d594e607ee481cd15c18925..c37a529ac7d6f695327bdc2843e88b62f44dfa26 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-09  Robert Anisko  <robert@lrde.epita.fr>
+
+       * data/bison.c++: Make the user able to add members to the generated
+       parser by subclassing.
+

 2002-03-05  Robert Anisko  <robert@lrde.epita.fr>
 
        * src/reader.c (read_additionnal_code): `c' should be an integer, not
 2002-03-05  Robert Anisko  <robert@lrde.epita.fr>
 
        * src/reader.c (read_additionnal_code): `c' should be an integer, not

diff --git a/data/bison.c++ b/data/bison.c++
index 0992bf8d22adbb7beb514a89342f55d118e094af..71cd6d9885eeb5e638a37d4fd041f1bf6f245eb1 100644 (file)
--- a/data/bison.c++
+++ b/data/bison.c++
@@ -25,6 +25,24 @@ m4_define_default([b4_header_guard],
                   [m4_bpatsubst(m4_toupper([BISON_]b4_output_header_name),
                                 [[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]], [_])])
 
                   [m4_bpatsubst(m4_toupper([BISON_]b4_output_header_name),
                                 [[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]], [_])])
 

+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),
+      ],
+                   [])])
+

 m4_define([b4_copyright],
           [/* -*- C++ -*- */
 /* A Bison parser, made from b4_filename,
 m4_define([b4_copyright],
           [/* -*- C++ -*- */
 /* A Bison parser, made from b4_filename,


@@ -126,7 +144,7 @@ namespace yy
 
 namespace yy
 {
 
 namespace yy
 {

-  class b4_name
+  class b4_name b4_inherit

   {
   public:
 
   {
   public:
 


@@ -140,10 +158,12 @@ namespace yy
 
 #if YYLSP_NEEDED
     b4_name (bool debug,
 
 #if YYLSP_NEEDED
     b4_name (bool debug,

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

 #else
 #else

-    b4_name (bool debug) : debug_ (debug)
+    b4_name (bool debug[]b4_param) :
+      b4_constructor[]debug_ (debug)

 #endif
     {
     }
 #endif
     {
     }