Use a secondary location for function override errors

wenlinlee · Aug 11, 2017 · d4997dd · d4997dd
1 parent a694985
commit d4997dd
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 26 deletions.
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
@@ -306,40 +306,31 @@ void TypeChecker::checkFunctionOverride(FunctionDefinition const& function, Func
 		return;
 
 	if (function.visibility() != super.visibility())
-		m_errorReporter.typeError(
-			function.location(),
-			"Overriding function visibility differs from " + super.fullyQualifiedName() + "."
-		);
+		overrideError(function, super, "Overriding function visibility differs.");
 
 	if (function.isDeclaredConst() && !super.isDeclaredConst())
-		m_errorReporter.typeError(
-			function.location(),
-			"Overriding function should not be declared constant."
-		);
+		overrideError(function, super, "Overriding function should not be declared constant.");
 
 	if (!function.isDeclaredConst() && super.isDeclaredConst())
-		m_errorReporter.typeError(
-			function.location(),
-			"Overriding function should be declared constant."
-		);
+		overrideError(function, super, "Overriding function should be declared constant.");
 
 	if (function.isPayable() && !super.isPayable())
-		m_errorReporter.typeError(
-			function.location(),
-			"Overriding function should not be declared payable."
-		);
+		overrideError(function, super, "Overriding function should not be declared payable.");
 
 	if (!function.isPayable() && super.isPayable())
-		m_errorReporter.typeError(
-			function.location(),
-			"Overriding function should be declared payable."
-		);
+		overrideError(function, super, "Overriding function should be declared payable.");
 
 	if (functionType != superType)
-		m_errorReporter.typeError(
-			function.location(),
-			"Overriding function return types differ from " + super.fullyQualifiedName() + "."
-		);
+		overrideError(function, super, "Overriding function return types differ.");
+}
+
+void TypeChecker::overrideError(FunctionDefinition const& function, FunctionDefinition const& super, string message)
+{
+	m_errorReporter.typeError(
+		function.location(),
+		SecondarySourceLocation().append("Overriden function is here:", super.location()),
+		message
+	);
 }
 
 void TypeChecker::checkContractExternalTypeClashes(ContractDefinition const& _contract)

diff --git a/libsolidity/analysis/TypeChecker.h b/libsolidity/analysis/TypeChecker.h
@@ -64,6 +64,7 @@ class TypeChecker: private ASTConstVisitor
 	void checkContractIllegalOverrides(ContractDefinition const& _contract);
 	/// Reports a type error with an appropiate message if overriden function signature differs.
 	void checkFunctionOverride(FunctionDefinition const& function, FunctionDefinition const& super);
+	void overrideError(FunctionDefinition const& function, FunctionDefinition const& super, std::string message);
 	void checkContractAbstractFunctions(ContractDefinition const& _contract);
 	void checkContractAbstractConstructors(ContractDefinition const& _contract);
 	/// Checks that different functions with external visibility end up having different

diff --git a/libsolidity/interface/ErrorReporter.h b/libsolidity/interface/ErrorReporter.h
@@ -75,8 +75,8 @@ class ErrorReporter
 
 	void typeError(
 		SourceLocation const& _location,
-		SecondarySourceLocation const& _secondaryLocation,
-		std::string const& _description
+		SecondarySourceLocation const& _secondaryLocation = SecondarySourceLocation(),
+		std::string const& _description = std::string()
 	);
 
 	void typeError(SourceLocation const& _location, std::string const& _description);