Mercurial > hg > jdk9-shenandoah > langtools
changeset 2887:04ec0526fa3d
8068737: ArrayType prints element type post order
Summary: Rewrote ArrayType.toString
Reviewed-by: jlahoda, ksrini
author | alundblad |
---|---|
date | Tue, 21 Apr 2015 12:10:26 +0200 |
parents | a6ee059ed168 |
children | 39f02f1acda4 |
files | src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java test/tools/javac/tree/ArrayTypeToString.java test/tools/javac/tree/ArrayTypeToString.out |
diffstat | 3 files changed, 91 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java Mon Apr 20 12:45:41 2015 +0300 +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Type.java Tue Apr 21 12:10:26 2015 +0200 @@ -1293,9 +1293,21 @@ @DefinedBy(Api.LANGUAGE_MODEL) public String toString() { StringBuilder sb = new StringBuilder(); - sb.append(elemtype); - appendAnnotationsString(sb, true); - sb.append("[]"); + + // First append root component type + Type t = elemtype; + while (t.getKind() == TypeKind.ARRAY) + t = ((ArrayType) t).getComponentType(); + sb.append(t); + + // then append @Anno[] @Anno[] ... @Anno[] + t = this; + do { + t.appendAnnotationsString(sb, true); + sb.append("[]"); + t = ((ArrayType) t).getComponentType(); + } while (t.getKind() == TypeKind.ARRAY); + return sb.toString(); }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/tree/ArrayTypeToString.java Tue Apr 21 12:10:26 2015 +0200 @@ -0,0 +1,75 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8068737 + * @summary Tests ArrayType.toString with type annotations present + * @build ArrayTypeToString + * @compile/ref=ArrayTypeToString.out -XDrawDiagnostics -processor ArrayTypeToString -proc:only ArrayTypeToString.java + */ + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.util.Set; + +import javax.annotation.processing.AbstractProcessor; +import javax.annotation.processing.RoundEnvironment; +import javax.annotation.processing.SupportedAnnotationTypes; +import javax.annotation.processing.SupportedSourceVersion; +import javax.lang.model.SourceVersion; +import javax.lang.model.element.Element; +import javax.lang.model.element.TypeElement; +import javax.tools.Diagnostic.Kind; + +import com.sun.tools.javac.code.Symbol.VarSymbol; + +@Retention(RetentionPolicy.SOURCE) +@Target({ ElementType.TYPE_USE, ElementType.FIELD }) +@interface Foo { + int value(); +} + +@SupportedAnnotationTypes("Foo") +@SupportedSourceVersion(SourceVersion.RELEASE_9) +public class ArrayTypeToString extends AbstractProcessor { + + @Foo(0) String @Foo(1)[] @Foo(2)[] @Foo(3)[] field; + + public boolean process(Set<? extends TypeElement> tes, RoundEnvironment renv) { + for (TypeElement te : tes) { + for (Element e : renv.getElementsAnnotatedWith(te)) { + String s = ((VarSymbol) e).type.toString(); + + // Normalize output by removing whitespace + s = s.replaceAll("\\s", ""); + + // Expected: "@Foo(0)java.lang.String@Foo(3)[]@Foo(2)[]@Foo(1)[]" + processingEnv.getMessager().printMessage(Kind.NOTE, s); + } + } + return true; + } +}