- fixes to inner outer prefixing when prefix is Prefix.NOPRE (top sco…

…pe).

- testsuite/flattening/modelica/scoping/InnerEnumeration.mo to test the fix.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@17044 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Compiler/FrontEnd/InnerOuter.mo

@@ -1598,7 +1598,7 @@ algorithm
     // we have some outer references, search for our prefix + cref in them
     case ({TOP_INSTANCE(_, _, outerPrefixes as _::_)}, _, _)
       equation
-        (_,fullCref) = PrefixUtil.prefixCref(Env.emptyCache(),{},emptyInstHierarchy,inPrefix, inOuterComponentRef);
+        (_,fullCref) = PrefixUtil.prefixCref(Env.emptyCache(), {}, emptyInstHierarchy, inPrefix, inOuterComponentRef);
 
         // this will fail if we don't find it so prefixing can happen in the calling function
         (outerCrefPrefix, innerCrefPrefix) = searchForInnerPrefix(fullCref, outerPrefixes);

Compiler/FrontEnd/PrefixUtil.mo

@@ -663,7 +663,11 @@ algorithm
       DAE.CallAttributes attr;
 
     // no prefix, return the input expression
-    case (cache,_,_,e,Prefix.NOPRE()) then (cache,e);
+    case (cache,_,_,e,Prefix.NOPRE())
+      equation
+         false = System.getHasInnerOuterDefinitions();
+      then 
+        (cache,e);
 
     // handle literal constants
     case (cache,_,_,(e as DAE.ICONST(integer = _)),_) then (cache,e);
@@ -863,6 +867,9 @@ algorithm
       then (cache,DAE.META_OPTION(NONE()));
         // ------------------------
 
+    // no prefix, return the input expression
+    case (cache,_,_,e,Prefix.NOPRE()) then (cache,e);
+
     case (_,_,_,e,_)
       equation
         true = Flags.isSet(Flags.FAILTRACE);