cerc-io/solidity
11
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Display nicer error messages in the parser (display tokens and not internal names)

Browse Source
This commit is contained in:
Alex Beregszaszi
2018-05-04 12:39:37 +01:00
parent 81d61ca086
commit e3279d8af8
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsolidity/parsing/ParserBase.cpp
+11 -11
View File
@@ -71,10 +71,10 @@ void ParserBase::expectToken(Token::Value _value, bool _advance)
if (Token::isReservedKeyword(tok))
{
fatalParserError(
string("Expected token ") +
string(Token::name(_value)) +
string(" got reserved keyword '") +
string(Token::name(tok)) +
string("Expected '") +
string(Token::toString(_value)) +
string("' but got reserved keyword '") +
string(Token::toString(tok)) +
string("'")
);
}
@@ -82,19 +82,19 @@ void ParserBase::expectToken(Token::Value _value, bool _advance)
{
ElementaryTypeNameToken elemTypeName = m_scanner->currentElementaryTypeNameToken();
fatalParserError(
string("Expected token ") +
string(Token::name(_value)) +
string(" got '") +
string("Expected '") +
string(Token::toString(_value)) +
string("' but got '") +
elemTypeName.toString() +
string("'")
);
}
else
fatalParserError(
string("Expected token ") +
string(Token::name(_value)) +
string(" got '") +
string(Token::name(m_scanner->currentToken())) +
string("Expected '") +
string(Token::toString(_value)) +
string("' but got '") +
string(Token::toString(m_scanner->currentToken())) +
string("'")
);
}