solution for immediate problem in #3548

eclipse-archived · Oct 26, 2012 · 90d2b51 · 90d2b51
1 parent 53c5514
commit 90d2b51
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/typechecker/src/com/redhat/ceylon/compiler/typechecker/model/ProducedType.java b/typechecker/src/com/redhat/ceylon/compiler/typechecker/model/ProducedType.java
@@ -469,6 +469,17 @@ private List<ProducedType> getSupertypes(List<ProducedType> list) {
  List<ProducedType> caseTypes = getCaseTypes();
  if (caseTypes!=null) {
  for (ProducedType t: caseTypes) {
+ boolean already = false;
+ for (ProducedType pt: list) {
+ if (t.getDeclaration() instanceof UnionType ||
+ t.getDeclaration() instanceof IntersectionType ||
+ (t.getDeclaration().equals(pt.getDeclaration()) && 
+ t.isExactly(pt, true))) {
+ already=true;
+ break;
+ }
+ }
+ if (already) continue;
  List<ProducedType> candidates = t.getSupertypes();
  for (ProducedType st: candidates) {
  boolean include = true;

diff --git a/typechecker/test/main/typing/SelfType.ceylon b/typechecker/test/main/typing/SelfType.ceylon
@@ -68,4 +68,9 @@ class SelfTypeEquivalence4() {
  Inv<X> l2 { throw; }
  Inv<Self<X>> l3 = l2;
  @error Inv<X> l4 = l1;
-}
+}
+
+interface Aa {}
+@error interface Bb satisfies Comparable<Bb&Aa> {}
+@error interface Cc satisfies Comparable<Cc|Aa> {}
+@error interface Zz satisfies Comparable<Bb|Cc|Aa> {}