Fix lookup of qualified crefs in nfinst.

OpenModelica · Nov 28, 2016 · 2ccad20 · 2ccad20
1 parent e1efb57
commit 2ccad20
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 0 deletions.
diff --git a/Compiler/NFFrontEnd/NFComponent.mo b/Compiler/NFFrontEnd/NFComponent.mo
@@ -105,6 +105,32 @@ uniontype Component
     end match;
   end classInstance;
 
+  function setClassInstance
+    input InstNode classInst;
+    input output Component component;
+  algorithm
+    () := match component
+      case UNTYPED_COMPONENT()
+        algorithm
+          component.classInst := classInst;
+        then
+          ();
+
+      case TYPED_COMPONENT()
+        algorithm
+          component.classInst := classInst;
+        then
+          ();
+
+      case EXTENDS_NODE()
+        algorithm
+          component.node := classInst;
+        then
+          ();
+
+    end match;
+  end setClassInstance;
+
   function setModifier
     input Modifier modifier;
     input output Component component;

diff --git a/Compiler/NFFrontEnd/NFInst.mo b/Compiler/NFFrontEnd/NFInst.mo
@@ -95,6 +95,11 @@ algorithm
 
   // Instantiate, type and flatten the class.
   cls := instantiate(cls, Modifier.NOMOD(), top_comp_node);
+
+  // Update the instantiated class inside the top component.
+  top_comp := Component.setClassInstance(cls, top_comp);
+  top_comp_node := ComponentNode.replaceComponent(top_comp, top_comp_node);
+
   cls := Typing.typeClass(cls, top_comp_node);
   dae := NFFlatten.flattenClass(cls);