Tue, 11 Aug 2009 01:13:14 +0100
6521805: Regression: JDK5/JDK6 javac allows write access to outer class reference
Summary: javac should warn/complain about identifiers with the same name as synthetic symbol
Reviewed-by: jjg
duke@1 | 1 | /* |
xdono@229 | 2 | * Copyright 1997-2009 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. Sun designates this |
duke@1 | 8 | * particular file as subject to the "Classpath" exception as provided |
duke@1 | 9 | * by Sun in the LICENSE file that accompanied this code. |
duke@1 | 10 | * |
duke@1 | 11 | * This code is distributed in the hope that it will be useful, but WITHOUT |
duke@1 | 12 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
duke@1 | 13 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
duke@1 | 14 | * version 2 for more details (a copy is included in the LICENSE file that |
duke@1 | 15 | * accompanied this code). |
duke@1 | 16 | * |
duke@1 | 17 | * You should have received a copy of the GNU General Public License version |
duke@1 | 18 | * 2 along with this work; if not, write to the Free Software Foundation, |
duke@1 | 19 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
duke@1 | 20 | * |
duke@1 | 21 | * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, |
duke@1 | 22 | * CA 95054 USA or visit www.sun.com if you need additional information or |
duke@1 | 23 | * have any questions. |
duke@1 | 24 | */ |
duke@1 | 25 | |
duke@1 | 26 | package com.sun.tools.javadoc; |
duke@1 | 27 | |
duke@1 | 28 | import com.sun.javadoc.*; |
duke@1 | 29 | |
duke@1 | 30 | import static com.sun.javadoc.LanguageVersion.*; |
duke@1 | 31 | |
duke@1 | 32 | import com.sun.tools.javac.code.Symbol; |
duke@1 | 33 | import com.sun.tools.javac.code.Symbol.ClassSymbol; |
duke@1 | 34 | import com.sun.tools.javac.code.Type; |
duke@1 | 35 | import com.sun.tools.javac.code.Type.ClassType; |
duke@1 | 36 | import com.sun.tools.javac.code.Type.TypeVar; |
duke@1 | 37 | import com.sun.tools.javac.code.Type.ArrayType; |
duke@1 | 38 | import com.sun.tools.javac.code.Types; |
duke@1 | 39 | import com.sun.tools.javac.util.List; |
duke@1 | 40 | |
duke@1 | 41 | import static com.sun.tools.javac.code.TypeTags.*; |
duke@1 | 42 | |
duke@1 | 43 | |
duke@1 | 44 | public class TypeMaker { |
duke@1 | 45 | |
duke@1 | 46 | public static com.sun.javadoc.Type getType(DocEnv env, Type t) { |
duke@1 | 47 | return getType(env, t, true); |
duke@1 | 48 | } |
duke@1 | 49 | |
duke@1 | 50 | /** |
duke@1 | 51 | * @param errToClassDoc if true, ERROR type results in a ClassDoc; |
duke@1 | 52 | * false preserves legacy behavior |
duke@1 | 53 | */ |
jjg@198 | 54 | @SuppressWarnings("fallthrough") |
duke@1 | 55 | public static com.sun.javadoc.Type getType(DocEnv env, Type t, |
duke@1 | 56 | boolean errToClassDoc) { |
duke@1 | 57 | if (env.legacyDoclet) { |
duke@1 | 58 | t = env.types.erasure(t); |
duke@1 | 59 | } |
duke@1 | 60 | switch (t.tag) { |
duke@1 | 61 | case CLASS: |
duke@1 | 62 | if (ClassDocImpl.isGeneric((ClassSymbol)t.tsym)) { |
duke@1 | 63 | return env.getParameterizedType((ClassType)t); |
duke@1 | 64 | } else { |
duke@1 | 65 | return env.getClassDoc((ClassSymbol)t.tsym); |
duke@1 | 66 | } |
duke@1 | 67 | case WILDCARD: |
duke@1 | 68 | Type.WildcardType a = (Type.WildcardType)t; |
duke@1 | 69 | return new WildcardTypeImpl(env, a); |
duke@1 | 70 | case TYPEVAR: return new TypeVariableImpl(env, (TypeVar)t); |
duke@1 | 71 | case ARRAY: return new ArrayTypeImpl(env, t); |
duke@1 | 72 | case BYTE: return PrimitiveType.byteType; |
duke@1 | 73 | case CHAR: return PrimitiveType.charType; |
duke@1 | 74 | case SHORT: return PrimitiveType.shortType; |
duke@1 | 75 | case INT: return PrimitiveType.intType; |
duke@1 | 76 | case LONG: return PrimitiveType.longType; |
duke@1 | 77 | case FLOAT: return PrimitiveType.floatType; |
duke@1 | 78 | case DOUBLE: return PrimitiveType.doubleType; |
duke@1 | 79 | case BOOLEAN: return PrimitiveType.booleanType; |
duke@1 | 80 | case VOID: return PrimitiveType.voidType; |
duke@1 | 81 | case ERROR: |
duke@1 | 82 | if (errToClassDoc) |
duke@1 | 83 | return env.getClassDoc((ClassSymbol)t.tsym); |
duke@1 | 84 | // FALLTHRU |
duke@1 | 85 | default: |
duke@1 | 86 | return new PrimitiveType(t.tsym.getQualifiedName().toString()); |
duke@1 | 87 | } |
duke@1 | 88 | } |
duke@1 | 89 | |
duke@1 | 90 | /** |
duke@1 | 91 | * Convert a list of javac types into an array of javadoc types. |
duke@1 | 92 | */ |
duke@1 | 93 | public static com.sun.javadoc.Type[] getTypes(DocEnv env, List<Type> ts) { |
duke@1 | 94 | return getTypes(env, ts, new com.sun.javadoc.Type[ts.length()]); |
duke@1 | 95 | } |
duke@1 | 96 | |
duke@1 | 97 | /** |
duke@1 | 98 | * Like the above version, but use and return the array given. |
duke@1 | 99 | */ |
duke@1 | 100 | public static com.sun.javadoc.Type[] getTypes(DocEnv env, List<Type> ts, |
duke@1 | 101 | com.sun.javadoc.Type res[]) { |
duke@1 | 102 | int i = 0; |
duke@1 | 103 | for (Type t : ts) { |
duke@1 | 104 | res[i++] = getType(env, t); |
duke@1 | 105 | } |
duke@1 | 106 | return res; |
duke@1 | 107 | } |
duke@1 | 108 | |
duke@1 | 109 | public static String getTypeName(Type t, boolean full) { |
duke@1 | 110 | switch (t.tag) { |
duke@1 | 111 | case ARRAY: |
duke@1 | 112 | StringBuffer dimension = new StringBuffer(); |
duke@1 | 113 | while (t.tag == ARRAY) { |
duke@1 | 114 | dimension = dimension.append("[]"); |
duke@1 | 115 | t = ((ArrayType)t).elemtype; |
duke@1 | 116 | } |
duke@1 | 117 | return getTypeName(t, full) + dimension; |
duke@1 | 118 | case CLASS: |
duke@1 | 119 | return ClassDocImpl.getClassName((ClassSymbol)t.tsym, full); |
duke@1 | 120 | default: |
duke@1 | 121 | return t.tsym.getQualifiedName().toString(); |
duke@1 | 122 | } |
duke@1 | 123 | } |
duke@1 | 124 | |
duke@1 | 125 | /** |
duke@1 | 126 | * Return the string representation of a type use. Bounds of type |
duke@1 | 127 | * variables are not included; bounds of wildcard types are. |
duke@1 | 128 | * Class names are qualified if "full" is true. |
duke@1 | 129 | */ |
duke@1 | 130 | static String getTypeString(DocEnv env, Type t, boolean full) { |
duke@1 | 131 | switch (t.tag) { |
duke@1 | 132 | case ARRAY: |
duke@1 | 133 | StringBuffer dimension = new StringBuffer(); |
duke@1 | 134 | while (t.tag == ARRAY) { |
duke@1 | 135 | dimension = dimension.append("[]"); |
duke@1 | 136 | t = env.types.elemtype(t); |
duke@1 | 137 | } |
duke@1 | 138 | return getTypeString(env, t, full) + dimension; |
duke@1 | 139 | case CLASS: |
duke@1 | 140 | return ParameterizedTypeImpl. |
duke@1 | 141 | parameterizedTypeToString(env, (ClassType)t, full); |
duke@1 | 142 | case WILDCARD: |
duke@1 | 143 | Type.WildcardType a = (Type.WildcardType)t; |
duke@1 | 144 | return WildcardTypeImpl.wildcardTypeToString(env, a, full); |
duke@1 | 145 | default: |
duke@1 | 146 | return t.tsym.getQualifiedName().toString(); |
duke@1 | 147 | } |
duke@1 | 148 | } |
duke@1 | 149 | |
duke@1 | 150 | /** |
duke@1 | 151 | * Return the formal type parameters of a class or method as an |
duke@1 | 152 | * angle-bracketed string. Each parameter is a type variable with |
duke@1 | 153 | * optional bounds. Class names are qualified if "full" is true. |
duke@1 | 154 | * Return "" if there are no type parameters or we're hiding generics. |
duke@1 | 155 | */ |
duke@1 | 156 | static String typeParametersString(DocEnv env, Symbol sym, boolean full) { |
duke@1 | 157 | if (env.legacyDoclet || sym.type.getTypeArguments().isEmpty()) { |
duke@1 | 158 | return ""; |
duke@1 | 159 | } |
duke@1 | 160 | StringBuffer s = new StringBuffer(); |
duke@1 | 161 | for (Type t : sym.type.getTypeArguments()) { |
duke@1 | 162 | s.append(s.length() == 0 ? "<" : ", "); |
duke@1 | 163 | s.append(TypeVariableImpl.typeVarToString(env, (TypeVar)t, full)); |
duke@1 | 164 | } |
duke@1 | 165 | s.append(">"); |
duke@1 | 166 | return s.toString(); |
duke@1 | 167 | } |
duke@1 | 168 | |
duke@1 | 169 | /** |
duke@1 | 170 | * Return the actual type arguments of a parameterized type as an |
duke@1 | 171 | * angle-bracketed string. Class name are qualified if "full" is true. |
duke@1 | 172 | * Return "" if there are no type arguments or we're hiding generics. |
duke@1 | 173 | */ |
duke@1 | 174 | static String typeArgumentsString(DocEnv env, ClassType cl, boolean full) { |
duke@1 | 175 | if (env.legacyDoclet || cl.getTypeArguments().isEmpty()) { |
duke@1 | 176 | return ""; |
duke@1 | 177 | } |
duke@1 | 178 | StringBuffer s = new StringBuffer(); |
duke@1 | 179 | for (Type t : cl.getTypeArguments()) { |
duke@1 | 180 | s.append(s.length() == 0 ? "<" : ", "); |
duke@1 | 181 | s.append(getTypeString(env, t, full)); |
duke@1 | 182 | } |
duke@1 | 183 | s.append(">"); |
duke@1 | 184 | return s.toString(); |
duke@1 | 185 | } |
duke@1 | 186 | |
duke@1 | 187 | |
duke@1 | 188 | private static class ArrayTypeImpl implements com.sun.javadoc.Type { |
duke@1 | 189 | |
duke@1 | 190 | Type arrayType; |
duke@1 | 191 | |
duke@1 | 192 | DocEnv env; |
duke@1 | 193 | |
duke@1 | 194 | ArrayTypeImpl(DocEnv env, Type arrayType) { |
duke@1 | 195 | this.env = env; |
duke@1 | 196 | this.arrayType = arrayType; |
duke@1 | 197 | } |
duke@1 | 198 | |
duke@1 | 199 | private com.sun.javadoc.Type skipArraysCache = null; |
duke@1 | 200 | |
duke@1 | 201 | private com.sun.javadoc.Type skipArrays() { |
duke@1 | 202 | if (skipArraysCache == null) { |
duke@1 | 203 | Type t; |
duke@1 | 204 | for (t = arrayType; t.tag == ARRAY; t = env.types.elemtype(t)) { } |
duke@1 | 205 | skipArraysCache = TypeMaker.getType(env, t); |
duke@1 | 206 | } |
duke@1 | 207 | return skipArraysCache; |
duke@1 | 208 | } |
duke@1 | 209 | |
duke@1 | 210 | /** |
duke@1 | 211 | * Return the type's dimension information, as a string. |
duke@1 | 212 | * <p> |
duke@1 | 213 | * For example, a two dimensional array of String returns '[][]'. |
duke@1 | 214 | */ |
duke@1 | 215 | public String dimension() { |
duke@1 | 216 | StringBuffer dimension = new StringBuffer(); |
duke@1 | 217 | for (Type t = arrayType; t.tag == ARRAY; t = env.types.elemtype(t)) { |
duke@1 | 218 | dimension = dimension.append("[]"); |
duke@1 | 219 | } |
duke@1 | 220 | return dimension.toString(); |
duke@1 | 221 | } |
duke@1 | 222 | |
duke@1 | 223 | /** |
duke@1 | 224 | * Return unqualified name of type excluding any dimension information. |
duke@1 | 225 | * <p> |
duke@1 | 226 | * For example, a two dimensional array of String returns 'String'. |
duke@1 | 227 | */ |
duke@1 | 228 | public String typeName() { |
duke@1 | 229 | return skipArrays().typeName(); |
duke@1 | 230 | } |
duke@1 | 231 | |
duke@1 | 232 | /** |
duke@1 | 233 | * Return qualified name of type excluding any dimension information. |
duke@1 | 234 | *<p> |
duke@1 | 235 | * For example, a two dimensional array of String |
duke@1 | 236 | * returns 'java.lang.String'. |
duke@1 | 237 | */ |
duke@1 | 238 | public String qualifiedTypeName() { |
duke@1 | 239 | return skipArrays().qualifiedTypeName(); |
duke@1 | 240 | } |
duke@1 | 241 | |
duke@1 | 242 | /** |
duke@1 | 243 | * Return the simple name of this type excluding any dimension information. |
duke@1 | 244 | */ |
duke@1 | 245 | public String simpleTypeName() { |
duke@1 | 246 | return skipArrays().simpleTypeName(); |
duke@1 | 247 | } |
duke@1 | 248 | |
duke@1 | 249 | /** |
duke@1 | 250 | * Return this type as a class. Array dimensions are ignored. |
duke@1 | 251 | * |
duke@1 | 252 | * @return a ClassDocImpl if the type is a Class. |
duke@1 | 253 | * Return null if it is a primitive type.. |
duke@1 | 254 | */ |
duke@1 | 255 | public ClassDoc asClassDoc() { |
duke@1 | 256 | return skipArrays().asClassDoc(); |
duke@1 | 257 | } |
duke@1 | 258 | |
duke@1 | 259 | /** |
duke@1 | 260 | * Return this type as a <code>ParameterizedType</code> if it |
duke@1 | 261 | * represents a parameterized type. Array dimensions are ignored. |
duke@1 | 262 | */ |
duke@1 | 263 | public ParameterizedType asParameterizedType() { |
duke@1 | 264 | return skipArrays().asParameterizedType(); |
duke@1 | 265 | } |
duke@1 | 266 | |
duke@1 | 267 | /** |
duke@1 | 268 | * Return this type as a <code>TypeVariable</code> if it represents |
duke@1 | 269 | * a type variable. Array dimensions are ignored. |
duke@1 | 270 | */ |
duke@1 | 271 | public TypeVariable asTypeVariable() { |
duke@1 | 272 | return skipArrays().asTypeVariable(); |
duke@1 | 273 | } |
duke@1 | 274 | |
duke@1 | 275 | /** |
duke@1 | 276 | * Return null, as there are no arrays of wildcard types. |
duke@1 | 277 | */ |
duke@1 | 278 | public WildcardType asWildcardType() { |
duke@1 | 279 | return null; |
duke@1 | 280 | } |
duke@1 | 281 | |
duke@1 | 282 | /** |
duke@1 | 283 | * Return this type as an <code>AnnotationTypeDoc</code> if it |
duke@1 | 284 | * represents an annotation type. Array dimensions are ignored. |
duke@1 | 285 | */ |
duke@1 | 286 | public AnnotationTypeDoc asAnnotationTypeDoc() { |
duke@1 | 287 | return skipArrays().asAnnotationTypeDoc(); |
duke@1 | 288 | } |
duke@1 | 289 | |
duke@1 | 290 | /** |
duke@1 | 291 | * Return true if this is an array of a primitive type. |
duke@1 | 292 | */ |
duke@1 | 293 | public boolean isPrimitive() { |
duke@1 | 294 | return skipArrays().isPrimitive(); |
duke@1 | 295 | } |
duke@1 | 296 | |
duke@1 | 297 | /** |
duke@1 | 298 | * Return a string representation of the type. |
duke@1 | 299 | * |
duke@1 | 300 | * Return name of type including any dimension information. |
duke@1 | 301 | * <p> |
duke@1 | 302 | * For example, a two dimensional array of String returns |
duke@1 | 303 | * <code>String[][]</code>. |
duke@1 | 304 | * |
duke@1 | 305 | * @return name of type including any dimension information. |
duke@1 | 306 | */ |
duke@1 | 307 | public String toString() { |
duke@1 | 308 | return qualifiedTypeName() + dimension(); |
duke@1 | 309 | } |
duke@1 | 310 | } |
duke@1 | 311 | } |