aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2017-05-26 16:41:53 +0800
committerAlex Beregszaszi <alex@rtfs.hu>2017-05-26 16:41:53 +0800
commite410cec19ace7ae489c2c58f6d44519234a44ed7 (patch)
tree730c9ad0c89c4ce7194ef89b377ca2e317e4b9e1
parent534d8008e21244680d9a584c05552e2297e3e3b7 (diff)
downloaddexon-solidity-e410cec19ace7ae489c2c58f6d44519234a44ed7.tar
dexon-solidity-e410cec19ace7ae489c2c58f6d44519234a44ed7.tar.gz
dexon-solidity-e410cec19ace7ae489c2c58f6d44519234a44ed7.tar.bz2
dexon-solidity-e410cec19ace7ae489c2c58f6d44519234a44ed7.tar.lz
dexon-solidity-e410cec19ace7ae489c2c58f6d44519234a44ed7.tar.xz
dexon-solidity-e410cec19ace7ae489c2c58f6d44519234a44ed7.tar.zst
dexon-solidity-e410cec19ace7ae489c2c58f6d44519234a44ed7.zip
Better error message for elementary operations
-rw-r--r--libsolidity/inlineasm/AsmParser.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/libsolidity/inlineasm/AsmParser.cpp b/libsolidity/inlineasm/AsmParser.cpp
index 530cd726..79e67af3 100644
--- a/libsolidity/inlineasm/AsmParser.cpp
+++ b/libsolidity/inlineasm/AsmParser.cpp
@@ -82,9 +82,6 @@ assembly::Statement Parser::parseStatement()
expectToken(Token::Identifier);
return assignment;
}
- case Token::Return: // opcode
- case Token::Byte: // opcode
- case Token::Address: // opcode
default:
break;
}
@@ -247,7 +244,7 @@ assembly::Statement Parser::parseElementaryOperation(bool _onlySinglePusher)
fatalParserError(
m_julia ?
"Literal or identifier expected." :
- "Expected elementary inline assembly operation."
+ "Literal, identifier or instruction expected."
);
}
return ret;
@@ -259,7 +256,7 @@ assembly::VariableDeclaration Parser::parseVariableDeclaration()
expectToken(Token::Let);
while (true)
{
- varDecl.variables.push_back(parseTypedName());
+ varDecl.variables.emplace_back(parseTypedName());
if (m_scanner->currentToken() == Token::Comma)
expectToken(Token::Comma);
else