X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/ce6719605b81aa7b19c6f9615a78a4fd18bfdb42..5679f31101d0bc5aab6adbce37212b2fdedd32cd:/etc/bench.pl.in diff --git a/etc/bench.pl.in b/etc/bench.pl.in index d365d653..f8fca8ac 100755 --- a/etc/bench.pl.in +++ b/etc/bench.pl.in @@ -35,8 +35,9 @@ I: | directives & directives -- Concatenation | [ directives> ] -- Optional | ( directives> ) -- Parentheses + | #d NAME[=VALUE] -- %code { #define NAME [VALUE] } + | %d NAME[=VALUE] -- %define NAME ["VALUE"] | %s skeleton -- %skeleton "skeleton" - | #d definition -- %code { #define definition } | directive Parentheses only group to override precedence. For instance: @@ -579,11 +580,13 @@ sub generate_grammar_list ($$@) my ($base, $max, @directive) = @_; my $directives = directives ($base, @directive); my $variant = grep { /%define "?variant"?/ } @directive; + my $lex_symbol = grep { /%define "?lex_symbol"?/ } @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_LEX_SYMBOL $lex_symbol #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_LEX_SYMBOL + yy::parser::symbol_type yylex(); #else -# define IF_ONE_STAGE_BUILD(True, False) False + yy::parser::token_type yylex(yy::parser::semantic_type* yylval, + yy::parser::location_type* yylloc); #endif + + // Conversion to string. + template + inline + std::string + string_cast (const T& t) + { + std::ostringstream o; + o << t; + return o.str (); + } } + +%token END_OF_FILE 0 EOF if ($variant) @@ -624,7 +636,6 @@ EOF %token NUMBER %printer { std::cerr << "Number: " << $$; } %printer { std::cerr << "Text: " << $$; } -%token END_OF_FILE 0 %type text result %% @@ -635,11 +646,7 @@ result: text: /* nothing */ { /* This will generate an empty string */ } | text TEXT { std::swap ($$, $2); } -| text NUMBER { - std::ostringstream ss; - ss << ' ' << $2; - $$ = ss.str(); - } +| text NUMBER { $$ = string_cast($2); } ; EOF } @@ -652,7 +659,6 @@ EOF %token NUMBER %printer { std::cerr << "Number: " << $$; } %printer { std::cerr << "Text: " << *$$; } -%token END_OF_FILE 0 %type text result %% @@ -663,51 +669,70 @@ result: text: /* nothing */ { $$ = new std::string; } | text TEXT { delete $1; $$ = $2; } -| text NUMBER { - delete $1; - std::ostringstream ss; - ss << ' ' << $2; - $$ = new std::string (ss.str()); - } +| 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_LEX_SYMBOL +yy::parser::symbol_type yylex() +#else +yy::parser::token_type yylex(yy::parser::semantic_type* yylval, + yy::parser::location_type* yylloc) +#endif { + typedef yy::parser::token token; static int stage = -1; ++stage; if (stage == STAGE_MAX) - return yy::parser::token::END_OF_FILE; + { +#if USE_LEX_SYMBOL + return yy::parser::make_symbol (yy::location()); +#else + *yylloc = yy::location (); + return token::END_OF_FILE; +#endif + } else if (stage % 2) { -#if USE_VARIANTS -# ifdef ONE_STAGE_BUILD +#if USE_LEX_SYMBOL + return yy::parser::make_symbol (stage, yy::location()); +#elif defined ONE_STAGE_BUILD yylval->build(stage); -# else + *yylloc = yy::location (); + return token::NUMBER; +#elif USE_VARIANTS yylval->build() = stage; -# endif + *yylloc = yy::location (); + return token::NUMBER; #else yylval->ival = stage; + *yylloc = yy::location (); + return token::NUMBER; #endif - return yy::parser::token::NUMBER; } else { -#if USE_VARIANTS -# ifdef ONE_STAGE_BUILD +#if USE_LEX_SYMBOL + return yy::parser::make_symbol ("A string.", yy::location()); +#elif defined ONE_STAGE_BUILD yylval->build(std::string("A string.")); -# else + *yylloc = yy::location (); + return token::TEXT; +#elif USE_VARIANTS yylval->build() = std::string("A string."); -# endif + *yylloc = yy::location (); + return token::TEXT; #else yylval->sval = new std::string("A string."); + *yylloc = yy::location (); + return token::TEXT; #endif - return yy::parser::token::TEXT; } abort(); } @@ -872,10 +897,10 @@ interfaces. sub bench_push_parser () { bench ('calc', - ( - '[', '%define api.pure', ']', - '&', - '[', '%define api.push_pull "both"', ']' + qw( + [ %d api.pure ] + & + [ %d api.push_pull=both ] )); } @@ -883,7 +908,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 @@ -891,15 +916,10 @@ sub bench_variant_parser () { bench ('list', qw( - %s lalr1.cc - & - [ %debug ] - & - [ %define variant + [ + %d variant & - [ #d VARIANT_DESTROY ] - & - [ #d ONE_STAGE_BUILD ] + [ #d ONE_STAGE_BUILD | %d lex_symbol ] ] ) ); @@ -939,30 +959,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; +# 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 -# dirs: %s SKELETON | #d DEFINE | directive +# dirs: %s SKELETON | #d NAME[=VALUE] | %d NAME[=VALUE] | directive sub parse (@) { - @token = @_; + @token = (@_, $eod); verbose 3, "Parsing: @token\n"; my @res = parse_expr (); - die "expected end of directives, unexpected: @token" - if defined $token[0]; + eat ($eod); return @res; } 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 (); } @@ -972,9 +1004,9 @@ sub parse_expr () 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 = (); @@ -982,7 +1014,7 @@ sub parse_term () { for my $lhs (@lhs) { - push @res, "$lhs\n$rhs"; + push @res, $lhs . ($lhs && $rhs ? "\n" : "") . $rhs; } } } @@ -997,19 +1029,15 @@ sub parse_fact () if ($token[0] eq '(') { - shift @token; + eat ('('); @res = parse_expr (); - die "unexpected $token[0], expected )" - unless $token[0] eq ')'; - shift @token; + eat (')'); } elsif ($token[0] eq '[') { - shift @token; + eat ('['); @res = (parse_expr (), ''); - die "unexpected $token[0], expected ]" - unless $token[0] eq ']'; - shift @token; + eat (']'); } else { @@ -1025,9 +1053,17 @@ sub parse_dirs () 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; - @res = ("%code {\n#define\n}"); + $token[0] =~ s/(.*?)=(.*)/$1 "$2"/; + @res = ("%define $token[0]"); shift @token; } elsif ($token[0] eq '%s')