Merge branch 'master' of github.com:anaelChardan/IMT-Recherche

clementgarbay · Nov 29, 2017 · a58dd50 · a58dd50
2 parents d8c6955 + d288fde
commit a58dd50
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/src/main/java/fr/imt/inference/ExpressionInferer.java b/src/main/java/fr/imt/inference/ExpressionInferer.java
@@ -27,11 +27,7 @@ public Either<String, Type> infer(Expression expression) {
 
             logger.debug("Constraints generated : " + constraintCollection);
 
-            if (rawReturnType instanceof TypeVariable) {
-                return Either.right(result.getOrElse((TypeVariable) rawReturnType, (TypeVariable) rawReturnType));
-            }
-
-            return Either.right(rawReturnType);
+            return Either.right(rawReturnType.applySubstitution(result));
         } catch (
             UnificationMismatchException |
             UnificationFailureException |