diff options
author | Marius Kintel <marius@kintel.net> | 2013-04-19 21:52:01 (GMT) |
---|---|---|
committer | Marius Kintel <marius@kintel.net> | 2013-04-26 21:45:03 (GMT) |
commit | 9a297ecee57549a4eb3919bde4f7b41a548724de (patch) | |
tree | b1f523e93f528559e9ada2d38d76be7a0362f9d4 /src/evalcontext.h | |
parent | b4568a09df8be0f212ba1c4fd1660459900e3cf0 (diff) |
Refactoring: Split out FileModule from Module, Added LocalScope renamed some confusing 'evaluate' methods to 'instantiate', added FileContext (not yet used)
Diffstat (limited to 'src/evalcontext.h')
-rw-r--r-- | src/evalcontext.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/evalcontext.h b/src/evalcontext.h index 26a4a68..34f339a 100644 --- a/src/evalcontext.h +++ b/src/evalcontext.h @@ -13,16 +13,16 @@ public: typedef std::vector<class ModuleInstantiation *> InstanceList; EvalContext(const Context *parent, - const AssignmentList &args, const InstanceList *const children = NULL) - : Context(parent), eval_arguments(args), children(children) {} + const AssignmentList &args, const class LocalScope *const scope = NULL) + : Context(parent), eval_arguments(args), scope(scope) {} virtual ~EvalContext() {} size_t numArgs() const { return this->eval_arguments.size(); } const std::string &getArgName(size_t i) const; Value getArgValue(size_t i, const Context *ctx = NULL) const; - size_t numChildren() const { return this->children ? this->children->size() : 0; } - ModuleInstantiation *getChild(size_t i) const { return this->children ? (*this->children)[i] : NULL; } + size_t numChildren() const; + ModuleInstantiation *getChild(size_t i) const; #ifdef DEBUG virtual void dump(const class AbstractModule *mod, const ModuleInstantiation *inst); @@ -31,7 +31,7 @@ public: private: const AssignmentList &eval_arguments; std::vector<std::pair<std::string, Value> > eval_values; - const InstanceList *const children; + const LocalScope *const scope; }; #endif |