Thu, 10 Oct 2013 20:12:08 -0400
8008762: Type annotation on inner class in anonymous class show up as regular type annotations
8015257: type annotation with TYPE_USE and FIELD attributed differently if repeated.
8013409: test failures for type annotations
Summary: Fixes to address some problems in type annotations
Reviewed-by: jfranck, jjg
jjg@1521 | 1 | /* |
darcy@1534 | 2 | * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. |
jjg@1521 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
jjg@1521 | 4 | * |
jjg@1521 | 5 | * This code is free software; you can redistribute it and/or modify it |
jjg@1521 | 6 | * under the terms of the GNU General Public License version 2 only, as |
jjg@1521 | 7 | * published by the Free Software Foundation. |
jjg@1521 | 8 | * |
jjg@1521 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
jjg@1521 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
jjg@1521 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
jjg@1521 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
jjg@1521 | 13 | * accompanied this code). |
jjg@1521 | 14 | * |
jjg@1521 | 15 | * You should have received a copy of the GNU General Public License version |
jjg@1521 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
jjg@1521 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
jjg@1521 | 18 | * |
jjg@1521 | 19 | * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
jjg@1521 | 20 | * or visit www.oracle.com if you need additional information or have any |
jjg@1521 | 21 | * questions. |
jjg@1521 | 22 | */ |
jjg@1521 | 23 | |
jjg@1521 | 24 | import static com.sun.tools.classfile.TypeAnnotation.TargetType.*; |
jjg@1521 | 25 | |
jjg@1521 | 26 | /* |
jjg@1521 | 27 | * @test |
jjg@1521 | 28 | * @summary Test that the examples from the manual are stored as expected |
jjg@1521 | 29 | * @compile -g Driver.java ReferenceInfoUtil.java FromSpecification.java |
jjg@1521 | 30 | * @run main Driver FromSpecification |
jjg@1521 | 31 | */ |
jjg@1521 | 32 | public class FromSpecification { |
jjg@1521 | 33 | |
jjg@1521 | 34 | @TADescriptions({ |
jjg@1521 | 35 | @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER, paramIndex = 0), |
jjg@1521 | 36 | @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER, |
jjg@1521 | 37 | genericLocation = {3, 0}, paramIndex = 0), |
jjg@1521 | 38 | @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER, |
jjg@1521 | 39 | genericLocation = {3, 0, 2, 0}, paramIndex = 0), |
jjg@1521 | 40 | @TADescription(annotation = "TD", type = METHOD_FORMAL_PARAMETER, |
jjg@1521 | 41 | genericLocation = {3, 1}, paramIndex = 0), |
jjg@1521 | 42 | @TADescription(annotation = "TE", type = METHOD_FORMAL_PARAMETER, |
jjg@1521 | 43 | genericLocation = {3, 1, 3, 0}, paramIndex = 0) |
jjg@1521 | 44 | }) |
jjg@1521 | 45 | public String testSpec1() { |
jjg@1521 | 46 | return "void test(@TA Map<@TB ? extends @TC String, @TD List<@TE Object>> a) { }"; |
jjg@1521 | 47 | } |
jjg@1521 | 48 | |
jjg@1521 | 49 | @TADescriptions({ |
jjg@1521 | 50 | @TADescription(annotation = "TF", type = METHOD_FORMAL_PARAMETER, paramIndex = 0), |
jjg@1521 | 51 | @TADescription(annotation = "TG", type = METHOD_FORMAL_PARAMETER, |
jjg@1521 | 52 | genericLocation = {0, 0}, paramIndex = 0), |
jjg@1521 | 53 | @TADescription(annotation = "TH", type = METHOD_FORMAL_PARAMETER, |
jjg@1521 | 54 | genericLocation = {0, 0, 0, 0}, paramIndex = 0), |
jjg@1521 | 55 | @TADescription(annotation = "TI", type = METHOD_FORMAL_PARAMETER, |
jjg@1521 | 56 | genericLocation = {0, 0, 0, 0, 0, 0}, paramIndex = 0) |
jjg@1521 | 57 | }) |
jjg@1521 | 58 | public String testSpec2() { |
jjg@1521 | 59 | return "void test(@TI String @TF [] @TG [] @TH [] a) { }"; |
jjg@1521 | 60 | } |
jjg@1521 | 61 | |
jjg@1521 | 62 | // Note first "1, 0" for top-level class Test. |
jjg@1521 | 63 | @TADescriptions({ |
jjg@1521 | 64 | @TADescription(annotation = "TJ", type = METHOD_FORMAL_PARAMETER, |
jjg@1521 | 65 | genericLocation = {1, 0, 1, 0, 1, 0, 1, 0}, paramIndex = 0), |
jjg@1521 | 66 | @TADescription(annotation = "TK", type = METHOD_FORMAL_PARAMETER, |
jjg@1521 | 67 | genericLocation = {1, 0, 1, 0, 1, 0}, paramIndex = 0), |
jjg@1521 | 68 | @TADescription(annotation = "TL", type = METHOD_FORMAL_PARAMETER, |
jjg@1521 | 69 | genericLocation = {1, 0, 1, 0}, paramIndex = 0), |
jjg@1521 | 70 | @TADescription(annotation = "TM", type = METHOD_FORMAL_PARAMETER, |
jjg@1521 | 71 | genericLocation = {1, 0}, paramIndex = 0) |
jjg@1521 | 72 | }) |
jjg@1521 | 73 | public String testSpec3() { |
jjg@1521 | 74 | return "class Test { class O1 { class O2 { class O3 { class NestedStatic {} } } }" + |
jjg@1521 | 75 | "void test(@TM O1.@TL O2.@TK O3.@TJ NestedStatic a) { } }"; |
jjg@1521 | 76 | } |
jjg@1521 | 77 | |
jjg@1521 | 78 | @TADescriptions({ |
jjg@1521 | 79 | @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER, paramIndex = 0), |
jjg@1521 | 80 | @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER, |
jjg@1521 | 81 | genericLocation = {3, 0}, paramIndex = 0), |
jjg@1521 | 82 | @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER, |
jjg@1521 | 83 | genericLocation = {3, 0, 3, 0}, paramIndex = 0), |
jjg@1521 | 84 | @TADescription(annotation = "TD", type = METHOD_FORMAL_PARAMETER, |
jjg@1521 | 85 | genericLocation = {3, 0, 3, 0, 0, 0}, paramIndex = 0), |
jjg@1521 | 86 | @TADescription(annotation = "TE", type = METHOD_FORMAL_PARAMETER, |
jjg@1521 | 87 | genericLocation = {3, 0, 3, 0, 0, 0, 0, 0}, paramIndex = 0), |
jjg@1521 | 88 | @TADescription(annotation = "TF", type = METHOD_FORMAL_PARAMETER, |
jjg@1521 | 89 | genericLocation = {3, 0, 3, 0, 0, 0, 0, 0, 0, 0}, paramIndex = 0), |
jjg@1521 | 90 | @TADescription(annotation = "TG", type = METHOD_FORMAL_PARAMETER, |
jjg@1521 | 91 | genericLocation = {3, 1}, paramIndex = 0), |
jjg@1521 | 92 | @TADescription(annotation = "TH", type = METHOD_FORMAL_PARAMETER, |
jjg@1521 | 93 | genericLocation = {3, 1, 3, 0}, paramIndex = 0) |
jjg@1521 | 94 | }) |
jjg@1521 | 95 | public String testSpec4() { |
jjg@1521 | 96 | return "void test(@TA Map<@TB Comparable<@TF Object @TC [] @TD [] @TE []>, @TG List<@TH String>> a) { }"; |
jjg@1521 | 97 | } |
jjg@1521 | 98 | |
jjg@1521 | 99 | // Note first "1, 0" for top-level class Test. |
jjg@1521 | 100 | @TADescriptions({ |
jjg@1521 | 101 | @TADescription(annotation = "TA", type = METHOD_FORMAL_PARAMETER, |
jjg@1521 | 102 | genericLocation = {1, 0, 1, 0, 1, 0, 1, 0}, paramIndex = 0), |
jjg@1521 | 103 | @TADescription(annotation = "TB", type = METHOD_FORMAL_PARAMETER, |
jjg@1521 | 104 | genericLocation = {1, 0, 1, 0, 1, 0, 1, 0, 3, 0}, paramIndex = 0), |
jjg@1521 | 105 | @TADescription(annotation = "TC", type = METHOD_FORMAL_PARAMETER, |
jjg@1521 | 106 | genericLocation = {1, 0, 1, 0, 1, 0, 1, 0, 3, 1}, paramIndex = 0), |
jjg@1521 | 107 | @TADescription(annotation = "TD", type = METHOD_FORMAL_PARAMETER, |
jjg@1521 | 108 | genericLocation = {1, 0, 1, 0, 1, 0}, paramIndex = 0), |
jjg@1521 | 109 | @TADescription(annotation = "TE", type = METHOD_FORMAL_PARAMETER, |
jjg@1521 | 110 | genericLocation = {1, 0, 1, 0}, paramIndex = 0), |
jjg@1521 | 111 | @TADescription(annotation = "TF", type = METHOD_FORMAL_PARAMETER, |
jjg@1521 | 112 | genericLocation = {1, 0, 1, 0, 3, 0}, paramIndex = 0), |
jjg@1521 | 113 | @TADescription(annotation = "TG", type = METHOD_FORMAL_PARAMETER, |
jjg@1521 | 114 | genericLocation = {1, 0, 1, 0, 3, 1}, paramIndex = 0), |
jjg@1521 | 115 | @TADescription(annotation = "TH", type = METHOD_FORMAL_PARAMETER, |
jjg@1521 | 116 | genericLocation = {1, 0}, paramIndex = 0) |
jjg@1521 | 117 | }) |
jjg@1521 | 118 | public String testSpec5() { |
jjg@1521 | 119 | return "class Test { class O1 { class O2<A, B> { class O3 { class Nested<X, Y> {} } } }" + |
jjg@1521 | 120 | "void test(@TH O1.@TE O2<@TF String, @TG String>.@TD O3.@TA Nested<@TB String, @TC String> a) { } }"; |
jjg@1521 | 121 | } |
jjg@1521 | 122 | } |