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

? ext/super TPH <?/= RefType/GenType und RefType/GenType <?/= ? ext/super TPH eingefuegt nicht alle Faelle getestet

Browse Source
This commit is contained in:
Martin Plümicke 2015-02-08 19:19:30 +01:00
parent 267083fbb4
commit 7a61324c9f
1 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1376,6 +1376,25 @@ throws MatchException
//erledigt 15-02-03 //erledigt 15-02-03
if(P.OperatorEqual()) if(P.OperatorEqual())
{ {
//PL 15-02-08 bisher mit keinem Beispiel getestet
if(P.TA1 instanceof WildcardType && ((WildcardType)P.TA1).GetWildcardType() instanceof TypePlaceholder
&& (P.TA2 instanceof GenericTypeVar || P.TA2 instanceof RefType))
{
H.add(new Pair(((WildcardType)P.TA1).GetWildcardType(),P.TA2, PairOperator.Equal));
bRegel = true;
continue;
}
//PL 15-02-08 bisher mit keinem Beispiel getestet
if((P.TA1 instanceof GenericTypeVar || P.TA1 instanceof RefType)
&& (P.TA2 instanceof WildcardType && ((WildcardType)P.TA2).GetWildcardType() instanceof TypePlaceholder))
{
H.add(new Pair(((WildcardType)P.TA1).GetWildcardType(),P.TA2, PairOperator.Equal));
bRegel = true;
continue;
}
//wenn noetig extends-wildcards entfernen PL 15-02-03 //wenn noetig extends-wildcards entfernen PL 15-02-03
//korrekt da P.OperatorEqual() //korrekt da P.OperatorEqual()
@ -1500,7 +1519,7 @@ throws MatchException
continue; continue;
} }
if (P.OperatorSmallerExtends()) //PL 15-02-03 Es muessen noch if (P.OperatorSmallerExtends()) //PL 15-02-03 Es muessen noch alle Fälle betrachtet werden.
{ {
if(P.TA1 instanceof ExtendsWildcardType && P.TA2 instanceof ExtendsWildcardType) if(P.TA1 instanceof ExtendsWildcardType && P.TA2 instanceof ExtendsWildcardType)
{ {
@ -1534,6 +1553,24 @@ throws MatchException
continue; continue;
} }
//PL 15-02-08
if(P.TA1 instanceof WildcardType && ((WildcardType)P.TA1).GetWildcardType() instanceof TypePlaceholder
&& (P.TA2 instanceof GenericTypeVar || P.TA2 instanceof RefType))
{
H.add(new Pair(((WildcardType)P.TA1).GetWildcardType(),P.TA2, PairOperator.Equal));
bRegel = true;
continue;
}
//PL 15-02-08 bisher mit keinem Beispiel getestet
if((P.TA1 instanceof GenericTypeVar || P.TA1 instanceof RefType)
&& (P.TA2 instanceof WildcardType && ((WildcardType)P.TA2).GetWildcardType() instanceof TypePlaceholder))
{
H.add(new Pair(((WildcardType)P.TA1).GetWildcardType(),P.TA2, PairOperator.Equal));
bRegel = true;
continue;
}
} }
// Subst --> noch zu pr<EFBFBD>fen // Subst --> noch zu pr<EFBFBD>fen