cerc-io/solidity
15
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 #2940 from ethereum/verboseErrors

Browse Source 
More verbos error reports.
This commit is contained in:
Alex Beregszaszi 2017-09-22 17:32:29 +01:00 committed by GitHub
commit ccb689701e
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libdevcore/Whiskers.cpp
View File

@ -90,7 +90,13 @@ string Whiskers::replace(
string tagName(_match[1]); string tagName(_match[1]);
if (!tagName.empty()) if (!tagName.empty())
{ {
assertThrow(_parameters.count(tagName), WhiskersError, "Value for tag " + tagName + " not provided."); assertThrow(
_parameters.count(tagName),
WhiskersError,
"Value for tag " + tagName + " not provided.\n" +
"Template:\n" +
_template
);
return _parameters.at(tagName); return _parameters.at(tagName);
} }
else else

20
libsolidity/codegen/CompilerContext.cpp
View File

@ -26,6 +26,7 @@
#include <libsolidity/codegen/Compiler.h> #include <libsolidity/codegen/Compiler.h>
#include <libsolidity/interface/Version.h> #include <libsolidity/interface/Version.h>
#include <libsolidity/interface/ErrorReporter.h> #include <libsolidity/interface/ErrorReporter.h>
#include <libsolidity/interface/SourceReferenceFormatter.h>
#include <libsolidity/parsing/Scanner.h> #include <libsolidity/parsing/Scanner.h>
#include <libsolidity/inlineasm/AsmParser.h> #include <libsolidity/inlineasm/AsmParser.h>
#include <libsolidity/inlineasm/AsmCodeGen.h> #include <libsolidity/inlineasm/AsmCodeGen.h>
@ -312,8 +313,23 @@ void CompilerContext::appendInlineAssembly(
ErrorReporter errorReporter(errors); ErrorReporter errorReporter(errors);
auto scanner = make_shared<Scanner>(CharStream(_assembly), "--CODEGEN--"); auto scanner = make_shared<Scanner>(CharStream(_assembly), "--CODEGEN--");
auto parserResult = assembly::Parser(errorReporter).parse(scanner); auto parserResult = assembly::Parser(errorReporter).parse(scanner);
solAssert(parserResult, "Failed to parse inline assembly block."); if (!parserResult || !errorReporter.errors().empty())
solAssert(errorReporter.errors().empty(), "Failed to parse inline assembly block."); {
string message =
"Error parsing inline assembly block:\n"
"------------------ Input: -----------------\n" +
_assembly + "\n"
"------------------ Errors: ----------------\n";
for (auto const& error: errorReporter.errors())
message += SourceReferenceFormatter::formatExceptionInformation(
*error,
(error->type() == Error::Type::Warning) ? "Warning" : "Error",
[&](string const&) -> Scanner const& { return *scanner; }
);
message += "-------------------------------------------\n";
solAssert(false, message);
}
assembly::AsmAnalysisInfo analysisInfo; assembly::AsmAnalysisInfo analysisInfo;
assembly::AsmAnalyzer analyzer(analysisInfo, errorReporter, false, identifierAccess.resolve); assembly::AsmAnalyzer analyzer(analysisInfo, errorReporter, false, identifierAccess.resolve);