diff options
| author | chriseth <c@ethdev.com> | 2016-06-08 15:48:39 +0800 |
|---|---|---|
| committer | chriseth <c@ethdev.com> | 2016-06-08 15:48:39 +0800 |
| commit | fd64e3b7edc0a368fce9c7c8c967a9301c214a10 (patch) | |
| tree | 029b473aeafa06d1a3180f5e2a96e674c60a0929 /libsolidity | |
| parent | e97ac4fb4919b9008bd3534cd4b915b7fe70b920 (diff) | |
| parent | ab7a22f4a0d95faacf453b76415eaee167aacdec (diff) | |
| download | dexon-solidity-fd64e3b7edc0a368fce9c7c8c967a9301c214a10.tar dexon-solidity-fd64e3b7edc0a368fce9c7c8c967a9301c214a10.tar.gz dexon-solidity-fd64e3b7edc0a368fce9c7c8c967a9301c214a10.tar.bz2 dexon-solidity-fd64e3b7edc0a368fce9c7c8c967a9301c214a10.tar.lz dexon-solidity-fd64e3b7edc0a368fce9c7c8c967a9301c214a10.tar.xz dexon-solidity-fd64e3b7edc0a368fce9c7c8c967a9301c214a10.tar.zst dexon-solidity-fd64e3b7edc0a368fce9c7c8c967a9301c214a10.zip | |
Merge pull request #634 from chriseth/fixConstructorOverride
Fix constructor override
Diffstat (limited to 'libsolidity')
| -rw-r--r-- | libsolidity/analysis/TypeChecker.cpp | 5 | ||||
| -rw-r--r-- | libsolidity/codegen/ContractCompiler.cpp | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp index 5ae0443a..ce55de00 100644 --- a/libsolidity/analysis/TypeChecker.cpp +++ b/libsolidity/analysis/TypeChecker.cpp @@ -32,7 +32,7 @@ using namespace dev; using namespace dev::solidity; -bool TypeChecker::checkTypeRequirements(const ContractDefinition& _contract) +bool TypeChecker::checkTypeRequirements(ContractDefinition const& _contract) { try { @@ -174,6 +174,9 @@ void TypeChecker::checkContractAbstractFunctions(ContractDefinition const& _cont for (ContractDefinition const* contract: boost::adaptors::reverse(_contract.annotation().linearizedBaseContracts)) for (FunctionDefinition const* function: contract->definedFunctions()) { + // Take constructors out of overload hierarchy + if (function->isConstructor()) + continue; auto& overloads = functions[function->name()]; FunctionTypePointer funType = make_shared<FunctionType>(*function); auto it = find_if(overloads.begin(), overloads.end(), [&](FunTypeAndFlag const& _funAndFlag) diff --git a/libsolidity/codegen/ContractCompiler.cpp b/libsolidity/codegen/ContractCompiler.cpp index 3623046e..bcfd33f2 100644 --- a/libsolidity/codegen/ContractCompiler.cpp +++ b/libsolidity/codegen/ContractCompiler.cpp @@ -776,7 +776,10 @@ void ContractCompiler::appendModifierOrFunctionCode() { solAssert(m_currentFunction, ""); if (m_modifierDepth >= m_currentFunction->modifiers().size()) + { + solAssert(m_currentFunction->isImplemented(), ""); m_currentFunction->body().accept(*this); + } else { ASTPointer<ModifierInvocation> const& modifierInvocation = m_currentFunction->modifiers()[m_modifierDepth]; |