cerc-io/solidity
15
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 back StructType::recursive()

Browse Source
This commit is contained in:
Mathias Baumann 2019-03-19 11:47:58 +01:00
parent 8e899a0d32
commit 7d809df91a
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libsolidity/ast/Types.cpp
View File

@ -2142,9 +2142,10 @@ TypeResult StructType::interfaceType(bool _inLibrary) const
if (!_inLibrary && m_interfaceType.is_initialized())
return *m_interfaceType;
bool recursion = false;
TypeResult result{TypePointer{}};
m_recursive = false;
auto visitor = [&](
StructDefinition const& _struct,
CycleDetector<StructDefinition>& _cycleDetector,
@ -2175,7 +2176,7 @@ TypeResult StructType::interfaceType(bool _inLibrary) const
_cycleDetector.run(innerStruct->structDefinition())
)
{
recursion = true;
m_recursive = true;
if (_inLibrary && location() == DataLocation::Storage)
continue;
else
@ -2195,7 +2196,7 @@ TypeResult StructType::interfaceType(bool _inLibrary) const
}
};
recursion = recursion || (CycleDetector<StructDefinition>(visitor).run(structDefinition()) != nullptr);
m_recursive = m_recursive.get() || (CycleDetector<StructDefinition>(visitor).run(structDefinition()) != nullptr);
std::string const recursiveErrMsg = "Recursive type not allowed for public or external contract functions.";
@ -2208,13 +2209,13 @@ TypeResult StructType::interfaceType(bool _inLibrary) const
else
m_interfaceType_library = copyForLocation(DataLocation::Memory, true);
if (recursion)
if (m_recursive.get())
m_interfaceType = TypeResult::err(recursiveErrMsg);
return *m_interfaceType_library;
}
if (recursion)
if (m_recursive.get())
m_interfaceType = TypeResult::err(recursiveErrMsg);
else if (!result.message().empty())
m_interfaceType = result;

11
libsolidity/ast/Types.h
View File

@ -844,6 +844,16 @@ public:
}
TypeResult interfaceType(bool _inLibrary) const override;
bool recursive() const
{
if (m_recursive.is_initialized())
return m_recursive.get();
interfaceType(false);
return m_recursive.get();
}
TypePointer copyForLocation(DataLocation _location, bool _isPointer) const override;
std::string canonicalName() const override;
@ -868,6 +878,7 @@ private:
// Caches for interfaceType(bool)
mutable boost::optional<TypeResult> m_interfaceType;
mutable boost::optional<TypeResult> m_interfaceType_library;
mutable boost::optional<bool> m_recursive;
};
/**