Automatically coerce arrays constructed using ++ to any enum index se…

…t (in addition to array literals and comprehensions)

CHANGES.txt

@@ -12,6 +12,8 @@ Changes:
  - Add missing min/max functions for set variables. Can be redefined to solver
    builtins using the new redefinitions-2.1.1.mzn library file.
  - Add support for option type expressions as objective functions.
+ - Automatically coerce arrays constructed using ++ to any enum index set
+   (in addition to array literals and comprehensions).
 
 Bug fixes:
  - Include cmath header to fix compilation issues with some compilers. Fixes #125.

lib/typecheck.cpp

@@ -1105,7 +1105,9 @@ namespace MiniZinc {
         if (vd.e()) {
           Type vdt = vd.ti()->type();
           Type vet = vd.e()->type();
-          if (vdt.enumId() != 0 && vdt.dim() > 0 && (vd.e()->isa<ArrayLit>() || vd.e()->isa<Comprehension>())) {
+          if (vdt.enumId() != 0 && vdt.dim() > 0 &&
+              (vd.e()->isa<ArrayLit>() || vd.e()->isa<Comprehension>() ||
+               (vd.e()->isa<BinOp>() && vd.e()->cast<BinOp>()->op()==BOT_PLUSPLUS))) {
             // Special case: index sets of array literals and comprehensions automatically
             // coerce to any enum index set
             const std::vector<unsigned int>& enumIds = _env.getArrayEnum(vdt.enumId());