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

Allow and require use-src to be repeated for each object.

Browse Source
This commit is contained in:
chriseth
2021-09-02 11:29:42 +02:00
parent 13691dfbaa
commit 5caa15879b
31 changed files with 67 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libyul/Object.cpp
+8 -14
View File
@@ -50,38 +50,32 @@ string indent(std::string const& _input)
}
string Data::toString(Dialect const*, optional<SourceNameMap>) const
string Data::toString(Dialect const*) const
{
return "data \"" + name.str() + "\" hex\"" + util::toHex(data) + "\"";
}
string Object::toString(Dialect const* _dialect) const
{
yulAssert(code, "No code");
yulAssert(debugData, "No debug data");
string useSrcComment;
if (debugData && debugData->sourceNames)
if (debugData->sourceNames)
useSrcComment =
"/// @use-src " +
joinHumanReadable(ranges::views::transform(*debugData->sourceNames, [](auto&& _pair) {
return to_string(_pair.first) + ":" + util::escapeAndQuoteString(*_pair.second);
})) +
"\n";
return useSrcComment + toString(_dialect, debugData ? debugData->sourceNames : optional<SourceNameMap>{});
}
string Object::toString(Dialect const* _dialect, std::optional<SourceNameMap> _sourceNames) const
{
yulAssert(code, "No code");
string inner = "code " + AsmPrinter{_dialect, _sourceNames}(*code);
string inner = "code " + AsmPrinter{_dialect, debugData->sourceNames}(*code);
for (auto const& obj: subObjects)
{
if (auto const* o = dynamic_cast<Object const*>(obj.get()))
yulAssert(!o->debugData || !o->debugData->sourceNames, "");
inner += "\n" + obj->toString(_dialect, _sourceNames);
}
inner += "\n" + obj->toString(_dialect);
return "object \"" + name.str() + "\" {\n" + indent(inner) + "\n}";
return useSrcComment + "object \"" + name.str() + "\" {\n" + indent(inner) + "\n}";
}
set<YulString> Object::qualifiedDataNames() const