Further refactoring of scope/context mechanisms. Mostly related to the new FileContext class. Not quite there yet, but almost

1 files changed, 3 insertions, 7 deletions

diff --git a/src/builtin.h b/src/builtin.h
index 564c951..9397aa9 100644
--- a/src/builtin.h
+++ b/src/builtin.h
@@ -4,6 +4,7 @@
 #include <string>
 #include <boost/unordered_map.hpp>
 #include "module.h"
+#include "localscope.h"
 
 class Builtins
 {
@@ -17,18 +18,13 @@ public:
 	void initialize();
 	std::string isDeprecated(const std::string &name);
 
-	const FunctionContainer &functions() { return this->builtinfunctions; }
-	const ModuleContainer &modules() { return this->builtinmodules; }
-
-	const Module &getRootModule() { return this->rootmodule; }
+	const LocalScope &getGlobalScope() { return this->globalscope; }
 
 private:
 	Builtins();
 	~Builtins();
 
-	Module rootmodule;
-	FunctionContainer builtinfunctions;
-	ModuleContainer builtinmodules;
+	LocalScope globalscope;
 
 	boost::unordered_map<std::string, std::string> deprecations;
 };