Expand support for variable children.

OpenModelica · Dec 8, 2020 · df5af65 · df5af65
1 parent 11cb38e
commit df5af65
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 0 deletions.
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFEvalConstants.mo b/OMCompiler/Compiler/NFFrontEnd/NFEvalConstants.mo
@@ -83,6 +83,7 @@ algorithm
   end if;
 
   var.typeAttributes := list(evaluateTypeAttribute(a) for a in var.typeAttributes);
+  var.children := list(evaluateVariable(v) for v in var.children);
 end evaluateVariable;
 
 function evaluateBinding

diff --git a/OMCompiler/Compiler/NFFrontEnd/NFFlatten.mo b/OMCompiler/Compiler/NFFrontEnd/NFFlatten.mo
@@ -1634,6 +1634,10 @@ algorithm
         for attr in var.typeAttributes loop
           funcs := collectBindingFuncs(Util.tuple22(attr), funcs);
         end for;
+
+        for c in var.children loop
+          funcs := collectComponentFuncs(c, funcs);
+        end for;
       then
         ();
 

diff --git a/OMCompiler/Compiler/NFFrontEnd/NFSimplifyModel.mo b/OMCompiler/Compiler/NFFrontEnd/NFSimplifyModel.mo
@@ -73,6 +73,7 @@ function simplifyVariable
 algorithm
   var.binding := simplifyBinding(var.binding);
   var.typeAttributes := list(simplifyTypeAttribute(a) for a in var.typeAttributes);
+  var.children := list(simplifyVariable(v) for v in var.children);
 end simplifyVariable;
 
 function simplifyBinding

diff --git a/OMCompiler/Compiler/NFFrontEnd/NFUnitCheck.mo b/OMCompiler/Compiler/NFFrontEnd/NFUnitCheck.mo
@@ -239,6 +239,10 @@ protected
 algorithm
   for v in variables loop
     (htCr2U, htS2U, htU2S, fnCache) := foldBindingExp(v, htCr2U, htS2U, htU2S, fnCache, dump_eq_unit);
+
+    for c in v.children loop
+      (htCr2U, htS2U, htU2S, fnCache) := foldBindingExp(c, htCr2U, htS2U, htU2S, fnCache, dump_eq_unit);
+    end for;
   end for;
 
   for eq in equations loop

diff --git a/OMCompiler/Compiler/NFFrontEnd/NFVariable.mo b/OMCompiler/Compiler/NFFrontEnd/NFVariable.mo
@@ -154,6 +154,7 @@ public
     var.binding := Binding.mapExp(var.binding, fn);
     var.typeAttributes := list(
       (Util.tuple21(a), Binding.mapExp(Util.tuple22(a), fn)) for a in var.typeAttributes);
+    var.children := list(mapExp(v, fn) for v in var.children);
   end mapExp;
 
   function toString

diff --git a/OMCompiler/Compiler/NFFrontEnd/NFVerifyModel.mo b/OMCompiler/Compiler/NFFrontEnd/NFVerifyModel.mo
@@ -96,6 +96,10 @@ protected
     for attr in var.typeAttributes loop
       verifyBinding(Util.tuple22(attr));
     end for;
+
+    for v in var.children loop
+      verifyVariable(v);
+    end for;
   end verifyVariable;
 
   function verifyBinding