From 56fe3a6ab93116438ea52634e891c71b995d7c3f Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Wed, 24 May 2017 13:13:05 +0100 Subject: [PATCH 1/3] Better error messages during parsing functional instructions --- Changelog.md | 4 ++++ libsolidity/inlineasm/AsmParser.cpp | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/Changelog.md b/Changelog.md index 2073c0a4e..5ba712f53 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,9 @@ ### 0.4.12 (unreleased) + +Features: * AST: export all attributes to Json format + * Inline Assembly: Present proper error message when not supplying enough arguments to a functional + instruction. Bugfixes: * Unused variable warnings no longer issued for variables used inside inline assembly diff --git a/libsolidity/inlineasm/AsmParser.cpp b/libsolidity/inlineasm/AsmParser.cpp index 85ae94241..519bfa2eb 100644 --- a/libsolidity/inlineasm/AsmParser.cpp +++ b/libsolidity/inlineasm/AsmParser.cpp @@ -321,6 +321,15 @@ 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 " + + boost::lexical_cast(args) + + " arguments, but received " + + boost::lexical_cast(i) + )); + ret.arguments.emplace_back(parseExpression()); if (i != args - 1) { From 130f7419fb4b7d40a212454fe870e9e135813bf1 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Wed, 24 May 2017 13:23:53 +0100 Subject: [PATCH 2/3] Add tests --- test/libsolidity/InlineAssembly.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/test/libsolidity/InlineAssembly.cpp b/test/libsolidity/InlineAssembly.cpp index f155cba73..6ab2a12d7 100644 --- a/test/libsolidity/InlineAssembly.cpp +++ b/test/libsolidity/InlineAssembly.cpp @@ -270,6 +270,17 @@ BOOST_AUTO_TEST_CASE(invalid_tuple_assignment) CHECK_PARSE_ERROR("{ 42 let x, y := 1 }", DeclarationError, "Variable count mismatch."); } +BOOST_AUTO_TEST_CASE(instruction_too_few_arguments) +{ + CHECK_PARSE_ERROR("{ mul() }", ParserError, "Expected 2 arguments, but received 0"); + CHECK_PARSE_ERROR("{ mul(1) }", ParserError, "Expected comma (MUL expects 2 arguments)"); +} + +BOOST_AUTO_TEST_CASE(instruction_too_many_arguments) +{ + CHECK_PARSE_ERROR("{ mul(1, 2, 3) }", ParserError, "Expected ')' (MUL expects 2 arguments)"); +} + BOOST_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE(Printing) From 338202ea96e0af8822dde3acc27aa45f79c8780b Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Wed, 24 May 2017 13:27:58 +0100 Subject: [PATCH 3/3] Uniform error messages --- libsolidity/inlineasm/AsmParser.cpp | 7 ++++--- test/libsolidity/InlineAssembly.cpp | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libsolidity/inlineasm/AsmParser.cpp b/libsolidity/inlineasm/AsmParser.cpp index 519bfa2eb..530cd726d 100644 --- a/libsolidity/inlineasm/AsmParser.cpp +++ b/libsolidity/inlineasm/AsmParser.cpp @@ -324,10 +324,11 @@ assembly::Statement Parser::parseCall(assembly::Statement&& _instruction) /// check for premature closing parentheses if (m_scanner->currentToken() == Token::RParen) fatalParserError(string( - "Expected " + + "Expected expression (" + + instrInfo.name + + " expects " + boost::lexical_cast(args) + - " arguments, but received " + - boost::lexical_cast(i) + " arguments)" )); ret.arguments.emplace_back(parseExpression()); diff --git a/test/libsolidity/InlineAssembly.cpp b/test/libsolidity/InlineAssembly.cpp index 6ab2a12d7..618927616 100644 --- a/test/libsolidity/InlineAssembly.cpp +++ b/test/libsolidity/InlineAssembly.cpp @@ -272,7 +272,7 @@ BOOST_AUTO_TEST_CASE(invalid_tuple_assignment) BOOST_AUTO_TEST_CASE(instruction_too_few_arguments) { - CHECK_PARSE_ERROR("{ mul() }", ParserError, "Expected 2 arguments, but received 0"); + CHECK_PARSE_ERROR("{ mul() }", ParserError, "Expected expression (MUL expects 2 arguments)"); CHECK_PARSE_ERROR("{ mul(1) }", ParserError, "Expected comma (MUL expects 2 arguments)"); }