syncline: one line is enough

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

diff --git a/etc/bench.pl.in b/etc/bench.pl.in
index b6143c0877191cbfa6b87e42fdd90d8e540adc1d..6b1e87ddac113a190c4a801f4ca92cb27614133c 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.
 #


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


@@ -285,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";


@@ -318,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


@@ -370,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>


@@ -410,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 */


@@ -527,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;


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


@@ -575,7 +579,7 @@ 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 $token_ctor = grep { /%define "?api.token.constructor"?/ } @directive;

   my $out = new IO::File ">$base.y"
     or die;
   print $out <<EOF;
   my $out = new IO::File ">$base.y"
     or die;
   print $out <<EOF;


@@ -597,12 +601,12 @@ $directives
 
 #define STAGE_MAX    ($max * 10) // max = $max
 
 
 #define STAGE_MAX    ($max * 10) // max = $max
 

-#define USE_LEX_SYMBOL $lex_symbol
+#define USE_TOKEN_CTOR $token_ctor

 #define USE_VARIANTS $variant
 
   // Prototype of the yylex function providing subsequent tokens.
   static
 #define USE_VARIANTS $variant
 
   // Prototype of the yylex function providing subsequent tokens.
   static

-#if USE_LEX_SYMBOL
+#if USE_TOKEN_CTOR

   yy::parser::symbol_type yylex();
 #else
   yy::parser::token_type yylex(yy::parser::semantic_type* yylval,
   yy::parser::symbol_type yylex();
 #else
   yy::parser::token_type yylex(yy::parser::semantic_type* yylval,


@@ -635,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
     }


@@ -658,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
     }


@@ -674,7 +678,7 @@ EOF
 #
 
 static
 #
 
 static

-#if USE_LEX_SYMBOL
+#if USE_TOKEN_CTOR

 yy::parser::symbol_type yylex()
 #else
 yy::parser::token_type yylex(yy::parser::semantic_type* yylval,
 yy::parser::symbol_type yylex()
 #else
 yy::parser::token_type yylex(yy::parser::semantic_type* yylval,


@@ -687,7 +691,7 @@ yy::parser::token_type yylex(yy::parser::semantic_type* yylval,
   ++stage;
   if (stage == STAGE_MAX)
     {
   ++stage;
   if (stage == STAGE_MAX)
     {

-#if USE_LEX_SYMBOL
+#if USE_TOKEN_CTOR

       return yy::parser::make_END_OF_FILE (location_type ());
 #else
       *yylloc = location_type ();
       return yy::parser::make_END_OF_FILE (location_type ());
 #else
       *yylloc = location_type ();


@@ -696,7 +700,7 @@ yy::parser::token_type yylex(yy::parser::semantic_type* yylval,
     }
   else if (stage % 2)
     {
     }
   else if (stage % 2)
     {

-#if USE_LEX_SYMBOL
+#if USE_TOKEN_CTOR

       return yy::parser::make_NUMBER (stage, location_type ());
 #else
 # if defined ONE_STAGE_BUILD
       return yy::parser::make_NUMBER (stage, location_type ());
 #else
 # if defined ONE_STAGE_BUILD


@@ -712,7 +716,7 @@ yy::parser::token_type yylex(yy::parser::semantic_type* yylval,
     }
   else
     {
     }
   else
     {

-#if USE_LEX_SYMBOL
+#if USE_TOKEN_CTOR

       return yy::parser::make_TEXT ("A string.", location_type ());
 #else
 # if defined ONE_STAGE_BUILD
       return yy::parser::make_TEXT ("A string.", location_type ());
 #else
 # if defined ONE_STAGE_BUILD


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

          ));
 }
 
          ));
 }
 


@@ -910,7 +914,7 @@ sub bench_variant_parser ()
             [
               %d variant
               &
             [
               %d variant
               &

-              [ #d ONE_STAGE_BUILD | %d lex_symbol ]
+              [ #d ONE_STAGE_BUILD | %d api.token.constructor ]

             ]
          )
     );
             ]
          )
     );