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 colour error type, not error message in isoltest.

Browse Source
This commit is contained in:
Daniel Kirchner 2018-03-15 16:27:34 +01:00
parent 7fa892eca9
commit 50ad89d369
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
test/libsolidity/SyntaxTest.cpp
View File

@ -78,8 +78,11 @@ void SyntaxTest::printExpected(ostream& _stream, string const& _linePrefix, bool
FormattedScope(_stream, _formatted, {BOLD, GREEN}) << _linePrefix << "Success" << endl; FormattedScope(_stream, _formatted, {BOLD, GREEN}) << _linePrefix << "Success" << endl;
else else
for (auto const& expectation: m_expectations) for (auto const& expectation: m_expectations)
{
FormattedScope(_stream, _formatted, {BOLD, expectation.type == "Warning" ? YELLOW : RED}) << FormattedScope(_stream, _formatted, {BOLD, expectation.type == "Warning" ? YELLOW : RED}) <<
_linePrefix << expectation.type << ": " << expectation.message << endl; _linePrefix << expectation.type << ": ";
_stream << expectation.message << endl;
}
} }
void SyntaxTest::printErrorList( void SyntaxTest::printErrorList(
@ -99,17 +102,20 @@ void SyntaxTest::printErrorList(
bool isWarning = (error->type() == Error::Type::Warning); bool isWarning = (error->type() == Error::Type::Warning);
if (isWarning && _ignoreWarnings) continue; if (isWarning && _ignoreWarnings) continue;
FormattedScope scope(_stream, _formatted, {BOLD, isWarning ? YELLOW : RED});
_stream << _linePrefix;
if (_lineNumbers)
{ {
int line = offsetToLineNumber( FormattedScope scope(_stream, _formatted, {BOLD, isWarning ? YELLOW : RED});
boost::get_error_info<errinfo_sourceLocation>(*error)->start _stream << _linePrefix;
); if (_lineNumbers)
if (line >= 0) {
_stream << "(" << line << "): "; int line = offsetToLineNumber(
boost::get_error_info<errinfo_sourceLocation>(*error)->start
);
if (line >= 0)
_stream << "(" << line << "): ";
}
_stream << error->typeName() << ": ";
} }
_stream << error->typeName() << ": " << errorMessage(*error) << endl; _stream << errorMessage(*error) << endl;
} }
} }