Re-enable multiple output items per model

MiniZinc · Dec 20, 2016 · 64e482e · 64e482e
1 parent f472f5e
commit 64e482e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 0 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -12,6 +12,9 @@ Bug fixes:
  - Fix a bug in the type checking for generators that iterate over
    arrays of enums.
  - Fix a bug in the output handling of arrays of enums.
+ - Fix handling of multiple output items (only the last item was
+   compiled, now the concatenation is used for output as defined
+   in the specification).
 
 Version 2.1.1
 =============

diff --git a/include/minizinc/model.hh b/include/minizinc/model.hh
@@ -131,6 +131,7 @@ namespace MiniZinc {
     SolveI* solveItem(void);
 
     OutputI* outputItem(void);
+    void setOutputItem(OutputI* oi);
 
 
     /// Add a file-level documentation comment

diff --git a/lib/model.cpp b/lib/model.cpp
@@ -78,6 +78,14 @@ namespace MiniZinc {
     }
   }
 
+  void
+  Model::setOutputItem(OutputI* oi) {
+    Model* m = this;
+    while (m->_parent)
+      m = m->_parent;
+    m->_outputItem = oi;
+  }
+
   void
   Model::registerFn(EnvI& env, FunctionI* fi) {
     Model* m = this;

diff --git a/lib/typecheck.cpp b/lib/typecheck.cpp
@@ -1500,6 +1500,7 @@ namespace MiniZinc {
           bo->type(Type::parstring(1));
           outputItem->e(bo);
           oi->remove();
+          m->setOutputItem(outputItem);
         }
       }
     } _tsv3(env.envi(),m);