Wed, 14 Apr 2010 12:31:55 +0100
6939620: Switch to 'complex' diamond inference scheme
Summary: Implement new inference scheme for diamond operator that takes into account type of actual arguments supplied to constructor
Reviewed-by: jjg, darcy
mcimadamore@537 | 1 | /* |
mcimadamore@537 | 2 | * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved. |
mcimadamore@537 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
mcimadamore@537 | 4 | * |
mcimadamore@537 | 5 | * This code is free software; you can redistribute it and/or modify it |
mcimadamore@537 | 6 | * under the terms of the GNU General Public License version 2 only, as |
mcimadamore@537 | 7 | * published by the Free Software Foundation. |
mcimadamore@537 | 8 | * |
mcimadamore@537 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
mcimadamore@537 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
mcimadamore@537 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
mcimadamore@537 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
mcimadamore@537 | 13 | * accompanied this code). |
mcimadamore@537 | 14 | * |
mcimadamore@537 | 15 | * You should have received a copy of the GNU General Public License version |
mcimadamore@537 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
mcimadamore@537 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
mcimadamore@537 | 18 | * |
mcimadamore@537 | 19 | * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, |
mcimadamore@537 | 20 | * CA 95054 USA or visit www.sun.com if you need additional information or |
mcimadamore@537 | 21 | * have any questions. |
mcimadamore@537 | 22 | */ |
mcimadamore@537 | 23 | |
mcimadamore@537 | 24 | /* |
mcimadamore@537 | 25 | * @test |
mcimadamore@537 | 26 | * @bug 6939620 |
mcimadamore@537 | 27 | * |
mcimadamore@537 | 28 | * @summary Switch to 'complex' diamond inference scheme |
mcimadamore@537 | 29 | * @author mcimadamore |
mcimadamore@537 | 30 | * @compile Pos03.java |
mcimadamore@537 | 31 | * @run main Pos03 |
mcimadamore@537 | 32 | * |
mcimadamore@537 | 33 | */ |
mcimadamore@537 | 34 | |
mcimadamore@537 | 35 | public class Pos03<U> { |
mcimadamore@537 | 36 | |
mcimadamore@537 | 37 | class Foo<V> { |
mcimadamore@537 | 38 | Foo(V x) {} |
mcimadamore@537 | 39 | <Z> Foo(V x, Z z) {} |
mcimadamore@537 | 40 | } |
mcimadamore@537 | 41 | |
mcimadamore@537 | 42 | void testSimple() { |
mcimadamore@537 | 43 | Foo<Integer> f1 = new Foo<>(1); |
mcimadamore@537 | 44 | Foo<? extends Integer> f2 = new Foo<>(1); |
mcimadamore@537 | 45 | Foo<?> f3 = new Foo<>(1); |
mcimadamore@537 | 46 | Foo<? super Integer> f4 = new Foo<>(1); |
mcimadamore@537 | 47 | |
mcimadamore@537 | 48 | Foo<Integer> f5 = new Foo<>(1){}; |
mcimadamore@537 | 49 | Foo<? extends Integer> f6 = new Foo<>(1){}; |
mcimadamore@537 | 50 | Foo<?> f7 = new Foo<>(1){}; |
mcimadamore@537 | 51 | Foo<? super Integer> f8 = new Foo<>(1){}; |
mcimadamore@537 | 52 | |
mcimadamore@537 | 53 | Foo<Integer> f9 = new Foo<>(1, ""); |
mcimadamore@537 | 54 | Foo<? extends Integer> f10 = new Foo<>(1, ""); |
mcimadamore@537 | 55 | Foo<?> f11 = new Foo<>(1, ""); |
mcimadamore@537 | 56 | Foo<? super Integer> f12 = new Foo<>(1, ""); |
mcimadamore@537 | 57 | |
mcimadamore@537 | 58 | Foo<Integer> f13 = new Foo<>(1, ""){}; |
mcimadamore@537 | 59 | Foo<? extends Integer> f14 = new Foo<>(1, ""){}; |
mcimadamore@537 | 60 | Foo<?> f15 = new Foo<>(1, ""){}; |
mcimadamore@537 | 61 | Foo<? super Integer> f16 = new Foo<>(1, ""){}; |
mcimadamore@537 | 62 | } |
mcimadamore@537 | 63 | |
mcimadamore@537 | 64 | void testQualified_1() { |
mcimadamore@537 | 65 | Foo<Integer> f1 = new Pos03<U>.Foo<>(1); |
mcimadamore@537 | 66 | Foo<? extends Integer> f2 = new Pos03<U>.Foo<>(1); |
mcimadamore@537 | 67 | Foo<?> f3 = new Pos03<U>.Foo<>(1); |
mcimadamore@537 | 68 | Foo<? super Integer> f4 = new Pos03<U>.Foo<>(1); |
mcimadamore@537 | 69 | |
mcimadamore@537 | 70 | Foo<Integer> f5 = new Pos03<U>.Foo<>(1){}; |
mcimadamore@537 | 71 | Foo<? extends Integer> f6 = new Pos03<U>.Foo<>(1){}; |
mcimadamore@537 | 72 | Foo<?> f7 = new Pos03<U>.Foo<>(1){}; |
mcimadamore@537 | 73 | Foo<? super Integer> f8 = new Pos03<U>.Foo<>(1){}; |
mcimadamore@537 | 74 | |
mcimadamore@537 | 75 | Foo<Integer> f9 = new Pos03<U>.Foo<>(1, ""); |
mcimadamore@537 | 76 | Foo<? extends Integer> f10 = new Pos03<U>.Foo<>(1, ""); |
mcimadamore@537 | 77 | Foo<?> f11 = new Pos03<U>.Foo<>(1, ""); |
mcimadamore@537 | 78 | Foo<? super Integer> f12 = new Pos03<U>.Foo<>(1, ""); |
mcimadamore@537 | 79 | |
mcimadamore@537 | 80 | Foo<Integer> f13 = new Pos03<U>.Foo<>(1, ""){}; |
mcimadamore@537 | 81 | Foo<? extends Integer> f14 = new Pos03<U>.Foo<>(1, ""){}; |
mcimadamore@537 | 82 | Foo<?> f15 = new Pos03<U>.Foo<>(1, ""){}; |
mcimadamore@537 | 83 | Foo<? super Integer> f16 = new Pos03<U>.Foo<>(1, ""){}; |
mcimadamore@537 | 84 | } |
mcimadamore@537 | 85 | |
mcimadamore@537 | 86 | void testQualified_2(Pos03<U> p) { |
mcimadamore@537 | 87 | Foo<Integer> f1 = p.new Foo<>(1); |
mcimadamore@537 | 88 | Foo<? extends Integer> f2 = p.new Foo<>(1); |
mcimadamore@537 | 89 | Foo<?> f3 = p.new Foo<>(1); |
mcimadamore@537 | 90 | Foo<? super Integer> f4 = p.new Foo<>(1); |
mcimadamore@537 | 91 | |
mcimadamore@537 | 92 | Foo<Integer> f5 = p.new Foo<>(1){}; |
mcimadamore@537 | 93 | Foo<? extends Integer> f6 = p.new Foo<>(1){}; |
mcimadamore@537 | 94 | Foo<?> f7 = p.new Foo<>(1){}; |
mcimadamore@537 | 95 | Foo<? super Integer> f8 = p.new Foo<>(1){}; |
mcimadamore@537 | 96 | |
mcimadamore@537 | 97 | Foo<Integer> f9 = p.new Foo<>(1, ""); |
mcimadamore@537 | 98 | Foo<? extends Integer> f10 = p.new Foo<>(1, ""); |
mcimadamore@537 | 99 | Foo<?> f11 = p.new Foo<>(1, ""); |
mcimadamore@537 | 100 | Foo<? super Integer> f12 = p.new Foo<>(1, ""); |
mcimadamore@537 | 101 | |
mcimadamore@537 | 102 | Foo<Integer> f13 = p.new Foo<>(1, ""){}; |
mcimadamore@537 | 103 | Foo<? extends Integer> f14 = p.new Foo<>(1, ""){}; |
mcimadamore@537 | 104 | Foo<?> f15 = p.new Foo<>(1, ""){}; |
mcimadamore@537 | 105 | Foo<? super Integer> f16 = p.new Foo<>(1, ""){}; |
mcimadamore@537 | 106 | } |
mcimadamore@537 | 107 | |
mcimadamore@537 | 108 | public static void main(String[] args) { |
mcimadamore@537 | 109 | Pos03<String> p3 = new Pos03<>(); |
mcimadamore@537 | 110 | p3.testSimple(); |
mcimadamore@537 | 111 | p3.testQualified_1(); |
mcimadamore@537 | 112 | p3.testQualified_2(p3); |
mcimadamore@537 | 113 | } |
mcimadamore@537 | 114 | } |