diff options
| author | chriseth <c@ethdev.com> | 2015-04-15 23:40:50 +0800 |
|---|---|---|
| committer | chriseth <c@ethdev.com> | 2015-04-15 23:40:50 +0800 |
| commit | 0c69d5fdcd3286f47c81dbcbcfb8802861eab8b5 (patch) | |
| tree | f78c665e6084300b939cc4cfcebb97d3bd44d9f5 /Compiler.cpp | |
| parent | 158795e48f4285d713b11f78cdd04de8c6d1f667 (diff) | |
| download | dexon-solidity-0c69d5fdcd3286f47c81dbcbcfb8802861eab8b5.tar dexon-solidity-0c69d5fdcd3286f47c81dbcbcfb8802861eab8b5.tar.gz dexon-solidity-0c69d5fdcd3286f47c81dbcbcfb8802861eab8b5.tar.bz2 dexon-solidity-0c69d5fdcd3286f47c81dbcbcfb8802861eab8b5.tar.lz dexon-solidity-0c69d5fdcd3286f47c81dbcbcfb8802861eab8b5.tar.xz dexon-solidity-0c69d5fdcd3286f47c81dbcbcfb8802861eab8b5.tar.zst dexon-solidity-0c69d5fdcd3286f47c81dbcbcfb8802861eab8b5.zip | |
Fixed function overloads.
Added tests, disallowed non-calling usage of non-unique function
references.
Diffstat (limited to 'Compiler.cpp')
| -rw-r--r-- | Compiler.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Compiler.cpp b/Compiler.cpp index 8e263449..a8d0a591 100644 --- a/Compiler.cpp +++ b/Compiler.cpp @@ -90,7 +90,7 @@ void Compiler::packIntoContractCreator(ContractDefinition const& _contract, Comp for (auto const& modifier: constructor->getModifiers()) { auto baseContract = dynamic_cast<ContractDefinition const*>( - modifier->getName()->getReferencedDeclaration()); + &modifier->getName()->getReferencedDeclaration()); if (baseContract) if (m_baseArguments.count(baseContract->getConstructor()) == 0) m_baseArguments[baseContract->getConstructor()] = &modifier->getArguments(); @@ -99,7 +99,7 @@ void Compiler::packIntoContractCreator(ContractDefinition const& _contract, Comp for (ASTPointer<InheritanceSpecifier> const& base: contract->getBaseContracts()) { ContractDefinition const* baseContract = dynamic_cast<ContractDefinition const*>( - base->getName()->getReferencedDeclaration()); + &base->getName()->getReferencedDeclaration()); solAssert(baseContract, ""); if (m_baseArguments.count(baseContract->getConstructor()) == 0) @@ -545,7 +545,7 @@ void Compiler::appendModifierOrFunctionCode() ASTPointer<ModifierInvocation> const& modifierInvocation = m_currentFunction->getModifiers()[m_modifierDepth]; // constructor call should be excluded - if (dynamic_cast<ContractDefinition const*>(modifierInvocation->getName()->getReferencedDeclaration())) + if (dynamic_cast<ContractDefinition const*>(&modifierInvocation->getName()->getReferencedDeclaration())) { ++m_modifierDepth; appendModifierOrFunctionCode(); |