aboutsummaryrefslogtreecommitdiffstats
path: root/libsolidity/inlineasm
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2017-05-17 20:33:05 +0800
committerAlex Beregszaszi <alex@rtfs.hu>2017-05-19 16:44:16 +0800
commitebcb27e5c14549d114c116889c730c3a8cd82a86 (patch)
tree94304ac0f5d45dfeabe5462817f5562b230527fa /libsolidity/inlineasm
parent2ade4fcdd80cdb12ef12cf929021f64d20de53d2 (diff)
downloaddexon-solidity-ebcb27e5c14549d114c116889c730c3a8cd82a86.tar
dexon-solidity-ebcb27e5c14549d114c116889c730c3a8cd82a86.tar.gz
dexon-solidity-ebcb27e5c14549d114c116889c730c3a8cd82a86.tar.bz2
dexon-solidity-ebcb27e5c14549d114c116889c730c3a8cd82a86.tar.lz
dexon-solidity-ebcb27e5c14549d114c116889c730c3a8cd82a86.tar.xz
dexon-solidity-ebcb27e5c14549d114c116889c730c3a8cd82a86.tar.zst
dexon-solidity-ebcb27e5c14549d114c116889c730c3a8cd82a86.zip
Accept bool as a type in Julia mode
Diffstat (limited to 'libsolidity/inlineasm')
-rw-r--r--libsolidity/inlineasm/AsmParser.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/libsolidity/inlineasm/AsmParser.cpp b/libsolidity/inlineasm/AsmParser.cpp
index 079b9352..a96984f5 100644
--- a/libsolidity/inlineasm/AsmParser.cpp
+++ b/libsolidity/inlineasm/AsmParser.cpp
@@ -381,7 +381,15 @@ TypedName Parser::parseTypedName()
string Parser::expectAsmIdentifier()
{
string name = m_scanner->currentLiteral();
- if (!m_julia && instructions().count(name))
+ if (m_julia)
+ {
+ if (m_scanner->currentToken() == Token::Bool)
+ {
+ m_scanner->next();
+ return name;
+ }
+ }
+ else if (instructions().count(name))
fatalParserError("Cannot use instruction names for identifier names.");
expectToken(Token::Identifier);
return name;