i21023/JavaTXCompilerInJavaTX
2
0
Fork 0
forked from JavaTX/JavaCompilerCore
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
Martin Plümicke 2018-03-19 17:43:27 +01:00
parent f4bc057aff
commit 6faffdf90c
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
View File

@ -315,9 +315,9 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>> {
int i = 0; int i = 0;
byte variance = nextSetasList.iterator().next().iterator().next().getVariance(); byte variance = nextSetasList.iterator().next().iterator().next().getVariance();
Set<UnifyPair> a_next = null; Set<UnifyPair> a_next = null;
if (nextSetasList.iterator().next().iterator().next().getLhsType().getName().equals("D"))
System.out.print("");
if (nextSetasList.size()>1) { if (nextSetasList.size()>1) {
if (nextSetasList.iterator().next().iterator().next().getLhsType().getName().equals("D"))
System.out.print("");
if (variance == 1) { if (variance == 1) {
a_next = oup.max(nextSetasList.iterator()); a_next = oup.max(nextSetasList.iterator());
} }
@ -331,6 +331,8 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>> {
else { else {
a_next = nextSetasList.iterator().next(); 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) { while (nextSetasList.size() != 0) {
Set<UnifyPair> a = a_next; Set<UnifyPair> a = a_next;
//writeLog("nextSet: " + nextSetasList.toString()+ "\n"); //writeLog("nextSet: " + nextSetasList.toString()+ "\n");
@ -704,6 +706,9 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>> {
* Cartesian product Case 1: (a <. Theta') * Cartesian product Case 1: (a <. Theta')
*/ */
protected Set<Set<UnifyPair>> unifyCase1(PlaceholderType a, UnifyType thetaPrime, byte variance, IFiniteClosure fc) { protected Set<Set<UnifyPair>> unifyCase1(PlaceholderType a, UnifyType thetaPrime, byte variance, IFiniteClosure fc) {
if (a.getName().equals("D")) {
System.out.print("");
}
Set<Set<UnifyPair>> result = new HashSet<>(); Set<Set<UnifyPair>> result = new HashSet<>();
boolean allGen = thetaPrime.getTypeParams().size() > 0; boolean allGen = thetaPrime.getTypeParams().size() > 0;