ilusha/lalr
1
0
Fork 0
mirror of https://github.com/cwbaker/lalr.git synced 2026-09-26 16:33:18 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Report symbol in syntax error if available

Browse source
This commit is contained in:
Charles Baker 2023-03-22 20:26:12 +13:00
parent 305b73ebf4
commit bc8a6dbebc
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/lalr/Parser.ipp
View file

@ -709,6 +709,7 @@ void Parser<Iterator, UserData, Char, Traits, Allocator>::error( bool* accepted,
LALR_ASSERT( rejected );
const std::basic_string<Char, Traits, Allocator> lexeme = lexer_.lexeme();
const ParserSymbol* symbol = reinterpret_cast<const ParserSymbol*>( lexer_.symbol() );
const ParserState* state = !nodes_.empty() ? nodes_.back().state() : nullptr;
bool handled = false;
@ -744,7 +745,14 @@ void Parser<Iterator, UserData, Char, Traits, Allocator>::error( bool* accepted,
if ( nodes_.empty() )
{
fire_error( line, column, PARSER_ERROR_SYNTAX, "Syntax error on '%s' when expecting %s", lexeme.c_str(), expected_symbols(state).c_str() );
if ( symbol )
{
fire_error( line, column, PARSER_ERROR_SYNTAX, "Syntax error on %s '%s' when expecting %s", symbol->identifier, lexeme.c_str(), expected_symbols(state).c_str() );
}
else
{
fire_error( line, column, PARSER_ERROR_SYNTAX, "Syntax error on '%s' when expecting %s", lexeme.c_str(), expected_symbols(state).c_str() );
}
*rejected = true;
}
}