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

Add "this" contract's ctor to provided ctors set

Browse Source 
- Also properly naming the 2 sets in checkAbstractConstructors() function
This commit is contained in:
Lefteris Karapetsas
2015-04-17 15:27:31 +02:00
parent 0c296cd809
commit eb84c3171a
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AST.cpp
+8 -5
View File
@@ -166,7 +166,7 @@ void ContractDefinition::checkAbstractConstructors()
if (constructor)
{
if (!constructor->getParameters().empty())
argumentsProvided.insert(constructor);
argumentsNeeded.insert(constructor);
for (auto const& modifier: constructor->getModifiers())
{
auto baseContract = dynamic_cast<ContractDefinition const*>(
@@ -174,8 +174,8 @@ void ContractDefinition::checkAbstractConstructors()
if (baseContract)
{
FunctionDefinition const* baseConstructor = baseContract->getConstructor();
if (argumentsProvided.count(baseConstructor) == 1)
argumentsNeeded.insert(baseConstructor);
if (argumentsNeeded.count(baseConstructor) == 1)
argumentsProvided.insert(baseConstructor);
}
}
}
@@ -186,10 +186,13 @@ void ContractDefinition::checkAbstractConstructors()
base->getName()->getReferencedDeclaration());
solAssert(baseContract, "");
FunctionDefinition const* baseConstructor = baseContract->getConstructor();
if (argumentsProvided.count(baseConstructor) == 1)
argumentsNeeded.insert(baseConstructor);
if (argumentsNeeded.count(baseConstructor) == 1)
argumentsProvided.insert(baseConstructor);
}
}
// add this contract's constructor to the provided too
if (getConstructor() && !getConstructor()->getParameters().empty())
argumentsProvided.insert(getConstructor());
if (argumentsProvided != argumentsNeeded)
setFullyImplemented(false);
}