glr.c: remove (broken) support for YYPRINT.

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

diff --git a/etc/bench.pl.in b/etc/bench.pl.in
index a95e646b56a62ac4e6ccb8bdab8d58a63efeec36..5d83fc7be480b952fa6bf9b3e5988b3c0e928496 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-2012 Free Software Foundation, Inc.

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


@@ -57,11 +57,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.


@@ -251,7 +246,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>


@@ -290,8 +284,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";


@@ -323,7 +317,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


@@ -375,8 +371,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>


@@ -415,7 +411,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 */


@@ -532,9 +528,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;


@@ -548,6 +543,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)
     {


@@ -640,13 +639,13 @@ EOF
 
 %%
 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 ($$, $2); }
-| text NUMBER          { $$ = string_cast($2); }
+  /* nothing */         { /* This will generate an empty string */ }
+| text TEXT             { std::swap ($$, $2); }
+| text NUMBER           { $$ = string_cast($2); }

 ;
 EOF
     }
 ;
 EOF
     }


@@ -663,13 +662,13 @@ EOF
 
 %%
 result:
 
 %%
 result:

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

 ;
 
 text:
 ;
 
 text:

-  /* nothing */                { $$ = new std::string; }
-| text TEXT            { delete $1; $$ = $2; }
-| text NUMBER          { delete $1; $$ = new std::string (string_cast ($2)); }
+  /* nothing */         { $$ = new std::string; }
+| text TEXT             { delete $1; $$ = $2; }
+| text NUMBER           { delete $1; $$ = new std::string (string_cast ($2)); }

 ;
 EOF
     }
 ;
 EOF
     }


@@ -693,7 +692,7 @@ yy::parser::token_type yylex(yy::parser::semantic_type* yylval,
   if (stage == STAGE_MAX)
     {
 #if USE_LEX_SYMBOL
   if (stage == STAGE_MAX)
     {
 #if USE_LEX_SYMBOL

-      return yy::parser::make_END_OF_FILE (yy::location());
+      return yy::parser::make_END_OF_FILE (location_type ());

 #else
       *yylloc = location_type ();
       return token::END_OF_FILE;
 #else
       *yylloc = location_type ();
       return token::END_OF_FILE;


@@ -702,7 +701,7 @@ yy::parser::token_type yylex(yy::parser::semantic_type* yylval,
   else if (stage % 2)
     {
 #if USE_LEX_SYMBOL
   else if (stage % 2)
     {
 #if USE_LEX_SYMBOL

-      return yy::parser::make_NUMBER (stage, yy::location());
+      return yy::parser::make_NUMBER (stage, location_type ());

 #else
 # if defined ONE_STAGE_BUILD
       yylval->build(stage);
 #else
 # if defined ONE_STAGE_BUILD
       yylval->build(stage);


@@ -718,7 +717,7 @@ yy::parser::token_type yylex(yy::parser::semantic_type* yylval,
   else
     {
 #if USE_LEX_SYMBOL
   else
     {
 #if USE_LEX_SYMBOL

-      return yy::parser::make_TEXT ("A string.", yy::location());
+      return yy::parser::make_TEXT ("A string.", location_type ());

 #else
 # if defined ONE_STAGE_BUILD
       yylval->build(std::string("A string."));
 #else
 # if defined ONE_STAGE_BUILD
       yylval->build(std::string("A string."));


@@ -736,10 +735,9 @@ yy::parser::token_type yylex(yy::parser::semantic_type* yylval,
 
 // Mandatory error function
 void
 
 // 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[])


@@ -897,7 +895,7 @@ sub bench_push_parser ()
          qw(
             [ %d api.pure ]
             &
          qw(
             [ %d api.pure ]
             &

-            [ %d api.push_pull=both ]
+            [ %d api.push-pull=both ]

          ));
 }
 
          ));
 }
 


@@ -922,25 +920,6 @@ sub bench_variant_parser ()
     );
 }
 
     );
 }
 

-######################################################################
-
-=item C<bench_fusion_parser ()>
-
-Bench the C++ lalr1.cc parser using Boost.Variants or %union.
-
-=cut
-
-sub bench_fusion_parser ()
-{
-  bench ('list',
-         qw(
-             %s lalr1-split.cc
-           |
-             %s lalr1.cc
-         )
-    );
-}
-

 ############################################################################
 
 sub help ($)
 ############################################################################
 
 sub help ($)


@@ -1126,7 +1105,6 @@ verbose 2, "Grammar: $grammar\n";
 # Support -b: predefined benches.
 my %bench =
   (
 # Support -b: predefined benches.
 my %bench =
   (

-   "fusion"   => \&bench_fusion_parser,

    "push"     => \&bench_push_parser,
    "variant"  => \&bench_variant_parser,
   );
    "push"     => \&bench_push_parser,
    "variant"  => \&bench_variant_parser,
   );