Replace inContractKind by libraryFunction.

This commit is contained in:
chriseth
2020-06-09 17:56:58 +02:00
parent bec9b24c5b
commit e5c19d8a2c
4 changed files with 14 additions and 19 deletions
+4 -4
View File
@@ -287,11 +287,11 @@ TypeDeclarationAnnotation& EnumDefinition::annotation() const
return initAnnotation<TypeDeclarationAnnotation>();
}
ContractKind FunctionDefinition::inContractKind() const
bool FunctionDefinition::libraryFunction() const
{
auto contractDef = dynamic_cast<ContractDefinition const*>(scope());
solAssert(contractDef, "Enclosing Scope of FunctionDefinition was not set.");
return contractDef->contractKind();
if (auto const* contractDef = dynamic_cast<ContractDefinition const*>(scope()))
return contractDef->isLibrary();
return false;
}
FunctionTypePointer FunctionDefinition::functionType(bool _internal) const
+1 -2
View File
@@ -799,6 +799,7 @@ public:
void accept(ASTConstVisitor& _visitor) const override;
StateMutability stateMutability() const { return m_stateMutability; }
bool libraryFunction() const;
bool isOrdinary() const { return m_kind == Token::Function; }
bool isConstructor() const { return m_kind == Token::Constructor; }
bool isFallback() const { return m_kind == Token::Fallback; }
@@ -825,8 +826,6 @@ public:
/// @returns the external identifier of this function (the hash of the signature) as a hex string.
std::string externalIdentifierHex() const;
ContractKind inContractKind() const;
TypePointer type() const override;
TypePointer typeViaContractName() const override;