cerc-io/solidity
11
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support interface (contract) keyword in the parser

Browse Source
This commit is contained in:
Alex Beregszaszi
2017-03-17 16:27:04 +00:00
parent 6d4628ace4
commit 54230d2d5d
3 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsolidity/parsing/Parser.cpp
+20 -4
View File
@@ -82,9 +82,10 @@ ASTPointer<SourceUnit> Parser::parse(shared_ptr<Scanner> const& _scanner)
case Token::Import:
nodes.push_back(parseImportDirective());
break;
case Token::Interface:
case Token::Contract:
case Token::Library:
nodes.push_back(parseContractDefinition(token == Token::Library));
nodes.push_back(parseContractDefinition(token));
break;
default:
fatalParserError(string("Expected import directive or contract definition."));
@@ -193,13 +194,28 @@ ASTPointer<ImportDirective> Parser::parseImportDirective()
return nodeFactory.createNode<ImportDirective>(path, unitAlias, move(symbolAliases));
}
ASTPointer<ContractDefinition> Parser::parseContractDefinition(bool _isLibrary)
ASTPointer<ContractDefinition> Parser::parseContractDefinition(Token::Value _expectedKind)
{
ASTNodeFactory nodeFactory(*this);
ASTPointer<ASTString> docString;
if (m_scanner->currentCommentLiteral() != "")
docString = make_shared<ASTString>(m_scanner->currentCommentLiteral());
expectToken(_isLibrary ? Token::Library : Token::Contract);
expectToken(_expectedKind);
ContractDefinition::ContractKind contractKind;
switch(_expectedKind)
{
case Token::Interface:
contractKind = ContractDefinition::ContractKind::Interface;
break;
case Token::Contract:
contractKind = ContractDefinition::ContractKind::Contract;
break;
case Token::Library:
contractKind = ContractDefinition::ContractKind::Library;
break;
default:
fatalParserError("Unsupported contract type.");
}
ASTPointer<ASTString> name = expectIdentifierToken();
vector<ASTPointer<InheritanceSpecifier>> baseContracts;
if (m_scanner->currentToken() == Token::Is)
@@ -252,7 +268,7 @@ ASTPointer<ContractDefinition> Parser::parseContractDefinition(bool _isLibrary)
docString,
baseContracts,
subNodes,
_isLibrary ? ContractDefinition::ContractKind::Library : ContractDefinition::ContractKind::Contract
contractKind
);
}