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

Fuer TPH <. Ty' hinzugefuegt: ? ext Ty <. Ty'

Browse Source
This commit is contained in:
Martin Plümicke 2015-03-12 12:29:54 +01:00
parent 8cc1c79c67
commit 385423092a
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/de/dhbwstuttgart/typeinference/unify/Unify.java
View File

@ -226,10 +226,11 @@ public class Unify
smaller1elemente = smaller0(p_fc_TA1_new, fc_tto); //Von Menge 2 kopiert und smaller1 durch smaller0 ersetzt, Luar 07-08-08
}
for(Type smele : smaller1elemente)
for(ObjectType smele : smaller1elemente)
{
smallers.add(smele);
//smallers.add(new ExtendsWildcardType(smele.getOffset(), smele).clone()); //Auskommentiert luar 07-08-08
smallers.add(new ExtendsWildcardType(smele.getOffset(), smele).clone()); //Auskommentiert luar 07-08-08
//wieder einkommentiert PL 15-03-11
}
//Ende
@ -278,14 +279,16 @@ public class Unify
//aus {ty <. ty'} {? extends ty <. ty'} erzeugen //angefuegt PL 15-03-03
//DIES IST NICHT RICHTIG GETESTET, ES KOENNTE SEIN, DASS DAS KART. PRODUKT FALSCH GEBILDET WIRD.
Stream<Vector<Pair>> strextergMenge1 =
ergMenge1.stream().map(v ->
v.stream().map(pa ->
new Pair(pa.getTA1Copy(), new ExtendsWildcardType(pa.getTA2Copy().getOffset(), (ObjectType)pa.getTA2Copy()), pa.GetOperator(), pa.bSubst)
).collect(Vector::new, Vector::add, Vector::addAll));
Vector<Vector<Pair>> extergMenge1 = strextergMenge1.collect(Vector::new, Vector::add, Vector::addAll);
ergMenge1.addAll(extergMenge1);
//DIES MUEESTE DURCH smallers.add(new ExtendsWildcardType(smele.getOffset(), smele).clone()); weiter ober erledigt sein.
//PL 15-03-11
//Stream<Vector<Pair>> strextergMenge1 =
// ergMenge1.stream().map(v ->
// v.stream().map(pa ->
// new Pair(pa.getTA1Copy(), new ExtendsWildcardType(pa.getTA2Copy().getOffset(), (ObjectType)pa.getTA2Copy()), pa.GetOperator(), pa.bSubst)
// ).collect(Vector::new, Vector::add, Vector::addAll));
//
// Vector<Vector<Pair>> extergMenge1 = strextergMenge1.collect(Vector::new, Vector::add, Vector::addAll);
// ergMenge1.addAll(extergMenge1);
cartProduktSets.add(ergMenge1);
}
else if(p.OperatorSmaller() && p.TA2 instanceof GenericTypeVar)