Refactored context handling into using separate Module contexts and Eval contexts. This allows for recursive module calls, and cascading children. I believe this fixes issue #116

1 files changed, 5 insertions, 3 deletions

diff --git a/src/builtin.h b/src/builtin.h
index bc096e5..564c951 100644
--- a/src/builtin.h
+++ b/src/builtin.h
@@ -3,6 +3,7 @@
 
 #include <string>
 #include <boost/unordered_map.hpp>
+#include "module.h"
 
 class Builtins
 {
@@ -19,16 +20,17 @@ public:
 	const FunctionContainer &functions() { return this->builtinfunctions; }
 	const ModuleContainer &modules() { return this->builtinmodules; }
 
+	const Module &getRootModule() { return this->rootmodule; }
+
 private:
-	Builtins() { }
+	Builtins();
 	~Builtins();
 
+	Module rootmodule;
 	FunctionContainer builtinfunctions;
 	ModuleContainer builtinmodules;
 
 	boost::unordered_map<std::string, std::string> deprecations;
 };
 
-extern void register_builtin(class Context &ctx);
-
 #endif