cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

simplify parser

Browse Source
This commit is contained in:
Alex Beregszaszi 2020-07-30 12:12:55 +01:00 committed by chriseth
parent 3862ceb528
commit 3da2b67b67
3 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
libyul/AsmParser.cpp
View File

@ -265,10 +265,12 @@ Expression Parser::parseExpression()
RecursionGuard recursionGuard(*this); RecursionGuard recursionGuard(*this);
ElementaryOperation operation = parseElementaryOperation(); ElementaryOperation operation = parseElementaryOperation();
if (holds_alternative<FunctionCall>(operation) || currentToken() == Token::LParen) if (holds_alternative<Identifier>(operation))
return parseCall(std::move(operation)); {
else if (holds_alternative<Identifier>(operation)) if (currentToken() == Token::LParen)
return parseCall(std::move(operation));
return std::get<Identifier>(operation); return std::get<Identifier>(operation);
}
else else
{ {
yulAssert(holds_alternative<Literal>(operation), ""); yulAssert(holds_alternative<Literal>(operation), "");
@ -284,16 +286,7 @@ Parser::ElementaryOperation Parser::parseElementaryOperation()
{ {
case Token::Identifier: case Token::Identifier:
{ {
YulString literal{currentLiteral()}; ret = Identifier{currentLocation(), YulString{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};
advance(); advance();
break; break;
} }
@ -422,17 +415,13 @@ Expression Parser::parseCall(Parser::ElementaryOperation&& _initialOp)
{ {
RecursionGuard recursionGuard(*this); RecursionGuard recursionGuard(*this);
FunctionCall ret; if (!holds_alternative<Identifier>(_initialOp))
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
fatalParserError(9980_error, "Function name expected."); fatalParserError(9980_error, "Function name expected.");
FunctionCall ret;
ret.functionName = std::move(std::get<Identifier>(_initialOp));
ret.location = ret.functionName.location;
expectToken(Token::LParen); expectToken(Token::LParen);
if (currentToken() != Token::RParen) if (currentToken() != Token::RParen)
{ {

2
test/libsolidity/syntaxTests/inlineAssembly/invalid/bare_instructions_disallowed.sol
View File

@ -7,4 +7,4 @@ contract C {
} }
} }
// ---- // ----
// ParserError 2314: (95-98): Expected '(' but got identifier // ParserError 6913: (95-98): Call or assignment expected.

2
test/libsolidity/syntaxTests/inlineAssembly/invalid/unbalanced_negative_stack.sol
View File

@ -6,4 +6,4 @@ contract test {
} }
} }
// ---- // ----
// ParserError 2314: (85-86): Expected '(' but got '}' // ParserError 6913: (85-86): Call or assignment expected.