Uniform error messages

ezhangle · May 24, 2017 · 338202e · 338202e
1 parent 130f741
commit 338202e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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<string>(args) +
-					" arguments, but received " +
-					boost::lexical_cast<string>(i)
+					" arguments)"
 				));
 
 			ret.arguments.emplace_back(parseExpression());

diff --git 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)");
 }