Singelton ut containing non singelton ut are treated as singeltons (#914)

* Singelton ut containing non singelton ut are treated as singeltons

Author: JKRT

OMCompiler/Compiler/FrontEnd/InstMeta.mo

@@ -57,31 +57,38 @@ public function fixUniontype
 algorithm
   outType := match (inState, inClassDef)
     local
+      Absyn.Path p, p2, utPathOfRestriction, utPath;
       Boolean isSingleton;
-      Absyn.Path p,p2;
+      DAE.EvaluateSingletonType singletonType;
+      FCore.Graph env_1;
+      SCode.Element c;
+      String name;
       list<Absyn.Path> paths;
       list<DAE.Type> typeVarsTypes;
       list<String> names, typeVars;
-      DAE.EvaluateSingletonType singletonType;
-      SCode.Element c;
-      FCore.Graph env_1;
-
     case (ClassInf.META_UNIONTYPE(typeVars=typeVars), SCode.PARTS())
       algorithm
+        utPath := inState.path;
         p := AbsynUtil.makeFullyQualified(inState.path);
-        names := SCodeUtil.elementNames(list(e for e guard match e case SCode.CLASS(restriction=SCode.R_METARECORD()) then true; else false; end match in inClassDef.elementLst));
+        names := SCodeUtil.elementNames(list(
+                                             e for e
+                                               guard match e
+                                                 case SCode.CLASS(restriction=SCode.R_METARECORD(name = utPathOfRestriction))
+                                                   then AbsynUtil.pathSuffixOf(utPathOfRestriction, utPath);
+                                                 else false;
+                                               end match
+                                        in inClassDef.elementLst));
         paths := list(AbsynUtil.suffixPath(p, n) for n in names);
-        isSingleton := listLength(paths)==1;
+        isSingleton := listLength(paths) == 1;
         if isSingleton then
           p2 := listGet(paths, 1);
-          singletonType := DAE.EVAL_SINGLETON_TYPE_FUNCTION(function fixUniontype2(arr=arrayCreate(1, (cache,inEnv,p2,NONE()))));
+          singletonType := DAE.EVAL_SINGLETON_TYPE_FUNCTION(function fixUniontype2(arr=arrayCreate(1, (cache, inEnv, p2, NONE()))));
         else
           singletonType := DAE.NOT_SINGLETON();
         end if;
         typeVarsTypes := list(DAE.T_METAPOLYMORPHIC(tv) for tv in typeVars);
       then
-        SOME(DAE.T_METAUNIONTYPE(paths,typeVarsTypes,isSingleton,singletonType,p));
-
+        SOME(DAE.T_METAUNIONTYPE(paths, typeVarsTypes, isSingleton, singletonType, p));
     else NONE();
   end match;
 end fixUniontype;

testsuite/metamodelica/meta/Makefile

@@ -136,6 +136,7 @@ UniontypeFunc1.mos \
 UniontypeConst1.mos \
 UniontypeConst2.mos \
 UniontypeConst3.mos \
+UniontypeNestedSingelton.mos
 # test that currently fail. Move up when fixed.
 # Run make testfailing
 FAILINGTESTFILES=

testsuite/metamodelica/meta/UniontypeNestedSingelton.mo

@@ -0,0 +1,24 @@
+uniontype UT
+  record R
+    Real RI;
+  end R;
+  function f
+    output Real ro;
+  protected
+    UT tmpUT = R(1.0);
+  algorithm
+    ro := tmpUT.RI;
+  end f;
+  uniontype UT2
+    record R1
+    end R1;
+   record R2
+   end R2;
+  end UT2;
+end UT;
+
+function test
+  output Real x;
+algorithm
+  x := UT.f();
+end test;

testsuite/metamodelica/meta/UniontypeNestedSingelton.mos

@@ -0,0 +1,18 @@
+// name:     UniontypeConst4
+// keywords: uniontype singelton record
+// status:   correct
+// cflags:   -g=MetaModelica -d=gen
+//
+// This tests check that asserts that singelton uniontype
+// that contains non singelton subuniontypes are treated as singeltons.
+//
+
+loadFile("UniontypeNestedSingelton.mo"); getErrorString();
+test(); getErrorString();
+
+// Result:
+// true
+// ""
+// 1.0
+// ""
+// endResult