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