[NF] Fix scoping of imported components.

Belonging to [master]:
  - #2118
  - OpenModelica/OpenModelica-testsuite#828

Compiler/NFFrontEnd/NFClass.mo

@@ -166,8 +166,9 @@ uniontype Class
     input String name;
     input Class cls;
     output InstNode node;
+    output Boolean isImport;
   algorithm
-    node := ClassTree.lookupElement(name, classTree(cls));
+    (node, isImport) := ClassTree.lookupElement(name, classTree(cls));
   end lookupElement;
 
   function lookupAttribute

Compiler/NFFrontEnd/NFClassTree.mo

@@ -676,11 +676,12 @@ public
       input String name;
       input ClassTree tree;
       output InstNode element;
+      output Boolean isImport;
     protected
       LookupTree.Entry entry;
     algorithm
       entry := LookupTree.get(lookupTree(tree), name);
-      element := resolveEntry(entry, tree);
+      (element, isImport) := resolveEntry(entry, tree);
     end lookupElement;
 
     function lookupElementPtr
@@ -1214,11 +1215,12 @@ public
       input LookupTree.Entry entry;
       input ClassTree tree;
       output InstNode element;
+      output Boolean isImport;
     algorithm
-      element := match entry
-        case LookupTree.Entry.CLASS() then resolveClass(entry.index, tree);
-        case LookupTree.Entry.COMPONENT() then resolveComponent(entry.index, tree);
-        case LookupTree.Entry.IMPORT() then resolveImport(entry.index, tree);
+      (element, isImport) := match entry
+        case LookupTree.Entry.CLASS() then (resolveClass(entry.index, tree), false);
+        case LookupTree.Entry.COMPONENT() then (resolveComponent(entry.index, tree), false);
+        case LookupTree.Entry.IMPORT() then (resolveImport(entry.index, tree), true);
       end match;
     end resolveEntry;
 

Compiler/NFFrontEnd/NFLookup.mo

@@ -657,15 +657,17 @@ function lookupSimpleCref
   input InstNode scope;
   output InstNode node;
   output InstNode foundScope = scope;
+protected
+  Boolean is_import;
 algorithm
   // Look for the name in the given scope, and if not found there continue
   // through the enclosing scopes of that scope until we either run out of
   // scopes or for some reason exceed the recursion depth limit.
   for i in 1:Global.recursionDepthLimit loop
     try
-      node := match foundScope
+      (node, is_import) := match foundScope
         case InstNode.IMPLICIT_SCOPE()
-          then lookupIterator(name, foundScope.locals);
+          then (lookupIterator(name, foundScope.locals), false);
         case InstNode.CLASS_NODE()
           then Class.lookupElement(name, InstNode.getClass(foundScope));
         case InstNode.COMPONENT_NODE()
@@ -674,8 +676,10 @@ algorithm
           then Class.lookupElement(name, InstNode.getClass(foundScope.innerNode));
       end match;
 
-      // If the node is an outer node, return the inner instead.
-      if InstNode.isInnerOuterNode(node) then
+      if is_import then
+        foundScope := InstNode.parent(node);
+      elseif InstNode.isInnerOuterNode(node) then
+        // If the node is an outer node, return the inner instead.
         node := InstNode.resolveInner(node);
         foundScope := InstNode.parent(node);
       end if;
@@ -700,10 +704,12 @@ function lookupLocalSimpleCref
   input InstNode scope;
   output InstNode node;
   output InstNode foundScope = scope;
+protected
+  Boolean is_import;
 algorithm
-  node := match foundScope
+  (node, is_import) := match foundScope
     case InstNode.IMPLICIT_SCOPE()
-      then lookupIterator(name, foundScope.locals);
+      then (lookupIterator(name, foundScope.locals), false);
     case InstNode.CLASS_NODE()
       then Class.lookupElement(name, InstNode.getClass(foundScope));
     case InstNode.COMPONENT_NODE()
@@ -712,8 +718,10 @@ algorithm
       then Class.lookupElement(name, InstNode.getClass(foundScope.innerNode));
   end match;
 
-  // If the node is an outer node, return the inner instead.
-  if InstNode.isInnerOuterNode(node) then
+  if is_import then
+    foundScope := InstNode.parent(node);
+  elseif InstNode.isInnerOuterNode(node) then
+    // If the node is an outer node, return the inner instead.
     node := InstNode.resolveInner(node);
     foundScope := InstNode.parent(node);
   end if;