Fix for #2532:

- Fixed slicing of qualified crefs.


git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@18725 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: perost

Compiler/FrontEnd/Expression.mo

@@ -1319,6 +1319,28 @@ algorithm
   end matchcontinue;
 end subscriptsAppend;
 
+public function subscriptsReplaceSlice
+  "Replaces the first slice subscript in the given list with the given subscript."
+  input list<DAE.Subscript> inSubscripts;
+  input DAE.Subscript inSubscript;
+  output list<DAE.Subscript> outSubscripts;
+algorithm
+  outSubscripts := match(inSubscripts, inSubscript)
+    local
+      list<DAE.Subscript> rest_subs;
+      DAE.Subscript sub;
+
+    case (DAE.WHOLEDIM() :: rest_subs, _) then inSubscript :: rest_subs;
+    case (DAE.SLICE(exp = _) :: rest_subs, _) then inSubscript :: rest_subs;
+    case (sub :: rest_subs, _)
+      equation
+        rest_subs = subscriptsReplaceSlice(rest_subs, inSubscript);
+      then
+        sub :: rest_subs;
+
+  end match;
+end subscriptsReplaceSlice;
+
 public function unliftArrayTypeWithSubs "
 helper function for renameVarsToUnderlineVar2 unlifts array type as much as we have subscripts"
   input list<DAE.Subscript> subs;

Compiler/FrontEnd/ExpressionSimplify.mo

@@ -3010,6 +3010,12 @@ algorithm
       then
         c_1;
 
+    case (DAE.CREF_QUAL(idn, t2, s, c), _)
+      equation
+        s = Expression.subscriptsReplaceSlice(s, DAE.INDEX(sub));
+      then
+        ComponentReference.makeCrefQual(idn, t2, s, c);
+
     case (DAE.CREF_QUAL(idn,t2,s,c),_)
       equation
         c_1 = simplifyAsubCref(c,sub);

Compiler/FrontEnd/Static.mo

@@ -10523,14 +10523,28 @@ algorithm
     // qualified ident with non-empty subscrips
     case (e as (DAE.CREF_QUAL(ident = id,subscriptLst = subs,componentRef = cref,identType = ty2 )),t)
       equation
-        // TODO!FIXME!
-        // ComponentReference.makeCrefIdent(id, ty2, subs) = fillCrefSubscripts(ComponentReference.makeCrefIdent(id, ty2, subs),t);
+        subs = fillSubscripts(subs, ty2);
+        t = stripPrefixType(t, ty2);
         cref_1 = fillCrefSubscripts(cref, t);
       then
         ComponentReference.makeCrefQual(id,ty2,subs,cref_1);
   end matchcontinue;
 end fillCrefSubscripts;
 
+protected function stripPrefixType
+  input DAE.Type inType;
+  input DAE.Type inPrefixType;
+  output DAE.Type outType;
+algorithm
+  outType := match(inType, inPrefixType)
+    local
+      DAE.Type t, pt;
+
+    case (DAE.T_ARRAY(ty = t), DAE.T_ARRAY(ty = pt)) then stripPrefixType(t, pt);
+    else inType;
+  end match;
+end stripPrefixType;
+
 protected function fillSubscripts
 "Helper function to fillCrefSubscripts."
   input list<DAE.Subscript> inExpSubscriptLst;