equal
deleted
inserted
replaced
3743 return cl2; |
3743 return cl2; |
3744 } else if (cl2.isEmpty()) { |
3744 } else if (cl2.isEmpty()) { |
3745 return cl1; |
3745 return cl1; |
3746 } else if (shouldSkip.test(cl1.head, cl2.head)) { |
3746 } else if (shouldSkip.test(cl1.head, cl2.head)) { |
3747 return union(cl1.tail, cl2.tail, shouldSkip).prepend(cl1.head); |
3747 return union(cl1.tail, cl2.tail, shouldSkip).prepend(cl1.head); |
3748 } else if (cl1.head.tsym.precedes(cl2.head.tsym, this)) { |
|
3749 return union(cl1.tail, cl2, shouldSkip).prepend(cl1.head); |
|
3750 } else if (cl2.head.tsym.precedes(cl1.head.tsym, this)) { |
3748 } else if (cl2.head.tsym.precedes(cl1.head.tsym, this)) { |
3751 return union(cl1, cl2.tail, shouldSkip).prepend(cl2.head); |
3749 return union(cl1, cl2.tail, shouldSkip).prepend(cl2.head); |
3752 } else { |
3750 } else { |
3753 // unrelated types |
|
3754 return union(cl1.tail, cl2, shouldSkip).prepend(cl1.head); |
3751 return union(cl1.tail, cl2, shouldSkip).prepend(cl1.head); |
3755 } |
3752 } |
3756 } |
3753 } |
3757 |
3754 |
3758 public List<Type> union(List<Type> cl1, List<Type> cl2) { |
3755 public List<Type> union(List<Type> cl1, List<Type> cl2) { |