From 01dd4e57e63f118f1532257ed424a1febbbee637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Pl=C3=BCmicke?= Date: Tue, 20 Mar 2018 10:14:01 +0100 Subject: [PATCH] modified: src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java modified: src/de/dhbwstuttgart/typeinference/unify/model/OrderingUnifyPair.java Letzte Version bevor MatchUnifyTask --- src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java | 1 + .../typeinference/unify/model/OrderingUnifyPair.java | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java b/src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java index 2f426a46..fb3aa1ab 100644 --- a/src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java +++ b/src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java @@ -320,6 +320,7 @@ public class TypeUnifyTask extends RecursiveTask>> { System.out.print(""); if (variance == 1) { a_next = oup.max(nextSetasList.iterator()); + List> liup = oup.sortedCopy(nextSetasList); } else if (variance == -1) { a_next = oup.min(nextSetasList.iterator()); diff --git a/src/de/dhbwstuttgart/typeinference/unify/model/OrderingUnifyPair.java b/src/de/dhbwstuttgart/typeinference/unify/model/OrderingUnifyPair.java index 0aa99683..55576bf0 100644 --- a/src/de/dhbwstuttgart/typeinference/unify/model/OrderingUnifyPair.java +++ b/src/de/dhbwstuttgart/typeinference/unify/model/OrderingUnifyPair.java @@ -92,6 +92,9 @@ public class OrderingUnifyPair extends Ordering> { .collect(Collectors.toCollection(HashSet::new)); //System.out.println(left.toString()); //Fall 2 und 3 + if (lefteq.iterator().next().getLhsType().getName().equals("AJO")) { + System.out.print(""); + } if (lefteq.size() == 1 && leftle.size() == 1 && righteq.size() == 0 && rightle.size() == 1) { return 1; }