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

Merge pull request #8106 from random-internet-cat/move-contract-kind

Browse Source 
Move ContractKind from ContractDefinition to file-scope
This commit is contained in:
chriseth
2020-01-08 13:06:26 +01:00
committed by GitHub
parent e81e73345e 529405deb6
commit 5ca3abd7cb
11 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsolidity/parsing/Parser.cpp
+6 -6
View File
@@ -243,9 +243,9 @@ ASTPointer<ImportDirective> Parser::parseImportDirective()
return nodeFactory.createNode<ImportDirective>(path, unitAlias, move(symbolAliases));
}
std::pair<ContractDefinition::ContractKind, bool> Parser::parseContractKind()
std::pair<ContractKind, bool> Parser::parseContractKind()
{
ContractDefinition::ContractKind kind;
ContractKind kind;
bool abstract = false;
if (m_scanner->currentToken() == Token::Abstract)
{
@@ -255,13 +255,13 @@ std::pair<ContractDefinition::ContractKind, bool> Parser::parseContractKind()
switch (m_scanner->currentToken())
{
case Token::Interface:
kind = ContractDefinition::ContractKind::Interface;
kind = ContractKind::Interface;
break;
case Token::Contract:
kind = ContractDefinition::ContractKind::Contract;
kind = ContractKind::Contract;
break;
case Token::Library:
kind = ContractDefinition::ContractKind::Library;
kind = ContractKind::Library;
break;
default:
solAssert(false, "Invalid contract kind.");
@@ -278,7 +278,7 @@ ASTPointer<ContractDefinition> Parser::parseContractDefinition()
ASTPointer<ASTString> docString;
vector<ASTPointer<InheritanceSpecifier>> baseContracts;
vector<ASTPointer<ASTNode>> subNodes;
std::pair<ContractDefinition::ContractKind, bool> contractKind{};
std::pair<ContractKind, bool> contractKind{};
try
{
if (m_scanner->currentCommentLiteral() != "")