summaryrefslogtreecommitdiff
path: root/src/context.cc
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2012-12-01 03:18:44 (GMT)
committerMarius Kintel <marius@kintel.net>2013-03-11 21:54:49 (GMT)
commit40d9ffe6a4c26eef22a6804329c736e081447a0a (patch)
treec3db921c93d0e5f26f35522ce09ede3773e7ffae /src/context.cc
parentadb16cb7ddb4cfae5d6eb4027778f92d282b4493 (diff)
Changed redeclaration of assignment so that the last declaration defines the order. This hopefully fixes the confusing error message discussed on the mailing list nov 27-30 (Variable bug)
Diffstat (limited to 'src/context.cc')
-rw-r--r--src/context.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/context.cc b/src/context.cc
index a2a8d13..97ea5b9 100644
--- a/src/context.cc
+++ b/src/context.cc
@@ -51,9 +51,8 @@ Context::Context(const Context *parent, const Module *library)
this->functions_p = &library->functions;
this->modules_p = &library->modules;
this->usedlibs_p = &library->usedlibs;
- for (size_t j = 0; j < library->assignments_var.size(); j++) {
- this->set_variable(library->assignments_var[j],
- library->assignments_expr[j]->evaluate(this));
+ BOOST_FOREACH(const std::string &var, library->assignments_var) {
+ this->set_variable(var, library->assignments.at(var)->evaluate(this));
}
}
else {
contact: Jan Huwald // Impressum