diff options
author | Akim Demaille <akim@lrde.epita.fr> | 2012-11-01 17:54:13 +0100 |
---|---|---|
committer | Akim Demaille <akim@lrde.epita.fr> | 2012-11-01 18:26:04 +0100 |
commit | e36ec1f41ffbe9f00db405c775201dbbc384c45c (patch) | |
tree | 9dba9decea9284924431669131ab282780411a70 /etc | |
parent | 0b3287025df27584045a91a006eb63665909cab9 (diff) | |
download | bison-e36ec1f41ffbe9f00db405c775201dbbc384c45c.tar.gz |
lalr1.cc: rename lex_symbol as api.token.constructor
* data/bison.m4 (b4_lex_symbol_if): Rename as...
(b4_token_ctor_if): this.
Depend upon api.token.constructor.
* data/c++.m4, data/lalr1.cc: Adjust.
* doc/bison.texi: Fix all the occurrences of lex_symbol.
* etc/bench.pl.in: Adjust.
* examples/variant.yy: Likewise.
* tests/local.at (AT_BISON_OPTION_PUSHDEFS, AT_BISON_OPTION_POPDEFS):
Handle AT_TOKEN_CTOR_IF.
* tests/c++.at: Adjust to using api.token.constructor and AT_TOKEN_CTOR_IF.
Simplify the test of both build call styles.
(AT_CHECK_VARIANTS): Rename as...
(AT_TEST): this.
And undef when done.
Diffstat (limited to 'etc')
-rwxr-xr-x | etc/bench.pl.in | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/etc/bench.pl.in b/etc/bench.pl.in index 5d83fc7b..6b1e87dd 100755 --- a/etc/bench.pl.in +++ b/etc/bench.pl.in @@ -579,7 +579,7 @@ 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 $token_ctor = grep { /%define "?api.token.constructor"?/ } @directive; my $out = new IO::File ">$base.y" or die; print $out <<EOF; @@ -601,12 +601,12 @@ $directives #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 -#if USE_LEX_SYMBOL +#if USE_TOKEN_CTOR yy::parser::symbol_type yylex(); #else yy::parser::token_type yylex(yy::parser::semantic_type* yylval, @@ -678,7 +678,7 @@ EOF # 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, @@ -691,7 +691,7 @@ yy::parser::token_type yylex(yy::parser::semantic_type* yylval, ++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 (); @@ -700,7 +700,7 @@ yy::parser::token_type yylex(yy::parser::semantic_type* yylval, } 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 @@ -716,7 +716,7 @@ yy::parser::token_type yylex(yy::parser::semantic_type* yylval, } else { -#if USE_LEX_SYMBOL +#if USE_TOKEN_CTOR return yy::parser::make_TEXT ("A string.", location_type ()); #else # if defined ONE_STAGE_BUILD @@ -914,7 +914,7 @@ sub bench_variant_parser () [ %d variant & - [ #d ONE_STAGE_BUILD | %d lex_symbol ] + [ #d ONE_STAGE_BUILD | %d api.token.constructor ] ] ) ); |