[NF] improve merging of subscripts to crefs (#14776)

- check all dimension sub configurations
  - [NB] improve debugging output

Author: kabdelhak

OMCompiler/Compiler/NBackEnd/Modules/1_Main/NBResolveSingularities.mo

@@ -460,7 +460,7 @@ public
       else
         error_msg := getInstanceName()
           + " failed because following non-fixable variables could not be solved:\n"
-          + List.toString(failed_vars, BVariable.pointerToString, "", "\t", ", ", "\n", true);
+          + List.toString(failed_vars, BVariable.pointerToString, "", "\t", "\n\t", "\n", true);
         if Flags.isSet(Flags.INITIALIZATION) then
           error_msg := error_msg + "\nFollowing equations were created by fixing variables:\n"
             + List.toString(Pointer.access(ptr_start_eqns), function Equation.pointerToString(str = "\t"), "", "", "\n", "\n", true);

OMCompiler/Compiler/NFFrontEnd/NFComponentRef.mo

@@ -730,6 +730,24 @@ public
     input output ComponentRef cref;
     input UnorderedMap<list<Dimension>, list<ComponentRef>> dims_map;
     input UnorderedMap<ComponentRef, Subscript> iter_map;
+  protected
+    function checkLocalDimensions
+      "checks if the current dimension configuration results in new subscripts for the cref"
+      input output ComponentRef cref;
+      input list<Dimension> dims;
+      input UnorderedMap<list<Dimension>, list<ComponentRef>> dims_map;
+      input UnorderedMap<ComponentRef, Subscript> iter_map;
+    protected
+      Option<list<ComponentRef>> iter_crefs;
+      list<Subscript> new_subs;
+    algorithm
+      iter_crefs    := UnorderedMap.get(dims, dims_map);
+      if Util.isSome(iter_crefs) then
+        // dimension configuration was found, map to subscripts and apply in reverse
+        new_subs  := list(UnorderedMap.getSafe(iter_name, iter_map, sourceInfo()) for iter_name in Util.getOption(iter_crefs));
+        cref      := mergeSubscripts(new_subs, cref, true, true, true);
+      end if;
+    end checkLocalDimensions;
   algorithm
     cref := match cref
       local
@@ -738,20 +756,22 @@ public
         ComponentRef new_cref;
         list<Subscript> new_subs, rest_subs;
         Type ty = getSubscriptedType(cref);
+        Integer num_local_dims;
 
       // local array type -> try to find the current dimension configuration in the map and add subscripts
       case CREF() guard(Type.isArray(ty)) algorithm
         // get dimensions and check in map
-        dims          := Type.arrayDims(ty);
-        iter_crefs    := UnorderedMap.get(dims, dims_map);
-        if Util.isSome(iter_crefs) then
-          // dimension configuration was found, map to subscripts and apply in reverse
-          new_subs    := list(UnorderedMap.getSafe(iter_name, iter_map, sourceInfo()) for iter_name in Util.getOption(iter_crefs));
-          new_cref    := mergeSubscripts(new_subs, cref, true, true, true);
-        else
-          // not found, just keep current cref
-          new_cref    := cref;
-        end if;
+        dims            := Type.arrayDims(ty);
+        num_local_dims  := listLength(Type.arrayDims(cref.ty));
+
+        // check if the dimension configuration exists in the map
+        // and iteratively remove one dimension to check all local configurations
+        new_cref := cref;
+        while num_local_dims > 0 loop
+          new_cref := checkLocalDimensions(new_cref, dims, dims_map, iter_map);
+          dims := List.stripLast(dims);
+          num_local_dims := num_local_dims - 1;
+        end while;
 
         // apply to restCref afterwards such that the outermost dimensions are handled first
         // this is important because the full dimension list is considered when checking in the map

OMCompiler/Compiler/NFFrontEnd/NFExpression.mo

@@ -4650,7 +4650,7 @@ public
       case STRING() then true;
       case BOOLEAN() then true;
       case ENUM_LITERAL() then true;
-      case ARRAY() then exp.literal or Array.all(exp.elements, isLiteralXML);
+      case ARRAY() then Array.all(exp.elements, isLiteralXML);
       case RECORD() then List.all(exp.elements, isLiteralXML);
       case RANGE() then isLiteralXML(exp.start) and isLiteralXML(exp.stop) and
                         Util.applyOptionOrDefault(exp.step, isLiteralXML, true);