cerc-io/solidity
15
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 library related checks.

Browse Source
This commit is contained in:
chriseth 2018-11-29 18:36:26 +01:00
parent 4f992298c6
commit 33d6a24c47
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libsolidity/analysis/ContractLevelChecker.cpp
View File

@ -44,6 +44,7 @@ bool ContractLevelChecker::check(ContractDefinition const& _contract)
checkFallbackFunction(_contract); checkFallbackFunction(_contract);
checkExternalTypeClashes(_contract); checkExternalTypeClashes(_contract);
checkHashCollisions(_contract); checkHashCollisions(_contract);
checkLibraryRequirements(_contract);
return Error::containsOnlyWarnings(m_errorReporter.errors()); return Error::containsOnlyWarnings(m_errorReporter.errors());
} }
@ -436,3 +437,16 @@ void ContractLevelChecker::checkHashCollisions(ContractDefinition const& _contra
hashes.insert(hash); hashes.insert(hash);
} }
} }
void ContractLevelChecker::checkLibraryRequirements(ContractDefinition const& _contract)
{
if (!_contract.isLibrary())
return;
if (!_contract.baseContracts().empty())
m_errorReporter.typeError(_contract.location(), "Library is not allowed to inherit.");
for (auto const& var: _contract.stateVariables())
if (!var->isConstant())
m_errorReporter.typeError(var->location(), "Library cannot have non-constant state variables");
}

2
libsolidity/analysis/ContractLevelChecker.h
View File

@ -77,6 +77,8 @@ private:
void checkExternalTypeClashes(ContractDefinition const& _contract); void checkExternalTypeClashes(ContractDefinition const& _contract);
/// Checks for hash collisions in external function signatures. /// Checks for hash collisions in external function signatures.
void checkHashCollisions(ContractDefinition const& _contract); void checkHashCollisions(ContractDefinition const& _contract);
/// Checks that all requirements for a library are fulfilled if this is a library.
void checkLibraryRequirements(ContractDefinition const& _contract);
langutil::ErrorReporter& m_errorReporter; langutil::ErrorReporter& m_errorReporter;
}; };

14
libsolidity/analysis/TypeChecker.cpp
View File

@ -93,23 +93,9 @@ bool TypeChecker::visit(ContractDefinition const& _contract)
for (auto const& n: _contract.subNodes()) for (auto const& n: _contract.subNodes())
n->accept(*this); n->accept(*this);
if (_contract.isLibrary())
checkLibraryRequirements(_contract);
return false; return false;
} }
void TypeChecker::checkLibraryRequirements(ContractDefinition const& _contract)
{
solAssert(_contract.isLibrary(), "");
if (!_contract.baseContracts().empty())
m_errorReporter.typeError(_contract.location(), "Library is not allowed to inherit.");
for (auto const& var: _contract.stateVariables())
if (!var->isConstant())
m_errorReporter.typeError(var->location(), "Library cannot have non-constant state variables");
}
void TypeChecker::checkDoubleStorageAssignment(Assignment const& _assignment) void TypeChecker::checkDoubleStorageAssignment(Assignment const& _assignment)
{ {
TupleType const& lhs = dynamic_cast<TupleType const&>(*type(_assignment.leftHandSide())); TupleType const& lhs = dynamic_cast<TupleType const&>(*type(_assignment.leftHandSide()));

2
libsolidity/analysis/TypeChecker.h
View File

@ -66,8 +66,6 @@ public:
private: private:
bool visit(ContractDefinition const& _contract) override; bool visit(ContractDefinition const& _contract) override;
/// Checks that all requirements for a library are fulfilled if this is a library.
void checkLibraryRequirements(ContractDefinition const& _contract);
/// Checks (and warns) if a tuple assignment might cause unexpected overwrites in storage. /// Checks (and warns) if a tuple assignment might cause unexpected overwrites in storage.
/// Should only be called if the left hand side is tuple-typed. /// Should only be called if the left hand side is tuple-typed.
void checkDoubleStorageAssignment(Assignment const& _assignment); void checkDoubleStorageAssignment(Assignment const& _assignment);