diff options
| author | chriseth <chris@ethereum.org> | 2018-03-08 03:20:57 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-08 03:20:57 +0800 |
| commit | dfe3193c7382c80f1814247a162663a97c3f5e67 (patch) | |
| tree | d0540c2dfc43a76f0add46840f60ff2e28604a19 /libsolidity/inlineasm/AsmParser.h | |
| parent | 3155dd8058672ce8f04bc2c0f2536cb549067d0a (diff) | |
| parent | 15920dc75dd5a46a036d5ff16fb8eee0534be6e1 (diff) | |
| download | dexon-solidity-dfe3193c7382c80f1814247a162663a97c3f5e67.tar dexon-solidity-dfe3193c7382c80f1814247a162663a97c3f5e67.tar.gz dexon-solidity-dfe3193c7382c80f1814247a162663a97c3f5e67.tar.bz2 dexon-solidity-dfe3193c7382c80f1814247a162663a97c3f5e67.tar.lz dexon-solidity-dfe3193c7382c80f1814247a162663a97c3f5e67.tar.xz dexon-solidity-dfe3193c7382c80f1814247a162663a97c3f5e67.tar.zst dexon-solidity-dfe3193c7382c80f1814247a162663a97c3f5e67.zip | |
Merge pull request #3678 from ethereum/develop
Merge develop into release.
Diffstat (limited to 'libsolidity/inlineasm/AsmParser.h')
| -rw-r--r-- | libsolidity/inlineasm/AsmParser.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libsolidity/inlineasm/AsmParser.h b/libsolidity/inlineasm/AsmParser.h index 015aeef3..41117228 100644 --- a/libsolidity/inlineasm/AsmParser.h +++ b/libsolidity/inlineasm/AsmParser.h @@ -41,8 +41,9 @@ public: ParserBase(_errorReporter), m_flavour(_flavour) {} /// Parses an inline assembly block starting with `{` and ending with `}`. + /// @param _reuseScanner if true, do check for end of input after the `}`. /// @returns an empty shared pointer on error. - std::shared_ptr<Block> parse(std::shared_ptr<Scanner> const& _scanner); + std::shared_ptr<Block> parse(std::shared_ptr<Scanner> const& _scanner, bool _reuseScanner); protected: using ElementaryOperation = boost::variant<assembly::Instruction, assembly::Literal, assembly::Identifier>; |