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