aboutsummaryrefslogtreecommitdiffstats
path: root/libsolidity/inlineasm/AsmParser.cpp
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2017-05-24 21:03:49 +0800
committerGitHub <noreply@github.com>2017-05-24 21:03:49 +0800
commitafe0a5404f4012650e6bea1f2ac0696dc464e2d1 (patch)
tree404fd5f4f71b470c7172a36d2fc35ffbe601b2b1 /libsolidity/inlineasm/AsmParser.cpp
parent451acd4c9f118a299e627d574dee1785d870723a (diff)
parent338202ea96e0af8822dde3acc27aa45f79c8780b (diff)
downloaddexon-solidity-afe0a5404f4012650e6bea1f2ac0696dc464e2d1.tar
dexon-solidity-afe0a5404f4012650e6bea1f2ac0696dc464e2d1.tar.gz
dexon-solidity-afe0a5404f4012650e6bea1f2ac0696dc464e2d1.tar.bz2
dexon-solidity-afe0a5404f4012650e6bea1f2ac0696dc464e2d1.tar.lz
dexon-solidity-afe0a5404f4012650e6bea1f2ac0696dc464e2d1.tar.xz
dexon-solidity-afe0a5404f4012650e6bea1f2ac0696dc464e2d1.tar.zst
dexon-solidity-afe0a5404f4012650e6bea1f2ac0696dc464e2d1.zip
Merge pull request #2302 from ethereum/inlineasm-better-errors
Better error messages for parsing functional assembly instructions
Diffstat (limited to 'libsolidity/inlineasm/AsmParser.cpp')
-rw-r--r--libsolidity/inlineasm/AsmParser.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/libsolidity/inlineasm/AsmParser.cpp b/libsolidity/inlineasm/AsmParser.cpp
index 85ae9424..530cd726 100644
--- a/libsolidity/inlineasm/AsmParser.cpp
+++ b/libsolidity/inlineasm/AsmParser.cpp
@@ -321,6 +321,16 @@ assembly::Statement Parser::parseCall(assembly::Statement&& _instruction)
unsigned args = unsigned(instrInfo.args);
for (unsigned i = 0; i < args; ++i)
{
+ /// check for premature closing parentheses
+ if (m_scanner->currentToken() == Token::RParen)
+ fatalParserError(string(
+ "Expected expression (" +
+ instrInfo.name +
+ " expects " +
+ boost::lexical_cast<string>(args) +
+ " arguments)"
+ ));
+
ret.arguments.emplace_back(parseExpression());
if (i != args - 1)
{