Check if overloaded function required for output. Fixes #303.

MiniZinc · Jul 29, 2019 · 123b5f5 · 123b5f5
1 parent 86998dd
commit 123b5f5
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/lib/output.cpp b/lib/output.cpp
@@ -695,9 +695,20 @@ namespace MiniZinc {
           tv[i].ti(Type::TI_PAR);
         }
         FunctionI* decl = env.output->matchFn(env, c.id(), tv, false);
+        FunctionI* origdecl = env.model->matchFn(env, c.id(), tv, false);
+        bool canReuseDecl = (decl != nullptr);
+        if (canReuseDecl && origdecl) {
+          // Check if this is the exact same overloaded declaration as in the model
+          for (unsigned int i=0; i<decl->params().size(); i++) {
+            if (decl->params()[i]->type() != origdecl->params()[i]->type()) {
+              // no, the types don't match, so we have to copy the original decl
+              canReuseDecl = false;
+              break;
+            }
+          }
+        }
         Type t;
-        if (decl==NULL) {
-          FunctionI* origdecl = env.model->matchFn(env, c.id(), tv, false);
+        if (!canReuseDecl) {
           if (origdecl == NULL || !origdecl->rtype(env, tv, false).ispar()) {
             throw FlatteningError(env,c.loc(),"function "+c.id().str()+" is used in output, par version needed");
           }