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

Disallow instructions in assignment.

Browse Source
This commit is contained in:
chriseth 2017-01-25 17:29:06 +01:00
parent 946a63c26f
commit f62e269115
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libsolidity/inlineasm/AsmParser.cpp
View File

@ -101,6 +101,8 @@ assembly::Statement Parser::parseStatement()
{ {
// functional assignment // functional assignment
FunctionalAssignment funAss = createWithLocation<FunctionalAssignment>(identifier.location); FunctionalAssignment funAss = createWithLocation<FunctionalAssignment>(identifier.location);
if (instructions().count(identifier.name))
fatalParserError("Cannot use instruction names for identifier names.");
m_scanner->next(); m_scanner->next();
funAss.variableName = identifier; funAss.variableName = identifier;
funAss.value.reset(new Statement(parseExpression())); funAss.value.reset(new Statement(parseExpression()));
@ -156,8 +158,6 @@ std::map<string, dev::solidity::Instruction> const& Parser::instructions()
assembly::Statement Parser::parseElementaryOperation(bool _onlySinglePusher) assembly::Statement Parser::parseElementaryOperation(bool _onlySinglePusher)
{ {
map<string, dev::solidity::Instruction> const& s_instructions = instructions();
Statement ret; Statement ret;
switch (m_scanner->currentToken()) switch (m_scanner->currentToken())
{ {
@ -176,9 +176,9 @@ assembly::Statement Parser::parseElementaryOperation(bool _onlySinglePusher)
else else
literal = m_scanner->currentLiteral(); literal = m_scanner->currentLiteral();
// first search the set of instructions. // first search the set of instructions.
if (s_instructions.count(literal)) if (instructions().count(literal))
{ {
dev::solidity::Instruction const& instr = s_instructions.at(literal); dev::solidity::Instruction const& instr = instructions().at(literal);
if (_onlySinglePusher) if (_onlySinglePusher)
{ {
InstructionInfo info = dev::solidity::instructionInfo(instr); InstructionInfo info = dev::solidity::instructionInfo(instr);
@ -210,11 +210,10 @@ assembly::Statement Parser::parseElementaryOperation(bool _onlySinglePusher)
assembly::VariableDeclaration Parser::parseVariableDeclaration() assembly::VariableDeclaration Parser::parseVariableDeclaration()
{ {
map<string, dev::solidity::Instruction> const& s_instructions = instructions();
VariableDeclaration varDecl = createWithLocation<VariableDeclaration>(); VariableDeclaration varDecl = createWithLocation<VariableDeclaration>();
expectToken(Token::Let); expectToken(Token::Let);
varDecl.name = m_scanner->currentLiteral(); varDecl.name = m_scanner->currentLiteral();
if (s_instructions.count(varDecl.name)) if (instructions().count(varDecl.name))
fatalParserError("Cannot use instruction names for identifier names."); fatalParserError("Cannot use instruction names for identifier names.");
expectToken(Token::Identifier); expectToken(Token::Identifier);
expectToken(Token::Colon); expectToken(Token::Colon);