equal
deleted
inserted
replaced
637 * messages. |
637 * messages. |
638 */ |
638 */ |
639 public static class FunctionDescriptorLookupError extends RuntimeException { |
639 public static class FunctionDescriptorLookupError extends RuntimeException { |
640 private static final long serialVersionUID = 0; |
640 private static final long serialVersionUID = 0; |
641 |
641 |
642 JCDiagnostic diagnostic; |
642 transient JCDiagnostic diagnostic; |
643 |
643 |
644 FunctionDescriptorLookupError() { |
644 FunctionDescriptorLookupError() { |
645 this.diagnostic = null; |
645 this.diagnostic = null; |
646 } |
646 } |
647 |
647 |
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) { |
5000 public static abstract class SignatureGenerator { |
4997 public static abstract class SignatureGenerator { |
5001 |
4998 |
5002 public static class InvalidSignatureException extends RuntimeException { |
4999 public static class InvalidSignatureException extends RuntimeException { |
5003 private static final long serialVersionUID = 0; |
5000 private static final long serialVersionUID = 0; |
5004 |
5001 |
5005 private final Type type; |
5002 private final transient Type type; |
5006 |
5003 |
5007 InvalidSignatureException(Type type) { |
5004 InvalidSignatureException(Type type) { |
5008 this.type = type; |
5005 this.type = type; |
5009 } |
5006 } |
5010 |
5007 |