[NF] Subscripting fixes.

- Fix type when subscripting enumerations.
- Only remove subscripts if all of them simplify to :.

OMCompiler/Compiler/NFFrontEnd/NFExpression.mo

@@ -1335,6 +1335,7 @@ public
     Expression index_exp, start_exp, stop_exp;
     Option<Expression> step_exp;
     Type ty;
+    list<Subscript> subs;
   algorithm
     Subscript.INDEX(index = index_exp) := index;
 
@@ -1343,7 +1344,9 @@ public
       outExp := applyIndexSubscriptRange2(start_exp, step_exp, stop_exp, toInteger(index_exp));
     else
       RANGE(ty = ty) := rangeExp;
-      outExp := SUBSCRIPTED_EXP(rangeExp, {index}, ty);
+      subs := {index};
+      ty := Type.subscript(ty, subs);
+      outExp := SUBSCRIPTED_EXP(rangeExp, subs, ty);
     end if;
   end applyIndexSubscriptRange;
 

OMCompiler/Compiler/NFFrontEnd/NFSubscript.mo

@@ -673,11 +673,9 @@ public
         outSubscripts := simplify(s, d) :: outSubscripts;
       end for;
 
-      while not listEmpty(outSubscripts) and isWhole(listHead(outSubscripts)) loop
-        outSubscripts := listRest(outSubscripts);
-      end while;
-
-      outSubscripts := listReverseInPlace(outSubscripts);
+      if not List.all(outSubscripts, isWhole) then
+        outSubscripts := listReverseInPlace(outSubscripts);
+      end if;
     end if;
   end simplifyList;