From 07a6e87d46f32a8248c2160ddd2345333f1c84b4 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Wed, 31 Dec 2008 16:12:02 +0100 Subject: [PATCH] Style changes. * etc/bench.pl.in (generate_grammar_list): Consitently use location_type, not yy::location. --- ChangeLog | 6 ++++++ etc/bench.pl.in | 11 +++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6f8b1f68..49153f2a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-02-25 Akim Demaille + + Style changes. + * etc/bench.pl.in (generate_grammar_list): Consitently use + location_type, not yy::location. + 2009-02-25 Akim Demaille Comment change. 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[]) -- 2.50.0