From 48dc76646bf5bafaf806676e4ee8ce722a4a3b0f Mon Sep 17 00:00:00 2001
From: JanUlrich <andi@michlaustderaffe.de>
Date: Tue, 14 Nov 2017 19:28:46 +0100
Subject: [PATCH] =?UTF-8?q?createPair=20Methode=20entfernen.=20Die=20Gener?=
 =?UTF-8?q?ics=20k=C3=B6nnen=20nicht=20generell=20aufgel=C3=B6st=20werden.?=
 =?UTF-8?q?=20(unvollst=C3=A4ndiger=20Zustand)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constraints/ConstraintsFactory.java       | 70 -------------------
 .../typeinference/typeAlgo/TYPEStmt.java      |  8 +--
 2 files changed, 4 insertions(+), 74 deletions(-)
 delete mode 100644 src/de/dhbwstuttgart/typeinference/constraints/ConstraintsFactory.java

diff --git a/src/de/dhbwstuttgart/typeinference/constraints/ConstraintsFactory.java b/src/de/dhbwstuttgart/typeinference/constraints/ConstraintsFactory.java
deleted file mode 100644
index 043af2104..000000000
--- a/src/de/dhbwstuttgart/typeinference/constraints/ConstraintsFactory.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package de.dhbwstuttgart.typeinference.constraints;
-
-import de.dhbwstuttgart.exceptions.DebugException;
-import de.dhbwstuttgart.syntaxtree.GenericTypeVar;
-import de.dhbwstuttgart.syntaxtree.TypeScope;
-import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
-import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation;
-import de.dhbwstuttgart.typeinference.unify.model.PairOperator;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class ConstraintsFactory {
-
-    /**
-     * Erstellt ein Pair Element für den Unify.
-     * Die Methode löst gleichzeitig GTVs in den Typen t1 und t2 auf.
-     * @param t1
-     * @param t2
-     * @param equalsdot
-     * @param currentScope
-     * @param additionalScope
-     * @param resolver
-     * @return
-     */
-    public static Pair createPair(RefTypeOrTPHOrWildcardOrGeneric t1, RefTypeOrTPHOrWildcardOrGeneric t2,
-                                  PairOperator equalsdot, TypeScope currentScope, TypeScope additionalScope,
-                           GenericsResolver resolver){
-        //Check whether Generics are in the same class and resolve all other generics:
-        return new Pair(checkGeneric(t1, currentScope, additionalScope,resolver),
-                checkGeneric(t2, currentScope,additionalScope, resolver), equalsdot);
-    }
-    public static Pair createPair(RefTypeOrTPHOrWildcardOrGeneric t1,
-                                  RefTypeOrTPHOrWildcardOrGeneric t2, TypeScope currentScope, TypeScope additionalScope,
-                           GenericsResolver resolver){
-        return createPair(t1,t2,PairOperator.SMALLERDOT, currentScope, additionalScope, resolver);
-    }
-
-
-    private static RefTypeOrTPHOrWildcardOrGeneric checkGeneric(RefTypeOrTPHOrWildcardOrGeneric type,
-                                                         TypeScope currentScope, TypeScope additionalScope,
-                                                         GenericsResolver resolver){
-        if(type instanceof GenericRefType){
-            //TODO: Für Generics müssen auch noch Constraints generiert werden
-            for(GenericTypeVar genericTypeVar : currentScope.getGenerics()){
-                if(genericTypeVar.getName().toString().equals(((GenericRefType)type).getName().toString())){
-                    return new RefType(((GenericRefType)type).getName(),type.getOffset());
-                }
-            }
-            //Nicht in den Generics in diesem Kontext enthalten:
-            TypePlaceholder ret = null;
-            for(GenericTypeVar genericTypeVar : additionalScope.getGenerics()){
-                if(genericTypeVar.getName().equals(((GenericRefType)type).getName())){
-                    ret = resolver.resolve(genericTypeVar);
-                }
-            }
-            if(ret == null)
-                throw new DebugException("Der Generic " + ((GenericRefType) type).getName() + " kommt in keine TypeScope vor!");
-            return ret;
-        }else{
-            return type;
-        }
-    }
-
-}
diff --git a/src/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java b/src/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
index 8062e173b..e45f7326c 100644
--- a/src/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
+++ b/src/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
@@ -301,10 +301,10 @@ public class TYPEStmt implements StatementVisitor{
             //}
         }
         RefTypeOrTPHOrWildcardOrGeneric receiverType = new RefType(assumption.getReceiver().getClassName(), params, forMethod.getOffset());
-        methodConstraint.add(ConstraintsFactory.createPair(forMethod.receiver.getType(), receiverType,
-                PairOperator.SMALLERDOT, info.getCurrentTypeScope(), assumption.getTypeScope(), resolver));
-        methodConstraint.add(ConstraintsFactory.createPair(assumption.getReturnType(), forMethod.getType(),
-                PairOperator.EQUALSDOT, info.getCurrentTypeScope(), assumption.getTypeScope(), resolver));
+        methodConstraint.add(new Pair(forMethod.receiver.getType(), receiverType,
+                PairOperator.SMALLERDOT);
+        methodConstraint.add(new Pair(assumption.getReturnType(), forMethod.getType(),
+                PairOperator.EQUALSDOT));
         methodConstraint.addAll(generateParameterConstraints(forMethod, assumption, info, resolver));
         return methodConstraint;
     }