NFInst fixes.

- Fix modifier scope propagation.
- Fix binding expansion during flattening.

Author: perost

Compiler/NFFrontEnd/NFFlatten.mo

@@ -242,7 +242,7 @@ algorithm
           case Instance.INSTANCED_BUILTIN()
             algorithm
               cref := Prefix.toCref(prefix);
-              binding_exp := flattenBinding(component.binding);
+              binding_exp := flattenBinding(component.binding, prefix);
               attr := component.attributes;
 
               var := DAE.VAR(
@@ -278,6 +278,7 @@ end flattenScalar;
 
 function flattenBinding
   input Binding binding;
+  input Prefix prefix;
   output Option<DAE.Exp> bindingExp;
 algorithm
   bindingExp := match binding
@@ -292,11 +293,10 @@ algorithm
     case Binding.TYPED_BINDING()
       algorithm
         // TODO: Implement this in a saner way.
-        //subs := List.lastN(List.flatten(Prefix.allSubscripts(prefix)),
-        //  binding.propagatedDims);
-      //then
-      //  SOME(Expression.subscriptExp(binding.bindingExp, subs));
-      then SOME(binding.bindingExp);
+        subs := List.lastN(List.flatten(Prefix.allSubscripts(prefix)),
+          binding.propagatedDims);
+      then
+        SOME(Expression.subscriptExp(binding.bindingExp, subs));
 
     else
       algorithm

Compiler/NFFrontEnd/NFInst.mo

@@ -649,7 +649,6 @@ protected
   list<Dimension> dims;
 algorithm
   component := ComponentNode.component(node);
-  name := ComponentNode.name(node);
 
   () := match component
     case Component.COMPONENT_DEF(modifier = comp_mod as Modifier.REDECLARE())
@@ -662,6 +661,7 @@ algorithm
 
     case Component.COMPONENT_DEF(definition = comp as SCode.COMPONENT())
       algorithm
+        name := ComponentNode.name(node);
         node := ComponentNode.setParent(parent, node);
 
         // Merge the modifier from the component.
@@ -670,16 +670,18 @@ algorithm
         comp_mod := Modifier.merge(component.modifier, comp_mod);
         comp_mod := Modifier.propagate(comp_mod, listLength(comp.attributes.arrayDims));
 
+        binding := instBinding(Modifier.binding(comp_mod), scope);
+        comp_mod := Modifier.propagateScope(comp_mod);
+
         // Instantiate the type of the component.
         cls := instTypeSpec(comp.typeSpec, comp_mod, scope, node, comp.info);
 
         // Instantiate the component's dimensions.
         dims := instDimensions(comp.attributes.arrayDims, scope);
         Modifier.checkEach(comp_mod, listEmpty(dims), name);
 
-        // Instantiate attributes and binding.
+        // Instantiate attributes and create the untyped component.
         attr := instComponentAttributes(comp.attributes, comp.prefixes);
-        binding := instBinding(Modifier.binding(comp_mod), scope);
         inst_comp := Component.UNTYPED_COMPONENT(cls, listArray(dims), binding, attr, comp.info);
         node := ComponentNode.setComponent(inst_comp, node);
       then

Compiler/NFFrontEnd/NFMod.mo

@@ -43,6 +43,7 @@ public
 import Absyn;
 import BaseAvlTree;
 import NFBinding.Binding;
+import NFComponent.Component;
 import NFInstNode.InstNode;
 import SCode;
 
@@ -314,6 +315,21 @@ public
     end match;
   end propagate;
 
+  function propagateScope
+    input output Modifier modifier;
+  algorithm
+    _ := match modifier
+      case MODIFIER()
+        algorithm
+          modifier.subModifiers := ModTable.map(modifier.subModifiers,
+            propagateSubModScope);
+        then
+          ();
+
+      else ();
+    end match;
+  end propagateScope;
+
   function checkEach
     input Modifier mod;
     input Boolean isScalar;
@@ -471,6 +487,39 @@ protected
     end match;
   end propagateBinding;
 
+  function propagateSubModScope
+    input String name;
+    input output Modifier modifier;
+  algorithm
+    _ := match modifier
+      case MODIFIER()
+        algorithm
+          modifier.binding := propagateBindingScope(modifier.binding);
+          modifier.subModifiers := ModTable.map(modifier.subModifiers,
+            propagateSubModScope);
+        then
+          ();
+
+      else ();
+    end match;
+  end propagateSubModScope;
+
+  function propagateBindingScope
+    input output Binding binding;
+  algorithm
+    _ := match binding
+      local
+        Integer l;
+
+      case Binding.RAW_BINDING(scope = Component.Scope.RELATIVE_COMP(level = l))
+        algorithm
+          binding.scope := Component.Scope.RELATIVE_COMP(l + 1);
+        then
+          ();
+
+      else ();
+    end match;
+  end propagateBindingScope;
 end Modifier;
 
 annotation(__OpenModelica_Interface="frontend");