Simplify code for variants bench marks.

[bison.git] / etc / bench.pl.in

diff --git a/etc/bench.pl.in b/etc/bench.pl.in
index d365d653cdbc81df43dad37d538a3d9bed9d7940..a95e646b56a62ac4e6ccb8bdab8d58a63efeec36 100755 (executable)
--- a/etc/bench.pl.in
+++ b/etc/bench.pl.in
@@ -35,8 +35,9 @@ I<directives>:
      | directives & directives  -- Concatenation
      | [ directives> ]          -- Optional
      | ( directives> )          -- Parentheses
      | directives & directives  -- Concatenation
      | [ directives> ]          -- Optional
      | ( directives> )          -- Parentheses

+     | #d NAME[=VALUE]          -- %code { #define NAME [VALUE] }
+     | %d NAME[=VALUE]          -- %define NAME ["VALUE"]

      | %s skeleton              -- %skeleton "skeleton"
      | %s skeleton              -- %skeleton "skeleton"

-     | #d definition            -- %code { #define definition }

      | directive
 
 Parentheses only group to override precedence.  For instance:
      | directive
 
 Parentheses only group to override precedence.  For instance:


@@ -579,11 +580,13 @@ sub generate_grammar_list ($$@)
   my ($base, $max, @directive) = @_;
   my $directives = directives ($base, @directive);
   my $variant = grep { /%define "?variant"?/ } @directive;
   my ($base, $max, @directive) = @_;
   my $directives = directives ($base, @directive);
   my $variant = grep { /%define "?variant"?/ } @directive;

+  my $lex_symbol = grep { /%define "?lex_symbol"?/ } @directive;

   my $out = new IO::File ">$base.y"
     or die;
   print $out <<EOF;
 %language "C++"
 %defines
   my $out = new IO::File ">$base.y"
     or die;
   print $out <<EOF;
 %language "C++"
 %defines

+%locations

 $directives
 
 %code requires // *.h
 $directives
 
 %code requires // *.h


@@ -597,24 +600,33 @@ $directives
 #include <iostream>
 #include <sstream>
 
 #include <iostream>
 #include <sstream>
 

-// Prototype of the yylex function providing subsequent tokens.
-static yy::parser::token_type yylex(yy::parser::semantic_type* yylval);
-

 #define STAGE_MAX    ($max * 10) // max = $max
 
 #define STAGE_MAX    ($max * 10) // max = $max
 

+#define USE_LEX_SYMBOL $lex_symbol

 #define USE_VARIANTS $variant
 #define USE_VARIANTS $variant

-#if USE_VARIANTS
-# define IF_VARIANTS(True, False) True
-#else
-# define IF_VARIANTS(True, False) False
-#endif

 
 

-#ifdef ONE_STAGE_BUILD
-# define IF_ONE_STAGE_BUILD(True, False) True
+  // Prototype of the yylex function providing subsequent tokens.
+  static
+#if USE_LEX_SYMBOL
+  yy::parser::symbol_type yylex();

 #else
 #else

-# define IF_ONE_STAGE_BUILD(True, False) False
+  yy::parser::token_type yylex(yy::parser::semantic_type* yylval,
+                               yy::parser::location_type* yylloc);

 #endif
 #endif

+
+  // Conversion to string.
+  template <typename T>
+    inline
+    std::string
+    string_cast (const T& t)
+  {
+    std::ostringstream o;
+    o << t;
+    return o.str ();
+  }

 }
 }

+
+%token END_OF_FILE 0

 EOF
 
   if ($variant)
 EOF
 
   if ($variant)


@@ -624,7 +636,6 @@ EOF
 %token <int> NUMBER
 %printer { std::cerr << "Number: " << $$; } <int>
 %printer { std::cerr << "Text: " << $$; } <std::string>
 %token <int> NUMBER
 %printer { std::cerr << "Number: " << $$; } <int>
 %printer { std::cerr << "Text: " << $$; } <std::string>

-%token END_OF_FILE 0

 %type <std::string> text result
 
 %%
 %type <std::string> text result
 
 %%


@@ -635,11 +646,7 @@ result:
 text:
   /* nothing */                { /* This will generate an empty string */ }
 | text TEXT            { std::swap ($$, $2); }
 text:
   /* nothing */                { /* This will generate an empty string */ }
 | text TEXT            { std::swap ($$, $2); }

-| text NUMBER          {
-                         std::ostringstream ss;
-                         ss << ' ' << $2;
-                         $$ = ss.str();
-                        }
+| text NUMBER          { $$ = string_cast($2); }

 ;
 EOF
     }
 ;
 EOF
     }


@@ -652,7 +659,6 @@ EOF
 %token <ival> NUMBER
 %printer { std::cerr << "Number: " << $$; } <ival>
 %printer { std::cerr << "Text: " << *$$; } <sval>
 %token <ival> NUMBER
 %printer { std::cerr << "Number: " << $$; } <ival>
 %printer { std::cerr << "Text: " << *$$; } <sval>

-%token END_OF_FILE 0

 %type <sval> text result
 
 %%
 %type <sval> text result
 
 %%


@@ -663,51 +669,67 @@ result:
 text:
   /* nothing */                { $$ = new std::string; }
 | text TEXT            { delete $1; $$ = $2; }
 text:
   /* nothing */                { $$ = new std::string; }
 | text TEXT            { delete $1; $$ = $2; }

-| text NUMBER          {
-                          delete $1;
-                          std::ostringstream ss;
-                         ss << ' ' << $2;
-                         $$ = new std::string (ss.str());
-                        }
+| text NUMBER          { delete $1; $$ = new std::string (string_cast ($2)); }

 ;
 EOF
     }
 
   print $out <<'EOF';
 %%
 ;
 EOF
     }
 
   print $out <<'EOF';
 %%

+#
+

 static
 static

-yy::parser::token_type
-yylex(yy::parser::semantic_type* yylval)
+#if USE_LEX_SYMBOL
+yy::parser::symbol_type yylex()
+#else
+yy::parser::token_type yylex(yy::parser::semantic_type* yylval,
+                             yy::parser::location_type* yylloc)
+#endif

 {
 {

+  typedef yy::parser::location_type location_type;
+  typedef yy::parser::token token;

   static int stage = -1;
   ++stage;
   if (stage == STAGE_MAX)
   static int stage = -1;
   ++stage;
   if (stage == STAGE_MAX)

-    return yy::parser::token::END_OF_FILE;
+    {
+#if USE_LEX_SYMBOL
+      return yy::parser::make_END_OF_FILE (yy::location());
+#else
+      *yylloc = location_type ();
+      return token::END_OF_FILE;
+#endif
+    }

   else if (stage % 2)
     {
   else if (stage % 2)
     {

-#if USE_VARIANTS
-# ifdef ONE_STAGE_BUILD
+#if USE_LEX_SYMBOL
+      return yy::parser::make_NUMBER (stage, yy::location());
+#else
+# if defined ONE_STAGE_BUILD

       yylval->build(stage);
       yylval->build(stage);

-# else
+# elif USE_VARIANTS

       yylval->build<int>() = stage;
       yylval->build<int>() = stage;

-# endif
-#else
+# else

       yylval->ival = stage;
       yylval->ival = stage;

+# endif
+      *yylloc = location_type ();
+      return token::NUMBER;

 #endif
 #endif

-      return yy::parser::token::NUMBER;

     }
   else
     {
     }
   else
     {

-#if USE_VARIANTS
-# ifdef ONE_STAGE_BUILD
+#if USE_LEX_SYMBOL
+      return yy::parser::make_TEXT ("A string.", yy::location());
+#else
+# if defined ONE_STAGE_BUILD

       yylval->build(std::string("A string."));
       yylval->build(std::string("A string."));

-# else
+# elif USE_VARIANTS

       yylval->build<std::string>() = std::string("A string.");
       yylval->build<std::string>() = std::string("A string.");

-# endif
-#else
+# else

       yylval->sval = new std::string("A string.");
       yylval->sval = new std::string("A string.");

+# endif
+      *yylloc = location_type ();
+      return token::TEXT;

 #endif
 #endif

-      return yy::parser::token::TEXT;

     }
   abort();
 }
     }
   abort();
 }


@@ -872,10 +894,10 @@ interfaces.
 sub bench_push_parser ()
 {
   bench ('calc',
 sub bench_push_parser ()
 {
   bench ('calc',

-         (
-          '[', '%define api.pure', ']',
-          '&',
-          '[', '%define api.push_pull "both"', ']'
+         qw(
+            [ %d api.pure ]
+            &
+            [ %d api.push_pull=both ]

          ));
 }
 
          ));
 }
 


@@ -883,7 +905,7 @@ sub bench_push_parser ()
 
 =item C<bench_variant_parser ()>
 
 
 =item C<bench_variant_parser ()>
 

-Bench the C++ lalr1.cc parser using Boost.Variants or %union.
+Bench the C++ lalr1.cc parser using variants or %union.

 
 =cut
 
 
 =cut
 


@@ -891,15 +913,10 @@ sub bench_variant_parser ()
 {
   bench ('list',
          qw(
 {
   bench ('list',
          qw(

-            %s lalr1.cc
-            &
-            [ %debug ]
-            &
-            [ %define variant
-              &
-              [ #d VARIANT_DESTROY ]
+            [
+              %d variant

               &
               &

-              [ #d ONE_STAGE_BUILD ]
+              [ #d ONE_STAGE_BUILD | %d lex_symbol ]

             ]
          )
     );
             ]
          )
     );


@@ -939,30 +956,42 @@ sub help ($)
 
 ######################################################################
 
 
 ######################################################################
 

+# The end of the directives to parse.
+my $eod = "end of directives";

 # The list of tokens parsed by the following functions.
 my @token;
 
 # The list of tokens parsed by the following functions.
 my @token;
 

+# eat ($EXPECTED)
+# ---------------
+# Check that the current token is $EXPECTED, and move to the next.
+sub eat ($)
+{
+  my ($expected) = @_;
+  die "expected $expected, unexpected: $token[0] (@token)\n"
+    unless $token[0] eq $expected;
+  shift @token;
+}
+

 # Parse directive specifications:
 #   expr: term (| term)*
 #   term: fact (& fact)*
 #   fact: ( expr ) | [ expr ] | dirs
 # Parse directive specifications:
 #   expr: term (| term)*
 #   term: fact (& fact)*
 #   fact: ( expr ) | [ expr ] | dirs

-#   dirs: %s SKELETON | #d DEFINE | directive
+#   dirs: %s SKELETON | #d NAME[=VALUE] | %d NAME[=VALUE] | directive

 sub parse (@)
 {
 sub parse (@)
 {

-  @token = @_;
+  @token = (@_, $eod);

   verbose 3, "Parsing: @token\n";
   my @res = parse_expr ();
   verbose 3, "Parsing: @token\n";
   my @res = parse_expr ();

-  die "expected end of directives, unexpected: @token"
-    if defined $token[0];
+  eat ($eod);

   return @res;
 }
 
 sub parse_expr ()
 {
   my @res = parse_term ();
   return @res;
 }
 
 sub parse_expr ()
 {
   my @res = parse_term ();

-  while (defined $token[0] && $token[0] eq '|')
+  while ($token[0] eq '|')

     {
     {

-      shift @token;
+      eat ('|');

       # Alternation.
       push @res, parse_term ();
     }
       # Alternation.
       push @res, parse_term ();
     }


@@ -972,9 +1001,9 @@ sub parse_expr ()
 sub parse_term ()
 {
   my @res = parse_fact ();
 sub parse_term ()
 {
   my @res = parse_fact ();

-  while (defined $token[0] && $token[0] eq '&')
+  while ($token[0] eq '&')

     {
     {

-      shift @token;
+      eat ('&');

       # Cartesian product.
       my @lhs = @res;
       @res = ();
       # Cartesian product.
       my @lhs = @res;
       @res = ();


@@ -982,7 +1011,7 @@ sub parse_term ()
         {
           for my $lhs (@lhs)
             {
         {
           for my $lhs (@lhs)
             {

-              push @res, "$lhs\n$rhs";
+              push @res, $lhs . ($lhs && $rhs ? "\n" : "") . $rhs;

             }
         }
     }
             }
         }
     }


@@ -997,19 +1026,15 @@ sub parse_fact ()
 
   if ($token[0] eq '(')
     {
 
   if ($token[0] eq '(')
     {

-      shift @token;
+      eat ('(');

       @res = parse_expr ();
       @res = parse_expr ();

-      die "unexpected $token[0], expected )"
-        unless $token[0] eq ')';
-      shift @token;
+      eat (')');

     }
   elsif ($token[0] eq '[')
     {
     }
   elsif ($token[0] eq '[')
     {

-      shift @token;
+      eat ('[');

       @res = (parse_expr (), '');
       @res = (parse_expr (), '');

-      die "unexpected $token[0], expected ]"
-        unless $token[0] eq ']';
-      shift @token;
+      eat (']');

     }
   else
     {
     }
   else
     {


@@ -1025,9 +1050,17 @@ sub parse_dirs ()
     unless defined $token[0];
 
   if ($token[0] eq '#d')
     unless defined $token[0];
 
   if ($token[0] eq '#d')

+    {
+      eat ('#d');
+      $token[0] =~ s/(.*?)=(.*)/$1 $2/;
+      @res = ("%code {\n#define $token[0]\n}");
+      shift @token;
+    }
+  elsif ($token[0] eq '%d')

     {
       shift @token;
     {
       shift @token;

-      @res = ("%code {\n#define\n}");
+      $token[0] =~ s/(.*?)=(.*)/$1 "$2"/;
+      @res = ("%define $token[0]");

       shift @token;
     }
   elsif ($token[0] eq '%s')
       shift @token;
     }
   elsif ($token[0] eq '%s')