diff options
author | Akim Demaille <demaille@gostai.com> | 2008-12-31 16:12:02 +0100 |
---|---|---|
committer | Akim Demaille <demaille@gostai.com> | 2009-02-25 23:31:34 +0100 |
commit | 07a6e87d46f32a8248c2160ddd2345333f1c84b4 (patch) | |
tree | 0c81b1d606b918bf42b917f3ace2d18fb11ed1e5 /etc | |
parent | 33c78bd23ed6e92b9377ab39136e9469e6ef7983 (diff) | |
download | bison-07a6e87d46f32a8248c2160ddd2345333f1c84b4.tar.gz |
Style changes.
* etc/bench.pl.in (generate_grammar_list): Consitently use
location_type, not yy::location.
Diffstat (limited to 'etc')
-rwxr-xr-x | etc/bench.pl.in | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/etc/bench.pl.in b/etc/bench.pl.in index cf4815ef..b6143c08 100755 --- a/etc/bench.pl.in +++ b/etc/bench.pl.in @@ -688,7 +688,7 @@ yy::parser::token_type yylex(yy::parser::semantic_type* yylval, if (stage == STAGE_MAX) { #if USE_LEX_SYMBOL - return yy::parser::make_END_OF_FILE (yy::location()); + return yy::parser::make_END_OF_FILE (location_type ()); #else *yylloc = location_type (); return token::END_OF_FILE; @@ -697,7 +697,7 @@ yy::parser::token_type yylex(yy::parser::semantic_type* yylval, else if (stage % 2) { #if USE_LEX_SYMBOL - return yy::parser::make_NUMBER (stage, yy::location()); + return yy::parser::make_NUMBER (stage, location_type ()); #else # if defined ONE_STAGE_BUILD yylval->build(stage); @@ -713,7 +713,7 @@ yy::parser::token_type yylex(yy::parser::semantic_type* yylval, else { #if USE_LEX_SYMBOL - return yy::parser::make_TEXT ("A string.", yy::location()); + return yy::parser::make_TEXT ("A string.", location_type ()); #else # if defined ONE_STAGE_BUILD yylval->build(std::string("A string.")); @@ -731,10 +731,9 @@ yy::parser::token_type yylex(yy::parser::semantic_type* yylval, // 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[]) |