diff options
| author | chriseth <chris@ethereum.org> | 2018-02-20 00:34:07 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-20 00:34:07 +0800 |
| commit | abc23ac6086fe724b82eb8ca7f9805cf7ff5ba10 (patch) | |
| tree | 31ebad3bbafe2fca6292989e7521ab0e8146f9d3 /test/libsolidity/SolidityExecutionFramework.h | |
| parent | a938e39a9d1784a91984c6959300f64734172864 (diff) | |
| parent | 305d5f70c25d63d602477c6b576b2f62d388c032 (diff) | |
| download | dexon-solidity-abc23ac6086fe724b82eb8ca7f9805cf7ff5ba10.tar dexon-solidity-abc23ac6086fe724b82eb8ca7f9805cf7ff5ba10.tar.gz dexon-solidity-abc23ac6086fe724b82eb8ca7f9805cf7ff5ba10.tar.bz2 dexon-solidity-abc23ac6086fe724b82eb8ca7f9805cf7ff5ba10.tar.lz dexon-solidity-abc23ac6086fe724b82eb8ca7f9805cf7ff5ba10.tar.xz dexon-solidity-abc23ac6086fe724b82eb8ca7f9805cf7ff5ba10.tar.zst dexon-solidity-abc23ac6086fe724b82eb8ca7f9805cf7ff5ba10.zip | |
Merge pull request #3135 from federicobond/formatter-instance
Convert static SourceReferenceFormatter functions to member ones
Diffstat (limited to 'test/libsolidity/SolidityExecutionFramework.h')
| -rw-r--r-- | test/libsolidity/SolidityExecutionFramework.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/test/libsolidity/SolidityExecutionFramework.h b/test/libsolidity/SolidityExecutionFramework.h index b0daaba9..b853d558 100644 --- a/test/libsolidity/SolidityExecutionFramework.h +++ b/test/libsolidity/SolidityExecutionFramework.h @@ -60,12 +60,13 @@ public: m_compiler.setOptimiserSettings(m_optimize, m_optimizeRuns); if (!m_compiler.compile()) { + auto scannerFromSourceName = [&](std::string const& _sourceName) -> solidity::Scanner const& { return m_compiler.scanner(_sourceName); }; + SourceReferenceFormatter formatter(std::cerr, scannerFromSourceName); + for (auto const& error: m_compiler.errors()) - SourceReferenceFormatter::printExceptionInformation( - std::cerr, + formatter.printExceptionInformation( *error, - (error->type() == Error::Type::Warning) ? "Warning" : "Error", - [&](std::string const& _sourceName) -> solidity::Scanner const& { return m_compiler.scanner(_sourceName); } + (error->type() == Error::Type::Warning) ? "Warning" : "Error" ); BOOST_ERROR("Compiling contract failed"); } |