aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2018-05-03 02:59:05 +0800
committerAlex Beregszaszi <alex@rtfs.hu>2018-05-04 20:27:05 +0800
commitcc108390737dfb8d774622d76e69e94485b0f7b5 (patch)
treefdd22f74f5805fab7aad6b0ab50b1a8950a80963
parentc7ee649d8033aedf49f83342c76984fe53449679 (diff)
downloaddexon-solidity-cc108390737dfb8d774622d76e69e94485b0f7b5.tar
dexon-solidity-cc108390737dfb8d774622d76e69e94485b0f7b5.tar.gz
dexon-solidity-cc108390737dfb8d774622d76e69e94485b0f7b5.tar.bz2
dexon-solidity-cc108390737dfb8d774622d76e69e94485b0f7b5.tar.lz
dexon-solidity-cc108390737dfb8d774622d76e69e94485b0f7b5.tar.xz
dexon-solidity-cc108390737dfb8d774622d76e69e94485b0f7b5.tar.zst
dexon-solidity-cc108390737dfb8d774622d76e69e94485b0f7b5.zip
Have more uniform parser errors
-rw-r--r--libsolidity/inlineasm/AsmParser.cpp8
-rw-r--r--libsolidity/parsing/Parser.cpp2
2 files changed, 5 insertions, 5 deletions
diff --git a/libsolidity/inlineasm/AsmParser.cpp b/libsolidity/inlineasm/AsmParser.cpp
index 7f618e07..d3b0808b 100644
--- a/libsolidity/inlineasm/AsmParser.cpp
+++ b/libsolidity/inlineasm/AsmParser.cpp
@@ -276,7 +276,7 @@ assembly::Expression Parser::parseExpression()
int args = instructionInfo(instr.instruction).args;
if (args > 0 && currentToken() != Token::LParen)
fatalParserError(string(
- "Expected token \"(\" (\"" +
+ "Expected '(' (instruction \"" +
instructionNames().at(instr.instruction) +
"\" expects " +
boost::lexical_cast<string>(args) +
@@ -504,7 +504,7 @@ assembly::Expression Parser::parseCall(Parser::ElementaryOperation&& _initialOp)
/// check for premature closing parentheses
if (currentToken() == Token::RParen)
fatalParserError(string(
- "Expected expression (\"" +
+ "Expected expression (instruction \"" +
instructionNames().at(instr) +
"\" expects " +
boost::lexical_cast<string>(args) +
@@ -516,7 +516,7 @@ assembly::Expression Parser::parseCall(Parser::ElementaryOperation&& _initialOp)
{
if (currentToken() != Token::Comma)
fatalParserError(string(
- "Expected comma (\"" +
+ "Expected ',' (instruction \"" +
instructionNames().at(instr) +
"\" expects " +
boost::lexical_cast<string>(args) +
@@ -529,7 +529,7 @@ assembly::Expression Parser::parseCall(Parser::ElementaryOperation&& _initialOp)
ret.location.end = endPosition();
if (currentToken() == Token::Comma)
fatalParserError(string(
- "Expected ')' (\"" +
+ "Expected ')' (instruction \"" +
instructionNames().at(instr) +
"\" expects " +
boost::lexical_cast<string>(args) +
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index 37732a37..49745e29 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -528,7 +528,7 @@ ASTPointer<EnumDefinition> Parser::parseEnumDefinition()
break;
expectToken(Token::Comma);
if (m_scanner->currentToken() != Token::Identifier)
- fatalParserError(string("Expected Identifier after ','"));
+ fatalParserError(string("Expected identifier after ','"));
}
if (members.size() == 0)
parserError({"enum with no members is not allowed."});