diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2016-10-05 18:47:56 +0800 |
|---|---|---|
| committer | Alex Beregszaszi <alex@rtfs.hu> | 2016-10-07 05:05:01 +0800 |
| commit | ae0477744c942ce748d8acb8b9fa5972a42a2f73 (patch) | |
| tree | 20024d357342eea8bf5a5135e3c46ff1de17e4e2 | |
| parent | 3f833c9ef4fde4edc795b5ddce6a7a2b543e3c00 (diff) | |
| download | dexon-solidity-ae0477744c942ce748d8acb8b9fa5972a42a2f73.tar dexon-solidity-ae0477744c942ce748d8acb8b9fa5972a42a2f73.tar.gz dexon-solidity-ae0477744c942ce748d8acb8b9fa5972a42a2f73.tar.bz2 dexon-solidity-ae0477744c942ce748d8acb8b9fa5972a42a2f73.tar.lz dexon-solidity-ae0477744c942ce748d8acb8b9fa5972a42a2f73.tar.xz dexon-solidity-ae0477744c942ce748d8acb8b9fa5972a42a2f73.tar.zst dexon-solidity-ae0477744c942ce748d8acb8b9fa5972a42a2f73.zip | |
Support address in inline assembly
| -rw-r--r-- | Changelog.md | 1 | ||||
| -rw-r--r-- | libsolidity/inlineasm/AsmParser.cpp | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Changelog.md b/Changelog.md index 8a243a36..1560990d 100644 --- a/Changelog.md +++ b/Changelog.md @@ -8,6 +8,7 @@ Features: Bugfixes: * Disallow unknown options in `solc` + * Inline assembly: support the `address` opcode ### 0.4.2 (2016-09-17) 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. |