Experiment: Lazy evaluation of argument lists in evaluation context. Allows e.g. for loop variables to be dependent on each other

1 files changed, 15 insertions, 2 deletions

diff --git a/src/evalcontext.cc b/src/evalcontext.cc
index b7566e3..25b6716 100644
--- a/src/evalcontext.cc
+++ b/src/evalcontext.cc
@@ -7,6 +7,19 @@
 
 #include <boost/foreach.hpp>
 
+const std::string &EvalContext::getArgName(size_t i) const
+{
+	assert(i < this->eval_arguments.size());
+	return this->eval_arguments[i].first;
+}
+
+Value EvalContext::getArgValue(size_t i, const Context *ctx) const
+{
+	assert(i < this->eval_arguments.size());
+	const Assignment &arg = this->eval_arguments[i];
+	return arg.second ? arg.second->evaluate(ctx ? ctx : this) : Value();
+}
+
 #ifdef DEBUG
 void EvalContext::dump(const AbstractModule *mod, const ModuleInstantiation *inst)
 {
@@ -20,9 +33,9 @@ void EvalContext::dump(const AbstractModule *mod, const ModuleInstantiation *ins
 	for (int i=0;i<this->eval_arguments.size();i++) {
 		PRINTB("    %s = %s", this->eval_arguments[i].first % this->eval_arguments[i].second);
 	}
-	if (this->children.size() > 0) {
+	if (this->children && this->children->size() > 0) {
 		PRINT("    children:");
-		BOOST_FOREACH(const ModuleInstantiation *ch, this->children) {
+		BOOST_FOREACH(const ModuleInstantiation *ch, *this->children) {
 			PRINTB("      %s", ch->name());
 		}
 	}