diff options
| author | chriseth <chris@ethereum.org> | 2018-01-06 07:02:21 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-06 07:02:21 +0800 |
| commit | bca01f8f680c4f7d3a2da56fa014f587c5645c6a (patch) | |
| tree | 0e5406e44ed53dc63b934314a7c59aae03cdc8d2 /libsolidity | |
| parent | cf4fdab134366d36d2614fc549eadf149e8ee82b (diff) | |
| parent | a91393f4d74352be022b9a83fc3007881f770ed7 (diff) | |
| download | dexon-solidity-bca01f8f680c4f7d3a2da56fa014f587c5645c6a.tar dexon-solidity-bca01f8f680c4f7d3a2da56fa014f587c5645c6a.tar.gz dexon-solidity-bca01f8f680c4f7d3a2da56fa014f587c5645c6a.tar.bz2 dexon-solidity-bca01f8f680c4f7d3a2da56fa014f587c5645c6a.tar.lz dexon-solidity-bca01f8f680c4f7d3a2da56fa014f587c5645c6a.tar.xz dexon-solidity-bca01f8f680c4f7d3a2da56fa014f587c5645c6a.tar.zst dexon-solidity-bca01f8f680c4f7d3a2da56fa014f587c5645c6a.zip | |
Merge pull request #3382 from ethereum/julia-identifier-parser
Support some restricted tokens (return, byte, address) as identifier in Julia
Diffstat (limited to 'libsolidity')
| -rw-r--r-- | libsolidity/inlineasm/AsmParser.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libsolidity/inlineasm/AsmParser.cpp b/libsolidity/inlineasm/AsmParser.cpp index 273e1d5c..9336e620 100644 --- a/libsolidity/inlineasm/AsmParser.cpp +++ b/libsolidity/inlineasm/AsmParser.cpp @@ -566,10 +566,16 @@ string Parser::expectAsmIdentifier() string name = currentLiteral(); if (m_julia) { - if (currentToken() == Token::Bool) + switch (currentToken()) { + case Token::Return: + case Token::Byte: + case Token::Address: + case Token::Bool: advance(); return name; + default: + break; } } else if (instructions().count(name)) |