style: minor changes

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

diff --git a/etc/bench.pl.in b/etc/bench.pl.in
index 5d83fc7be480b952fa6bf9b3e5988b3c0e928496..aaaf143060b73869c8a9e7a632287f9d52df750d 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-2012 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.
 #


@@ -35,6 +35,7 @@ I<directives>:
      | directives & directives  -- Concatenation
      | [ directives> ]          -- Optional
      | ( directives> )          -- Parentheses
      | 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"
      | #d NAME[=VALUE]          -- %code { #define NAME [VALUE] }
      | %d NAME[=VALUE]          -- %define NAME ["VALUE"]
      | %s skeleton              -- %skeleton "skeleton"


@@ -579,7 +580,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;


@@ -601,16 +602,16 @@ $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::symbol_type yylex();
 #else

-  yy::parser::token_type yylex(yy::parser::semantic_type* yylval,
-                               yy::parser::location_type* yylloc);
+  yy::parser::token_type yylex(yy::parser::semantic_type* yylvalp,
+                               yy::parser::location_type* yyllocp);

 #endif
 
   // Conversion to string.
 #endif
 
   // Conversion to string.


@@ -678,11 +679,11 @@ EOF
 #
 
 static
 #
 
 static

-#if USE_LEX_SYMBOL
+#if USE_TOKEN_CTOR

 yy::parser::symbol_type yylex()
 #else
 yy::parser::symbol_type yylex()
 #else

-yy::parser::token_type yylex(yy::parser::semantic_type* yylval,
-                             yy::parser::location_type* yylloc)
+yy::parser::token_type yylex(yy::parser::semantic_type* yylvalp,
+                             yy::parser::location_type* yyllocp)

 #endif
 {
   typedef yy::parser::location_type location_type;
 #endif
 {
   typedef yy::parser::location_type location_type;


@@ -691,42 +692,42 @@ 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
       return yy::parser::make_END_OF_FILE (location_type ());
 #else

-      *yylloc = location_type ();
+      *yyllocp = location_type ();

       return token::END_OF_FILE;
 #endif
     }
   else if (stage % 2)
     {
       return token::END_OF_FILE;
 #endif
     }
   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

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

 # elif USE_VARIANTS
 # elif USE_VARIANTS

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

 # else
 # else

-      yylval->ival = stage;
+      yylvalp->ival = stage;

 # endif
 # endif

-      *yylloc = location_type ();
+      *yyllocp = location_type ();

       return token::NUMBER;
 #endif
     }
   else
     {
       return token::NUMBER;
 #endif
     }
   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

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

 # elif USE_VARIANTS
 # elif USE_VARIANTS

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

 # else
 # else

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

 # endif
 # endif

-      *yylloc = location_type ();
+      *yyllocp = location_type ();

       return token::TEXT;
 #endif
     }
       return token::TEXT;
 #endif
     }


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


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

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

             ]
          )
     );
             ]
          )
     );


@@ -1048,6 +1050,12 @@ sub parse_dirs ()
       @res = ("%skeleton \"$token[0]\"");
       shift @token;
     }
       @res = ("%skeleton \"$token[0]\"");
       shift @token;
     }

+  elsif ($token[0] eq '%b')
+    {
+      shift @token;
+      @res = ("/*\n%bison \"$token[0]\"\\\n*/");
+      shift @token;
+    }

   else
     {
       @res = $token[0];
   else
     {
       @res = $token[0];