cerc-io/solidity
10
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
No known key found for this signature in database
GPG Key ID: 2A3F6A6DCA1E8DED
11 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libsolidity/analysis/ContractLevelChecker.cpp
View File

@ -208,18 +208,18 @@ void ContractLevelChecker::checkAbstractFunctions(ContractDefinition const& _con
if (_contract.abstract()) if (_contract.abstract())
{ {
if (_contract.contractKind() == ContractDefinition::ContractKind::Interface) if (_contract.contractKind() == ContractKind::Interface)
m_errorReporter.typeError(_contract.location(), "Interfaces do not need the \"abstract\" keyword, they are abstract implicitly."); m_errorReporter.typeError(_contract.location(), "Interfaces do not need the \"abstract\" keyword, they are abstract implicitly.");
else if (_contract.contractKind() == ContractDefinition::ContractKind::Library) else if (_contract.contractKind() == ContractKind::Library)
m_errorReporter.typeError(_contract.location(), "Libraries cannot be abstract."); m_errorReporter.typeError(_contract.location(), "Libraries cannot be abstract.");
else else
solAssert(_contract.contractKind() == ContractDefinition::ContractKind::Contract, ""); solAssert(_contract.contractKind() == ContractKind::Contract, "");
} }
// For libraries, we emit errors on function-level, so this is fine as long as we do // For libraries, we emit errors on function-level, so this is fine as long as we do
// not have inheritance for libraries. // not have inheritance for libraries.
if ( if (
_contract.contractKind() == ContractDefinition::ContractKind::Contract && _contract.contractKind() == ContractKind::Contract &&
!_contract.abstract() && !_contract.abstract() &&
!_contract.annotation().unimplementedFunctions.empty() !_contract.annotation().unimplementedFunctions.empty()
) )

8
libsolidity/analysis/TypeChecker.cpp
View File

@ -326,7 +326,7 @@ bool TypeChecker::visit(StructDefinition const& _struct)
bool TypeChecker::visit(FunctionDefinition const& _function) bool TypeChecker::visit(FunctionDefinition const& _function)
{ {
bool isLibraryFunction = _function.inContractKind() == ContractDefinition::ContractKind::Library; bool isLibraryFunction = _function.inContractKind() == ContractKind::Library;
if (_function.markedVirtual()) if (_function.markedVirtual())
{ {
@ -425,7 +425,7 @@ bool TypeChecker::visit(FunctionDefinition const& _function)
if (_function.isConstructor()) if (_function.isConstructor())
m_errorReporter.typeError(_function.location(), "Constructor cannot be defined in interfaces."); m_errorReporter.typeError(_function.location(), "Constructor cannot be defined in interfaces.");
} }
else if (m_scope->contractKind() == ContractDefinition::ContractKind::Library) else if (m_scope->contractKind() == ContractKind::Library)
if (_function.isConstructor()) if (_function.isConstructor())
m_errorReporter.typeError(_function.location(), "Constructor cannot be defined in libraries."); m_errorReporter.typeError(_function.location(), "Constructor cannot be defined in libraries.");
if (_function.isImplemented()) if (_function.isImplemented())
@ -1733,7 +1733,7 @@ void TypeChecker::typeCheckFallbackFunction(FunctionDefinition const& _function)
{ {
solAssert(_function.isFallback(), ""); solAssert(_function.isFallback(), "");
if (_function.inContractKind() == ContractDefinition::ContractKind::Library) if (_function.inContractKind() == ContractKind::Library)
m_errorReporter.typeError(_function.location(), "Libraries cannot have fallback functions."); m_errorReporter.typeError(_function.location(), "Libraries cannot have fallback functions.");
if (_function.stateMutability() != StateMutability::NonPayable && _function.stateMutability() != StateMutability::Payable) if (_function.stateMutability() != StateMutability::NonPayable && _function.stateMutability() != StateMutability::Payable)
m_errorReporter.typeError( m_errorReporter.typeError(
@ -1759,7 +1759,7 @@ void TypeChecker::typeCheckReceiveFunction(FunctionDefinition const& _function)
{ {
solAssert(_function.isReceive(), ""); solAssert(_function.isReceive(), "");
if (_function.inContractKind() == ContractDefinition::ContractKind::Library) if (_function.inContractKind() == ContractKind::Library)
m_errorReporter.typeError(_function.location(), "Libraries cannot have receive ether functions."); m_errorReporter.typeError(_function.location(), "Libraries cannot have receive ether functions.");
if (_function.stateMutability() != StateMutability::Payable) if (_function.stateMutability() != StateMutability::Payable)

2
libsolidity/analysis/ViewPureChecker.cpp
View File

@ -272,7 +272,7 @@ void ViewPureChecker::reportMutability(
{ {
// We do not warn for library functions because they cannot be payable anyway. // We do not warn for library functions because they cannot be payable anyway.
// Also internal functions should be allowed to use `msg.value`. // Also internal functions should be allowed to use `msg.value`.
if (m_currentFunction->isPublic() && m_currentFunction->inContractKind() != ContractDefinition::ContractKind::Library) if (m_currentFunction->isPublic() && m_currentFunction->inContractKind() != ContractKind::Library)
{ {
if (_nestedLocation) if (_nestedLocation)
m_errorReporter.typeError( m_errorReporter.typeError(

2
libsolidity/ast/AST.cpp
View File

@ -305,7 +305,7 @@ TypeDeclarationAnnotation& EnumDefinition::annotation() const
return dynamic_cast<TypeDeclarationAnnotation&>(*m_annotation); return dynamic_cast<TypeDeclarationAnnotation&>(*m_annotation);
} }
ContractDefinition::ContractKind FunctionDefinition::inContractKind() const ContractKind FunctionDefinition::inContractKind() const
{ {
auto contractDef = dynamic_cast<ContractDefinition const*>(scope()); auto contractDef = dynamic_cast<ContractDefinition const*>(scope());
solAssert(contractDef, "Enclosing Scope of FunctionDefinition was not set."); solAssert(contractDef, "Enclosing Scope of FunctionDefinition was not set.");

4
libsolidity/ast/AST.h
View File

@ -378,8 +378,6 @@ protected:
class ContractDefinition: public Declaration, public Documented class ContractDefinition: public Declaration, public Documented
{ {
public: public:
enum class ContractKind { Interface, Contract, Library };
ContractDefinition( ContractDefinition(
SourceLocation const& _location, SourceLocation const& _location,
ASTPointer<ASTString> const& _name, ASTPointer<ASTString> const& _name,
@ -711,7 +709,7 @@ public:
/// @returns the external identifier of this function (the hash of the signature) as a hex string. /// @returns the external identifier of this function (the hash of the signature) as a hex string.
std::string externalIdentifierHex() const; std::string externalIdentifierHex() const;
ContractDefinition::ContractKind inContractKind() const; ContractKind inContractKind() const;
TypePointer type() const override; TypePointer type() const override;

2
libsolidity/ast/ASTEnums.h
View File

@ -69,5 +69,7 @@ struct FuncCallArguments
bool hasNamedArguments() const { return !names.empty(); } bool hasNamedArguments() const { return !names.empty(); }
}; };
enum class ContractKind { Interface, Contract, Library };
} }
} }

8
libsolidity/ast/ASTJsonConverter.cpp
View File

@ -834,15 +834,15 @@ string ASTJsonConverter::location(VariableDeclaration::Location _location)
return {}; return {};
} }
string ASTJsonConverter::contractKind(ContractDefinition::ContractKind _kind) string ASTJsonConverter::contractKind(ContractKind _kind)
{ {
switch (_kind) switch (_kind)
{ {
case ContractDefinition::ContractKind::Interface: case ContractKind::Interface:
return "interface"; return "interface";
case ContractDefinition::ContractKind::Contract: case ContractKind::Contract:
return "contract"; return "contract";
case ContractDefinition::ContractKind::Library: case ContractKind::Library:
return "library"; return "library";
} }

2
libsolidity/ast/ASTJsonConverter.h
View File

@ -147,7 +147,7 @@ private:
} }
Json::Value inlineAssemblyIdentifierToJson(std::pair<yul::Identifier const* , InlineAssemblyAnnotation::ExternalIdentifierInfo> _info) const; Json::Value inlineAssemblyIdentifierToJson(std::pair<yul::Identifier const* , InlineAssemblyAnnotation::ExternalIdentifierInfo> _info) const;
static std::string location(VariableDeclaration::Location _location); static std::string location(VariableDeclaration::Location _location);
static std::string contractKind(ContractDefinition::ContractKind _kind); static std::string contractKind(ContractKind _kind);
static std::string functionCallKind(FunctionCallKind _kind); static std::string functionCallKind(FunctionCallKind _kind);
static std::string literalTokenKind(Token _token); static std::string literalTokenKind(Token _token);
static std::string type(Expression const& _expression); static std::string type(Expression const& _expression);

12
libsolidity/parsing/Parser.cpp
View File

@ -245,9 +245,9 @@ ASTPointer<ImportDirective> Parser::parseImportDirective()
return nodeFactory.createNode<ImportDirective>(path, unitAlias, move(symbolAliases)); 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; bool abstract = false;
if (m_scanner->currentToken() == Token::Abstract) if (m_scanner->currentToken() == Token::Abstract)
{ {
@ -257,13 +257,13 @@ std::pair<ContractDefinition::ContractKind, bool> Parser::parseContractKind()
switch (m_scanner->currentToken()) switch (m_scanner->currentToken())
{ {
case Token::Interface: case Token::Interface:
kind = ContractDefinition::ContractKind::Interface; kind = ContractKind::Interface;
break; break;
case Token::Contract: case Token::Contract:
kind = ContractDefinition::ContractKind::Contract; kind = ContractKind::Contract;
break; break;
case Token::Library: case Token::Library:
kind = ContractDefinition::ContractKind::Library; kind = ContractKind::Library;
break; break;
default: default:
solAssert(false, "Invalid contract kind."); solAssert(false, "Invalid contract kind.");
@ -280,7 +280,7 @@ ASTPointer<ContractDefinition> Parser::parseContractDefinition()
ASTPointer<ASTString> docString; ASTPointer<ASTString> docString;
vector<ASTPointer<InheritanceSpecifier>> baseContracts; vector<ASTPointer<InheritanceSpecifier>> baseContracts;
vector<ASTPointer<ASTNode>> subNodes; vector<ASTPointer<ASTNode>> subNodes;
std::pair<ContractDefinition::ContractKind, bool> contractKind{}; std::pair<ContractKind, bool> contractKind{};
try try
{ {
if (m_scanner->currentCommentLiteral() != "") if (m_scanner->currentCommentLiteral() != "")

4
libsolidity/parsing/Parser.h
View File

@ -84,9 +84,9 @@ private:
void parsePragmaVersion(langutil::SourceLocation const& _location, std::vector<Token> const& _tokens, std::vector<std::string> const& _literals); void parsePragmaVersion(langutil::SourceLocation const& _location, std::vector<Token> const& _tokens, std::vector<std::string> const& _literals);
ASTPointer<PragmaDirective> parsePragmaDirective(); ASTPointer<PragmaDirective> parsePragmaDirective();
ASTPointer<ImportDirective> parseImportDirective(); 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. /// 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<ContractDefinition> parseContractDefinition();
ASTPointer<InheritanceSpecifier> parseInheritanceSpecifier(); ASTPointer<InheritanceSpecifier> parseInheritanceSpecifier();
Visibility parseVisibilitySpecifier(); Visibility parseVisibilitySpecifier();

2
test/libsolidity/SolidityTypes.cpp
View File

@ -182,7 +182,7 @@ BOOST_AUTO_TEST_CASE(type_identifiers)
TypePointer multiArray = TypeProvider::array(DataLocation::Storage, stringArray); TypePointer multiArray = TypeProvider::array(DataLocation::Storage, stringArray);
BOOST_CHECK_EQUAL(multiArray->identifier(), "t_array$_t_array$_t_string_storage_$20_storage_$dyn_storage_ptr"); BOOST_CHECK_EQUAL(multiArray->identifier(), "t_array$_t_array$_t_string_storage_$20_storage_$dyn_storage_ptr");
ContractDefinition c(SourceLocation{}, make_shared<string>("MyContract$"), {}, {}, {}, ContractDefinition::ContractKind::Contract); ContractDefinition c(SourceLocation{}, make_shared<string>("MyContract$"), {}, {}, {}, ContractKind::Contract);
BOOST_CHECK_EQUAL(c.type()->identifier(), "t_type$_t_contract$_MyContract$$$_$2_$"); BOOST_CHECK_EQUAL(c.type()->identifier(), "t_type$_t_contract$_MyContract$$$_$2_$");
BOOST_CHECK_EQUAL(ContractType(c, true).identifier(), "t_super$_MyContract$$$_$2"); BOOST_CHECK_EQUAL(ContractType(c, true).identifier(), "t_super$_MyContract$$$_$2");