fix for ticket:3979

OpenModelica · Sep 22, 2016 · 4f0d761 · 4f0d761
1 parent f0f37a3
commit 4f0d761
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/Compiler/FrontEnd/Lookup.mo b/Compiler/FrontEnd/Lookup.mo
@@ -1746,6 +1746,10 @@ algorithm
             equation
               cr = lookupQualifiedImportedVarInFrame(qimports, id);
               Util.setStatefulBoolean(inState,true);
+			  // if the first name of the import A.B is equal with the scope we are in, skip it!
+			  cr = if FNode.name(FNode.fromRef(FGraph.lastScopeRef(env))) == ComponentReference.crefFirstIdent(cr)
+			       then ComponentReference.crefStripFirstIdent(cr)
+				   else cr;
               f::prevFrames = listReverse(FGraph.currentScope(env));
               env = FGraph.setScope(env, {f});
               (cache,p_env,attr,ty,bind,cnstForRange,splicedExpData,componentEnv,name) = lookupVarInPackages(cache,env,cr,prevFrames,inState);