author | mcimadamore |
Sat, 17 Nov 2012 19:01:03 +0000 | |
changeset 14547 | 86d8d242b0c4 |
parent 14541 | 36f9d11fc9aa |
child 14722 | aaa39655aa2e |
permissions | -rw-r--r-- |
10 | 1 |
/* |
12466
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
2 |
* Copyright (c) 1999, 2012, 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.parser; |
|
27 |
||
28 |
import java.util.*; |
|
29 |
||
11144
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
30 |
import com.sun.source.tree.MemberReferenceTree.ReferenceMode; |
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
31 |
|
10455
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
32 |
import com.sun.tools.javac.code.*; |
10815 | 33 |
import com.sun.tools.javac.parser.Tokens.*; |
10948 | 34 |
import com.sun.tools.javac.parser.Tokens.Comment.CommentStyle; |
10 | 35 |
import com.sun.tools.javac.tree.*; |
10455
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
36 |
import com.sun.tools.javac.tree.JCTree.*; |
10 | 37 |
import com.sun.tools.javac.util.*; |
7076
c96fa26247c8
6994946: option to specify only syntax errors as unrecoverable
jjg
parents:
7074
diff
changeset
|
38 |
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticFlag; |
10455
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
39 |
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition; |
10 | 40 |
import com.sun.tools.javac.util.List; |
41 |
||
10950 | 42 |
import static com.sun.tools.javac.parser.Tokens.TokenKind.*; |
43 |
import static com.sun.tools.javac.parser.Tokens.TokenKind.ASSERT; |
|
44 |
import static com.sun.tools.javac.parser.Tokens.TokenKind.CASE; |
|
45 |
import static com.sun.tools.javac.parser.Tokens.TokenKind.CATCH; |
|
46 |
import static com.sun.tools.javac.parser.Tokens.TokenKind.EQ; |
|
47 |
import static com.sun.tools.javac.parser.Tokens.TokenKind.GT; |
|
48 |
import static com.sun.tools.javac.parser.Tokens.TokenKind.IMPORT; |
|
49 |
import static com.sun.tools.javac.parser.Tokens.TokenKind.LT; |
|
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14450
diff
changeset
|
50 |
import static com.sun.tools.javac.tree.JCTree.Tag.*; |
10455
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
51 |
import static com.sun.tools.javac.util.ListBuffer.lb; |
10 | 52 |
|
53 |
/** The parser maps a token sequence into an abstract syntax |
|
54 |
* tree. It operates by recursive descent, with code derived |
|
55 |
* systematically from an LL(1) grammar. For efficiency reasons, an |
|
56 |
* operator precedence scheme is used for parsing binary operation |
|
57 |
* expressions. |
|
58 |
* |
|
5847
1908176fd6e3
6944312: Potential rebranding issues in openjdk/langtools repository sources
jjg
parents:
5520
diff
changeset
|
59 |
* <p><b>This is NOT part of any supported API. |
1908176fd6e3
6944312: Potential rebranding issues in openjdk/langtools repository sources
jjg
parents:
5520
diff
changeset
|
60 |
* If you write code that depends on this, you do so at your own risk. |
10 | 61 |
* This code and its internal interfaces are subject to change or |
62 |
* deletion without notice.</b> |
|
63 |
*/ |
|
1258
1cf37d8837d1
6724118: change JavaCompiler to not use Scanner directly
jjg
parents:
939
diff
changeset
|
64 |
public class JavacParser implements Parser { |
10 | 65 |
|
66 |
/** The number of precedence levels of infix operators. |
|
67 |
*/ |
|
68 |
private static final int infixPrecedenceLevels = 10; |
|
69 |
||
70 |
/** The scanner used for lexical analysis. |
|
71 |
*/ |
|
10200
56cc93e7b6ef
7068902: (javac) allow enabling or disabling of String folding
ksrini
parents:
10199
diff
changeset
|
72 |
protected Lexer S; |
10 | 73 |
|
74 |
/** The factory to be used for abstract syntax tree construction. |
|
75 |
*/ |
|
76 |
protected TreeMaker F; |
|
77 |
||
78 |
/** The log to be used for error diagnostics. |
|
79 |
*/ |
|
80 |
private Log log; |
|
81 |
||
82 |
/** The Source language setting. */ |
|
83 |
private Source source; |
|
84 |
||
85 |
/** The name table. */ |
|
1260
a772ba9ba43d
6574134: Allow for alternative implementation of Name Table with garbage collection of name bytes
jjg
parents:
1258
diff
changeset
|
86 |
private Names names; |
10 | 87 |
|
11055 | 88 |
/** End position mappings container */ |
89 |
private final AbstractEndPosTable endPosTable; |
|
90 |
||
14450
7a62c5b13d6e
8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents:
14359
diff
changeset
|
91 |
interface ErrorRecoveryAction { |
7a62c5b13d6e
8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents:
14359
diff
changeset
|
92 |
JCTree doRecover(JavacParser parser); |
7a62c5b13d6e
8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents:
14359
diff
changeset
|
93 |
} |
7a62c5b13d6e
8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents:
14359
diff
changeset
|
94 |
|
7a62c5b13d6e
8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents:
14359
diff
changeset
|
95 |
enum BasicErrorRecoveryAction implements ErrorRecoveryAction { |
7a62c5b13d6e
8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents:
14359
diff
changeset
|
96 |
BLOCK_STMT {public JCTree doRecover(JavacParser parser) { return parser.parseStatementAsBlock(); }}, |
7a62c5b13d6e
8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents:
14359
diff
changeset
|
97 |
CATCH_CLAUSE {public JCTree doRecover(JavacParser parser) { return parser.catchClause(); }} |
7a62c5b13d6e
8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents:
14359
diff
changeset
|
98 |
} |
7a62c5b13d6e
8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents:
14359
diff
changeset
|
99 |
|
10 | 100 |
/** Construct a parser from a given scanner, tree factory and log. |
101 |
*/ |
|
1258
1cf37d8837d1
6724118: change JavaCompiler to not use Scanner directly
jjg
parents:
939
diff
changeset
|
102 |
protected JavacParser(ParserFactory fac, |
10 | 103 |
Lexer S, |
1258
1cf37d8837d1
6724118: change JavaCompiler to not use Scanner directly
jjg
parents:
939
diff
changeset
|
104 |
boolean keepDocComments, |
11055 | 105 |
boolean keepLineMap, |
106 |
boolean keepEndPositions) { |
|
10 | 107 |
this.S = S; |
10815 | 108 |
nextToken(); // prime the pump |
10 | 109 |
this.F = fac.F; |
110 |
this.log = fac.log; |
|
111 |
this.names = fac.names; |
|
112 |
this.source = fac.source; |
|
113 |
this.allowGenerics = source.allowGenerics(); |
|
114 |
this.allowVarargs = source.allowVarargs(); |
|
115 |
this.allowAsserts = source.allowAsserts(); |
|
116 |
this.allowEnums = source.allowEnums(); |
|
117 |
this.allowForeach = source.allowForeach(); |
|
118 |
this.allowStaticImport = source.allowStaticImport(); |
|
119 |
this.allowAnnotations = source.allowAnnotations(); |
|
6148
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
6146
diff
changeset
|
120 |
this.allowTWR = source.allowTryWithResources(); |
5321
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
5320
diff
changeset
|
121 |
this.allowDiamond = source.allowDiamond(); |
5492
515e4b33b335
6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents:
5321
diff
changeset
|
122 |
this.allowMulticatch = source.allowMulticatch(); |
10200
56cc93e7b6ef
7068902: (javac) allow enabling or disabling of String folding
ksrini
parents:
10199
diff
changeset
|
123 |
this.allowStringFolding = fac.options.getBoolean("allowStringFolding", true); |
14547 | 124 |
this.allowLambda = source.allowLambda(); |
125 |
this.allowMethodReferences = source.allowMethodReferences(); |
|
126 |
this.allowDefaultMethods = source.allowDefaultMethods(); |
|
10 | 127 |
this.keepDocComments = keepDocComments; |
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14450
diff
changeset
|
128 |
docComments = newDocCommentTable(keepDocComments, fac); |
1258
1cf37d8837d1
6724118: change JavaCompiler to not use Scanner directly
jjg
parents:
939
diff
changeset
|
129 |
this.keepLineMap = keepLineMap; |
10 | 130 |
this.errorTree = F.Erroneous(); |
11055 | 131 |
endPosTable = newEndPosTable(keepEndPositions); |
10 | 132 |
} |
133 |
||
11055 | 134 |
protected AbstractEndPosTable newEndPosTable(boolean keepEndPositions) { |
135 |
return keepEndPositions |
|
136 |
? new SimpleEndPosTable() |
|
137 |
: new EmptyEndPosTable(); |
|
138 |
} |
|
13077 | 139 |
|
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14450
diff
changeset
|
140 |
protected DocCommentTable newDocCommentTable(boolean keepDocComments, ParserFactory fac) { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14450
diff
changeset
|
141 |
return keepDocComments ? new LazyDocCommentTable(fac) : null; |
13077 | 142 |
} |
143 |
||
10 | 144 |
/** Switch: Should generics be recognized? |
145 |
*/ |
|
146 |
boolean allowGenerics; |
|
147 |
||
5321
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
5320
diff
changeset
|
148 |
/** Switch: Should diamond operator be recognized? |
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
5320
diff
changeset
|
149 |
*/ |
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
5320
diff
changeset
|
150 |
boolean allowDiamond; |
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
5320
diff
changeset
|
151 |
|
5492
515e4b33b335
6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents:
5321
diff
changeset
|
152 |
/** Switch: Should multicatch clause be accepted? |
515e4b33b335
6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents:
5321
diff
changeset
|
153 |
*/ |
515e4b33b335
6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents:
5321
diff
changeset
|
154 |
boolean allowMulticatch; |
515e4b33b335
6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents:
5321
diff
changeset
|
155 |
|
10 | 156 |
/** Switch: Should varargs be recognized? |
157 |
*/ |
|
158 |
boolean allowVarargs; |
|
159 |
||
160 |
/** Switch: should we recognize assert statements, or just give a warning? |
|
161 |
*/ |
|
162 |
boolean allowAsserts; |
|
163 |
||
164 |
/** Switch: should we recognize enums, or just give a warning? |
|
165 |
*/ |
|
166 |
boolean allowEnums; |
|
167 |
||
168 |
/** Switch: should we recognize foreach? |
|
169 |
*/ |
|
170 |
boolean allowForeach; |
|
171 |
||
172 |
/** Switch: should we recognize foreach? |
|
173 |
*/ |
|
174 |
boolean allowStaticImport; |
|
175 |
||
176 |
/** Switch: should we recognize annotations? |
|
177 |
*/ |
|
178 |
boolean allowAnnotations; |
|
179 |
||
8224
8f18e1622660
7013420: Project Coin: remove general expression support from try-with-resources statement
darcy
parents:
8047
diff
changeset
|
180 |
/** Switch: should we recognize try-with-resources? |
6148
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
6146
diff
changeset
|
181 |
*/ |
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
6146
diff
changeset
|
182 |
boolean allowTWR; |
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
6146
diff
changeset
|
183 |
|
10200
56cc93e7b6ef
7068902: (javac) allow enabling or disabling of String folding
ksrini
parents:
10199
diff
changeset
|
184 |
/** Switch: should we fold strings? |
56cc93e7b6ef
7068902: (javac) allow enabling or disabling of String folding
ksrini
parents:
10199
diff
changeset
|
185 |
*/ |
56cc93e7b6ef
7068902: (javac) allow enabling or disabling of String folding
ksrini
parents:
10199
diff
changeset
|
186 |
boolean allowStringFolding; |
56cc93e7b6ef
7068902: (javac) allow enabling or disabling of String folding
ksrini
parents:
10199
diff
changeset
|
187 |
|
11143
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
188 |
/** Switch: should we recognize lambda expressions? |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
189 |
*/ |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
190 |
boolean allowLambda; |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
191 |
|
11144
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
192 |
/** Switch: should we allow method/constructor references? |
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
193 |
*/ |
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
194 |
boolean allowMethodReferences; |
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
195 |
|
14267
6321fbe0cf50
7192245: Add parser support for default methods
mcimadamore
parents:
14263
diff
changeset
|
196 |
/** Switch: should we allow default methods in interfaces? |
6321fbe0cf50
7192245: Add parser support for default methods
mcimadamore
parents:
14263
diff
changeset
|
197 |
*/ |
6321fbe0cf50
7192245: Add parser support for default methods
mcimadamore
parents:
14263
diff
changeset
|
198 |
boolean allowDefaultMethods; |
6321fbe0cf50
7192245: Add parser support for default methods
mcimadamore
parents:
14263
diff
changeset
|
199 |
|
10 | 200 |
/** Switch: should we keep docComments? |
201 |
*/ |
|
202 |
boolean keepDocComments; |
|
203 |
||
1258
1cf37d8837d1
6724118: change JavaCompiler to not use Scanner directly
jjg
parents:
939
diff
changeset
|
204 |
/** Switch: should we keep line table? |
1cf37d8837d1
6724118: change JavaCompiler to not use Scanner directly
jjg
parents:
939
diff
changeset
|
205 |
*/ |
1cf37d8837d1
6724118: change JavaCompiler to not use Scanner directly
jjg
parents:
939
diff
changeset
|
206 |
boolean keepLineMap; |
1cf37d8837d1
6724118: change JavaCompiler to not use Scanner directly
jjg
parents:
939
diff
changeset
|
207 |
|
10 | 208 |
/** When terms are parsed, the mode determines which is expected: |
209 |
* mode = EXPR : an expression |
|
210 |
* mode = TYPE : a type |
|
211 |
* mode = NOPARAMS : no parameters allowed for type |
|
212 |
* mode = TYPEARG : type argument |
|
213 |
*/ |
|
5321
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
5320
diff
changeset
|
214 |
static final int EXPR = 0x1; |
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
5320
diff
changeset
|
215 |
static final int TYPE = 0x2; |
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
5320
diff
changeset
|
216 |
static final int NOPARAMS = 0x4; |
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
5320
diff
changeset
|
217 |
static final int TYPEARG = 0x8; |
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
5320
diff
changeset
|
218 |
static final int DIAMOND = 0x10; |
10 | 219 |
|
220 |
/** The current mode. |
|
221 |
*/ |
|
222 |
private int mode = 0; |
|
223 |
||
224 |
/** The mode of the term that was parsed last. |
|
225 |
*/ |
|
226 |
private int lastmode = 0; |
|
227 |
||
10815 | 228 |
/* ---------- token management -------------- */ |
229 |
||
230 |
protected Token token; |
|
231 |
||
14541
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14450
diff
changeset
|
232 |
public Token token() { |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14450
diff
changeset
|
233 |
return token; |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14450
diff
changeset
|
234 |
} |
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14450
diff
changeset
|
235 |
|
36f9d11fc9aa
7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents:
14450
diff
changeset
|
236 |
public void nextToken() { |
10815 | 237 |
S.nextToken(); |
238 |
token = S.token(); |
|
239 |
} |
|
240 |
||
11143
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
241 |
protected boolean peekToken(TokenKind tk) { |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
242 |
return S.token(1).kind == tk; |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
243 |
} |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
244 |
|
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
245 |
protected boolean peekToken(TokenKind tk1, TokenKind tk2) { |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
246 |
return S.token(1).kind == tk1 && |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
247 |
S.token(2).kind == tk2; |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
248 |
} |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
249 |
|
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
250 |
protected boolean peekToken(TokenKind tk1, TokenKind tk2, TokenKind tk3) { |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
251 |
return S.token(1).kind == tk1 && |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
252 |
S.token(2).kind == tk2 && |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
253 |
S.token(3).kind == tk3; |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
254 |
} |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
255 |
|
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
256 |
protected boolean peekToken(TokenKind... kinds) { |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
257 |
for (int lookahead = 0 ; lookahead < kinds.length ; lookahead++) { |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
258 |
if (S.token(lookahead + 1).kind != kinds[lookahead]) { |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
259 |
return false; |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
260 |
} |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
261 |
} |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
262 |
return true; |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
263 |
} |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
264 |
|
10815 | 265 |
/* ---------- error recovery -------------- */ |
10 | 266 |
|
267 |
private JCErroneous errorTree; |
|
268 |
||
269 |
/** Skip forward until a suitable stop token is found. |
|
270 |
*/ |
|
271 |
private void skip(boolean stopAtImport, boolean stopAtMemberDecl, boolean stopAtIdentifier, boolean stopAtStatement) { |
|
272 |
while (true) { |
|
10815 | 273 |
switch (token.kind) { |
10 | 274 |
case SEMI: |
10815 | 275 |
nextToken(); |
10 | 276 |
return; |
277 |
case PUBLIC: |
|
278 |
case FINAL: |
|
279 |
case ABSTRACT: |
|
280 |
case MONKEYS_AT: |
|
281 |
case EOF: |
|
282 |
case CLASS: |
|
283 |
case INTERFACE: |
|
284 |
case ENUM: |
|
285 |
return; |
|
286 |
case IMPORT: |
|
287 |
if (stopAtImport) |
|
288 |
return; |
|
289 |
break; |
|
290 |
case LBRACE: |
|
291 |
case RBRACE: |
|
292 |
case PRIVATE: |
|
293 |
case PROTECTED: |
|
294 |
case STATIC: |
|
295 |
case TRANSIENT: |
|
296 |
case NATIVE: |
|
297 |
case VOLATILE: |
|
298 |
case SYNCHRONIZED: |
|
299 |
case STRICTFP: |
|
300 |
case LT: |
|
301 |
case BYTE: |
|
302 |
case SHORT: |
|
303 |
case CHAR: |
|
304 |
case INT: |
|
305 |
case LONG: |
|
306 |
case FLOAT: |
|
307 |
case DOUBLE: |
|
308 |
case BOOLEAN: |
|
309 |
case VOID: |
|
310 |
if (stopAtMemberDecl) |
|
311 |
return; |
|
312 |
break; |
|
313 |
case IDENTIFIER: |
|
314 |
if (stopAtIdentifier) |
|
315 |
return; |
|
316 |
break; |
|
317 |
case CASE: |
|
318 |
case DEFAULT: |
|
319 |
case IF: |
|
320 |
case FOR: |
|
321 |
case WHILE: |
|
322 |
case DO: |
|
323 |
case TRY: |
|
324 |
case SWITCH: |
|
325 |
case RETURN: |
|
326 |
case THROW: |
|
327 |
case BREAK: |
|
328 |
case CONTINUE: |
|
329 |
case ELSE: |
|
330 |
case FINALLY: |
|
331 |
case CATCH: |
|
332 |
if (stopAtStatement) |
|
333 |
return; |
|
334 |
break; |
|
335 |
} |
|
10815 | 336 |
nextToken(); |
10 | 337 |
} |
338 |
} |
|
339 |
||
10815 | 340 |
private JCErroneous syntaxError(int pos, String key, TokenKind... args) { |
10455
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
341 |
return syntaxError(pos, List.<JCTree>nil(), key, args); |
10 | 342 |
} |
343 |
||
10815 | 344 |
private JCErroneous syntaxError(int pos, List<JCTree> errs, String key, TokenKind... args) { |
10 | 345 |
setErrorEndPos(pos); |
10455
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
346 |
JCErroneous err = F.at(pos).Erroneous(errs); |
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
347 |
reportSyntaxError(err, key, (Object[])args); |
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
348 |
if (errs != null) { |
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
349 |
JCTree last = errs.last(); |
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
350 |
if (last != null) |
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
351 |
storeEnd(last, pos); |
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
352 |
} |
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
353 |
return toP(err); |
10 | 354 |
} |
355 |
||
356 |
private int errorPos = Position.NOPOS; |
|
10455
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
357 |
|
10 | 358 |
/** |
10455
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
359 |
* Report a syntax using the given the position parameter and arguments, |
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
360 |
* unless one was already reported at the same position. |
10 | 361 |
*/ |
939
38e24969c7e9
6717241: some diagnostic argument is prematurely converted into a String object
mcimadamore
parents:
735
diff
changeset
|
362 |
private void reportSyntaxError(int pos, String key, Object... args) { |
10455
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
363 |
JCDiagnostic.DiagnosticPosition diag = new JCDiagnostic.SimpleDiagnosticPosition(pos); |
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
364 |
reportSyntaxError(diag, key, args); |
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
365 |
} |
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
366 |
|
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
367 |
/** |
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
368 |
* Report a syntax error using the given DiagnosticPosition object and |
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
369 |
* arguments, unless one was already reported at the same position. |
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
370 |
*/ |
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
371 |
private void reportSyntaxError(JCDiagnostic.DiagnosticPosition diagPos, String key, Object... args) { |
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
372 |
int pos = diagPos.getPreferredPosition(); |
10 | 373 |
if (pos > S.errPos() || pos == Position.NOPOS) { |
10815 | 374 |
if (token.kind == EOF) { |
10455
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
375 |
error(diagPos, "premature.eof"); |
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
376 |
} else { |
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
377 |
error(diagPos, key, args); |
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
378 |
} |
10 | 379 |
} |
380 |
S.errPos(pos); |
|
10815 | 381 |
if (token.pos == errorPos) |
382 |
nextToken(); // guarantee progress |
|
383 |
errorPos = token.pos; |
|
10 | 384 |
} |
385 |
||
386 |
||
387 |
/** Generate a syntax error at current position unless one was already |
|
388 |
* reported at the same position. |
|
389 |
*/ |
|
390 |
private JCErroneous syntaxError(String key) { |
|
10815 | 391 |
return syntaxError(token.pos, key); |
10 | 392 |
} |
393 |
||
394 |
/** Generate a syntax error at current position unless one was |
|
395 |
* already reported at the same position. |
|
396 |
*/ |
|
10815 | 397 |
private JCErroneous syntaxError(String key, TokenKind arg) { |
398 |
return syntaxError(token.pos, key, arg); |
|
10 | 399 |
} |
400 |
||
401 |
/** If next input token matches given token, skip it, otherwise report |
|
402 |
* an error. |
|
403 |
*/ |
|
10815 | 404 |
public void accept(TokenKind tk) { |
405 |
if (token.kind == tk) { |
|
406 |
nextToken(); |
|
10 | 407 |
} else { |
10815 | 408 |
setErrorEndPos(token.pos); |
409 |
reportSyntaxError(S.prevToken().endPos, "expected", tk); |
|
10 | 410 |
} |
411 |
} |
|
412 |
||
413 |
/** Report an illegal start of expression/type error at given position. |
|
414 |
*/ |
|
415 |
JCExpression illegal(int pos) { |
|
10455
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
416 |
setErrorEndPos(pos); |
10 | 417 |
if ((mode & EXPR) != 0) |
418 |
return syntaxError(pos, "illegal.start.of.expr"); |
|
419 |
else |
|
420 |
return syntaxError(pos, "illegal.start.of.type"); |
|
421 |
||
422 |
} |
|
423 |
||
424 |
/** Report an illegal start of expression/type error at current position. |
|
425 |
*/ |
|
426 |
JCExpression illegal() { |
|
10815 | 427 |
return illegal(token.pos); |
10 | 428 |
} |
429 |
||
430 |
/** Diagnose a modifier flag from the set, if any. */ |
|
431 |
void checkNoMods(long mods) { |
|
432 |
if (mods != 0) { |
|
433 |
long lowestMod = mods & -mods; |
|
10815 | 434 |
error(token.pos, "mod.not.allowed.here", |
939
38e24969c7e9
6717241: some diagnostic argument is prematurely converted into a String object
mcimadamore
parents:
735
diff
changeset
|
435 |
Flags.asFlagSet(lowestMod)); |
10 | 436 |
} |
437 |
} |
|
438 |
||
439 |
/* ---------- doc comments --------- */ |
|
440 |
||
13077 | 441 |
/** A table to store all documentation comments |
10 | 442 |
* indexed by the tree nodes they refer to. |
443 |
* defined only if option flag keepDocComment is set. |
|
444 |
*/ |
|
13077 | 445 |
private final DocCommentTable docComments; |
10 | 446 |
|
447 |
/** Make an entry into docComments hashtable, |
|
448 |
* provided flag keepDocComments is set and given doc comment is non-null. |
|
449 |
* @param tree The tree to be used as index in the hashtable |
|
450 |
* @param dc The doc comment to associate with the tree, or null. |
|
451 |
*/ |
|
13077 | 452 |
void attach(JCTree tree, Comment dc) { |
10 | 453 |
if (keepDocComments && dc != null) { |
454 |
// System.out.println("doc comment = ");System.out.println(dc);//DEBUG |
|
13077 | 455 |
docComments.putComment(tree, dc); |
10 | 456 |
} |
457 |
} |
|
458 |
||
459 |
/* -------- source positions ------- */ |
|
460 |
||
461 |
private void setErrorEndPos(int errPos) { |
|
11055 | 462 |
endPosTable.setErrorEndPos(errPos); |
10 | 463 |
} |
464 |
||
11055 | 465 |
private void storeEnd(JCTree tree, int endpos) { |
466 |
endPosTable.storeEnd(tree, endpos); |
|
10 | 467 |
} |
468 |
||
11055 | 469 |
private <T extends JCTree> T to(T t) { |
470 |
return endPosTable.to(t); |
|
471 |
} |
|
10 | 472 |
|
11055 | 473 |
private <T extends JCTree> T toP(T t) { |
474 |
return endPosTable.toP(t); |
|
475 |
} |
|
10 | 476 |
|
477 |
/** Get the start position for a tree node. The start position is |
|
478 |
* defined to be the position of the first character of the first |
|
479 |
* token of the node's source text. |
|
480 |
* @param tree The tree node |
|
481 |
*/ |
|
482 |
public int getStartPos(JCTree tree) { |
|
483 |
return TreeInfo.getStartPos(tree); |
|
484 |
} |
|
485 |
||
486 |
/** |
|
487 |
* Get the end position for a tree node. The end position is |
|
488 |
* defined to be the position of the last character of the last |
|
489 |
* token of the node's source text. Returns Position.NOPOS if end |
|
490 |
* positions are not generated or the position is otherwise not |
|
491 |
* found. |
|
492 |
* @param tree The tree node |
|
493 |
*/ |
|
494 |
public int getEndPos(JCTree tree) { |
|
11055 | 495 |
return endPosTable.getEndPos(tree); |
10 | 496 |
} |
497 |
||
498 |
||
499 |
||
500 |
/* ---------- parsing -------------- */ |
|
501 |
||
502 |
/** |
|
503 |
* Ident = IDENTIFIER |
|
504 |
*/ |
|
505 |
Name ident() { |
|
10815 | 506 |
if (token.kind == IDENTIFIER) { |
507 |
Name name = token.name(); |
|
508 |
nextToken(); |
|
10 | 509 |
return name; |
10815 | 510 |
} else if (token.kind == ASSERT) { |
10 | 511 |
if (allowAsserts) { |
10815 | 512 |
error(token.pos, "assert.as.identifier"); |
513 |
nextToken(); |
|
10 | 514 |
return names.error; |
515 |
} else { |
|
10815 | 516 |
warning(token.pos, "assert.as.identifier"); |
517 |
Name name = token.name(); |
|
518 |
nextToken(); |
|
10 | 519 |
return name; |
520 |
} |
|
10815 | 521 |
} else if (token.kind == ENUM) { |
10 | 522 |
if (allowEnums) { |
10815 | 523 |
error(token.pos, "enum.as.identifier"); |
524 |
nextToken(); |
|
10 | 525 |
return names.error; |
526 |
} else { |
|
10815 | 527 |
warning(token.pos, "enum.as.identifier"); |
528 |
Name name = token.name(); |
|
529 |
nextToken(); |
|
10 | 530 |
return name; |
531 |
} |
|
532 |
} else { |
|
533 |
accept(IDENTIFIER); |
|
534 |
return names.error; |
|
535 |
} |
|
536 |
} |
|
537 |
||
538 |
/** |
|
539 |
* Qualident = Ident { DOT Ident } |
|
540 |
*/ |
|
541 |
public JCExpression qualident() { |
|
10815 | 542 |
JCExpression t = toP(F.at(token.pos).Ident(ident())); |
543 |
while (token.kind == DOT) { |
|
544 |
int pos = token.pos; |
|
545 |
nextToken(); |
|
10 | 546 |
t = toP(F.at(pos).Select(t, ident())); |
547 |
} |
|
548 |
return t; |
|
549 |
} |
|
550 |
||
10455
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
551 |
JCExpression literal(Name prefix) { |
10815 | 552 |
return literal(prefix, token.pos); |
10455
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
553 |
} |
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
554 |
|
10 | 555 |
/** |
556 |
* Literal = |
|
557 |
* INTLITERAL |
|
558 |
* | LONGLITERAL |
|
559 |
* | FLOATLITERAL |
|
560 |
* | DOUBLELITERAL |
|
561 |
* | CHARLITERAL |
|
562 |
* | STRINGLITERAL |
|
563 |
* | TRUE |
|
564 |
* | FALSE |
|
565 |
* | NULL |
|
566 |
*/ |
|
10455
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
567 |
JCExpression literal(Name prefix, int pos) { |
10 | 568 |
JCExpression t = errorTree; |
10815 | 569 |
switch (token.kind) { |
10 | 570 |
case INTLITERAL: |
571 |
try { |
|
572 |
t = F.at(pos).Literal( |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
573 |
TypeTag.INT, |
10815 | 574 |
Convert.string2int(strval(prefix), token.radix())); |
10 | 575 |
} catch (NumberFormatException ex) { |
10815 | 576 |
error(token.pos, "int.number.too.large", strval(prefix)); |
10 | 577 |
} |
578 |
break; |
|
579 |
case LONGLITERAL: |
|
580 |
try { |
|
581 |
t = F.at(pos).Literal( |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
582 |
TypeTag.LONG, |
10815 | 583 |
new Long(Convert.string2long(strval(prefix), token.radix()))); |
10 | 584 |
} catch (NumberFormatException ex) { |
10815 | 585 |
error(token.pos, "int.number.too.large", strval(prefix)); |
10 | 586 |
} |
587 |
break; |
|
588 |
case FLOATLITERAL: { |
|
10815 | 589 |
String proper = token.radix() == 16 ? |
590 |
("0x"+ token.stringVal()) : |
|
591 |
token.stringVal(); |
|
10 | 592 |
Float n; |
593 |
try { |
|
594 |
n = Float.valueOf(proper); |
|
595 |
} catch (NumberFormatException ex) { |
|
7636
030f141aa32b
6504896: TreeMaker.Literal(Object) does not support Booleans
jjg
parents:
7211
diff
changeset
|
596 |
// error already reported in scanner |
10 | 597 |
n = Float.NaN; |
598 |
} |
|
599 |
if (n.floatValue() == 0.0f && !isZero(proper)) |
|
10815 | 600 |
error(token.pos, "fp.number.too.small"); |
10 | 601 |
else if (n.floatValue() == Float.POSITIVE_INFINITY) |
10815 | 602 |
error(token.pos, "fp.number.too.large"); |
10 | 603 |
else |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
604 |
t = F.at(pos).Literal(TypeTag.FLOAT, n); |
10 | 605 |
break; |
606 |
} |
|
607 |
case DOUBLELITERAL: { |
|
10815 | 608 |
String proper = token.radix() == 16 ? |
609 |
("0x"+ token.stringVal()) : |
|
610 |
token.stringVal(); |
|
10 | 611 |
Double n; |
612 |
try { |
|
613 |
n = Double.valueOf(proper); |
|
614 |
} catch (NumberFormatException ex) { |
|
615 |
// error already reported in scanner |
|
616 |
n = Double.NaN; |
|
617 |
} |
|
618 |
if (n.doubleValue() == 0.0d && !isZero(proper)) |
|
10815 | 619 |
error(token.pos, "fp.number.too.small"); |
10 | 620 |
else if (n.doubleValue() == Double.POSITIVE_INFINITY) |
10815 | 621 |
error(token.pos, "fp.number.too.large"); |
10 | 622 |
else |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
623 |
t = F.at(pos).Literal(TypeTag.DOUBLE, n); |
10 | 624 |
break; |
625 |
} |
|
626 |
case CHARLITERAL: |
|
627 |
t = F.at(pos).Literal( |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
628 |
TypeTag.CHAR, |
10815 | 629 |
token.stringVal().charAt(0) + 0); |
10 | 630 |
break; |
631 |
case STRINGLITERAL: |
|
632 |
t = F.at(pos).Literal( |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
633 |
TypeTag.CLASS, |
10815 | 634 |
token.stringVal()); |
10 | 635 |
break; |
636 |
case TRUE: case FALSE: |
|
637 |
t = F.at(pos).Literal( |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
638 |
TypeTag.BOOLEAN, |
10815 | 639 |
(token.kind == TRUE ? 1 : 0)); |
10 | 640 |
break; |
641 |
case NULL: |
|
642 |
t = F.at(pos).Literal( |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
643 |
TypeTag.BOT, |
10 | 644 |
null); |
645 |
break; |
|
646 |
default: |
|
8032 | 647 |
Assert.error(); |
10 | 648 |
} |
649 |
if (t == errorTree) |
|
650 |
t = F.at(pos).Erroneous(); |
|
10815 | 651 |
storeEnd(t, token.endPos); |
652 |
nextToken(); |
|
10 | 653 |
return t; |
654 |
} |
|
655 |
//where |
|
656 |
boolean isZero(String s) { |
|
657 |
char[] cs = s.toCharArray(); |
|
3894 | 658 |
int base = ((cs.length > 1 && Character.toLowerCase(cs[1]) == 'x') ? 16 : 10); |
10 | 659 |
int i = ((base==16) ? 2 : 0); |
660 |
while (i < cs.length && (cs[i] == '0' || cs[i] == '.')) i++; |
|
661 |
return !(i < cs.length && (Character.digit(cs[i], base) > 0)); |
|
662 |
} |
|
663 |
||
664 |
String strval(Name prefix) { |
|
10815 | 665 |
String s = token.stringVal(); |
1260
a772ba9ba43d
6574134: Allow for alternative implementation of Name Table with garbage collection of name bytes
jjg
parents:
1258
diff
changeset
|
666 |
return prefix.isEmpty() ? s : prefix + s; |
10 | 667 |
} |
668 |
||
669 |
/** terms can be either expressions or types. |
|
670 |
*/ |
|
1258
1cf37d8837d1
6724118: change JavaCompiler to not use Scanner directly
jjg
parents:
939
diff
changeset
|
671 |
public JCExpression parseExpression() { |
10 | 672 |
return term(EXPR); |
673 |
} |
|
674 |
||
1258
1cf37d8837d1
6724118: change JavaCompiler to not use Scanner directly
jjg
parents:
939
diff
changeset
|
675 |
public JCExpression parseType() { |
10 | 676 |
return term(TYPE); |
677 |
} |
|
678 |
||
679 |
JCExpression term(int newmode) { |
|
680 |
int prevmode = mode; |
|
681 |
mode = newmode; |
|
682 |
JCExpression t = term(); |
|
683 |
lastmode = mode; |
|
684 |
mode = prevmode; |
|
685 |
return t; |
|
686 |
} |
|
687 |
||
688 |
/** |
|
13844 | 689 |
* {@literal |
10 | 690 |
* Expression = Expression1 [ExpressionRest] |
691 |
* ExpressionRest = [AssignmentOperator Expression1] |
|
692 |
* AssignmentOperator = "=" | "+=" | "-=" | "*=" | "/=" | |
|
693 |
* "&=" | "|=" | "^=" | |
|
694 |
* "%=" | "<<=" | ">>=" | ">>>=" |
|
695 |
* Type = Type1 |
|
696 |
* TypeNoParams = TypeNoParams1 |
|
697 |
* StatementExpression = Expression |
|
698 |
* ConstantExpression = Expression |
|
13844 | 699 |
* } |
10 | 700 |
*/ |
701 |
JCExpression term() { |
|
702 |
JCExpression t = term1(); |
|
703 |
if ((mode & EXPR) != 0 && |
|
10815 | 704 |
token.kind == EQ || PLUSEQ.compareTo(token.kind) <= 0 && token.kind.compareTo(GTGTGTEQ) <= 0) |
10 | 705 |
return termRest(t); |
706 |
else |
|
707 |
return t; |
|
708 |
} |
|
709 |
||
710 |
JCExpression termRest(JCExpression t) { |
|
10815 | 711 |
switch (token.kind) { |
10 | 712 |
case EQ: { |
10815 | 713 |
int pos = token.pos; |
714 |
nextToken(); |
|
10 | 715 |
mode = EXPR; |
716 |
JCExpression t1 = term(); |
|
717 |
return toP(F.at(pos).Assign(t, t1)); |
|
718 |
} |
|
719 |
case PLUSEQ: |
|
720 |
case SUBEQ: |
|
721 |
case STAREQ: |
|
722 |
case SLASHEQ: |
|
723 |
case PERCENTEQ: |
|
724 |
case AMPEQ: |
|
725 |
case BAREQ: |
|
726 |
case CARETEQ: |
|
727 |
case LTLTEQ: |
|
728 |
case GTGTEQ: |
|
729 |
case GTGTGTEQ: |
|
10815 | 730 |
int pos = token.pos; |
731 |
TokenKind tk = token.kind; |
|
732 |
nextToken(); |
|
10 | 733 |
mode = EXPR; |
734 |
JCExpression t1 = term(); |
|
10815 | 735 |
return F.at(pos).Assignop(optag(tk), t, t1); |
10 | 736 |
default: |
737 |
return t; |
|
738 |
} |
|
739 |
} |
|
740 |
||
741 |
/** Expression1 = Expression2 [Expression1Rest] |
|
742 |
* Type1 = Type2 |
|
743 |
* TypeNoParams1 = TypeNoParams2 |
|
744 |
*/ |
|
745 |
JCExpression term1() { |
|
746 |
JCExpression t = term2(); |
|
10815 | 747 |
if ((mode & EXPR) != 0 && token.kind == QUES) { |
10 | 748 |
mode = EXPR; |
749 |
return term1Rest(t); |
|
750 |
} else { |
|
751 |
return t; |
|
752 |
} |
|
753 |
} |
|
754 |
||
755 |
/** Expression1Rest = ["?" Expression ":" Expression1] |
|
756 |
*/ |
|
757 |
JCExpression term1Rest(JCExpression t) { |
|
10815 | 758 |
if (token.kind == QUES) { |
759 |
int pos = token.pos; |
|
760 |
nextToken(); |
|
10 | 761 |
JCExpression t1 = term(); |
762 |
accept(COLON); |
|
763 |
JCExpression t2 = term1(); |
|
764 |
return F.at(pos).Conditional(t, t1, t2); |
|
765 |
} else { |
|
766 |
return t; |
|
767 |
} |
|
768 |
} |
|
769 |
||
770 |
/** Expression2 = Expression3 [Expression2Rest] |
|
771 |
* Type2 = Type3 |
|
772 |
* TypeNoParams2 = TypeNoParams3 |
|
773 |
*/ |
|
774 |
JCExpression term2() { |
|
775 |
JCExpression t = term3(); |
|
10815 | 776 |
if ((mode & EXPR) != 0 && prec(token.kind) >= TreeInfo.orPrec) { |
10 | 777 |
mode = EXPR; |
778 |
return term2Rest(t, TreeInfo.orPrec); |
|
779 |
} else { |
|
780 |
return t; |
|
781 |
} |
|
782 |
} |
|
783 |
||
784 |
/* Expression2Rest = {infixop Expression3} |
|
785 |
* | Expression3 instanceof Type |
|
786 |
* infixop = "||" |
|
787 |
* | "&&" |
|
788 |
* | "|" |
|
789 |
* | "^" |
|
790 |
* | "&" |
|
791 |
* | "==" | "!=" |
|
792 |
* | "<" | ">" | "<=" | ">=" |
|
793 |
* | "<<" | ">>" | ">>>" |
|
794 |
* | "+" | "-" |
|
795 |
* | "*" | "/" | "%" |
|
796 |
*/ |
|
797 |
JCExpression term2Rest(JCExpression t, int minprec) { |
|
798 |
List<JCExpression[]> savedOd = odStackSupply.elems; |
|
799 |
JCExpression[] odStack = newOdStack(); |
|
800 |
List<Token[]> savedOp = opStackSupply.elems; |
|
801 |
Token[] opStack = newOpStack(); |
|
10815 | 802 |
|
10 | 803 |
// optimization, was odStack = new Tree[...]; opStack = new Tree[...]; |
804 |
int top = 0; |
|
805 |
odStack[0] = t; |
|
10815 | 806 |
int startPos = token.pos; |
807 |
Token topOp = Tokens.DUMMY; |
|
808 |
while (prec(token.kind) >= minprec) { |
|
10 | 809 |
opStack[top] = topOp; |
810 |
top++; |
|
10815 | 811 |
topOp = token; |
812 |
nextToken(); |
|
11322
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
813 |
odStack[top] = (topOp.kind == INSTANCEOF) ? parseType() : term3(); |
10815 | 814 |
while (top > 0 && prec(topOp.kind) >= prec(token.kind)) { |
815 |
odStack[top-1] = makeOp(topOp.pos, topOp.kind, odStack[top-1], |
|
10 | 816 |
odStack[top]); |
817 |
top--; |
|
818 |
topOp = opStack[top]; |
|
819 |
} |
|
820 |
} |
|
8032 | 821 |
Assert.check(top == 0); |
10 | 822 |
t = odStack[0]; |
823 |
||
10950 | 824 |
if (t.hasTag(JCTree.Tag.PLUS)) { |
14263 | 825 |
StringBuilder buf = foldStrings(t); |
10 | 826 |
if (buf != null) { |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
827 |
t = toP(F.at(startPos).Literal(TypeTag.CLASS, buf.toString())); |
10 | 828 |
} |
829 |
} |
|
830 |
||
831 |
odStackSupply.elems = savedOd; // optimization |
|
832 |
opStackSupply.elems = savedOp; // optimization |
|
833 |
return t; |
|
834 |
} |
|
835 |
//where |
|
836 |
/** Construct a binary or type test node. |
|
837 |
*/ |
|
838 |
private JCExpression makeOp(int pos, |
|
10815 | 839 |
TokenKind topOp, |
10 | 840 |
JCExpression od1, |
841 |
JCExpression od2) |
|
842 |
{ |
|
843 |
if (topOp == INSTANCEOF) { |
|
844 |
return F.at(pos).TypeTest(od1, od2); |
|
845 |
} else { |
|
846 |
return F.at(pos).Binary(optag(topOp), od1, od2); |
|
847 |
} |
|
848 |
} |
|
849 |
/** If tree is a concatenation of string literals, replace it |
|
850 |
* by a single literal representing the concatenated string. |
|
851 |
*/ |
|
14263 | 852 |
protected StringBuilder foldStrings(JCTree tree) { |
10200
56cc93e7b6ef
7068902: (javac) allow enabling or disabling of String folding
ksrini
parents:
10199
diff
changeset
|
853 |
if (!allowStringFolding) |
56cc93e7b6ef
7068902: (javac) allow enabling or disabling of String folding
ksrini
parents:
10199
diff
changeset
|
854 |
return null; |
10 | 855 |
List<String> buf = List.nil(); |
856 |
while (true) { |
|
10950 | 857 |
if (tree.hasTag(LITERAL)) { |
10 | 858 |
JCLiteral lit = (JCLiteral) tree; |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
859 |
if (lit.typetag == TypeTag.CLASS) { |
14263 | 860 |
StringBuilder sbuf = |
861 |
new StringBuilder((String)lit.value); |
|
10 | 862 |
while (buf.nonEmpty()) { |
863 |
sbuf.append(buf.head); |
|
864 |
buf = buf.tail; |
|
865 |
} |
|
866 |
return sbuf; |
|
867 |
} |
|
10950 | 868 |
} else if (tree.hasTag(JCTree.Tag.PLUS)) { |
10 | 869 |
JCBinary op = (JCBinary)tree; |
10950 | 870 |
if (op.rhs.hasTag(LITERAL)) { |
10 | 871 |
JCLiteral lit = (JCLiteral) op.rhs; |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
872 |
if (lit.typetag == TypeTag.CLASS) { |
10 | 873 |
buf = buf.prepend((String) lit.value); |
874 |
tree = op.lhs; |
|
875 |
continue; |
|
876 |
} |
|
877 |
} |
|
878 |
} |
|
879 |
return null; |
|
880 |
} |
|
881 |
} |
|
882 |
||
883 |
/** optimization: To save allocating a new operand/operator stack |
|
884 |
* for every binary operation, we use supplys. |
|
885 |
*/ |
|
886 |
ListBuffer<JCExpression[]> odStackSupply = new ListBuffer<JCExpression[]>(); |
|
887 |
ListBuffer<Token[]> opStackSupply = new ListBuffer<Token[]>(); |
|
888 |
||
889 |
private JCExpression[] newOdStack() { |
|
890 |
if (odStackSupply.elems == odStackSupply.last) |
|
891 |
odStackSupply.append(new JCExpression[infixPrecedenceLevels + 1]); |
|
892 |
JCExpression[] odStack = odStackSupply.elems.head; |
|
893 |
odStackSupply.elems = odStackSupply.elems.tail; |
|
894 |
return odStack; |
|
895 |
} |
|
896 |
||
897 |
private Token[] newOpStack() { |
|
898 |
if (opStackSupply.elems == opStackSupply.last) |
|
899 |
opStackSupply.append(new Token[infixPrecedenceLevels + 1]); |
|
900 |
Token[] opStack = opStackSupply.elems.head; |
|
901 |
opStackSupply.elems = opStackSupply.elems.tail; |
|
902 |
return opStack; |
|
903 |
} |
|
904 |
||
13844 | 905 |
/** |
906 |
* Expression3 = PrefixOp Expression3 |
|
10 | 907 |
* | "(" Expr | TypeNoParams ")" Expression3 |
908 |
* | Primary {Selector} {PostfixOp} |
|
13844 | 909 |
* |
910 |
* {@literal |
|
10 | 911 |
* Primary = "(" Expression ")" |
912 |
* | Literal |
|
913 |
* | [TypeArguments] THIS [Arguments] |
|
914 |
* | [TypeArguments] SUPER SuperSuffix |
|
915 |
* | NEW [TypeArguments] Creator |
|
11143
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
916 |
* | "(" Arguments ")" "->" ( Expression | Block ) |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
917 |
* | Ident "->" ( Expression | Block ) |
7072 | 918 |
* | Ident { "." Ident } |
11144
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
919 |
* | Expression3 MemberReferenceSuffix |
7072 | 920 |
* [ "[" ( "]" BracketsOpt "." CLASS | Expression "]" ) |
10 | 921 |
* | Arguments |
922 |
* | "." ( CLASS | THIS | [TypeArguments] SUPER Arguments | NEW [TypeArguments] InnerCreator ) |
|
923 |
* ] |
|
924 |
* | BasicType BracketsOpt "." CLASS |
|
13844 | 925 |
* } |
926 |
* |
|
10 | 927 |
* PrefixOp = "++" | "--" | "!" | "~" | "+" | "-" |
928 |
* PostfixOp = "++" | "--" |
|
929 |
* Type3 = Ident { "." Ident } [TypeArguments] {TypeSelector} BracketsOpt |
|
930 |
* | BasicType |
|
931 |
* TypeNoParams3 = Ident { "." Ident } BracketsOpt |
|
932 |
* Selector = "." [TypeArguments] Ident [Arguments] |
|
933 |
* | "." THIS |
|
934 |
* | "." [TypeArguments] SUPER SuperSuffix |
|
935 |
* | "." NEW [TypeArguments] InnerCreator |
|
936 |
* | "[" Expression "]" |
|
937 |
* TypeSelector = "." Ident [TypeArguments] |
|
938 |
* SuperSuffix = Arguments | "." Ident [Arguments] |
|
939 |
*/ |
|
940 |
protected JCExpression term3() { |
|
10815 | 941 |
int pos = token.pos; |
10 | 942 |
JCExpression t; |
943 |
List<JCExpression> typeArgs = typeArgumentsOpt(EXPR); |
|
10815 | 944 |
switch (token.kind) { |
10 | 945 |
case QUES: |
946 |
if ((mode & TYPE) != 0 && (mode & (TYPEARG|NOPARAMS)) == TYPEARG) { |
|
947 |
mode = TYPE; |
|
948 |
return typeArgument(); |
|
949 |
} else |
|
950 |
return illegal(); |
|
951 |
case PLUSPLUS: case SUBSUB: case BANG: case TILDE: case PLUS: case SUB: |
|
952 |
if (typeArgs == null && (mode & EXPR) != 0) { |
|
10815 | 953 |
TokenKind tk = token.kind; |
954 |
nextToken(); |
|
10 | 955 |
mode = EXPR; |
10815 | 956 |
if (tk == SUB && |
957 |
(token.kind == INTLITERAL || token.kind == LONGLITERAL) && |
|
958 |
token.radix() == 10) { |
|
10 | 959 |
mode = EXPR; |
10455
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
960 |
t = literal(names.hyphen, pos); |
10 | 961 |
} else { |
11322
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
962 |
t = term3(); |
10815 | 963 |
return F.at(pos).Unary(unoptag(tk), t); |
10 | 964 |
} |
965 |
} else return illegal(); |
|
966 |
break; |
|
967 |
case LPAREN: |
|
968 |
if (typeArgs == null && (mode & EXPR) != 0) { |
|
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14056
diff
changeset
|
969 |
if (peekToken(MONKEYS_AT) || |
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14056
diff
changeset
|
970 |
peekToken(FINAL) || |
11143
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
971 |
peekToken(RPAREN) || |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
972 |
peekToken(IDENTIFIER, COMMA) || |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
973 |
peekToken(IDENTIFIER, RPAREN, ARROW)) { |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
974 |
//implicit n-ary lambda |
14058
c7ec7facdd20
7177385: Add attribution support for lambda expressions
mcimadamore
parents:
14056
diff
changeset
|
975 |
t = lambdaExpressionOrStatement(true, peekToken(MONKEYS_AT) || peekToken(FINAL), pos); |
11143
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
976 |
break; |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
977 |
} else { |
10815 | 978 |
nextToken(); |
11322
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
979 |
mode = EXPR | TYPE | NOPARAMS; |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
980 |
t = term3(); |
11143
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
981 |
if ((mode & TYPE) != 0 && token.kind == LT) { |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
982 |
// Could be a cast to a parameterized type |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
983 |
JCTree.Tag op = JCTree.Tag.LT; |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
984 |
int pos1 = token.pos; |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
985 |
nextToken(); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
986 |
mode &= (EXPR | TYPE); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
987 |
mode |= TYPEARG; |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
988 |
JCExpression t1 = term3(); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
989 |
if ((mode & TYPE) != 0 && |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
990 |
(token.kind == COMMA || token.kind == GT)) { |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
991 |
mode = TYPE; |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
992 |
ListBuffer<JCExpression> args = new ListBuffer<JCExpression>(); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
993 |
args.append(t1); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
994 |
while (token.kind == COMMA) { |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
995 |
nextToken(); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
996 |
args.append(typeArgument()); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
997 |
} |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
998 |
accept(GT); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
999 |
t = toP(F.at(pos1).TypeApply(t, args.toList())); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1000 |
checkGenerics(); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1001 |
mode = EXPR | TYPE; //could be a lambda or a method ref or a cast to a type |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1002 |
t = term3Rest(t, typeArgs); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1003 |
if (token.kind == IDENTIFIER || token.kind == ELLIPSIS) { |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1004 |
//explicit lambda (w/ generic type) |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1005 |
mode = EXPR; |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1006 |
JCModifiers mods = F.at(token.pos).Modifiers(Flags.PARAMETER); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1007 |
if (token.kind == ELLIPSIS) { |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1008 |
mods.flags = Flags.VARARGS; |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1009 |
t = to(F.at(token.pos).TypeArray(t)); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1010 |
nextToken(); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1011 |
} |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1012 |
t = lambdaExpressionOrStatement(variableDeclaratorId(mods, t), pos); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1013 |
break; |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1014 |
} |
12337
a27eed20c9a3
7157165: Regression: code with disjunctive type crashes javac
mcimadamore
parents:
11322
diff
changeset
|
1015 |
} else if ((mode & EXPR) != 0) { |
11143
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1016 |
mode = EXPR; |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1017 |
JCExpression e = term2Rest(t1, TreeInfo.shiftPrec); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1018 |
t = F.at(pos1).Binary(op, t, e); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1019 |
t = termRest(term1Rest(term2Rest(t, TreeInfo.orPrec))); |
12337
a27eed20c9a3
7157165: Regression: code with disjunctive type crashes javac
mcimadamore
parents:
11322
diff
changeset
|
1020 |
} else { |
a27eed20c9a3
7157165: Regression: code with disjunctive type crashes javac
mcimadamore
parents:
11322
diff
changeset
|
1021 |
accept(GT); |
11143
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1022 |
} |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1023 |
} else if ((mode & TYPE) != 0 && |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1024 |
(token.kind == IDENTIFIER || token.kind == ELLIPSIS)) { |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1025 |
//explicit lambda (w/ non-generic type) |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1026 |
mode = EXPR; |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1027 |
JCModifiers mods = F.at(token.pos).Modifiers(Flags.PARAMETER); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1028 |
if (token.kind == ELLIPSIS) { |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1029 |
mods.flags = Flags.VARARGS; |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1030 |
t = to(F.at(token.pos).TypeArray(t)); |
10815 | 1031 |
nextToken(); |
10 | 1032 |
} |
11143
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1033 |
t = lambdaExpressionOrStatement(variableDeclaratorId(mods, t), pos); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1034 |
break; |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1035 |
} else { |
10 | 1036 |
t = termRest(term1Rest(term2Rest(t, TreeInfo.orPrec))); |
1037 |
} |
|
1790
7182011ee8a6
6665356: Cast not allowed when both qualifying type and inner class are parameterized
mcimadamore
parents:
1260
diff
changeset
|
1038 |
} |
11143
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1039 |
|
10 | 1040 |
accept(RPAREN); |
1041 |
lastmode = mode; |
|
1042 |
mode = EXPR; |
|
1043 |
if ((lastmode & EXPR) == 0) { |
|
11322
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1044 |
JCExpression t1 = term3(); |
10 | 1045 |
return F.at(pos).TypeCast(t, t1); |
1046 |
} else if ((lastmode & TYPE) != 0) { |
|
10815 | 1047 |
switch (token.kind) { |
10 | 1048 |
/*case PLUSPLUS: case SUBSUB: */ |
1049 |
case BANG: case TILDE: |
|
1050 |
case LPAREN: case THIS: case SUPER: |
|
1051 |
case INTLITERAL: case LONGLITERAL: case FLOATLITERAL: |
|
1052 |
case DOUBLELITERAL: case CHARLITERAL: case STRINGLITERAL: |
|
1053 |
case TRUE: case FALSE: case NULL: |
|
11143
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1054 |
case NEW: case IDENTIFIER: case ASSERT: case ENUM: |
10 | 1055 |
case BYTE: case SHORT: case CHAR: case INT: |
1056 |
case LONG: case FLOAT: case DOUBLE: case BOOLEAN: case VOID: |
|
11322
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1057 |
JCExpression t1 = term3(); |
10 | 1058 |
return F.at(pos).TypeCast(t, t1); |
1059 |
} |
|
1060 |
} |
|
11143
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1061 |
} else { |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1062 |
return illegal(); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1063 |
} |
10 | 1064 |
t = toP(F.at(pos).Parens(t)); |
1065 |
break; |
|
1066 |
case THIS: |
|
1067 |
if ((mode & EXPR) != 0) { |
|
1068 |
mode = EXPR; |
|
1069 |
t = to(F.at(pos).Ident(names._this)); |
|
10815 | 1070 |
nextToken(); |
10 | 1071 |
if (typeArgs == null) |
1072 |
t = argumentsOpt(null, t); |
|
1073 |
else |
|
1074 |
t = arguments(typeArgs, t); |
|
1075 |
typeArgs = null; |
|
1076 |
} else return illegal(); |
|
1077 |
break; |
|
1078 |
case SUPER: |
|
1079 |
if ((mode & EXPR) != 0) { |
|
1080 |
mode = EXPR; |
|
4870
a132763160d7
6919889: assorted position errors in compiler syntax trees
jjg
parents:
4704
diff
changeset
|
1081 |
t = to(F.at(pos).Ident(names._super)); |
a132763160d7
6919889: assorted position errors in compiler syntax trees
jjg
parents:
4704
diff
changeset
|
1082 |
t = superSuffix(typeArgs, t); |
10 | 1083 |
typeArgs = null; |
1084 |
} else return illegal(); |
|
1085 |
break; |
|
1086 |
case INTLITERAL: case LONGLITERAL: case FLOATLITERAL: case DOUBLELITERAL: |
|
1087 |
case CHARLITERAL: case STRINGLITERAL: |
|
1088 |
case TRUE: case FALSE: case NULL: |
|
1089 |
if (typeArgs == null && (mode & EXPR) != 0) { |
|
1090 |
mode = EXPR; |
|
1091 |
t = literal(names.empty); |
|
1092 |
} else return illegal(); |
|
1093 |
break; |
|
1094 |
case NEW: |
|
1095 |
if (typeArgs != null) return illegal(); |
|
1096 |
if ((mode & EXPR) != 0) { |
|
1097 |
mode = EXPR; |
|
10815 | 1098 |
nextToken(); |
1099 |
if (token.kind == LT) typeArgs = typeArguments(false); |
|
10 | 1100 |
t = creator(pos, typeArgs); |
1101 |
typeArgs = null; |
|
1102 |
} else return illegal(); |
|
1103 |
break; |
|
1104 |
case IDENTIFIER: case ASSERT: case ENUM: |
|
1105 |
if (typeArgs != null) return illegal(); |
|
11143
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1106 |
if ((mode & EXPR) != 0 && peekToken(ARROW)) { |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1107 |
t = lambdaExpressionOrStatement(false, false, pos); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1108 |
} else { |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1109 |
t = toP(F.at(token.pos).Ident(ident())); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1110 |
loop: while (true) { |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1111 |
pos = token.pos; |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1112 |
switch (token.kind) { |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1113 |
case LBRACKET: |
10815 | 1114 |
nextToken(); |
11143
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1115 |
if (token.kind == RBRACKET) { |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1116 |
nextToken(); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1117 |
t = bracketsOpt(t); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1118 |
t = toP(F.at(pos).TypeArray(t)); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1119 |
t = bracketsSuffix(t); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1120 |
} else { |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1121 |
if ((mode & EXPR) != 0) { |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1122 |
mode = EXPR; |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1123 |
JCExpression t1 = term(); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1124 |
t = to(F.at(pos).Indexed(t, t1)); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1125 |
} |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1126 |
accept(RBRACKET); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1127 |
} |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1128 |
break loop; |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1129 |
case LPAREN: |
10 | 1130 |
if ((mode & EXPR) != 0) { |
1131 |
mode = EXPR; |
|
11143
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1132 |
t = arguments(typeArgs, t); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1133 |
typeArgs = null; |
10 | 1134 |
} |
11143
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1135 |
break loop; |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1136 |
case DOT: |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1137 |
nextToken(); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1138 |
int oldmode = mode; |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1139 |
mode &= ~NOPARAMS; |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1140 |
typeArgs = typeArgumentsOpt(EXPR); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1141 |
mode = oldmode; |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1142 |
if ((mode & EXPR) != 0) { |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1143 |
switch (token.kind) { |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1144 |
case CLASS: |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1145 |
if (typeArgs != null) return illegal(); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1146 |
mode = EXPR; |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1147 |
t = to(F.at(pos).Select(t, names._class)); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1148 |
nextToken(); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1149 |
break loop; |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1150 |
case THIS: |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1151 |
if (typeArgs != null) return illegal(); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1152 |
mode = EXPR; |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1153 |
t = to(F.at(pos).Select(t, names._this)); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1154 |
nextToken(); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1155 |
break loop; |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1156 |
case SUPER: |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1157 |
mode = EXPR; |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1158 |
t = to(F.at(pos).Select(t, names._super)); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1159 |
t = superSuffix(typeArgs, t); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1160 |
typeArgs = null; |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1161 |
break loop; |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1162 |
case NEW: |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1163 |
if (typeArgs != null) return illegal(); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1164 |
mode = EXPR; |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1165 |
int pos1 = token.pos; |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1166 |
nextToken(); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1167 |
if (token.kind == LT) typeArgs = typeArguments(false); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1168 |
t = innerCreator(pos1, typeArgs, t); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1169 |
typeArgs = null; |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1170 |
break loop; |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1171 |
} |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1172 |
} |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1173 |
// typeArgs saved for next loop iteration. |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1174 |
t = toP(F.at(pos).Select(t, ident())); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1175 |
break; |
11322
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1176 |
case LT: |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1177 |
if ((mode & TYPE) == 0 && isUnboundMemberRef()) { |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1178 |
//this is an unbound method reference whose qualifier |
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
1179 |
//is a generic type i.e. A<S>::m |
11322
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1180 |
int pos1 = token.pos; |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1181 |
accept(LT); |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1182 |
ListBuffer<JCExpression> args = new ListBuffer<JCExpression>(); |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1183 |
args.append(typeArgument()); |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1184 |
while (token.kind == COMMA) { |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1185 |
nextToken(); |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1186 |
args.append(typeArgument()); |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1187 |
} |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1188 |
accept(GT); |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1189 |
t = toP(F.at(pos1).TypeApply(t, args.toList())); |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1190 |
checkGenerics(); |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1191 |
while (token.kind == DOT) { |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1192 |
nextToken(); |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1193 |
mode = TYPE; |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1194 |
t = toP(F.at(token.pos).Select(t, ident())); |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1195 |
t = typeArgumentsOpt(t); |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1196 |
} |
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
1197 |
t = bracketsOpt(t); |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
1198 |
if (token.kind != COLCOL) { |
11322
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1199 |
//method reference expected here |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1200 |
t = illegal(); |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1201 |
} |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1202 |
mode = EXPR; |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1203 |
return term3Rest(t, typeArgs); |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1204 |
} |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1205 |
break loop; |
11143
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1206 |
default: |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1207 |
break loop; |
10 | 1208 |
} |
1209 |
} |
|
1210 |
} |
|
1211 |
if (typeArgs != null) illegal(); |
|
1212 |
t = typeArgumentsOpt(t); |
|
1213 |
break; |
|
1214 |
case BYTE: case SHORT: case CHAR: case INT: case LONG: case FLOAT: |
|
1215 |
case DOUBLE: case BOOLEAN: |
|
1216 |
if (typeArgs != null) illegal(); |
|
1217 |
t = bracketsSuffix(bracketsOpt(basicType())); |
|
1218 |
break; |
|
1219 |
case VOID: |
|
1220 |
if (typeArgs != null) illegal(); |
|
1221 |
if ((mode & EXPR) != 0) { |
|
10815 | 1222 |
nextToken(); |
1223 |
if (token.kind == DOT) { |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
1224 |
JCPrimitiveTypeTree ti = toP(F.at(pos).TypeIdent(TypeTag.VOID)); |
10 | 1225 |
t = bracketsSuffix(ti); |
1226 |
} else { |
|
1227 |
return illegal(pos); |
|
1228 |
} |
|
1229 |
} else { |
|
2723
b659ca23d5f5
6829189: Java programming with JSR 292 needs language support
jrose
parents:
2212
diff
changeset
|
1230 |
// Support the corner case of myMethodHandle.<void>invoke() by passing |
b659ca23d5f5
6829189: Java programming with JSR 292 needs language support
jrose
parents:
2212
diff
changeset
|
1231 |
// a void type (like other primitive types) to the next phase. |
b659ca23d5f5
6829189: Java programming with JSR 292 needs language support
jrose
parents:
2212
diff
changeset
|
1232 |
// The error will be reported in Attr.attribTypes or Attr.visitApply. |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
1233 |
JCPrimitiveTypeTree ti = to(F.at(pos).TypeIdent(TypeTag.VOID)); |
10815 | 1234 |
nextToken(); |
2723
b659ca23d5f5
6829189: Java programming with JSR 292 needs language support
jrose
parents:
2212
diff
changeset
|
1235 |
return ti; |
b659ca23d5f5
6829189: Java programming with JSR 292 needs language support
jrose
parents:
2212
diff
changeset
|
1236 |
//return illegal(); |
10 | 1237 |
} |
1238 |
break; |
|
1239 |
default: |
|
1240 |
return illegal(); |
|
1241 |
} |
|
11143
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1242 |
return term3Rest(t, typeArgs); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1243 |
} |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1244 |
|
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1245 |
JCExpression term3Rest(JCExpression t, List<JCExpression> typeArgs) { |
10 | 1246 |
if (typeArgs != null) illegal(); |
1247 |
while (true) { |
|
10815 | 1248 |
int pos1 = token.pos; |
1249 |
if (token.kind == LBRACKET) { |
|
1250 |
nextToken(); |
|
10 | 1251 |
if ((mode & TYPE) != 0) { |
1252 |
int oldmode = mode; |
|
1253 |
mode = TYPE; |
|
10815 | 1254 |
if (token.kind == RBRACKET) { |
1255 |
nextToken(); |
|
7072 | 1256 |
t = bracketsOpt(t); |
10 | 1257 |
t = toP(F.at(pos1).TypeArray(t)); |
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
1258 |
if (token.kind == COLCOL) { |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
1259 |
mode = EXPR; |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
1260 |
continue; |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
1261 |
} |
10 | 1262 |
return t; |
1263 |
} |
|
1264 |
mode = oldmode; |
|
1265 |
} |
|
1266 |
if ((mode & EXPR) != 0) { |
|
1267 |
mode = EXPR; |
|
1268 |
JCExpression t1 = term(); |
|
1269 |
t = to(F.at(pos1).Indexed(t, t1)); |
|
1270 |
} |
|
1271 |
accept(RBRACKET); |
|
10815 | 1272 |
} else if (token.kind == DOT) { |
1273 |
nextToken(); |
|
10 | 1274 |
typeArgs = typeArgumentsOpt(EXPR); |
10815 | 1275 |
if (token.kind == SUPER && (mode & EXPR) != 0) { |
10 | 1276 |
mode = EXPR; |
1277 |
t = to(F.at(pos1).Select(t, names._super)); |
|
10815 | 1278 |
nextToken(); |
10 | 1279 |
t = arguments(typeArgs, t); |
1280 |
typeArgs = null; |
|
10815 | 1281 |
} else if (token.kind == NEW && (mode & EXPR) != 0) { |
10 | 1282 |
if (typeArgs != null) return illegal(); |
1283 |
mode = EXPR; |
|
10815 | 1284 |
int pos2 = token.pos; |
1285 |
nextToken(); |
|
1286 |
if (token.kind == LT) typeArgs = typeArguments(false); |
|
10 | 1287 |
t = innerCreator(pos2, typeArgs, t); |
1288 |
typeArgs = null; |
|
1289 |
} else { |
|
1290 |
t = toP(F.at(pos1).Select(t, ident())); |
|
1291 |
t = argumentsOpt(typeArgs, typeArgumentsOpt(t)); |
|
1292 |
typeArgs = null; |
|
1293 |
} |
|
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
1294 |
} else if ((mode & EXPR) != 0 && token.kind == COLCOL) { |
11144
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
1295 |
mode = EXPR; |
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
1296 |
if (typeArgs != null) return illegal(); |
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
1297 |
accept(COLCOL); |
11144
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
1298 |
t = memberReferenceSuffix(pos1, t); |
10 | 1299 |
} else { |
1300 |
break; |
|
1301 |
} |
|
1302 |
} |
|
10815 | 1303 |
while ((token.kind == PLUSPLUS || token.kind == SUBSUB) && (mode & EXPR) != 0) { |
10 | 1304 |
mode = EXPR; |
10815 | 1305 |
t = to(F.at(token.pos).Unary( |
10950 | 1306 |
token.kind == PLUSPLUS ? POSTINC : POSTDEC, t)); |
10815 | 1307 |
nextToken(); |
10 | 1308 |
} |
1309 |
return toP(t); |
|
1310 |
} |
|
1311 |
||
11322
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1312 |
/** |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1313 |
* If we see an identifier followed by a '<' it could be an unbound |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1314 |
* method reference or a binary expression. To disambiguate, look for a |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1315 |
* matching '>' and see if the subsequent terminal is either '.' or '#'. |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1316 |
*/ |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1317 |
@SuppressWarnings("fallthrough") |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1318 |
boolean isUnboundMemberRef() { |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1319 |
int pos = 0, depth = 0; |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1320 |
for (Token t = S.token(pos) ; ; t = S.token(++pos)) { |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1321 |
switch (t.kind) { |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1322 |
case IDENTIFIER: case QUES: case EXTENDS: case SUPER: |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1323 |
case DOT: case RBRACKET: case LBRACKET: case COMMA: |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1324 |
case BYTE: case SHORT: case INT: case LONG: case FLOAT: |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1325 |
case DOUBLE: case BOOLEAN: case CHAR: |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1326 |
break; |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1327 |
case LT: |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1328 |
depth++; break; |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1329 |
case GTGTGT: |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1330 |
depth--; |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1331 |
case GTGT: |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1332 |
depth--; |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1333 |
case GT: |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1334 |
depth--; |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1335 |
if (depth == 0) { |
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
1336 |
TokenKind nextKind = S.token(pos + 1).kind; |
11322
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1337 |
return |
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
1338 |
nextKind == TokenKind.DOT || |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
1339 |
nextKind == TokenKind.LBRACKET || |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
1340 |
nextKind == TokenKind.COLCOL; |
11322
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1341 |
} |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1342 |
break; |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1343 |
default: |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1344 |
return false; |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1345 |
} |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1346 |
} |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1347 |
} |
6ee85f80967a
7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents:
11149
diff
changeset
|
1348 |
|
11143
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1349 |
JCExpression lambdaExpressionOrStatement(JCVariableDecl firstParam, int pos) { |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1350 |
ListBuffer<JCVariableDecl> params = new ListBuffer<JCVariableDecl>(); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1351 |
params.append(firstParam); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1352 |
JCVariableDecl lastParam = firstParam; |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1353 |
while ((lastParam.mods.flags & Flags.VARARGS) == 0 && token.kind == COMMA) { |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1354 |
nextToken(); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1355 |
params.append(lastParam = formalParameter()); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1356 |
} |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1357 |
accept(RPAREN); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1358 |
return lambdaExpressionOrStatementRest(params.toList(), pos); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1359 |
} |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1360 |
|
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1361 |
JCExpression lambdaExpressionOrStatement(boolean hasParens, boolean explicitParams, int pos) { |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1362 |
List<JCVariableDecl> params = explicitParams ? |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1363 |
formalParameters() : |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1364 |
implicitParameters(hasParens); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1365 |
|
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1366 |
return lambdaExpressionOrStatementRest(params, pos); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1367 |
} |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1368 |
|
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1369 |
JCExpression lambdaExpressionOrStatementRest(List<JCVariableDecl> args, int pos) { |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1370 |
checkLambda(); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1371 |
accept(ARROW); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1372 |
|
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1373 |
return token.kind == LBRACE ? |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1374 |
lambdaStatement(args, pos, pos) : |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1375 |
lambdaExpression(args, pos); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1376 |
} |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1377 |
|
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1378 |
JCExpression lambdaStatement(List<JCVariableDecl> args, int pos, int pos2) { |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1379 |
JCBlock block = block(pos2, 0); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1380 |
return toP(F.at(pos).Lambda(args, block)); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1381 |
} |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1382 |
|
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1383 |
JCExpression lambdaExpression(List<JCVariableDecl> args, int pos) { |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1384 |
JCTree expr = parseExpression(); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1385 |
return toP(F.at(pos).Lambda(args, expr)); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1386 |
} |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
1387 |
|
10 | 1388 |
/** SuperSuffix = Arguments | "." [TypeArguments] Ident [Arguments] |
1389 |
*/ |
|
1390 |
JCExpression superSuffix(List<JCExpression> typeArgs, JCExpression t) { |
|
10815 | 1391 |
nextToken(); |
1392 |
if (token.kind == LPAREN || typeArgs != null) { |
|
10 | 1393 |
t = arguments(typeArgs, t); |
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
1394 |
} else if (token.kind == COLCOL) { |
11144
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
1395 |
if (typeArgs != null) return illegal(); |
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
1396 |
t = memberReferenceSuffix(t); |
10 | 1397 |
} else { |
10815 | 1398 |
int pos = token.pos; |
10 | 1399 |
accept(DOT); |
10815 | 1400 |
typeArgs = (token.kind == LT) ? typeArguments(false) : null; |
10 | 1401 |
t = toP(F.at(pos).Select(t, ident())); |
1402 |
t = argumentsOpt(typeArgs, t); |
|
1403 |
} |
|
1404 |
return t; |
|
1405 |
} |
|
1406 |
||
1407 |
/** BasicType = BYTE | SHORT | CHAR | INT | LONG | FLOAT | DOUBLE | BOOLEAN |
|
1408 |
*/ |
|
1409 |
JCPrimitiveTypeTree basicType() { |
|
10815 | 1410 |
JCPrimitiveTypeTree t = to(F.at(token.pos).TypeIdent(typetag(token.kind))); |
1411 |
nextToken(); |
|
10 | 1412 |
return t; |
1413 |
} |
|
1414 |
||
1415 |
/** ArgumentsOpt = [ Arguments ] |
|
1416 |
*/ |
|
1417 |
JCExpression argumentsOpt(List<JCExpression> typeArgs, JCExpression t) { |
|
10815 | 1418 |
if ((mode & EXPR) != 0 && token.kind == LPAREN || typeArgs != null) { |
10 | 1419 |
mode = EXPR; |
1420 |
return arguments(typeArgs, t); |
|
1421 |
} else { |
|
1422 |
return t; |
|
1423 |
} |
|
1424 |
} |
|
1425 |
||
1426 |
/** Arguments = "(" [Expression { COMMA Expression }] ")" |
|
1427 |
*/ |
|
1428 |
List<JCExpression> arguments() { |
|
1429 |
ListBuffer<JCExpression> args = lb(); |
|
10815 | 1430 |
if (token.kind == LPAREN) { |
1431 |
nextToken(); |
|
1432 |
if (token.kind != RPAREN) { |
|
1258
1cf37d8837d1
6724118: change JavaCompiler to not use Scanner directly
jjg
parents:
939
diff
changeset
|
1433 |
args.append(parseExpression()); |
10815 | 1434 |
while (token.kind == COMMA) { |
1435 |
nextToken(); |
|
1258
1cf37d8837d1
6724118: change JavaCompiler to not use Scanner directly
jjg
parents:
939
diff
changeset
|
1436 |
args.append(parseExpression()); |
10 | 1437 |
} |
1438 |
} |
|
1439 |
accept(RPAREN); |
|
1440 |
} else { |
|
10815 | 1441 |
syntaxError(token.pos, "expected", LPAREN); |
10 | 1442 |
} |
1443 |
return args.toList(); |
|
1444 |
} |
|
1445 |
||
1446 |
JCMethodInvocation arguments(List<JCExpression> typeArgs, JCExpression t) { |
|
10815 | 1447 |
int pos = token.pos; |
10 | 1448 |
List<JCExpression> args = arguments(); |
1449 |
return toP(F.at(pos).Apply(typeArgs, t, args)); |
|
1450 |
} |
|
1451 |
||
1452 |
/** TypeArgumentsOpt = [ TypeArguments ] |
|
1453 |
*/ |
|
1454 |
JCExpression typeArgumentsOpt(JCExpression t) { |
|
10815 | 1455 |
if (token.kind == LT && |
10 | 1456 |
(mode & TYPE) != 0 && |
1457 |
(mode & NOPARAMS) == 0) { |
|
1458 |
mode = TYPE; |
|
1459 |
checkGenerics(); |
|
9073
a29adf86aa0c
7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents:
8625
diff
changeset
|
1460 |
return typeArguments(t, false); |
10 | 1461 |
} else { |
1462 |
return t; |
|
1463 |
} |
|
1464 |
} |
|
1465 |
List<JCExpression> typeArgumentsOpt() { |
|
1466 |
return typeArgumentsOpt(TYPE); |
|
1467 |
} |
|
1468 |
||
1469 |
List<JCExpression> typeArgumentsOpt(int useMode) { |
|
10815 | 1470 |
if (token.kind == LT) { |
10 | 1471 |
checkGenerics(); |
1472 |
if ((mode & useMode) == 0 || |
|
1473 |
(mode & NOPARAMS) != 0) { |
|
1474 |
illegal(); |
|
1475 |
} |
|
1476 |
mode = useMode; |
|
9073
a29adf86aa0c
7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents:
8625
diff
changeset
|
1477 |
return typeArguments(false); |
10 | 1478 |
} |
1479 |
return null; |
|
1480 |
} |
|
1481 |
||
13844 | 1482 |
/** |
1483 |
* {@literal |
|
1484 |
* TypeArguments = "<" TypeArgument {"," TypeArgument} ">" |
|
1485 |
* } |
|
10 | 1486 |
*/ |
9073
a29adf86aa0c
7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents:
8625
diff
changeset
|
1487 |
List<JCExpression> typeArguments(boolean diamondAllowed) { |
10815 | 1488 |
if (token.kind == LT) { |
1489 |
nextToken(); |
|
1490 |
if (token.kind == GT && diamondAllowed) { |
|
5321
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
5320
diff
changeset
|
1491 |
checkDiamond(); |
9073
a29adf86aa0c
7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents:
8625
diff
changeset
|
1492 |
mode |= DIAMOND; |
10815 | 1493 |
nextToken(); |
5321
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
5320
diff
changeset
|
1494 |
return List.nil(); |
9073
a29adf86aa0c
7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents:
8625
diff
changeset
|
1495 |
} else { |
a29adf86aa0c
7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents:
8625
diff
changeset
|
1496 |
ListBuffer<JCExpression> args = ListBuffer.lb(); |
1258
1cf37d8837d1
6724118: change JavaCompiler to not use Scanner directly
jjg
parents:
939
diff
changeset
|
1497 |
args.append(((mode & EXPR) == 0) ? typeArgument() : parseType()); |
10815 | 1498 |
while (token.kind == COMMA) { |
1499 |
nextToken(); |
|
9073
a29adf86aa0c
7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents:
8625
diff
changeset
|
1500 |
args.append(((mode & EXPR) == 0) ? typeArgument() : parseType()); |
a29adf86aa0c
7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents:
8625
diff
changeset
|
1501 |
} |
10815 | 1502 |
switch (token.kind) { |
1503 |
||
1504 |
case GTGTGTEQ: case GTGTEQ: case GTEQ: |
|
1505 |
case GTGTGT: case GTGT: |
|
1506 |
token = S.split(); |
|
9073
a29adf86aa0c
7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents:
8625
diff
changeset
|
1507 |
break; |
10455
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
1508 |
case GT: |
10815 | 1509 |
nextToken(); |
10455
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
1510 |
break; |
9073
a29adf86aa0c
7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents:
8625
diff
changeset
|
1511 |
default: |
10815 | 1512 |
args.append(syntaxError(token.pos, "expected", GT)); |
9073
a29adf86aa0c
7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents:
8625
diff
changeset
|
1513 |
break; |
a29adf86aa0c
7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents:
8625
diff
changeset
|
1514 |
} |
a29adf86aa0c
7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents:
8625
diff
changeset
|
1515 |
return args.toList(); |
10 | 1516 |
} |
1517 |
} else { |
|
10815 | 1518 |
return List.<JCExpression>of(syntaxError(token.pos, "expected", LT)); |
10 | 1519 |
} |
1520 |
} |
|
1521 |
||
13844 | 1522 |
/** |
1523 |
* {@literal |
|
1524 |
* TypeArgument = Type |
|
7072 | 1525 |
* | "?" |
1526 |
* | "?" EXTENDS Type {"&" Type} |
|
1527 |
* | "?" SUPER Type |
|
13844 | 1528 |
* } |
10 | 1529 |
*/ |
1530 |
JCExpression typeArgument() { |
|
10815 | 1531 |
if (token.kind != QUES) return parseType(); |
1532 |
int pos = token.pos; |
|
1533 |
nextToken(); |
|
1534 |
if (token.kind == EXTENDS) { |
|
4870
a132763160d7
6919889: assorted position errors in compiler syntax trees
jjg
parents:
4704
diff
changeset
|
1535 |
TypeBoundKind t = to(F.at(pos).TypeBoundKind(BoundKind.EXTENDS)); |
10815 | 1536 |
nextToken(); |
4870
a132763160d7
6919889: assorted position errors in compiler syntax trees
jjg
parents:
4704
diff
changeset
|
1537 |
JCExpression bound = parseType(); |
7072 | 1538 |
return F.at(pos).Wildcard(t, bound); |
10815 | 1539 |
} else if (token.kind == SUPER) { |
4870
a132763160d7
6919889: assorted position errors in compiler syntax trees
jjg
parents:
4704
diff
changeset
|
1540 |
TypeBoundKind t = to(F.at(pos).TypeBoundKind(BoundKind.SUPER)); |
10815 | 1541 |
nextToken(); |
4870
a132763160d7
6919889: assorted position errors in compiler syntax trees
jjg
parents:
4704
diff
changeset
|
1542 |
JCExpression bound = parseType(); |
7072 | 1543 |
return F.at(pos).Wildcard(t, bound); |
10815 | 1544 |
} else if (token.kind == IDENTIFIER) { |
10 | 1545 |
//error recovery |
1546 |
TypeBoundKind t = F.at(Position.NOPOS).TypeBoundKind(BoundKind.UNBOUND); |
|
1547 |
JCExpression wc = toP(F.at(pos).Wildcard(t, null)); |
|
10815 | 1548 |
JCIdent id = toP(F.at(token.pos).Ident(ident())); |
10455
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
1549 |
JCErroneous err = F.at(pos).Erroneous(List.<JCTree>of(wc, id)); |
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
1550 |
reportSyntaxError(err, "expected3", GT, EXTENDS, SUPER); |
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
1551 |
return err; |
10 | 1552 |
} else { |
4870
a132763160d7
6919889: assorted position errors in compiler syntax trees
jjg
parents:
4704
diff
changeset
|
1553 |
TypeBoundKind t = toP(F.at(pos).TypeBoundKind(BoundKind.UNBOUND)); |
7072 | 1554 |
return toP(F.at(pos).Wildcard(t, null)); |
10 | 1555 |
} |
1556 |
} |
|
1557 |
||
9073
a29adf86aa0c
7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents:
8625
diff
changeset
|
1558 |
JCTypeApply typeArguments(JCExpression t, boolean diamondAllowed) { |
10815 | 1559 |
int pos = token.pos; |
9073
a29adf86aa0c
7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents:
8625
diff
changeset
|
1560 |
List<JCExpression> args = typeArguments(diamondAllowed); |
10 | 1561 |
return toP(F.at(pos).TypeApply(t, args)); |
1562 |
} |
|
1563 |
||
7072 | 1564 |
/** BracketsOpt = {"[" "]"} |
10 | 1565 |
*/ |
7072 | 1566 |
private JCExpression bracketsOpt(JCExpression t) { |
10815 | 1567 |
if (token.kind == LBRACKET) { |
1568 |
int pos = token.pos; |
|
1569 |
nextToken(); |
|
7072 | 1570 |
t = bracketsOptCont(t, pos); |
1571 |
F.at(pos); |
|
10 | 1572 |
} |
1573 |
return t; |
|
1574 |
} |
|
1575 |
||
7072 | 1576 |
private JCArrayTypeTree bracketsOptCont(JCExpression t, int pos) { |
10 | 1577 |
accept(RBRACKET); |
7072 | 1578 |
t = bracketsOpt(t); |
10 | 1579 |
return toP(F.at(pos).TypeArray(t)); |
1580 |
} |
|
1581 |
||
1582 |
/** BracketsSuffixExpr = "." CLASS |
|
1583 |
* BracketsSuffixType = |
|
1584 |
*/ |
|
1585 |
JCExpression bracketsSuffix(JCExpression t) { |
|
10815 | 1586 |
if ((mode & EXPR) != 0 && token.kind == DOT) { |
10 | 1587 |
mode = EXPR; |
10815 | 1588 |
int pos = token.pos; |
1589 |
nextToken(); |
|
10 | 1590 |
accept(CLASS); |
11055 | 1591 |
if (token.pos == endPosTable.errorEndPos) { |
10 | 1592 |
// error recovery |
1593 |
Name name = null; |
|
10815 | 1594 |
if (token.kind == IDENTIFIER) { |
1595 |
name = token.name(); |
|
1596 |
nextToken(); |
|
10 | 1597 |
} else { |
1598 |
name = names.error; |
|
1599 |
} |
|
1600 |
t = F.at(pos).Erroneous(List.<JCTree>of(toP(F.at(pos).Select(t, name)))); |
|
1601 |
} else { |
|
1602 |
t = toP(F.at(pos).Select(t, names._class)); |
|
1603 |
} |
|
1604 |
} else if ((mode & TYPE) != 0) { |
|
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
1605 |
if (token.kind != COLCOL) { |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
1606 |
mode = TYPE; |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
1607 |
} |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
1608 |
} else if (token.kind != COLCOL) { |
10815 | 1609 |
syntaxError(token.pos, "dot.class.expected"); |
10 | 1610 |
} |
1611 |
return t; |
|
1612 |
} |
|
1613 |
||
11144
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
1614 |
/** |
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
1615 |
* MemberReferenceSuffix = "::" [TypeArguments] Ident |
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
1616 |
* | "::" [TypeArguments] "new" |
11144
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
1617 |
*/ |
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
1618 |
JCExpression memberReferenceSuffix(JCExpression t) { |
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
1619 |
int pos1 = token.pos; |
14062
b7439971a094
7177386: Add attribution support for method references
mcimadamore
parents:
14058
diff
changeset
|
1620 |
accept(COLCOL); |
11144
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
1621 |
return memberReferenceSuffix(pos1, t); |
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
1622 |
} |
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
1623 |
|
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
1624 |
JCExpression memberReferenceSuffix(int pos1, JCExpression t) { |
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
1625 |
checkMethodReferences(); |
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
1626 |
mode = EXPR; |
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
1627 |
List<JCExpression> typeArgs = null; |
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
1628 |
if (token.kind == LT) { |
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
1629 |
typeArgs = typeArguments(false); |
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
1630 |
} |
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
1631 |
Name refName = null; |
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
1632 |
ReferenceMode refMode = null; |
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
1633 |
if (token.kind == NEW) { |
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
1634 |
refMode = ReferenceMode.NEW; |
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
1635 |
refName = names.init; |
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
1636 |
nextToken(); |
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
1637 |
} else { |
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
1638 |
refMode = ReferenceMode.INVOKE; |
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
1639 |
refName = ident(); |
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
1640 |
} |
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
1641 |
return toP(F.at(t.getStartPosition()).Reference(refMode, refName, t, typeArgs)); |
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
1642 |
} |
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
1643 |
|
7072 | 1644 |
/** Creator = Qualident [TypeArguments] ( ArrayCreatorRest | ClassCreatorRest ) |
10 | 1645 |
*/ |
1646 |
JCExpression creator(int newpos, List<JCExpression> typeArgs) { |
|
10815 | 1647 |
switch (token.kind) { |
10 | 1648 |
case BYTE: case SHORT: case CHAR: case INT: case LONG: case FLOAT: |
1649 |
case DOUBLE: case BOOLEAN: |
|
7072 | 1650 |
if (typeArgs == null) |
1651 |
return arrayCreatorRest(newpos, basicType()); |
|
10 | 1652 |
break; |
1653 |
default: |
|
1654 |
} |
|
1655 |
JCExpression t = qualident(); |
|
1656 |
int oldmode = mode; |
|
9073
a29adf86aa0c
7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents:
8625
diff
changeset
|
1657 |
mode = TYPE; |
a29adf86aa0c
7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents:
8625
diff
changeset
|
1658 |
boolean diamondFound = false; |
10199
48bd09ecc88a
7057297: Project Coin: diamond erroneously accepts in array initializer expressions
mcimadamore
parents:
9300
diff
changeset
|
1659 |
int lastTypeargsPos = -1; |
10815 | 1660 |
if (token.kind == LT) { |
10 | 1661 |
checkGenerics(); |
10815 | 1662 |
lastTypeargsPos = token.pos; |
9073
a29adf86aa0c
7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents:
8625
diff
changeset
|
1663 |
t = typeArguments(t, true); |
a29adf86aa0c
7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents:
8625
diff
changeset
|
1664 |
diamondFound = (mode & DIAMOND) != 0; |
10 | 1665 |
} |
10815 | 1666 |
while (token.kind == DOT) { |
9073
a29adf86aa0c
7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents:
8625
diff
changeset
|
1667 |
if (diamondFound) { |
a29adf86aa0c
7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents:
8625
diff
changeset
|
1668 |
//cannot select after a diamond |
10455
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
1669 |
illegal(); |
9073
a29adf86aa0c
7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents:
8625
diff
changeset
|
1670 |
} |
10815 | 1671 |
int pos = token.pos; |
1672 |
nextToken(); |
|
10 | 1673 |
t = toP(F.at(pos).Select(t, ident())); |
10815 | 1674 |
if (token.kind == LT) { |
1675 |
lastTypeargsPos = token.pos; |
|
10 | 1676 |
checkGenerics(); |
9073
a29adf86aa0c
7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents:
8625
diff
changeset
|
1677 |
t = typeArguments(t, true); |
a29adf86aa0c
7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents:
8625
diff
changeset
|
1678 |
diamondFound = (mode & DIAMOND) != 0; |
10 | 1679 |
} |
1680 |
} |
|
1681 |
mode = oldmode; |
|
10815 | 1682 |
if (token.kind == LBRACKET) { |
10 | 1683 |
JCExpression e = arrayCreatorRest(newpos, t); |
10199
48bd09ecc88a
7057297: Project Coin: diamond erroneously accepts in array initializer expressions
mcimadamore
parents:
9300
diff
changeset
|
1684 |
if (diamondFound) { |
48bd09ecc88a
7057297: Project Coin: diamond erroneously accepts in array initializer expressions
mcimadamore
parents:
9300
diff
changeset
|
1685 |
reportSyntaxError(lastTypeargsPos, "cannot.create.array.with.diamond"); |
48bd09ecc88a
7057297: Project Coin: diamond erroneously accepts in array initializer expressions
mcimadamore
parents:
9300
diff
changeset
|
1686 |
return toP(F.at(newpos).Erroneous(List.of(e))); |
48bd09ecc88a
7057297: Project Coin: diamond erroneously accepts in array initializer expressions
mcimadamore
parents:
9300
diff
changeset
|
1687 |
} |
48bd09ecc88a
7057297: Project Coin: diamond erroneously accepts in array initializer expressions
mcimadamore
parents:
9300
diff
changeset
|
1688 |
else if (typeArgs != null) { |
10 | 1689 |
int pos = newpos; |
1690 |
if (!typeArgs.isEmpty() && typeArgs.head.pos != Position.NOPOS) { |
|
1691 |
// note: this should always happen but we should |
|
1692 |
// not rely on this as the parser is continuously |
|
1693 |
// modified to improve error recovery. |
|
1694 |
pos = typeArgs.head.pos; |
|
1695 |
} |
|
10815 | 1696 |
setErrorEndPos(S.prevToken().endPos); |
10455
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
1697 |
JCErroneous err = F.at(pos).Erroneous(typeArgs.prepend(e)); |
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
1698 |
reportSyntaxError(err, "cannot.create.array.with.type.arguments"); |
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
1699 |
return toP(err); |
10 | 1700 |
} |
1701 |
return e; |
|
10815 | 1702 |
} else if (token.kind == LPAREN) { |
7072 | 1703 |
return classCreatorRest(newpos, null, typeArgs, t); |
10 | 1704 |
} else { |
10815 | 1705 |
setErrorEndPos(token.pos); |
1706 |
reportSyntaxError(token.pos, "expected2", LPAREN, LBRACKET); |
|
10 | 1707 |
t = toP(F.at(newpos).NewClass(null, typeArgs, t, List.<JCExpression>nil(), null)); |
1708 |
return toP(F.at(newpos).Erroneous(List.<JCTree>of(t))); |
|
1709 |
} |
|
1710 |
} |
|
1711 |
||
1712 |
/** InnerCreator = Ident [TypeArguments] ClassCreatorRest |
|
1713 |
*/ |
|
1714 |
JCExpression innerCreator(int newpos, List<JCExpression> typeArgs, JCExpression encl) { |
|
10815 | 1715 |
JCExpression t = toP(F.at(token.pos).Ident(ident())); |
1716 |
if (token.kind == LT) { |
|
5321
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
5320
diff
changeset
|
1717 |
int oldmode = mode; |
10 | 1718 |
checkGenerics(); |
9073
a29adf86aa0c
7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents:
8625
diff
changeset
|
1719 |
t = typeArguments(t, true); |
5321
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
5320
diff
changeset
|
1720 |
mode = oldmode; |
10 | 1721 |
} |
1722 |
return classCreatorRest(newpos, encl, typeArgs, t); |
|
1723 |
} |
|
1724 |
||
7072 | 1725 |
/** ArrayCreatorRest = "[" ( "]" BracketsOpt ArrayInitializer |
1726 |
* | Expression "]" {"[" Expression "]"} BracketsOpt ) |
|
10 | 1727 |
*/ |
1728 |
JCExpression arrayCreatorRest(int newpos, JCExpression elemtype) { |
|
1729 |
accept(LBRACKET); |
|
10815 | 1730 |
if (token.kind == RBRACKET) { |
10 | 1731 |
accept(RBRACKET); |
7072 | 1732 |
elemtype = bracketsOpt(elemtype); |
10815 | 1733 |
if (token.kind == LBRACE) { |
7072 | 1734 |
return arrayInitializer(newpos, elemtype); |
10 | 1735 |
} else { |
10455
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
1736 |
JCExpression t = toP(F.at(newpos).NewArray(elemtype, List.<JCExpression>nil(), null)); |
10815 | 1737 |
return syntaxError(token.pos, List.<JCTree>of(t), "array.dimension.missing"); |
10 | 1738 |
} |
1739 |
} else { |
|
1740 |
ListBuffer<JCExpression> dims = new ListBuffer<JCExpression>(); |
|
1258
1cf37d8837d1
6724118: change JavaCompiler to not use Scanner directly
jjg
parents:
939
diff
changeset
|
1741 |
dims.append(parseExpression()); |
10 | 1742 |
accept(RBRACKET); |
10815 | 1743 |
while (token.kind == LBRACKET) { |
1744 |
int pos = token.pos; |
|
1745 |
nextToken(); |
|
1746 |
if (token.kind == RBRACKET) { |
|
7072 | 1747 |
elemtype = bracketsOptCont(elemtype, pos); |
10 | 1748 |
} else { |
7072 | 1749 |
dims.append(parseExpression()); |
1750 |
accept(RBRACKET); |
|
10 | 1751 |
} |
1752 |
} |
|
7072 | 1753 |
return toP(F.at(newpos).NewArray(elemtype, dims.toList(), null)); |
10 | 1754 |
} |
1755 |
} |
|
1756 |
||
1757 |
/** ClassCreatorRest = Arguments [ClassBody] |
|
1758 |
*/ |
|
3149 | 1759 |
JCNewClass classCreatorRest(int newpos, |
10 | 1760 |
JCExpression encl, |
1761 |
List<JCExpression> typeArgs, |
|
1762 |
JCExpression t) |
|
1763 |
{ |
|
1764 |
List<JCExpression> args = arguments(); |
|
1765 |
JCClassDecl body = null; |
|
10815 | 1766 |
if (token.kind == LBRACE) { |
1767 |
int pos = token.pos; |
|
10 | 1768 |
List<JCTree> defs = classOrInterfaceBody(names.empty, false); |
1769 |
JCModifiers mods = F.at(Position.NOPOS).Modifiers(0); |
|
1770 |
body = toP(F.at(pos).AnonymousClassDef(mods, defs)); |
|
1771 |
} |
|
1772 |
return toP(F.at(newpos).NewClass(encl, typeArgs, t, args, body)); |
|
1773 |
} |
|
1774 |
||
1775 |
/** ArrayInitializer = "{" [VariableInitializer {"," VariableInitializer}] [","] "}" |
|
1776 |
*/ |
|
1777 |
JCExpression arrayInitializer(int newpos, JCExpression t) { |
|
1778 |
accept(LBRACE); |
|
1779 |
ListBuffer<JCExpression> elems = new ListBuffer<JCExpression>(); |
|
10815 | 1780 |
if (token.kind == COMMA) { |
1781 |
nextToken(); |
|
1782 |
} else if (token.kind != RBRACE) { |
|
10 | 1783 |
elems.append(variableInitializer()); |
10815 | 1784 |
while (token.kind == COMMA) { |
1785 |
nextToken(); |
|
1786 |
if (token.kind == RBRACE) break; |
|
10 | 1787 |
elems.append(variableInitializer()); |
1788 |
} |
|
1789 |
} |
|
1790 |
accept(RBRACE); |
|
1791 |
return toP(F.at(newpos).NewArray(t, List.<JCExpression>nil(), elems.toList())); |
|
1792 |
} |
|
1793 |
||
1794 |
/** VariableInitializer = ArrayInitializer | Expression |
|
1795 |
*/ |
|
1796 |
public JCExpression variableInitializer() { |
|
10815 | 1797 |
return token.kind == LBRACE ? arrayInitializer(token.pos, null) : parseExpression(); |
10 | 1798 |
} |
1799 |
||
1800 |
/** ParExpression = "(" Expression ")" |
|
1801 |
*/ |
|
1802 |
JCExpression parExpression() { |
|
11055 | 1803 |
int pos = token.pos; |
10 | 1804 |
accept(LPAREN); |
1258
1cf37d8837d1
6724118: change JavaCompiler to not use Scanner directly
jjg
parents:
939
diff
changeset
|
1805 |
JCExpression t = parseExpression(); |
10 | 1806 |
accept(RPAREN); |
11055 | 1807 |
return toP(F.at(pos).Parens(t)); |
10 | 1808 |
} |
1809 |
||
1810 |
/** Block = "{" BlockStatements "}" |
|
1811 |
*/ |
|
1812 |
JCBlock block(int pos, long flags) { |
|
1813 |
accept(LBRACE); |
|
1814 |
List<JCStatement> stats = blockStatements(); |
|
1815 |
JCBlock t = F.at(pos).Block(flags, stats); |
|
10815 | 1816 |
while (token.kind == CASE || token.kind == DEFAULT) { |
1817 |
syntaxError("orphaned", token.kind); |
|
10 | 1818 |
switchBlockStatementGroups(); |
1819 |
} |
|
1820 |
// the Block node has a field "endpos" for first char of last token, which is |
|
1821 |
// usually but not necessarily the last char of the last token. |
|
10815 | 1822 |
t.endpos = token.pos; |
10 | 1823 |
accept(RBRACE); |
1824 |
return toP(t); |
|
1825 |
} |
|
1826 |
||
1827 |
public JCBlock block() { |
|
10815 | 1828 |
return block(token.pos, 0); |
10 | 1829 |
} |
1830 |
||
1831 |
/** BlockStatements = { BlockStatement } |
|
1832 |
* BlockStatement = LocalVariableDeclarationStatement |
|
1833 |
* | ClassOrInterfaceOrEnumDeclaration |
|
1834 |
* | [Ident ":"] Statement |
|
1835 |
* LocalVariableDeclarationStatement |
|
1836 |
* = { FINAL | '@' Annotation } Type VariableDeclarators ";" |
|
1837 |
*/ |
|
1838 |
@SuppressWarnings("fallthrough") |
|
1839 |
List<JCStatement> blockStatements() { |
|
12466
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1840 |
//todo: skip to anchor on error(?) |
10 | 1841 |
ListBuffer<JCStatement> stats = new ListBuffer<JCStatement>(); |
1842 |
while (true) { |
|
12466
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1843 |
List<JCStatement> stat = blockStatement(); |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1844 |
if (stat.isEmpty()) { |
10 | 1845 |
return stats.toList(); |
12466
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1846 |
} else { |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1847 |
if (token.pos <= endPosTable.errorEndPos) { |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1848 |
skip(false, true, true, true); |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1849 |
} |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1850 |
stats.addAll(stat); |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1851 |
} |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1852 |
} |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1853 |
} |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1854 |
|
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1855 |
/* |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1856 |
* This method parses a statement treating it as a block, relaxing the |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1857 |
* JLS restrictions, allows us to parse more faulty code, doing so |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1858 |
* enables us to provide better and accurate diagnostics to the user. |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1859 |
*/ |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1860 |
JCStatement parseStatementAsBlock() { |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1861 |
int pos = token.pos; |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1862 |
List<JCStatement> stats = blockStatement(); |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1863 |
if (stats.isEmpty()) { |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1864 |
JCErroneous e = F.at(pos).Erroneous(); |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1865 |
error(e, "illegal.start.of.stmt"); |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1866 |
return F.at(pos).Exec(e); |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1867 |
} else { |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1868 |
JCStatement first = stats.head; |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1869 |
String error = null; |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1870 |
switch (first.getTag()) { |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1871 |
case CLASSDEF: |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1872 |
error = "class.not.allowed"; |
10 | 1873 |
break; |
12466
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1874 |
case VARDEF: |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1875 |
error = "variable.not.allowed"; |
10 | 1876 |
break; |
1877 |
} |
|
12466
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1878 |
if (error != null) { |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1879 |
error(first, error); |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1880 |
List<JCBlock> blist = List.of(F.at(first.pos).Block(0, stats)); |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1881 |
return toP(F.at(pos).Exec(F.at(first.pos).Erroneous(blist))); |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1882 |
} |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1883 |
return first; |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1884 |
} |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1885 |
} |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1886 |
|
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1887 |
@SuppressWarnings("fallthrough") |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1888 |
List<JCStatement> blockStatement() { |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1889 |
//todo: skip to anchor on error(?) |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1890 |
int pos = token.pos; |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1891 |
switch (token.kind) { |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1892 |
case RBRACE: case CASE: case DEFAULT: case EOF: |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1893 |
return List.nil(); |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1894 |
case LBRACE: case IF: case FOR: case WHILE: case DO: case TRY: |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1895 |
case SWITCH: case SYNCHRONIZED: case RETURN: case THROW: case BREAK: |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1896 |
case CONTINUE: case SEMI: case ELSE: case FINALLY: case CATCH: |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1897 |
return List.of(parseStatement()); |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1898 |
case MONKEYS_AT: |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1899 |
case FINAL: { |
13077 | 1900 |
Comment dc = token.comment(CommentStyle.JAVADOC); |
12466
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1901 |
JCModifiers mods = modifiersOpt(); |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1902 |
if (token.kind == INTERFACE || |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1903 |
token.kind == CLASS || |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1904 |
allowEnums && token.kind == ENUM) { |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1905 |
return List.of(classOrInterfaceOrEnumDeclaration(mods, dc)); |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1906 |
} else { |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1907 |
JCExpression t = parseType(); |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1908 |
ListBuffer<JCStatement> stats = |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1909 |
variableDeclarators(mods, t, new ListBuffer<JCStatement>()); |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1910 |
// A "LocalVariableDeclarationStatement" subsumes the terminating semicolon |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1911 |
storeEnd(stats.elems.last(), token.endPos); |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1912 |
accept(SEMI); |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1913 |
return stats.toList(); |
10 | 1914 |
} |
12466
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1915 |
} |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1916 |
case ABSTRACT: case STRICTFP: { |
13077 | 1917 |
Comment dc = token.comment(CommentStyle.JAVADOC); |
12466
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1918 |
JCModifiers mods = modifiersOpt(); |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1919 |
return List.of(classOrInterfaceOrEnumDeclaration(mods, dc)); |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1920 |
} |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1921 |
case INTERFACE: |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1922 |
case CLASS: |
13077 | 1923 |
Comment dc = token.comment(CommentStyle.JAVADOC); |
12466
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1924 |
return List.of(classOrInterfaceOrEnumDeclaration(modifiersOpt(), dc)); |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1925 |
case ENUM: |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1926 |
case ASSERT: |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1927 |
if (allowEnums && token.kind == ENUM) { |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1928 |
error(token.pos, "local.enum"); |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1929 |
dc = token.comment(CommentStyle.JAVADOC); |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1930 |
return List.of(classOrInterfaceOrEnumDeclaration(modifiersOpt(), dc)); |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1931 |
} else if (allowAsserts && token.kind == ASSERT) { |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1932 |
return List.of(parseStatement()); |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1933 |
} |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1934 |
/* fall through to default */ |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1935 |
default: |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1936 |
Token prevToken = token; |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1937 |
JCExpression t = term(EXPR | TYPE); |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1938 |
if (token.kind == COLON && t.hasTag(IDENT)) { |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1939 |
nextToken(); |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1940 |
JCStatement stat = parseStatement(); |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1941 |
return List.<JCStatement>of(F.at(pos).Labelled(prevToken.name(), stat)); |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1942 |
} else if ((lastmode & TYPE) != 0 && |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1943 |
(token.kind == IDENTIFIER || |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1944 |
token.kind == ASSERT || |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1945 |
token.kind == ENUM)) { |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1946 |
pos = token.pos; |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1947 |
JCModifiers mods = F.at(Position.NOPOS).Modifiers(0); |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1948 |
F.at(pos); |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1949 |
ListBuffer<JCStatement> stats = |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1950 |
variableDeclarators(mods, t, new ListBuffer<JCStatement>()); |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1951 |
// A "LocalVariableDeclarationStatement" subsumes the terminating semicolon |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1952 |
storeEnd(stats.elems.last(), token.endPos); |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1953 |
accept(SEMI); |
10 | 1954 |
return stats.toList(); |
12466
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1955 |
} else { |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1956 |
// This Exec is an "ExpressionStatement"; it subsumes the terminating semicolon |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1957 |
JCExpressionStatement expr = to(F.at(pos).Exec(checkExprStat(t))); |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1958 |
accept(SEMI); |
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1959 |
return List.<JCStatement>of(expr); |
10 | 1960 |
} |
1961 |
} |
|
1962 |
} |
|
1963 |
||
1964 |
/** Statement = |
|
1965 |
* Block |
|
1966 |
* | IF ParExpression Statement [ELSE Statement] |
|
1967 |
* | FOR "(" ForInitOpt ";" [Expression] ";" ForUpdateOpt ")" Statement |
|
1968 |
* | FOR "(" FormalParameter : Expression ")" Statement |
|
1969 |
* | WHILE ParExpression Statement |
|
1970 |
* | DO Statement WHILE ParExpression ";" |
|
1971 |
* | TRY Block ( Catches | [Catches] FinallyPart ) |
|
8234
5050975e2df0
7014734: Project Coin: Allow optional trailing semicolon to terminate resources list in try-with-resources
darcy
parents:
8224
diff
changeset
|
1972 |
* | TRY "(" ResourceSpecification ";"opt ")" Block [Catches] [FinallyPart] |
10 | 1973 |
* | SWITCH ParExpression "{" SwitchBlockStatementGroups "}" |
1974 |
* | SYNCHRONIZED ParExpression Block |
|
1975 |
* | RETURN [Expression] ";" |
|
1976 |
* | THROW Expression ";" |
|
1977 |
* | BREAK [Ident] ";" |
|
1978 |
* | CONTINUE [Ident] ";" |
|
1979 |
* | ASSERT Expression [ ":" Expression ] ";" |
|
1980 |
* | ";" |
|
1981 |
* | ExpressionStatement |
|
1982 |
* | Ident ":" Statement |
|
1983 |
*/ |
|
1984 |
@SuppressWarnings("fallthrough") |
|
1258
1cf37d8837d1
6724118: change JavaCompiler to not use Scanner directly
jjg
parents:
939
diff
changeset
|
1985 |
public JCStatement parseStatement() { |
10815 | 1986 |
int pos = token.pos; |
1987 |
switch (token.kind) { |
|
10 | 1988 |
case LBRACE: |
1989 |
return block(); |
|
1990 |
case IF: { |
|
10815 | 1991 |
nextToken(); |
10 | 1992 |
JCExpression cond = parExpression(); |
12466
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1993 |
JCStatement thenpart = parseStatementAsBlock(); |
10 | 1994 |
JCStatement elsepart = null; |
10815 | 1995 |
if (token.kind == ELSE) { |
1996 |
nextToken(); |
|
12466
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
1997 |
elsepart = parseStatementAsBlock(); |
10 | 1998 |
} |
1999 |
return F.at(pos).If(cond, thenpart, elsepart); |
|
2000 |
} |
|
2001 |
case FOR: { |
|
10815 | 2002 |
nextToken(); |
10 | 2003 |
accept(LPAREN); |
10815 | 2004 |
List<JCStatement> inits = token.kind == SEMI ? List.<JCStatement>nil() : forInit(); |
10 | 2005 |
if (inits.length() == 1 && |
10950 | 2006 |
inits.head.hasTag(VARDEF) && |
10 | 2007 |
((JCVariableDecl) inits.head).init == null && |
10815 | 2008 |
token.kind == COLON) { |
10 | 2009 |
checkForeach(); |
2010 |
JCVariableDecl var = (JCVariableDecl)inits.head; |
|
2011 |
accept(COLON); |
|
1258
1cf37d8837d1
6724118: change JavaCompiler to not use Scanner directly
jjg
parents:
939
diff
changeset
|
2012 |
JCExpression expr = parseExpression(); |
10 | 2013 |
accept(RPAREN); |
12466
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
2014 |
JCStatement body = parseStatementAsBlock(); |
10 | 2015 |
return F.at(pos).ForeachLoop(var, expr, body); |
2016 |
} else { |
|
2017 |
accept(SEMI); |
|
10815 | 2018 |
JCExpression cond = token.kind == SEMI ? null : parseExpression(); |
10 | 2019 |
accept(SEMI); |
10815 | 2020 |
List<JCExpressionStatement> steps = token.kind == RPAREN ? List.<JCExpressionStatement>nil() : forUpdate(); |
10 | 2021 |
accept(RPAREN); |
12466
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
2022 |
JCStatement body = parseStatementAsBlock(); |
10 | 2023 |
return F.at(pos).ForLoop(inits, cond, steps, body); |
2024 |
} |
|
2025 |
} |
|
2026 |
case WHILE: { |
|
10815 | 2027 |
nextToken(); |
10 | 2028 |
JCExpression cond = parExpression(); |
12466
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
2029 |
JCStatement body = parseStatementAsBlock(); |
10 | 2030 |
return F.at(pos).WhileLoop(cond, body); |
2031 |
} |
|
2032 |
case DO: { |
|
10815 | 2033 |
nextToken(); |
12466
08863ee323df
7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents:
12337
diff
changeset
|
2034 |
JCStatement body = parseStatementAsBlock(); |
10 | 2035 |
accept(WHILE); |
2036 |
JCExpression cond = parExpression(); |
|
2037 |
JCDoWhileLoop t = to(F.at(pos).DoLoop(body, cond)); |
|
2038 |
accept(SEMI); |
|
2039 |
return t; |
|
2040 |
} |
|
2041 |
case TRY: { |
|
10815 | 2042 |
nextToken(); |
6148
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
6146
diff
changeset
|
2043 |
List<JCTree> resources = List.<JCTree>nil(); |
10815 | 2044 |
if (token.kind == LPAREN) { |
7211
163fe60f63de
6970016: Clean up ARM/try-with-resources implementation
mcimadamore
parents:
7076
diff
changeset
|
2045 |
checkTryWithResources(); |
10815 | 2046 |
nextToken(); |
6148
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
6146
diff
changeset
|
2047 |
resources = resources(); |
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
6146
diff
changeset
|
2048 |
accept(RPAREN); |
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
6146
diff
changeset
|
2049 |
} |
10 | 2050 |
JCBlock body = block(); |
2051 |
ListBuffer<JCCatch> catchers = new ListBuffer<JCCatch>(); |
|
2052 |
JCBlock finalizer = null; |
|
10815 | 2053 |
if (token.kind == CATCH || token.kind == FINALLY) { |
2054 |
while (token.kind == CATCH) catchers.append(catchClause()); |
|
2055 |
if (token.kind == FINALLY) { |
|
2056 |
nextToken(); |
|
10 | 2057 |
finalizer = block(); |
2058 |
} |
|
2059 |
} else { |
|
6148
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
6146
diff
changeset
|
2060 |
if (allowTWR) { |
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
6146
diff
changeset
|
2061 |
if (resources.isEmpty()) |
7076
c96fa26247c8
6994946: option to specify only syntax errors as unrecoverable
jjg
parents:
7074
diff
changeset
|
2062 |
error(pos, "try.without.catch.finally.or.resource.decls"); |
6148
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
6146
diff
changeset
|
2063 |
} else |
7076
c96fa26247c8
6994946: option to specify only syntax errors as unrecoverable
jjg
parents:
7074
diff
changeset
|
2064 |
error(pos, "try.without.catch.or.finally"); |
10 | 2065 |
} |
6148
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
6146
diff
changeset
|
2066 |
return F.at(pos).Try(resources, body, catchers.toList(), finalizer); |
10 | 2067 |
} |
2068 |
case SWITCH: { |
|
10815 | 2069 |
nextToken(); |
10 | 2070 |
JCExpression selector = parExpression(); |
2071 |
accept(LBRACE); |
|
2072 |
List<JCCase> cases = switchBlockStatementGroups(); |
|
2073 |
JCSwitch t = to(F.at(pos).Switch(selector, cases)); |
|
2074 |
accept(RBRACE); |
|
2075 |
return t; |
|
2076 |
} |
|
2077 |
case SYNCHRONIZED: { |
|
10815 | 2078 |
nextToken(); |
10 | 2079 |
JCExpression lock = parExpression(); |
2080 |
JCBlock body = block(); |
|
2081 |
return F.at(pos).Synchronized(lock, body); |
|
2082 |
} |
|
2083 |
case RETURN: { |
|
10815 | 2084 |
nextToken(); |
2085 |
JCExpression result = token.kind == SEMI ? null : parseExpression(); |
|
10 | 2086 |
JCReturn t = to(F.at(pos).Return(result)); |
2087 |
accept(SEMI); |
|
2088 |
return t; |
|
2089 |
} |
|
2090 |
case THROW: { |
|
10815 | 2091 |
nextToken(); |
1258
1cf37d8837d1
6724118: change JavaCompiler to not use Scanner directly
jjg
parents:
939
diff
changeset
|
2092 |
JCExpression exc = parseExpression(); |
10 | 2093 |
JCThrow t = to(F.at(pos).Throw(exc)); |
2094 |
accept(SEMI); |
|
2095 |
return t; |
|
2096 |
} |
|
2097 |
case BREAK: { |
|
10815 | 2098 |
nextToken(); |
2099 |
Name label = (token.kind == IDENTIFIER || token.kind == ASSERT || token.kind == ENUM) ? ident() : null; |
|
10 | 2100 |
JCBreak t = to(F.at(pos).Break(label)); |
2101 |
accept(SEMI); |
|
2102 |
return t; |
|
2103 |
} |
|
2104 |
case CONTINUE: { |
|
10815 | 2105 |
nextToken(); |
2106 |
Name label = (token.kind == IDENTIFIER || token.kind == ASSERT || token.kind == ENUM) ? ident() : null; |
|
10 | 2107 |
JCContinue t = to(F.at(pos).Continue(label)); |
2108 |
accept(SEMI); |
|
2109 |
return t; |
|
2110 |
} |
|
2111 |
case SEMI: |
|
10815 | 2112 |
nextToken(); |
10 | 2113 |
return toP(F.at(pos).Skip()); |
2114 |
case ELSE: |
|
14450
7a62c5b13d6e
8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents:
14359
diff
changeset
|
2115 |
int elsePos = token.pos; |
7a62c5b13d6e
8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents:
14359
diff
changeset
|
2116 |
nextToken(); |
7a62c5b13d6e
8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents:
14359
diff
changeset
|
2117 |
return doRecover(elsePos, BasicErrorRecoveryAction.BLOCK_STMT, "else.without.if"); |
10 | 2118 |
case FINALLY: |
14450
7a62c5b13d6e
8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents:
14359
diff
changeset
|
2119 |
int finallyPos = token.pos; |
7a62c5b13d6e
8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents:
14359
diff
changeset
|
2120 |
nextToken(); |
7a62c5b13d6e
8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents:
14359
diff
changeset
|
2121 |
return doRecover(finallyPos, BasicErrorRecoveryAction.BLOCK_STMT, "finally.without.try"); |
10 | 2122 |
case CATCH: |
14450
7a62c5b13d6e
8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents:
14359
diff
changeset
|
2123 |
return doRecover(token.pos, BasicErrorRecoveryAction.CATCH_CLAUSE, "catch.without.try"); |
10 | 2124 |
case ASSERT: { |
10815 | 2125 |
if (allowAsserts && token.kind == ASSERT) { |
2126 |
nextToken(); |
|
1258
1cf37d8837d1
6724118: change JavaCompiler to not use Scanner directly
jjg
parents:
939
diff
changeset
|
2127 |
JCExpression assertion = parseExpression(); |
10 | 2128 |
JCExpression message = null; |
10815 | 2129 |
if (token.kind == COLON) { |
2130 |
nextToken(); |
|
1258
1cf37d8837d1
6724118: change JavaCompiler to not use Scanner directly
jjg
parents:
939
diff
changeset
|
2131 |
message = parseExpression(); |
10 | 2132 |
} |
2133 |
JCAssert t = to(F.at(pos).Assert(assertion, message)); |
|
2134 |
accept(SEMI); |
|
2135 |
return t; |
|
2136 |
} |
|
2137 |
/* else fall through to default case */ |
|
2138 |
} |
|
2139 |
case ENUM: |
|
2140 |
default: |
|
10815 | 2141 |
Token prevToken = token; |
1258
1cf37d8837d1
6724118: change JavaCompiler to not use Scanner directly
jjg
parents:
939
diff
changeset
|
2142 |
JCExpression expr = parseExpression(); |
10950 | 2143 |
if (token.kind == COLON && expr.hasTag(IDENT)) { |
10815 | 2144 |
nextToken(); |
1258
1cf37d8837d1
6724118: change JavaCompiler to not use Scanner directly
jjg
parents:
939
diff
changeset
|
2145 |
JCStatement stat = parseStatement(); |
10815 | 2146 |
return F.at(pos).Labelled(prevToken.name(), stat); |
10 | 2147 |
} else { |
2148 |
// This Exec is an "ExpressionStatement"; it subsumes the terminating semicolon |
|
2149 |
JCExpressionStatement stat = to(F.at(pos).Exec(checkExprStat(expr))); |
|
2150 |
accept(SEMI); |
|
2151 |
return stat; |
|
2152 |
} |
|
2153 |
} |
|
2154 |
} |
|
2155 |
||
14450
7a62c5b13d6e
8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents:
14359
diff
changeset
|
2156 |
private JCStatement doRecover(int startPos, ErrorRecoveryAction action, String key) { |
7a62c5b13d6e
8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents:
14359
diff
changeset
|
2157 |
int errPos = S.errPos(); |
7a62c5b13d6e
8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents:
14359
diff
changeset
|
2158 |
JCTree stm = action.doRecover(this); |
7a62c5b13d6e
8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents:
14359
diff
changeset
|
2159 |
S.errPos(errPos); |
7a62c5b13d6e
8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents:
14359
diff
changeset
|
2160 |
return toP(F.Exec(syntaxError(startPos, List.<JCTree>of(stm), key))); |
7a62c5b13d6e
8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents:
14359
diff
changeset
|
2161 |
} |
7a62c5b13d6e
8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents:
14359
diff
changeset
|
2162 |
|
10 | 2163 |
/** CatchClause = CATCH "(" FormalParameter ")" Block |
2164 |
*/ |
|
10455
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
2165 |
protected JCCatch catchClause() { |
10815 | 2166 |
int pos = token.pos; |
10 | 2167 |
accept(CATCH); |
2168 |
accept(LPAREN); |
|
5492
515e4b33b335
6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents:
5321
diff
changeset
|
2169 |
JCModifiers mods = optFinal(Flags.PARAMETER); |
515e4b33b335
6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents:
5321
diff
changeset
|
2170 |
List<JCExpression> catchTypes = catchTypes(); |
515e4b33b335
6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents:
5321
diff
changeset
|
2171 |
JCExpression paramType = catchTypes.size() > 1 ? |
9300
c2de4dd9853b
7033809: Rename "disjunctive" to "union" in javax.lang.model
darcy
parents:
9073
diff
changeset
|
2172 |
toP(F.at(catchTypes.head.getStartPosition()).TypeUnion(catchTypes)) : |
5492
515e4b33b335
6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents:
5321
diff
changeset
|
2173 |
catchTypes.head; |
515e4b33b335
6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents:
5321
diff
changeset
|
2174 |
JCVariableDecl formal = variableDeclaratorId(mods, paramType); |
10 | 2175 |
accept(RPAREN); |
2176 |
JCBlock body = block(); |
|
2177 |
return F.at(pos).Catch(formal, body); |
|
2178 |
} |
|
2179 |
||
5492
515e4b33b335
6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents:
5321
diff
changeset
|
2180 |
List<JCExpression> catchTypes() { |
515e4b33b335
6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents:
5321
diff
changeset
|
2181 |
ListBuffer<JCExpression> catchTypes = ListBuffer.lb(); |
515e4b33b335
6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents:
5321
diff
changeset
|
2182 |
catchTypes.add(parseType()); |
10815 | 2183 |
while (token.kind == BAR) { |
5492
515e4b33b335
6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents:
5321
diff
changeset
|
2184 |
checkMulticatch(); |
10815 | 2185 |
nextToken(); |
5492
515e4b33b335
6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents:
5321
diff
changeset
|
2186 |
catchTypes.add(qualident()); |
515e4b33b335
6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents:
5321
diff
changeset
|
2187 |
} |
515e4b33b335
6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents:
5321
diff
changeset
|
2188 |
return catchTypes.toList(); |
515e4b33b335
6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents:
5321
diff
changeset
|
2189 |
} |
515e4b33b335
6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents:
5321
diff
changeset
|
2190 |
|
10 | 2191 |
/** SwitchBlockStatementGroups = { SwitchBlockStatementGroup } |
2192 |
* SwitchBlockStatementGroup = SwitchLabel BlockStatements |
|
2193 |
* SwitchLabel = CASE ConstantExpression ":" | DEFAULT ":" |
|
2194 |
*/ |
|
2195 |
List<JCCase> switchBlockStatementGroups() { |
|
2196 |
ListBuffer<JCCase> cases = new ListBuffer<JCCase>(); |
|
2197 |
while (true) { |
|
10815 | 2198 |
int pos = token.pos; |
2199 |
switch (token.kind) { |
|
14056 | 2200 |
case CASE: |
2201 |
case DEFAULT: |
|
2202 |
cases.append(switchBlockStatementGroup()); |
|
10 | 2203 |
break; |
2204 |
case RBRACE: case EOF: |
|
2205 |
return cases.toList(); |
|
2206 |
default: |
|
10815 | 2207 |
nextToken(); // to ensure progress |
10 | 2208 |
syntaxError(pos, "expected3", |
939
38e24969c7e9
6717241: some diagnostic argument is prematurely converted into a String object
mcimadamore
parents:
735
diff
changeset
|
2209 |
CASE, DEFAULT, RBRACE); |
10 | 2210 |
} |
2211 |
} |
|
2212 |
} |
|
2213 |
||
14056 | 2214 |
protected JCCase switchBlockStatementGroup() { |
2215 |
int pos = token.pos; |
|
2216 |
List<JCStatement> stats; |
|
2217 |
JCCase c; |
|
2218 |
switch (token.kind) { |
|
2219 |
case CASE: |
|
2220 |
nextToken(); |
|
2221 |
JCExpression pat = parseExpression(); |
|
2222 |
accept(COLON); |
|
2223 |
stats = blockStatements(); |
|
2224 |
c = F.at(pos).Case(pat, stats); |
|
2225 |
if (stats.isEmpty()) |
|
2226 |
storeEnd(c, S.prevToken().endPos); |
|
2227 |
return c; |
|
2228 |
case DEFAULT: |
|
2229 |
nextToken(); |
|
2230 |
accept(COLON); |
|
2231 |
stats = blockStatements(); |
|
2232 |
c = F.at(pos).Case(null, stats); |
|
2233 |
if (stats.isEmpty()) |
|
2234 |
storeEnd(c, S.prevToken().endPos); |
|
2235 |
return c; |
|
2236 |
} |
|
2237 |
throw new AssertionError("should not reach here"); |
|
2238 |
} |
|
2239 |
||
10 | 2240 |
/** MoreStatementExpressions = { COMMA StatementExpression } |
2241 |
*/ |
|
2242 |
<T extends ListBuffer<? super JCExpressionStatement>> T moreStatementExpressions(int pos, |
|
2243 |
JCExpression first, |
|
2244 |
T stats) { |
|
2245 |
// This Exec is a "StatementExpression"; it subsumes no terminating token |
|
2246 |
stats.append(toP(F.at(pos).Exec(checkExprStat(first)))); |
|
10815 | 2247 |
while (token.kind == COMMA) { |
2248 |
nextToken(); |
|
2249 |
pos = token.pos; |
|
1258
1cf37d8837d1
6724118: change JavaCompiler to not use Scanner directly
jjg
parents:
939
diff
changeset
|
2250 |
JCExpression t = parseExpression(); |
10 | 2251 |
// This Exec is a "StatementExpression"; it subsumes no terminating token |
2252 |
stats.append(toP(F.at(pos).Exec(checkExprStat(t)))); |
|
2253 |
} |
|
2254 |
return stats; |
|
2255 |
} |
|
2256 |
||
2257 |
/** ForInit = StatementExpression MoreStatementExpressions |
|
2258 |
* | { FINAL | '@' Annotation } Type VariableDeclarators |
|
2259 |
*/ |
|
2260 |
List<JCStatement> forInit() { |
|
2261 |
ListBuffer<JCStatement> stats = lb(); |
|
10815 | 2262 |
int pos = token.pos; |
2263 |
if (token.kind == FINAL || token.kind == MONKEYS_AT) { |
|
1258
1cf37d8837d1
6724118: change JavaCompiler to not use Scanner directly
jjg
parents:
939
diff
changeset
|
2264 |
return variableDeclarators(optFinal(0), parseType(), stats).toList(); |
10 | 2265 |
} else { |
2266 |
JCExpression t = term(EXPR | TYPE); |
|
2267 |
if ((lastmode & TYPE) != 0 && |
|
12715
139b8354de6a
7159445: (javac) emits inaccurate diagnostics for enhanced for-loops
ksrini
parents:
12466
diff
changeset
|
2268 |
(token.kind == IDENTIFIER || token.kind == ASSERT || |
139b8354de6a
7159445: (javac) emits inaccurate diagnostics for enhanced for-loops
ksrini
parents:
12466
diff
changeset
|
2269 |
token.kind == ENUM)) { |
10 | 2270 |
return variableDeclarators(modifiersOpt(), t, stats).toList(); |
12715
139b8354de6a
7159445: (javac) emits inaccurate diagnostics for enhanced for-loops
ksrini
parents:
12466
diff
changeset
|
2271 |
} else if ((lastmode & TYPE) != 0 && token.kind == COLON) { |
139b8354de6a
7159445: (javac) emits inaccurate diagnostics for enhanced for-loops
ksrini
parents:
12466
diff
changeset
|
2272 |
error(pos, "bad.initializer", "for-loop"); |
139b8354de6a
7159445: (javac) emits inaccurate diagnostics for enhanced for-loops
ksrini
parents:
12466
diff
changeset
|
2273 |
return List.of((JCStatement)F.at(pos).VarDef(null, null, t, null)); |
139b8354de6a
7159445: (javac) emits inaccurate diagnostics for enhanced for-loops
ksrini
parents:
12466
diff
changeset
|
2274 |
} else { |
10 | 2275 |
return moreStatementExpressions(pos, t, stats).toList(); |
12715
139b8354de6a
7159445: (javac) emits inaccurate diagnostics for enhanced for-loops
ksrini
parents:
12466
diff
changeset
|
2276 |
} |
10 | 2277 |
} |
2278 |
} |
|
2279 |
||
2280 |
/** ForUpdate = StatementExpression MoreStatementExpressions |
|
2281 |
*/ |
|
2282 |
List<JCExpressionStatement> forUpdate() { |
|
10815 | 2283 |
return moreStatementExpressions(token.pos, |
1258
1cf37d8837d1
6724118: change JavaCompiler to not use Scanner directly
jjg
parents:
939
diff
changeset
|
2284 |
parseExpression(), |
10 | 2285 |
new ListBuffer<JCExpressionStatement>()).toList(); |
2286 |
} |
|
2287 |
||
2288 |
/** AnnotationsOpt = { '@' Annotation } |
|
2289 |
*/ |
|
7072 | 2290 |
List<JCAnnotation> annotationsOpt() { |
10815 | 2291 |
if (token.kind != MONKEYS_AT) return List.nil(); // optimization |
10 | 2292 |
ListBuffer<JCAnnotation> buf = new ListBuffer<JCAnnotation>(); |
10815 | 2293 |
while (token.kind == MONKEYS_AT) { |
2294 |
int pos = token.pos; |
|
2295 |
nextToken(); |
|
7072 | 2296 |
buf.append(annotation(pos)); |
10 | 2297 |
} |
7072 | 2298 |
return buf.toList(); |
10 | 2299 |
} |
2300 |
||
2301 |
/** ModifiersOpt = { Modifier } |
|
2302 |
* Modifier = PUBLIC | PROTECTED | PRIVATE | STATIC | ABSTRACT | FINAL |
|
2303 |
* | NATIVE | SYNCHRONIZED | TRANSIENT | VOLATILE | "@" |
|
2304 |
* | "@" Annotation |
|
2305 |
*/ |
|
2306 |
JCModifiers modifiersOpt() { |
|
2307 |
return modifiersOpt(null); |
|
2308 |
} |
|
10455
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
2309 |
protected JCModifiers modifiersOpt(JCModifiers partial) { |
4870
a132763160d7
6919889: assorted position errors in compiler syntax trees
jjg
parents:
4704
diff
changeset
|
2310 |
long flags; |
a132763160d7
6919889: assorted position errors in compiler syntax trees
jjg
parents:
4704
diff
changeset
|
2311 |
ListBuffer<JCAnnotation> annotations = new ListBuffer<JCAnnotation>(); |
a132763160d7
6919889: assorted position errors in compiler syntax trees
jjg
parents:
4704
diff
changeset
|
2312 |
int pos; |
a132763160d7
6919889: assorted position errors in compiler syntax trees
jjg
parents:
4704
diff
changeset
|
2313 |
if (partial == null) { |
a132763160d7
6919889: assorted position errors in compiler syntax trees
jjg
parents:
4704
diff
changeset
|
2314 |
flags = 0; |
10815 | 2315 |
pos = token.pos; |
4870
a132763160d7
6919889: assorted position errors in compiler syntax trees
jjg
parents:
4704
diff
changeset
|
2316 |
} else { |
a132763160d7
6919889: assorted position errors in compiler syntax trees
jjg
parents:
4704
diff
changeset
|
2317 |
flags = partial.flags; |
a132763160d7
6919889: assorted position errors in compiler syntax trees
jjg
parents:
4704
diff
changeset
|
2318 |
annotations.appendList(partial.annotations); |
a132763160d7
6919889: assorted position errors in compiler syntax trees
jjg
parents:
4704
diff
changeset
|
2319 |
pos = partial.pos; |
a132763160d7
6919889: assorted position errors in compiler syntax trees
jjg
parents:
4704
diff
changeset
|
2320 |
} |
10948 | 2321 |
if (token.deprecatedFlag()) { |
10 | 2322 |
flags |= Flags.DEPRECATED; |
2323 |
} |
|
2324 |
int lastPos = Position.NOPOS; |
|
2325 |
loop: |
|
2326 |
while (true) { |
|
2327 |
long flag; |
|
10815 | 2328 |
switch (token.kind) { |
10 | 2329 |
case PRIVATE : flag = Flags.PRIVATE; break; |
2330 |
case PROTECTED : flag = Flags.PROTECTED; break; |
|
2331 |
case PUBLIC : flag = Flags.PUBLIC; break; |
|
2332 |
case STATIC : flag = Flags.STATIC; break; |
|
2333 |
case TRANSIENT : flag = Flags.TRANSIENT; break; |
|
2334 |
case FINAL : flag = Flags.FINAL; break; |
|
2335 |
case ABSTRACT : flag = Flags.ABSTRACT; break; |
|
2336 |
case NATIVE : flag = Flags.NATIVE; break; |
|
2337 |
case VOLATILE : flag = Flags.VOLATILE; break; |
|
2338 |
case SYNCHRONIZED: flag = Flags.SYNCHRONIZED; break; |
|
2339 |
case STRICTFP : flag = Flags.STRICTFP; break; |
|
2340 |
case MONKEYS_AT : flag = Flags.ANNOTATION; break; |
|
14267
6321fbe0cf50
7192245: Add parser support for default methods
mcimadamore
parents:
14263
diff
changeset
|
2341 |
case DEFAULT : checkDefaultMethods(); flag = Flags.DEFAULT; break; |
10815 | 2342 |
case ERROR : flag = 0; nextToken(); break; |
10 | 2343 |
default: break loop; |
2344 |
} |
|
10815 | 2345 |
if ((flags & flag) != 0) error(token.pos, "repeated.modifier"); |
2346 |
lastPos = token.pos; |
|
2347 |
nextToken(); |
|
10 | 2348 |
if (flag == Flags.ANNOTATION) { |
2349 |
checkAnnotations(); |
|
10815 | 2350 |
if (token.kind != INTERFACE) { |
7072 | 2351 |
JCAnnotation ann = annotation(lastPos); |
4870
a132763160d7
6919889: assorted position errors in compiler syntax trees
jjg
parents:
4704
diff
changeset
|
2352 |
// if first modifier is an annotation, set pos to annotation's. |
a132763160d7
6919889: assorted position errors in compiler syntax trees
jjg
parents:
4704
diff
changeset
|
2353 |
if (flags == 0 && annotations.isEmpty()) |
a132763160d7
6919889: assorted position errors in compiler syntax trees
jjg
parents:
4704
diff
changeset
|
2354 |
pos = ann.pos; |
a132763160d7
6919889: assorted position errors in compiler syntax trees
jjg
parents:
4704
diff
changeset
|
2355 |
annotations.append(ann); |
a132763160d7
6919889: assorted position errors in compiler syntax trees
jjg
parents:
4704
diff
changeset
|
2356 |
lastPos = ann.pos; |
10 | 2357 |
flag = 0; |
2358 |
} |
|
2359 |
} |
|
2360 |
flags |= flag; |
|
2361 |
} |
|
10815 | 2362 |
switch (token.kind) { |
10 | 2363 |
case ENUM: flags |= Flags.ENUM; break; |
2364 |
case INTERFACE: flags |= Flags.INTERFACE; break; |
|
2365 |
default: break; |
|
2366 |
} |
|
2367 |
||
2368 |
/* A modifiers tree with no modifier tokens or annotations |
|
2369 |
* has no text position. */ |
|
6152
111b884a19a7
6972327: JCTree.pos incorrect for annotations without modifiers and package
jjg
parents:
6148
diff
changeset
|
2370 |
if ((flags & (Flags.ModifierFlags | Flags.ANNOTATION)) == 0 && annotations.isEmpty()) |
10 | 2371 |
pos = Position.NOPOS; |
2372 |
||
2373 |
JCModifiers mods = F.at(pos).Modifiers(flags, annotations.toList()); |
|
2374 |
if (pos != Position.NOPOS) |
|
10815 | 2375 |
storeEnd(mods, S.prevToken().endPos); |
10 | 2376 |
return mods; |
2377 |
} |
|
2378 |
||
2379 |
/** Annotation = "@" Qualident [ "(" AnnotationFieldValues ")" ] |
|
2380 |
* @param pos position of "@" token |
|
2381 |
*/ |
|
7072 | 2382 |
JCAnnotation annotation(int pos) { |
10 | 2383 |
// accept(AT); // AT consumed by caller |
2384 |
checkAnnotations(); |
|
2385 |
JCTree ident = qualident(); |
|
2386 |
List<JCExpression> fieldValues = annotationFieldValuesOpt(); |
|
7072 | 2387 |
JCAnnotation ann = F.at(pos).Annotation(ident, fieldValues); |
10815 | 2388 |
storeEnd(ann, S.prevToken().endPos); |
10 | 2389 |
return ann; |
2390 |
} |
|
2391 |
||
2392 |
List<JCExpression> annotationFieldValuesOpt() { |
|
10815 | 2393 |
return (token.kind == LPAREN) ? annotationFieldValues() : List.<JCExpression>nil(); |
10 | 2394 |
} |
2395 |
||
2396 |
/** AnnotationFieldValues = "(" [ AnnotationFieldValue { "," AnnotationFieldValue } ] ")" */ |
|
2397 |
List<JCExpression> annotationFieldValues() { |
|
2398 |
accept(LPAREN); |
|
2399 |
ListBuffer<JCExpression> buf = new ListBuffer<JCExpression>(); |
|
10815 | 2400 |
if (token.kind != RPAREN) { |
10 | 2401 |
buf.append(annotationFieldValue()); |
10815 | 2402 |
while (token.kind == COMMA) { |
2403 |
nextToken(); |
|
10 | 2404 |
buf.append(annotationFieldValue()); |
2405 |
} |
|
2406 |
} |
|
2407 |
accept(RPAREN); |
|
2408 |
return buf.toList(); |
|
2409 |
} |
|
2410 |
||
2411 |
/** AnnotationFieldValue = AnnotationValue |
|
2412 |
* | Identifier "=" AnnotationValue |
|
2413 |
*/ |
|
2414 |
JCExpression annotationFieldValue() { |
|
10815 | 2415 |
if (token.kind == IDENTIFIER) { |
10 | 2416 |
mode = EXPR; |
2417 |
JCExpression t1 = term1(); |
|
10950 | 2418 |
if (t1.hasTag(IDENT) && token.kind == EQ) { |
10815 | 2419 |
int pos = token.pos; |
10 | 2420 |
accept(EQ); |
4870
a132763160d7
6919889: assorted position errors in compiler syntax trees
jjg
parents:
4704
diff
changeset
|
2421 |
JCExpression v = annotationValue(); |
a132763160d7
6919889: assorted position errors in compiler syntax trees
jjg
parents:
4704
diff
changeset
|
2422 |
return toP(F.at(pos).Assign(t1, v)); |
10 | 2423 |
} else { |
2424 |
return t1; |
|
2425 |
} |
|
2426 |
} |
|
2427 |
return annotationValue(); |
|
2428 |
} |
|
2429 |
||
2430 |
/* AnnotationValue = ConditionalExpression |
|
2431 |
* | Annotation |
|
3997
35250de1d4ea
6337964: should ignore last comma in annotation array
darcy
parents:
3894
diff
changeset
|
2432 |
* | "{" [ AnnotationValue { "," AnnotationValue } ] [","] "}" |
10 | 2433 |
*/ |
2434 |
JCExpression annotationValue() { |
|
2435 |
int pos; |
|
10815 | 2436 |
switch (token.kind) { |
10 | 2437 |
case MONKEYS_AT: |
10815 | 2438 |
pos = token.pos; |
2439 |
nextToken(); |
|
7072 | 2440 |
return annotation(pos); |
10 | 2441 |
case LBRACE: |
10815 | 2442 |
pos = token.pos; |
10 | 2443 |
accept(LBRACE); |
2444 |
ListBuffer<JCExpression> buf = new ListBuffer<JCExpression>(); |
|
10815 | 2445 |
if (token.kind != RBRACE) { |
10 | 2446 |
buf.append(annotationValue()); |
10815 | 2447 |
while (token.kind == COMMA) { |
2448 |
nextToken(); |
|
2449 |
if (token.kind == RBRACE) break; |
|
10 | 2450 |
buf.append(annotationValue()); |
2451 |
} |
|
2452 |
} |
|
2453 |
accept(RBRACE); |
|
2454 |
return toP(F.at(pos).NewArray(null, List.<JCExpression>nil(), buf.toList())); |
|
2455 |
default: |
|
2456 |
mode = EXPR; |
|
2457 |
return term1(); |
|
2458 |
} |
|
2459 |
} |
|
2460 |
||
2461 |
/** VariableDeclarators = VariableDeclarator { "," VariableDeclarator } |
|
2462 |
*/ |
|
2463 |
public <T extends ListBuffer<? super JCVariableDecl>> T variableDeclarators(JCModifiers mods, |
|
2464 |
JCExpression type, |
|
2465 |
T vdefs) |
|
2466 |
{ |
|
10815 | 2467 |
return variableDeclaratorsRest(token.pos, mods, type, ident(), false, null, vdefs); |
10 | 2468 |
} |
2469 |
||
2470 |
/** VariableDeclaratorsRest = VariableDeclaratorRest { "," VariableDeclarator } |
|
2471 |
* ConstantDeclaratorsRest = ConstantDeclaratorRest { "," ConstantDeclarator } |
|
2472 |
* |
|
2473 |
* @param reqInit Is an initializer always required? |
|
2474 |
* @param dc The documentation comment for the variable declarations, or null. |
|
2475 |
*/ |
|
2476 |
<T extends ListBuffer<? super JCVariableDecl>> T variableDeclaratorsRest(int pos, |
|
2477 |
JCModifiers mods, |
|
2478 |
JCExpression type, |
|
2479 |
Name name, |
|
2480 |
boolean reqInit, |
|
13077 | 2481 |
Comment dc, |
10 | 2482 |
T vdefs) |
2483 |
{ |
|
2484 |
vdefs.append(variableDeclaratorRest(pos, mods, type, name, reqInit, dc)); |
|
10815 | 2485 |
while (token.kind == COMMA) { |
10 | 2486 |
// All but last of multiple declarators subsume a comma |
10815 | 2487 |
storeEnd((JCTree)vdefs.elems.last(), token.endPos); |
2488 |
nextToken(); |
|
10 | 2489 |
vdefs.append(variableDeclarator(mods, type, reqInit, dc)); |
2490 |
} |
|
2491 |
return vdefs; |
|
2492 |
} |
|
2493 |
||
2494 |
/** VariableDeclarator = Ident VariableDeclaratorRest |
|
2495 |
* ConstantDeclarator = Ident ConstantDeclaratorRest |
|
2496 |
*/ |
|
13077 | 2497 |
JCVariableDecl variableDeclarator(JCModifiers mods, JCExpression type, boolean reqInit, Comment dc) { |
10815 | 2498 |
return variableDeclaratorRest(token.pos, mods, type, ident(), reqInit, dc); |
10 | 2499 |
} |
2500 |
||
2501 |
/** VariableDeclaratorRest = BracketsOpt ["=" VariableInitializer] |
|
2502 |
* ConstantDeclaratorRest = BracketsOpt "=" VariableInitializer |
|
2503 |
* |
|
2504 |
* @param reqInit Is an initializer always required? |
|
2505 |
* @param dc The documentation comment for the variable declarations, or null. |
|
2506 |
*/ |
|
2507 |
JCVariableDecl variableDeclaratorRest(int pos, JCModifiers mods, JCExpression type, Name name, |
|
13077 | 2508 |
boolean reqInit, Comment dc) { |
10 | 2509 |
type = bracketsOpt(type); |
2510 |
JCExpression init = null; |
|
10815 | 2511 |
if (token.kind == EQ) { |
2512 |
nextToken(); |
|
10 | 2513 |
init = variableInitializer(); |
2514 |
} |
|
10815 | 2515 |
else if (reqInit) syntaxError(token.pos, "expected", EQ); |
10 | 2516 |
JCVariableDecl result = |
2517 |
toP(F.at(pos).VarDef(mods, name, type, init)); |
|
2518 |
attach(result, dc); |
|
2519 |
return result; |
|
2520 |
} |
|
2521 |
||
2522 |
/** VariableDeclaratorId = Ident BracketsOpt |
|
2523 |
*/ |
|
2524 |
JCVariableDecl variableDeclaratorId(JCModifiers mods, JCExpression type) { |
|
10815 | 2525 |
int pos = token.pos; |
10 | 2526 |
Name name = ident(); |
8047
c7f08cdb5c3c
6569633: Varargs: parser error when varargs element type is an array
mcimadamore
parents:
8033
diff
changeset
|
2527 |
if ((mods.flags & Flags.VARARGS) != 0 && |
10815 | 2528 |
token.kind == LBRACKET) { |
2529 |
log.error(token.pos, "varargs.and.old.array.syntax"); |
|
8047
c7f08cdb5c3c
6569633: Varargs: parser error when varargs element type is an array
mcimadamore
parents:
8033
diff
changeset
|
2530 |
} |
c7f08cdb5c3c
6569633: Varargs: parser error when varargs element type is an array
mcimadamore
parents:
8033
diff
changeset
|
2531 |
type = bracketsOpt(type); |
10 | 2532 |
return toP(F.at(pos).VarDef(mods, name, type, null)); |
2533 |
} |
|
2534 |
||
6148
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
6146
diff
changeset
|
2535 |
/** Resources = Resource { ";" Resources } |
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
6146
diff
changeset
|
2536 |
*/ |
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
6146
diff
changeset
|
2537 |
List<JCTree> resources() { |
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
6146
diff
changeset
|
2538 |
ListBuffer<JCTree> defs = new ListBuffer<JCTree>(); |
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
6146
diff
changeset
|
2539 |
defs.append(resource()); |
10815 | 2540 |
while (token.kind == SEMI) { |
8234
5050975e2df0
7014734: Project Coin: Allow optional trailing semicolon to terminate resources list in try-with-resources
darcy
parents:
8224
diff
changeset
|
2541 |
// All but last of multiple declarators must subsume a semicolon |
10815 | 2542 |
storeEnd(defs.elems.last(), token.endPos); |
2543 |
int semiColonPos = token.pos; |
|
2544 |
nextToken(); |
|
2545 |
if (token.kind == RPAREN) { // Optional trailing semicolon |
|
8224
8f18e1622660
7013420: Project Coin: remove general expression support from try-with-resources statement
darcy
parents:
8047
diff
changeset
|
2546 |
// after last resource |
8f18e1622660
7013420: Project Coin: remove general expression support from try-with-resources statement
darcy
parents:
8047
diff
changeset
|
2547 |
break; |
8f18e1622660
7013420: Project Coin: remove general expression support from try-with-resources statement
darcy
parents:
8047
diff
changeset
|
2548 |
} |
6148
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
6146
diff
changeset
|
2549 |
defs.append(resource()); |
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
6146
diff
changeset
|
2550 |
} |
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
6146
diff
changeset
|
2551 |
return defs.toList(); |
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
6146
diff
changeset
|
2552 |
} |
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
6146
diff
changeset
|
2553 |
|
8224
8f18e1622660
7013420: Project Coin: remove general expression support from try-with-resources statement
darcy
parents:
8047
diff
changeset
|
2554 |
/** Resource = VariableModifiersOpt Type VariableDeclaratorId = Expression |
6148
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
6146
diff
changeset
|
2555 |
*/ |
10455
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
2556 |
protected JCTree resource() { |
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
2557 |
JCModifiers optFinal = optFinal(Flags.FINAL); |
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
2558 |
JCExpression type = parseType(); |
10815 | 2559 |
int pos = token.pos; |
10455
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
2560 |
Name ident = ident(); |
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
2561 |
return variableDeclaratorRest(pos, optFinal, type, ident, true, null); |
6148
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
6146
diff
changeset
|
2562 |
} |
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
6146
diff
changeset
|
2563 |
|
10 | 2564 |
/** CompilationUnit = [ { "@" Annotation } PACKAGE Qualident ";"] {ImportDeclaration} {TypeDeclaration} |
2565 |
*/ |
|
1258
1cf37d8837d1
6724118: change JavaCompiler to not use Scanner directly
jjg
parents:
939
diff
changeset
|
2566 |
public JCTree.JCCompilationUnit parseCompilationUnit() { |
10815 | 2567 |
Token firstToken = token; |
10 | 2568 |
JCExpression pid = null; |
2569 |
JCModifiers mods = null; |
|
10815 | 2570 |
boolean consumedToplevelDoc = false; |
2571 |
boolean seenImport = false; |
|
2572 |
boolean seenPackage = false; |
|
10 | 2573 |
List<JCAnnotation> packageAnnotations = List.nil(); |
10815 | 2574 |
if (token.kind == MONKEYS_AT) |
10 | 2575 |
mods = modifiersOpt(); |
2576 |
||
10815 | 2577 |
if (token.kind == PACKAGE) { |
2578 |
seenPackage = true; |
|
10 | 2579 |
if (mods != null) { |
2580 |
checkNoMods(mods.flags); |
|
2581 |
packageAnnotations = mods.annotations; |
|
2582 |
mods = null; |
|
2583 |
} |
|
10815 | 2584 |
nextToken(); |
10 | 2585 |
pid = qualident(); |
2586 |
accept(SEMI); |
|
2587 |
} |
|
2588 |
ListBuffer<JCTree> defs = new ListBuffer<JCTree>(); |
|
1258
1cf37d8837d1
6724118: change JavaCompiler to not use Scanner directly
jjg
parents:
939
diff
changeset
|
2589 |
boolean checkForImports = true; |
10815 | 2590 |
boolean firstTypeDecl = true; |
2591 |
while (token.kind != EOF) { |
|
11055 | 2592 |
if (token.pos <= endPosTable.errorEndPos) { |
10 | 2593 |
// error recovery |
2594 |
skip(checkForImports, false, false, false); |
|
10815 | 2595 |
if (token.kind == EOF) |
10 | 2596 |
break; |
2597 |
} |
|
10815 | 2598 |
if (checkForImports && mods == null && token.kind == IMPORT) { |
2599 |
seenImport = true; |
|
10 | 2600 |
defs.append(importDeclaration()); |
2601 |
} else { |
|
13077 | 2602 |
Comment docComment = token.comment(CommentStyle.JAVADOC); |
10815 | 2603 |
if (firstTypeDecl && !seenImport && !seenPackage) { |
10948 | 2604 |
docComment = firstToken.comment(CommentStyle.JAVADOC); |
10815 | 2605 |
consumedToplevelDoc = true; |
6716
71df48777dd1
6877202: Elements.getDocComment() is not getting JavaDocComments
jjg
parents:
6585
diff
changeset
|
2606 |
} |
10815 | 2607 |
JCTree def = typeDeclaration(mods, docComment); |
10 | 2608 |
if (def instanceof JCExpressionStatement) |
2609 |
def = ((JCExpressionStatement)def).expr; |
|
2610 |
defs.append(def); |
|
2611 |
if (def instanceof JCClassDecl) |
|
2612 |
checkForImports = false; |
|
2613 |
mods = null; |
|
10815 | 2614 |
firstTypeDecl = false; |
10 | 2615 |
} |
2616 |
} |
|
10815 | 2617 |
JCTree.JCCompilationUnit toplevel = F.at(firstToken.pos).TopLevel(packageAnnotations, pid, defs.toList()); |
2618 |
if (!consumedToplevelDoc) |
|
10948 | 2619 |
attach(toplevel, firstToken.comment(CommentStyle.JAVADOC)); |
10 | 2620 |
if (defs.elems.isEmpty()) |
10815 | 2621 |
storeEnd(toplevel, S.prevToken().endPos); |
1258
1cf37d8837d1
6724118: change JavaCompiler to not use Scanner directly
jjg
parents:
939
diff
changeset
|
2622 |
if (keepDocComments) |
1cf37d8837d1
6724118: change JavaCompiler to not use Scanner directly
jjg
parents:
939
diff
changeset
|
2623 |
toplevel.docComments = docComments; |
1cf37d8837d1
6724118: change JavaCompiler to not use Scanner directly
jjg
parents:
939
diff
changeset
|
2624 |
if (keepLineMap) |
1cf37d8837d1
6724118: change JavaCompiler to not use Scanner directly
jjg
parents:
939
diff
changeset
|
2625 |
toplevel.lineMap = S.getLineMap(); |
11055 | 2626 |
toplevel.endPositions = this.endPosTable; |
10 | 2627 |
return toplevel; |
2628 |
} |
|
2629 |
||
2630 |
/** ImportDeclaration = IMPORT [ STATIC ] Ident { "." Ident } [ "." "*" ] ";" |
|
2631 |
*/ |
|
2632 |
JCTree importDeclaration() { |
|
10815 | 2633 |
int pos = token.pos; |
2634 |
nextToken(); |
|
10 | 2635 |
boolean importStatic = false; |
10815 | 2636 |
if (token.kind == STATIC) { |
10 | 2637 |
checkStaticImports(); |
2638 |
importStatic = true; |
|
10815 | 2639 |
nextToken(); |
10 | 2640 |
} |
10815 | 2641 |
JCExpression pid = toP(F.at(token.pos).Ident(ident())); |
10 | 2642 |
do { |
10815 | 2643 |
int pos1 = token.pos; |
10 | 2644 |
accept(DOT); |
10815 | 2645 |
if (token.kind == STAR) { |
10 | 2646 |
pid = to(F.at(pos1).Select(pid, names.asterisk)); |
10815 | 2647 |
nextToken(); |
10 | 2648 |
break; |
2649 |
} else { |
|
2650 |
pid = toP(F.at(pos1).Select(pid, ident())); |
|
2651 |
} |
|
10815 | 2652 |
} while (token.kind == DOT); |
10 | 2653 |
accept(SEMI); |
2654 |
return toP(F.at(pos).Import(pid, importStatic)); |
|
2655 |
} |
|
2656 |
||
2657 |
/** TypeDeclaration = ClassOrInterfaceOrEnumDeclaration |
|
2658 |
* | ";" |
|
2659 |
*/ |
|
13077 | 2660 |
JCTree typeDeclaration(JCModifiers mods, Comment docComment) { |
10815 | 2661 |
int pos = token.pos; |
2662 |
if (mods == null && token.kind == SEMI) { |
|
2663 |
nextToken(); |
|
10 | 2664 |
return toP(F.at(pos).Skip()); |
2665 |
} else { |
|
10815 | 2666 |
return classOrInterfaceOrEnumDeclaration(modifiersOpt(mods), docComment); |
10 | 2667 |
} |
2668 |
} |
|
2669 |
||
2670 |
/** ClassOrInterfaceOrEnumDeclaration = ModifiersOpt |
|
2671 |
* (ClassDeclaration | InterfaceDeclaration | EnumDeclaration) |
|
2672 |
* @param mods Any modifiers starting the class or interface declaration |
|
2673 |
* @param dc The documentation comment for the class, or null. |
|
2674 |
*/ |
|
13077 | 2675 |
JCStatement classOrInterfaceOrEnumDeclaration(JCModifiers mods, Comment dc) { |
10815 | 2676 |
if (token.kind == CLASS) { |
10 | 2677 |
return classDeclaration(mods, dc); |
10815 | 2678 |
} else if (token.kind == INTERFACE) { |
10 | 2679 |
return interfaceDeclaration(mods, dc); |
2680 |
} else if (allowEnums) { |
|
10815 | 2681 |
if (token.kind == ENUM) { |
10 | 2682 |
return enumDeclaration(mods, dc); |
2683 |
} else { |
|
10815 | 2684 |
int pos = token.pos; |
10 | 2685 |
List<JCTree> errs; |
10815 | 2686 |
if (token.kind == IDENTIFIER) { |
10 | 2687 |
errs = List.<JCTree>of(mods, toP(F.at(pos).Ident(ident()))); |
10815 | 2688 |
setErrorEndPos(token.pos); |
10 | 2689 |
} else { |
2690 |
errs = List.<JCTree>of(mods); |
|
2691 |
} |
|
2692 |
return toP(F.Exec(syntaxError(pos, errs, "expected3", |
|
939
38e24969c7e9
6717241: some diagnostic argument is prematurely converted into a String object
mcimadamore
parents:
735
diff
changeset
|
2693 |
CLASS, INTERFACE, ENUM))); |
10 | 2694 |
} |
2695 |
} else { |
|
10815 | 2696 |
if (token.kind == ENUM) { |
2697 |
error(token.pos, "enums.not.supported.in.source", source.name); |
|
10 | 2698 |
allowEnums = true; |
2699 |
return enumDeclaration(mods, dc); |
|
2700 |
} |
|
10815 | 2701 |
int pos = token.pos; |
10 | 2702 |
List<JCTree> errs; |
10815 | 2703 |
if (token.kind == IDENTIFIER) { |
10 | 2704 |
errs = List.<JCTree>of(mods, toP(F.at(pos).Ident(ident()))); |
10815 | 2705 |
setErrorEndPos(token.pos); |
10 | 2706 |
} else { |
2707 |
errs = List.<JCTree>of(mods); |
|
2708 |
} |
|
2709 |
return toP(F.Exec(syntaxError(pos, errs, "expected2", |
|
939
38e24969c7e9
6717241: some diagnostic argument is prematurely converted into a String object
mcimadamore
parents:
735
diff
changeset
|
2710 |
CLASS, INTERFACE))); |
10 | 2711 |
} |
2712 |
} |
|
2713 |
||
2714 |
/** ClassDeclaration = CLASS Ident TypeParametersOpt [EXTENDS Type] |
|
2715 |
* [IMPLEMENTS TypeList] ClassBody |
|
2716 |
* @param mods The modifiers starting the class declaration |
|
2717 |
* @param dc The documentation comment for the class, or null. |
|
2718 |
*/ |
|
13077 | 2719 |
protected JCClassDecl classDeclaration(JCModifiers mods, Comment dc) { |
10815 | 2720 |
int pos = token.pos; |
10 | 2721 |
accept(CLASS); |
2722 |
Name name = ident(); |
|
2723 |
||
2724 |
List<JCTypeParameter> typarams = typeParametersOpt(); |
|
2725 |
||
8625
6b51ef804d49
6639645: Modeling type implementing missing interfaces
jjg
parents:
8234
diff
changeset
|
2726 |
JCExpression extending = null; |
10815 | 2727 |
if (token.kind == EXTENDS) { |
2728 |
nextToken(); |
|
1258
1cf37d8837d1
6724118: change JavaCompiler to not use Scanner directly
jjg
parents:
939
diff
changeset
|
2729 |
extending = parseType(); |
10 | 2730 |
} |
2731 |
List<JCExpression> implementing = List.nil(); |
|
10815 | 2732 |
if (token.kind == IMPLEMENTS) { |
2733 |
nextToken(); |
|
10 | 2734 |
implementing = typeList(); |
2735 |
} |
|
2736 |
List<JCTree> defs = classOrInterfaceBody(name, false); |
|
2737 |
JCClassDecl result = toP(F.at(pos).ClassDef( |
|
2738 |
mods, name, typarams, extending, implementing, defs)); |
|
2739 |
attach(result, dc); |
|
2740 |
return result; |
|
2741 |
} |
|
2742 |
||
2743 |
/** InterfaceDeclaration = INTERFACE Ident TypeParametersOpt |
|
2744 |
* [EXTENDS TypeList] InterfaceBody |
|
2745 |
* @param mods The modifiers starting the interface declaration |
|
2746 |
* @param dc The documentation comment for the interface, or null. |
|
2747 |
*/ |
|
13077 | 2748 |
protected JCClassDecl interfaceDeclaration(JCModifiers mods, Comment dc) { |
10815 | 2749 |
int pos = token.pos; |
10 | 2750 |
accept(INTERFACE); |
2751 |
Name name = ident(); |
|
2752 |
||
2753 |
List<JCTypeParameter> typarams = typeParametersOpt(); |
|
2754 |
||
2755 |
List<JCExpression> extending = List.nil(); |
|
10815 | 2756 |
if (token.kind == EXTENDS) { |
2757 |
nextToken(); |
|
10 | 2758 |
extending = typeList(); |
2759 |
} |
|
2760 |
List<JCTree> defs = classOrInterfaceBody(name, true); |
|
2761 |
JCClassDecl result = toP(F.at(pos).ClassDef( |
|
2762 |
mods, name, typarams, null, extending, defs)); |
|
2763 |
attach(result, dc); |
|
2764 |
return result; |
|
2765 |
} |
|
2766 |
||
2767 |
/** EnumDeclaration = ENUM Ident [IMPLEMENTS TypeList] EnumBody |
|
2768 |
* @param mods The modifiers starting the enum declaration |
|
2769 |
* @param dc The documentation comment for the enum, or null. |
|
2770 |
*/ |
|
13077 | 2771 |
protected JCClassDecl enumDeclaration(JCModifiers mods, Comment dc) { |
10815 | 2772 |
int pos = token.pos; |
10 | 2773 |
accept(ENUM); |
2774 |
Name name = ident(); |
|
2775 |
||
2776 |
List<JCExpression> implementing = List.nil(); |
|
10815 | 2777 |
if (token.kind == IMPLEMENTS) { |
2778 |
nextToken(); |
|
10 | 2779 |
implementing = typeList(); |
2780 |
} |
|
2781 |
||
2782 |
List<JCTree> defs = enumBody(name); |
|
4870
a132763160d7
6919889: assorted position errors in compiler syntax trees
jjg
parents:
4704
diff
changeset
|
2783 |
mods.flags |= Flags.ENUM; |
10 | 2784 |
JCClassDecl result = toP(F.at(pos). |
4870
a132763160d7
6919889: assorted position errors in compiler syntax trees
jjg
parents:
4704
diff
changeset
|
2785 |
ClassDef(mods, name, List.<JCTypeParameter>nil(), |
10 | 2786 |
null, implementing, defs)); |
2787 |
attach(result, dc); |
|
2788 |
return result; |
|
2789 |
} |
|
2790 |
||
2791 |
/** EnumBody = "{" { EnumeratorDeclarationList } [","] |
|
2792 |
* [ ";" {ClassBodyDeclaration} ] "}" |
|
2793 |
*/ |
|
2794 |
List<JCTree> enumBody(Name enumName) { |
|
2795 |
accept(LBRACE); |
|
2796 |
ListBuffer<JCTree> defs = new ListBuffer<JCTree>(); |
|
10815 | 2797 |
if (token.kind == COMMA) { |
2798 |
nextToken(); |
|
2799 |
} else if (token.kind != RBRACE && token.kind != SEMI) { |
|
10 | 2800 |
defs.append(enumeratorDeclaration(enumName)); |
10815 | 2801 |
while (token.kind == COMMA) { |
2802 |
nextToken(); |
|
2803 |
if (token.kind == RBRACE || token.kind == SEMI) break; |
|
10 | 2804 |
defs.append(enumeratorDeclaration(enumName)); |
2805 |
} |
|
10815 | 2806 |
if (token.kind != SEMI && token.kind != RBRACE) { |
2807 |
defs.append(syntaxError(token.pos, "expected3", |
|
939
38e24969c7e9
6717241: some diagnostic argument is prematurely converted into a String object
mcimadamore
parents:
735
diff
changeset
|
2808 |
COMMA, RBRACE, SEMI)); |
10815 | 2809 |
nextToken(); |
10 | 2810 |
} |
2811 |
} |
|
10815 | 2812 |
if (token.kind == SEMI) { |
2813 |
nextToken(); |
|
2814 |
while (token.kind != RBRACE && token.kind != EOF) { |
|
10 | 2815 |
defs.appendList(classOrInterfaceBodyDeclaration(enumName, |
2816 |
false)); |
|
11055 | 2817 |
if (token.pos <= endPosTable.errorEndPos) { |
10 | 2818 |
// error recovery |
2819 |
skip(false, true, true, false); |
|
2820 |
} |
|
2821 |
} |
|
2822 |
} |
|
2823 |
accept(RBRACE); |
|
2824 |
return defs.toList(); |
|
2825 |
} |
|
2826 |
||
2827 |
/** EnumeratorDeclaration = AnnotationsOpt [TypeArguments] IDENTIFIER [ Arguments ] [ "{" ClassBody "}" ] |
|
2828 |
*/ |
|
2829 |
JCTree enumeratorDeclaration(Name enumName) { |
|
13077 | 2830 |
Comment dc = token.comment(CommentStyle.JAVADOC); |
10 | 2831 |
int flags = Flags.PUBLIC|Flags.STATIC|Flags.FINAL|Flags.ENUM; |
10948 | 2832 |
if (token.deprecatedFlag()) { |
10 | 2833 |
flags |= Flags.DEPRECATED; |
2834 |
} |
|
10815 | 2835 |
int pos = token.pos; |
7072 | 2836 |
List<JCAnnotation> annotations = annotationsOpt(); |
10 | 2837 |
JCModifiers mods = F.at(annotations.isEmpty() ? Position.NOPOS : pos).Modifiers(flags, annotations); |
2838 |
List<JCExpression> typeArgs = typeArgumentsOpt(); |
|
10815 | 2839 |
int identPos = token.pos; |
10 | 2840 |
Name name = ident(); |
10815 | 2841 |
int createPos = token.pos; |
2842 |
List<JCExpression> args = (token.kind == LPAREN) |
|
10 | 2843 |
? arguments() : List.<JCExpression>nil(); |
2844 |
JCClassDecl body = null; |
|
10815 | 2845 |
if (token.kind == LBRACE) { |
10 | 2846 |
JCModifiers mods1 = F.at(Position.NOPOS).Modifiers(Flags.ENUM | Flags.STATIC); |
2847 |
List<JCTree> defs = classOrInterfaceBody(names.empty, false); |
|
2848 |
body = toP(F.at(identPos).AnonymousClassDef(mods1, defs)); |
|
2849 |
} |
|
2850 |
if (args.isEmpty() && body == null) |
|
4704
5206047418c2
6472751: SourcePositions.getStartPos returns incorrect value for enum constants
jjg
parents:
3997
diff
changeset
|
2851 |
createPos = identPos; |
5206047418c2
6472751: SourcePositions.getStartPos returns incorrect value for enum constants
jjg
parents:
3997
diff
changeset
|
2852 |
JCIdent ident = F.at(identPos).Ident(enumName); |
10 | 2853 |
JCNewClass create = F.at(createPos).NewClass(null, typeArgs, ident, args, body); |
4704
5206047418c2
6472751: SourcePositions.getStartPos returns incorrect value for enum constants
jjg
parents:
3997
diff
changeset
|
2854 |
if (createPos != identPos) |
10815 | 2855 |
storeEnd(create, S.prevToken().endPos); |
4704
5206047418c2
6472751: SourcePositions.getStartPos returns incorrect value for enum constants
jjg
parents:
3997
diff
changeset
|
2856 |
ident = F.at(identPos).Ident(enumName); |
10 | 2857 |
JCTree result = toP(F.at(pos).VarDef(mods, name, ident, create)); |
2858 |
attach(result, dc); |
|
2859 |
return result; |
|
2860 |
} |
|
2861 |
||
2862 |
/** TypeList = Type {"," Type} |
|
2863 |
*/ |
|
2864 |
List<JCExpression> typeList() { |
|
2865 |
ListBuffer<JCExpression> ts = new ListBuffer<JCExpression>(); |
|
1258
1cf37d8837d1
6724118: change JavaCompiler to not use Scanner directly
jjg
parents:
939
diff
changeset
|
2866 |
ts.append(parseType()); |
10815 | 2867 |
while (token.kind == COMMA) { |
2868 |
nextToken(); |
|
1258
1cf37d8837d1
6724118: change JavaCompiler to not use Scanner directly
jjg
parents:
939
diff
changeset
|
2869 |
ts.append(parseType()); |
10 | 2870 |
} |
2871 |
return ts.toList(); |
|
2872 |
} |
|
2873 |
||
2874 |
/** ClassBody = "{" {ClassBodyDeclaration} "}" |
|
2875 |
* InterfaceBody = "{" {InterfaceBodyDeclaration} "}" |
|
2876 |
*/ |
|
2877 |
List<JCTree> classOrInterfaceBody(Name className, boolean isInterface) { |
|
2878 |
accept(LBRACE); |
|
11055 | 2879 |
if (token.pos <= endPosTable.errorEndPos) { |
10 | 2880 |
// error recovery |
2881 |
skip(false, true, false, false); |
|
10815 | 2882 |
if (token.kind == LBRACE) |
2883 |
nextToken(); |
|
10 | 2884 |
} |
2885 |
ListBuffer<JCTree> defs = new ListBuffer<JCTree>(); |
|
10815 | 2886 |
while (token.kind != RBRACE && token.kind != EOF) { |
10 | 2887 |
defs.appendList(classOrInterfaceBodyDeclaration(className, isInterface)); |
11055 | 2888 |
if (token.pos <= endPosTable.errorEndPos) { |
10 | 2889 |
// error recovery |
2890 |
skip(false, true, true, false); |
|
2891 |
} |
|
2892 |
} |
|
2893 |
accept(RBRACE); |
|
2894 |
return defs.toList(); |
|
2895 |
} |
|
2896 |
||
2897 |
/** ClassBodyDeclaration = |
|
2898 |
* ";" |
|
2899 |
* | [STATIC] Block |
|
2900 |
* | ModifiersOpt |
|
2901 |
* ( Type Ident |
|
2902 |
* ( VariableDeclaratorsRest ";" | MethodDeclaratorRest ) |
|
2903 |
* | VOID Ident MethodDeclaratorRest |
|
2904 |
* | TypeParameters (Type | VOID) Ident MethodDeclaratorRest |
|
2905 |
* | Ident ConstructorDeclaratorRest |
|
2906 |
* | TypeParameters Ident ConstructorDeclaratorRest |
|
2907 |
* | ClassOrInterfaceOrEnumDeclaration |
|
2908 |
* ) |
|
2909 |
* InterfaceBodyDeclaration = |
|
2910 |
* ";" |
|
2911 |
* | ModifiersOpt Type Ident |
|
2912 |
* ( ConstantDeclaratorsRest | InterfaceMethodDeclaratorRest ";" ) |
|
2913 |
*/ |
|
10455
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
2914 |
protected List<JCTree> classOrInterfaceBodyDeclaration(Name className, boolean isInterface) { |
10815 | 2915 |
if (token.kind == SEMI) { |
2916 |
nextToken(); |
|
6585
189f53daed52
6921495: spurious semicolons in class def cause empty NOPOS blocks
jjg
parents:
6152
diff
changeset
|
2917 |
return List.<JCTree>nil(); |
10 | 2918 |
} else { |
13077 | 2919 |
Comment dc = token.comment(CommentStyle.JAVADOC); |
10815 | 2920 |
int pos = token.pos; |
10 | 2921 |
JCModifiers mods = modifiersOpt(); |
10815 | 2922 |
if (token.kind == CLASS || |
2923 |
token.kind == INTERFACE || |
|
2924 |
allowEnums && token.kind == ENUM) { |
|
10 | 2925 |
return List.<JCTree>of(classOrInterfaceOrEnumDeclaration(mods, dc)); |
10815 | 2926 |
} else if (token.kind == LBRACE && !isInterface && |
10 | 2927 |
(mods.flags & Flags.StandardFlags & ~Flags.STATIC) == 0 && |
2928 |
mods.annotations.isEmpty()) { |
|
2929 |
return List.<JCTree>of(block(pos, mods.flags)); |
|
2930 |
} else { |
|
10815 | 2931 |
pos = token.pos; |
10 | 2932 |
List<JCTypeParameter> typarams = typeParametersOpt(); |
8033
13d9c18b8fa1
6993305: starting position of a method without modifiers and with type parameters is incorrect
jjg
parents:
8032
diff
changeset
|
2933 |
// if there are type parameters but no modifiers, save the start |
13d9c18b8fa1
6993305: starting position of a method without modifiers and with type parameters is incorrect
jjg
parents:
8032
diff
changeset
|
2934 |
// position of the method in the modifiers. |
13d9c18b8fa1
6993305: starting position of a method without modifiers and with type parameters is incorrect
jjg
parents:
8032
diff
changeset
|
2935 |
if (typarams.nonEmpty() && mods.pos == Position.NOPOS) { |
13d9c18b8fa1
6993305: starting position of a method without modifiers and with type parameters is incorrect
jjg
parents:
8032
diff
changeset
|
2936 |
mods.pos = pos; |
13d9c18b8fa1
6993305: starting position of a method without modifiers and with type parameters is incorrect
jjg
parents:
8032
diff
changeset
|
2937 |
storeEnd(mods, pos); |
13d9c18b8fa1
6993305: starting position of a method without modifiers and with type parameters is incorrect
jjg
parents:
8032
diff
changeset
|
2938 |
} |
10815 | 2939 |
Token tk = token; |
2940 |
pos = token.pos; |
|
10 | 2941 |
JCExpression type; |
10815 | 2942 |
boolean isVoid = token.kind == VOID; |
10 | 2943 |
if (isVoid) { |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
2944 |
type = to(F.at(pos).TypeIdent(TypeTag.VOID)); |
10815 | 2945 |
nextToken(); |
10 | 2946 |
} else { |
7072 | 2947 |
type = parseType(); |
10 | 2948 |
} |
10950 | 2949 |
if (token.kind == LPAREN && !isInterface && type.hasTag(IDENT)) { |
10815 | 2950 |
if (isInterface || tk.name() != className) |
7076
c96fa26247c8
6994946: option to specify only syntax errors as unrecoverable
jjg
parents:
7074
diff
changeset
|
2951 |
error(pos, "invalid.meth.decl.ret.type.req"); |
10 | 2952 |
return List.of(methodDeclaratorRest( |
2953 |
pos, mods, null, names.init, typarams, |
|
2954 |
isInterface, true, dc)); |
|
2955 |
} else { |
|
10815 | 2956 |
pos = token.pos; |
2957 |
Name name = ident(); |
|
2958 |
if (token.kind == LPAREN) { |
|
10 | 2959 |
return List.of(methodDeclaratorRest( |
2960 |
pos, mods, type, name, typarams, |
|
2961 |
isInterface, isVoid, dc)); |
|
2962 |
} else if (!isVoid && typarams.isEmpty()) { |
|
2963 |
List<JCTree> defs = |
|
2964 |
variableDeclaratorsRest(pos, mods, type, name, isInterface, dc, |
|
2965 |
new ListBuffer<JCTree>()).toList(); |
|
10815 | 2966 |
storeEnd(defs.last(), token.endPos); |
10 | 2967 |
accept(SEMI); |
2968 |
return defs; |
|
2969 |
} else { |
|
10815 | 2970 |
pos = token.pos; |
10 | 2971 |
List<JCTree> err = isVoid |
2972 |
? List.<JCTree>of(toP(F.at(pos).MethodDef(mods, name, type, typarams, |
|
2973 |
List.<JCVariableDecl>nil(), List.<JCExpression>nil(), null, null))) |
|
2974 |
: null; |
|
10815 | 2975 |
return List.<JCTree>of(syntaxError(token.pos, err, "expected", LPAREN)); |
10 | 2976 |
} |
2977 |
} |
|
2978 |
} |
|
2979 |
} |
|
2980 |
} |
|
2981 |
||
2982 |
/** MethodDeclaratorRest = |
|
7072 | 2983 |
* FormalParameters BracketsOpt [Throws TypeList] ( MethodBody | [DEFAULT AnnotationValue] ";") |
10 | 2984 |
* VoidMethodDeclaratorRest = |
7072 | 2985 |
* FormalParameters [Throws TypeList] ( MethodBody | ";") |
10 | 2986 |
* InterfaceMethodDeclaratorRest = |
7072 | 2987 |
* FormalParameters BracketsOpt [THROWS TypeList] ";" |
10 | 2988 |
* VoidInterfaceMethodDeclaratorRest = |
7072 | 2989 |
* FormalParameters [THROWS TypeList] ";" |
10 | 2990 |
* ConstructorDeclaratorRest = |
7072 | 2991 |
* "(" FormalParameterListOpt ")" [THROWS TypeList] MethodBody |
10 | 2992 |
*/ |
11147
20770e90d993
7119032: (javac) increase visibility of JavacParser methods to improve subtyping
ksrini
parents:
11144
diff
changeset
|
2993 |
protected JCTree methodDeclaratorRest(int pos, |
10 | 2994 |
JCModifiers mods, |
2995 |
JCExpression type, |
|
2996 |
Name name, |
|
2997 |
List<JCTypeParameter> typarams, |
|
2998 |
boolean isInterface, boolean isVoid, |
|
13077 | 2999 |
Comment dc) { |
10 | 3000 |
List<JCVariableDecl> params = formalParameters(); |
7072 | 3001 |
if (!isVoid) type = bracketsOpt(type); |
10 | 3002 |
List<JCExpression> thrown = List.nil(); |
10815 | 3003 |
if (token.kind == THROWS) { |
3004 |
nextToken(); |
|
10 | 3005 |
thrown = qualidentList(); |
3006 |
} |
|
3007 |
JCBlock body = null; |
|
3008 |
JCExpression defaultValue; |
|
10815 | 3009 |
if (token.kind == LBRACE) { |
10 | 3010 |
body = block(); |
3011 |
defaultValue = null; |
|
3012 |
} else { |
|
10815 | 3013 |
if (token.kind == DEFAULT) { |
10 | 3014 |
accept(DEFAULT); |
3015 |
defaultValue = annotationValue(); |
|
3016 |
} else { |
|
3017 |
defaultValue = null; |
|
3018 |
} |
|
3019 |
accept(SEMI); |
|
11055 | 3020 |
if (token.pos <= endPosTable.errorEndPos) { |
10 | 3021 |
// error recovery |
3022 |
skip(false, true, false, false); |
|
10815 | 3023 |
if (token.kind == LBRACE) { |
10 | 3024 |
body = block(); |
3025 |
} |
|
3026 |
} |
|
3027 |
} |
|
4870
a132763160d7
6919889: assorted position errors in compiler syntax trees
jjg
parents:
4704
diff
changeset
|
3028 |
|
10 | 3029 |
JCMethodDecl result = |
3030 |
toP(F.at(pos).MethodDef(mods, name, type, typarams, |
|
7072 | 3031 |
params, thrown, |
10 | 3032 |
body, defaultValue)); |
3033 |
attach(result, dc); |
|
3034 |
return result; |
|
3035 |
} |
|
3036 |
||
7072 | 3037 |
/** QualidentList = Qualident {"," Qualident} |
10 | 3038 |
*/ |
3039 |
List<JCExpression> qualidentList() { |
|
3040 |
ListBuffer<JCExpression> ts = new ListBuffer<JCExpression>(); |
|
7072 | 3041 |
ts.append(qualident()); |
10815 | 3042 |
while (token.kind == COMMA) { |
3043 |
nextToken(); |
|
7072 | 3044 |
ts.append(qualident()); |
10 | 3045 |
} |
3046 |
return ts.toList(); |
|
3047 |
} |
|
3048 |
||
13844 | 3049 |
/** |
3050 |
* {@literal |
|
3051 |
* TypeParametersOpt = ["<" TypeParameter {"," TypeParameter} ">"] |
|
3052 |
* } |
|
10 | 3053 |
*/ |
3054 |
List<JCTypeParameter> typeParametersOpt() { |
|
10815 | 3055 |
if (token.kind == LT) { |
10 | 3056 |
checkGenerics(); |
3057 |
ListBuffer<JCTypeParameter> typarams = new ListBuffer<JCTypeParameter>(); |
|
10815 | 3058 |
nextToken(); |
10 | 3059 |
typarams.append(typeParameter()); |
10815 | 3060 |
while (token.kind == COMMA) { |
3061 |
nextToken(); |
|
10 | 3062 |
typarams.append(typeParameter()); |
3063 |
} |
|
3064 |
accept(GT); |
|
3065 |
return typarams.toList(); |
|
3066 |
} else { |
|
3067 |
return List.nil(); |
|
3068 |
} |
|
3069 |
} |
|
3070 |
||
13844 | 3071 |
/** |
3072 |
* {@literal |
|
3073 |
* TypeParameter = TypeVariable [TypeParameterBound] |
|
10 | 3074 |
* TypeParameterBound = EXTENDS Type {"&" Type} |
3075 |
* TypeVariable = Ident |
|
13844 | 3076 |
* } |
10 | 3077 |
*/ |
3078 |
JCTypeParameter typeParameter() { |
|
10815 | 3079 |
int pos = token.pos; |
10 | 3080 |
Name name = ident(); |
3081 |
ListBuffer<JCExpression> bounds = new ListBuffer<JCExpression>(); |
|
10815 | 3082 |
if (token.kind == EXTENDS) { |
3083 |
nextToken(); |
|
1258
1cf37d8837d1
6724118: change JavaCompiler to not use Scanner directly
jjg
parents:
939
diff
changeset
|
3084 |
bounds.append(parseType()); |
10815 | 3085 |
while (token.kind == AMP) { |
3086 |
nextToken(); |
|
1258
1cf37d8837d1
6724118: change JavaCompiler to not use Scanner directly
jjg
parents:
939
diff
changeset
|
3087 |
bounds.append(parseType()); |
10 | 3088 |
} |
3089 |
} |
|
7072 | 3090 |
return toP(F.at(pos).TypeParameter(name, bounds.toList())); |
10 | 3091 |
} |
3092 |
||
3093 |
/** FormalParameters = "(" [ FormalParameterList ] ")" |
|
3094 |
* FormalParameterList = [ FormalParameterListNovarargs , ] LastFormalParameter |
|
3095 |
* FormalParameterListNovarargs = [ FormalParameterListNovarargs , ] FormalParameter |
|
3096 |
*/ |
|
3097 |
List<JCVariableDecl> formalParameters() { |
|
3098 |
ListBuffer<JCVariableDecl> params = new ListBuffer<JCVariableDecl>(); |
|
3099 |
JCVariableDecl lastParam = null; |
|
3100 |
accept(LPAREN); |
|
10815 | 3101 |
if (token.kind != RPAREN) { |
10 | 3102 |
params.append(lastParam = formalParameter()); |
10815 | 3103 |
while ((lastParam.mods.flags & Flags.VARARGS) == 0 && token.kind == COMMA) { |
3104 |
nextToken(); |
|
10 | 3105 |
params.append(lastParam = formalParameter()); |
3106 |
} |
|
3107 |
} |
|
3108 |
accept(RPAREN); |
|
3109 |
return params.toList(); |
|
3110 |
} |
|
3111 |
||
11143
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
3112 |
List<JCVariableDecl> implicitParameters(boolean hasParens) { |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
3113 |
if (hasParens) { |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
3114 |
accept(LPAREN); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
3115 |
} |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
3116 |
ListBuffer<JCVariableDecl> params = new ListBuffer<JCVariableDecl>(); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
3117 |
if (token.kind != RPAREN && token.kind != ARROW) { |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
3118 |
params.append(implicitParameter()); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
3119 |
while (token.kind == COMMA) { |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
3120 |
nextToken(); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
3121 |
params.append(implicitParameter()); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
3122 |
} |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
3123 |
} |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
3124 |
if (hasParens) { |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
3125 |
accept(RPAREN); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
3126 |
} |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
3127 |
return params.toList(); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
3128 |
} |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
3129 |
|
10 | 3130 |
JCModifiers optFinal(long flags) { |
3131 |
JCModifiers mods = modifiersOpt(); |
|
3132 |
checkNoMods(mods.flags & ~(Flags.FINAL | Flags.DEPRECATED)); |
|
3133 |
mods.flags |= flags; |
|
3134 |
return mods; |
|
3135 |
} |
|
3136 |
||
3137 |
/** FormalParameter = { FINAL | '@' Annotation } Type VariableDeclaratorId |
|
3138 |
* LastFormalParameter = { FINAL | '@' Annotation } Type '...' Ident | FormalParameter |
|
3139 |
*/ |
|
10455
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
3140 |
protected JCVariableDecl formalParameter() { |
10 | 3141 |
JCModifiers mods = optFinal(Flags.PARAMETER); |
1258
1cf37d8837d1
6724118: change JavaCompiler to not use Scanner directly
jjg
parents:
939
diff
changeset
|
3142 |
JCExpression type = parseType(); |
10815 | 3143 |
if (token.kind == ELLIPSIS) { |
10 | 3144 |
checkVarargs(); |
3145 |
mods.flags |= Flags.VARARGS; |
|
10815 | 3146 |
type = to(F.at(token.pos).TypeArray(type)); |
3147 |
nextToken(); |
|
10 | 3148 |
} |
3149 |
return variableDeclaratorId(mods, type); |
|
3150 |
} |
|
3151 |
||
11143
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
3152 |
protected JCVariableDecl implicitParameter() { |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
3153 |
JCModifiers mods = F.at(token.pos).Modifiers(Flags.PARAMETER); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
3154 |
return variableDeclaratorId(mods, null); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
3155 |
} |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
3156 |
|
10 | 3157 |
/* ---------- auxiliary methods -------------- */ |
3158 |
||
7076
c96fa26247c8
6994946: option to specify only syntax errors as unrecoverable
jjg
parents:
7074
diff
changeset
|
3159 |
void error(int pos, String key, Object ... args) { |
c96fa26247c8
6994946: option to specify only syntax errors as unrecoverable
jjg
parents:
7074
diff
changeset
|
3160 |
log.error(DiagnosticFlag.SYNTAX, pos, key, args); |
c96fa26247c8
6994946: option to specify only syntax errors as unrecoverable
jjg
parents:
7074
diff
changeset
|
3161 |
} |
c96fa26247c8
6994946: option to specify only syntax errors as unrecoverable
jjg
parents:
7074
diff
changeset
|
3162 |
|
10455
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
3163 |
void error(DiagnosticPosition pos, String key, Object ... args) { |
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
3164 |
log.error(DiagnosticFlag.SYNTAX, pos, key, args); |
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
3165 |
} |
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
3166 |
|
7076
c96fa26247c8
6994946: option to specify only syntax errors as unrecoverable
jjg
parents:
7074
diff
changeset
|
3167 |
void warning(int pos, String key, Object ... args) { |
c96fa26247c8
6994946: option to specify only syntax errors as unrecoverable
jjg
parents:
7074
diff
changeset
|
3168 |
log.warning(pos, key, args); |
c96fa26247c8
6994946: option to specify only syntax errors as unrecoverable
jjg
parents:
7074
diff
changeset
|
3169 |
} |
c96fa26247c8
6994946: option to specify only syntax errors as unrecoverable
jjg
parents:
7074
diff
changeset
|
3170 |
|
10 | 3171 |
/** Check that given tree is a legal expression statement. |
3172 |
*/ |
|
3173 |
protected JCExpression checkExprStat(JCExpression t) { |
|
3174 |
switch(t.getTag()) { |
|
10950 | 3175 |
case PREINC: case PREDEC: |
3176 |
case POSTINC: case POSTDEC: |
|
3177 |
case ASSIGN: |
|
3178 |
case BITOR_ASG: case BITXOR_ASG: case BITAND_ASG: |
|
3179 |
case SL_ASG: case SR_ASG: case USR_ASG: |
|
3180 |
case PLUS_ASG: case MINUS_ASG: |
|
3181 |
case MUL_ASG: case DIV_ASG: case MOD_ASG: |
|
3182 |
case APPLY: case NEWCLASS: |
|
3183 |
case ERRONEOUS: |
|
10 | 3184 |
return t; |
3185 |
default: |
|
10455
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
3186 |
JCExpression ret = F.at(t.pos).Erroneous(List.<JCTree>of(t)); |
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
3187 |
error(ret, "not.stmt"); |
3d070be0fff8
7073631: (javac) javac parser improvements for error position reporting
ksrini
parents:
10200
diff
changeset
|
3188 |
return ret; |
10 | 3189 |
} |
3190 |
} |
|
3191 |
||
3192 |
/** Return precedence of operator represented by token, |
|
3193 |
* -1 if token is not a binary operator. @see TreeInfo.opPrec |
|
3194 |
*/ |
|
10815 | 3195 |
static int prec(TokenKind token) { |
10950 | 3196 |
JCTree.Tag oc = optag(token); |
3197 |
return (oc != NO_TAG) ? TreeInfo.opPrec(oc) : -1; |
|
10 | 3198 |
} |
3199 |
||
5013
e942b2e52479
6931927: position issues with synthesized anonymous class
jjg
parents:
4870
diff
changeset
|
3200 |
/** |
e942b2e52479
6931927: position issues with synthesized anonymous class
jjg
parents:
4870
diff
changeset
|
3201 |
* Return the lesser of two positions, making allowance for either one |
e942b2e52479
6931927: position issues with synthesized anonymous class
jjg
parents:
4870
diff
changeset
|
3202 |
* being unset. |
e942b2e52479
6931927: position issues with synthesized anonymous class
jjg
parents:
4870
diff
changeset
|
3203 |
*/ |
e942b2e52479
6931927: position issues with synthesized anonymous class
jjg
parents:
4870
diff
changeset
|
3204 |
static int earlier(int pos1, int pos2) { |
e942b2e52479
6931927: position issues with synthesized anonymous class
jjg
parents:
4870
diff
changeset
|
3205 |
if (pos1 == Position.NOPOS) |
e942b2e52479
6931927: position issues with synthesized anonymous class
jjg
parents:
4870
diff
changeset
|
3206 |
return pos2; |
e942b2e52479
6931927: position issues with synthesized anonymous class
jjg
parents:
4870
diff
changeset
|
3207 |
if (pos2 == Position.NOPOS) |
e942b2e52479
6931927: position issues with synthesized anonymous class
jjg
parents:
4870
diff
changeset
|
3208 |
return pos1; |
e942b2e52479
6931927: position issues with synthesized anonymous class
jjg
parents:
4870
diff
changeset
|
3209 |
return (pos1 < pos2 ? pos1 : pos2); |
e942b2e52479
6931927: position issues with synthesized anonymous class
jjg
parents:
4870
diff
changeset
|
3210 |
} |
e942b2e52479
6931927: position issues with synthesized anonymous class
jjg
parents:
4870
diff
changeset
|
3211 |
|
10 | 3212 |
/** Return operation tag of binary operator represented by token, |
10950 | 3213 |
* No_TAG if token is not a binary operator. |
10 | 3214 |
*/ |
10950 | 3215 |
static JCTree.Tag optag(TokenKind token) { |
10 | 3216 |
switch (token) { |
3217 |
case BARBAR: |
|
10950 | 3218 |
return OR; |
10 | 3219 |
case AMPAMP: |
10950 | 3220 |
return AND; |
10 | 3221 |
case BAR: |
10950 | 3222 |
return BITOR; |
10 | 3223 |
case BAREQ: |
10950 | 3224 |
return BITOR_ASG; |
10 | 3225 |
case CARET: |
10950 | 3226 |
return BITXOR; |
10 | 3227 |
case CARETEQ: |
10950 | 3228 |
return BITXOR_ASG; |
10 | 3229 |
case AMP: |
10950 | 3230 |
return BITAND; |
10 | 3231 |
case AMPEQ: |
10950 | 3232 |
return BITAND_ASG; |
10 | 3233 |
case EQEQ: |
10950 | 3234 |
return JCTree.Tag.EQ; |
10 | 3235 |
case BANGEQ: |
10950 | 3236 |
return NE; |
10 | 3237 |
case LT: |
10950 | 3238 |
return JCTree.Tag.LT; |
10 | 3239 |
case GT: |
10950 | 3240 |
return JCTree.Tag.GT; |
10 | 3241 |
case LTEQ: |
10950 | 3242 |
return LE; |
10 | 3243 |
case GTEQ: |
10950 | 3244 |
return GE; |
10 | 3245 |
case LTLT: |
10950 | 3246 |
return SL; |
10 | 3247 |
case LTLTEQ: |
10950 | 3248 |
return SL_ASG; |
10 | 3249 |
case GTGT: |
10950 | 3250 |
return SR; |
10 | 3251 |
case GTGTEQ: |
10950 | 3252 |
return SR_ASG; |
10 | 3253 |
case GTGTGT: |
10950 | 3254 |
return USR; |
10 | 3255 |
case GTGTGTEQ: |
10950 | 3256 |
return USR_ASG; |
10 | 3257 |
case PLUS: |
10950 | 3258 |
return JCTree.Tag.PLUS; |
10 | 3259 |
case PLUSEQ: |
10950 | 3260 |
return PLUS_ASG; |
10 | 3261 |
case SUB: |
10950 | 3262 |
return MINUS; |
10 | 3263 |
case SUBEQ: |
10950 | 3264 |
return MINUS_ASG; |
10 | 3265 |
case STAR: |
10950 | 3266 |
return MUL; |
10 | 3267 |
case STAREQ: |
10950 | 3268 |
return MUL_ASG; |
10 | 3269 |
case SLASH: |
10950 | 3270 |
return DIV; |
10 | 3271 |
case SLASHEQ: |
10950 | 3272 |
return DIV_ASG; |
10 | 3273 |
case PERCENT: |
10950 | 3274 |
return MOD; |
10 | 3275 |
case PERCENTEQ: |
10950 | 3276 |
return MOD_ASG; |
10 | 3277 |
case INSTANCEOF: |
10950 | 3278 |
return TYPETEST; |
10 | 3279 |
default: |
10950 | 3280 |
return NO_TAG; |
10 | 3281 |
} |
3282 |
} |
|
3283 |
||
3284 |
/** Return operation tag of unary operator represented by token, |
|
10950 | 3285 |
* No_TAG if token is not a binary operator. |
10 | 3286 |
*/ |
10950 | 3287 |
static JCTree.Tag unoptag(TokenKind token) { |
10 | 3288 |
switch (token) { |
3289 |
case PLUS: |
|
10950 | 3290 |
return POS; |
10 | 3291 |
case SUB: |
10950 | 3292 |
return NEG; |
10 | 3293 |
case BANG: |
10950 | 3294 |
return NOT; |
10 | 3295 |
case TILDE: |
10950 | 3296 |
return COMPL; |
10 | 3297 |
case PLUSPLUS: |
10950 | 3298 |
return PREINC; |
10 | 3299 |
case SUBSUB: |
10950 | 3300 |
return PREDEC; |
10 | 3301 |
default: |
10950 | 3302 |
return NO_TAG; |
10 | 3303 |
} |
3304 |
} |
|
3305 |
||
3306 |
/** Return type tag of basic type represented by token, |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
3307 |
* NONE if token is not a basic type identifier. |
10 | 3308 |
*/ |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
3309 |
static TypeTag typetag(TokenKind token) { |
10 | 3310 |
switch (token) { |
3311 |
case BYTE: |
|
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
3312 |
return TypeTag.BYTE; |
10 | 3313 |
case CHAR: |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
3314 |
return TypeTag.CHAR; |
10 | 3315 |
case SHORT: |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
3316 |
return TypeTag.SHORT; |
10 | 3317 |
case INT: |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
3318 |
return TypeTag.INT; |
10 | 3319 |
case LONG: |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
3320 |
return TypeTag.LONG; |
10 | 3321 |
case FLOAT: |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
3322 |
return TypeTag.FLOAT; |
10 | 3323 |
case DOUBLE: |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
3324 |
return TypeTag.DOUBLE; |
10 | 3325 |
case BOOLEAN: |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
3326 |
return TypeTag.BOOLEAN; |
10 | 3327 |
default: |
14359
d4099818ab70
7200915: convert TypeTags from a series of small ints to an enum
jjg
parents:
14267
diff
changeset
|
3328 |
return TypeTag.NONE; |
10 | 3329 |
} |
3330 |
} |
|
3331 |
||
3332 |
void checkGenerics() { |
|
3333 |
if (!allowGenerics) { |
|
10815 | 3334 |
error(token.pos, "generics.not.supported.in.source", source.name); |
10 | 3335 |
allowGenerics = true; |
3336 |
} |
|
3337 |
} |
|
3338 |
void checkVarargs() { |
|
3339 |
if (!allowVarargs) { |
|
10815 | 3340 |
error(token.pos, "varargs.not.supported.in.source", source.name); |
10 | 3341 |
allowVarargs = true; |
3342 |
} |
|
3343 |
} |
|
3344 |
void checkForeach() { |
|
3345 |
if (!allowForeach) { |
|
10815 | 3346 |
error(token.pos, "foreach.not.supported.in.source", source.name); |
10 | 3347 |
allowForeach = true; |
3348 |
} |
|
3349 |
} |
|
3350 |
void checkStaticImports() { |
|
3351 |
if (!allowStaticImport) { |
|
10815 | 3352 |
error(token.pos, "static.import.not.supported.in.source", source.name); |
10 | 3353 |
allowStaticImport = true; |
3354 |
} |
|
3355 |
} |
|
3356 |
void checkAnnotations() { |
|
3357 |
if (!allowAnnotations) { |
|
10815 | 3358 |
error(token.pos, "annotations.not.supported.in.source", source.name); |
10 | 3359 |
allowAnnotations = true; |
3360 |
} |
|
3361 |
} |
|
5321
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
5320
diff
changeset
|
3362 |
void checkDiamond() { |
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
5320
diff
changeset
|
3363 |
if (!allowDiamond) { |
10815 | 3364 |
error(token.pos, "diamond.not.supported.in.source", source.name); |
5321
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
5320
diff
changeset
|
3365 |
allowDiamond = true; |
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
5320
diff
changeset
|
3366 |
} |
c8efe769cb3b
6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents:
5320
diff
changeset
|
3367 |
} |
5492
515e4b33b335
6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents:
5321
diff
changeset
|
3368 |
void checkMulticatch() { |
515e4b33b335
6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents:
5321
diff
changeset
|
3369 |
if (!allowMulticatch) { |
10815 | 3370 |
error(token.pos, "multicatch.not.supported.in.source", source.name); |
5492
515e4b33b335
6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents:
5321
diff
changeset
|
3371 |
allowMulticatch = true; |
6148
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
6146
diff
changeset
|
3372 |
} |
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
6146
diff
changeset
|
3373 |
} |
7211
163fe60f63de
6970016: Clean up ARM/try-with-resources implementation
mcimadamore
parents:
7076
diff
changeset
|
3374 |
void checkTryWithResources() { |
6148
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
6146
diff
changeset
|
3375 |
if (!allowTWR) { |
10815 | 3376 |
error(token.pos, "try.with.resources.not.supported.in.source", source.name); |
6148
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
6146
diff
changeset
|
3377 |
allowTWR = true; |
3a8158299c51
6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents:
6146
diff
changeset
|
3378 |
} |
5492
515e4b33b335
6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents:
5321
diff
changeset
|
3379 |
} |
11143
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
3380 |
void checkLambda() { |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
3381 |
if (!allowLambda) { |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
3382 |
log.error(token.pos, "lambda.not.supported.in.source", source.name); |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
3383 |
allowLambda = true; |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
3384 |
} |
9dbe313bfb74
7115050: Add parser support for lambda expressions
mcimadamore
parents:
11055
diff
changeset
|
3385 |
} |
11144
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
3386 |
void checkMethodReferences() { |
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
3387 |
if (!allowMethodReferences) { |
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
3388 |
log.error(token.pos, "method.references.not.supported.in.source", source.name); |
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
3389 |
allowMethodReferences = true; |
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
3390 |
} |
8a4ae514eedf
7115052: Add parser support for method references
mcimadamore
parents:
11143
diff
changeset
|
3391 |
} |
14267
6321fbe0cf50
7192245: Add parser support for default methods
mcimadamore
parents:
14263
diff
changeset
|
3392 |
void checkDefaultMethods() { |
6321fbe0cf50
7192245: Add parser support for default methods
mcimadamore
parents:
14263
diff
changeset
|
3393 |
if (!allowDefaultMethods) { |
6321fbe0cf50
7192245: Add parser support for default methods
mcimadamore
parents:
14263
diff
changeset
|
3394 |
log.error(token.pos, "default.methods.not.supported.in.source", source.name); |
6321fbe0cf50
7192245: Add parser support for default methods
mcimadamore
parents:
14263
diff
changeset
|
3395 |
allowDefaultMethods = true; |
6321fbe0cf50
7192245: Add parser support for default methods
mcimadamore
parents:
14263
diff
changeset
|
3396 |
} |
6321fbe0cf50
7192245: Add parser support for default methods
mcimadamore
parents:
14263
diff
changeset
|
3397 |
} |
11055 | 3398 |
|
3399 |
/* |
|
3400 |
* a functional source tree and end position mappings |
|
3401 |
*/ |
|
3402 |
protected class SimpleEndPosTable extends AbstractEndPosTable { |
|
3403 |
||
3404 |
private final Map<JCTree, Integer> endPosMap; |
|
3405 |
||
3406 |
SimpleEndPosTable() { |
|
3407 |
endPosMap = new HashMap<JCTree, Integer>(); |
|
3408 |
} |
|
3409 |
||
3410 |
protected void storeEnd(JCTree tree, int endpos) { |
|
3411 |
endPosMap.put(tree, errorEndPos > endpos ? errorEndPos : endpos); |
|
3412 |
} |
|
3413 |
||
3414 |
protected <T extends JCTree> T to(T t) { |
|
3415 |
storeEnd(t, token.endPos); |
|
3416 |
return t; |
|
3417 |
} |
|
3418 |
||
3419 |
protected <T extends JCTree> T toP(T t) { |
|
3420 |
storeEnd(t, S.prevToken().endPos); |
|
3421 |
return t; |
|
3422 |
} |
|
3423 |
||
3424 |
public int getEndPos(JCTree tree) { |
|
3425 |
Integer value = endPosMap.get(tree); |
|
3426 |
return (value == null) ? Position.NOPOS : value; |
|
3427 |
} |
|
3428 |
||
3429 |
public int replaceTree(JCTree oldTree, JCTree newTree) { |
|
3430 |
Integer pos = endPosMap.remove(oldTree); |
|
3431 |
if (pos != null) { |
|
3432 |
endPosMap.put(newTree, pos); |
|
3433 |
return pos; |
|
3434 |
} |
|
3435 |
return Position.NOPOS; |
|
3436 |
} |
|
3437 |
} |
|
3438 |
||
3439 |
/* |
|
3440 |
* a default skeletal implementation without any mapping overhead. |
|
3441 |
*/ |
|
3442 |
protected class EmptyEndPosTable extends AbstractEndPosTable { |
|
3443 |
||
3444 |
protected void storeEnd(JCTree tree, int endpos) { /* empty */ } |
|
3445 |
||
3446 |
protected <T extends JCTree> T to(T t) { |
|
3447 |
return t; |
|
3448 |
} |
|
3449 |
||
3450 |
protected <T extends JCTree> T toP(T t) { |
|
3451 |
return t; |
|
3452 |
} |
|
3453 |
||
3454 |
public int getEndPos(JCTree tree) { |
|
3455 |
return Position.NOPOS; |
|
3456 |
} |
|
3457 |
||
3458 |
public int replaceTree(JCTree oldTree, JCTree newTree) { |
|
3459 |
return Position.NOPOS; |
|
3460 |
} |
|
3461 |
||
3462 |
} |
|
3463 |
||
3464 |
protected abstract class AbstractEndPosTable implements EndPosTable { |
|
3465 |
||
3466 |
/** |
|
3467 |
* Store the last error position. |
|
3468 |
*/ |
|
3469 |
protected int errorEndPos; |
|
3470 |
||
3471 |
/** |
|
3472 |
* Store ending position for a tree, the value of which is the greater |
|
3473 |
* of last error position and the given ending position. |
|
3474 |
* @param tree The tree. |
|
3475 |
* @param endpos The ending position to associate with the tree. |
|
3476 |
*/ |
|
3477 |
protected abstract void storeEnd(JCTree tree, int endpos); |
|
3478 |
||
3479 |
/** |
|
3480 |
* Store current token's ending position for a tree, the value of which |
|
3481 |
* will be the greater of last error position and the ending position of |
|
3482 |
* the current token. |
|
3483 |
* @param t The tree. |
|
3484 |
*/ |
|
3485 |
protected abstract <T extends JCTree> T to(T t); |
|
3486 |
||
3487 |
/** |
|
3488 |
* Store current token's ending position for a tree, the value of which |
|
3489 |
* will be the greater of last error position and the ending position of |
|
3490 |
* the previous token. |
|
3491 |
* @param t The tree. |
|
3492 |
*/ |
|
3493 |
protected abstract <T extends JCTree> T toP(T t); |
|
3494 |
||
3495 |
/** |
|
3496 |
* Set the error position during the parsing phases, the value of which |
|
3497 |
* will be set only if it is greater than the last stored error position. |
|
3498 |
* @param errPos The error position |
|
3499 |
*/ |
|
3500 |
protected void setErrorEndPos(int errPos) { |
|
3501 |
if (errPos > errorEndPos) { |
|
3502 |
errorEndPos = errPos; |
|
3503 |
} |
|
3504 |
} |
|
3505 |
} |
|
10 | 3506 |
} |