gnulib: update

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

diff --git a/etc/bench.pl.in b/etc/bench.pl.in
index f71611f09a8b3954c0b0a9aebf8c3368e9059013..30d0a996e611a3b73acb871c9e45132686b44879 100755 (executable)
--- a/etc/bench.pl.in
+++ b/etc/bench.pl.in
@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
 #! /usr/bin/perl -w
 

-# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008-2013 Free Software Foundation, Inc.

 #
 # This file is part of Bison, the GNU Compiler Compiler.
 #
 #
 # This file is part of Bison, the GNU Compiler Compiler.
 #


@@ -23,18 +23,23 @@ bench.pl - bench marks for Bison parsers.
 
 =head1 SYNOPSIS
 
 
 =head1 SYNOPSIS
 

-  ./bench.pl [OPTIONS]... I<directives>
+  ./bench.pl [OPTIONS]... DIRECTIVES

 
 =head1 DIRECTIVES
 
 Specify the set of benches to run.  The following grammar defines the
 I<directives>:
 
 
 =head1 DIRECTIVES
 
 Specify the set of benches to run.  The following grammar defines the
 I<directives>:
 

-   I<directives> ::= I<directives> | I<directives>  -- Alternation
-                  |  I<directives> & I<directives>  -- Concatenation
-                  |  [ I<directives> ]              -- Optional
-                  |  ( I<directives> )              -- Parentheses
-                  | I<directive>
+   directives ::=
+       directives | directives  -- Alternation
+     | directives & directives  -- Concatenation
+     | [ directives> ]          -- Optional
+     | ( directives> )          -- Parentheses
+     | %b PATH                  -- Use bison at PATH for this bench
+     | #d NAME[=VALUE]          -- %code { #define NAME [VALUE] }
+     | %d NAME[=VALUE]          -- %define NAME ["VALUE"]
+     | %s skeleton              -- %skeleton "skeleton"
+     | directive

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


@@ -53,11 +58,6 @@ request.
 
 =over 4
 
 
 =over 4
 

-=item I<fusion>
-
-Test F<lalr1.cc> with three stacks against F<lalr1-fusion.cc> which
-uses a single one.
-

 =item I<push>
 
 Test the push parser vs. the pull interface.  Use the C parser.
 =item I<push>
 
 Test the push parser vs. the pull interface.  Use the C parser.


@@ -204,9 +204,9 @@ Format the list of directives for Bison for bench named C<$bench>.
 sub directives($@)
 {
   my ($bench, @directive) = @_;
 sub directives($@)
 {
   my ($bench, @directive) = @_;

-  my $res = "/* Directives for bench `$bench'. */\n";
+  my $res = "/* Directives for bench '$bench'. */\n";

   $res .= join ("\n", @directive) . "\n";
   $res .= join ("\n", @directive) . "\n";

-  $res .= "/* End of directives for bench `$bench'. */\n";
+  $res .= "/* End of directives for bench '$bench'. */\n";

   return $res;
 }
 
   return $res;
 }
 


@@ -247,7 +247,6 @@ sub generate_grammar_triangular ($$@)
     or die;
   print $out <<EOF;
 %error-verbose
     or die;
   print $out <<EOF;
 %error-verbose

-%debug

 %{
 #include <stdio.h>
 #include <stdlib.h>
 %{
 #include <stdio.h>
 #include <stdlib.h>


@@ -286,8 +285,8 @@ for my $size (1 .. $max)
   {
     use Text::Wrap;
     print $out wrap ("| ", "   ",
   {
     use Text::Wrap;
     print $out wrap ("| ", "   ",

-                    (map { "\"$_\"" } (1 .. $size)),
-                    " END \n"),
+                     (map { "\"$_\"" } (1 .. $size)),
+                     " END \n"),

                "    { \$\$ = $size; }\n";
   };
 print $out ";\n";
                "    { \$\$ = $size; }\n";
   };
 print $out ";\n";


@@ -319,7 +318,9 @@ yyerror (const char *msg)
 int
 main (void)
 {
 int
 main (void)
 {

+#if YYDEBUG

   yydebug = !!getenv ("YYDEBUG");
   yydebug = !!getenv ("YYDEBUG");

+#endif

   return yyparse ();
 }
 EOF
   return yyparse ();
 }
 EOF


@@ -371,8 +372,8 @@ sub generate_grammar_calc ($$@)
     or die;
   print $out <<EOF;
 %{
     or die;
   print $out <<EOF;
 %{

+#include <assert.h>

 #include <stdio.h>
 #include <stdio.h>

-

 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>


@@ -411,7 +412,7 @@ static int yylex (void);
 %token <ival> NUM "number"
 %type  <ival> exp
 
 %token <ival> NUM "number"
 %type  <ival> exp
 

-%nonassoc '=' /* comparison           */
+%nonassoc '=' /* comparison            */

 %left '-' '+'
 %left '*' '/'
 %left NEG     /* negation--unary minus */
 %left '-' '+'
 %left '*' '/'
 %left NEG     /* negation--unary minus */


@@ -528,9 +529,8 @@ yylex (void)
 static int
 power (int base, int exponent)
 {
 static int
 power (int base, int exponent)
 {

+  assert (0 <= exponent);

   int res = 1;
   int res = 1;

-  if (exponent < 0)
-    exit (3);

   for (/* Niente */; exponent; --exponent)
     res *= base;
   return res;
   for (/* Niente */; exponent; --exponent)
     res *= base;
   return res;


@@ -544,6 +544,10 @@ main (int argc, const char **argv)
   int count = 0;
   int status;
 
   int count = 0;
   int status;
 

+#if YYDEBUG
+  yydebug = !!getenv ("YYDEBUG");
+#endif
+

   input = fopen ("calc.input", "r");
   if (!input)
     {
   input = fopen ("calc.input", "r");
   if (!input)
     {


@@ -575,13 +579,14 @@ sub generate_grammar_list ($$@)
 {
   my ($base, $max, @directive) = @_;
   my $directives = directives ($base, @directive);
 {
   my ($base, $max, @directive) = @_;
   my $directives = directives ($base, @directive);

-  my $variant = grep { $_ eq '%define variant' } @directive;
-
+  my $variant = grep { /%define "?variant"?/ } @directive;
+  my $token_ctor = grep { /%define "?api.token.constructor"?/ } @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


@@ -595,17 +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_TOKEN_CTOR $token_ctor

 #define USE_VARIANTS $variant
 #define USE_VARIANTS $variant

-#if USE_VARIANTS
-# define IF_VARIANTS(True, False) True
+
+  // Prototype of the yylex function providing subsequent tokens.
+  static
+#if USE_TOKEN_CTOR
+  yy::parser::symbol_type yylex();

 #else
 #else

-# define IF_VARIANTS(True, False) False
+  yy::parser::token_type yylex(yy::parser::semantic_type* yylvalp,
+                               yy::parser::location_type* yyllocp);

 #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)


@@ -615,23 +636,17 @@ 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
 
 %%
 result:
 %type <std::string> text result
 
 %%
 result:

-  text                 { /* Throw away the result. */ }
+  text                  { /* Throw away the result. */ }

 ;
 
 text:
 ;
 
 text:

-  /* nothing */                { /* This will generate an empty string */ }
-| text TEXT            { std::swap($$,$1); $$.append($2); }
-| text NUMBER          {
-                         std::swap($$,$1);
-                          std::ostringstream ss;
-                         ss << ' ' << $2;
-                         $$.append(ss.str());
-                        }
+  /* nothing */         { /* This will generate an empty string */ }
+| text TEXT             { std::swap ($$, $2); }
+| text NUMBER           { $$ = string_cast($2); }

 ;
 EOF
     }
 ;
 EOF
     }


@@ -644,55 +659,86 @@ 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
 
 %%
 result:
 %type <sval> text result
 
 %%
 result:

-  text                 { delete $1; }
+  text                  { delete $1; }

 ;
 
 text:
 ;
 
 text:

-  /* nothing */                { $$ = new std::string; }
-| text TEXT            { $$->append(*$2); delete $2; }
-| text NUMBER          {
-                         std::ostringstream ss;
-                         ss << ' ' << $2;
-                         $$->append(ss.str());
-                        }
+  /* nothing */         { $$ = new std::string; }
+| text TEXT             { delete $1; $$ = $2; }
+| 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_TOKEN_CTOR
+yy::parser::symbol_type yylex()
+#else
+yy::parser::token_type yylex(yy::parser::semantic_type* yylvalp,
+                             yy::parser::location_type* yyllocp)
+#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_TOKEN_CTOR
+      return yy::parser::make_END_OF_FILE (location_type ());
+#else
+      *yyllocp = location_type ();
+      return token::END_OF_FILE;
+#endif
+    }

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

-      IF_VARIANTS(yylval->build<int>(), yylval->ival) = stage;
-      return yy::parser::token::NUMBER;
+#if USE_TOKEN_CTOR
+      return yy::parser::make_NUMBER (stage, location_type ());
+#else
+# if defined ONE_STAGE_BUILD
+      yylvalp->build(stage);
+# elif USE_VARIANTS
+      yylvalp->build<int>() = stage;
+# else
+      yylvalp->ival = stage;
+# endif
+      *yyllocp = location_type ();
+      return token::NUMBER;
+#endif

     }
   else
     {
     }
   else
     {

-      IF_VARIANTS(yylval->build<std::string>() =, yylval->sval = new) std::string("A string.");
-      return yy::parser::token::TEXT;
+#if USE_TOKEN_CTOR
+      return yy::parser::make_TEXT ("A string.", location_type ());
+#else
+# if defined ONE_STAGE_BUILD
+      yylvalp->build(std::string("A string."));
+# elif USE_VARIANTS
+      yylvalp->build<std::string>() = std::string("A string.");
+# else
+      yylvalp->sval = new std::string("A string.");
+# endif
+      *yyllocp = location_type ();
+      return token::TEXT;
+#endif

     }
   abort();
 }
 
 // Mandatory error function
 void
     }
   abort();
 }
 
 // Mandatory error function
 void

-yy::parser::error(const yy::parser::location_type& yylloc,
-                  const std::string& message)
+yy::parser::error(const yy::parser::location_type& loc, const std::string& msg)

 {
 {

-  std::cerr << yylloc << ": " << message << std::endl;
+  std::cerr << loc << ": " << msg << std::endl;

 }
 
 int main(int argc, char *argv[])
 }
 
 int main(int argc, char *argv[])


@@ -718,7 +764,7 @@ Generate F<$base.y> by calling C<&generate_grammar_$name>.
 sub generate_grammar ($$@)
 {
   my ($name, $base, @directive) = @_;
 sub generate_grammar ($$@)
 {
   my ($name, $base, @directive) = @_;

-  verbose 2, "Generating $base.y\n";
+  verbose 3, "Generating $base.y\n";

   my %generator =
     (
       "calc"       => \&generate_grammar_calc,
   my %generator =
     (
       "calc"       => \&generate_grammar_calc,


@@ -739,7 +785,7 @@ Run, possibly verbosely, the shell C<$command>.
 sub run ($)
 {
   my ($command) = @_;
 sub run ($)
 {
   my ($command) = @_;

-  verbose 2, "$command\n";
+  verbose 3, "$command\n";

   system ("$command") == 0
     or die "$command failed";
 }
   system ("$command") == 0
     or die "$command failed";
 }


@@ -761,7 +807,8 @@ sub compile ($)
 
   my $compiler = $language eq 'C++' ? $cxx : $cc;
 
 
   my $compiler = $language eq 'C++' ? $cxx : $cc;
 

-  run "$bison $base.y -o $base.c";
+  my $my_bison = `sed -ne '/%bison "\\(.*\\)"/{s//\\1/;p;q;}' $base.y`;
+  run ((length $my_bison ? $my_bison : $bison) . " $base.y -o $base.c");

   run "$compiler -o $base $cflags $base.c";
 }
 
   run "$compiler -o $base $cflags $base.c";
 }
 


@@ -813,7 +860,7 @@ sub bench ($@)
   # shows only wallclock and the two children times.  'auto' (the
   # default) will act as 'all' unless the children times are both
   # zero, in which case it acts as 'noc'.  'none' prevents output.
   # shows only wallclock and the two children times.  'auto' (the
   # default) will act as 'all' unless the children times are both
   # zero, in which case it acts as 'noc'.  'none' prevents output.

-  verbose 2, "Running the benches for $grammar\n";
+  verbose 3, "Running the benches for $grammar\n";

   my $res = timethese ($iterations, \%bench, 'nop');
 
   # Output the speed result.
   my $res = timethese ($iterations, \%bench, 'nop');
 
   # Output the speed result.


@@ -847,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 ]

          ));
 }
 
          ));
 }
 


@@ -858,37 +905,21 @@ 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
 
 sub bench_variant_parser ()
 
 =cut
 
 sub bench_variant_parser ()

-{
-  bench ('variant',
-         ('%skeleton "lalr1.cc"',
-          '&',
-          '[', '%debug', ']',
-          '&',
-          '[', '%define variant', ']',
-          '&',
-          '[', "%code {\n#define VARIANT_DESTROY\n}", ']'
-         ));
-}
-
-######################################################################
-
-=item C<bench_fusion_parser ()>
-
-Bench the C++ lalr1.cc parser using Boost.Variants or %union.
-
-=cut
-
-sub bench_fusion_parser ()

 {
   bench ('list',
 {
   bench ('list',

-         ('%skeleton "lalr1-split.cc"',
-          '|',
-          '%skeleton "lalr1.cc"'));
+         qw(
+            [
+              %d variant
+              &
+              [ #d ONE_STAGE_BUILD | %d api.token.constructor ]
+            ]
+         )
+    );

 }
 
 ############################################################################
 }
 
 ############################################################################


@@ -906,26 +937,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 NAME[=VALUE] | %d NAME[=VALUE] | directive

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

-  @token = @_;
-  verbose 2, "Parsing: @token\n";
-  return parse_expr ();
+  @token = (@_, $eod);
+  verbose 3, "Parsing: @token\n";
+  my @res = parse_expr ();
+  eat ($eod);
+  return @res;

 }
 
 sub parse_expr ()
 {
   my @res = parse_term ();
 }
 
 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 ();
     }


@@ -935,9 +982,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 = ();


@@ -945,7 +992,7 @@ sub parse_term ()
         {
           for my $lhs (@lhs)
             {
         {
           for my $lhs (@lhs)
             {

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

             }
         }
     }
             }
         }
     }


@@ -960,18 +1007,53 @@ 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 ']';
+      eat (']');
+    }
+  else
+    {
+      @res = parse_dirs ();
+    }
+  return @res;
+}
+
+sub parse_dirs ()
+{
+  my @res;
+  die "unexpected end of expression"
+    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;
+      $token[0] =~ s/(.*?)=(.*)/$1 "$2"/;
+      @res = ("%define $token[0]");
+      shift @token;
+    }
+  elsif ($token[0] eq '%s')
+    {
+      shift @token;
+      @res = ("%skeleton \"$token[0]\"");
+      shift @token;
+    }
+  elsif ($token[0] eq '%b')
+    {
+      shift @token;
+      @res = ("/*\n%bison \"$token[0]\"\\\n*/");

       shift @token;
     }
   else
       shift @token;
     }
   else


@@ -979,6 +1061,7 @@ sub parse_fact ()
       @res = $token[0];
       shift @token;
     }
       @res = $token[0];
       shift @token;
     }

+

   return @res;
 }
 
   return @res;
 }
 


@@ -1000,36 +1083,52 @@ sub getopt ()
   Getopt::Long::Configure ("bundling", "pass_through");
   GetOptions (%option)
     or exit 1;
   Getopt::Long::Configure ("bundling", "pass_through");
   GetOptions (%option)
     or exit 1;

-
-  # Support -b: predefined benches.
-  my %bench =
-    (
-     "fusion"   => \&bench_fusion_parser,
-     "push"     => \&bench_push_parser,
-     "variant"  => \&bench_variant_parser,
-    );
-
-  if (defined $bench)
-    {
-      die "invalid argument for --bench: $bench"
-        unless defined $bench{$bench};
-      &{$bench{$bench}}();
-      exit 0;
-    }

 }
 
 ######################################################################
 
 getopt;
 }
 
 ######################################################################
 
 getopt;

+
+# Create the directory we work in.
+mkdir "benches" or die "cannot create benches"
+  unless -d "benches";
+my $count = 1;
+++$count
+  while -d "benches/$count";
+my $dir = "benches/$count";
+mkdir $dir
+  or die "cannot create $dir";
+chdir $dir
+  or die "cannot chdir $dir";
+
+# The following message is tailored to please Emacs' compilation-mode.
+verbose 1, "Entering directory `$dir'\n";

 verbose 1, "Using bison=$bison.\n";
 verbose 1, "Using bison=$bison.\n";

-verbose 1, "Using cc=$cc.\n";
-verbose 1, "Using cxx=$cxx.\n";
-verbose 1, "Using cflags=$cflags.\n";
+verbose 2, "Using cc=$cc.\n";
+verbose 2, "Using cxx=$cxx.\n";
+verbose 2, "Using cflags=$cflags.\n";

 verbose 2, "Grammar: $grammar\n";
 
 verbose 2, "Grammar: $grammar\n";
 

-# Launch the bench marking.
-bench ($grammar, @ARGV);

 
 

+# Support -b: predefined benches.
+my %bench =
+  (
+   "push"     => \&bench_push_parser,
+   "variant"  => \&bench_variant_parser,
+  );
+
+if (defined $bench)
+{
+  die "invalid argument for --bench: $bench"
+    unless defined $bench{$bench};
+  &{$bench{$bench}}();
+  exit 0;
+}
+else
+{
+  # Launch the bench marking.
+  bench ($grammar, @ARGV);
+}

 
 ### Setup "GNU" style for perl-mode and cperl-mode.
 ## Local Variables:
 
 ### Setup "GNU" style for perl-mode and cperl-mode.
 ## Local Variables: