diff --git a/src/module.cc b/src/module.cc index 8fb8506b..970dd56c 100644 --- a/src/module.cc +++ b/src/module.cc @@ -153,6 +153,8 @@ std::vector IfElseModuleInstantiation::instantiateElseChildren(co return this->else_scope.instantiateChildren(evalctx); } +std::stack Module::stack; + Module::~Module() { } @@ -181,15 +183,20 @@ AbstractNode *Module::instantiate(const Context *ctx, const ModuleInstantiation ModuleContext c(ctx, evalctx); c.initializeModule(*this); + c.set_variable("_current_module", inst->name()); + if (!stack.empty()) + c.set_variable("_parent_module", stack.top()); c.set_variable("$children", Value(double(inst->scope.children.size()))); // FIXME: Set document path to the path of the module #if 0 && DEBUG c.dump(this, inst); #endif + stack.push(inst->name()); AbstractNode *node = new AbstractNode(inst); std::vector instantiatednodes = this->scope.instantiateChildren(&c); node->children.insert(node->children.end(), instantiatednodes.begin(), instantiatednodes.end()); + stack.pop(); return node; } diff --git a/src/module.h b/src/module.h index b5c58afe..fca88e37 100644 --- a/src/module.h +++ b/src/module.h @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include @@ -77,6 +78,8 @@ public: AssignmentList definition_arguments; LocalScope scope; +private: + static std::stack stack; }; // FIXME: A FileModule doesn't have definition arguments, so we shouldn't really