Remove isCompatible and add new unit tests

Author: pkourouklidis

plugins/org.eclipse.epsilon.eol.engine/src/org/eclipse/epsilon/eol/staticanalyser/EolStaticAnalyser.java

@@ -162,7 +162,7 @@ public void visit(AssignmentStatement assignmentStatement) {
 		if (valueType instanceof EolModelElementType && ((EolModelElementType) valueType).getMetaClass() != null)
 			valueType = new EolModelElementType(((EolModelElementType) valueType).getMetaClass());
 
-		if (!(isCompatible(targetType, valueType))) {
+		if (!targetType.isAncestorOf(valueType)) {
 			if (canBeCompatible(targetType, valueType)) {
 				createTypeCompatibilityWarning(targetExpression, valueExpression);
 			}
@@ -739,29 +739,31 @@ public void visit(OperationCallExpression operationCallExpression) {
 		for (IStaticOperation op : resolvedOperations) {
 			resolvedOperationContextTypes.add(op.getContextType());
 		}
-
+		
+		// If the contextType is a UnionType all containedTypes must be handled
 		if (contextType instanceof EolUnionType) {
-			if (resolvedOperationContextTypes.containsAll(((EolUnionType)contextType).containedTypes)){
-				return;
-			}
-		}
-		else {
-			if (resolvedOperationContextTypes.contains(contextType)) {
-				return;
-			}
-		}
-
-//		TODO: get descendants?
-		for (EolType t : contextType.getChildrenTypes()) {
-			if (!resolvedOperationContextTypes.contains(t)) {
+			outerLoop: for (EolType t : ((EolUnionType) contextType).containedTypes) {
+				for (EolType a : t.getAncestors()) {
+					if (resolvedOperationContextTypes.contains(a)) {
+						continue outerLoop;
+					}
+				}
 				warnings.add(
 						new ModuleMarker(
 								operationCallExpression, "Operation " + nameExpression.getName()
 										+ " is undefined for subtype " + t.getName() + " of " + contextType.getName(),
 								Severity.Warning));
 			}
+		} else {
+			for (EolType a : contextType.getAncestors()) {
+				if (resolvedOperationContextTypes.contains(a)) {
+					return;
+				}
+			}
+			warnings.add(new ModuleMarker(operationCallExpression,
+					"Operation " + nameExpression.getName() + " is undefined for type " + contextType.getName(),
+					Severity.Warning));
 		}
-		
 	}
 
 	@Override
@@ -936,7 +938,7 @@ public void visit(ReturnStatement returnStatement) {
 				setReturnFlag(((Operation) parent), true);
 				EolType requiredReturnType = (EolType) parent.getData().get("returnType");
 
-				if (!(isCompatible(requiredReturnType, providedReturnType))) {
+				if (!requiredReturnType.isAncestorOf(providedReturnType)) {
 					if (canBeCompatible(requiredReturnType, providedReturnType))
 						warnings.add(new ModuleMarker(returnedExpression, "Return type might be " + requiredReturnType
 								+ " instead of " + getResolvedType(returnedExpression), Severity.Warning));
@@ -1277,73 +1279,6 @@ public void createTypeCompatibilityError(Expression requiredExpression, Expressi
 				Severity.Error));
 	}
 
-	public boolean isCompatible(EolType targetType, EolType valueType) {
-
-		if (targetType.equals(EolNoType.Instance) || valueType.equals(EolNoType.Instance)) {
-			return false;
-		}
-
-		if (valueType instanceof EolUnionType) {
-			for (EolType t : ((EolUnionType)valueType).containedTypes) {
-				while(true) {
-					if (t instanceof EolAnyType) {
-						return false;
-					}
-					if (!t.equals(targetType)) {
-						t = getParentType(t);
-					} else {
-						break;
-					}
-				}
-			}
-			return true;
-		}
-		
-		while (true) {
-			if (!(targetType.equals(valueType)) && !(targetType instanceof EolAnyType)) {
-
-				if (valueType instanceof EolAnyType) {
-					return false;
-				}
-
-				valueType = getParentType(valueType);
-
-			} else if (targetType instanceof EolAnyType) {
-				return true;
-			} else if (valueType instanceof EolCollectionType
-					&& !((((EolCollectionType) targetType).getContentType()) instanceof EolAnyType)) {
-
-				EolType valueContentType = ((EolCollectionType) valueType).getContentType();
-				EolType targetContentType = ((EolCollectionType) targetType).getContentType();
-
-				while (targetContentType instanceof EolCollectionType
-						&& valueContentType instanceof EolCollectionType) {
-					if (targetContentType.equals(valueContentType)) {
-						return isCompatible(((EolCollectionType) targetContentType).getContentType(),
-								((EolCollectionType) valueContentType).getContentType());
-					} else {
-						valueContentType = getParentType(valueContentType);
-						return isCompatible(targetContentType, valueContentType);
-
-					}
-				}
-				while (true) {
-					if (valueContentType instanceof EolAnyType) {
-						return false;
-					}
-					if (!valueContentType.equals(targetContentType)) {
-						valueContentType = getParentType(valueContentType);
-					} else {
-						return true;
-					}
-				}
-			}else {
-				return true;
-			}
-
-		}
-	}
-
 	public boolean canBeCompatible(EolType targetType, EolType valueType) {
 
 		if (targetType == null || valueType == null) {

plugins/org.eclipse.epsilon.eol.engine/src/org/eclipse/epsilon/eol/staticanalyser/types/EolUnionType.java

@@ -31,6 +31,11 @@ public String toString() {
 		return containedTypes.stream().map(t -> t.toString()).collect(Collectors.joining("|"));
 	}
 
+	@Override
+	public List<EolType> getParentTypes(){
+		return new ArrayList<EolType>(containedTypes); 
+	}
+	
 	@Override
 	public List<EolType> getChildrenTypes(){
 		List<EolType> children = new ArrayList<EolType>();

tests/org.eclipse.epsilon.eol.staticanalyser.tests/src/org/eclipse/epsilon/eol/staticanalyser/tests/meta1.ecore

@@ -11,4 +11,5 @@
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="B" eSuperTypes="#//A"/>
   <eClassifiers xsi:type="ecore:EClass" name="C" eSuperTypes="#//A"/>
+  <eClassifiers xsi:type="ecore:EClass" name="D" eSuperTypes="#//B"/>
 </ecore:EPackage>

tests/org.eclipse.epsilon.eol.staticanalyser.tests/src/org/eclipse/epsilon/eol/staticanalyser/tests/meta1.emf

@@ -15,4 +15,7 @@ class B extends A {
 class C extends A {
 }
 
+class D extends B{
+}
+
 

tests/org.eclipse.epsilon.eol.staticanalyser.tests/src/org/eclipse/epsilon/eol/staticanalyser/tests/scripts/operationCallExpressionContextTypeIsParentType.eol

@@ -0,0 +1,6 @@
+model M driver EMF {nsuri='sa'};
+
+var v1:B;
+v1.foo();
+
+operation A foo() : A {return self;}

tests/org.eclipse.epsilon.eol.staticanalyser.tests/src/org/eclipse/epsilon/eol/staticanalyser/tests/scripts/sequenceAssignmentContainedTypeError.eol

@@ -0,0 +1,4 @@
+//!Sequence<Integer> cannot be assigned to Sequence<A>
+model M driver EMF {nsuri='sa'};
+
+var v:Sequence<A> = Sequence{1,2,3};

tests/org.eclipse.epsilon.eol.staticanalyser.tests/src/org/eclipse/epsilon/eol/staticanalyser/tests/scripts/sequenceAssingmentSubtype.eol

@@ -0,0 +1,3 @@
+model M driver EMF {nsuri='sa'};
+
+var v:Sequence<A> = new Sequence<B>;