From 6faffdf90ccf39f95672362c096ecf602533b32b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Pl=C3=BCmicke?= Date: Mon, 19 Mar 2018 17:43:27 +0100 Subject: [PATCH] modified: src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java --- .../dhbwstuttgart/typeinference/unify/TypeUnifyTask.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java b/src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java index 45a886c9..2f426a46 100644 --- a/src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java +++ b/src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java @@ -315,9 +315,9 @@ public class TypeUnifyTask extends RecursiveTask>> { int i = 0; byte variance = nextSetasList.iterator().next().iterator().next().getVariance(); Set a_next = null; - if (nextSetasList.iterator().next().iterator().next().getLhsType().getName().equals("D")) - System.out.print(""); if (nextSetasList.size()>1) { + if (nextSetasList.iterator().next().iterator().next().getLhsType().getName().equals("D")) + System.out.print(""); if (variance == 1) { a_next = oup.max(nextSetasList.iterator()); } @@ -331,6 +331,8 @@ public class TypeUnifyTask extends RecursiveTask>> { else { a_next = nextSetasList.iterator().next(); } + if (nextSetasList.iterator().next().iterator().next().getLhsType().getName().equals("D") && nextSetasList.size()>1) + System.out.print(""); while (nextSetasList.size() != 0) { Set a = a_next; //writeLog("nextSet: " + nextSetasList.toString()+ "\n"); @@ -704,6 +706,9 @@ public class TypeUnifyTask extends RecursiveTask>> { * Cartesian product Case 1: (a <. Theta') */ protected Set> unifyCase1(PlaceholderType a, UnifyType thetaPrime, byte variance, IFiniteClosure fc) { + if (a.getName().equals("D")) { + System.out.print(""); + } Set> result = new HashSet<>(); boolean allGen = thetaPrime.getTypeParams().size() > 0;