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@117 | 2 | * Copyright 2003-2008 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.tools.javac.util.Context; |
duke@1 | 29 | import com.sun.tools.javac.util.Position; |
duke@1 | 30 | import com.sun.tools.javac.code.Flags; |
duke@1 | 31 | import com.sun.tools.javac.code.Kinds; |
duke@1 | 32 | import com.sun.tools.javac.code.Symbol.*; |
duke@1 | 33 | import com.sun.tools.javac.comp.MemberEnter; |
duke@1 | 34 | import com.sun.tools.javac.tree.JCTree.*; |
duke@1 | 35 | |
duke@1 | 36 | /** |
duke@1 | 37 | * Javadoc's own memberEnter phase does a few things above and beyond that |
duke@1 | 38 | * done by javac. |
duke@1 | 39 | * @author Neal Gafter |
duke@1 | 40 | */ |
duke@1 | 41 | class JavadocMemberEnter extends MemberEnter { |
duke@1 | 42 | public static JavadocMemberEnter instance0(Context context) { |
duke@1 | 43 | MemberEnter instance = context.get(memberEnterKey); |
duke@1 | 44 | if (instance == null) |
duke@1 | 45 | instance = new JavadocMemberEnter(context); |
duke@1 | 46 | return (JavadocMemberEnter)instance; |
duke@1 | 47 | } |
duke@1 | 48 | |
duke@1 | 49 | public static void preRegister(final Context context) { |
duke@1 | 50 | context.put(memberEnterKey, new Context.Factory<MemberEnter>() { |
duke@1 | 51 | public MemberEnter make() { |
duke@1 | 52 | return new JavadocMemberEnter(context); |
duke@1 | 53 | } |
duke@1 | 54 | }); |
duke@1 | 55 | } |
duke@1 | 56 | |
duke@1 | 57 | final DocEnv docenv; |
duke@1 | 58 | |
duke@1 | 59 | protected JavadocMemberEnter(Context context) { |
duke@1 | 60 | super(context); |
duke@1 | 61 | docenv = DocEnv.instance(context); |
duke@1 | 62 | } |
duke@1 | 63 | |
duke@1 | 64 | public void visitMethodDef(JCMethodDecl tree) { |
duke@1 | 65 | super.visitMethodDef(tree); |
jjg@74 | 66 | MethodSymbol meth = tree.sym; |
duke@1 | 67 | if (meth == null || meth.kind != Kinds.MTH) return; |
duke@1 | 68 | String docComment = env.toplevel.docComments.get(tree); |
duke@1 | 69 | Position.LineMap lineMap = env.toplevel.lineMap; |
duke@1 | 70 | if (meth.isConstructor()) |
duke@1 | 71 | docenv.makeConstructorDoc(meth, docComment, tree, lineMap); |
duke@1 | 72 | else if (isAnnotationTypeElement(meth)) |
duke@1 | 73 | docenv.makeAnnotationTypeElementDoc(meth, docComment, tree, lineMap); |
duke@1 | 74 | else |
duke@1 | 75 | docenv.makeMethodDoc(meth, docComment, tree, lineMap); |
duke@1 | 76 | } |
duke@1 | 77 | |
duke@1 | 78 | public void visitVarDef(JCVariableDecl tree) { |
duke@1 | 79 | super.visitVarDef(tree); |
duke@1 | 80 | if (tree.sym != null && |
duke@1 | 81 | tree.sym.kind == Kinds.VAR && |
duke@1 | 82 | !isParameter(tree.sym)) { |
duke@1 | 83 | String docComment = env.toplevel.docComments.get(tree); |
duke@1 | 84 | Position.LineMap lineMap = env.toplevel.lineMap; |
jjg@74 | 85 | docenv.makeFieldDoc(tree.sym, docComment, tree, lineMap); |
duke@1 | 86 | } |
duke@1 | 87 | } |
duke@1 | 88 | |
duke@1 | 89 | private static boolean isAnnotationTypeElement(MethodSymbol meth) { |
duke@1 | 90 | return ClassDocImpl.isAnnotationType(meth.enclClass()); |
duke@1 | 91 | } |
duke@1 | 92 | |
duke@1 | 93 | private static boolean isParameter(VarSymbol var) { |
duke@1 | 94 | return (var.flags() & Flags.PARAMETER) != 0; |
duke@1 | 95 | } |
duke@1 | 96 | } |