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

Merge pull request #5554 from ethereum/cp-SourceReferenceFormatter-refactor

Browse Source 
[2/3] Refactor SourceReferenceFormatter (split-out data extraction & make use of new SourceLocation knowledge)
This commit is contained in:
chriseth
2018-12-06 14:01:39 +01:00
committed by GitHub
parent 1643d63e3a 073b03d90c
commit 0e8841005c
16 changed files with 234 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/libsolidity/AnalysisFramework.cpp
+1 -2
View File
@@ -127,8 +127,7 @@ string AnalysisFramework::formatError(Error const& _error) const
{
return SourceReferenceFormatter::formatExceptionInformation(
_error,
(_error.type() == Error::Type::Warning) ? "Warning" : "Error",
[&](std::string const& _sourceName) -> Scanner const& { return m_compiler.scanner(_sourceName); }
(_error.type() == Error::Type::Warning) ? "Warning" : "Error"
);
}
test/libsolidity/GasMeter.cpp
+1 -2
View File
@@ -138,8 +138,7 @@ BOOST_AUTO_TEST_CASE(non_overlapping_filtered_costs)
if (first->first->location().intersects(second->first->location()))
{
BOOST_CHECK_MESSAGE(false, "Source locations should not overlap!");
auto scannerFromSource = [&](string const& _sourceName) -> Scanner const& { return m_compiler.scanner(_sourceName); };
SourceReferenceFormatter formatter(cout, scannerFromSource);
SourceReferenceFormatter formatter(cout);
formatter.printSourceLocation(&first->first->location());
formatter.printSourceLocation(&second->first->location());
test/libsolidity/SolidityExecutionFramework.h
+1 -2
View File
@@ -72,8 +72,7 @@ public:
m_compiler.setOptimiserSettings(m_optimize, m_optimizeRuns);
if (!m_compiler.compile())
{
auto scannerFromSourceName = [&](std::string const& _sourceName) -> langutil::Scanner const& { return m_compiler.scanner(_sourceName); };
langutil::SourceReferenceFormatter formatter(std::cerr, scannerFromSourceName);
langutil::SourceReferenceFormatter formatter(std::cerr);
for (auto const& error: m_compiler.errors())
formatter.printExceptionInformation(