author | avstepan |
Mon, 13 Jul 2015 16:57:52 +0400 | |
changeset 31751 | ec251536a004 |
parent 29842 | 826ac2519523 |
child 33360 | d8ef08003d35 |
permissions | -rw-r--r-- |
10 | 1 |
/* |
28455
41245007c074
8066843: Messager.printMessage cannot print multiple errors for same source position
jlahoda
parents:
27224
diff
changeset
|
2 |
* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. |
10 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
5520 | 7 |
* published by the Free Software Foundation. Oracle designates this |
10 | 8 |
* particular file as subject to the "Classpath" exception as provided |
5520 | 9 |
* by Oracle in the LICENSE file that accompanied this code. |
10 | 10 |
* |
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
15 |
* accompanied this code). |
|
16 |
* |
|
17 |
* You should have received a copy of the GNU General Public License version |
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
20 |
* |
|
5520 | 21 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
22 |
* or visit www.oracle.com if you need additional information or have any |
|
23 |
* questions. |
|
10 | 24 |
*/ |
25 |
||
26 |
package com.sun.tools.javac.api; |
|
27 |
||
28 |
import java.io.IOException; |
|
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
29 |
import java.util.HashSet; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
30 |
import java.util.Set; |
12016 | 31 |
|
10 | 32 |
import javax.annotation.processing.ProcessingEnvironment; |
33 |
import javax.lang.model.element.AnnotationMirror; |
|
34 |
import javax.lang.model.element.AnnotationValue; |
|
35 |
import javax.lang.model.element.Element; |
|
17549
65ea6f3b72d9
8009724: Enhance the DocTree API with DocTreePath
jlahoda
parents:
17273
diff
changeset
|
36 |
import javax.lang.model.element.ElementKind; |
10 | 37 |
import javax.lang.model.element.ExecutableElement; |
38 |
import javax.lang.model.element.TypeElement; |
|
39 |
import javax.lang.model.type.DeclaredType; |
|
9599
0996df19ea87
7029150: Project Coin: present union types from the tree API through to javax.lang.model
jjg
parents:
7631
diff
changeset
|
40 |
import javax.lang.model.type.TypeKind; |
10 | 41 |
import javax.lang.model.type.TypeMirror; |
3149 | 42 |
import javax.tools.Diagnostic; |
10 | 43 |
import javax.tools.JavaCompiler; |
44 |
import javax.tools.JavaFileObject; |
|
45 |
||
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
46 |
import com.sun.source.doctree.DocCommentTree; |
17273
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
47 |
import com.sun.source.doctree.DocTree; |
9599
0996df19ea87
7029150: Project Coin: present union types from the tree API through to javax.lang.model
jjg
parents:
7631
diff
changeset
|
48 |
import com.sun.source.tree.CatchTree; |
10 | 49 |
import com.sun.source.tree.CompilationUnitTree; |
50 |
import com.sun.source.tree.Scope; |
|
51 |
import com.sun.source.tree.Tree; |
|
17273
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
52 |
import com.sun.source.util.DocSourcePositions; |
17549
65ea6f3b72d9
8009724: Enhance the DocTree API with DocTreePath
jlahoda
parents:
17273
diff
changeset
|
53 |
import com.sun.source.util.DocTreePath; |
17273
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
54 |
import com.sun.source.util.DocTreeScanner; |
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
55 |
import com.sun.source.util.DocTrees; |
12016 | 56 |
import com.sun.source.util.JavacTask; |
10 | 57 |
import com.sun.source.util.TreePath; |
6590
f745e683da2c
6930507: Symbols for anonymous and local classes made too late for use by java tree API
jjg
parents:
5847
diff
changeset
|
58 |
import com.sun.tools.javac.code.Flags; |
12016 | 59 |
import com.sun.tools.javac.code.Symbol; |
10 | 60 |
import com.sun.tools.javac.code.Symbol.ClassSymbol; |
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
61 |
import com.sun.tools.javac.code.Symbol.MethodSymbol; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
62 |
import com.sun.tools.javac.code.Symbol.PackageSymbol; |
10 | 63 |
import com.sun.tools.javac.code.Symbol.TypeSymbol; |
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
64 |
import com.sun.tools.javac.code.Symbol.VarSymbol; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
65 |
import com.sun.tools.javac.code.Type; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
66 |
import com.sun.tools.javac.code.Type.ArrayType; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
67 |
import com.sun.tools.javac.code.Type.ClassType; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
68 |
import com.sun.tools.javac.code.Type.ErrorType; |
9599
0996df19ea87
7029150: Project Coin: present union types from the tree API through to javax.lang.model
jjg
parents:
7631
diff
changeset
|
69 |
import com.sun.tools.javac.code.Type.UnionClassType; |
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
70 |
import com.sun.tools.javac.code.Types; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
71 |
import com.sun.tools.javac.code.Types.TypeRelation; |
10 | 72 |
import com.sun.tools.javac.comp.Attr; |
73 |
import com.sun.tools.javac.comp.AttrContext; |
|
74 |
import com.sun.tools.javac.comp.Enter; |
|
75 |
import com.sun.tools.javac.comp.Env; |
|
76 |
import com.sun.tools.javac.comp.MemberEnter; |
|
77 |
import com.sun.tools.javac.comp.Resolve; |
|
78 |
import com.sun.tools.javac.model.JavacElements; |
|
14258 | 79 |
import com.sun.tools.javac.processing.JavacProcessingEnvironment; |
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
80 |
import com.sun.tools.javac.tree.DCTree; |
17273
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
81 |
import com.sun.tools.javac.tree.DCTree.DCBlockTag; |
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
82 |
import com.sun.tools.javac.tree.DCTree.DCDocComment; |
17273
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
83 |
import com.sun.tools.javac.tree.DCTree.DCEndPosTree; |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
84 |
import com.sun.tools.javac.tree.DCTree.DCErroneous; |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
85 |
import com.sun.tools.javac.tree.DCTree.DCIdentifier; |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
86 |
import com.sun.tools.javac.tree.DCTree.DCParam; |
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
87 |
import com.sun.tools.javac.tree.DCTree.DCReference; |
17273
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
88 |
import com.sun.tools.javac.tree.DCTree.DCText; |
13077 | 89 |
import com.sun.tools.javac.tree.EndPosTable; |
12016 | 90 |
import com.sun.tools.javac.tree.JCTree; |
10 | 91 |
import com.sun.tools.javac.tree.JCTree.*; |
92 |
import com.sun.tools.javac.tree.TreeCopier; |
|
93 |
import com.sun.tools.javac.tree.TreeInfo; |
|
94 |
import com.sun.tools.javac.tree.TreeMaker; |
|
14952 | 95 |
import com.sun.tools.javac.util.Abort; |
10631
d9914010b902
7090249: IllegalStateException from Trees.getScope when called from JSR 199
jjg
parents:
9599
diff
changeset
|
96 |
import com.sun.tools.javac.util.Assert; |
10 | 97 |
import com.sun.tools.javac.util.Context; |
26266
2d24bda701dc
8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents:
26264
diff
changeset
|
98 |
import com.sun.tools.javac.util.DefinedBy; |
2d24bda701dc
8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents:
26264
diff
changeset
|
99 |
import com.sun.tools.javac.util.DefinedBy.Api; |
3149 | 100 |
import com.sun.tools.javac.util.JCDiagnostic; |
28455
41245007c074
8066843: Messager.printMessage cannot print multiple errors for same source position
jlahoda
parents:
27224
diff
changeset
|
101 |
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticFlag; |
10 | 102 |
import com.sun.tools.javac.util.List; |
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
103 |
import com.sun.tools.javac.util.ListBuffer; |
10 | 104 |
import com.sun.tools.javac.util.Log; |
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
105 |
import com.sun.tools.javac.util.Name; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
106 |
import com.sun.tools.javac.util.Names; |
10 | 107 |
import com.sun.tools.javac.util.Pair; |
17273
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
108 |
import com.sun.tools.javac.util.Position; |
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26266
diff
changeset
|
109 |
import static com.sun.tools.javac.code.Kinds.Kind.*; |
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
110 |
import static com.sun.tools.javac.code.TypeTag.*; |
10 | 111 |
|
112 |
/** |
|
113 |
* Provides an implementation of Trees. |
|
114 |
* |
|
5847
1908176fd6e3
6944312: Potential rebranding issues in openjdk/langtools repository sources
jjg
parents:
5520
diff
changeset
|
115 |
* <p><b>This is NOT part of any supported API. |
10 | 116 |
* If you write code that depends on this, you do so at your own |
117 |
* risk. This code and its internal interfaces are subject to change |
|
118 |
* or deletion without notice.</b></p> |
|
119 |
* |
|
120 |
* @author Peter von der Ahé |
|
121 |
*/ |
|
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
122 |
public class JavacTrees extends DocTrees { |
10 | 123 |
|
6717 | 124 |
// in a world of a single context per compilation, these would all be final |
125 |
private Resolve resolve; |
|
126 |
private Enter enter; |
|
127 |
private Log log; |
|
128 |
private MemberEnter memberEnter; |
|
129 |
private Attr attr; |
|
130 |
private TreeMaker treeMaker; |
|
131 |
private JavacElements elements; |
|
132 |
private JavacTaskImpl javacTaskImpl; |
|
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
133 |
private Names names; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
134 |
private Types types; |
10 | 135 |
|
12016 | 136 |
// called reflectively from Trees.instance(CompilationTask task) |
10 | 137 |
public static JavacTrees instance(JavaCompiler.CompilationTask task) { |
14548
aa687b312c97
8001098: Provide a simple light-weight "plug-in" mechanism for javac
jjg
parents:
14541
diff
changeset
|
138 |
if (!(task instanceof BasicJavacTask)) |
10 | 139 |
throw new IllegalArgumentException(); |
14548
aa687b312c97
8001098: Provide a simple light-weight "plug-in" mechanism for javac
jjg
parents:
14541
diff
changeset
|
140 |
return instance(((BasicJavacTask)task).getContext()); |
10 | 141 |
} |
142 |
||
12016 | 143 |
// called reflectively from Trees.instance(ProcessingEnvironment env) |
10 | 144 |
public static JavacTrees instance(ProcessingEnvironment env) { |
145 |
if (!(env instanceof JavacProcessingEnvironment)) |
|
146 |
throw new IllegalArgumentException(); |
|
147 |
return instance(((JavacProcessingEnvironment)env).getContext()); |
|
148 |
} |
|
149 |
||
150 |
public static JavacTrees instance(Context context) { |
|
151 |
JavacTrees instance = context.get(JavacTrees.class); |
|
152 |
if (instance == null) |
|
153 |
instance = new JavacTrees(context); |
|
154 |
return instance; |
|
155 |
} |
|
156 |
||
13845
bbb35ad7a9c1
7192073: (javac) minor refactoring of tree maker to help IDEs
ksrini
parents:
13077
diff
changeset
|
157 |
protected JavacTrees(Context context) { |
10 | 158 |
context.put(JavacTrees.class, this); |
6717 | 159 |
init(context); |
160 |
} |
|
161 |
||
162 |
public void updateContext(Context context) { |
|
163 |
init(context); |
|
164 |
} |
|
165 |
||
166 |
private void init(Context context) { |
|
10 | 167 |
attr = Attr.instance(context); |
168 |
enter = Enter.instance(context); |
|
169 |
elements = JavacElements.instance(context); |
|
170 |
log = Log.instance(context); |
|
171 |
resolve = Resolve.instance(context); |
|
172 |
treeMaker = TreeMaker.instance(context); |
|
173 |
memberEnter = MemberEnter.instance(context); |
|
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
174 |
names = Names.instance(context); |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
175 |
types = Types.instance(context); |
12016 | 176 |
|
177 |
JavacTask t = context.get(JavacTask.class); |
|
178 |
if (t instanceof JavacTaskImpl) |
|
179 |
javacTaskImpl = (JavacTaskImpl) t; |
|
10 | 180 |
} |
181 |
||
26266
2d24bda701dc
8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents:
26264
diff
changeset
|
182 |
@DefinedBy(Api.COMPILER_TREE) |
17273
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
183 |
public DocSourcePositions getSourcePositions() { |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
184 |
return new DocSourcePositions() { |
26266
2d24bda701dc
8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents:
26264
diff
changeset
|
185 |
@DefinedBy(Api.COMPILER_TREE) |
10 | 186 |
public long getStartPosition(CompilationUnitTree file, Tree tree) { |
187 |
return TreeInfo.getStartPos((JCTree) tree); |
|
188 |
} |
|
189 |
||
26266
2d24bda701dc
8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents:
26264
diff
changeset
|
190 |
@DefinedBy(Api.COMPILER_TREE) |
10 | 191 |
public long getEndPosition(CompilationUnitTree file, Tree tree) { |
11055 | 192 |
EndPosTable endPosTable = ((JCCompilationUnit) file).endPositions; |
193 |
return TreeInfo.getEndPos((JCTree) tree, endPosTable); |
|
10 | 194 |
} |
17273
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
195 |
|
26266
2d24bda701dc
8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents:
26264
diff
changeset
|
196 |
@DefinedBy(Api.COMPILER_TREE) |
17273
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
197 |
public long getStartPosition(CompilationUnitTree file, DocCommentTree comment, DocTree tree) { |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
198 |
return ((DCTree) tree).getSourcePosition((DCDocComment) comment); |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
199 |
} |
26266
2d24bda701dc
8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents:
26264
diff
changeset
|
200 |
@SuppressWarnings("fallthrough") @DefinedBy(Api.COMPILER_TREE) |
17273
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
201 |
public long getEndPosition(CompilationUnitTree file, DocCommentTree comment, DocTree tree) { |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
202 |
DCDocComment dcComment = (DCDocComment) comment; |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
203 |
if (tree instanceof DCEndPosTree) { |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
204 |
int endPos = ((DCEndPosTree) tree).getEndPos(dcComment); |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
205 |
|
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
206 |
if (endPos != Position.NOPOS) { |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
207 |
return endPos; |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
208 |
} |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
209 |
} |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
210 |
int correction = 0; |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
211 |
switch (tree.getKind()) { |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
212 |
case TEXT: |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
213 |
DCText text = (DCText) tree; |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
214 |
|
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
215 |
return dcComment.comment.getSourcePos(text.pos + text.text.length()); |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
216 |
case ERRONEOUS: |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
217 |
DCErroneous err = (DCErroneous) tree; |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
218 |
|
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
219 |
return dcComment.comment.getSourcePos(err.pos + err.body.length()); |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
220 |
case IDENTIFIER: |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
221 |
DCIdentifier ident = (DCIdentifier) tree; |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
222 |
|
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
223 |
return dcComment.comment.getSourcePos(ident.pos + (ident.name != names.error ? ident.name.length() : 0)); |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
224 |
case PARAM: |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
225 |
DCParam param = (DCParam) tree; |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
226 |
|
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
227 |
if (param.isTypeParameter && param.getDescription().isEmpty()) { |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
228 |
correction = 1; |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
229 |
} |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
230 |
case AUTHOR: case DEPRECATED: case RETURN: case SEE: |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
231 |
case SERIAL: case SERIAL_DATA: case SERIAL_FIELD: case SINCE: |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
232 |
case THROWS: case UNKNOWN_BLOCK_TAG: case VERSION: { |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
233 |
DocTree last = getLastChild(tree); |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
234 |
|
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
235 |
if (last != null) { |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
236 |
return getEndPosition(file, comment, last) + correction; |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
237 |
} |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
238 |
|
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
239 |
DCBlockTag block = (DCBlockTag) tree; |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
240 |
|
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
241 |
return dcComment.comment.getSourcePos(block.pos + block.getTagName().length() + 1); |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
242 |
} |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
243 |
default: |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
244 |
DocTree last = getLastChild(tree); |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
245 |
|
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
246 |
if (last != null) { |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
247 |
return getEndPosition(file, comment, last); |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
248 |
} |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
249 |
break; |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
250 |
} |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
251 |
|
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
252 |
return Position.NOPOS; |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
253 |
} |
10 | 254 |
}; |
255 |
} |
|
256 |
||
17273
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
257 |
private DocTree getLastChild(DocTree tree) { |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
258 |
final DocTree[] last = new DocTree[] {null}; |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
259 |
|
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
260 |
tree.accept(new DocTreeScanner<Void, Void>() { |
26266
2d24bda701dc
8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents:
26264
diff
changeset
|
261 |
@Override @DefinedBy(Api.COMPILER_TREE) |
2d24bda701dc
8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents:
26264
diff
changeset
|
262 |
public Void scan(DocTree node, Void p) { |
17273
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
263 |
if (node != null) last[0] = node; |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
264 |
return null; |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
265 |
} |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
266 |
}, null); |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
267 |
|
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
268 |
return last[0]; |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
269 |
} |
d7ec6654aac9
8008174: DocTree API should provide start and end positions for tree nodes
jlahoda
parents:
14952
diff
changeset
|
270 |
|
26266
2d24bda701dc
8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents:
26264
diff
changeset
|
271 |
@DefinedBy(Api.COMPILER_TREE) |
10 | 272 |
public JCClassDecl getTree(TypeElement element) { |
273 |
return (JCClassDecl) getTree((Element) element); |
|
274 |
} |
|
275 |
||
26266
2d24bda701dc
8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents:
26264
diff
changeset
|
276 |
@DefinedBy(Api.COMPILER_TREE) |
10 | 277 |
public JCMethodDecl getTree(ExecutableElement method) { |
278 |
return (JCMethodDecl) getTree((Element) method); |
|
279 |
} |
|
280 |
||
26266
2d24bda701dc
8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents:
26264
diff
changeset
|
281 |
@DefinedBy(Api.COMPILER_TREE) |
10 | 282 |
public JCTree getTree(Element element) { |
23122
02c931d49ad2
6411385: Trees.getPath does not work for constructors
jlahoda
parents:
22165
diff
changeset
|
283 |
return getTree(element, null); |
10 | 284 |
} |
285 |
||
26266
2d24bda701dc
8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents:
26264
diff
changeset
|
286 |
@DefinedBy(Api.COMPILER_TREE) |
10 | 287 |
public JCTree getTree(Element e, AnnotationMirror a) { |
288 |
return getTree(e, a, null); |
|
289 |
} |
|
290 |
||
26266
2d24bda701dc
8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents:
26264
diff
changeset
|
291 |
@DefinedBy(Api.COMPILER_TREE) |
10 | 292 |
public JCTree getTree(Element e, AnnotationMirror a, AnnotationValue v) { |
293 |
Pair<JCTree, JCCompilationUnit> treeTopLevel = elements.getTreeAndTopLevel(e, a, v); |
|
294 |
if (treeTopLevel == null) |
|
295 |
return null; |
|
296 |
return treeTopLevel.fst; |
|
297 |
} |
|
298 |
||
26266
2d24bda701dc
8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents:
26264
diff
changeset
|
299 |
@DefinedBy(Api.COMPILER_TREE) |
10 | 300 |
public TreePath getPath(CompilationUnitTree unit, Tree node) { |
301 |
return TreePath.getPath(unit, node); |
|
302 |
} |
|
303 |
||
26266
2d24bda701dc
8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents:
26264
diff
changeset
|
304 |
@DefinedBy(Api.COMPILER_TREE) |
10 | 305 |
public TreePath getPath(Element e) { |
306 |
return getPath(e, null, null); |
|
307 |
} |
|
308 |
||
26266
2d24bda701dc
8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents:
26264
diff
changeset
|
309 |
@DefinedBy(Api.COMPILER_TREE) |
10 | 310 |
public TreePath getPath(Element e, AnnotationMirror a) { |
311 |
return getPath(e, a, null); |
|
312 |
} |
|
313 |
||
26266
2d24bda701dc
8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents:
26264
diff
changeset
|
314 |
@DefinedBy(Api.COMPILER_TREE) |
10 | 315 |
public TreePath getPath(Element e, AnnotationMirror a, AnnotationValue v) { |
316 |
final Pair<JCTree, JCCompilationUnit> treeTopLevel = elements.getTreeAndTopLevel(e, a, v); |
|
317 |
if (treeTopLevel == null) |
|
318 |
return null; |
|
319 |
return TreePath.getPath(treeTopLevel.snd, treeTopLevel.fst); |
|
320 |
} |
|
321 |
||
26266
2d24bda701dc
8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents:
26264
diff
changeset
|
322 |
@DefinedBy(Api.COMPILER_TREE) |
17549
65ea6f3b72d9
8009724: Enhance the DocTree API with DocTreePath
jlahoda
parents:
17273
diff
changeset
|
323 |
public Symbol getElement(TreePath path) { |
6590
f745e683da2c
6930507: Symbols for anonymous and local classes made too late for use by java tree API
jjg
parents:
5847
diff
changeset
|
324 |
JCTree tree = (JCTree) path.getLeaf(); |
f745e683da2c
6930507: Symbols for anonymous and local classes made too late for use by java tree API
jjg
parents:
5847
diff
changeset
|
325 |
Symbol sym = TreeInfo.symbolFor(tree); |
14952 | 326 |
if (sym == null) { |
327 |
if (TreeInfo.isDeclaration(tree)) { |
|
328 |
for (TreePath p = path; p != null; p = p.getParentPath()) { |
|
329 |
JCTree t = (JCTree) p.getLeaf(); |
|
330 |
if (t.hasTag(JCTree.Tag.CLASSDEF)) { |
|
331 |
JCClassDecl ct = (JCClassDecl) t; |
|
332 |
if (ct.sym != null) { |
|
333 |
if ((ct.sym.flags_field & Flags.UNATTRIBUTED) != 0) { |
|
334 |
attr.attribClass(ct.pos(), ct.sym); |
|
335 |
sym = TreeInfo.symbolFor(tree); |
|
336 |
} |
|
337 |
break; |
|
6590
f745e683da2c
6930507: Symbols for anonymous and local classes made too late for use by java tree API
jjg
parents:
5847
diff
changeset
|
338 |
} |
f745e683da2c
6930507: Symbols for anonymous and local classes made too late for use by java tree API
jjg
parents:
5847
diff
changeset
|
339 |
} |
f745e683da2c
6930507: Symbols for anonymous and local classes made too late for use by java tree API
jjg
parents:
5847
diff
changeset
|
340 |
} |
f745e683da2c
6930507: Symbols for anonymous and local classes made too late for use by java tree API
jjg
parents:
5847
diff
changeset
|
341 |
} |
f745e683da2c
6930507: Symbols for anonymous and local classes made too late for use by java tree API
jjg
parents:
5847
diff
changeset
|
342 |
} |
f745e683da2c
6930507: Symbols for anonymous and local classes made too late for use by java tree API
jjg
parents:
5847
diff
changeset
|
343 |
return sym; |
10 | 344 |
} |
345 |
||
26266
2d24bda701dc
8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents:
26264
diff
changeset
|
346 |
@Override @DefinedBy(Api.COMPILER_TREE) |
17549
65ea6f3b72d9
8009724: Enhance the DocTree API with DocTreePath
jlahoda
parents:
17273
diff
changeset
|
347 |
public Element getElement(DocTreePath path) { |
65ea6f3b72d9
8009724: Enhance the DocTree API with DocTreePath
jlahoda
parents:
17273
diff
changeset
|
348 |
DocTree forTree = path.getLeaf(); |
65ea6f3b72d9
8009724: Enhance the DocTree API with DocTreePath
jlahoda
parents:
17273
diff
changeset
|
349 |
if (forTree instanceof DCReference) |
65ea6f3b72d9
8009724: Enhance the DocTree API with DocTreePath
jlahoda
parents:
17273
diff
changeset
|
350 |
return attributeDocReference(path.getTreePath(), ((DCReference) forTree)); |
65ea6f3b72d9
8009724: Enhance the DocTree API with DocTreePath
jlahoda
parents:
17273
diff
changeset
|
351 |
if (forTree instanceof DCIdentifier) { |
65ea6f3b72d9
8009724: Enhance the DocTree API with DocTreePath
jlahoda
parents:
17273
diff
changeset
|
352 |
if (path.getParentPath().getLeaf() instanceof DCParam) { |
65ea6f3b72d9
8009724: Enhance the DocTree API with DocTreePath
jlahoda
parents:
17273
diff
changeset
|
353 |
return attributeParamIdentifier(path.getTreePath(), (DCParam) path.getParentPath().getLeaf()); |
65ea6f3b72d9
8009724: Enhance the DocTree API with DocTreePath
jlahoda
parents:
17273
diff
changeset
|
354 |
} |
65ea6f3b72d9
8009724: Enhance the DocTree API with DocTreePath
jlahoda
parents:
17273
diff
changeset
|
355 |
} |
65ea6f3b72d9
8009724: Enhance the DocTree API with DocTreePath
jlahoda
parents:
17273
diff
changeset
|
356 |
return null; |
65ea6f3b72d9
8009724: Enhance the DocTree API with DocTreePath
jlahoda
parents:
17273
diff
changeset
|
357 |
} |
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
358 |
|
17549
65ea6f3b72d9
8009724: Enhance the DocTree API with DocTreePath
jlahoda
parents:
17273
diff
changeset
|
359 |
private Symbol attributeDocReference(TreePath path, DCReference ref) { |
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
360 |
Env<AttrContext> env = getAttrContext(path); |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
361 |
|
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
362 |
Log.DeferredDiagnosticHandler deferredDiagnosticHandler = |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
363 |
new Log.DeferredDiagnosticHandler(log); |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
364 |
try { |
19125
db8cab0ecbd9
8020556: doclint does not check type variables for @throws
jjg
parents:
18646
diff
changeset
|
365 |
final TypeSymbol tsym; |
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
366 |
final Name memberName; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
367 |
if (ref.qualifierExpression == null) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
368 |
tsym = env.enclClass.sym; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
369 |
memberName = ref.memberName; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
370 |
} else { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
371 |
// See if the qualifierExpression is a type or package name. |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
372 |
// javac does not provide the exact method required, so |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
373 |
// we first check if qualifierExpression identifies a type, |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
374 |
// and if not, then we check to see if it identifies a package. |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
375 |
Type t = attr.attribType(ref.qualifierExpression, env); |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
376 |
if (t.isErroneous()) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
377 |
if (ref.memberName == null) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
378 |
// Attr/Resolve assume packages exist and create symbols as needed |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
379 |
// so use getPackageElement to restrict search to existing packages |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
380 |
PackageSymbol pck = elements.getPackageElement(ref.qualifierExpression.toString()); |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
381 |
if (pck != null) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
382 |
return pck; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
383 |
} else if (ref.qualifierExpression.hasTag(JCTree.Tag.IDENT)) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
384 |
// fixup: allow "identifier" instead of "#identifier" |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
385 |
// for compatibility with javadoc |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
386 |
tsym = env.enclClass.sym; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
387 |
memberName = ((JCIdent) ref.qualifierExpression).name; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
388 |
} else |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
389 |
return null; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
390 |
} else { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
391 |
return null; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
392 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
393 |
} else { |
19125
db8cab0ecbd9
8020556: doclint does not check type variables for @throws
jjg
parents:
18646
diff
changeset
|
394 |
tsym = t.tsym; |
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
395 |
memberName = ref.memberName; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
396 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
397 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
398 |
|
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
399 |
if (memberName == null) |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
400 |
return tsym; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
401 |
|
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
402 |
final List<Type> paramTypes; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
403 |
if (ref.paramTypes == null) |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
404 |
paramTypes = null; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
405 |
else { |
22163 | 406 |
ListBuffer<Type> lb = new ListBuffer<>(); |
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
407 |
for (List<JCTree> l = ref.paramTypes; l.nonEmpty(); l = l.tail) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
408 |
JCTree tree = l.head; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
409 |
Type t = attr.attribType(tree, env); |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
410 |
lb.add(t); |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
411 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
412 |
paramTypes = lb.toList(); |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
413 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
414 |
|
24612
75dc732b45af
8042338: Refactor Types.upperBound to treat wildcards and variables separately
dlsmith
parents:
23122
diff
changeset
|
415 |
ClassSymbol sym = (ClassSymbol) types.cvarUpperBound(tsym.type).tsym; |
19125
db8cab0ecbd9
8020556: doclint does not check type variables for @throws
jjg
parents:
18646
diff
changeset
|
416 |
|
db8cab0ecbd9
8020556: doclint does not check type variables for @throws
jjg
parents:
18646
diff
changeset
|
417 |
Symbol msym = (memberName == sym.name) |
db8cab0ecbd9
8020556: doclint does not check type variables for @throws
jjg
parents:
18646
diff
changeset
|
418 |
? findConstructor(sym, paramTypes) |
db8cab0ecbd9
8020556: doclint does not check type variables for @throws
jjg
parents:
18646
diff
changeset
|
419 |
: findMethod(sym, memberName, paramTypes); |
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
420 |
if (paramTypes != null) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
421 |
// explicit (possibly empty) arg list given, so cannot be a field |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
422 |
return msym; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
423 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
424 |
|
19125
db8cab0ecbd9
8020556: doclint does not check type variables for @throws
jjg
parents:
18646
diff
changeset
|
425 |
VarSymbol vsym = (ref.paramTypes != null) ? null : findField(sym, memberName); |
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
426 |
// prefer a field over a method with no parameters |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
427 |
if (vsym != null && |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
428 |
(msym == null || |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
429 |
types.isSubtypeUnchecked(vsym.enclClass().asType(), msym.enclClass().asType()))) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
430 |
return vsym; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
431 |
} else { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
432 |
return msym; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
433 |
} |
14952 | 434 |
} catch (Abort e) { // may be thrown by Check.completionError in case of bad class file |
435 |
return null; |
|
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
436 |
} finally { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
437 |
log.popDiagnosticHandler(deferredDiagnosticHandler); |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
438 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
439 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
440 |
|
17549
65ea6f3b72d9
8009724: Enhance the DocTree API with DocTreePath
jlahoda
parents:
17273
diff
changeset
|
441 |
private Symbol attributeParamIdentifier(TreePath path, DCParam ptag) { |
65ea6f3b72d9
8009724: Enhance the DocTree API with DocTreePath
jlahoda
parents:
17273
diff
changeset
|
442 |
Symbol javadocSymbol = getElement(path); |
65ea6f3b72d9
8009724: Enhance the DocTree API with DocTreePath
jlahoda
parents:
17273
diff
changeset
|
443 |
if (javadocSymbol == null) |
65ea6f3b72d9
8009724: Enhance the DocTree API with DocTreePath
jlahoda
parents:
17273
diff
changeset
|
444 |
return null; |
65ea6f3b72d9
8009724: Enhance the DocTree API with DocTreePath
jlahoda
parents:
17273
diff
changeset
|
445 |
ElementKind kind = javadocSymbol.getKind(); |
65ea6f3b72d9
8009724: Enhance the DocTree API with DocTreePath
jlahoda
parents:
17273
diff
changeset
|
446 |
List<? extends Symbol> params = List.nil(); |
65ea6f3b72d9
8009724: Enhance the DocTree API with DocTreePath
jlahoda
parents:
17273
diff
changeset
|
447 |
if (kind == ElementKind.METHOD || kind == ElementKind.CONSTRUCTOR) { |
65ea6f3b72d9
8009724: Enhance the DocTree API with DocTreePath
jlahoda
parents:
17273
diff
changeset
|
448 |
MethodSymbol ee = (MethodSymbol) javadocSymbol; |
65ea6f3b72d9
8009724: Enhance the DocTree API with DocTreePath
jlahoda
parents:
17273
diff
changeset
|
449 |
params = ptag.isTypeParameter() |
65ea6f3b72d9
8009724: Enhance the DocTree API with DocTreePath
jlahoda
parents:
17273
diff
changeset
|
450 |
? ee.getTypeParameters() |
65ea6f3b72d9
8009724: Enhance the DocTree API with DocTreePath
jlahoda
parents:
17273
diff
changeset
|
451 |
: ee.getParameters(); |
65ea6f3b72d9
8009724: Enhance the DocTree API with DocTreePath
jlahoda
parents:
17273
diff
changeset
|
452 |
} else if (kind.isClass() || kind.isInterface()) { |
65ea6f3b72d9
8009724: Enhance the DocTree API with DocTreePath
jlahoda
parents:
17273
diff
changeset
|
453 |
ClassSymbol te = (ClassSymbol) javadocSymbol; |
65ea6f3b72d9
8009724: Enhance the DocTree API with DocTreePath
jlahoda
parents:
17273
diff
changeset
|
454 |
params = te.getTypeParameters(); |
65ea6f3b72d9
8009724: Enhance the DocTree API with DocTreePath
jlahoda
parents:
17273
diff
changeset
|
455 |
} |
65ea6f3b72d9
8009724: Enhance the DocTree API with DocTreePath
jlahoda
parents:
17273
diff
changeset
|
456 |
|
65ea6f3b72d9
8009724: Enhance the DocTree API with DocTreePath
jlahoda
parents:
17273
diff
changeset
|
457 |
for (Symbol param : params) { |
65ea6f3b72d9
8009724: Enhance the DocTree API with DocTreePath
jlahoda
parents:
17273
diff
changeset
|
458 |
if (param.getSimpleName() == ptag.getName().getName()) { |
65ea6f3b72d9
8009724: Enhance the DocTree API with DocTreePath
jlahoda
parents:
17273
diff
changeset
|
459 |
return param; |
65ea6f3b72d9
8009724: Enhance the DocTree API with DocTreePath
jlahoda
parents:
17273
diff
changeset
|
460 |
} |
65ea6f3b72d9
8009724: Enhance the DocTree API with DocTreePath
jlahoda
parents:
17273
diff
changeset
|
461 |
} |
65ea6f3b72d9
8009724: Enhance the DocTree API with DocTreePath
jlahoda
parents:
17273
diff
changeset
|
462 |
return null; |
65ea6f3b72d9
8009724: Enhance the DocTree API with DocTreePath
jlahoda
parents:
17273
diff
changeset
|
463 |
} |
65ea6f3b72d9
8009724: Enhance the DocTree API with DocTreePath
jlahoda
parents:
17273
diff
changeset
|
464 |
|
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
465 |
/** @see com.sun.tools.javadoc.ClassDocImpl#findField */ |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
466 |
private VarSymbol findField(ClassSymbol tsym, Name fieldName) { |
22165
ec53c8946fc2
8030807: langtools should still build using jdk 7
vromero
parents:
22163
diff
changeset
|
467 |
return searchField(tsym, fieldName, new HashSet<ClassSymbol>()); |
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
468 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
469 |
|
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
470 |
/** @see com.sun.tools.javadoc.ClassDocImpl#searchField */ |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
471 |
private VarSymbol searchField(ClassSymbol tsym, Name fieldName, Set<ClassSymbol> searched) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
472 |
if (searched.contains(tsym)) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
473 |
return null; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
474 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
475 |
searched.add(tsym); |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
476 |
|
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25287
diff
changeset
|
477 |
for (Symbol sym : tsym.members().getSymbolsByName(fieldName)) { |
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26266
diff
changeset
|
478 |
if (sym.kind == VAR) { |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25287
diff
changeset
|
479 |
return (VarSymbol)sym; |
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
480 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
481 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
482 |
|
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
483 |
//### If we found a VarSymbol above, but which did not pass |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
484 |
//### the modifier filter, we should return failure here! |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
485 |
|
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
486 |
ClassSymbol encl = tsym.owner.enclClass(); |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
487 |
if (encl != null) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
488 |
VarSymbol vsym = searchField(encl, fieldName, searched); |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
489 |
if (vsym != null) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
490 |
return vsym; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
491 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
492 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
493 |
|
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
494 |
// search superclass |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
495 |
Type superclass = tsym.getSuperclass(); |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
496 |
if (superclass.tsym != null) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
497 |
VarSymbol vsym = searchField((ClassSymbol) superclass.tsym, fieldName, searched); |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
498 |
if (vsym != null) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
499 |
return vsym; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
500 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
501 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
502 |
|
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
503 |
// search interfaces |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
504 |
List<Type> intfs = tsym.getInterfaces(); |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
505 |
for (List<Type> l = intfs; l.nonEmpty(); l = l.tail) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
506 |
Type intf = l.head; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
507 |
if (intf.isErroneous()) continue; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
508 |
VarSymbol vsym = searchField((ClassSymbol) intf.tsym, fieldName, searched); |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
509 |
if (vsym != null) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
510 |
return vsym; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
511 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
512 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
513 |
|
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
514 |
return null; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
515 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
516 |
|
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
517 |
/** @see com.sun.tools.javadoc.ClassDocImpl#findConstructor */ |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
518 |
MethodSymbol findConstructor(ClassSymbol tsym, List<Type> paramTypes) { |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25287
diff
changeset
|
519 |
for (Symbol sym : tsym.members().getSymbolsByName(names.init)) { |
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26266
diff
changeset
|
520 |
if (sym.kind == MTH) { |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25287
diff
changeset
|
521 |
if (hasParameterTypes((MethodSymbol) sym, paramTypes)) { |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25287
diff
changeset
|
522 |
return (MethodSymbol) sym; |
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
523 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
524 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
525 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
526 |
return null; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
527 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
528 |
|
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
529 |
/** @see com.sun.tools.javadoc.ClassDocImpl#findMethod */ |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
530 |
private MethodSymbol findMethod(ClassSymbol tsym, Name methodName, List<Type> paramTypes) { |
22165
ec53c8946fc2
8030807: langtools should still build using jdk 7
vromero
parents:
22163
diff
changeset
|
531 |
return searchMethod(tsym, methodName, paramTypes, new HashSet<ClassSymbol>()); |
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
532 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
533 |
|
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
534 |
/** @see com.sun.tools.javadoc.ClassDocImpl#searchMethod */ |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
535 |
private MethodSymbol searchMethod(ClassSymbol tsym, Name methodName, |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
536 |
List<Type> paramTypes, Set<ClassSymbol> searched) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
537 |
//### Note that this search is not necessarily what the compiler would do! |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
538 |
|
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
539 |
// do not match constructors |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
540 |
if (methodName == names.init) |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
541 |
return null; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
542 |
|
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
543 |
if (searched.contains(tsym)) |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
544 |
return null; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
545 |
searched.add(tsym); |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
546 |
|
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
547 |
// search current class |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
548 |
|
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
549 |
//### Using modifier filter here isn't really correct, |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
550 |
//### but emulates the old behavior. Instead, we should |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
551 |
//### apply the normal rules of visibility and inheritance. |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
552 |
|
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
553 |
if (paramTypes == null) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
554 |
// If no parameters specified, we are allowed to return |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
555 |
// any method with a matching name. In practice, the old |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
556 |
// code returned the first method, which is now the last! |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
557 |
// In order to provide textually identical results, we |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
558 |
// attempt to emulate the old behavior. |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
559 |
MethodSymbol lastFound = null; |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25287
diff
changeset
|
560 |
for (Symbol sym : tsym.members().getSymbolsByName(methodName)) { |
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26266
diff
changeset
|
561 |
if (sym.kind == MTH) { |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25287
diff
changeset
|
562 |
if (sym.name == methodName) { |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25287
diff
changeset
|
563 |
lastFound = (MethodSymbol)sym; |
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
564 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
565 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
566 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
567 |
if (lastFound != null) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
568 |
return lastFound; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
569 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
570 |
} else { |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25287
diff
changeset
|
571 |
for (Symbol sym : tsym.members().getSymbolsByName(methodName)) { |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25287
diff
changeset
|
572 |
if (sym != null && |
27224
228abfa87080
8054457: Refactor Symbol kinds from small ints to an enum
emc
parents:
26266
diff
changeset
|
573 |
sym.kind == MTH) { |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25287
diff
changeset
|
574 |
if (hasParameterTypes((MethodSymbol) sym, paramTypes)) { |
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25287
diff
changeset
|
575 |
return (MethodSymbol) sym; |
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
576 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
577 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
578 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
579 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
580 |
|
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
581 |
//### If we found a MethodSymbol above, but which did not pass |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
582 |
//### the modifier filter, we should return failure here! |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
583 |
|
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
584 |
// search superclass |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
585 |
Type superclass = tsym.getSuperclass(); |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
586 |
if (superclass.tsym != null) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
587 |
MethodSymbol msym = searchMethod((ClassSymbol) superclass.tsym, methodName, paramTypes, searched); |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
588 |
if (msym != null) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
589 |
return msym; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
590 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
591 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
592 |
|
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
593 |
// search interfaces |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
594 |
List<Type> intfs = tsym.getInterfaces(); |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
595 |
for (List<Type> l = intfs; l.nonEmpty(); l = l.tail) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
596 |
Type intf = l.head; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
597 |
if (intf.isErroneous()) continue; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
598 |
MethodSymbol msym = searchMethod((ClassSymbol) intf.tsym, methodName, paramTypes, searched); |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
599 |
if (msym != null) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
600 |
return msym; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
601 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
602 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
603 |
|
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
604 |
// search enclosing class |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
605 |
ClassSymbol encl = tsym.owner.enclClass(); |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
606 |
if (encl != null) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
607 |
MethodSymbol msym = searchMethod(encl, methodName, paramTypes, searched); |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
608 |
if (msym != null) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
609 |
return msym; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
610 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
611 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
612 |
|
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
613 |
return null; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
614 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
615 |
|
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
616 |
/** @see com.sun.tools.javadoc.ClassDocImpl */ |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
617 |
private boolean hasParameterTypes(MethodSymbol method, List<Type> paramTypes) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
618 |
if (paramTypes == null) |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
619 |
return true; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
620 |
|
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
621 |
if (method.params().size() != paramTypes.size()) |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
622 |
return false; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
623 |
|
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
624 |
List<Type> methodParamTypes = types.erasureRecursive(method.asType()).getParameterTypes(); |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
625 |
|
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
626 |
return (Type.isErroneous(paramTypes)) |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
627 |
? fuzzyMatch(paramTypes, methodParamTypes) |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
628 |
: types.isSameTypes(paramTypes, methodParamTypes); |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
629 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
630 |
|
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
631 |
boolean fuzzyMatch(List<Type> paramTypes, List<Type> methodParamTypes) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
632 |
List<Type> l1 = paramTypes; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
633 |
List<Type> l2 = methodParamTypes; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
634 |
while (l1.nonEmpty()) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
635 |
if (!fuzzyMatch(l1.head, l2.head)) |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
636 |
return false; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
637 |
l1 = l1.tail; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
638 |
l2 = l2.tail; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
639 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
640 |
return true; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
641 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
642 |
|
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
643 |
boolean fuzzyMatch(Type paramType, Type methodParamType) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
644 |
Boolean b = fuzzyMatcher.visit(paramType, methodParamType); |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
645 |
return (b == Boolean.TRUE); |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
646 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
647 |
|
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
648 |
TypeRelation fuzzyMatcher = new TypeRelation() { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
649 |
@Override |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
650 |
public Boolean visitType(Type t, Type s) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
651 |
if (t == s) |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
652 |
return true; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
653 |
|
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
654 |
if (s.isPartial()) |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
655 |
return visit(s, t); |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
656 |
|
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
657 |
switch (t.getTag()) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
658 |
case BYTE: case CHAR: case SHORT: case INT: case LONG: case FLOAT: |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
659 |
case DOUBLE: case BOOLEAN: case VOID: case BOT: case NONE: |
18646
e628560a86d1
8017104: javac should have a class for primitive types that inherits from Type
vromero
parents:
17557
diff
changeset
|
660 |
return t.hasTag(s.getTag()); |
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
661 |
default: |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
662 |
throw new AssertionError("fuzzyMatcher " + t.getTag()); |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
663 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
664 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
665 |
|
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
666 |
@Override |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
667 |
public Boolean visitArrayType(ArrayType t, Type s) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
668 |
if (t == s) |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
669 |
return true; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
670 |
|
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
671 |
if (s.isPartial()) |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
672 |
return visit(s, t); |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
673 |
|
18646
e628560a86d1
8017104: javac should have a class for primitive types that inherits from Type
vromero
parents:
17557
diff
changeset
|
674 |
return s.hasTag(ARRAY) |
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
675 |
&& visit(t.elemtype, types.elemtype(s)); |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
676 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
677 |
|
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
678 |
@Override |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
679 |
public Boolean visitClassType(ClassType t, Type s) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
680 |
if (t == s) |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
681 |
return true; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
682 |
|
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
683 |
if (s.isPartial()) |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
684 |
return visit(s, t); |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
685 |
|
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
686 |
return t.tsym == s.tsym; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
687 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
688 |
|
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
689 |
@Override |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
690 |
public Boolean visitErrorType(ErrorType t, Type s) { |
18646
e628560a86d1
8017104: javac should have a class for primitive types that inherits from Type
vromero
parents:
17557
diff
changeset
|
691 |
return s.hasTag(CLASS) |
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
692 |
&& t.tsym.name == ((ClassType) s).tsym.name; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
693 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
694 |
}; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
695 |
|
26266
2d24bda701dc
8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents:
26264
diff
changeset
|
696 |
@DefinedBy(Api.COMPILER_TREE) |
10 | 697 |
public TypeMirror getTypeMirror(TreePath path) { |
698 |
Tree t = path.getLeaf(); |
|
29842
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
28455
diff
changeset
|
699 |
Type ty = ((JCTree)t).type; |
826ac2519523
8031744: Annotations on many Language Model elements are not returned
jjg
parents:
28455
diff
changeset
|
700 |
return ty == null ? null : ty.stripMetadataIfNeeded(); |
10 | 701 |
} |
702 |
||
26266
2d24bda701dc
8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents:
26264
diff
changeset
|
703 |
@DefinedBy(Api.COMPILER_TREE) |
10 | 704 |
public JavacScope getScope(TreePath path) { |
25443
9187d77f2c64
8031569: Refactor javac scope implementation to enable lazy imports
jlahoda
parents:
25287
diff
changeset
|
705 |
return JavacScope.create(getAttrContext(path)); |
10 | 706 |
} |
707 |
||
26266
2d24bda701dc
8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents:
26264
diff
changeset
|
708 |
@DefinedBy(Api.COMPILER_TREE) |
7631 | 709 |
public String getDocComment(TreePath path) { |
710 |
CompilationUnitTree t = path.getCompilationUnit(); |
|
13077 | 711 |
Tree leaf = path.getLeaf(); |
712 |
if (t instanceof JCTree.JCCompilationUnit && leaf instanceof JCTree) { |
|
7631 | 713 |
JCCompilationUnit cu = (JCCompilationUnit) t; |
714 |
if (cu.docComments != null) { |
|
13077 | 715 |
return cu.docComments.getCommentText((JCTree) leaf); |
7631 | 716 |
} |
717 |
} |
|
718 |
return null; |
|
719 |
} |
|
720 |
||
26266
2d24bda701dc
8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents:
26264
diff
changeset
|
721 |
@DefinedBy(Api.COMPILER_TREE) |
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
722 |
public DocCommentTree getDocCommentTree(TreePath path) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
723 |
CompilationUnitTree t = path.getCompilationUnit(); |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
724 |
Tree leaf = path.getLeaf(); |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
725 |
if (t instanceof JCTree.JCCompilationUnit && leaf instanceof JCTree) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
726 |
JCCompilationUnit cu = (JCCompilationUnit) t; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
727 |
if (cu.docComments != null) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
728 |
return cu.docComments.getCommentTree((JCTree) leaf); |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
729 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
730 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
731 |
return null; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
732 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
733 |
|
26266
2d24bda701dc
8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents:
26264
diff
changeset
|
734 |
@DefinedBy(Api.COMPILER_TREE) |
10 | 735 |
public boolean isAccessible(Scope scope, TypeElement type) { |
736 |
if (scope instanceof JavacScope && type instanceof ClassSymbol) { |
|
737 |
Env<AttrContext> env = ((JavacScope) scope).env; |
|
7209
889e80aa1d2e
6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents:
7077
diff
changeset
|
738 |
return resolve.isAccessible(env, (ClassSymbol)type, true); |
10 | 739 |
} else |
740 |
return false; |
|
741 |
} |
|
742 |
||
26266
2d24bda701dc
8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents:
26264
diff
changeset
|
743 |
@DefinedBy(Api.COMPILER_TREE) |
10 | 744 |
public boolean isAccessible(Scope scope, Element member, DeclaredType type) { |
745 |
if (scope instanceof JavacScope |
|
746 |
&& member instanceof Symbol |
|
747 |
&& type instanceof com.sun.tools.javac.code.Type) { |
|
748 |
Env<AttrContext> env = ((JavacScope) scope).env; |
|
7209
889e80aa1d2e
6598108: com.sun.source.util.Trees.isAccessible incorrect
mcimadamore
parents:
7077
diff
changeset
|
749 |
return resolve.isAccessible(env, (com.sun.tools.javac.code.Type)type, (Symbol)member, true); |
10 | 750 |
} else |
751 |
return false; |
|
752 |
} |
|
753 |
||
754 |
private Env<AttrContext> getAttrContext(TreePath path) { |
|
755 |
if (!(path.getLeaf() instanceof JCTree)) // implicit null-check |
|
756 |
throw new IllegalArgumentException(); |
|
757 |
||
10631
d9914010b902
7090249: IllegalStateException from Trees.getScope when called from JSR 199
jjg
parents:
9599
diff
changeset
|
758 |
// if we're being invoked from a Tree API client via parse/enter/analyze, |
d9914010b902
7090249: IllegalStateException from Trees.getScope when called from JSR 199
jjg
parents:
9599
diff
changeset
|
759 |
// we need to make sure all the classes have been entered; |
d9914010b902
7090249: IllegalStateException from Trees.getScope when called from JSR 199
jjg
parents:
9599
diff
changeset
|
760 |
// if we're being invoked from JSR 199 or JSR 269, then the classes |
d9914010b902
7090249: IllegalStateException from Trees.getScope when called from JSR 199
jjg
parents:
9599
diff
changeset
|
761 |
// will already have been entered. |
10 | 762 |
if (javacTaskImpl != null) { |
26264
a09fedde76be
8044859: javac duplicates option processing when using Compiler API
jjg
parents:
25874
diff
changeset
|
763 |
javacTaskImpl.enter(null); |
10 | 764 |
} |
765 |
||
766 |
||
767 |
JCCompilationUnit unit = (JCCompilationUnit) path.getCompilationUnit(); |
|
13845
bbb35ad7a9c1
7192073: (javac) minor refactoring of tree maker to help IDEs
ksrini
parents:
13077
diff
changeset
|
768 |
Copier copier = createCopier(treeMaker.forToplevel(unit)); |
10 | 769 |
|
770 |
Env<AttrContext> env = null; |
|
771 |
JCMethodDecl method = null; |
|
772 |
JCVariableDecl field = null; |
|
773 |
||
774 |
List<Tree> l = List.nil(); |
|
775 |
TreePath p = path; |
|
776 |
while (p != null) { |
|
777 |
l = l.prepend(p.getLeaf()); |
|
778 |
p = p.getParentPath(); |
|
779 |
} |
|
780 |
||
781 |
for ( ; l.nonEmpty(); l = l.tail) { |
|
782 |
Tree tree = l.head; |
|
783 |
switch (tree.getKind()) { |
|
784 |
case COMPILATION_UNIT: |
|
785 |
// System.err.println("COMP: " + ((JCCompilationUnit)tree).sourcefile); |
|
786 |
env = enter.getTopLevelEnv((JCCompilationUnit)tree); |
|
787 |
break; |
|
7077
55689b828dc5
6993304: JavacTrees.getAttrContext not updated to Tree.Kind.{ANNOTATION_TYPE,ENUM,INTERFACE}
jjg
parents:
6717
diff
changeset
|
788 |
case ANNOTATION_TYPE: |
10 | 789 |
case CLASS: |
7077
55689b828dc5
6993304: JavacTrees.getAttrContext not updated to Tree.Kind.{ANNOTATION_TYPE,ENUM,INTERFACE}
jjg
parents:
6717
diff
changeset
|
790 |
case ENUM: |
6600 | 791 |
case INTERFACE: |
10 | 792 |
// System.err.println("CLASS: " + ((JCClassDecl)tree).sym.getSimpleName()); |
793 |
env = enter.getClassEnv(((JCClassDecl)tree).sym); |
|
794 |
break; |
|
795 |
case METHOD: |
|
796 |
// System.err.println("METHOD: " + ((JCMethodDecl)tree).sym.getSimpleName()); |
|
797 |
method = (JCMethodDecl)tree; |
|
19125
db8cab0ecbd9
8020556: doclint does not check type variables for @throws
jjg
parents:
18646
diff
changeset
|
798 |
env = memberEnter.getMethodEnv(method, env); |
10 | 799 |
break; |
800 |
case VARIABLE: |
|
801 |
// System.err.println("FIELD: " + ((JCVariableDecl)tree).sym.getSimpleName()); |
|
802 |
field = (JCVariableDecl)tree; |
|
803 |
break; |
|
804 |
case BLOCK: { |
|
805 |
// System.err.println("BLOCK: "); |
|
10631
d9914010b902
7090249: IllegalStateException from Trees.getScope when called from JSR 199
jjg
parents:
9599
diff
changeset
|
806 |
if (method != null) { |
d9914010b902
7090249: IllegalStateException from Trees.getScope when called from JSR 199
jjg
parents:
9599
diff
changeset
|
807 |
try { |
d9914010b902
7090249: IllegalStateException from Trees.getScope when called from JSR 199
jjg
parents:
9599
diff
changeset
|
808 |
Assert.check(method.body == tree); |
d9914010b902
7090249: IllegalStateException from Trees.getScope when called from JSR 199
jjg
parents:
9599
diff
changeset
|
809 |
method.body = copier.copy((JCBlock)tree, (JCTree) path.getLeaf()); |
d9914010b902
7090249: IllegalStateException from Trees.getScope when called from JSR 199
jjg
parents:
9599
diff
changeset
|
810 |
env = attribStatToTree(method.body, env, copier.leafCopy); |
d9914010b902
7090249: IllegalStateException from Trees.getScope when called from JSR 199
jjg
parents:
9599
diff
changeset
|
811 |
} finally { |
d9914010b902
7090249: IllegalStateException from Trees.getScope when called from JSR 199
jjg
parents:
9599
diff
changeset
|
812 |
method.body = (JCBlock) tree; |
d9914010b902
7090249: IllegalStateException from Trees.getScope when called from JSR 199
jjg
parents:
9599
diff
changeset
|
813 |
} |
d9914010b902
7090249: IllegalStateException from Trees.getScope when called from JSR 199
jjg
parents:
9599
diff
changeset
|
814 |
} else { |
d9914010b902
7090249: IllegalStateException from Trees.getScope when called from JSR 199
jjg
parents:
9599
diff
changeset
|
815 |
JCBlock body = copier.copy((JCBlock)tree, (JCTree) path.getLeaf()); |
d9914010b902
7090249: IllegalStateException from Trees.getScope when called from JSR 199
jjg
parents:
9599
diff
changeset
|
816 |
env = attribStatToTree(body, env, copier.leafCopy); |
d9914010b902
7090249: IllegalStateException from Trees.getScope when called from JSR 199
jjg
parents:
9599
diff
changeset
|
817 |
} |
10 | 818 |
return env; |
819 |
} |
|
820 |
default: |
|
821 |
// System.err.println("DEFAULT: " + tree.getKind()); |
|
822 |
if (field != null && field.getInitializer() == tree) { |
|
823 |
env = memberEnter.getInitEnv(field, env); |
|
824 |
JCExpression expr = copier.copy((JCExpression)tree, (JCTree) path.getLeaf()); |
|
825 |
env = attribExprToTree(expr, env, copier.leafCopy); |
|
826 |
return env; |
|
827 |
} |
|
828 |
} |
|
829 |
} |
|
10631
d9914010b902
7090249: IllegalStateException from Trees.getScope when called from JSR 199
jjg
parents:
9599
diff
changeset
|
830 |
return (field != null) ? memberEnter.getInitEnv(field, env) : env; |
10 | 831 |
} |
832 |
||
833 |
private Env<AttrContext> attribStatToTree(JCTree stat, Env<AttrContext>env, JCTree tree) { |
|
834 |
JavaFileObject prev = log.useSource(env.toplevel.sourcefile); |
|
835 |
try { |
|
836 |
return attr.attribStatToTree(stat, env, tree); |
|
837 |
} finally { |
|
838 |
log.useSource(prev); |
|
839 |
} |
|
840 |
} |
|
841 |
||
842 |
private Env<AttrContext> attribExprToTree(JCExpression expr, Env<AttrContext>env, JCTree tree) { |
|
843 |
JavaFileObject prev = log.useSource(env.toplevel.sourcefile); |
|
844 |
try { |
|
845 |
return attr.attribExprToTree(expr, env, tree); |
|
846 |
} finally { |
|
847 |
log.useSource(prev); |
|
848 |
} |
|
849 |
} |
|
850 |
||
851 |
/** |
|
852 |
* Makes a copy of a tree, noting the value resulting from copying a particular leaf. |
|
853 |
**/ |
|
13845
bbb35ad7a9c1
7192073: (javac) minor refactoring of tree maker to help IDEs
ksrini
parents:
13077
diff
changeset
|
854 |
protected static class Copier extends TreeCopier<JCTree> { |
10 | 855 |
JCTree leafCopy = null; |
856 |
||
13845
bbb35ad7a9c1
7192073: (javac) minor refactoring of tree maker to help IDEs
ksrini
parents:
13077
diff
changeset
|
857 |
protected Copier(TreeMaker M) { |
10 | 858 |
super(M); |
859 |
} |
|
860 |
||
6717 | 861 |
@Override |
10 | 862 |
public <T extends JCTree> T copy(T t, JCTree leaf) { |
863 |
T t2 = super.copy(t, leaf); |
|
864 |
if (t == leaf) |
|
865 |
leafCopy = t2; |
|
866 |
return t2; |
|
867 |
} |
|
868 |
} |
|
1257
873b053bf757
6557752: Original type of an AST should be made available even if it is replaced with an ErrorType
jjg
parents:
10
diff
changeset
|
869 |
|
13845
bbb35ad7a9c1
7192073: (javac) minor refactoring of tree maker to help IDEs
ksrini
parents:
13077
diff
changeset
|
870 |
protected Copier createCopier(TreeMaker maker) { |
bbb35ad7a9c1
7192073: (javac) minor refactoring of tree maker to help IDEs
ksrini
parents:
13077
diff
changeset
|
871 |
return new Copier(maker); |
bbb35ad7a9c1
7192073: (javac) minor refactoring of tree maker to help IDEs
ksrini
parents:
13077
diff
changeset
|
872 |
} |
bbb35ad7a9c1
7192073: (javac) minor refactoring of tree maker to help IDEs
ksrini
parents:
13077
diff
changeset
|
873 |
|
1257
873b053bf757
6557752: Original type of an AST should be made available even if it is replaced with an ErrorType
jjg
parents:
10
diff
changeset
|
874 |
/** |
25287 | 875 |
* Returns the original type from the ErrorType object. |
1257
873b053bf757
6557752: Original type of an AST should be made available even if it is replaced with an ErrorType
jjg
parents:
10
diff
changeset
|
876 |
* @param errorType The errorType for which we want to get the original type. |
31751 | 877 |
* @return TypeMirror corresponding to the original type, replaced by the ErrorType. |
878 |
* noType (type.tag == NONE) is returned if there is no original type. |
|
1257
873b053bf757
6557752: Original type of an AST should be made available even if it is replaced with an ErrorType
jjg
parents:
10
diff
changeset
|
879 |
*/ |
26266
2d24bda701dc
8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents:
26264
diff
changeset
|
880 |
@DefinedBy(Api.COMPILER_TREE) |
1257
873b053bf757
6557752: Original type of an AST should be made available even if it is replaced with an ErrorType
jjg
parents:
10
diff
changeset
|
881 |
public TypeMirror getOriginalType(javax.lang.model.type.ErrorType errorType) { |
873b053bf757
6557752: Original type of an AST should be made available even if it is replaced with an ErrorType
jjg
parents:
10
diff
changeset
|
882 |
if (errorType instanceof com.sun.tools.javac.code.Type.ErrorType) { |
873b053bf757
6557752: Original type of an AST should be made available even if it is replaced with an ErrorType
jjg
parents:
10
diff
changeset
|
883 |
return ((com.sun.tools.javac.code.Type.ErrorType)errorType).getOriginalType(); |
873b053bf757
6557752: Original type of an AST should be made available even if it is replaced with an ErrorType
jjg
parents:
10
diff
changeset
|
884 |
} |
873b053bf757
6557752: Original type of an AST should be made available even if it is replaced with an ErrorType
jjg
parents:
10
diff
changeset
|
885 |
|
873b053bf757
6557752: Original type of an AST should be made available even if it is replaced with an ErrorType
jjg
parents:
10
diff
changeset
|
886 |
return com.sun.tools.javac.code.Type.noType; |
873b053bf757
6557752: Original type of an AST should be made available even if it is replaced with an ErrorType
jjg
parents:
10
diff
changeset
|
887 |
} |
3149 | 888 |
|
889 |
/** |
|
890 |
* Prints a message of the specified kind at the location of the |
|
891 |
* tree within the provided compilation unit |
|
892 |
* |
|
893 |
* @param kind the kind of message |
|
894 |
* @param msg the message, or an empty string if none |
|
895 |
* @param t the tree to use as a position hint |
|
896 |
* @param root the compilation unit that contains tree |
|
897 |
*/ |
|
26266
2d24bda701dc
8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents:
26264
diff
changeset
|
898 |
@DefinedBy(Api.COMPILER_TREE) |
3149 | 899 |
public void printMessage(Diagnostic.Kind kind, CharSequence msg, |
900 |
com.sun.source.tree.Tree t, |
|
901 |
com.sun.source.tree.CompilationUnitTree root) { |
|
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
902 |
printMessage(kind, msg, ((JCTree) t).pos(), root); |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
903 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
904 |
|
26266
2d24bda701dc
8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents:
26264
diff
changeset
|
905 |
@DefinedBy(Api.COMPILER_TREE) |
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
906 |
public void printMessage(Diagnostic.Kind kind, CharSequence msg, |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
907 |
com.sun.source.doctree.DocTree t, |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
908 |
com.sun.source.doctree.DocCommentTree c, |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
909 |
com.sun.source.tree.CompilationUnitTree root) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
910 |
printMessage(kind, msg, ((DCTree) t).pos((DCDocComment) c), root); |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
911 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
912 |
|
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
913 |
private void printMessage(Diagnostic.Kind kind, CharSequence msg, |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
914 |
JCDiagnostic.DiagnosticPosition pos, |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
915 |
com.sun.source.tree.CompilationUnitTree root) { |
3149 | 916 |
JavaFileObject oldSource = null; |
917 |
JavaFileObject newSource = null; |
|
918 |
||
919 |
newSource = root.getSourceFile(); |
|
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
920 |
if (newSource == null) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
921 |
pos = null; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14258
diff
changeset
|
922 |
} else { |
3149 | 923 |
oldSource = log.useSource(newSource); |
924 |
} |
|
925 |
||
926 |
try { |
|
927 |
switch (kind) { |
|
928 |
case ERROR: |
|
28455
41245007c074
8066843: Messager.printMessage cannot print multiple errors for same source position
jlahoda
parents:
27224
diff
changeset
|
929 |
log.error(DiagnosticFlag.MULTIPLE, pos, "proc.messager", msg.toString()); |
3149 | 930 |
break; |
931 |
||
932 |
case WARNING: |
|
933 |
log.warning(pos, "proc.messager", msg.toString()); |
|
934 |
break; |
|
935 |
||
936 |
case MANDATORY_WARNING: |
|
937 |
log.mandatoryWarning(pos, "proc.messager", msg.toString()); |
|
938 |
break; |
|
939 |
||
940 |
default: |
|
941 |
log.note(pos, "proc.messager", msg.toString()); |
|
942 |
} |
|
943 |
} finally { |
|
944 |
if (oldSource != null) |
|
945 |
log.useSource(oldSource); |
|
946 |
} |
|
947 |
} |
|
9599
0996df19ea87
7029150: Project Coin: present union types from the tree API through to javax.lang.model
jjg
parents:
7631
diff
changeset
|
948 |
|
26266
2d24bda701dc
8056061: Mark implementations of public interfaces with an annotation
jlahoda
parents:
26264
diff
changeset
|
949 |
@Override @DefinedBy(Api.COMPILER_TREE) |
9599
0996df19ea87
7029150: Project Coin: present union types from the tree API through to javax.lang.model
jjg
parents:
7631
diff
changeset
|
950 |
public TypeMirror getLub(CatchTree tree) { |
0996df19ea87
7029150: Project Coin: present union types from the tree API through to javax.lang.model
jjg
parents:
7631
diff
changeset
|
951 |
JCCatch ct = (JCCatch) tree; |
0996df19ea87
7029150: Project Coin: present union types from the tree API through to javax.lang.model
jjg
parents:
7631
diff
changeset
|
952 |
JCVariableDecl v = ct.param; |
0996df19ea87
7029150: Project Coin: present union types from the tree API through to javax.lang.model
jjg
parents:
7631
diff
changeset
|
953 |
if (v.type != null && v.type.getKind() == TypeKind.UNION) { |
0996df19ea87
7029150: Project Coin: present union types from the tree API through to javax.lang.model
jjg
parents:
7631
diff
changeset
|
954 |
UnionClassType ut = (UnionClassType) v.type; |
0996df19ea87
7029150: Project Coin: present union types from the tree API through to javax.lang.model
jjg
parents:
7631
diff
changeset
|
955 |
return ut.getLub(); |
0996df19ea87
7029150: Project Coin: present union types from the tree API through to javax.lang.model
jjg
parents:
7631
diff
changeset
|
956 |
} else { |
0996df19ea87
7029150: Project Coin: present union types from the tree API through to javax.lang.model
jjg
parents:
7631
diff
changeset
|
957 |
return v.type; |
0996df19ea87
7029150: Project Coin: present union types from the tree API through to javax.lang.model
jjg
parents:
7631
diff
changeset
|
958 |
} |
0996df19ea87
7029150: Project Coin: present union types from the tree API through to javax.lang.model
jjg
parents:
7631
diff
changeset
|
959 |
} |
10 | 960 |
} |