aboutsummaryrefslogtreecommitdiffstats
path: root/libsolidity/parsing/Parser.cpp
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2016-09-06 18:25:19 +0800
committerGitHub <noreply@github.com>2016-09-06 18:25:19 +0800
commitf687635e4743a1e12d01fb082a4f8a76a759ab48 (patch)
tree7e3b917cfcc5ebf44c6770c6d742da0fa9277a12 /libsolidity/parsing/Parser.cpp
parent171c74843bb231c4663ec0fe7f4252ac03266f53 (diff)
parentdff9633084ebc241d8268c5dbd35a0c5307fd6fc (diff)
downloaddexon-solidity-f687635e4743a1e12d01fb082a4f8a76a759ab48.tar
dexon-solidity-f687635e4743a1e12d01fb082a4f8a76a759ab48.tar.gz
dexon-solidity-f687635e4743a1e12d01fb082a4f8a76a759ab48.tar.bz2
dexon-solidity-f687635e4743a1e12d01fb082a4f8a76a759ab48.tar.lz
dexon-solidity-f687635e4743a1e12d01fb082a4f8a76a759ab48.tar.xz
dexon-solidity-f687635e4743a1e12d01fb082a4f8a76a759ab48.tar.zst
dexon-solidity-f687635e4743a1e12d01fb082a4f8a76a759ab48.zip
Merge pull request #665 from axic/feature/accept-ether
BREAKING: Add payable modifier
Diffstat (limited to 'libsolidity/parsing/Parser.cpp')
-rw-r--r--libsolidity/parsing/Parser.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index 1bffa5d7..0e99d1e7 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -305,6 +305,7 @@ ASTPointer<FunctionDefinition> Parser::parseFunctionDefinition(ASTString const*
options.allowLocationSpecifier = true;
ASTPointer<ParameterList> parameters(parseParameterList(options));
bool isDeclaredConst = false;
+ bool isPayable = false;
Declaration::Visibility visibility(Declaration::Visibility::Default);
vector<ASTPointer<ModifierInvocation>> modifiers;
while (true)
@@ -315,6 +316,11 @@ ASTPointer<FunctionDefinition> Parser::parseFunctionDefinition(ASTString const*
isDeclaredConst = true;
m_scanner->next();
}
+ else if (m_scanner->currentToken() == Token::Payable)
+ {
+ isPayable = true;
+ m_scanner->next();
+ }
else if (token == Token::Identifier)
modifiers.push_back(parseModifierInvocation());
else if (Token::isVisibilitySpecifier(token))
@@ -354,6 +360,7 @@ ASTPointer<FunctionDefinition> Parser::parseFunctionDefinition(ASTString const*
isDeclaredConst,
modifiers,
returnParameters,
+ isPayable,
block
);
}