Fixed function overloads.

Added tests, disallowed non-calling usage of non-unique function
references.

1 files changed, 14 insertions, 7 deletions

diff --git a/NameAndTypeResolver.h b/NameAndTypeResolver.h
index 82877617..6528bbef 100644
--- a/NameAndTypeResolver.h
+++ b/NameAndTypeResolver.h
@@ -65,9 +65,10 @@ public:
 private:
 	void reset();
 
-	/// Imports all members declared directly in the given contract (i.e. does not import inherited
-	/// members) into the current scope if they are not present already.
-	void importInheritedScope(ContractDefinition const& _base);
+	/// Either imports all non-function members or all function members declared directly in the
+	/// given contract (i.e. does not import inherited members) into the current scope if they are
+	///not present already.
+	void importInheritedScope(ContractDefinition const& _base, bool _importFunctions);
 
 	/// Computes "C3-Linearization" of base contracts and stores it inside the contract.
 	void linearizeBaseContracts(ContractDefinition& _contract) const;
@@ -126,13 +127,18 @@ private:
 class ReferencesResolver: private ASTVisitor
 {
 public:
-	ReferencesResolver(ASTNode& _root, NameAndTypeResolver& _resolver,
-					   ContractDefinition const* _currentContract,
-					   ParameterList const* _returnParameters,
-					   bool _allowLazyTypes = true);
+	ReferencesResolver(
+		ASTNode& _root,
+		NameAndTypeResolver& _resolver,
+		ContractDefinition const* _currentContract,
+		ParameterList const* _returnParameters,
+		bool _resolveInsideCode = false,
+		bool _allowLazyTypes = true
+	);
 
 private:
 	virtual void endVisit(VariableDeclaration& _variable) override;
+	virtual bool visit(Block&) override { return m_resolveInsideCode; }
 	virtual bool visit(Identifier& _identifier) override;
 	virtual bool visit(UserDefinedTypeName& _typeName) override;
 	virtual bool visit(Mapping&) override;
@@ -141,6 +147,7 @@ private:
 	NameAndTypeResolver& m_resolver;
 	ContractDefinition const* m_currentContract;
 	ParameterList const* m_returnParameters;
+	bool m_resolveInsideCode;
 	bool m_allowLazyTypes;
 };