Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-22 02:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

lalr1.cc: use state_type.

Browse Source 
* data/lalr1.cc (yysyntax_error_): Use state_type.
	Move argument names into yy*.
This commit is contained in:
Akim Demaille
2009-08-16 07:38:40 +02:00
parent 7580c37942
commit ceb8b8e6b5
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2009-08-19 Akim Demaille <demaille@gostai.com>
lalr1.cc: use state_type.
* data/lalr1.cc (yysyntax_error_): Use state_type.
Move argument names into yy*.
2009-08-19 Akim Demaille <demaille@gostai.com> 2009-08-19 Akim Demaille <demaille@gostai.com>
lalr1.cc: get rid of yyparse's yystate. lalr1.cc: get rid of yyparse's yystate.

12
data/lalr1.cc
View File

@@ -232,14 +232,14 @@ do { \
virtual void error (]b4_locations_if([const location_type& loc, ])[const std::string& msg); virtual void error (]b4_locations_if([const location_type& loc, ])[const std::string& msg);
private: private:
/// Generate an error message.
/// \param state the state where the error occurred.
/// \param tok the lookahead token.
virtual std::string yysyntax_error_ (int yystate, int tok);
/// State numbers. /// State numbers.
typedef int state_type; typedef int state_type;
/// Generate an error message.
/// \param yystate the state where the error occurred.
/// \param yytoken the lookahead token.
virtual std::string yysyntax_error_ (state_type yystate, int yytoken);
/// Compute post-reduction state. /// Compute post-reduction state.
/// \param yystate the current state /// \param yystate the current state
/// \param yylhs the nonterminal to push on the stack /// \param yylhs the nonterminal to push on the stack
@@ -946,7 +946,7 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param)));])[
// Generate an error message. // Generate an error message.
std::string std::string
]b4_parser_class_name[::yysyntax_error_ (]dnl ]b4_parser_class_name[::yysyntax_error_ (]dnl
b4_error_verbose_if([int yystate, int yytoken], b4_error_verbose_if([state_type yystate, int yytoken],
[int, int])[) [int, int])[)
{ {
std::string yyres;]b4_error_verbose_if([[ std::string yyres;]b4_error_verbose_if([[