Merge branch 'unify' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into refactoring

src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java

@@ -410,8 +410,11 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>> {
 			// Case unknown: If a pair fits no other case, then the type unification has failed.
 			// Through application of the rules, every pair should have one of the above forms.
 			// Pairs that do not have one of the aboves form are contradictory.
-			else 
+			else {
-				undefined.add(pair);
+				// If a pair is not defined, the unificiation will fail, so the loop can be stopped here.
+				undefined.add(pair); 
+				break;
+			}
 		}
 		
 		// Filter empty sets or sets that only contain an empty set.
@@ -493,7 +496,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>> {
 	/**
 	 * Cartesian Product Case 2: (a <.? ? ext Theta')
 	 */
-	protected Set<Set<UnifyPair>> unifyCase2(PlaceholderType a, ExtendsType extThetaPrime, IFiniteClosure fc) {
+	private Set<Set<UnifyPair>> unifyCase2(PlaceholderType a, ExtendsType extThetaPrime, IFiniteClosure fc) {
 		Set<Set<UnifyPair>> result = new HashSet<>();
 		
 		UnifyType aPrime = PlaceholderType.freshPlaceholder();
@@ -513,7 +516,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>> {
 	/**
 	 * Cartesian Product Case 3: (a <.? ? sup Theta')
 	 */
-	protected Set<Set<UnifyPair>> unifyCase3(PlaceholderType a, SuperType subThetaPrime, IFiniteClosure fc) {
+	private Set<Set<UnifyPair>> unifyCase3(PlaceholderType a, SuperType subThetaPrime, IFiniteClosure fc) {
 		Set<Set<UnifyPair>> result = new HashSet<>();
 		
 		UnifyType aPrime = PlaceholderType.freshPlaceholder();
@@ -531,22 +534,10 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>> {
 		return result;
 	}
 	
-	/**
-	 * Cartesian Product Case 4: (a <.? Theta')
-	 */
-	protected Set<Set<UnifyPair>> unifyCase4(PlaceholderType a, UnifyType thetaPrime, IFiniteClosure fc) {
-		Set<Set<UnifyPair>> result = new HashSet<>();
-		Set<UnifyPair> resultPrime = new HashSet<>();
-		resultPrime.add(new UnifyPair(a, thetaPrime, PairOperator.EQUALSDOT));
-		result.add(resultPrime);
-
-		return result;
-	}
-	
 	/**
 	 * Cartesian Product Case 5: (Theta <. a)
 	 */
-	protected Set<Set<UnifyPair>> unifyCase5(UnifyType theta, PlaceholderType a, IFiniteClosure fc) {
+	private Set<Set<UnifyPair>> unifyCase5(UnifyType theta, PlaceholderType a, IFiniteClosure fc) {
 		Set<Set<UnifyPair>> result = new HashSet<>();
 		
 		boolean allGen = theta.getTypeParams().size() > 0;
@@ -574,44 +565,11 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>> {
 	
 		return result;
 	}
-	
-	/**
-	 * Cartesian Product Case 6: (? ext Theta <.? a)
-	 */
-	protected Set<Set<UnifyPair>> unifyCase6(ExtendsType extTheta, PlaceholderType a, IFiniteClosure fc) {
-		Set<Set<UnifyPair>> result = new HashSet<>();
-		UnifyType freshTph = PlaceholderType.freshPlaceholder();
-		UnifyType extFreshTph = new ExtendsType(freshTph);
-			
-		Set<UnifyPair> resultPrime = new HashSet<>();
-		resultPrime.add(new UnifyPair(a, extFreshTph, PairOperator.EQUALSDOT));
-		resultPrime.add(new UnifyPair(extTheta.getExtendedType(), freshTph, PairOperator.SMALLERDOT));
-		result.add(resultPrime);
 
-		return result;
-	}
-	
-	/**
-	 * Cartesian Product Case 7: (? sup Theta <.? a)
-	 */
-	protected Set<Set<UnifyPair>> unifyCase7(SuperType supTheta, PlaceholderType a, IFiniteClosure fc) {
-		Set<Set<UnifyPair>> result = new HashSet<>();
-		
-		UnifyType aPrime = PlaceholderType.freshPlaceholder();
-		UnifyType supAPrime = new SuperType(aPrime);
-		UnifyType theta = supTheta.getSuperedType();
-		Set<UnifyPair> resultPrime = new HashSet<>();
-		resultPrime.add(new UnifyPair(a, supAPrime, PairOperator.EQUALSDOT));
-		resultPrime.add(new UnifyPair(aPrime, theta, PairOperator.SMALLERDOT));
-		result.add(resultPrime);
-		
-		return result;
-	}
-	
 	/**
 	 * Cartesian Product Case 8: (Theta <.? a)
 	 */
-	protected Set<Set<UnifyPair>> unifyCase8(UnifyType theta, PlaceholderType a, IFiniteClosure fc) {
+	private Set<Set<UnifyPair>> unifyCase8(UnifyType theta, PlaceholderType a, IFiniteClosure fc) {
 		Set<Set<UnifyPair>> result = new HashSet<>();
 		//for(UnifyType thetaS : fc.grArg(theta)) {
 		Set<UnifyPair> resultPrime = new HashSet<>();

src/de/dhbwstuttgart/typeinference/unify/model/FiniteClosure.java

@@ -26,7 +26,7 @@ public class FiniteClosure implements IFiniteClosure {
 	/**
 	 * A map that maps every typename to the nodes of the inheritance graph that contain a type with that name.
 	 */
-	private HashMap<String, HashSet<Node<UnifyType>>> strInheritanceGraph;
+	private HashMap<String, Set<Node<UnifyType>>> strInheritanceGraph;
 	
 	/**
 	 * The initial pairs of that define the inheritance tree
@@ -251,7 +251,6 @@ public class FiniteClosure implements IFiniteClosure {
 	
 	@Override
 	public Set<UnifyType> grArg(FunNType type) {
-		// TODO ist das richtig?
 		Set<UnifyType> result = new HashSet<UnifyType>();
 		result.add(type);	
         smaller(type).forEach(x -> result.add(new SuperType(x)));
@@ -298,7 +297,6 @@ public class FiniteClosure implements IFiniteClosure {
 	
 	@Override
 	public Set<UnifyType> smArg(FunNType type) {
-		// TODO ist das richtig?
 		Set<UnifyType> result = new HashSet<UnifyType>();
 		result.add(type);	
 		return result;