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

return instructionInfo style

Browse Source
This commit is contained in:
Dimitry
2016-04-04 15:27:09 +04:00
parent 9816510065
commit d43d4347bf
11 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsolidity/inlineasm/AsmParser.cpp
+2 -2
View File
@@ -154,7 +154,7 @@ assembly::Statement Parser::parseElementaryOperation(bool _onlySinglePusher)
dev::solidity::Instruction const& instr = s_instructions[literal];
if (_onlySinglePusher)
{
InstructionInfo info = dev::solidity::getInstructionInfo(instr);
InstructionInfo info = dev::solidity::instructionInfo(instr);
if (info.ret != 1)
fatalParserError("Instruction " + info.name + " not allowed in this context.");
}
@@ -200,7 +200,7 @@ FunctionalInstruction Parser::parseFunctionalInstruction(assembly::Statement con
if (_instruction.type() != typeid(Instruction))
fatalParserError("Assembly instruction required in front of \"(\")");
solidity::Instruction instr = boost::get<solidity::assembly::Instruction>(_instruction).instruction;
InstructionInfo instrInfo = getInstructionInfo(instr);
InstructionInfo instrInfo = instructionInfo(instr);
if (solidity::Instruction::DUP1 <= instr && instr <= solidity::Instruction::DUP16)
fatalParserError("DUPi instructions not allowed for functional notation");
if (solidity::Instruction::SWAP1 <= instr && instr <= solidity::Instruction::SWAP16)