Catch type error when set literal is declared that contains another set.

MiniZinc · Jan 10, 2018 · 8bb12b9 · 8bb12b9
1 parent 34fbaf8
commit 8bb12b9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -35,6 +35,7 @@ Bug fixes:
  - Fix evaluation of comprehensions in recursive functions.
  - Fix output of Gurobi backend when used in conjunction with solns2out.
  - Fix pthread linking for mzn-cbc.
+ - Catch type error when set literal is declared that contains another set.
 
 Version 2.1.6
 =============

diff --git a/lib/typecheck.cpp b/lib/typecheck.cpp
@@ -820,6 +820,8 @@ namespace MiniZinc {
       for (unsigned int i=0; i<sl.v().size(); i++) {
         if (sl.v()[i]->type().dim() > 0)
           throw TypeError(_env,sl.v()[i]->loc(),"set literals cannot contain arrays");
+        if (sl.v()[i]->type().is_set())
+          throw TypeError(_env,sl.v()[i]->loc(),"set literals cannot contain sets");
         if (sl.v()[i]->type().isvar())
           ty.ti(Type::TI_VAR);
         if (sl.v()[i]->type().isopt())