Merge pull request #195 from LianaHus/sol_remove_exc_from_ref_resolver

Sol remove exc from ref resolver

1 files changed, 21 insertions, 18 deletions

diff --git a/test/libsolidity/SolidityNameAndTypeResolution.cpp b/test/libsolidity/SolidityNameAndTypeResolution.cpp
index 6b36f4cc..915d6542 100644
--- a/test/libsolidity/SolidityNameAndTypeResolution.cpp
+++ b/test/libsolidity/SolidityNameAndTypeResolution.cpp
@@ -62,35 +62,38 @@ parseAnalyseAndReturnError(string const& _source, bool _reportWarnings = false)
 		solAssert(Error::containsOnlyWarnings(errors), "");
 		resolver.registerDeclarations(*sourceUnit);
 
+		bool success = true;
 		for (ASTPointer<ASTNode> const& node: sourceUnit->nodes())
 			if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get()))
 			{
 				globalContext->setCurrentContract(*contract);
 				resolver.updateDeclaration(*globalContext->currentThis());
 				resolver.updateDeclaration(*globalContext->currentSuper());
-				resolver.resolveNamesAndTypes(*contract);
+				if (!resolver.resolveNamesAndTypes(*contract))
+					success = false;
 			}
-		for (ASTPointer<ASTNode> const& node: sourceUnit->nodes())
-			if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get()))
-			{
-				globalContext->setCurrentContract(*contract);
-				resolver.updateDeclaration(*globalContext->currentThis());
+		if (success)
+			for (ASTPointer<ASTNode> const& node: sourceUnit->nodes())
+				if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get()))
+				{
+					globalContext->setCurrentContract(*contract);
+					resolver.updateDeclaration(*globalContext->currentThis());
 
-				TypeChecker typeChecker(errors);
-				bool success = typeChecker.checkTypeRequirements(*contract);
-				BOOST_CHECK(success || !errors.empty());
+					TypeChecker typeChecker(errors);
+					bool success = typeChecker.checkTypeRequirements(*contract);
+					BOOST_CHECK(success || !errors.empty());
 
-				for (auto const& currentError: errors)
-				{
-					if (
-						(_reportWarnings && currentError->type() == Error::Type::Warning) ||
-						(!_reportWarnings && currentError->type() != Error::Type::Warning)
-					)
-						return make_pair(sourceUnit, std::make_shared<Error::Type const>(currentError->type()));
 				}
-			}
+		for (auto const& currentError: errors)
+		{
+			if (
+				(_reportWarnings && currentError->type() == Error::Type::Warning) ||
+				(!_reportWarnings && currentError->type() != Error::Type::Warning)
+			)
+				return make_pair(sourceUnit, std::make_shared<Error::Type const>(currentError->type()));
+		}
 	}
-	catch(Error const& _e)
+	catch (Error const& _e)
 	{
 		return make_pair(sourceUnit, std::make_shared<Error::Type const>(_e.type()));
 	}