Refactoring: Split out FileModule from Module, Added LocalScope renamed some confusing 'evaluate' methods to 'instantiate', added FileContext (not yet used)

1 files changed, 11 insertions, 4 deletions

diff --git a/src/modcontext.h b/src/modcontext.h
index 5fce88f..d9965c5 100644
--- a/src/modcontext.h
+++ b/src/modcontext.h
@@ -2,13 +2,14 @@
 #define FILECONTEXT_H_
 
 #include "context.h"
+#include "module.h"
 #include <boost/unordered_map.hpp>
 
 /*!
 	This holds the context for a Module definition; keeps track of
 	global variables, submodules and functions defined inside a module.
 
-	NB! every .scad file defines an implicit unnamed module holding the contents of the file.
+	NB! every .scad file defines a FileModule holding the contents of the file.
 */
 class ModuleContext : public Context
 {
@@ -20,12 +21,11 @@ public:
 	void registerBuiltin();
 
 	virtual Value evaluate_function(const std::string &name, const EvalContext *evalctx) const;
-	virtual AbstractNode *evaluate_module(const ModuleInstantiation &inst, const EvalContext *evalctx) const;
+	virtual AbstractNode *instantiate_module(const ModuleInstantiation &inst, const EvalContext *evalctx) const;
 
 	const boost::unordered_map<std::string, class AbstractFunction*> *functions_p;
 	const boost::unordered_map<std::string, class AbstractModule*> *modules_p;
-	typedef boost::unordered_map<std::string, class Module*> ModuleContainer;
-	const ModuleContainer *usedlibs_p;
+	const FileModule::ModuleContainer *usedlibs_p;
 
   // FIXME: Points to the eval context for the call to this module. Not sure where it belongs
 	const class EvalContext *evalctx;
@@ -37,4 +37,11 @@ public:
 	mutable boost::unordered_map<std::string, int> recursioncount;
 };
 
+class FileContext : public ModuleContext
+{
+public:
+	FileContext(const class FileModule &module, const Context *parent = NULL, const EvalContext *evalctx = NULL);
+	virtual ~FileContext() {}
+};
+
 #endif