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

debug Ausgabe korriegiert!

Browse Source
This commit is contained in:
Martin Plümicke 2015-02-07 15:19:10 +01:00
parent fed7519f84
commit 267083fbb4
1 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1500,6 +1500,42 @@ throws MatchException
continue;
}
if (P.OperatorSmallerExtends()) //PL 15-02-03 Es muessen noch
{
if(P.TA1 instanceof ExtendsWildcardType && P.TA2 instanceof ExtendsWildcardType)
{
inferencelog.debug(" Extends <? Extends");
H.add(new Pair(((WildcardType)P.TA1).GetWildcardType(),((WildcardType)P.TA2).GetWildcardType(), PairOperator.Equal));
bRegel = true;
continue;
}
if(P.TA1 instanceof SuperWildcardType && P.TA2 instanceof SuperWildcardType)
{
inferencelog.debug(" Super <? Super");
H.add(new Pair(((WildcardType)P.TA1).GetWildcardType(),((WildcardType)P.TA2).GetWildcardType(), PairOperator.Equal));
bRegel = true;
continue;
}
if(P.TA1 instanceof ExtendsWildcardType && P.TA2 instanceof SuperWildcardType)
{
inferencelog.debug(" Extends <? Super");
H.add(new Pair(((WildcardType)P.TA1).GetWildcardType(),((WildcardType)P.TA2).GetWildcardType(), PairOperator.Smaller));
bRegel = true;
continue;
}
}
// Subst --> noch zu pr<EFBFBD>fen
if( P.TA1 instanceof TypePlaceholder && P.OperatorEqual() && useSubst) //&& P.TA2 instanceof RefType )
//PL 05-02-09 P.TA@ duerfen auch TypePlaceholder sein
@ -1539,7 +1575,7 @@ throws MatchException
if( !P.bSubst )
{
inferencelog.debug(" ================================");
inferencelog.debug(" SUBSTITUTE: in " + E.elementAt(q).toString() + " alle " + P.TA1.getName() + " durch " + P.TA2.getName());
inferencelog.debug(" SUBSTITUTE: in " + H.elementAt(q).toString() + " alle " + P.TA1.getName() + " durch " + P.TA2.getName());
inferencelog.debug(" ================================");
bRegel = true;
bTempSubst = true;