diff options
| author | LianaHus <liana@ethdev.com> | 2015-10-15 17:10:55 +0800 |
|---|---|---|
| committer | LianaHus <liana@ethdev.com> | 2015-10-15 17:10:55 +0800 |
| commit | 7a7a7dcbb59e1126679e7e8f6eab16992fffb51c (patch) | |
| tree | 02e06e723a1cd61ec57e23f8ceffc371eba4a806 | |
| parent | c3491e446964f366101f28e3d51ab59dd9aaa5b2 (diff) | |
| download | dexon-solidity-7a7a7dcbb59e1126679e7e8f6eab16992fffb51c.tar.gz dexon-solidity-7a7a7dcbb59e1126679e7e8f6eab16992fffb51c.tar.zst dexon-solidity-7a7a7dcbb59e1126679e7e8f6eab16992fffb51c.zip | |
fixes error after conflict resolving
| -rw-r--r-- | libsolidity/CompilerStack.cpp | 3 | ||||
| -rw-r--r-- | libsolidity/ReferencesResolver.cpp | 2 | ||||
| -rw-r--r-- | libsolidity/TypeChecker.cpp | 2 | ||||
| -rw-r--r-- | libsolidity/Utils.h | 1 |
4 files changed, 3 insertions, 5 deletions
diff --git a/libsolidity/CompilerStack.cpp b/libsolidity/CompilerStack.cpp index 3887999a..dd7f7dfc 100644 --- a/libsolidity/CompilerStack.cpp +++ b/libsolidity/CompilerStack.cpp @@ -140,7 +140,7 @@ bool CompilerStack::parse() { m_globalContext->setCurrentContract(*contract); resolver.updateDeclaration(*m_globalContext->currentThis()); - TypeChecker typeChecker; + TypeChecker typeChecker(m_errors); if (typeChecker.checkTypeRequirements(*contract)) { contract->setDevDocumentation(interfaceHandler.devDocumentation(*contract)); @@ -150,7 +150,6 @@ bool CompilerStack::parse() typesFine = false; m_contracts[contract->name()].contract = contract; - m_errors += typeChecker.errors(); } m_parseSuccessful = typesFine; return m_parseSuccessful; diff --git a/libsolidity/ReferencesResolver.cpp b/libsolidity/ReferencesResolver.cpp index 70bc6572..b1112dd9 100644 --- a/libsolidity/ReferencesResolver.cpp +++ b/libsolidity/ReferencesResolver.cpp @@ -60,7 +60,7 @@ bool ReferencesResolver::visit(UserDefinedTypeName const& _typeName) Error(Error::Type::DeclarationError) << errinfo_sourceLocation(_typeName.location()) << errinfo_comment("Identifier not found or not unique.") - + ); _typeName.annotation().referencedDeclaration = declaration; return true; } diff --git a/libsolidity/TypeChecker.cpp b/libsolidity/TypeChecker.cpp index cc7ad2f3..2e45f7b0 100644 --- a/libsolidity/TypeChecker.cpp +++ b/libsolidity/TypeChecker.cpp @@ -607,7 +607,7 @@ bool TypeChecker::visit(VariableDeclarationStatement const& _statement) { if (ref->dataStoredIn(DataLocation::Storage)) { - auto err = make_shared<Warning>(); + auto err = make_shared<Error>(Error::Type::Warning); *err << errinfo_sourceLocation(varDecl.location()) << errinfo_comment("Uninitialized storage pointer. Did you mean '<type> memory " + varDecl.name() + "'?"); diff --git a/libsolidity/Utils.h b/libsolidity/Utils.h index 6c8e3b33..05c5fa6f 100644 --- a/libsolidity/Utils.h +++ b/libsolidity/Utils.h @@ -23,7 +23,6 @@ #pragma once #include <libdevcore/Assertions.h> -#include <libsolidity/Exceptions.h> /// Assertion that throws an InternalCompilerError containing the given description if it is not met. #define solAssert(CONDITION, DESCRIPTION) \ |