In der FC_TTO werden keine T <. T Constraints mehr aufgenommen
This commit is contained in:
parent
0fc7e18935
commit
37923779b1
@ -310,8 +310,10 @@ public class SourceFile
|
|||||||
// 1. Menge <= in FC aufnehmen --> Iteration ueber alle Klassen
|
// 1. Menge <= in FC aufnehmen --> Iteration ueber alle Klassen
|
||||||
|
|
||||||
for(ClassAssumption cAss : ass.getClassAssumptions()){
|
for(ClassAssumption cAss : ass.getClassAssumptions()){
|
||||||
Pair p = new Pair(cAss.getAssumedClass().getType(), cAss.getAssumedClass().getSuperClass());
|
Type t1 = cAss.getAssumedClass().getType();
|
||||||
vFC.add(p);
|
Type t2 = cAss.getAssumedClass().getType();
|
||||||
|
Pair p = new Pair(t1, t2);
|
||||||
|
if(! t1.equals(t2))vFC.add(p); //Um FC_TTO darf kein T <. T stehen.
|
||||||
}
|
}
|
||||||
|
|
||||||
for( int i = 0; i < KlassenVektor.size(); i++ )
|
for( int i = 0; i < KlassenVektor.size(); i++ )
|
||||||
|
@ -57,7 +57,4 @@ public class ConstraintsSet implements Iterable<OderConstraint>{
|
|||||||
constraint.filterWrongConstraints(unify);
|
constraint.filterWrongConstraints(unify);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -3,7 +3,6 @@ package de.dhbwstuttgart.typeinference;
|
|||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
|
|
||||||
import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
|
import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
|
||||||
import sun.reflect.generics.reflectiveObjects.NotImplementedException;
|
|
||||||
|
|
||||||
public class JavaCodeResult{
|
public class JavaCodeResult{
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user