author | rfield |
Fri, 16 Jan 2015 20:03:30 -0800 | |
changeset 28587 | ce5606145ea3 |
permissions | -rw-r--r-- |
28587
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
1 |
/* |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
2 |
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
4 |
* |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
8 |
* |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
13 |
* accompanied this code). |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
14 |
* |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
18 |
* |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
21 |
* questions. |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
22 |
*/ |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
23 |
|
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
24 |
import com.sun.tools.javac.code.TypeTag; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
25 |
import com.sun.tools.javac.parser.JavacParser; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
26 |
import com.sun.tools.javac.parser.ParserFactory; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
27 |
import com.sun.tools.javac.parser.Tokens.Comment; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
28 |
import com.sun.tools.javac.parser.Tokens.Comment.CommentStyle; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
29 |
import com.sun.tools.javac.parser.Tokens.Token; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
30 |
import static com.sun.tools.javac.parser.Tokens.TokenKind.CLASS; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
31 |
import static com.sun.tools.javac.parser.Tokens.TokenKind.COLON; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
32 |
import static com.sun.tools.javac.parser.Tokens.TokenKind.ENUM; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
33 |
import static com.sun.tools.javac.parser.Tokens.TokenKind.EOF; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
34 |
import static com.sun.tools.javac.parser.Tokens.TokenKind.IMPORT; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
35 |
import static com.sun.tools.javac.parser.Tokens.TokenKind.INTERFACE; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
36 |
import static com.sun.tools.javac.parser.Tokens.TokenKind.LPAREN; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
37 |
import static com.sun.tools.javac.parser.Tokens.TokenKind.MONKEYS_AT; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
38 |
import static com.sun.tools.javac.parser.Tokens.TokenKind.PACKAGE; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
39 |
import static com.sun.tools.javac.parser.Tokens.TokenKind.SEMI; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
40 |
import static com.sun.tools.javac.parser.Tokens.TokenKind.VOID; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
41 |
import com.sun.tools.javac.tree.JCTree; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
42 |
import com.sun.tools.javac.tree.JCTree.JCAnnotation; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
43 |
import com.sun.tools.javac.tree.JCTree.JCCompilationUnit; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
44 |
import com.sun.tools.javac.tree.JCTree.JCExpression; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
45 |
import com.sun.tools.javac.tree.JCTree.JCExpressionStatement; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
46 |
import com.sun.tools.javac.tree.JCTree.JCModifiers; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
47 |
import com.sun.tools.javac.tree.JCTree.JCPackageDecl; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
48 |
import com.sun.tools.javac.tree.JCTree.JCStatement; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
49 |
import com.sun.tools.javac.tree.JCTree.JCTypeParameter; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
50 |
import com.sun.tools.javac.tree.JCTree.JCVariableDecl; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
51 |
import com.sun.tools.javac.tree.JCTree.Tag; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
52 |
import static com.sun.tools.javac.tree.JCTree.Tag.IDENT; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
53 |
import com.sun.tools.javac.util.List; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
54 |
import com.sun.tools.javac.util.ListBuffer; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
55 |
import com.sun.tools.javac.util.Name; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
56 |
import com.sun.tools.javac.util.Position; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
57 |
|
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
58 |
/** |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
59 |
* |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
60 |
* @author Robert Field |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
61 |
*/ |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
62 |
class TrialParser extends JavacParser { |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
63 |
|
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
64 |
public TrialParser(ParserFactory fac, |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
65 |
com.sun.tools.javac.parser.Lexer S, |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
66 |
boolean keepDocComments, |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
67 |
boolean keepLineMap, |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
68 |
boolean keepEndPositions) { |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
69 |
super(fac, S, keepDocComments, keepLineMap, keepEndPositions); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
70 |
} |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
71 |
|
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
72 |
@Override |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
73 |
public JCCompilationUnit parseCompilationUnit() { |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
74 |
Token firstToken = token; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
75 |
JCModifiers mods = null; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
76 |
boolean seenImport = false; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
77 |
boolean seenPackage = false; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
78 |
ListBuffer<JCTree> defs = new ListBuffer<>(); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
79 |
if (token.kind == MONKEYS_AT) { |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
80 |
mods = modifiersOpt(); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
81 |
} |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
82 |
|
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
83 |
if (token.kind == PACKAGE) { |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
84 |
int packagePos = token.pos; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
85 |
List<JCAnnotation> annotations = List.nil(); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
86 |
seenPackage = true; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
87 |
if (mods != null) { |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
88 |
checkNoMods(mods.flags); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
89 |
annotations = mods.annotations; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
90 |
mods = null; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
91 |
} |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
92 |
nextToken(); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
93 |
JCExpression pid = qualident(false); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
94 |
accept(SEMI); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
95 |
JCPackageDecl pd = F.at(packagePos).PackageDecl(annotations, pid); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
96 |
attach(pd, firstToken.comment(CommentStyle.JAVADOC)); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
97 |
storeEnd(pd, token.pos); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
98 |
defs.append(pd); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
99 |
} |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
100 |
|
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
101 |
boolean firstTypeDecl = true; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
102 |
while (token.kind != EOF) { |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
103 |
if (token.pos > 0 && token.pos <= endPosTable.errorEndPos) { |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
104 |
// error recovery |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
105 |
skip(true, false, false, false); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
106 |
if (token.kind == EOF) { |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
107 |
break; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
108 |
} |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
109 |
} |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
110 |
if (mods == null && token.kind == IMPORT) { |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
111 |
seenImport = true; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
112 |
defs.append(importDeclaration()); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
113 |
break; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
114 |
} else { |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
115 |
Comment docComment = token.comment(CommentStyle.JAVADOC); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
116 |
if (firstTypeDecl && !seenImport && !seenPackage) { |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
117 |
docComment = firstToken.comment(CommentStyle.JAVADOC); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
118 |
} |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
119 |
List<? extends JCTree> udefs = aUnit(mods, docComment); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
120 |
for (JCTree def : udefs) { |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
121 |
defs.append(def); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
122 |
} |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
123 |
mods = null; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
124 |
firstTypeDecl = false; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
125 |
break; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
126 |
} |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
127 |
} |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
128 |
List<JCTree> rdefs = defs.toList(); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
129 |
class TrialUnit extends JCCompilationUnit { |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
130 |
|
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
131 |
public TrialUnit(List<JCTree> defs) { |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
132 |
super(defs); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
133 |
} |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
134 |
} |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
135 |
JCCompilationUnit toplevel = new TrialUnit(rdefs); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
136 |
if (rdefs.isEmpty()) { |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
137 |
storeEnd(toplevel, S.prevToken().endPos); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
138 |
} |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
139 |
toplevel.lineMap = S.getLineMap(); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
140 |
this.endPosTable.setParser(null); // remove reference to parser |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
141 |
toplevel.endPositions = this.endPosTable; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
142 |
return toplevel; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
143 |
} |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
144 |
|
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
145 |
List<? extends JCTree> aUnit(JCModifiers pmods, Comment dc) { |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
146 |
switch (token.kind) { |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
147 |
case EOF: |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
148 |
return List.nil(); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
149 |
case RBRACE: |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
150 |
case CASE: |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
151 |
case DEFAULT: |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
152 |
// These are illegal, fall through to handle as illegal statement |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
153 |
case LBRACE: |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
154 |
case IF: |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
155 |
case FOR: |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
156 |
case WHILE: |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
157 |
case DO: |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
158 |
case TRY: |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
159 |
case SWITCH: |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
160 |
case SYNCHRONIZED: |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
161 |
case RETURN: |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
162 |
case THROW: |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
163 |
case BREAK: |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
164 |
case CONTINUE: |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
165 |
case SEMI: |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
166 |
case ELSE: |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
167 |
case FINALLY: |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
168 |
case CATCH: |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
169 |
case ASSERT: |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
170 |
return List.<JCTree>of(parseStatement()); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
171 |
default: |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
172 |
JCModifiers mods = modifiersOpt(pmods); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
173 |
if (token.kind == CLASS |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
174 |
|| token.kind == INTERFACE |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
175 |
|| token.kind == ENUM) { |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
176 |
return List.<JCTree>of(classOrInterfaceOrEnumDeclaration(mods, dc)); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
177 |
} else { |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
178 |
int pos = token.pos; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
179 |
List<JCTypeParameter> typarams = typeParametersOpt(); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
180 |
// if there are type parameters but no modifiers, save the start |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
181 |
// position of the method in the modifiers. |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
182 |
if (typarams.nonEmpty() && mods.pos == Position.NOPOS) { |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
183 |
mods.pos = pos; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
184 |
storeEnd(mods, pos); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
185 |
} |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
186 |
List<JCAnnotation> annosAfterParams = annotationsOpt(Tag.ANNOTATION); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
187 |
|
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
188 |
if (annosAfterParams.nonEmpty()) { |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
189 |
checkAnnotationsAfterTypeParams(annosAfterParams.head.pos); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
190 |
mods.annotations = mods.annotations.appendList(annosAfterParams); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
191 |
if (mods.pos == Position.NOPOS) { |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
192 |
mods.pos = mods.annotations.head.pos; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
193 |
} |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
194 |
} |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
195 |
|
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
196 |
Token prevToken = token; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
197 |
pos = token.pos; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
198 |
JCExpression t; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
199 |
boolean isVoid = token.kind == VOID; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
200 |
if (isVoid) { |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
201 |
t = to(F.at(pos).TypeIdent(TypeTag.VOID)); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
202 |
nextToken(); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
203 |
} else { |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
204 |
// return type of method, declared type of variable, or an expression |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
205 |
t = term(EXPR | TYPE); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
206 |
} |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
207 |
if (token.kind == COLON && t.hasTag(IDENT)) { |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
208 |
// labelled statement |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
209 |
nextToken(); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
210 |
JCStatement stat = parseStatement(); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
211 |
return List.<JCTree>of(F.at(pos).Labelled(prevToken.name(), stat)); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
212 |
} else if ((isVoid || (lastmode & TYPE) != 0) && LAX_IDENTIFIER.accepts(token.kind)) { |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
213 |
// we have "Type Ident", so we can assume it is variable or method declaration |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
214 |
pos = token.pos; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
215 |
Name name = ident(); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
216 |
if (token.kind == LPAREN) { |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
217 |
// method declaration |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
218 |
//mods.flags |= Flags.STATIC; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
219 |
return List.of(methodDeclaratorRest( |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
220 |
pos, mods, t, name, typarams, |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
221 |
false, isVoid, dc)); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
222 |
} else if (!isVoid && typarams.isEmpty()) { |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
223 |
// variable declaration |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
224 |
//mods.flags |= Flags.STATIC; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
225 |
List<JCTree> defs |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
226 |
= variableDeclaratorsRest(pos, mods, t, name, false, dc, |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
227 |
new ListBuffer<JCTree>()).toList(); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
228 |
accept(SEMI); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
229 |
storeEnd(defs.last(), S.prevToken().endPos); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
230 |
return defs; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
231 |
} else { |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
232 |
// malformed declaration, return error |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
233 |
pos = token.pos; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
234 |
List<JCTree> err = isVoid |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
235 |
? List.<JCTree>of(toP(F.at(pos).MethodDef(mods, name, t, typarams, |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
236 |
List.<JCVariableDecl>nil(), List.<JCExpression>nil(), null, null))) |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
237 |
: null; |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
238 |
return List.<JCTree>of(syntaxError(token.pos, err, "expected", LPAREN)); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
239 |
} |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
240 |
} else if (!typarams.isEmpty()) { |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
241 |
// type parameters on non-variable non-method -- error |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
242 |
return List.<JCTree>of(syntaxError(token.pos, "illegal.start.of.type")); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
243 |
} else { |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
244 |
// expression-statement or expression to evaluate |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
245 |
accept(SEMI); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
246 |
JCExpressionStatement expr = toP(F.at(pos).Exec(t)); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
247 |
return List.<JCTree>of(expr); |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
248 |
} |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
249 |
|
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
250 |
} |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
251 |
} |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
252 |
} |
ce5606145ea3
8068488: Facilitate extension of the javac parser -- missing modifier
rfield
parents:
diff
changeset
|
253 |
} |