Type system, not yet complete.

1 files changed, 6 insertions, 18 deletions

diff --git a/Scope.h b/Scope.h
index be2514c4..e3b024ec 100644
--- a/Scope.h
+++ b/Scope.h
@@ -24,6 +24,8 @@
 
 #include <map>
 
+#include <boost/noncopyable.hpp>
+
 #include <libsolidity/ASTForward.h>
 
 namespace dev {
@@ -33,29 +35,15 @@ class Scope
 {
 public:
 	explicit Scope(Scope* _outerScope = nullptr) : m_outerScope(_outerScope) {}
-	/// Registers the name _name in the scope unless it is already declared. Returns true iff
+	/// Registers the declaration in the scope unless its name is already declared. Returns true iff
 	/// it was not yet declared.
-	bool registerName(ASTString const& _name, ASTNode& _declaration)
-	{
-		if (m_declaredNames.find(_name) != m_declaredNames.end())
-			return false;
-		m_declaredNames[_name] = &_declaration;
-		return true;
-	}
-	ASTNode* resolveName(ASTString const& _name, bool _recursive = false) const
-	{
-		auto result = m_declaredNames.find(_name);
-		if (result != m_declaredNames.end())
-			return result->second;
-		if (_recursive && m_outerScope != nullptr)
-			return m_outerScope->resolveName(_name, true);
-		return nullptr;
-	}
+	bool registerDeclaration(Declaration& _declaration);
+	Declaration* resolveName(ASTString const& _name, bool _recursive = false) const;
 	Scope* getOuterScope() const { return m_outerScope; }
 
 private:
 	Scope* m_outerScope;
-	std::map<ASTString, ASTNode*> m_declaredNames;
+	std::map<ASTString, Declaration*> m_declarations;
 };
 
 } }