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

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

Browse Source 
modified:   src/de/dhbwstuttgart/typeinference/unify/model/OrderingUnifyPair.java
Letzte Version bevor MatchUnifyTask
This commit is contained in:
Martin Plümicke 2018-03-20 10:14:01 +01:00
parent 6faffdf90c
commit 01dd4e57e6
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -320,6 +320,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>> {
System.out.print(""); System.out.print("");
if (variance == 1) { if (variance == 1) {
a_next = oup.max(nextSetasList.iterator()); a_next = oup.max(nextSetasList.iterator());
List<Set<UnifyPair>> liup = oup.sortedCopy(nextSetasList);
} }
else if (variance == -1) { else if (variance == -1) {
a_next = oup.min(nextSetasList.iterator()); a_next = oup.min(nextSetasList.iterator());

3
src/de/dhbwstuttgart/typeinference/unify/model/OrderingUnifyPair.java
View File

@ -92,6 +92,9 @@ public class OrderingUnifyPair extends Ordering<Set<UnifyPair>> {
.collect(Collectors.toCollection(HashSet::new)); .collect(Collectors.toCollection(HashSet::new));
//System.out.println(left.toString()); //System.out.println(left.toString());
//Fall 2 und 3 //Fall 2 und 3
if (lefteq.iterator().next().getLhsType().getName().equals("AJO")) {
System.out.print("");
}
if (lefteq.size() == 1 && leftle.size() == 1 && righteq.size() == 0 && rightle.size() == 1) { if (lefteq.size() == 1 && leftle.size() == 1 && righteq.size() == 0 && rightle.size() == 1) {
return 1; return 1;
} }