diff options
| author | Marius Kintel <marius@kintel.net> | 2013-04-09 04:28:16 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-04-09 04:28:16 (GMT) |
| commit | a37813a8999571f4b9235f33fdc7c22bcbe5fd17 (patch) | |
| tree | 266d8c106100edab9f51b93cf229cf55cd083918 /src/import.cc | |
| parent | b16c24fb2888d932ec035fff27cb29b4ffbc256b (diff) | |
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
Diffstat (limited to 'src/import.cc')
| -rw-r--r-- | src/import.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/import.cc b/src/import.cc index bbf5a6e..3d753fb 100644 --- a/src/import.cc +++ b/src/import.cc @@ -28,7 +28,7 @@ #include "module.h" #include "polyset.h" -#include "context.h" +#include "evalcontext.h" #include "builtin.h" #include "dxfdata.h" #include "dxftess.h" @@ -60,10 +60,10 @@ class ImportModule : public AbstractModule public: import_type_e type; ImportModule(import_type_e type = TYPE_UNKNOWN) : type(type) { } - virtual AbstractNode *evaluate(const Context *ctx, const ModuleInstantiation *inst) const; + virtual AbstractNode *evaluate(const Context *ctx, const ModuleInstantiation *inst, const EvalContext *evalctx) const; }; -AbstractNode *ImportModule::evaluate(const Context *ctx, const ModuleInstantiation *inst) const +AbstractNode *ImportModule::evaluate(const Context *ctx, const ModuleInstantiation *inst, const EvalContext *evalctx) const { std::vector<std::string> argnames; argnames += "file", "layer", "convexity", "origin", "scale"; @@ -77,7 +77,11 @@ AbstractNode *ImportModule::evaluate(const Context *ctx, const ModuleInstantiati } Context c(ctx); - c.args(argnames, argexpr, inst_argnames, inst->argvalues); + c.setDocumentPath(evalctx->documentPath()); + c.setVariables(argnames, argexpr, evalctx); +#ifdef DEBUG + c.dump(this, inst); +#endif Value v = c.lookup_variable("file"); std::string filename = inst->getAbsolutePath(v.isUndefined() ? "" : v.toString()); |