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 #6484 from sifmelcara/create-SourceReferenceFormatter-shortcut

Browse Source 
Add a shortcut for formatting error information
This commit is contained in:
Leonardo
2019-04-12 12:34:08 +02:00
committed by GitHub
parent 31abeb99a8 f1374066af
commit dbc9442f9c
13 changed files with 34 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/libsolidity/AnalysisFramework.cpp
+1 -4
View File
@@ -125,10 +125,7 @@ string AnalysisFramework::formatErrors() const
string AnalysisFramework::formatError(Error const& _error) const
{
return SourceReferenceFormatter::formatExceptionInformation(
_error,
(_error.type() == Error::Type::Warning) ? "Warning" : "Error"
);
return SourceReferenceFormatter::formatErrorInformation(_error);
}
ContractDefinition const* AnalysisFramework::retrieveContractByName(SourceUnit const& _source, string const& _name)
test/libsolidity/SolidityExecutionFramework.h
+2 -8
View File
@@ -83,10 +83,7 @@ public:
langutil::SourceReferenceFormatter formatter(std::cerr);
for (auto const& error: m_compiler.errors())
formatter.printExceptionInformation(
*error,
(error->type() == langutil::Error::Type::Warning) ? "Warning" : "Error"
);
formatter.printErrorInformation(*error);
BOOST_ERROR("Compiling contract failed");
}
eth::LinkerObject obj;
@@ -104,10 +101,7 @@ public:
langutil::SourceReferenceFormatter formatter(std::cerr);
for (auto const& error: m_compiler.errors())
formatter.printExceptionInformation(
*error,
(error->type() == langutil::Error::Type::Warning) ? "Warning" : "Error"
);
formatter.printErrorInformation(*error);
BOOST_ERROR("Assembly contract failed. IR: " + m_compiler.yulIROptimized({}));
}
asmStack.optimize();
test/libyul/Common.cpp
+1 -4
View File
@@ -54,10 +54,7 @@ void yul::test::printErrors(ErrorList const& _errors)
SourceReferenceFormatter formatter(cout);
for (auto const& error: _errors)
formatter.printExceptionInformation(
*error,
(error->type() == Error::Type::Warning) ? "Warning" : "Error"
);
formatter.printErrorInformation(*error);
}
test/libyul/ObjectCompilerTest.cpp
+1 -4
View File
@@ -130,8 +130,5 @@ void ObjectCompilerTest::printErrors(ostream& _stream, ErrorList const& _errors)
SourceReferenceFormatter formatter(_stream);
for (auto const& error: _errors)
formatter.printExceptionInformation(
*error,
(error->type() == Error::Type::Warning) ? "Warning" : "Error"
);
formatter.printErrorInformation(*error);
}
test/libyul/YulInterpreterTest.cpp
+1 -4
View File
@@ -159,8 +159,5 @@ void YulInterpreterTest::printErrors(ostream& _stream, ErrorList const& _errors)
SourceReferenceFormatter formatter(_stream);
for (auto const& error: _errors)
formatter.printExceptionInformation(
*error,
(error->type() == Error::Type::Warning) ? "Warning" : "Error"
);
formatter.printErrorInformation(*error);
}
test/libyul/YulOptimizerTest.cpp
+1 -4
View File
@@ -354,8 +354,5 @@ void YulOptimizerTest::printErrors(ostream& _stream, ErrorList const& _errors)
SourceReferenceFormatter formatter(_stream);
for (auto const& error: _errors)
formatter.printExceptionInformation(
*error,
(error->type() == Error::Type::Warning) ? "Warning" : "Error"
);
formatter.printErrorInformation(*error);
}
test/tools/yulopti.cpp
+1 -4
View File
@@ -80,10 +80,7 @@ public:
SourceReferenceFormatter formatter(cout);
for (auto const& error: m_errors)
formatter.printExceptionInformation(
*error,
(error->type() == Error::Type::Warning) ? "Warning" : "Error"
);
formatter.printErrorInformation(*error);
}
bool parse(string const& _input)
test/tools/yulrun.cpp
+1 -4
View File
@@ -55,10 +55,7 @@ namespace
void printErrors(ErrorList const& _errors)
{
for (auto const& error: _errors)
SourceReferenceFormatter(cout).printExceptionInformation(
*error,
(error->type() == Error::Type::Warning) ? "Warning" : "Error"
);
SourceReferenceFormatter(cout).printErrorInformation(*error);
}
pair<shared_ptr<Block>, shared_ptr<AsmAnalysisInfo>> parse(string const& _source)