Changeset a3d7c1ef in OpenModelica

Timestamp:

2021-01-21T23:46:53+01:00 (3 years ago)

Author:

Per Östlund <perost86@…>

Parents:

116b4405

git-author:

Per Östlund <perost86@…> (01/21/21 23:45:13)

git-committer:

Per Östlund <perost86@…> (01/21/21 23:46:53)

Message:

Workaround for #7097

File:

• OMCompiler/Compiler/NFFrontEnd/NFFlatten.mo (modified) (2 diffs)

OMCompiler/Compiler/NFFrontEnd/NFFlatten.mo

@@ -574 +574 @@
   Binding binding;
   Option<Binding> opt_binding;
-  Expression binding_exp;
+  Expression binding_exp, binding_exp_eval;
   Equation eq;
   list<Expression> bindings;
@@ -593 +593 @@
     elseif binding_var == Variability.PARAMETER and Component.isFinal(comp) then
       try
-        binding_exp := Expression.stripBindingInfo(Ceval.evalExp(binding_exp));
+        binding_exp_eval := Expression.stripBindingInfo(Ceval.evalExp(binding_exp));
+        // Throw away the evaluated binding if the number of dimensions no
+        // longer match after evaluation, in case Ceval fails to apply the
+        // subscripts correctly.
+        // TODO: Fix this, it shouldn't be needed.
+        0 := Type.dimensionDiff(ty, Expression.typeOf(binding_exp_eval));
+        binding_exp := binding_exp_eval;
       else
       end try;