Merge pull request #5571 from ethereum/develop

Version 0.5.1

1 files changed, 30 insertions, 25 deletions

diff --git a/libsolidity/analysis/ReferencesResolver.h b/libsolidity/analysis/ReferencesResolver.h
index 24ec4643..32c0553f 100644
--- a/libsolidity/analysis/ReferencesResolver.h
+++ b/libsolidity/analysis/ReferencesResolver.h
@@ -28,12 +28,17 @@
 #include <libsolidity/ast/ASTVisitor.h>
 #include <libsolidity/ast/ASTAnnotations.h>
 
+namespace langutil
+{
+class ErrorReporter;
+struct SourceLocation;
+}
+
 namespace dev
 {
 namespace solidity
 {
 
-class ErrorReporter;
 class NameAndTypeResolver;
 
 /**
@@ -44,7 +49,7 @@ class ReferencesResolver: private ASTConstVisitor
 {
 public:
 	ReferencesResolver(
-		ErrorReporter& _errorReporter,
+		langutil::ErrorReporter& _errorReporter,
 		NameAndTypeResolver& _resolver,
 		bool _resolveInsideCode = false
 	):
@@ -57,38 +62,38 @@ public:
 	bool resolve(ASTNode const& _root);
 
 private:
-	virtual bool visit(Block const& _block) override;
-	virtual void endVisit(Block const& _block) override;
-	virtual bool visit(ForStatement const& _for) override;
-	virtual void endVisit(ForStatement const& _for) override;
-	virtual void endVisit(VariableDeclarationStatement const& _varDeclStatement) override;
-	virtual bool visit(Identifier const& _identifier) override;
-	virtual bool visit(ElementaryTypeName const& _typeName) override;
-	virtual bool visit(FunctionDefinition const& _functionDefinition) override;
-	virtual void endVisit(FunctionDefinition const& _functionDefinition) override;
-	virtual bool visit(ModifierDefinition const& _modifierDefinition) override;
-	virtual void endVisit(ModifierDefinition const& _modifierDefinition) override;
-	virtual void endVisit(UserDefinedTypeName const& _typeName) override;
-	virtual void endVisit(FunctionTypeName const& _typeName) override;
-	virtual void endVisit(Mapping const& _typeName) override;
-	virtual void endVisit(ArrayTypeName const& _typeName) override;
-	virtual bool visit(InlineAssembly const& _inlineAssembly) override;
-	virtual bool visit(Return const& _return) override;
-	virtual void endVisit(VariableDeclaration const& _variable) override;
+	bool visit(Block const& _block) override;
+	void endVisit(Block const& _block) override;
+	bool visit(ForStatement const& _for) override;
+	void endVisit(ForStatement const& _for) override;
+	void endVisit(VariableDeclarationStatement const& _varDeclStatement) override;
+	bool visit(Identifier const& _identifier) override;
+	bool visit(ElementaryTypeName const& _typeName) override;
+	bool visit(FunctionDefinition const& _functionDefinition) override;
+	void endVisit(FunctionDefinition const& _functionDefinition) override;
+	bool visit(ModifierDefinition const& _modifierDefinition) override;
+	void endVisit(ModifierDefinition const& _modifierDefinition) override;
+	void endVisit(UserDefinedTypeName const& _typeName) override;
+	void endVisit(FunctionTypeName const& _typeName) override;
+	void endVisit(Mapping const& _typeName) override;
+	void endVisit(ArrayTypeName const& _typeName) override;
+	bool visit(InlineAssembly const& _inlineAssembly) override;
+	bool visit(Return const& _return) override;
+	void endVisit(VariableDeclaration const& _variable) override;
 
 	/// Adds a new error to the list of errors.
-	void typeError(SourceLocation const& _location, std::string const& _description);
+	void typeError(langutil::SourceLocation const& _location, std::string const& _description);
 
 	/// Adds a new error to the list of errors and throws to abort reference resolving.
-	void fatalTypeError(SourceLocation const& _location, std::string const& _description);
+	void fatalTypeError(langutil::SourceLocation const& _location, std::string const& _description);
 
 	/// Adds a new error to the list of errors.
-	void declarationError(SourceLocation const& _location, std::string const& _description);
+	void declarationError(langutil::SourceLocation const& _location, std::string const& _description);
 
 	/// Adds a new error to the list of errors and throws to abort reference resolving.
-	void fatalDeclarationError(SourceLocation const& _location, std::string const& _description);
+	void fatalDeclarationError(langutil::SourceLocation const& _location, std::string const& _description);
 
-	ErrorReporter& m_errorReporter;
+	langutil::ErrorReporter& m_errorReporter;
 	NameAndTypeResolver& m_resolver;
 	/// Stack of return parameters.
 	std::vector<ParameterList const*> m_returnParameters;