From 7a7a7dcbb59e1126679e7e8f6eab16992fffb51c Mon Sep 17 00:00:00 2001 From: LianaHus Date: Thu, 15 Oct 2015 11:10:55 +0200 Subject: fixes error after conflict resolving --- libsolidity/CompilerStack.cpp | 3 +-- libsolidity/ReferencesResolver.cpp | 2 +- libsolidity/TypeChecker.cpp | 2 +- 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(); + auto err = make_shared(Error::Type::Warning); *err << errinfo_sourceLocation(varDecl.location()) << errinfo_comment("Uninitialized storage pointer. Did you mean ' 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 -#include /// Assertion that throws an InternalCompilerError containing the given description if it is not met. #define solAssert(CONDITION, DESCRIPTION) \ -- cgit