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

modified: typeinference/unify/TypeUnifyTask.java

Browse Source 
modified:   typeinference/unify/model/UnifyPair.java
This commit is contained in:
Martin Plümicke 2018-03-15 20:47:16 +01:00
parent 7e6dee8e1d
commit 6299086297
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -158,8 +158,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>> {
writeLog("UndefinedPairs; " + undefinedPairs); writeLog("UndefinedPairs; " + undefinedPairs);
Set<Set<UnifyPair>> error = new HashSet<>(); Set<Set<UnifyPair>> error = new HashSet<>();
error.add(undefinedPairs); error.add(undefinedPairs);
//return error; return error;
return new HashSet<>();
} }
/* Up to here, no cartesian products are calculated. /* Up to here, no cartesian products are calculated.
@ -363,10 +362,6 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>> {
else { else {
result.addAll(computeCartesianRecursive(elems, remainingSets, eq, fc, parallel)); result.addAll(computeCartesianRecursive(elems, remainingSets, eq, fc, parallel));
} }
//if (result.size() == 1) {
// System.out.println(result.toString());
// result.remove(result.iterator().next());
//}
if (!result.isEmpty()) { if (!result.isEmpty()) {
if (variance == 1) { if (variance == 1) {
if (a.iterator().next().getLhsType().getName().equals("WL")) if (a.iterator().next().getLhsType().getName().equals("WL"))
@ -400,6 +395,14 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>> {
return result; return result;
} }
protected boolean isUndefinedPairSet(Set<Set<UnifyPair>> s) {
boolean res = true;
if (s.size() ==1) {
s.iterator().next().stream().forEach(x -> { res = res && x.isUndefinedPair(); return; });
return res;
}
}
/** /**
* Checks whether a set of pairs is in solved form. * Checks whether a set of pairs is in solved form.
* @param eqPrimePrime The set of pair * @param eqPrimePrime The set of pair

4
src/de/dhbwstuttgart/typeinference/unify/model/UnifyPair.java
View File

@ -75,6 +75,10 @@ public class UnifyPair {
public void setVariance(byte v) { public void setVariance(byte v) {
variance = v; variance = v;
} }
public boolean isUndefinedPair() {
return undefinedPair;
}
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
if(!(obj instanceof UnifyPair)) if(!(obj instanceof UnifyPair))