diff options
| author | chriseth <chris@ethereum.org> | 2017-02-24 17:39:55 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-24 17:39:55 +0800 |
| commit | 92bf5154fdcf0dfee40bfb5795729a4a9fa71dd6 (patch) | |
| tree | 4f5d35f34c7598e0640576376d9e4544378ed0f8 /libsolidity/inlineasm/AsmParser.h | |
| parent | dcc16c81e26f31141ae766096873b5fd7741cdf5 (diff) | |
| parent | bec3c6fab6bf02aea5664be4423f45e98db22e8e (diff) | |
| download | dexon-solidity-92bf5154fdcf0dfee40bfb5795729a4a9fa71dd6.tar dexon-solidity-92bf5154fdcf0dfee40bfb5795729a4a9fa71dd6.tar.gz dexon-solidity-92bf5154fdcf0dfee40bfb5795729a4a9fa71dd6.tar.bz2 dexon-solidity-92bf5154fdcf0dfee40bfb5795729a4a9fa71dd6.tar.lz dexon-solidity-92bf5154fdcf0dfee40bfb5795729a4a9fa71dd6.tar.xz dexon-solidity-92bf5154fdcf0dfee40bfb5795729a4a9fa71dd6.tar.zst dexon-solidity-92bf5154fdcf0dfee40bfb5795729a4a9fa71dd6.zip | |
Merge branch 'develop' into fixNoMobile
Diffstat (limited to 'libsolidity/inlineasm/AsmParser.h')
| -rw-r--r-- | libsolidity/inlineasm/AsmParser.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libsolidity/inlineasm/AsmParser.h b/libsolidity/inlineasm/AsmParser.h index 643548dd..4b4a24ae 100644 --- a/libsolidity/inlineasm/AsmParser.h +++ b/libsolidity/inlineasm/AsmParser.h @@ -67,7 +67,9 @@ protected: std::map<std::string, dev::solidity::Instruction> const& instructions(); Statement parseElementaryOperation(bool _onlySinglePusher = false); VariableDeclaration parseVariableDeclaration(); - FunctionalInstruction parseFunctionalInstruction(Statement&& _instruction); + FunctionDefinition parseFunctionDefinition(); + Statement parseFunctionalInstruction(Statement&& _instruction); + std::string expectAsmIdentifier(); }; } |