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

1 files changed, 17 insertions, 8 deletions

diff --git a/src/modcontext.h b/src/modcontext.h
index d9965c5..4479051 100644
--- a/src/modcontext.h
+++ b/src/modcontext.h
@@ -14,18 +14,21 @@
 class ModuleContext : public Context
 {
 public:
-	ModuleContext(const class Module *module = NULL, const Context *parent = NULL, const EvalContext *evalctx = NULL);
+	ModuleContext(const Context *parent = NULL, const EvalContext *evalctx = NULL);
 	virtual ~ModuleContext();
 
-	void setModule(const Module &module, const EvalContext *evalctx = NULL);
+	void initializeModule(const Module &m);
 	void registerBuiltin();
+	virtual Value evaluate_function(const std::string &name, 
+																	const EvalContext *evalctx) const;
+	virtual AbstractNode *instantiate_module(const ModuleInstantiation &inst, 
+																					 const EvalContext *evalctx) const;
 
-	virtual Value evaluate_function(const std::string &name, const EvalContext *evalctx) const;
-	virtual AbstractNode *instantiate_module(const ModuleInstantiation &inst, const EvalContext *evalctx) const;
+	const AbstractModule *findLocalModule(const std::string &name) const;
+	const AbstractFunction *findLocalFunction(const std::string &name) const;
 
-	const boost::unordered_map<std::string, class AbstractFunction*> *functions_p;
-	const boost::unordered_map<std::string, class AbstractModule*> *modules_p;
-	const FileModule::ModuleContainer *usedlibs_p;
+	const LocalScope::FunctionContainer *functions_p;
+	const LocalScope::AbstractModuleContainer *modules_p;
 
   // FIXME: Points to the eval context for the call to this module. Not sure where it belongs
 	const class EvalContext *evalctx;
@@ -40,8 +43,14 @@ public:
 class FileContext : public ModuleContext
 {
 public:
-	FileContext(const class FileModule &module, const Context *parent = NULL, const EvalContext *evalctx = NULL);
+	FileContext(const class FileModule &module, const Context *parent);
 	virtual ~FileContext() {}
+	virtual Value evaluate_function(const std::string &name, const EvalContext *evalctx) const;
+	virtual AbstractNode *instantiate_module(const ModuleInstantiation &inst, 
+																					 const EvalContext *evalctx) const;
+
+private:
+	const FileModule::ModuleContainer &usedlibs;
 };
 
 #endif