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

Added a flag to record when a source is reconstructed from JSON so garbage code snippets are not printed after source location.

Browse Source
This commit is contained in:
Matheus Aguiar 2022-06-24 20:37:52 -03:00
parent a53f15f45f
commit 290bd4fd2d
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
liblangutil/CharStream.h
View File

@ -73,9 +73,15 @@ public:
CharStream() = default;
CharStream(std::string _source, std::string _name):
m_source(std::move(_source)), m_name(std::move(_name)) {}
CharStream(std::string _source, std::string _name, bool _importedFromAST):
m_source(std::move(_source)),
m_name(std::move(_name)),
m_importedFromAST(_importedFromAST)
{ }
size_t position() const { return m_position; }
bool isPastEndOfInput(size_t _charsForward = 0) const { return (m_position + _charsForward) >= m_source.size(); }
bool isImportedFromAST() const { return m_importedFromAST; }
char get(size_t _charsForward = 0) const { return m_source[m_position + _charsForward]; }
char advanceAndGet(size_t _chars = 1);
@ -138,6 +144,7 @@ public:
private:
std::string m_source;
std::string m_name;
bool m_importedFromAST{false};
size_t m_position{0};
};

3
libsolidity/interface/CompilerStack.cpp
View File

@ -404,7 +404,8 @@ void CompilerStack::importASTs(map<string, Json::Value> const& _sources)
source.ast = src.second;
source.charStream = make_shared<CharStream>(
util::jsonCompactPrint(m_sourceJsons[src.first]),
src.first
src.first,
true // imported from AST
);
m_sources[path] = move(source);
}

6
libyul/AsmPrinter.cpp
View File

@ -278,7 +278,11 @@ string AsmPrinter::formatSourceLocation(
{
sourceIndex = to_string(_nameToSourceIndex.at(*_location.sourceName));
if (_debugInfoSelection.snippet && _soliditySourceProvider)
if (
_debugInfoSelection.snippet &&
_soliditySourceProvider &&
!_soliditySourceProvider->charStream(*_location.sourceName).isImportedFromAST()
)
{
solidityCodeSnippet = escapeAndQuoteString(
_soliditySourceProvider->charStream(*_location.sourceName).singleLineSnippet(_location)