summaryrefslogtreecommitdiff
path: root/src/context.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/context.cc')
-rw-r--r--src/context.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/context.cc b/src/context.cc
index 706407c..a7273a4 100644
--- a/src/context.cc
+++ b/src/context.cc
@@ -66,9 +66,9 @@ void Context::setVariables(const AssignmentList &args,
if (evalctx) {
size_t posarg = 0;
- for (size_t i=0; i<evalctx->eval_arguments.size(); i++) {
- const std::string &name = evalctx->eval_arguments[i].first;
- const Value &val = evalctx->eval_arguments[i].second;
+ for (size_t i=0; i<evalctx->numArgs(); i++) {
+ const std::string &name = evalctx->getArgName(i);
+ const Value &val = evalctx->getArgValue(i);
if (name.empty()) {
if (posarg < args.size()) this->set_variable(args[posarg++].first, val);
} else {
@@ -124,9 +124,9 @@ Value Context::evaluate_function(const std::string &name, const EvalContext *eva
return Value();
}
-AbstractNode *Context::evaluate_module(const ModuleInstantiation &inst, const EvalContext *evalctx) const
+AbstractNode *Context::instantiate_module(const ModuleInstantiation &inst, const EvalContext *evalctx) const
{
- if (this->parent) return this->parent->evaluate_module(inst, evalctx);
+ if (this->parent) return this->parent->instantiate_module(inst, evalctx);
PRINTB("WARNING: Ignoring unknown module '%s'.", inst.name());
return NULL;
}
contact: Jan Huwald // Impressum