JavaTX/JavaCompilerCore
2
0
Fork 3
Code Issues 94 Pull Requests Actions Packages Projects Releases Wiki Activity

fixed vector

Browse Source
This commit is contained in:
Florian Steurer 2016-05-03 20:44:55 +02:00
parent 84176275be
commit 78794e377a
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -425,9 +425,9 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>> {
protected Set<Set<UnifyPair>> unifyCase1(PlaceholderType a, UnifyType thetaPrime, IFiniteClosure fc) { protected Set<Set<UnifyPair>> unifyCase1(PlaceholderType a, UnifyType thetaPrime, IFiniteClosure fc) {
Set<Set<UnifyPair>> result = new HashSet<>(); Set<Set<UnifyPair>> result = new HashSet<>();
boolean allGen = true; boolean allGen = thetaPrime.getTypeParams().size() > 0;
for(UnifyType t : thetaPrime.getTypeParams()) for(UnifyType t : thetaPrime.getTypeParams())
if(t instanceof PlaceholderType && !((PlaceholderType) t).isGenerated()) { if(!(t instanceof PlaceholderType) || !((PlaceholderType) t).isGenerated()) {
allGen = false; allGen = false;
break; break;
} }
@ -437,7 +437,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>> {
for(UnifyType c : cs) { for(UnifyType c : cs) {
Set<UnifyType> thetaQs = fc.getChildren(c).stream().collect(Collectors.toCollection(HashSet::new)); Set<UnifyType> thetaQs = fc.getChildren(c).stream().collect(Collectors.toCollection(HashSet::new));
thetaQs.add(thetaPrime); //thetaQs.add(thetaPrime);
Set<UnifyType> thetaQPrimes = new HashSet<>(); Set<UnifyType> thetaQPrimes = new HashSet<>();
TypeParams cParams = c.getTypeParams(); TypeParams cParams = c.getTypeParams();
if(cParams.size() == 0) if(cParams.size() == 0)
@ -549,9 +549,9 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>> {
protected Set<Set<UnifyPair>> unifyCase5(UnifyType theta, PlaceholderType a, IFiniteClosure fc) { protected Set<Set<UnifyPair>> unifyCase5(UnifyType theta, PlaceholderType a, IFiniteClosure fc) {
Set<Set<UnifyPair>> result = new HashSet<>(); Set<Set<UnifyPair>> result = new HashSet<>();
boolean allGen = true; boolean allGen = theta.getTypeParams().size() > 0;
for(UnifyType t : theta.getTypeParams()) for(UnifyType t : theta.getTypeParams())
if(t instanceof PlaceholderType && !((PlaceholderType) t).isGenerated()) { if(!(t instanceof PlaceholderType) || !((PlaceholderType) t).isGenerated()) {
allGen = false; allGen = false;
break; break;
} }

7
test/unify/UnifyTest.java
View File

@ -862,13 +862,12 @@ public class UnifyTest {
UnifyType tphT1 = tf.getPlaceholderType("T1"); UnifyType tphT1 = tf.getPlaceholderType("T1");
UnifyType tphT2 = tf.getPlaceholderType("T2"); UnifyType tphT2 = tf.getPlaceholderType("T2");
UnifyType gtv = tf.getSimpleType("gtv"); UnifyType vector = tf.getSimpleType("Vector", "T");
UnifyType vector = tf.getSimpleType("Vector", gtv);
UnifyType vectorE = tf.getSimpleType("Vector", tphT2); UnifyType vectorE = tf.getSimpleType("Vector", tphT2);
UnifyType string = tf.getSimpleType("String"); UnifyType string = tf.getSimpleType("String");
UnifyType vectorString = tf.getSimpleType("Vector", string); UnifyType vectorString = tf.getSimpleType("Vector", string);
fcb.add(vector, vector); fcb.add(vector, tf.getSimpleType("java.lang.Object"));
IFiniteClosure fc = fcb.getFiniteClosure(); IFiniteClosure fc = fcb.getFiniteClosure();
@ -879,7 +878,7 @@ public class UnifyTest {
Set<Set<UnifyPair>> actual = new TypeUnify().unifySequential(eq, fc); Set<Set<UnifyPair>> actual = new TypeUnify().unifySequential(eq, fc);
System.out.println("Test OverloadingVector:"); System.out.println("Test OverloadingVector:");
System.out.println(actual); System.out.println(actual + "\n");
} }
@Test @Test