ST6RI-820 Corrected TypeUtil::getResultExpressonMembershipsOf.

Author: seidewitz

org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/validation/ResultExpressionMembership_Invalid.kerml.xt

@@ -0,0 +1,35 @@
+//*
+XPECT_SETUP org.omg.kerml.xpect.tests.parsing.KerMLParsingTest
+	ResourceSet {
+		ThisFile {}
+		File {from ="/library/Base.kerml"}
+       	File {from ="/library/Occurrences.kerml"}
+       	File {from ="/library/Performances.kerml"}
+	}
+	Workspace {
+		JavaProject {
+			SrcFolder {
+				ThisFile {}
+				File {from ="/library/Occurrences.kerml"}
+       			File {from ="/library/Performances.kerml"}
+			}
+		}
+	}
+END_SETUP 
+*/
+package ResultExpressionMembersio_invalid {
+	function F {
+		1
+	}
+	function G :> F {
+		//XPECT errors --> "Only one (owned or inherited) result expression is allowed" at "2"
+		2
+	}
+	
+	expr f : F {
+		//XPECT errors --> "Only one (owned or inherited) result expression is allowed" at "1"
+		1
+	}
+	//XPECT errors --> "Only one (owned or inherited) result expression is allowed" at "expr g :> f;"
+	expr g :> f;
+}

org.omg.sysml/src/org/omg/sysml/util/TypeUtil.java

@@ -321,11 +321,9 @@ private static Set<ResultExpressionMembership> getResultExpressionMembershipsOf(
 		visited.add(type);
 		getTypeAdapter(type).addAdditionalMembers();
 		Set<ResultExpressionMembership> resultExpressions = new HashSet<>(getOwnedResultExpressionMembershipsOf(type));
-		if (resultExpressions.isEmpty()) {
-			for (Type general: getSupertypesOf(type)) {
-				if (general != null && !visited.contains(general)) {
-					resultExpressions.addAll(getResultExpressionMembershipsOf(general, visited));
-				}
+		for (Type general: getSupertypesOf(type)) {
+			if (general != null && !visited.contains(general)) {
+				resultExpressions.addAll(getResultExpressionMembershipsOf(general, visited));
 			}
 		}
 		return resultExpressions;