diff options
| author | chriseth <chris@ethereum.org> | 2018-04-11 23:44:44 +0800 |
|---|---|---|
| committer | chriseth <chris@ethereum.org> | 2018-04-12 04:00:21 +0800 |
| commit | b5a696ad48780bf0614eef2a737a2e89963d4640 (patch) | |
| tree | fcc1d4e910eef36fef15fca3e036f3039146450c /libsolidity | |
| parent | 52f68d3b63d65c31215e683899b96b27e2e24ee1 (diff) | |
| download | dexon-solidity-b5a696ad48780bf0614eef2a737a2e89963d4640.tar.gz dexon-solidity-b5a696ad48780bf0614eef2a737a2e89963d4640.tar.zst dexon-solidity-b5a696ad48780bf0614eef2a737a2e89963d4640.zip | |
Properly cope with constructor headers.
Diffstat (limited to 'libsolidity')
| -rw-r--r-- | libsolidity/parsing/Parser.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp index ea092a74..2d8ca7d3 100644 --- a/libsolidity/parsing/Parser.cpp +++ b/libsolidity/parsing/Parser.cpp @@ -365,9 +365,10 @@ Parser::FunctionHeaderParserResult Parser::parseFunctionHeader( Token::Value token = m_scanner->currentToken(); if (_allowModifiers && token == Token::Identifier) { - // If the name is empty, then this can either be a modifier (fallback function declaration) + // If the name is empty (and this is not a constructor), + // then this can either be a modifier (fallback function declaration) // or the name of the state variable (function type name plus variable). - if (result.name->empty() && ( + if ((result.name->empty() && !result.isConstructor) && ( m_scanner->peekNextToken() == Token::Semicolon || m_scanner->peekNextToken() == Token::Assign )) @@ -385,7 +386,7 @@ Parser::FunctionHeaderParserResult Parser::parseFunctionHeader( if ( (result.visibility == Declaration::Visibility::External || result.visibility == Declaration::Visibility::Internal) && result.modifiers.empty() && - result.name->empty() + (result.name->empty() && !result.isConstructor) ) break; parserError(string( @@ -437,6 +438,7 @@ ASTPointer<ASTNode> Parser::parseFunctionDefinitionOrFunctionTypeStateVariable(A FunctionHeaderParserResult header = parseFunctionHeader(false, true, _contractName); if ( + header.isConstructor || !header.modifiers.empty() || !header.name->empty() || m_scanner->currentToken() == Token::Semicolon || @@ -802,6 +804,7 @@ ASTPointer<FunctionTypeName> Parser::parseFunctionType() RecursionGuard recursionGuard(*this); ASTNodeFactory nodeFactory(*this); FunctionHeaderParserResult header = parseFunctionHeader(true, false); + solAssert(!header.isConstructor, "Tried to parse type as constructor."); return nodeFactory.createNode<FunctionTypeName>( header.parameters, header.returnParameters, |