Changeset 8a20ce0 in OpenModelica for Compiler/NFFrontEnd/NFTyping.mo

Timestamp:

2019-01-21T16:29:30+01:00 (4 years ago)

Author:

hudson <openmodelica@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, master, omlib-staging

Children:

5e72f06e

Parents:

25cfbd50

git-author:

Per Östlund <per.ostlund@…> (01/21/19 16:29:30)

git-committer:

hudson <openmodelica@…> (01/21/19 16:29:30)

Message:

[NF] Propagate structuralness via modifications.

• Mark parameters that have a structural cref as binding as also structural.

Belonging to [master]:

• OpenModelica/OMCompiler#2887
• OpenModelica/OpenModelica-testsuite#1108

File:

• Compiler/NFFrontEnd/NFTyping.mo (modified) (3 diffs)

Compiler/NFFrontEnd/NFTyping.mo

@@ -762 +762 @@
   MatchKind matchKind;
   String name;
-  Variability comp_var, comp_eff_var, bind_var;
+  Variability comp_var, comp_eff_var, bind_var, bind_eff_var;
+  Component.Attributes attrs;
 algorithm
   if InstNode.isEmpty(component) then
@@ -771 +772 @@
 
   () := match c
-    case Component.TYPED_COMPONENT(binding = Binding.UNTYPED_BINDING())
+    case Component.TYPED_COMPONENT(binding = Binding.UNTYPED_BINDING(), attributes = attrs)
       algorithm
         name := InstNode.name(component);
@@ -784 +785 @@
           comp_var := Component.variability(c);
           comp_eff_var := Prefixes.effectiveVariability(comp_var);
-          bind_var := Prefixes.effectiveVariability(Binding.variability(binding));
-
-          if bind_var > comp_eff_var and ExpOrigin.flagNotSet(origin, ExpOrigin.FUNCTION) then
+          bind_var := Binding.variability(binding);
+          bind_eff_var := Prefixes.effectiveVariability(bind_var);
+
+          if bind_eff_var > comp_eff_var and ExpOrigin.flagNotSet(origin, ExpOrigin.FUNCTION) then
             Error.addSourceMessage(Error.HIGHER_VARIABILITY_BINDING, {
               name, Prefixes.variabilityString(comp_eff_var),
-              "'" + Binding.toString(c.binding) + "'", Prefixes.variabilityString(bind_var)},
+              "'" + Binding.toString(c.binding) + "'", Prefixes.variabilityString(bind_eff_var)},
               Binding.getInfo(binding));
             fail();
+          end if;
+
+          // Mark parameters that have a structural cref as binding as also
+          // structural. This is perhaps not optimal, but is required right now
+          // to avoid structural singularity and other issues.
+          if bind_var == Variability.STRUCTURAL_PARAMETER and
+             comp_var == Variability.PARAMETER and
+             Binding.isCrefExp(binding) then
+            attrs.variability := bind_var;
+            c.attributes := attrs;
           end if;
         else