Merge pull request #5571 from ethereum/develop

Version 0.5.1

1 files changed, 23 insertions, 19 deletions

diff --git a/libsolidity/analysis/ViewPureChecker.h b/libsolidity/analysis/ViewPureChecker.h
index faa5b698..fd2432a7 100644
--- a/libsolidity/analysis/ViewPureChecker.h
+++ b/libsolidity/analysis/ViewPureChecker.h
@@ -21,11 +21,15 @@
 #include <libsolidity/ast/ASTForward.h>
 #include <libsolidity/ast/ASTVisitor.h>
 
-#include <libsolidity/interface/ErrorReporter.h>
-
 #include <map>
 #include <memory>
 
+namespace langutil
+{
+class ErrorReporter;
+struct SourceLocation;
+}
+
 namespace dev
 {
 namespace solidity
@@ -34,7 +38,7 @@ namespace solidity
 class ViewPureChecker: private ASTConstVisitor
 {
 public:
-	ViewPureChecker(std::vector<std::shared_ptr<ASTNode>> const& _ast, ErrorReporter& _errorReporter):
+	ViewPureChecker(std::vector<std::shared_ptr<ASTNode>> const& _ast, langutil::ErrorReporter& _errorReporter):
 		m_ast(_ast), m_errorReporter(_errorReporter) {}
 
 	bool check();
@@ -43,34 +47,34 @@ private:
 	struct MutabilityAndLocation
 	{
 		StateMutability mutability;
-		SourceLocation location;
+		langutil::SourceLocation location;
 	};
 
-	virtual bool visit(FunctionDefinition const& _funDef) override;
-	virtual void endVisit(FunctionDefinition const& _funDef) override;
-	virtual bool visit(ModifierDefinition const& _modifierDef) override;
-	virtual void endVisit(ModifierDefinition const& _modifierDef) override;
-	virtual void endVisit(Identifier const& _identifier) override;
-	virtual bool visit(MemberAccess const& _memberAccess) override;
-	virtual void endVisit(MemberAccess const& _memberAccess) override;
-	virtual void endVisit(IndexAccess const& _indexAccess) override;
-	virtual void endVisit(ModifierInvocation const& _modifier) override;
-	virtual void endVisit(FunctionCall const& _functionCall) override;
-	virtual void endVisit(InlineAssembly const& _inlineAssembly) override;
+	bool visit(FunctionDefinition const& _funDef) override;
+	void endVisit(FunctionDefinition const& _funDef) override;
+	bool visit(ModifierDefinition const& _modifierDef) override;
+	void endVisit(ModifierDefinition const& _modifierDef) override;
+	void endVisit(Identifier const& _identifier) override;
+	bool visit(MemberAccess const& _memberAccess) override;
+	void endVisit(MemberAccess const& _memberAccess) override;
+	void endVisit(IndexAccess const& _indexAccess) override;
+	void endVisit(ModifierInvocation const& _modifier) override;
+	void endVisit(FunctionCall const& _functionCall) override;
+	void endVisit(InlineAssembly const& _inlineAssembly) override;
 
 	/// Called when an element of mutability @a _mutability is encountered.
 	/// Creates appropriate warnings and errors and sets @a m_currentBestMutability.
 	void reportMutability(
 		StateMutability _mutability,
-		SourceLocation const& _location,
-		boost::optional<SourceLocation> const& _nestedLocation = {}
+		langutil::SourceLocation const& _location,
+		boost::optional<langutil::SourceLocation> const& _nestedLocation = {}
 	);
 
 	std::vector<std::shared_ptr<ASTNode>> const& m_ast;
-	ErrorReporter& m_errorReporter;
+	langutil::ErrorReporter& m_errorReporter;
 
 	bool m_errors = false;
-	MutabilityAndLocation m_bestMutabilityAndLocation = MutabilityAndLocation{StateMutability::Payable, SourceLocation()};
+	MutabilityAndLocation m_bestMutabilityAndLocation = MutabilityAndLocation{StateMutability::Payable, langutil::SourceLocation()};
 	FunctionDefinition const* m_currentFunction = nullptr;
 	std::map<ModifierDefinition const*, MutabilityAndLocation> m_inferredMutability;
 };