cerc-io/solidity
16
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

Fixed and simplified external type computation.

Browse Source
This commit is contained in:
chriseth 2015-06-26 16:52:30 +02:00
parent 2e5c52bfab
commit 342ca94866
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AST.cpp
View File

@ -340,8 +340,10 @@ vector<pair<FixedHash<4>, FunctionTypePointer>> const& ContractDefinition::getIn
{ {
for (ASTPointer<FunctionDefinition> const& f: contract->getDefinedFunctions()) for (ASTPointer<FunctionDefinition> const& f: contract->getDefinedFunctions())
{ {
if (!f->isPartOfExternalInterface())
continue;
string functionSignature = f->externalSignature(); string functionSignature = f->externalSignature();
if (f->isPartOfExternalInterface() && signaturesSeen.count(functionSignature) == 0) if (signaturesSeen.count(functionSignature) == 0)
{ {
functionsSeen.insert(f->getName()); functionsSeen.insert(f->getName());
signaturesSeen.insert(functionSignature); signaturesSeen.insert(functionSignature);

17
Types.cpp
View File

@ -827,15 +827,16 @@ TypePointer ArrayType::externalType() const
{ {
if (m_arrayKind != ArrayKind::Ordinary) if (m_arrayKind != ArrayKind::Ordinary)
return this->copyForLocation(DataLocation::Memory, true); return this->copyForLocation(DataLocation::Memory, true);
if (!m_baseType->externalType()) TypePointer baseExt = m_baseType->externalType();
if (!baseExt)
return TypePointer(); return TypePointer();
if (m_baseType->getCategory() == Category::Array && m_baseType->isDynamicallySized()) if (m_baseType->getCategory() == Category::Array && m_baseType->isDynamicallySized())
return TypePointer(); return TypePointer();
if (isDynamicallySized()) if (isDynamicallySized())
return std::make_shared<ArrayType>(DataLocation::Memory, m_baseType->externalType()); return std::make_shared<ArrayType>(DataLocation::Memory, baseExt);
else else
return std::make_shared<ArrayType>(DataLocation::Memory, m_baseType->externalType(), m_length); return std::make_shared<ArrayType>(DataLocation::Memory, baseExt, m_length);
} }
TypePointer ArrayType::copyForLocation(DataLocation _location, bool _isPointer) const TypePointer ArrayType::copyForLocation(DataLocation _location, bool _isPointer) const
@ -1268,15 +1269,17 @@ FunctionTypePointer FunctionType::externalFunctionType() const
for (auto type: m_parameterTypes) for (auto type: m_parameterTypes)
{ {
if (!type->externalType()) if (auto ext = type->externalType())
paramTypes.push_back(ext);
else
return FunctionTypePointer(); return FunctionTypePointer();
paramTypes.push_back(type->externalType());
} }
for (auto type: m_returnParameterTypes) for (auto type: m_returnParameterTypes)
{ {
if (!type->externalType()) if (auto ext = type->externalType())
retParamTypes.push_back(ext);
else
return FunctionTypePointer(); return FunctionTypePointer();
retParamTypes.push_back(type->externalType());
} }
return make_shared<FunctionType>(paramTypes, retParamTypes, m_parameterNames, m_returnParameterNames, m_location, m_arbitraryParameters); return make_shared<FunctionType>(paramTypes, retParamTypes, m_parameterNames, m_returnParameterNames, m_location, m_arbitraryParameters);
} }