cerc-io/solidity
15
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

Use builtin functions in the yul parser.

Browse Source
This commit is contained in:
chriseth 2018-12-03 17:47:29 +01:00
parent 8654f8f6d4
commit 1746366bb6
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libyul/AsmParser.cpp
View File

@ -114,7 +114,9 @@ Statement Parser::parseStatement()
expectToken(Token::Colon); expectToken(Token::Colon);
assignment.variableName.location = location(); assignment.variableName.location = location();
assignment.variableName.name = YulString(currentLiteral()); assignment.variableName.name = YulString(currentLiteral());
if (instructions().count(assignment.variableName.name.str())) if (m_dialect.builtins->query(assignment.variableName.name))
fatalParserError("Identifier expected, got builtin symbol.");
else if (instructions().count(assignment.variableName.name.str()))
fatalParserError("Identifier expected, got instruction name."); fatalParserError("Identifier expected, got instruction name.");
assignment.location.end = endPosition(); assignment.location.end = endPosition();
expectToken(Token::Identifier); expectToken(Token::Identifier);
@ -174,7 +176,9 @@ Statement Parser::parseStatement()
if (currentToken() == Token::Assign && peekNextToken() != Token::Colon) if (currentToken() == Token::Assign && peekNextToken() != Token::Colon)
{ {
Assignment assignment = createWithLocation<Assignment>(identifier.location); Assignment assignment = createWithLocation<Assignment>(identifier.location);
if (m_dialect.flavour != AsmFlavour::Yul && instructions().count(identifier.name.str())) if (m_dialect.builtins->query(identifier.name))
fatalParserError("Cannot assign to builtin function \"" + identifier.name.str() + "\".");
else if (m_dialect.flavour != AsmFlavour::Yul && instructions().count(identifier.name.str()))
fatalParserError("Cannot use instruction names for identifier names."); fatalParserError("Cannot use instruction names for identifier names.");
advance(); advance();
assignment.variableNames.emplace_back(identifier); assignment.variableNames.emplace_back(identifier);
@ -357,8 +361,10 @@ Parser::ElementaryOperation Parser::parseElementaryOperation()
literal = YulString{"address"}; literal = YulString{"address"};
else else
literal = YulString{currentLiteral()}; literal = YulString{currentLiteral()};
// first search the set of instructions. // first search the set of builtins, then the instructions.
if (m_dialect.flavour != AsmFlavour::Yul && instructions().count(literal.str())) if (m_dialect.builtins->query(literal))
ret = Identifier{location(), literal};
else if (m_dialect.flavour != AsmFlavour::Yul && instructions().count(literal.str()))
{ {
dev::solidity::Instruction const& instr = instructions().at(literal.str()); dev::solidity::Instruction const& instr = instructions().at(literal.str());
ret = Instruction{location(), instr}; ret = Instruction{location(), instr};
@ -592,6 +598,8 @@ YulString Parser::expectAsmIdentifier()
break; break;
} }
} }
else if (m_dialect.builtins->query(name))
fatalParserError("Cannot use builtin function name \"" + name.str() + "\" as identifier name.");
else if (instructions().count(name.str())) else if (instructions().count(name.str()))
fatalParserError("Cannot use instruction names for identifier names."); fatalParserError("Cannot use instruction names for identifier names.");
expectToken(Token::Identifier); expectToken(Token::Identifier);