Use qualified component names in hideResult attribute

Fix for ticket:4089

Author: ptaeuber

Compiler/BackEnd/BackendDAECreate.mo

@@ -766,7 +766,7 @@ algorithm
         dae_var_attr = DAEUtil.setProtectedAttr(dae_var_attr, b);
         dae_var_attr = setMinMaxFromEnumeration(t, dae_var_attr);
         ts = BackendDAEUtil.setTearingSelectAttribute(comment);
-        hideResult = BackendDAEUtil.setHideResultAttribute(comment, b);
+        hideResult = BackendDAEUtil.setHideResultAttribute(comment, b, name);
       then
         (BackendDAE.VAR(name, kind_1, dir, prl, tp, NONE(), NONE(), dims, source, dae_var_attr, ts, hideResult, comment, ct, DAEUtil.toDAEInnerOuter(io), false));
   end match;
@@ -831,7 +831,7 @@ algorithm
         eqLst = buildAssertAlgorithms({},source,assrtEqIn);
         // building an algorithm of the assert
         ts = NONE();
-        hideResult = BackendDAEUtil.setHideResultAttribute(comment, b);
+        hideResult = BackendDAEUtil.setHideResultAttribute(comment, b, name);
       then
         (BackendDAE.VAR(name, kind_1, dir, prl, tp, bind, NONE(), dims, source, dae_var_attr, ts, hideResult, comment, ct, DAEUtil.toDAEInnerOuter(io), false), iInlineHT, eqLst);
 

Compiler/BackEnd/BackendDAEUtil.mo

@@ -1240,16 +1240,27 @@ public function setHideResultAttribute
    See Modelica Spec 3.3, section 18.3"
   input Option<SCode.Comment> comment;
   input Boolean isProtected;
+  input DAE.ComponentRef inCref;
   output DAE.Exp hideResult;
 protected
   SCode.Annotation ann;
   Absyn.Exp val;
-  String ts_str;
+  DAE.ComponentRef crefRoot;
 algorithm
   try
     SOME(SCode.COMMENT(annotation_=SOME(ann))) := comment;
     val := SCode.getNamedAnnotation(ann, "HideResult");
     hideResult := Expression.fromAbsynExp(val);
+
+    hideResult := match(inCref)
+      case(DAE.CREF_QUAL())
+        equation
+          (crefRoot,_) = ComponentReference.splitCrefLast(inCref);
+          hideResult = Expression.traverseExpBottomUp(hideResult, ComponentReference.joinCrefsExp, crefRoot);
+       then hideResult;
+      else hideResult;
+    end match;
+
   else
     hideResult := DAE.BCONST(isProtected);
   end try;

Compiler/FrontEnd/ComponentReference.mo

@@ -2236,10 +2236,8 @@ algorithm
 end appendStringLastIdent;
 
 public function joinCrefs
-"Join two component references by concatenating them.
-
+"Joins two component references by concatenating them.
   alternative names: crefAppend
-
   "
   input DAE.ComponentRef inComponentRef1 " first part of the new componentref";
   input DAE.ComponentRef inComponentRef2 " last part of the new componentref";
@@ -2289,6 +2287,24 @@ algorithm
   end match;
 end joinCrefsR;
 
+public function joinCrefsExp
+"Like joinCrefs but first argument is an expression"
+  input output DAE.Exp exp;
+  input output DAE.ComponentRef cref;
+algorithm
+  exp := match (exp)
+    local
+      DAE.ComponentRef cr;
+      DAE.Type tp;
+    case (DAE.CREF(cr, tp))
+      equation
+        cr = joinCrefs(cref, cr);
+      then
+        DAE.CREF(cr,tp);
+     else exp;
+  end match;
+end joinCrefsExp;
+
 public function subscriptCref
 "The subscriptCref function adds a subscript to the ComponentRef
   For instance a.b with subscript 10 becomes a.b[10] and c.d[1,2]