From 0b680f831dfd73ffbf10e333fc628d46386c181c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Pl=C3=BCmicke?= <pl@dhbw.de>
Date: Thu, 22 Mar 2018 20:40:22 +0100
Subject: [PATCH] 	modified:  
 src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java 	modified:  
 src/de/dhbwstuttgart/typeinference/unify/model/UnifyPair.java

---
 .../typeinference/unify/TypeUnifyTask.java    | 24 ++++++++++++++-----
 .../typeinference/unify/model/UnifyPair.java  |  9 ++++++-
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java b/src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
index 24f16bc8..c848a068 100644
--- a/src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
+++ b/src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
@@ -350,7 +350,9 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 			a_next = nextSetasList.iterator().next();
 		}
 		*/
-		if (nextSetasList.iterator().next().iterator().next().getLhsType().getName().equals("D") && nextSetasList.size()>1) 
+		if (!nextSetasList.iterator().hasNext())
+			System.out.print("");
+		if (nextSetasList.iterator().next().stream().filter(x -> x.getLhsType().getName().equals("D")).findFirst().isPresent() && nextSetasList.size()>1) 
 			System.out.print("");
 		while (nextSetasList.size() > 0) {  //(nextSetasList.size() != 0) {
 			 Set<UnifyPair> a = nextSetasList.remove(0);
@@ -388,8 +390,10 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 			else {
 				result.addAll(computeCartesianRecursive(elems, remainingSets, eq, fc, parallel)); 
 			}
-
+			
 			if (!result.isEmpty() && !isUndefinedPairSetSet(result)) {
+				if (nextSetasList.iterator().hasNext() && nextSetasList.iterator().next().stream().filter(x -> x.getLhsType().getName().equals("D")).findFirst().isPresent() && nextSetasList.size()>1) 
+					System.out.print("");
 				Iterator<Set<UnifyPair>> nextSetasListIt = new ArrayList<Set<UnifyPair>>(nextSetasList).iterator(); 
 				if (variance == 1) {
 					while (nextSetasListIt.hasNext()) {
@@ -802,10 +806,18 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 							resultPrime.add(new UnifyPair(freshTphs.get(i), theta.getTypeParams().get(i), PairOperator.SMALLERDOTWC));
 						}
 						
-						if(allGen)
-							resultPrime.add(new UnifyPair(a, theta, PairOperator.EQUALSDOT));
-						else 
-							resultPrime.add(new UnifyPair(a, theta.setTypeParams(new TypeParams(freshTphs.toArray(new UnifyType[0]))), PairOperator.EQUALSDOT));
+						if(allGen) {
+							UnifyPair up = new UnifyPair(a, theta, PairOperator.EQUALSDOT);
+							Iterator<UnifyType> upit = up.getRhsType().getTypeParams().iterator();
+							while (upit.hasNext()) ((PlaceholderType)upit.next()).setVariance(a.getVariance());
+							resultPrime.add(up);
+						}
+						else {
+							UnifyPair up = new UnifyPair(a, theta.setTypeParams(new TypeParams(freshTphs.toArray(new UnifyType[0]))), PairOperator.EQUALSDOT);
+							Iterator<UnifyType> upit = up.getRhsType().getTypeParams().iterator();
+							while (upit.hasNext()) ((PlaceholderType)upit.next()).setVariance(a.getVariance());
+							resultPrime.add(up);
+						}
 						resultPrime.addAll(substitutionSet);
 						//writeLog("Substitution: " + substitutionSet.toString());
 						resultPrime = resultPrime.stream().map(x -> { x.setVariance(variance); return x;}).collect(Collectors.toCollection(HashSet::new));
diff --git a/src/de/dhbwstuttgart/typeinference/unify/model/UnifyPair.java b/src/de/dhbwstuttgart/typeinference/unify/model/UnifyPair.java
index e57c5e42..098ff946 100644
--- a/src/de/dhbwstuttgart/typeinference/unify/model/UnifyPair.java
+++ b/src/de/dhbwstuttgart/typeinference/unify/model/UnifyPair.java
@@ -137,7 +137,14 @@ public class UnifyPair {
 	
 	@Override
 	public String toString() {
-		return "(" + lhs + " " + pairOp + " " + rhs + ", " + variance + ")";
+		String ret = "";
+		if (lhs instanceof PlaceholderType) {
+			ret = new Integer(((PlaceholderType)lhs).getVariance()).toString();
+		}
+		if (rhs instanceof PlaceholderType) {
+			ret = ret + ", " + new Integer(((PlaceholderType)rhs).getVariance()).toString();
+		}
+		return "(" + lhs + " " + pairOp + " " + rhs + ", " + ret + ")";
 	}
 
 	/*