summaryrefslogtreecommitdiff
path: root/src/module.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/module.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/module.cc')
-rw-r--r--src/module.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/module.cc b/src/module.cc
index cfd73cc..e6dcb57 100644
--- a/src/module.cc
+++ b/src/module.cc
@@ -136,7 +136,7 @@ std::vector<AbstractNode*> IfElseModuleInstantiation::evaluateElseChildren(const
Module::~Module()
{
- BOOST_FOREACH (Expression *v, assignments_expr) delete v;
+ BOOST_FOREACH (const AssignmentContainer::value_type &v, assignments) delete v.second;
BOOST_FOREACH (FunctionContainer::value_type &f, functions) delete f.second;
BOOST_FOREACH (AbstractModuleContainer::value_type &m, modules) delete m.second;
BOOST_FOREACH (ModuleInstantiation *v, children) delete v;
@@ -158,8 +158,8 @@ AbstractNode *Module::evaluate(const Context *ctx, const ModuleInstantiation *in
else
c.usedlibs_p = NULL;
- for (size_t i = 0; i < assignments_var.size(); i++) {
- c.set_variable(assignments_var[i], assignments_expr[i]->evaluate(&c));
+ BOOST_FOREACH(const std::string &var, assignments_var) {
+ c.set_variable(var, assignments.at(var)->evaluate(&c));
}
AbstractNode *node = new AbstractNode(inst);
@@ -192,8 +192,8 @@ std::string Module::dump(const std::string &indent, const std::string &name) con
BOOST_FOREACH(const AbstractModuleContainer::value_type &m, modules) {
dump << m.second->dump(indent + tab, m.first);
}
- for (size_t i = 0; i < assignments_var.size(); i++) {
- dump << indent << tab << assignments_var[i] << " = " << *assignments_expr[i] << ";\n";
+ BOOST_FOREACH(const std::string &var, assignments_var) {
+ dump << indent << tab << var << " = " << *assignments.at(var) << ";\n";
}
for (size_t i = 0; i < children.size(); i++) {
dump << children[i]->dump(indent + tab);
contact: Jan Huwald // Impressum