HideResult defaults to protected, ticket:4089

Author: rfranke

Compiler/SimCode/SimCodeUtil.mo

@@ -8469,7 +8469,7 @@ algorithm
         commentStr = unparseCommentOptionNoAnnotationNoQuote(comment);
         (unit, displayUnit) = extractVarUnit(dae_var_attr);
         isProtected = getProtected(dae_var_attr);
-        hideResult = getHideResult(comment);
+        hideResult = getHideResult(comment, isProtected);
         (minValue, maxValue) = getMinMaxValues(dlowVar);
         initVal = getStartValue(dlowVar);
         nomVal = getNominalValue(dlowVar);
@@ -8503,7 +8503,7 @@ algorithm
         commentStr = unparseCommentOptionNoAnnotationNoQuote(comment);
         (unit, displayUnit) = extractVarUnit(dae_var_attr);
         isProtected = getProtected(dae_var_attr);
-        hideResult = getHideResult(comment);
+        hideResult = getHideResult(comment, isProtected);
         (minValue, maxValue) = getMinMaxValues(dlowVar);
         initVal = getStartValue(dlowVar);
         nomVal = getNominalValue(dlowVar);
@@ -8531,7 +8531,7 @@ algorithm
         commentStr = unparseCommentOptionNoAnnotationNoQuote(comment);
         (unit, displayUnit) = extractVarUnit(dae_var_attr);
         isProtected = getProtected(dae_var_attr);
-        hideResult = getHideResult(comment);
+        hideResult = getHideResult(comment, isProtected);
         (minValue, maxValue) = getMinMaxValues(dlowVar);
         initVal = getStartValue(dlowVar);
         nomVal = getNominalValue(dlowVar);
@@ -10688,7 +10688,11 @@ algorithm
 end getProtected;
 
 protected function getHideResult
+  "Returns the value of the HideResult annotation.
+   Uses isProtected as default if the annotation is not specified.
+   See Modelica Spec 3.3, section 18.3"
   input Option<SCode.Comment> inComment;
+  input Boolean isProtected;
   output Boolean outHideResult;
 protected
   SCode.Annotation ann;
@@ -10702,7 +10706,7 @@ algorithm
       else false;
     end match;
   else
-    outHideResult := false;
+    outHideResult := isProtected;
   end try;
 end getHideResult;
 

Compiler/Template/CodegenCppInit.tpl

@@ -138,7 +138,7 @@ template scalarVariableAttributeXML(SimVar simVar, SimCode simCode, String index
       let causalityAtt = CodegenFMUCommon.getCausality(causality)
       let variability = getVariablity(varKind)
       let description = if comment then 'description="<%Util.escapeModelicaStringToXmlString(comment)%>"'
-      let additionalAttributes = if generateFMUModelDescription then '' else 'isProtected="<%isProtected%>" isDiscrete="<%isDiscrete%>" isValueChangeable="<%isValueChangeable%>"'
+      let additionalAttributes = if generateFMUModelDescription then '' else 'isProtected="<%isProtected%>" hideResult="<%hideResult%>" isDiscrete="<%isDiscrete%>" isValueChangeable="<%isValueChangeable%>"'
       <<
       name="<%System.stringReplace(Util.escapeModelicaStringToXmlString(crefStrNoUnderscore(name)),"$", "_D_")%>" valueReference="<%valueReference%>" <%description%> variability="<%variability%>" causality="<%causalityAtt%>" alias="<%alias%>" <%additionalAttributes%>
       >>