aboutsummaryrefslogtreecommitdiffstats
path: root/libsolidity/inlineasm/AsmParser.cpp
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2017-07-13 22:58:24 +0800
committerGitHub <noreply@github.com>2017-07-13 22:58:24 +0800
commitb5da5f6e42c9d60206d5045ace471c7b5839ed30 (patch)
treef1aa574f2a1312340a081997de690384206c8aa8 /libsolidity/inlineasm/AsmParser.cpp
parentd1c3ecc94a4c0b36ccfd310a0ccf15e9e9b4a8dd (diff)
parent8d90e6fc4e76ccf41d8ccb59c23920623269cd06 (diff)
downloaddexon-solidity-b5da5f6e42c9d60206d5045ace471c7b5839ed30.tar
dexon-solidity-b5da5f6e42c9d60206d5045ace471c7b5839ed30.tar.gz
dexon-solidity-b5da5f6e42c9d60206d5045ace471c7b5839ed30.tar.bz2
dexon-solidity-b5da5f6e42c9d60206d5045ace471c7b5839ed30.tar.lz
dexon-solidity-b5da5f6e42c9d60206d5045ace471c7b5839ed30.tar.xz
dexon-solidity-b5da5f6e42c9d60206d5045ace471c7b5839ed30.tar.zst
dexon-solidity-b5da5f6e42c9d60206d5045ace471c7b5839ed30.zip
Merge pull request #2504 from ethereum/inlineasm-decl-empty
Support variable declarations without an assignment in assembly
Diffstat (limited to 'libsolidity/inlineasm/AsmParser.cpp')
-rw-r--r--libsolidity/inlineasm/AsmParser.cpp13
1 files changed, 9 insertions, 4 deletions
diff --git a/libsolidity/inlineasm/AsmParser.cpp b/libsolidity/inlineasm/AsmParser.cpp
index d282a30d..133f70b1 100644
--- a/libsolidity/inlineasm/AsmParser.cpp
+++ b/libsolidity/inlineasm/AsmParser.cpp
@@ -347,10 +347,15 @@ assembly::VariableDeclaration Parser::parseVariableDeclaration()
else
break;
}
- expectToken(Token::Colon);
- expectToken(Token::Assign);
- varDecl.value.reset(new Statement(parseExpression()));
- varDecl.location.end = locationOf(*varDecl.value).end;
+ if (currentToken() == Token::Colon)
+ {
+ expectToken(Token::Colon);
+ expectToken(Token::Assign);
+ varDecl.value.reset(new Statement(parseExpression()));
+ varDecl.location.end = locationOf(*varDecl.value).end;
+ }
+ else
+ varDecl.location.end = varDecl.variables.back().location.end;
return varDecl;
}