Thu, 23 Oct 2008 18:29:11 +0100
6557954: Inner class type parameters doesn't get substituted when checking type well-formedness
Summary: Validator.visitTypeApply should substitute all formal typevars with actual parameters
Reviewed-by: jjg
duke@1 | 1 | /* |
duke@1 | 2 | * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. |
duke@1 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
duke@1 | 4 | * |
duke@1 | 5 | * This code is free software; you can redistribute it and/or modify it |
duke@1 | 6 | * under the terms of the GNU General Public License version 2 only, as |
duke@1 | 7 | * published by the Free Software Foundation. |
duke@1 | 8 | * |
duke@1 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
duke@1 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
duke@1 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
duke@1 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
duke@1 | 13 | * accompanied this code). |
duke@1 | 14 | * |
duke@1 | 15 | * You should have received a copy of the GNU General Public License version |
duke@1 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
duke@1 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
duke@1 | 18 | * |
duke@1 | 19 | * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, |
duke@1 | 20 | * CA 95054 USA or visit www.sun.com if you need additional information or |
duke@1 | 21 | * have any questions. |
duke@1 | 22 | */ |
duke@1 | 23 | |
duke@1 | 24 | /* |
duke@1 | 25 | * @test |
duke@1 | 26 | * @bug 6338064 6346249 6340951 6392177 |
duke@1 | 27 | * @summary Tree API: can't determine kind of operator |
duke@1 | 28 | * @author Peter von der Ah\u00e9 |
duke@1 | 29 | * @compile TestOperators.java |
duke@1 | 30 | * @compile -processor TestOperators -proc:only TestOperators.java |
duke@1 | 31 | */ |
duke@1 | 32 | |
duke@1 | 33 | import java.util.Set; |
duke@1 | 34 | import javax.annotation.processing.*; |
duke@1 | 35 | import javax.lang.model.element.*; |
duke@1 | 36 | import javax.lang.model.util.*; |
duke@1 | 37 | import static javax.tools.Diagnostic.Kind.*; |
duke@1 | 38 | |
duke@1 | 39 | import com.sun.source.tree.*; |
duke@1 | 40 | import com.sun.source.util.Trees; |
duke@1 | 41 | |
duke@1 | 42 | import static com.sun.source.tree.Tree.Kind.*; |
duke@1 | 43 | |
duke@1 | 44 | @interface TestMe { |
duke@1 | 45 | Tree.Kind value(); |
duke@1 | 46 | } |
duke@1 | 47 | |
duke@1 | 48 | @SupportedAnnotationTypes("TestMe") |
duke@1 | 49 | public class TestOperators extends AbstractProcessor { |
duke@1 | 50 | |
duke@1 | 51 | @TestMe(POSTFIX_INCREMENT) |
duke@1 | 52 | public int test_POSTFIX_INCREMENT(int i) { |
duke@1 | 53 | return i++; |
duke@1 | 54 | } |
duke@1 | 55 | |
duke@1 | 56 | @TestMe(POSTFIX_DECREMENT) |
duke@1 | 57 | public int test_POSTFIX_DECREMENT(int i) { |
duke@1 | 58 | return i--; |
duke@1 | 59 | } |
duke@1 | 60 | |
duke@1 | 61 | @TestMe(PREFIX_INCREMENT) |
duke@1 | 62 | public int test_PREFIX_INCREMENT(int i) { |
duke@1 | 63 | return ++i; |
duke@1 | 64 | } |
duke@1 | 65 | |
duke@1 | 66 | @TestMe(PREFIX_DECREMENT) |
duke@1 | 67 | public int test_PREFIX_DECREMENT(int i) { |
duke@1 | 68 | return --i; |
duke@1 | 69 | } |
duke@1 | 70 | |
duke@1 | 71 | @TestMe(UNARY_PLUS) |
duke@1 | 72 | public int test_UNARY_PLUS(int i) { |
duke@1 | 73 | return +i; |
duke@1 | 74 | } |
duke@1 | 75 | |
duke@1 | 76 | @TestMe(UNARY_MINUS) |
duke@1 | 77 | public int test_UNARY_MINUS(int i) { |
duke@1 | 78 | return -i; |
duke@1 | 79 | } |
duke@1 | 80 | |
duke@1 | 81 | @TestMe(BITWISE_COMPLEMENT) |
duke@1 | 82 | public int test_BITWISE_COMPLEMENT(int i) { |
duke@1 | 83 | return ~i; |
duke@1 | 84 | } |
duke@1 | 85 | |
duke@1 | 86 | @TestMe(LOGICAL_COMPLEMENT) |
duke@1 | 87 | public boolean test_LOGICAL_COMPLEMENT(boolean b) { |
duke@1 | 88 | return !b; |
duke@1 | 89 | } |
duke@1 | 90 | |
duke@1 | 91 | @TestMe(MULTIPLY) |
duke@1 | 92 | public int test_MULTIPLY(int i, int j) { |
duke@1 | 93 | return i * j; |
duke@1 | 94 | } |
duke@1 | 95 | |
duke@1 | 96 | @TestMe(DIVIDE) |
duke@1 | 97 | public int test_DIVIDE(int i, int j) { |
duke@1 | 98 | return i / j; |
duke@1 | 99 | } |
duke@1 | 100 | |
duke@1 | 101 | @TestMe(REMAINDER) |
duke@1 | 102 | public int test_REMAINDER(int i, int j) { |
duke@1 | 103 | return i % j; |
duke@1 | 104 | } |
duke@1 | 105 | |
duke@1 | 106 | @TestMe(PLUS) |
duke@1 | 107 | public int test_PLUS(int i, int j) { |
duke@1 | 108 | return i + j; |
duke@1 | 109 | } |
duke@1 | 110 | |
duke@1 | 111 | @TestMe(MINUS) |
duke@1 | 112 | public int test_MINUS(int i, int j) { |
duke@1 | 113 | return i - j; |
duke@1 | 114 | } |
duke@1 | 115 | |
duke@1 | 116 | @TestMe(LEFT_SHIFT) |
duke@1 | 117 | public int test_LEFT_SHIFT(int i, int j) { |
duke@1 | 118 | return i << j; |
duke@1 | 119 | } |
duke@1 | 120 | |
duke@1 | 121 | @TestMe(RIGHT_SHIFT) |
duke@1 | 122 | public int test_RIGHT_SHIFT(int i, int j) { |
duke@1 | 123 | return i >> j; |
duke@1 | 124 | } |
duke@1 | 125 | |
duke@1 | 126 | @TestMe(UNSIGNED_RIGHT_SHIFT) |
duke@1 | 127 | public int test_UNSIGNED_RIGHT_SHIFT(int i, int j) { |
duke@1 | 128 | return i >>> j; |
duke@1 | 129 | } |
duke@1 | 130 | |
duke@1 | 131 | @TestMe(LESS_THAN) |
duke@1 | 132 | public boolean test_LESS_THAN(int i, int j) { |
duke@1 | 133 | return i < j; |
duke@1 | 134 | } |
duke@1 | 135 | |
duke@1 | 136 | @TestMe(GREATER_THAN) |
duke@1 | 137 | public boolean test_GREATER_THAN(int i, int j) { |
duke@1 | 138 | return i > j; |
duke@1 | 139 | } |
duke@1 | 140 | |
duke@1 | 141 | @TestMe(LESS_THAN_EQUAL) |
duke@1 | 142 | public boolean test_LESS_THAN_EQUAL(int i, int j) { |
duke@1 | 143 | return i <= j; |
duke@1 | 144 | } |
duke@1 | 145 | |
duke@1 | 146 | @TestMe(GREATER_THAN_EQUAL) |
duke@1 | 147 | public boolean test_GREATER_THAN_EQUAL(int i, int j) { |
duke@1 | 148 | return i >= j; |
duke@1 | 149 | } |
duke@1 | 150 | |
duke@1 | 151 | @TestMe(EQUAL_TO) |
duke@1 | 152 | public boolean test_EQUAL_TO(int i, int j) { |
duke@1 | 153 | return i == j; |
duke@1 | 154 | } |
duke@1 | 155 | |
duke@1 | 156 | @TestMe(NOT_EQUAL_TO) |
duke@1 | 157 | public boolean test_NOT_EQUAL_TO(int i, int j) { |
duke@1 | 158 | return i != j; |
duke@1 | 159 | } |
duke@1 | 160 | |
duke@1 | 161 | @TestMe(AND) |
duke@1 | 162 | public boolean test_AND(boolean a, boolean b) { |
duke@1 | 163 | return a & b; |
duke@1 | 164 | } |
duke@1 | 165 | |
duke@1 | 166 | @TestMe(XOR) |
duke@1 | 167 | public boolean test_XOR(boolean a, boolean b) { |
duke@1 | 168 | return a ^ b; |
duke@1 | 169 | } |
duke@1 | 170 | |
duke@1 | 171 | @TestMe(OR) |
duke@1 | 172 | public boolean test_OR(boolean a, boolean b) { |
duke@1 | 173 | return a | b; |
duke@1 | 174 | } |
duke@1 | 175 | |
duke@1 | 176 | @TestMe(CONDITIONAL_AND) |
duke@1 | 177 | public boolean test_CONDITIONAL_AND(boolean a, boolean b) { |
duke@1 | 178 | return a && b; |
duke@1 | 179 | } |
duke@1 | 180 | |
duke@1 | 181 | @TestMe(CONDITIONAL_OR) |
duke@1 | 182 | public boolean test_CONDITIONAL_OR(boolean a, boolean b) { |
duke@1 | 183 | return a || b; |
duke@1 | 184 | } |
duke@1 | 185 | |
duke@1 | 186 | @TestMe(MULTIPLY_ASSIGNMENT) |
duke@1 | 187 | public int test_MULTIPLY_ASSIGNMENT(int i, int j) { |
duke@1 | 188 | return i *= j; |
duke@1 | 189 | } |
duke@1 | 190 | |
duke@1 | 191 | @TestMe(DIVIDE_ASSIGNMENT) |
duke@1 | 192 | public int test_DIVIDE_ASSIGNMENT(int i, int j) { |
duke@1 | 193 | return i /= j; |
duke@1 | 194 | } |
duke@1 | 195 | |
duke@1 | 196 | @TestMe(REMAINDER_ASSIGNMENT) |
duke@1 | 197 | public int test_REMAINDER_ASSIGNMENT(int i, int j) { |
duke@1 | 198 | return i %= j; |
duke@1 | 199 | } |
duke@1 | 200 | |
duke@1 | 201 | @TestMe(PLUS_ASSIGNMENT) |
duke@1 | 202 | public int test_PLUS_ASSIGNMENT(int i, int j) { |
duke@1 | 203 | return i += j; |
duke@1 | 204 | } |
duke@1 | 205 | |
duke@1 | 206 | @TestMe(MINUS_ASSIGNMENT) |
duke@1 | 207 | public int test_MINUS_ASSIGNMENT(int i, int j) { |
duke@1 | 208 | return i -= j; |
duke@1 | 209 | } |
duke@1 | 210 | |
duke@1 | 211 | @TestMe(LEFT_SHIFT_ASSIGNMENT) |
duke@1 | 212 | public int test_LEFT_SHIFT_ASSIGNMENT(int i, int j) { |
duke@1 | 213 | return i <<= j; |
duke@1 | 214 | } |
duke@1 | 215 | |
duke@1 | 216 | @TestMe(RIGHT_SHIFT_ASSIGNMENT) |
duke@1 | 217 | public int test_RIGHT_SHIFT_ASSIGNMENT(int i, int j) { |
duke@1 | 218 | return i >>= j; |
duke@1 | 219 | } |
duke@1 | 220 | |
duke@1 | 221 | @TestMe(UNSIGNED_RIGHT_SHIFT_ASSIGNMENT) |
duke@1 | 222 | public int test_UNSIGNED_RIGHT_SHIFT_ASSIGNMENT(int i, int j) { |
duke@1 | 223 | return i >>>= j; |
duke@1 | 224 | } |
duke@1 | 225 | |
duke@1 | 226 | @TestMe(AND_ASSIGNMENT) |
duke@1 | 227 | public boolean test_AND_ASSIGNMENT(boolean a, boolean b) { |
duke@1 | 228 | return a &= b; |
duke@1 | 229 | } |
duke@1 | 230 | |
duke@1 | 231 | @TestMe(XOR_ASSIGNMENT) |
duke@1 | 232 | public boolean test_XOR_ASSIGNMENT(boolean a, boolean b) { |
duke@1 | 233 | return a ^= b; |
duke@1 | 234 | } |
duke@1 | 235 | |
duke@1 | 236 | @TestMe(OR_ASSIGNMENT) |
duke@1 | 237 | public boolean test_OR_ASSIGNMENT(boolean a, boolean b) { |
duke@1 | 238 | return a |= b; |
duke@1 | 239 | } |
duke@1 | 240 | |
duke@1 | 241 | @TestMe(INT_LITERAL) |
duke@1 | 242 | public Object test_INT_LITERAL() { |
duke@1 | 243 | return 0; |
duke@1 | 244 | } |
duke@1 | 245 | |
duke@1 | 246 | @TestMe(LONG_LITERAL) |
duke@1 | 247 | public Object test_LONG_LITERAL() { |
duke@1 | 248 | return 0L; |
duke@1 | 249 | } |
duke@1 | 250 | |
duke@1 | 251 | @TestMe(FLOAT_LITERAL) |
duke@1 | 252 | public Object test_FLOAT_LITERAL() { |
duke@1 | 253 | return 0.0F; |
duke@1 | 254 | } |
duke@1 | 255 | |
duke@1 | 256 | @TestMe(DOUBLE_LITERAL) |
duke@1 | 257 | public Object test_DOUBLE_LITERAL() { |
duke@1 | 258 | return 0.0; |
duke@1 | 259 | } |
duke@1 | 260 | |
duke@1 | 261 | @TestMe(BOOLEAN_LITERAL) |
duke@1 | 262 | public Object test_BOOLEAN_LITERAL() { |
duke@1 | 263 | return true; |
duke@1 | 264 | } |
duke@1 | 265 | |
duke@1 | 266 | @TestMe(CHAR_LITERAL) |
duke@1 | 267 | public Object test_CHAR_LITERAL() { |
duke@1 | 268 | return 'a'; |
duke@1 | 269 | } |
duke@1 | 270 | |
duke@1 | 271 | @TestMe(STRING_LITERAL) |
duke@1 | 272 | public Object test_STRING_LITERAL() { |
duke@1 | 273 | return "a"; |
duke@1 | 274 | } |
duke@1 | 275 | |
duke@1 | 276 | @TestMe(NULL_LITERAL) |
duke@1 | 277 | public Object test_NULL_LITERAL() { |
duke@1 | 278 | return null; |
duke@1 | 279 | } |
duke@1 | 280 | |
duke@1 | 281 | @TestMe(UNBOUNDED_WILDCARD) |
duke@1 | 282 | public Set<?> test_UNBOUNDED_WILDCARD() { |
duke@1 | 283 | return null; |
duke@1 | 284 | } |
duke@1 | 285 | |
duke@1 | 286 | @TestMe(EXTENDS_WILDCARD) |
duke@1 | 287 | public Set<? extends Number> test_EXTENDS_WILDCARD() { |
duke@1 | 288 | return null; |
duke@1 | 289 | } |
duke@1 | 290 | |
duke@1 | 291 | @TestMe(SUPER_WILDCARD) |
duke@1 | 292 | public Set<? super Number> test_SUPER_WILDCARD() { |
duke@1 | 293 | return null; |
duke@1 | 294 | } |
duke@1 | 295 | |
duke@1 | 296 | public boolean process(Set<? extends TypeElement> annotations, |
duke@1 | 297 | RoundEnvironment roundEnvironment) |
duke@1 | 298 | { |
duke@1 | 299 | final Trees trees = Trees.instance(processingEnv); |
duke@1 | 300 | final Messager log = processingEnv.getMessager(); |
duke@1 | 301 | final Elements elements = processingEnv.getElementUtils(); |
duke@1 | 302 | class Scan extends ElementScanner6<Void,Void> { |
duke@1 | 303 | @Override |
duke@1 | 304 | public Void visitExecutable(ExecutableElement e, Void p) { |
duke@1 | 305 | Object debug = e; // info for exception handler |
duke@1 | 306 | try { |
duke@1 | 307 | TestMe info = e.getAnnotation(TestMe.class); |
duke@1 | 308 | if (info == null) |
duke@1 | 309 | return null; |
duke@1 | 310 | |
duke@1 | 311 | Tree.Kind kind = info.value(); |
duke@1 | 312 | MethodTree node = trees.getTree(e); |
duke@1 | 313 | debug = node; |
duke@1 | 314 | Tree testNode; |
duke@1 | 315 | switch (kind) { |
duke@1 | 316 | case UNBOUNDED_WILDCARD: |
duke@1 | 317 | case EXTENDS_WILDCARD: |
duke@1 | 318 | case SUPER_WILDCARD: |
duke@1 | 319 | ParameterizedTypeTree typeTree; |
duke@1 | 320 | typeTree = (ParameterizedTypeTree) node.getReturnType(); |
duke@1 | 321 | testNode = typeTree.getTypeArguments().get(0); |
duke@1 | 322 | break; |
duke@1 | 323 | default: |
duke@1 | 324 | ReturnTree returnNode; |
duke@1 | 325 | returnNode = (ReturnTree) node.getBody().getStatements().get(0); |
duke@1 | 326 | testNode = returnNode.getExpression(); |
duke@1 | 327 | } |
duke@1 | 328 | if (testNode.getKind() != kind) { |
duke@1 | 329 | log.printMessage(ERROR, testNode.getKind() + " != " + kind, e); |
duke@1 | 330 | throw new AssertionError(testNode); |
duke@1 | 331 | } |
duke@1 | 332 | System.err.format("OK: %32s %s%n", kind, testNode); |
duke@1 | 333 | } catch (Error ex) { |
duke@1 | 334 | System.err.println("Error while looking at " + debug); |
duke@1 | 335 | throw ex; |
duke@1 | 336 | } |
duke@1 | 337 | return null; |
duke@1 | 338 | } |
duke@1 | 339 | } |
duke@1 | 340 | Scan scan = new Scan(); |
duke@1 | 341 | for (Element e : roundEnvironment.getRootElements()) { |
duke@1 | 342 | scan.scan(e); |
duke@1 | 343 | } |
duke@1 | 344 | return true; |
duke@1 | 345 | } |
duke@1 | 346 | |
duke@1 | 347 | } |