From 3da2b67b674f20a59a22e80e399c7d215011b50c Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Thu, 30 Jul 2020 12:12:55 +0100
Subject: [PATCH] simplify parser

---
 libyul/AsmParser.cpp                          | 33 +++++++------------
 .../invalid/bare_instructions_disallowed.sol  |  2 +-
 .../invalid/unbalanced_negative_stack.sol     |  2 +-
 3 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/libyul/AsmParser.cpp b/libyul/AsmParser.cpp
index 00cdb4a22..19d0ced20 100644
--- a/libyul/AsmParser.cpp
+++ b/libyul/AsmParser.cpp
@@ -265,10 +265,12 @@ Expression Parser::parseExpression()
 	RecursionGuard recursionGuard(*this);
 
 	ElementaryOperation operation = parseElementaryOperation();
-	if (holds_alternative<FunctionCall>(operation) || currentToken() == Token::LParen)
-		return parseCall(std::move(operation));
-	else if (holds_alternative<Identifier>(operation))
+	if (holds_alternative<Identifier>(operation))
+	{
+		if (currentToken() == Token::LParen)
+			return parseCall(std::move(operation));
 		return std::get<Identifier>(operation);
+	}
 	else
 	{
 		yulAssert(holds_alternative<Literal>(operation), "");
@@ -284,16 +286,7 @@ Parser::ElementaryOperation Parser::parseElementaryOperation()
 	{
 	case Token::Identifier:
 	{
-		YulString literal{currentLiteral()};
-		if (m_dialect.builtin(literal))
-		{
-			Identifier identifier{currentLocation(), literal};
-			advance();
-			expectToken(Token::LParen, false);
-			return FunctionCall{identifier.location, identifier, {}};
-		}
-		else
-			ret = Identifier{currentLocation(), literal};
+		ret = Identifier{currentLocation(), YulString{currentLiteral()}};
 		advance();
 		break;
 	}
@@ -422,17 +415,13 @@ Expression Parser::parseCall(Parser::ElementaryOperation&& _initialOp)
 {
 	RecursionGuard recursionGuard(*this);
 
-	FunctionCall ret;
-	if (holds_alternative<Identifier>(_initialOp))
-	{
-		ret.functionName = std::move(std::get<Identifier>(_initialOp));
-		ret.location = ret.functionName.location;
-	}
-	else if (holds_alternative<FunctionCall>(_initialOp))
-		ret = std::move(std::get<FunctionCall>(_initialOp));
-	else
+	if (!holds_alternative<Identifier>(_initialOp))
 		fatalParserError(9980_error, "Function name expected.");
 
+	FunctionCall ret;
+	ret.functionName = std::move(std::get<Identifier>(_initialOp));
+	ret.location = ret.functionName.location;
+
 	expectToken(Token::LParen);
 	if (currentToken() != Token::RParen)
 	{
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/bare_instructions_disallowed.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/bare_instructions_disallowed.sol
index a55586af9..87884efee 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/bare_instructions_disallowed.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/bare_instructions_disallowed.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// ParserError 2314: (95-98): Expected '(' but got identifier
+// ParserError 6913: (95-98): Call or assignment expected.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/unbalanced_negative_stack.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/unbalanced_negative_stack.sol
index 3f92beec2..80dd3a587 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/unbalanced_negative_stack.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/unbalanced_negative_stack.sol
@@ -6,4 +6,4 @@ contract test {
     }
 }
 // ----
-// ParserError 2314: (85-86): Expected '(' but got '}'
+// ParserError 6913: (85-86): Call or assignment expected.