i21017/JavaCompilerCore
1
0
Fork 0
forked from JavaTX/JavaCompilerCore
Code Pull Requests Activity

In der FC_TTO werden keine T <. T Constraints mehr aufgenommen

Browse Source
This commit is contained in:
JanUlrich 2014-10-07 09:20:35 +02:00
parent 0fc7e18935
commit 37923779b1
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/de/dhbwstuttgart/syntaxtree/SourceFile.java
View File

@ -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++ )

3
src/de/dhbwstuttgart/typeinference/ConstraintsSet.java
View File

@ -57,7 +57,4 @@ public class ConstraintsSet implements Iterable<OderConstraint>{
constraint.filterWrongConstraints(unify); constraint.filterWrongConstraints(unify);
} }
} }
} }

1
src/de/dhbwstuttgart/typeinference/JavaCodeResult.java
View File

@ -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{