Move constructor checks.

3 files changed, 21 insertions, 16 deletions

diff --git a/libsolidity/analysis/ContractLevelChecker.cpp b/libsolidity/analysis/ContractLevelChecker.cpp
index 0ddb198f..879903de 100644
--- a/libsolidity/analysis/ContractLevelChecker.cpp
+++ b/libsolidity/analysis/ContractLevelChecker.cpp
@@ -40,6 +40,7 @@ bool ContractLevelChecker::check(ContractDefinition const& _contract)
 	checkIllegalOverrides(_contract);
 	checkAbstractFunctions(_contract);
 	checkBaseConstructorArguments(_contract);
+	checkConstructor(_contract);
 
 	return Error::containsOnlyWarnings(m_errorReporter.errors());
 }
@@ -339,3 +340,22 @@ void ContractLevelChecker::annotateBaseConstructorArguments(
 	}
 
 }
+
+void ContractLevelChecker::checkConstructor(ContractDefinition const& _contract)
+{
+	FunctionDefinition const* constructor = _contract.constructor();
+	if (!constructor)
+		return;
+
+	if (!constructor->returnParameters().empty())
+		m_errorReporter.typeError(constructor->returnParameterList()->location(), "Non-empty \"returns\" directive for constructor.");
+	if (constructor->stateMutability() != StateMutability::NonPayable && constructor->stateMutability() != StateMutability::Payable)
+		m_errorReporter.typeError(
+			constructor->location(),
+			"Constructor must be payable or non-payable, but is \"" +
+			stateMutabilityToString(constructor->stateMutability()) +
+			"\"."
+		);
+	if (constructor->visibility() != FunctionDefinition::Visibility::Public && constructor->visibility() != FunctionDefinition::Visibility::Internal)
+		m_errorReporter.typeError(constructor->location(), "Constructor must be public or internal.");
+}
diff --git a/libsolidity/analysis/ContractLevelChecker.h b/libsolidity/analysis/ContractLevelChecker.h
index eb8807e9..003cfbfd 100644
--- a/libsolidity/analysis/ContractLevelChecker.h
+++ b/libsolidity/analysis/ContractLevelChecker.h
@@ -70,6 +70,7 @@ private:
 		FunctionDefinition const* _baseConstructor,
 		ASTNode const* _argumentNode
 	);
+	void checkConstructor(ContractDefinition const& _contract);
 
 	langutil::ErrorReporter& m_errorReporter;
 };
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 3572943b..1f88c8ab 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -90,22 +90,6 @@ bool TypeChecker::visit(ContractDefinition const& _contract)
 
 	ASTNode::listAccept(_contract.baseContracts(), *this);
 
-	FunctionDefinition const* function = _contract.constructor();
-	if (function)
-	{
-		if (!function->returnParameters().empty())
-			m_errorReporter.typeError(function->returnParameterList()->location(), "Non-empty \"returns\" directive for constructor.");
-		if (function->stateMutability() != StateMutability::NonPayable && function->stateMutability() != StateMutability::Payable)
-			m_errorReporter.typeError(
-				function->location(),
-				"Constructor must be payable or non-payable, but is \"" +
-				stateMutabilityToString(function->stateMutability()) +
-				"\"."
-			);
-		if (function->visibility() != FunctionDefinition::Visibility::Public && function->visibility() != FunctionDefinition::Visibility::Internal)
-			m_errorReporter.typeError(function->location(), "Constructor must be public or internal.");
-	}
-
 	for (FunctionDefinition const* function: _contract.definedFunctions())
 		if (function->isFallback())
 		{