Use "%define variant" in bench.pl.

	* etc/bench.pl.in: No longer use the pseudo directive %variants,
	just use %define variants.

diff --git a/ChangeLog b/ChangeLog
index f575d055340caaad30d929f3efa847b7c500e185..8054b254801d436d08ebd5456c641b5720f1679a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-07  Akim Demaille  <demaille@gostai.com>
+
+       Use "%define variant" in bench.pl.
+       * etc/bench.pl.in: No longer use the pseudo directive %variants,
+       just use %define variants.
+
 2008-11-07  Akim Demaille  <demaille@gostai.com>
 
        Regen.

diff --git a/etc/bench.pl.in b/etc/bench.pl.in
index 22328cfa91381893cc4820f7c799281d778c7710..f4f5a7e56d9847d5163f3324fc1a4ee1dac44736 100755 (executable)
--- a/etc/bench.pl.in
+++ b/etc/bench.pl.in
@@ -147,21 +147,13 @@ sub verbose($$)
 
 Format the list of directives for Bison for bench named C<$bench>.
 
-The special fake C<%variant> directive requests the use of
-Boost.Variants instead of a regular union.  So don't pass it, it is
-not a valid directive.
-
 =cut
 
 sub directives($@)
 {
   my ($bench, @directive) = @_;
   my $res = "/* Directives for bench `$bench'. */\n";
-  for my $d (@directive)
-    {
-      $res .= $d . "\n"
-        unless $d eq '%variant';
-    }
+  $res .= join ("\n", @directive) . "\n";
   $res .= "/* End of directives for bench `$bench'. */\n";
   return $res;
 }
@@ -527,7 +519,7 @@ sub generate_grammar_variant ($$@)
 {
   my ($base, $max, @directive) = @_;
   my $directives = directives ($base, @directive);
-  my $variant = grep { $_ eq '%variant' } @directive;
+  my $variant = grep { $_ eq '%define variant' } @directive;
 
   my $out = new IO::File ">$base.y"
     or die;
@@ -563,7 +555,6 @@ EOF
   if ($variant)
     {
       print $out <<'EOF';
-%code variant {int,std::string}
 %token <std::string> TEXT
 %token <int> NUMBER
 %printer { std::cerr << "Number: " << $$; } <int>
@@ -821,10 +812,10 @@ sub bench_variant_parser ()
      (
       "f-union"         => ['%skeleton "lalr1-fusion.cc"'],
       "f-uni-deb"   => ['%skeleton "lalr1-fusion.cc"', '%debug'],
-      "f-var"       => ['%skeleton "lalr1-fusion.cc"', '%variant'],
-      "f-var-deb" => ['%skeleton "lalr1-fusion.cc"', '%debug', '%variant'],
-      "f-var-dtr"       => ['%skeleton "lalr1-fusion.cc"', '%variant', "%code {\n#define VARIANT_DESTROY\n}"],
-      "f-var-deb-dtr" => ['%skeleton "lalr1-fusion.cc"', '%debug', '%variant', "%code {\n#define VARIANT_DESTROY\n}"],
+      "f-var"       => ['%skeleton "lalr1-fusion.cc"', '%define variant'],
+      "f-var-deb" => ['%skeleton "lalr1-fusion.cc"', '%debug', '%define variant'],
+      "f-var-dtr"       => ['%skeleton "lalr1-fusion.cc"', '%define variant', "%code {\n#define VARIANT_DESTROY\n}"],
+      "f-var-deb-dtr" => ['%skeleton "lalr1-fusion.cc"', '%debug', '%define variant', "%code {\n#define VARIANT_DESTROY\n}"],
      )
     );
 }

diff --git a/examples/variant.yy b/examples/variant.yy
index be43c60d0e592e23b1c3ddd6dd2bcf4a874c14be..cba6d08c5c1dfcd4b327afcef9b001fd471b3f8b 100644 (file)
--- a/examples/variant.yy
+++ b/examples/variant.yy
@@ -58,7 +58,7 @@ typedef std::list<std::string> strings_type;
 %%
 
 result:
-  list          { std::cout << $1 << std::endl; }
+  list { std::cout << $1 << std::endl; }
 ;
 
 list: