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

Fixing detection of abstract contract

Browse Source
This commit is contained in:
Lefteris Karapetsas 2015-04-17 16:17:21 +02:00
parent 1a19d436db
commit c558aa0656
1 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
AST.cpp
View File

@ -155,45 +155,40 @@ void ContractDefinition::checkAbstractFunctions()
void ContractDefinition::checkAbstractConstructors() void ContractDefinition::checkAbstractConstructors()
{ {
set<FunctionDefinition const*> argumentsNeeded; set<ContractDefinition const*> argumentsNeeded;
set<FunctionDefinition const*> argumentsProvided;
// check that we get arguments for all base constructors that need it. // check that we get arguments for all base constructors that need it.
// If not mark the contract as abstract (not fully implemented) // If not mark the contract as abstract (not fully implemented)
vector<ContractDefinition const*> const& bases = getLinearizedBaseContracts(); vector<ContractDefinition const*> const& bases = getLinearizedBaseContracts();
for (ContractDefinition const* contract: bases)
if (FunctionDefinition const* constructor = contract->getConstructor())
if (contract != this && !constructor->getParameters().empty())
argumentsNeeded.insert(contract);
for (ContractDefinition const* contract: bases) for (ContractDefinition const* contract: bases)
{ {
FunctionDefinition const* constructor = contract->getConstructor(); if (FunctionDefinition const* constructor = contract->getConstructor())
if (constructor)
{
if (!constructor->getParameters().empty())
argumentsNeeded.insert(constructor);
for (auto const& modifier: constructor->getModifiers()) for (auto const& modifier: constructor->getModifiers())
{ {
auto baseContract = dynamic_cast<ContractDefinition const*>( auto baseContract = dynamic_cast<ContractDefinition const*>(
modifier->getName()->getReferencedDeclaration()); modifier->getName()->getReferencedDeclaration()
);
if (baseContract) if (baseContract)
{ argumentsNeeded.erase(baseContract);
FunctionDefinition const* baseConstructor = baseContract->getConstructor();
if (argumentsNeeded.count(baseConstructor) == 1)
argumentsProvided.insert(baseConstructor);
}
} }
}
for (ASTPointer<InheritanceSpecifier> const& base: contract->getBaseContracts()) for (ASTPointer<InheritanceSpecifier> const& base: contract->getBaseContracts())
{ {
ContractDefinition const* baseContract = dynamic_cast<ContractDefinition const*>( auto baseContract = dynamic_cast<ContractDefinition const*>(
base->getName()->getReferencedDeclaration()); base->getName()->getReferencedDeclaration()
);
solAssert(baseContract, ""); solAssert(baseContract, "");
FunctionDefinition const* baseConstructor = baseContract->getConstructor(); if (!base->getArguments().empty())
if (argumentsNeeded.count(baseConstructor) == 1) argumentsNeeded.erase(baseContract);
argumentsProvided.insert(baseConstructor);
} }
} }
// add this contract's constructor to the provided too if (!argumentsNeeded.empty())
if (getConstructor() && !getConstructor()->getParameters().empty())
argumentsProvided.insert(getConstructor());
if (argumentsProvided != argumentsNeeded)
setFullyImplemented(false); setFullyImplemented(false);
} }