X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/918eb7c5ae9ec56d998fe931cc437cb626fe5cb4..42fef012562597732cdf8044dbd4602bf1122170:/etc/bench.pl.in diff --git a/etc/bench.pl.in b/etc/bench.pl.in index 1ee98b7f..30d0a996 100755 --- a/etc/bench.pl.in +++ b/etc/bench.pl.in @@ -1,6 +1,6 @@ #! /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. # @@ -35,6 +35,7 @@ I: | 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" @@ -57,11 +58,6 @@ request. =over 4 -=item I - -Test F with three stacks against F which -uses a single one. - =item I Test the push parser vs. the pull interface. Use the C parser. @@ -208,9 +204,9 @@ Format the list of directives for Bison for bench named C<$bench>. 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 .= "/* End of directives for bench `$bench'. */\n"; + $res .= "/* End of directives for bench '$bench'. */\n"; return $res; } @@ -251,7 +247,6 @@ sub generate_grammar_triangular ($$@) or die; print $out < #include @@ -290,8 +285,8 @@ for my $size (1 .. $max) { use Text::Wrap; print $out wrap ("| ", " ", - (map { "\"$_\"" } (1 .. $size)), - " END \n"), + (map { "\"$_\"" } (1 .. $size)), + " END \n"), " { \$\$ = $size; }\n"; }; print $out ";\n"; @@ -323,7 +318,9 @@ yyerror (const char *msg) int main (void) { +#if YYDEBUG yydebug = !!getenv ("YYDEBUG"); +#endif return yyparse (); } EOF @@ -375,8 +372,8 @@ sub generate_grammar_calc ($$@) or die; print $out < #include - #include #include #include @@ -415,7 +412,7 @@ static int yylex (void); %token NUM "number" %type exp -%nonassoc '=' /* comparison */ +%nonassoc '=' /* comparison */ %left '-' '+' %left '*' '/' %left NEG /* negation--unary minus */ @@ -532,9 +529,8 @@ yylex (void) static int power (int base, int exponent) { + assert (0 <= exponent); int res = 1; - if (exponent < 0) - exit (3); for (/* Niente */; exponent; --exponent) res *= base; return res; @@ -548,6 +544,10 @@ main (int argc, const char **argv) int count = 0; int status; +#if YYDEBUG + yydebug = !!getenv ("YYDEBUG"); +#endif + input = fopen ("calc.input", "r"); if (!input) { @@ -580,11 +580,13 @@ sub generate_grammar_list ($$@) my ($base, $max, @directive) = @_; my $directives = directives ($base, @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 < #include -// 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 USE_TOKEN_CTOR $token_ctor #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_TOKEN_CTOR + yy::parser::symbol_type yylex(); #else -# define IF_ONE_STAGE_BUILD(True, False) False + yy::parser::token_type yylex(yy::parser::semantic_type* yylvalp, + yy::parser::location_type* yyllocp); #endif // Conversion to string. @@ -627,6 +625,8 @@ static yy::parser::token_type yylex(yy::parser::semantic_type* yylval); return o.str (); } } + +%token END_OF_FILE 0 EOF if ($variant) @@ -636,18 +636,17 @@ EOF %token NUMBER %printer { std::cerr << "Number: " << $$; } %printer { std::cerr << "Text: " << $$; } -%token END_OF_FILE 0 %type text result %% result: - text { /* Throw away the result. */ } + text { /* Throw away the result. */ } ; 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 } @@ -660,67 +659,86 @@ EOF %token NUMBER %printer { std::cerr << "Number: " << $$; } %printer { std::cerr << "Text: " << *$$; } -%token END_OF_FILE 0 %type text result %% result: - text { delete $1; } + text { delete $1; } ; 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 } print $out <<'EOF'; %% +# + 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) - 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) { -#if USE_VARIANTS -# ifdef ONE_STAGE_BUILD - yylval->build(stage); +#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() = stage; # else - yylval->build() = stage; + yylvalp->ival = stage; # endif -#else - yylval->ival = stage; + *yyllocp = location_type (); + return token::NUMBER; #endif - return yy::parser::token::NUMBER; } else { -#if USE_VARIANTS -# ifdef ONE_STAGE_BUILD - yylval->build(std::string("A string.")); +#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("A string."); # else - yylval->build() = std::string("A string."); + yylvalp->sval = new std::string("A string."); # endif -#else - yylval->sval = new std::string("A string."); + *yyllocp = location_type (); + return token::TEXT; #endif - return yy::parser::token::TEXT; } 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[]) @@ -789,7 +807,8 @@ sub compile ($) 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"; } @@ -878,7 +897,7 @@ sub bench_push_parser () qw( [ %d api.pure ] & - [ %d api.push_pull=both ] + [ %d api.push-pull=both ] )); } @@ -886,7 +905,7 @@ sub bench_push_parser () =item C -Bench the C++ lalr1.cc parser using Boost.Variants or %union. +Bench the C++ lalr1.cc parser using variants or %union. =cut @@ -894,37 +913,15 @@ sub bench_variant_parser () { bench ('list', qw( - [ %debug ] - & - [ %d variant - & - [ #d VARIANT_DESTROY ] + [ + %d variant & - [ #d ONE_STAGE_BUILD ] + [ #d ONE_STAGE_BUILD | %d api.token.constructor ] ] ) ); } -###################################################################### - -=item C - -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 ($) @@ -995,7 +992,7 @@ sub parse_term () { for my $lhs (@lhs) { - push @res, "$lhs\n$rhs"; + push @res, $lhs . ($lhs && $rhs ? "\n" : "") . $rhs; } } } @@ -1053,6 +1050,12 @@ sub parse_dirs () @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]; @@ -1110,7 +1113,6 @@ verbose 2, "Grammar: $grammar\n"; # Support -b: predefined benches. my %bench = ( - "fusion" => \&bench_fusion_parser, "push" => \&bench_push_parser, "variant" => \&bench_variant_parser, );