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

Only use SourceReferenceFormatterHuman

Browse Source
This commit is contained in:
Alex Beregszaszi 2020-11-02 14:29:33 +00:00 committed by chriseth
parent 1126838a31
commit 1dedba8538
22 changed files with 47 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
liblangutil/SourceReferenceFormatterHuman.h
View File

@ -58,6 +58,14 @@ public:
return errorOutput.str(); return errorOutput.str();
} }
static std::string formatErrorInformation(Error const& _error)
{
return formatExceptionInformation(
_error,
(_error.type() == Error::Type::Warning) ? "Warning" : "Error"
);
}
private: private:
util::AnsiColorized normalColored() const; util::AnsiColorized normalColored() const;
util::AnsiColorized frameColored() const; util::AnsiColorized frameColored() const;

4
libsolidity/codegen/CompilerContext.cpp
View File

@ -45,7 +45,7 @@
#include <liblangutil/ErrorReporter.h> #include <liblangutil/ErrorReporter.h>
#include <liblangutil/Scanner.h> #include <liblangutil/Scanner.h>
#include <liblangutil/SourceReferenceFormatter.h> #include <liblangutil/SourceReferenceFormatterHuman.h>
#include <boost/algorithm/string/replace.hpp> #include <boost/algorithm/string/replace.hpp>
@ -460,7 +460,7 @@ void CompilerContext::appendInlineAssembly(
_assembly + "\n" _assembly + "\n"
"------------------ Errors: ----------------\n"; "------------------ Errors: ----------------\n";
for (auto const& error: errorReporter.errors()) for (auto const& error: errorReporter.errors())
message += SourceReferenceFormatter::formatErrorInformation(*error); message += SourceReferenceFormatterHuman::formatErrorInformation(*error);
message += "-------------------------------------------\n"; message += "-------------------------------------------\n";
solAssert(false, message); solAssert(false, message);

4
libsolidity/codegen/ir/IRGenerator.cpp
View File

@ -37,7 +37,7 @@
#include <libsolutil/Whiskers.h> #include <libsolutil/Whiskers.h>
#include <libsolutil/StringUtils.h> #include <libsolutil/StringUtils.h>
#include <liblangutil/SourceReferenceFormatter.h> #include <liblangutil/SourceReferenceFormatterHuman.h>
#include <boost/range/adaptor/map.hpp> #include <boost/range/adaptor/map.hpp>
@ -60,7 +60,7 @@ pair<string, string> IRGenerator::run(
{ {
string errorMessage; string errorMessage;
for (auto const& error: asmStack.errors()) for (auto const& error: asmStack.errors())
errorMessage += langutil::SourceReferenceFormatter::formatErrorInformation(*error); errorMessage += langutil::SourceReferenceFormatterHuman::formatErrorInformation(*error);
solAssert(false, ir + "\n\nInvalid IR generated:\n" + errorMessage + "\n"); solAssert(false, ir + "\n\nInvalid IR generated:\n" + errorMessage + "\n");
} }
asmStack.optimize(); asmStack.optimize();

5
libsolidity/interface/StandardCompiler.cpp
View File

@ -27,7 +27,7 @@
#include <libyul/AssemblyStack.h> #include <libyul/AssemblyStack.h>
#include <libyul/Exceptions.h> #include <libyul/Exceptions.h>
#include <libyul/optimiser/Suite.h> #include <libyul/optimiser/Suite.h>
#include <liblangutil/SourceReferenceFormatter.h> #include <liblangutil/SourceReferenceFormatterHuman.h>
#include <libevmasm/Instruction.h> #include <libevmasm/Instruction.h>
#include <libsmtutil/Exceptions.h> #include <libsmtutil/Exceptions.h>
#include <libsolutil/JSON.h> #include <libsolutil/JSON.h>
@ -117,7 +117,8 @@ Json::Value formatErrorWithException(
) )
{ {
string message; string message;
string formattedMessage = SourceReferenceFormatter::formatExceptionInformation(_exception, _type); // TODO: consider enabling color
string formattedMessage = SourceReferenceFormatterHuman::formatExceptionInformation(_exception, _type);
if (string const* description = boost::get_error_info<util::errinfo_comment>(_exception)) if (string const* description = boost::get_error_info<util::errinfo_comment>(_exception))
message = ((_message.length() > 0) ? (_message + ":") : "") + *description; message = ((_message.length() > 0) ? (_message + ":") : "") + *description;

6
libyul/backends/wasm/EVMToEwasmTranslator.cpp
View File

@ -39,7 +39,7 @@
#include <liblangutil/ErrorReporter.h> #include <liblangutil/ErrorReporter.h>
#include <liblangutil/Scanner.h> #include <liblangutil/Scanner.h>
#include <liblangutil/SourceReferenceFormatter.h> #include <liblangutil/SourceReferenceFormatterHuman.h>
// The following headers are generated from the // The following headers are generated from the
// yul files placed in libyul/backends/wasm/polyfill. // yul files placed in libyul/backends/wasm/polyfill.
@ -97,7 +97,7 @@ Object EVMToEwasmTranslator::run(Object const& _object)
message += ret.toString(&WasmDialect::instance()); message += ret.toString(&WasmDialect::instance());
message += "----------------------------------\n"; message += "----------------------------------\n";
for (auto const& err: errors) for (auto const& err: errors)
message += langutil::SourceReferenceFormatter::formatErrorInformation(*err); message += langutil::SourceReferenceFormatterHuman::formatErrorInformation(*err);
yulAssert(false, message); yulAssert(false, message);
} }
@ -131,7 +131,7 @@ void EVMToEwasmTranslator::parsePolyfill()
{ {
string message; string message;
for (auto const& err: errors) for (auto const& err: errors)
message += langutil::SourceReferenceFormatter::formatErrorInformation(*err); message += langutil::SourceReferenceFormatterHuman::formatErrorInformation(*err);
yulAssert(false, message); yulAssert(false, message);
} }

4
test/libsolidity/AnalysisFramework.cpp
View File

@ -24,7 +24,7 @@
#include <test/Common.h> #include <test/Common.h>
#include <libsolidity/interface/CompilerStack.h> #include <libsolidity/interface/CompilerStack.h>
#include <liblangutil/SourceReferenceFormatter.h> #include <liblangutil/SourceReferenceFormatterHuman.h>
#include <libsolidity/ast/AST.h> #include <libsolidity/ast/AST.h>
@ -149,7 +149,7 @@ string AnalysisFramework::formatErrors() const
string AnalysisFramework::formatError(Error const& _error) const string AnalysisFramework::formatError(Error const& _error) const
{ {
return SourceReferenceFormatter::formatErrorInformation(_error); return SourceReferenceFormatterHuman::formatErrorInformation(_error);
} }
ContractDefinition const* AnalysisFramework::retrieveContractByName(SourceUnit const& _source, string const& _name) ContractDefinition const* AnalysisFramework::retrieveContractByName(SourceUnit const& _source, string const& _name)

1
test/libsolidity/GasMeter.cpp
View File

@ -27,7 +27,6 @@
#include <libevmasm/PathGasMeter.h> #include <libevmasm/PathGasMeter.h>
#include <libsolidity/ast/AST.h> #include <libsolidity/ast/AST.h>
#include <libsolidity/interface/GasEstimator.h> #include <libsolidity/interface/GasEstimator.h>
#include <liblangutil/SourceReferenceFormatter.h>
using namespace std; using namespace std;
using namespace solidity::langutil; using namespace solidity::langutil;

4
test/libsolidity/InlineAssembly.cpp
View File

@ -30,7 +30,7 @@
#include <liblangutil/Scanner.h> #include <liblangutil/Scanner.h>
#include <liblangutil/Exceptions.h> #include <liblangutil/Exceptions.h>
#include <liblangutil/SourceReferenceFormatter.h> #include <liblangutil/SourceReferenceFormatterHuman.h>
#include <libevmasm/Assembly.h> #include <libevmasm/Assembly.h>
@ -81,7 +81,7 @@ std::optional<Error> parseAndReturnFirstError(
{ {
string errors; string errors;
for (auto const& err: stack.errors()) for (auto const& err: stack.errors())
errors += SourceReferenceFormatter::formatErrorInformation(*err); errors += SourceReferenceFormatterHuman::formatErrorInformation(*err);
BOOST_FAIL("Found more than one error:\n" + errors); BOOST_FAIL("Found more than one error:\n" + errors);
} }
error = e; error = e;

4
test/libsolidity/SolidityExecutionFramework.cpp
View File

@ -25,6 +25,8 @@
#include <iostream> #include <iostream>
#include <boost/test/framework.hpp> #include <boost/test/framework.hpp>
#include <test/libsolidity/SolidityExecutionFramework.h> #include <test/libsolidity/SolidityExecutionFramework.h>
#include <liblangutil/Exceptions.h>
#include <liblangutil/SourceReferenceFormatterHuman.h>
using namespace solidity; using namespace solidity;
using namespace solidity::test; using namespace solidity::test;
@ -60,7 +62,7 @@ bytes SolidityExecutionFramework::multiSourceCompileContract(
for (auto const& error: m_compiler.errors()) for (auto const& error: m_compiler.errors())
if (error->type() == langutil::Error::Type::CodeGenerationError) if (error->type() == langutil::Error::Type::CodeGenerationError)
BOOST_THROW_EXCEPTION(*error); BOOST_THROW_EXCEPTION(*error);
langutil::SourceReferenceFormatter formatter(std::cerr); langutil::SourceReferenceFormatterHuman formatter(std::cerr, true, false);
for (auto const& error: m_compiler.errors()) for (auto const& error: m_compiler.errors())
formatter.printErrorInformation(*error); formatter.printErrorInformation(*error);

3
test/libsolidity/SolidityExecutionFramework.h
View File

@ -32,9 +32,6 @@
#include <libyul/AssemblyStack.h> #include <libyul/AssemblyStack.h>
#include <liblangutil/Exceptions.h>
#include <liblangutil/SourceReferenceFormatter.h>
namespace solidity::frontend::test namespace solidity::frontend::test
{ {

4
test/libyul/Common.cpp
View File

@ -23,7 +23,7 @@
#include <test/Common.h> #include <test/Common.h>
#include <liblangutil/SourceReferenceFormatter.h> #include <liblangutil/SourceReferenceFormatterHuman.h>
#include <libyul/optimiser/Disambiguator.h> #include <libyul/optimiser/Disambiguator.h>
#include <libyul/AsmParser.h> #include <libyul/AsmParser.h>
@ -55,7 +55,7 @@ Dialect const& defaultDialect(bool _yul)
void yul::test::printErrors(ErrorList const& _errors) void yul::test::printErrors(ErrorList const& _errors)
{ {
SourceReferenceFormatter formatter(cout); SourceReferenceFormatterHuman formatter(cout, true, false);
for (auto const& error: _errors) for (auto const& error: _errors)
formatter.printErrorInformation(*error); formatter.printErrorInformation(*error);

4
test/libyul/EwasmTranslationTest.cpp
View File

@ -31,7 +31,7 @@
#include <libyul/Object.h> #include <libyul/Object.h>
#include <liblangutil/ErrorReporter.h> #include <liblangutil/ErrorReporter.h>
#include <liblangutil/SourceReferenceFormatter.h> #include <liblangutil/SourceReferenceFormatterHuman.h>
#include <libsolutil/AnsiColorized.h> #include <libsolutil/AnsiColorized.h>
@ -116,7 +116,7 @@ string EwasmTranslationTest::interpret()
void EwasmTranslationTest::printErrors(ostream& _stream, ErrorList const& _errors) void EwasmTranslationTest::printErrors(ostream& _stream, ErrorList const& _errors)
{ {
SourceReferenceFormatter formatter(_stream); SourceReferenceFormatterHuman formatter(_stream, true, false);
for (auto const& error: _errors) for (auto const& error: _errors)
formatter.printErrorInformation(*error); formatter.printErrorInformation(*error);

4
test/libyul/ObjectCompilerTest.cpp
View File

@ -24,7 +24,7 @@
#include <libevmasm/Instruction.h> #include <libevmasm/Instruction.h>
#include <liblangutil/SourceReferenceFormatter.h> #include <liblangutil/SourceReferenceFormatterHuman.h>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
@ -96,7 +96,7 @@ TestCase::TestResult ObjectCompilerTest::run(ostream& _stream, string const& _li
void ObjectCompilerTest::printErrors(ostream& _stream, ErrorList const& _errors) void ObjectCompilerTest::printErrors(ostream& _stream, ErrorList const& _errors)
{ {
SourceReferenceFormatter formatter(_stream); SourceReferenceFormatterHuman formatter(_stream, true, false);
for (auto const& error: _errors) for (auto const& error: _errors)
formatter.printErrorInformation(*error); formatter.printErrorInformation(*error);

4
test/libyul/YulInterpreterTest.cpp
View File

@ -28,7 +28,7 @@
#include <libyul/AsmAnalysisInfo.h> #include <libyul/AsmAnalysisInfo.h>
#include <liblangutil/ErrorReporter.h> #include <liblangutil/ErrorReporter.h>
#include <liblangutil/SourceReferenceFormatter.h> #include <liblangutil/SourceReferenceFormatterHuman.h>
#include <libsolutil/AnsiColorized.h> #include <libsolutil/AnsiColorized.h>
@ -104,7 +104,7 @@ string YulInterpreterTest::interpret()
void YulInterpreterTest::printErrors(ostream& _stream, ErrorList const& _errors) void YulInterpreterTest::printErrors(ostream& _stream, ErrorList const& _errors)
{ {
SourceReferenceFormatter formatter(_stream); SourceReferenceFormatterHuman formatter(_stream, true, false);
for (auto const& error: _errors) for (auto const& error: _errors)
formatter.printErrorInformation(*error); formatter.printErrorInformation(*error);

4
test/libyul/YulOptimizerTest.cpp
View File

@ -73,7 +73,7 @@
#include <libyul/AsmAnalysis.h> #include <libyul/AsmAnalysis.h>
#include <libyul/AssemblyStack.h> #include <libyul/AssemblyStack.h>
#include <libyul/CompilabilityChecker.h> #include <libyul/CompilabilityChecker.h>
#include <liblangutil/SourceReferenceFormatter.h> #include <liblangutil/SourceReferenceFormatterHuman.h>
#include <liblangutil/ErrorReporter.h> #include <liblangutil/ErrorReporter.h>
#include <liblangutil/Scanner.h> #include <liblangutil/Scanner.h>
@ -496,7 +496,7 @@ void YulOptimizerTest::updateContext()
void YulOptimizerTest::printErrors(ostream& _stream, ErrorList const& _errors) void YulOptimizerTest::printErrors(ostream& _stream, ErrorList const& _errors)
{ {
SourceReferenceFormatter formatter(_stream); SourceReferenceFormatterHuman formatter(_stream, true, false);
for (auto const& error: _errors) for (auto const& error: _errors)
formatter.printErrorInformation(*error); formatter.printErrorInformation(*error);

5
test/tools/ossfuzz/abiV2FuzzerCommon.cpp
View File

@ -1,5 +1,8 @@
#include <test/tools/ossfuzz/abiV2FuzzerCommon.h> #include <test/tools/ossfuzz/abiV2FuzzerCommon.h>
#include <liblangutil/Exceptions.h>
#include <liblangutil/SourceReferenceFormatterHuman.h>
using namespace solidity::test::abiv2fuzzer; using namespace solidity::test::abiv2fuzzer;
SolidityCompilationFramework::SolidityCompilationFramework(langutil::EVMVersion _evmVersion) SolidityCompilationFramework::SolidityCompilationFramework(langutil::EVMVersion _evmVersion)
@ -21,7 +24,7 @@ solidity::bytes SolidityCompilationFramework::compileContract(
m_compiler.setOptimiserSettings(_optimization); m_compiler.setOptimiserSettings(_optimization);
if (!m_compiler.compile()) if (!m_compiler.compile())
{ {
langutil::SourceReferenceFormatter formatter(std::cerr); langutil::SourceReferenceFormatterHuman formatter(std::cerr, false, false);
for (auto const& error: m_compiler.errors()) for (auto const& error: m_compiler.errors())
formatter.printExceptionInformation( formatter.printExceptionInformation(

3
test/tools/ossfuzz/abiV2FuzzerCommon.h
View File

@ -4,9 +4,6 @@
#include <libyul/AssemblyStack.h> #include <libyul/AssemblyStack.h>
#include <liblangutil/Exceptions.h>
#include <liblangutil/SourceReferenceFormatter.h>
#include <libsolutil/Keccak256.h> #include <libsolutil/Keccak256.h>
namespace solidity::test::abiv2fuzzer namespace solidity::test::abiv2fuzzer

1
test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp
View File

@ -26,7 +26,6 @@
#include <liblangutil/Exceptions.h> #include <liblangutil/Exceptions.h>
#include <liblangutil/ErrorReporter.h> #include <liblangutil/ErrorReporter.h>
#include <liblangutil/EVMVersion.h> #include <liblangutil/EVMVersion.h>
#include <liblangutil/SourceReferenceFormatter.h>
#include <libsolutil/CommonIO.h> #include <libsolutil/CommonIO.h>
#include <libsolutil/CommonData.h> #include <libsolutil/CommonData.h>

4
test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp
View File

@ -28,7 +28,7 @@
#include <libyul/Exceptions.h> #include <libyul/Exceptions.h>
#include <liblangutil/EVMVersion.h> #include <liblangutil/EVMVersion.h>
#include <liblangutil/SourceReferenceFormatter.h> #include <liblangutil/SourceReferenceFormatterHuman.h>
#include <test/tools/ossfuzz/yulFuzzerCommon.h> #include <test/tools/ossfuzz/yulFuzzerCommon.h>
@ -44,7 +44,7 @@ namespace
{ {
void printErrors(ostream& _stream, ErrorList const& _errors) void printErrors(ostream& _stream, ErrorList const& _errors)
{ {
SourceReferenceFormatter formatter(_stream); SourceReferenceFormatterHuman formatter(_stream, false, false);
for (auto const& error: _errors) for (auto const& error: _errors)
formatter.printExceptionInformation( formatter.printExceptionInformation(

4
test/tools/yulopti.cpp
View File

@ -30,7 +30,7 @@
#include <libyul/AsmParser.h> #include <libyul/AsmParser.h>
#include <libyul/AsmPrinter.h> #include <libyul/AsmPrinter.h>
#include <libyul/Object.h> #include <libyul/Object.h>
#include <liblangutil/SourceReferenceFormatter.h> #include <liblangutil/SourceReferenceFormatterHuman.h>
#include <libyul/optimiser/Disambiguator.h> #include <libyul/optimiser/Disambiguator.h>
#include <libyul/optimiser/OptimiserStep.h> #include <libyul/optimiser/OptimiserStep.h>
@ -64,7 +64,7 @@ class YulOpti
public: public:
void printErrors() void printErrors()
{ {
SourceReferenceFormatter formatter(cerr); SourceReferenceFormatterHuman formatter(cerr, true, false);
for (auto const& error: m_errors) for (auto const& error: m_errors)
formatter.printErrorInformation(*error); formatter.printErrorInformation(*error);

4
test/tools/yulrun.cpp
View File

@ -31,7 +31,7 @@
#include <liblangutil/Exceptions.h> #include <liblangutil/Exceptions.h>
#include <liblangutil/ErrorReporter.h> #include <liblangutil/ErrorReporter.h>
#include <liblangutil/EVMVersion.h> #include <liblangutil/EVMVersion.h>
#include <liblangutil/SourceReferenceFormatter.h> #include <liblangutil/SourceReferenceFormatterHuman.h>
#include <libsolutil/CommonIO.h> #include <libsolutil/CommonIO.h>
#include <libsolutil/CommonData.h> #include <libsolutil/CommonData.h>
@ -58,7 +58,7 @@ namespace
void printErrors(ErrorList const& _errors) void printErrors(ErrorList const& _errors)
{ {
for (auto const& error: _errors) for (auto const& error: _errors)
SourceReferenceFormatter(cout).printErrorInformation(*error); SourceReferenceFormatterHuman(cout, true, false).printErrorInformation(*error);
} }
pair<shared_ptr<Block>, shared_ptr<AsmAnalysisInfo>> parse(string const& _source) pair<shared_ptr<Block>, shared_ptr<AsmAnalysisInfo>> parse(string const& _source)

4
tools/yulPhaser/Program.cpp
View File

@ -20,7 +20,7 @@
#include <liblangutil/CharStream.h> #include <liblangutil/CharStream.h>
#include <liblangutil/ErrorReporter.h> #include <liblangutil/ErrorReporter.h>
#include <liblangutil/SourceReferenceFormatter.h> #include <liblangutil/SourceReferenceFormatterHuman.h>
#include <libyul/AsmAnalysis.h> #include <libyul/AsmAnalysis.h>
#include <libyul/AsmAnalysisInfo.h> #include <libyul/AsmAnalysisInfo.h>
@ -59,7 +59,7 @@ ostream& operator<<(ostream& _stream, Program const& _program);
ostream& std::operator<<(ostream& _outputStream, ErrorList const& _errors) ostream& std::operator<<(ostream& _outputStream, ErrorList const& _errors)
{ {
SourceReferenceFormatter formatter(_outputStream); SourceReferenceFormatterHuman formatter(_outputStream, true, false);
for (auto const& error: _errors) for (auto const& error: _errors)
formatter.printErrorInformation(*error); formatter.printErrorInformation(*error);