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

Move ContractKind from ContractDefinition to file-scope

Browse Source
This commit is contained in:
Jason Cobb
2020-01-07 09:11:29 -05:00
parent f7624e254c
commit 529405deb6
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
@@ -245,9 +245,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)
{
@@ -257,13 +257,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.");
@@ -280,7 +280,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() != "")
libsolidity/parsing/Parser.h
+2 -2
View File
@@ -84,9 +84,9 @@ private:
void parsePragmaVersion(langutil::SourceLocation const& _location, std::vector<Token> const& _tokens, std::vector<std::string> const& _literals);
ASTPointer<PragmaDirective> parsePragmaDirective();
ASTPointer<ImportDirective> parseImportDirective();
/// @returns an std::pair<ContractDefinition::ContractKind, bool>, where
/// @returns an std::pair<ContractKind, bool>, where
/// result.second is set to true, if an abstract contract was parsed, false otherwise.
std::pair<ContractDefinition::ContractKind, bool> parseContractKind();
std::pair<ContractKind, bool> parseContractKind();
ASTPointer<ContractDefinition> parseContractDefinition();
ASTPointer<InheritanceSpecifier> parseInheritanceSpecifier();
Visibility parseVisibilitySpecifier();