From 4e61ba736d5203b9ed31ea038c1585e7994e7be1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Pl=C3=BCmicke?= <pl@dhbw.de>
Date: Tue, 17 Feb 2015 23:23:02 +0100
Subject: [PATCH]  alle Faelle P.OperatorSmallerExtends eingefuegt

---
 .../typeinference/unify/Unify.java            | 54 +++++++++++++------
 1 file changed, 39 insertions(+), 15 deletions(-)

diff --git a/src/de/dhbwstuttgart/typeinference/unify/Unify.java b/src/de/dhbwstuttgart/typeinference/unify/Unify.java
index 234314eb..5e36d313 100755
--- a/src/de/dhbwstuttgart/typeinference/unify/Unify.java
+++ b/src/de/dhbwstuttgart/typeinference/unify/Unify.java
@@ -1519,14 +1519,25 @@ throws MatchException
                     continue;
                 }
                 
-                if (P.OperatorSmallerExtends())    //PL 15-02-03 Es muessen noch alle Fälle betrachtet werden.  
+                if (P.OperatorSmallerExtends())    //PL 15-02-17 alle eingefuegt  
                 {	
                 	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));
+                		H.add(new Pair(((WildcardType)P.TA1).GetWildcardType(),((WildcardType)P.TA2).GetWildcardType(), PairOperator.Smaller));
+                		bRegel = true;
+                		continue;
+                		
+                	}
+                	
+                	if(!(P.TA1 instanceof WildcardType) && P.TA2 instanceof ExtendsWildcardType)
+                	{                		
+                	
+                		inferencelog.debug("  TA1 <? Extends");
+                    
+                		H.add(new Pair(P.TA1,((WildcardType)P.TA2).GetWildcardType(), PairOperator.Smaller));
                 		bRegel = true;
                 		continue;
                 		
@@ -1537,7 +1548,18 @@ throws MatchException
                 	
                 		inferencelog.debug("  Super <? Super");
                     
-                		H.add(new Pair(((WildcardType)P.TA1).GetWildcardType(),((WildcardType)P.TA2).GetWildcardType(), PairOperator.Equal));
+                		H.add(new Pair(((WildcardType)P.TA2).GetWildcardType(),((WildcardType)P.TA1).GetWildcardType(), PairOperator.Smaller));
+                		bRegel = true;
+                		continue;
+                		
+                	}
+                	
+                	if(!(P.TA1 instanceof WildcardType) && P.TA2 instanceof SuperWildcardType)
+                	{                		
+                	
+                		inferencelog.debug(" TA1 <? Super");
+                    
+                		H.add(new Pair(((WildcardType)P.TA2).GetWildcardType(), P.TA1, PairOperator.Smaller));
                 		bRegel = true;
                 		continue;
                 		
@@ -1548,29 +1570,31 @@ throws MatchException
                 	
                 		inferencelog.debug("  Extends <? Super");
                     
-                		H.add(new Pair(((WildcardType)P.TA1).GetWildcardType(),((WildcardType)P.TA2).GetWildcardType(), PairOperator.Smaller));
+                		H.add(new Pair(((WildcardType)P.TA1).GetWildcardType(),((WildcardType)P.TA2).GetWildcardType(), PairOperator.Equal));
                 		bRegel = true;
                 		continue;
                 		
                 	}
                 	
-                	//PL 15-02-08
-                	if(P.TA1 instanceof WildcardType && ((WildcardType)P.TA1).GetWildcardType() instanceof TypePlaceholder 
-                		&& (P.TA2 instanceof GenericTypeVar || P.TA2 instanceof RefType))
+                	if(P.TA1 instanceof SuperWildcardType && P.TA2 instanceof ExtendsWildcardType)
+                	{                		
+                	
+                		inferencelog.debug("  Super <? Extends");
+                    
+                		H.add(new Pair(((WildcardType)P.TA1).GetWildcardType(),((WildcardType)P.TA2).GetWildcardType(), PairOperator.Equal));
+                		bRegel = true;
+                		continue;
+                		
+                	}
+                	
+                	//PL 15-02-08 angepasst 15-02-17
+                	if(P.TA1 instanceof WildcardType && !(P.TA2 instanceof WildcardType))
                 	{
                 		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�fen