diff options
| author | chriseth <chris@ethereum.org> | 2017-05-30 22:45:36 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-30 22:45:36 +0800 |
| commit | 254b55728f66ea164e9085700a294ac4837f2029 (patch) | |
| tree | a4c464d4d40baaa260f071c1028f347bd287e44d /test/libsolidity/SolidityExpressionCompiler.cpp | |
| parent | 0066a08aa8f6c469cde7947ec50ca662a32123a0 (diff) | |
| parent | 89b60ffbd4c2dde26fa5e9f1d750729b5c89373e (diff) | |
| download | dexon-solidity-254b55728f66ea164e9085700a294ac4837f2029.tar dexon-solidity-254b55728f66ea164e9085700a294ac4837f2029.tar.gz dexon-solidity-254b55728f66ea164e9085700a294ac4837f2029.tar.bz2 dexon-solidity-254b55728f66ea164e9085700a294ac4837f2029.tar.lz dexon-solidity-254b55728f66ea164e9085700a294ac4837f2029.tar.xz dexon-solidity-254b55728f66ea164e9085700a294ac4837f2029.tar.zst dexon-solidity-254b55728f66ea164e9085700a294ac4837f2029.zip | |
Merge pull request #2264 from roadriverrail/refactor_error_log
Refactor error reporting
Diffstat (limited to 'test/libsolidity/SolidityExpressionCompiler.cpp')
| -rw-r--r-- | test/libsolidity/SolidityExpressionCompiler.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/test/libsolidity/SolidityExpressionCompiler.cpp b/test/libsolidity/SolidityExpressionCompiler.cpp index 3116aea8..58efa0a2 100644 --- a/test/libsolidity/SolidityExpressionCompiler.cpp +++ b/test/libsolidity/SolidityExpressionCompiler.cpp @@ -29,6 +29,7 @@ #include <libsolidity/codegen/ExpressionCompiler.h> #include <libsolidity/ast/AST.h> #include <libsolidity/analysis/TypeChecker.h> +#include <libsolidity/interface/ErrorReporter.h> #include "../TestHelper.h" using namespace std; @@ -98,7 +99,8 @@ bytes compileFirstExpression( try { ErrorList errors; - sourceUnit = Parser(errors).parse(make_shared<Scanner>(CharStream(_sourceCode))); + ErrorReporter errorReporter(errors); + sourceUnit = Parser(errorReporter).parse(make_shared<Scanner>(CharStream(_sourceCode))); if (!sourceUnit) return bytes(); } @@ -114,8 +116,9 @@ bytes compileFirstExpression( declarations.push_back(variable.get()); ErrorList errors; + ErrorReporter errorReporter(errors); map<ASTNode const*, shared_ptr<DeclarationContainer>> scopes; - NameAndTypeResolver resolver(declarations, scopes, errors); + NameAndTypeResolver resolver(declarations, scopes, errorReporter); resolver.registerDeclarations(*sourceUnit); vector<ContractDefinition const*> inheritanceHierarchy; @@ -128,7 +131,8 @@ bytes compileFirstExpression( for (ASTPointer<ASTNode> const& node: sourceUnit->nodes()) if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get())) { - TypeChecker typeChecker(errors); + ErrorReporter errorReporter(errors); + TypeChecker typeChecker(errorReporter); BOOST_REQUIRE(typeChecker.checkTypeRequirements(*contract)); } for (ASTPointer<ASTNode> const& node: sourceUnit->nodes()) |