diff options
| author | Yoichi Hirai <yhirai@pira.jp> | 2016-10-07 17:28:16 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-07 17:28:16 +0800 |
| commit | 8572664ac2e955cc08b665f645ad4b1cd964584b (patch) | |
| tree | 332d9b4dc16e8b441b9686f3e301b5bda47b49c8 /libsolidity/inlineasm/AsmParser.cpp | |
| parent | d855f645ee5f1b444edfc444b2d26787ef381f09 (diff) | |
| parent | 9f61ae924e0222c35eb58bceea8b201da42cbd5f (diff) | |
| download | dexon-solidity-8572664ac2e955cc08b665f645ad4b1cd964584b.tar.gz dexon-solidity-8572664ac2e955cc08b665f645ad4b1cd964584b.tar.zst dexon-solidity-8572664ac2e955cc08b665f645ad4b1cd964584b.zip | |
Merge pull request #1156 from ethereum/inline-assembly-address
Support address in inline assembly
Diffstat (limited to 'libsolidity/inlineasm/AsmParser.cpp')
| -rw-r--r-- | libsolidity/inlineasm/AsmParser.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libsolidity/inlineasm/AsmParser.cpp b/libsolidity/inlineasm/AsmParser.cpp index 196b314d..ee9c150e 100644 --- a/libsolidity/inlineasm/AsmParser.cpp +++ b/libsolidity/inlineasm/AsmParser.cpp @@ -156,12 +156,15 @@ assembly::Statement Parser::parseElementaryOperation(bool _onlySinglePusher) case Token::Identifier: case Token::Return: case Token::Byte: + case Token::Address: { string literal; if (m_scanner->currentToken() == Token::Return) literal = "return"; else if (m_scanner->currentToken() == Token::Byte) literal = "byte"; + else if (m_scanner->currentToken() == Token::Address) + literal = "address"; else literal = m_scanner->currentLiteral(); // first search the set of instructions. |