langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
author rfield
Wed, 17 Dec 2014 12:48:04 -0800
changeset 28147 72e7fdc79b78
parent 27991 8f4b68523da3
child 28454 63c31d7de8f6
permissions -rw-r--r--
8067384: Facilitate extension of the javac parser Reviewed-by: jjg
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
10
06bc494ca11e Initial load
duke
parents:
diff changeset
     1
/*
22701
67811024e8b4 8030091: Request to update error messages from javac for negative varargs test cases
jlahoda
parents: 22165
diff changeset
     2
 * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
06bc494ca11e Initial load
duke
parents:
diff changeset
     4
 *
06bc494ca11e Initial load
duke
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
06bc494ca11e Initial load
duke
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
5520
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 5492
diff changeset
     7
 * published by the Free Software Foundation.  Oracle designates this
10
06bc494ca11e Initial load
duke
parents:
diff changeset
     8
 * particular file as subject to the "Classpath" exception as provided
5520
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 5492
diff changeset
     9
 * by Oracle in the LICENSE file that accompanied this code.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    10
 *
06bc494ca11e Initial load
duke
parents:
diff changeset
    11
 * This code is distributed in the hope that it will be useful, but WITHOUT
06bc494ca11e Initial load
duke
parents:
diff changeset
    12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
06bc494ca11e Initial load
duke
parents:
diff changeset
    13
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
06bc494ca11e Initial load
duke
parents:
diff changeset
    14
 * version 2 for more details (a copy is included in the LICENSE file that
06bc494ca11e Initial load
duke
parents:
diff changeset
    15
 * accompanied this code).
06bc494ca11e Initial load
duke
parents:
diff changeset
    16
 *
06bc494ca11e Initial load
duke
parents:
diff changeset
    17
 * You should have received a copy of the GNU General Public License version
06bc494ca11e Initial load
duke
parents:
diff changeset
    18
 * 2 along with this work; if not, write to the Free Software Foundation,
06bc494ca11e Initial load
duke
parents:
diff changeset
    19
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
06bc494ca11e Initial load
duke
parents:
diff changeset
    20
 *
5520
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 5492
diff changeset
    21
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 5492
diff changeset
    22
 * or visit www.oracle.com if you need additional information or have any
86e4b9a9da40 6943119: Rebrand source copyright notices
ohair
parents: 5492
diff changeset
    23
 * questions.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    24
 */
06bc494ca11e Initial load
duke
parents:
diff changeset
    25
06bc494ca11e Initial load
duke
parents:
diff changeset
    26
package com.sun.tools.javac.parser;
06bc494ca11e Initial load
duke
parents:
diff changeset
    27
06bc494ca11e Initial load
duke
parents:
diff changeset
    28
import java.util.*;
06bc494ca11e Initial load
duke
parents:
diff changeset
    29
11144
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
    30
import com.sun.source.tree.MemberReferenceTree.ReferenceMode;
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
    31
10455
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
    32
import com.sun.tools.javac.code.*;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
    33
import com.sun.tools.javac.parser.Tokens.*;
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
    34
import com.sun.tools.javac.parser.Tokens.Comment.CommentStyle;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    35
import com.sun.tools.javac.tree.*;
10455
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
    36
import com.sun.tools.javac.tree.JCTree.*;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    37
import com.sun.tools.javac.util.*;
7076
c96fa26247c8 6994946: option to specify only syntax errors as unrecoverable
jjg
parents: 7074
diff changeset
    38
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticFlag;
10455
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
    39
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    40
import com.sun.tools.javac.util.List;
06bc494ca11e Initial load
duke
parents:
diff changeset
    41
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
    42
import static com.sun.tools.javac.parser.Tokens.TokenKind.*;
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
    43
import static com.sun.tools.javac.parser.Tokens.TokenKind.ASSERT;
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
    44
import static com.sun.tools.javac.parser.Tokens.TokenKind.CASE;
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
    45
import static com.sun.tools.javac.parser.Tokens.TokenKind.CATCH;
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
    46
import static com.sun.tools.javac.parser.Tokens.TokenKind.EQ;
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
    47
import static com.sun.tools.javac.parser.Tokens.TokenKind.GT;
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
    48
import static com.sun.tools.javac.parser.Tokens.TokenKind.IMPORT;
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
    49
import static com.sun.tools.javac.parser.Tokens.TokenKind.LT;
14541
36f9d11fc9aa 7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents: 14450
diff changeset
    50
import static com.sun.tools.javac.tree.JCTree.Tag.*;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    51
06bc494ca11e Initial load
duke
parents:
diff changeset
    52
/** The parser maps a token sequence into an abstract syntax
06bc494ca11e Initial load
duke
parents:
diff changeset
    53
 *  tree. It operates by recursive descent, with code derived
06bc494ca11e Initial load
duke
parents:
diff changeset
    54
 *  systematically from an LL(1) grammar. For efficiency reasons, an
06bc494ca11e Initial load
duke
parents:
diff changeset
    55
 *  operator precedence scheme is used for parsing binary operation
06bc494ca11e Initial load
duke
parents:
diff changeset
    56
 *  expressions.
06bc494ca11e Initial load
duke
parents:
diff changeset
    57
 *
5847
1908176fd6e3 6944312: Potential rebranding issues in openjdk/langtools repository sources
jjg
parents: 5520
diff changeset
    58
 *  <p><b>This is NOT part of any supported API.
1908176fd6e3 6944312: Potential rebranding issues in openjdk/langtools repository sources
jjg
parents: 5520
diff changeset
    59
 *  If you write code that depends on this, you do so at your own risk.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    60
 *  This code and its internal interfaces are subject to change or
06bc494ca11e Initial load
duke
parents:
diff changeset
    61
 *  deletion without notice.</b>
06bc494ca11e Initial load
duke
parents:
diff changeset
    62
 */
1258
1cf37d8837d1 6724118: change JavaCompiler to not use Scanner directly
jjg
parents: 939
diff changeset
    63
public class JavacParser implements Parser {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    64
06bc494ca11e Initial load
duke
parents:
diff changeset
    65
    /** The number of precedence levels of infix operators.
06bc494ca11e Initial load
duke
parents:
diff changeset
    66
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
    67
    private static final int infixPrecedenceLevels = 10;
06bc494ca11e Initial load
duke
parents:
diff changeset
    68
06bc494ca11e Initial load
duke
parents:
diff changeset
    69
    /** The scanner used for lexical analysis.
06bc494ca11e Initial load
duke
parents:
diff changeset
    70
     */
10200
56cc93e7b6ef 7068902: (javac) allow enabling or disabling of String folding
ksrini
parents: 10199
diff changeset
    71
    protected Lexer S;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    72
06bc494ca11e Initial load
duke
parents:
diff changeset
    73
    /** The factory to be used for abstract syntax tree construction.
06bc494ca11e Initial load
duke
parents:
diff changeset
    74
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
    75
    protected TreeMaker F;
06bc494ca11e Initial load
duke
parents:
diff changeset
    76
06bc494ca11e Initial load
duke
parents:
diff changeset
    77
    /** The log to be used for error diagnostics.
06bc494ca11e Initial load
duke
parents:
diff changeset
    78
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
    79
    private Log log;
06bc494ca11e Initial load
duke
parents:
diff changeset
    80
06bc494ca11e Initial load
duke
parents:
diff changeset
    81
    /** The Source language setting. */
06bc494ca11e Initial load
duke
parents:
diff changeset
    82
    private Source source;
06bc494ca11e Initial load
duke
parents:
diff changeset
    83
06bc494ca11e Initial load
duke
parents:
diff changeset
    84
    /** The name table. */
1260
a772ba9ba43d 6574134: Allow for alternative implementation of Name Table with garbage collection of name bytes
jjg
parents: 1258
diff changeset
    85
    private Names names;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
    86
11055
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
    87
    /** End position mappings container */
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
    88
    private final AbstractEndPosTable endPosTable;
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
    89
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
    90
    // Because of javac's limited lookahead, some contexts are ambiguous in
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
    91
    // the presence of type annotations even though they are not ambiguous
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
    92
    // in the absence of type annotations.  Consider this code:
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
    93
    //   void m(String [] m) { }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
    94
    //   void m(String ... m) { }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
    95
    // After parsing "String", javac calls bracketsOpt which immediately
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
    96
    // returns if the next character is not '['.  Similarly, javac can see
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
    97
    // if the next token is ... and in that case parse an ellipsis.  But in
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
    98
    // the presence of type annotations:
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
    99
    //   void m(String @A [] m) { }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   100
    //   void m(String @A ... m) { }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   101
    // no finite lookahead is enough to determine whether to read array
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   102
    // levels or an ellipsis.  Furthermore, if you call bracketsOpt, then
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   103
    // bracketsOpt first reads all the leading annotations and only then
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   104
    // discovers that it needs to fail.  bracketsOpt needs a way to push
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   105
    // back the extra annotations that it read.  (But, bracketsOpt should
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   106
    // not *always* be allowed to push back extra annotations that it finds
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   107
    // -- in most contexts, any such extra annotation is an error.
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   108
    //
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   109
    // The following two variables permit type annotations that have
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   110
    // already been read to be stored for later use.  Alternate
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   111
    // implementations are possible but would cause much larger changes to
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   112
    // the parser.
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   113
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   114
    /** Type annotations that have already been read but have not yet been used. **/
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   115
    private List<JCAnnotation> typeAnnotationsPushedBack = List.nil();
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   116
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   117
    /**
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   118
     * If the parser notices extra annotations, then it either immediately
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   119
     * issues an error (if this variable is false) or places the extra
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   120
     * annotations in variable typeAnnotationsPushedBack (if this variable
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   121
     * is true).
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   122
     */
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   123
    private boolean permitTypeAnnotationsPushBack = false;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   124
14450
7a62c5b13d6e 8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents: 14359
diff changeset
   125
    interface ErrorRecoveryAction {
7a62c5b13d6e 8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents: 14359
diff changeset
   126
        JCTree doRecover(JavacParser parser);
7a62c5b13d6e 8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents: 14359
diff changeset
   127
    }
7a62c5b13d6e 8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents: 14359
diff changeset
   128
7a62c5b13d6e 8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents: 14359
diff changeset
   129
    enum BasicErrorRecoveryAction implements ErrorRecoveryAction {
7a62c5b13d6e 8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents: 14359
diff changeset
   130
        BLOCK_STMT {public JCTree doRecover(JavacParser parser) { return parser.parseStatementAsBlock(); }},
7a62c5b13d6e 8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents: 14359
diff changeset
   131
        CATCH_CLAUSE {public JCTree doRecover(JavacParser parser) { return parser.catchClause(); }}
7a62c5b13d6e 8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents: 14359
diff changeset
   132
    }
7a62c5b13d6e 8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents: 14359
diff changeset
   133
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   134
    /** Construct a parser from a given scanner, tree factory and log.
06bc494ca11e Initial load
duke
parents:
diff changeset
   135
     */
1258
1cf37d8837d1 6724118: change JavaCompiler to not use Scanner directly
jjg
parents: 939
diff changeset
   136
    protected JavacParser(ParserFactory fac,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   137
                     Lexer S,
1258
1cf37d8837d1 6724118: change JavaCompiler to not use Scanner directly
jjg
parents: 939
diff changeset
   138
                     boolean keepDocComments,
11055
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
   139
                     boolean keepLineMap,
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
   140
                     boolean keepEndPositions) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   141
        this.S = S;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   142
        nextToken(); // prime the pump
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   143
        this.F = fac.F;
06bc494ca11e Initial load
duke
parents:
diff changeset
   144
        this.log = fac.log;
06bc494ca11e Initial load
duke
parents:
diff changeset
   145
        this.names = fac.names;
06bc494ca11e Initial load
duke
parents:
diff changeset
   146
        this.source = fac.source;
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6146
diff changeset
   147
        this.allowTWR = source.allowTryWithResources();
27844
8b5d79870a2f 7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents: 26993
diff changeset
   148
        this.allowEffectivelyFinalVariablesInTWR =
8b5d79870a2f 7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents: 26993
diff changeset
   149
                source.allowEffectivelyFinalVariablesInTryWithResources();
5321
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 5320
diff changeset
   150
        this.allowDiamond = source.allowDiamond();
5492
515e4b33b335 6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents: 5321
diff changeset
   151
        this.allowMulticatch = source.allowMulticatch();
10200
56cc93e7b6ef 7068902: (javac) allow enabling or disabling of String folding
ksrini
parents: 10199
diff changeset
   152
        this.allowStringFolding = fac.options.getBoolean("allowStringFolding", true);
14547
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   153
        this.allowLambda = source.allowLambda();
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   154
        this.allowMethodReferences = source.allowMethodReferences();
86d8d242b0c4 8003280: Add lambda tests
mcimadamore
parents: 14541
diff changeset
   155
        this.allowDefaultMethods = source.allowDefaultMethods();
15377
515846bb6637 8005166: Add support for static interface methods
mcimadamore
parents: 15375
diff changeset
   156
        this.allowStaticInterfaceMethods = source.allowStaticInterfaceMethods();
15375
d2529dc91d77 8006566: Remove transient lambda-related guards from JavacParser
mcimadamore
parents: 15367
diff changeset
   157
        this.allowIntersectionTypesInCast = source.allowIntersectionTypesInCast();
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   158
        this.allowTypeAnnotations = source.allowTypeAnnotations();
23800
f7ffcfe938f2 8035890: jdk8 javac -source 7 compiles test case it should not
jlahoda
parents: 23133
diff changeset
   159
        this.allowAnnotationsAfterTypeParams = source.allowAnnotationsAfterTypeParams();
27991
8f4b68523da3 8061549: Disallow _ as a one-character identifier
jlahoda
parents: 27989
diff changeset
   160
        this.allowUnderscoreIdentifier = source.allowUnderscoreIdentifier();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   161
        this.keepDocComments = keepDocComments;
14541
36f9d11fc9aa 7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents: 14450
diff changeset
   162
        docComments = newDocCommentTable(keepDocComments, fac);
1258
1cf37d8837d1 6724118: change JavaCompiler to not use Scanner directly
jjg
parents: 939
diff changeset
   163
        this.keepLineMap = keepLineMap;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   164
        this.errorTree = F.Erroneous();
11055
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
   165
        endPosTable = newEndPosTable(keepEndPositions);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   166
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   167
11055
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
   168
    protected AbstractEndPosTable newEndPosTable(boolean keepEndPositions) {
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
   169
        return  keepEndPositions
16811
fca5473a5823 8011677: EndPosTables should avoid hidden references to Parser
jjg
parents: 16296
diff changeset
   170
                ? new SimpleEndPosTable(this)
fca5473a5823 8011677: EndPosTables should avoid hidden references to Parser
jjg
parents: 16296
diff changeset
   171
                : new EmptyEndPosTable(this);
11055
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
   172
    }
13077
16fb753bb5dc 7174143: encapsulate doc comment table
jjg
parents: 12715
diff changeset
   173
14541
36f9d11fc9aa 7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents: 14450
diff changeset
   174
    protected DocCommentTable newDocCommentTable(boolean keepDocComments, ParserFactory fac) {
36f9d11fc9aa 7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents: 14450
diff changeset
   175
        return keepDocComments ? new LazyDocCommentTable(fac) : null;
13077
16fb753bb5dc 7174143: encapsulate doc comment table
jjg
parents: 12715
diff changeset
   176
    }
16fb753bb5dc 7174143: encapsulate doc comment table
jjg
parents: 12715
diff changeset
   177
5321
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 5320
diff changeset
   178
    /** Switch: Should diamond operator be recognized?
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 5320
diff changeset
   179
     */
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 5320
diff changeset
   180
    boolean allowDiamond;
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 5320
diff changeset
   181
5492
515e4b33b335 6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents: 5321
diff changeset
   182
    /** Switch: Should multicatch clause be accepted?
515e4b33b335 6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents: 5321
diff changeset
   183
     */
515e4b33b335 6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents: 5321
diff changeset
   184
    boolean allowMulticatch;
515e4b33b335 6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents: 5321
diff changeset
   185
8224
8f18e1622660 7013420: Project Coin: remove general expression support from try-with-resources statement
darcy
parents: 8047
diff changeset
   186
    /** Switch: should we recognize try-with-resources?
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6146
diff changeset
   187
     */
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6146
diff changeset
   188
    boolean allowTWR;
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6146
diff changeset
   189
27844
8b5d79870a2f 7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents: 26993
diff changeset
   190
    /** Switch: should we allow (effectively) final variables as resources in try-with-resources?
8b5d79870a2f 7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents: 26993
diff changeset
   191
     */
8b5d79870a2f 7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents: 26993
diff changeset
   192
    boolean allowEffectivelyFinalVariablesInTWR;
8b5d79870a2f 7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents: 26993
diff changeset
   193
10200
56cc93e7b6ef 7068902: (javac) allow enabling or disabling of String folding
ksrini
parents: 10199
diff changeset
   194
    /** Switch: should we fold strings?
56cc93e7b6ef 7068902: (javac) allow enabling or disabling of String folding
ksrini
parents: 10199
diff changeset
   195
     */
56cc93e7b6ef 7068902: (javac) allow enabling or disabling of String folding
ksrini
parents: 10199
diff changeset
   196
    boolean allowStringFolding;
56cc93e7b6ef 7068902: (javac) allow enabling or disabling of String folding
ksrini
parents: 10199
diff changeset
   197
11143
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
   198
    /** Switch: should we recognize lambda expressions?
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
   199
     */
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
   200
    boolean allowLambda;
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
   201
11144
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
   202
    /** Switch: should we allow method/constructor references?
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
   203
     */
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
   204
    boolean allowMethodReferences;
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
   205
14267
6321fbe0cf50 7192245: Add parser support for default methods
mcimadamore
parents: 14263
diff changeset
   206
    /** Switch: should we allow default methods in interfaces?
6321fbe0cf50 7192245: Add parser support for default methods
mcimadamore
parents: 14263
diff changeset
   207
     */
6321fbe0cf50 7192245: Add parser support for default methods
mcimadamore
parents: 14263
diff changeset
   208
    boolean allowDefaultMethods;
6321fbe0cf50 7192245: Add parser support for default methods
mcimadamore
parents: 14263
diff changeset
   209
15377
515846bb6637 8005166: Add support for static interface methods
mcimadamore
parents: 15375
diff changeset
   210
    /** Switch: should we allow static methods in interfaces?
515846bb6637 8005166: Add support for static interface methods
mcimadamore
parents: 15375
diff changeset
   211
     */
515846bb6637 8005166: Add support for static interface methods
mcimadamore
parents: 15375
diff changeset
   212
    boolean allowStaticInterfaceMethods;
515846bb6637 8005166: Add support for static interface methods
mcimadamore
parents: 15375
diff changeset
   213
14725
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
   214
    /** Switch: should we allow intersection types in cast?
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
   215
     */
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
   216
    boolean allowIntersectionTypesInCast;
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
   217
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   218
    /** Switch: should we keep docComments?
06bc494ca11e Initial load
duke
parents:
diff changeset
   219
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   220
    boolean keepDocComments;
06bc494ca11e Initial load
duke
parents:
diff changeset
   221
1258
1cf37d8837d1 6724118: change JavaCompiler to not use Scanner directly
jjg
parents: 939
diff changeset
   222
    /** Switch: should we keep line table?
1cf37d8837d1 6724118: change JavaCompiler to not use Scanner directly
jjg
parents: 939
diff changeset
   223
     */
1cf37d8837d1 6724118: change JavaCompiler to not use Scanner directly
jjg
parents: 939
diff changeset
   224
    boolean keepLineMap;
1cf37d8837d1 6724118: change JavaCompiler to not use Scanner directly
jjg
parents: 939
diff changeset
   225
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   226
    /** Switch: should we recognize type annotations?
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   227
     */
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   228
    boolean allowTypeAnnotations;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   229
23800
f7ffcfe938f2 8035890: jdk8 javac -source 7 compiles test case it should not
jlahoda
parents: 23133
diff changeset
   230
    /** Switch: should we allow annotations after the method type parameters?
f7ffcfe938f2 8035890: jdk8 javac -source 7 compiles test case it should not
jlahoda
parents: 23133
diff changeset
   231
     */
f7ffcfe938f2 8035890: jdk8 javac -source 7 compiles test case it should not
jlahoda
parents: 23133
diff changeset
   232
    boolean allowAnnotationsAfterTypeParams;
f7ffcfe938f2 8035890: jdk8 javac -source 7 compiles test case it should not
jlahoda
parents: 23133
diff changeset
   233
27991
8f4b68523da3 8061549: Disallow _ as a one-character identifier
jlahoda
parents: 27989
diff changeset
   234
    /** Switch: should we allow '_' as an identifier?
8f4b68523da3 8061549: Disallow _ as a one-character identifier
jlahoda
parents: 27989
diff changeset
   235
     */
8f4b68523da3 8061549: Disallow _ as a one-character identifier
jlahoda
parents: 27989
diff changeset
   236
    boolean allowUnderscoreIdentifier;
8f4b68523da3 8061549: Disallow _ as a one-character identifier
jlahoda
parents: 27989
diff changeset
   237
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   238
    /** Switch: is "this" allowed as an identifier?
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   239
     * This is needed to parse receiver types.
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   240
     */
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   241
    boolean allowThisIdent;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   242
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   243
    /** The type of the method receiver, as specified by a first "this" parameter.
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   244
     */
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   245
    JCVariableDecl receiverParam;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   246
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   247
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   248
    /** When terms are parsed, the mode determines which is expected:
06bc494ca11e Initial load
duke
parents:
diff changeset
   249
     *     mode = EXPR        : an expression
06bc494ca11e Initial load
duke
parents:
diff changeset
   250
     *     mode = TYPE        : a type
06bc494ca11e Initial load
duke
parents:
diff changeset
   251
     *     mode = NOPARAMS    : no parameters allowed for type
06bc494ca11e Initial load
duke
parents:
diff changeset
   252
     *     mode = TYPEARG     : type argument
06bc494ca11e Initial load
duke
parents:
diff changeset
   253
     */
28147
72e7fdc79b78 8067384: Facilitate extension of the javac parser
rfield
parents: 27991
diff changeset
   254
    protected static final int EXPR = 0x1;
72e7fdc79b78 8067384: Facilitate extension of the javac parser
rfield
parents: 27991
diff changeset
   255
    protected static final int TYPE = 0x2;
72e7fdc79b78 8067384: Facilitate extension of the javac parser
rfield
parents: 27991
diff changeset
   256
    protected static final int NOPARAMS = 0x4;
72e7fdc79b78 8067384: Facilitate extension of the javac parser
rfield
parents: 27991
diff changeset
   257
    protected static final int TYPEARG = 0x8;
72e7fdc79b78 8067384: Facilitate extension of the javac parser
rfield
parents: 27991
diff changeset
   258
    protected static final int DIAMOND = 0x10;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   259
06bc494ca11e Initial load
duke
parents:
diff changeset
   260
    /** The current mode.
06bc494ca11e Initial load
duke
parents:
diff changeset
   261
     */
28147
72e7fdc79b78 8067384: Facilitate extension of the javac parser
rfield
parents: 27991
diff changeset
   262
    protected int mode = 0;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   263
06bc494ca11e Initial load
duke
parents:
diff changeset
   264
    /** The mode of the term that was parsed last.
06bc494ca11e Initial load
duke
parents:
diff changeset
   265
     */
28147
72e7fdc79b78 8067384: Facilitate extension of the javac parser
rfield
parents: 27991
diff changeset
   266
    protected int lastmode = 0;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   267
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   268
    /* ---------- token management -------------- */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   269
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   270
    protected Token token;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   271
14541
36f9d11fc9aa 7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents: 14450
diff changeset
   272
    public Token token() {
36f9d11fc9aa 7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents: 14450
diff changeset
   273
        return token;
36f9d11fc9aa 7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents: 14450
diff changeset
   274
    }
36f9d11fc9aa 7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents: 14450
diff changeset
   275
36f9d11fc9aa 7021614: extend com.sun.source API to support parsing javadoc comments
jjg
parents: 14450
diff changeset
   276
    public void nextToken() {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   277
        S.nextToken();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   278
        token = S.token();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   279
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   280
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
   281
    protected boolean peekToken(Filter<TokenKind> tk) {
14725
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
   282
        return peekToken(0, tk);
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
   283
    }
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
   284
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
   285
    protected boolean peekToken(int lookahead, Filter<TokenKind> tk) {
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
   286
        return tk.accepts(S.token(lookahead + 1).kind);
11143
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
   287
    }
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
   288
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
   289
    protected boolean peekToken(Filter<TokenKind> tk1, Filter<TokenKind> tk2) {
14725
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
   290
        return peekToken(0, tk1, tk2);
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
   291
    }
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
   292
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
   293
    protected boolean peekToken(int lookahead, Filter<TokenKind> tk1, Filter<TokenKind> tk2) {
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
   294
        return tk1.accepts(S.token(lookahead + 1).kind) &&
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
   295
                tk2.accepts(S.token(lookahead + 2).kind);
11143
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
   296
    }
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
   297
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
   298
    protected boolean peekToken(Filter<TokenKind> tk1, Filter<TokenKind> tk2, Filter<TokenKind> tk3) {
14725
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
   299
        return peekToken(0, tk1, tk2, tk3);
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
   300
    }
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
   301
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
   302
    protected boolean peekToken(int lookahead, Filter<TokenKind> tk1, Filter<TokenKind> tk2, Filter<TokenKind> tk3) {
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
   303
        return tk1.accepts(S.token(lookahead + 1).kind) &&
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
   304
                tk2.accepts(S.token(lookahead + 2).kind) &&
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
   305
                tk3.accepts(S.token(lookahead + 3).kind);
11143
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
   306
    }
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
   307
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
   308
    @SuppressWarnings("unchecked")
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
   309
    protected boolean peekToken(Filter<TokenKind>... kinds) {
14725
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
   310
        return peekToken(0, kinds);
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
   311
    }
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
   312
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
   313
    @SuppressWarnings("unchecked")
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
   314
    protected boolean peekToken(int lookahead, Filter<TokenKind>... kinds) {
14725
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
   315
        for (; lookahead < kinds.length ; lookahead++) {
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
   316
            if (!kinds[lookahead].accepts(S.token(lookahead + 1).kind)) {
11143
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
   317
                return false;
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
   318
            }
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
   319
        }
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
   320
        return true;
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
   321
    }
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
   322
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   323
    /* ---------- error recovery -------------- */
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   324
06bc494ca11e Initial load
duke
parents:
diff changeset
   325
    private JCErroneous errorTree;
06bc494ca11e Initial load
duke
parents:
diff changeset
   326
06bc494ca11e Initial load
duke
parents:
diff changeset
   327
    /** Skip forward until a suitable stop token is found.
06bc494ca11e Initial load
duke
parents:
diff changeset
   328
     */
28147
72e7fdc79b78 8067384: Facilitate extension of the javac parser
rfield
parents: 27991
diff changeset
   329
    protected void skip(boolean stopAtImport, boolean stopAtMemberDecl, boolean stopAtIdentifier, boolean stopAtStatement) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   330
         while (true) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   331
             switch (token.kind) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   332
                case SEMI:
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   333
                    nextToken();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   334
                    return;
06bc494ca11e Initial load
duke
parents:
diff changeset
   335
                case PUBLIC:
06bc494ca11e Initial load
duke
parents:
diff changeset
   336
                case FINAL:
06bc494ca11e Initial load
duke
parents:
diff changeset
   337
                case ABSTRACT:
06bc494ca11e Initial load
duke
parents:
diff changeset
   338
                case MONKEYS_AT:
06bc494ca11e Initial load
duke
parents:
diff changeset
   339
                case EOF:
06bc494ca11e Initial load
duke
parents:
diff changeset
   340
                case CLASS:
06bc494ca11e Initial load
duke
parents:
diff changeset
   341
                case INTERFACE:
06bc494ca11e Initial load
duke
parents:
diff changeset
   342
                case ENUM:
06bc494ca11e Initial load
duke
parents:
diff changeset
   343
                    return;
06bc494ca11e Initial load
duke
parents:
diff changeset
   344
                case IMPORT:
06bc494ca11e Initial load
duke
parents:
diff changeset
   345
                    if (stopAtImport)
06bc494ca11e Initial load
duke
parents:
diff changeset
   346
                        return;
06bc494ca11e Initial load
duke
parents:
diff changeset
   347
                    break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   348
                case LBRACE:
06bc494ca11e Initial load
duke
parents:
diff changeset
   349
                case RBRACE:
06bc494ca11e Initial load
duke
parents:
diff changeset
   350
                case PRIVATE:
06bc494ca11e Initial load
duke
parents:
diff changeset
   351
                case PROTECTED:
06bc494ca11e Initial load
duke
parents:
diff changeset
   352
                case STATIC:
06bc494ca11e Initial load
duke
parents:
diff changeset
   353
                case TRANSIENT:
06bc494ca11e Initial load
duke
parents:
diff changeset
   354
                case NATIVE:
06bc494ca11e Initial load
duke
parents:
diff changeset
   355
                case VOLATILE:
06bc494ca11e Initial load
duke
parents:
diff changeset
   356
                case SYNCHRONIZED:
06bc494ca11e Initial load
duke
parents:
diff changeset
   357
                case STRICTFP:
06bc494ca11e Initial load
duke
parents:
diff changeset
   358
                case LT:
06bc494ca11e Initial load
duke
parents:
diff changeset
   359
                case BYTE:
06bc494ca11e Initial load
duke
parents:
diff changeset
   360
                case SHORT:
06bc494ca11e Initial load
duke
parents:
diff changeset
   361
                case CHAR:
06bc494ca11e Initial load
duke
parents:
diff changeset
   362
                case INT:
06bc494ca11e Initial load
duke
parents:
diff changeset
   363
                case LONG:
06bc494ca11e Initial load
duke
parents:
diff changeset
   364
                case FLOAT:
06bc494ca11e Initial load
duke
parents:
diff changeset
   365
                case DOUBLE:
06bc494ca11e Initial load
duke
parents:
diff changeset
   366
                case BOOLEAN:
06bc494ca11e Initial load
duke
parents:
diff changeset
   367
                case VOID:
06bc494ca11e Initial load
duke
parents:
diff changeset
   368
                    if (stopAtMemberDecl)
06bc494ca11e Initial load
duke
parents:
diff changeset
   369
                        return;
06bc494ca11e Initial load
duke
parents:
diff changeset
   370
                    break;
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
   371
                case UNDERSCORE:
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   372
                case IDENTIFIER:
06bc494ca11e Initial load
duke
parents:
diff changeset
   373
                   if (stopAtIdentifier)
06bc494ca11e Initial load
duke
parents:
diff changeset
   374
                        return;
06bc494ca11e Initial load
duke
parents:
diff changeset
   375
                    break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   376
                case CASE:
06bc494ca11e Initial load
duke
parents:
diff changeset
   377
                case DEFAULT:
06bc494ca11e Initial load
duke
parents:
diff changeset
   378
                case IF:
06bc494ca11e Initial load
duke
parents:
diff changeset
   379
                case FOR:
06bc494ca11e Initial load
duke
parents:
diff changeset
   380
                case WHILE:
06bc494ca11e Initial load
duke
parents:
diff changeset
   381
                case DO:
06bc494ca11e Initial load
duke
parents:
diff changeset
   382
                case TRY:
06bc494ca11e Initial load
duke
parents:
diff changeset
   383
                case SWITCH:
06bc494ca11e Initial load
duke
parents:
diff changeset
   384
                case RETURN:
06bc494ca11e Initial load
duke
parents:
diff changeset
   385
                case THROW:
06bc494ca11e Initial load
duke
parents:
diff changeset
   386
                case BREAK:
06bc494ca11e Initial load
duke
parents:
diff changeset
   387
                case CONTINUE:
06bc494ca11e Initial load
duke
parents:
diff changeset
   388
                case ELSE:
06bc494ca11e Initial load
duke
parents:
diff changeset
   389
                case FINALLY:
06bc494ca11e Initial load
duke
parents:
diff changeset
   390
                case CATCH:
25274
a06a738fc6be 8041648: do while loop that misses ending semicolon has wrong end position
jlahoda
parents: 24069
diff changeset
   391
                case THIS:
a06a738fc6be 8041648: do while loop that misses ending semicolon has wrong end position
jlahoda
parents: 24069
diff changeset
   392
                case SUPER:
a06a738fc6be 8041648: do while loop that misses ending semicolon has wrong end position
jlahoda
parents: 24069
diff changeset
   393
                case NEW:
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   394
                    if (stopAtStatement)
06bc494ca11e Initial load
duke
parents:
diff changeset
   395
                        return;
06bc494ca11e Initial load
duke
parents:
diff changeset
   396
                    break;
25274
a06a738fc6be 8041648: do while loop that misses ending semicolon has wrong end position
jlahoda
parents: 24069
diff changeset
   397
                case ASSERT:
25445
603f0c93d5c9 8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents: 25274
diff changeset
   398
                    if (stopAtStatement)
603f0c93d5c9 8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents: 25274
diff changeset
   399
                        return;
25274
a06a738fc6be 8041648: do while loop that misses ending semicolon has wrong end position
jlahoda
parents: 24069
diff changeset
   400
                    break;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   401
            }
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   402
            nextToken();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   403
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   404
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   405
28147
72e7fdc79b78 8067384: Facilitate extension of the javac parser
rfield
parents: 27991
diff changeset
   406
    protected JCErroneous syntaxError(int pos, String key, TokenKind... args) {
10455
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
   407
        return syntaxError(pos, List.<JCTree>nil(), key, args);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   408
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   409
28147
72e7fdc79b78 8067384: Facilitate extension of the javac parser
rfield
parents: 27991
diff changeset
   410
    protected JCErroneous syntaxError(int pos, List<JCTree> errs, String key, TokenKind... args) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   411
        setErrorEndPos(pos);
10455
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
   412
        JCErroneous err = F.at(pos).Erroneous(errs);
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
   413
        reportSyntaxError(err, key, (Object[])args);
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
   414
        if (errs != null) {
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
   415
            JCTree last = errs.last();
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
   416
            if (last != null)
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
   417
                storeEnd(last, pos);
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
   418
        }
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
   419
        return toP(err);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   420
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   421
23133
a58476887b3d 8031383: Error recovery in JavacParser could be improved
jlahoda
parents: 23131
diff changeset
   422
    private static final int RECOVERY_THRESHOLD = 50;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   423
    private int errorPos = Position.NOPOS;
23133
a58476887b3d 8031383: Error recovery in JavacParser could be improved
jlahoda
parents: 23131
diff changeset
   424
    private int count = 0;
10455
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
   425
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   426
    /**
10455
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
   427
     * Report a syntax using the given the position parameter and arguments,
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
   428
     * unless one was already reported at the same position.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   429
     */
28147
72e7fdc79b78 8067384: Facilitate extension of the javac parser
rfield
parents: 27991
diff changeset
   430
    protected void reportSyntaxError(int pos, String key, Object... args) {
10455
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
   431
        JCDiagnostic.DiagnosticPosition diag = new JCDiagnostic.SimpleDiagnosticPosition(pos);
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
   432
        reportSyntaxError(diag, key, args);
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
   433
    }
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
   434
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
   435
    /**
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
   436
     * Report a syntax error using the given DiagnosticPosition object and
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
   437
     * arguments, unless one was already reported at the same position.
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
   438
     */
28147
72e7fdc79b78 8067384: Facilitate extension of the javac parser
rfield
parents: 27991
diff changeset
   439
    protected void reportSyntaxError(JCDiagnostic.DiagnosticPosition diagPos, String key, Object... args) {
10455
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
   440
        int pos = diagPos.getPreferredPosition();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   441
        if (pos > S.errPos() || pos == Position.NOPOS) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   442
            if (token.kind == EOF) {
10455
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
   443
                error(diagPos, "premature.eof");
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
   444
            } else {
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
   445
                error(diagPos, key, args);
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
   446
            }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   447
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   448
        S.errPos(pos);
23133
a58476887b3d 8031383: Error recovery in JavacParser could be improved
jlahoda
parents: 23131
diff changeset
   449
        if (token.pos == errorPos) {
a58476887b3d 8031383: Error recovery in JavacParser could be improved
jlahoda
parents: 23131
diff changeset
   450
            //check for a possible infinite loop in parsing:
a58476887b3d 8031383: Error recovery in JavacParser could be improved
jlahoda
parents: 23131
diff changeset
   451
            Assert.check(count++ < RECOVERY_THRESHOLD);
a58476887b3d 8031383: Error recovery in JavacParser could be improved
jlahoda
parents: 23131
diff changeset
   452
        } else {
a58476887b3d 8031383: Error recovery in JavacParser could be improved
jlahoda
parents: 23131
diff changeset
   453
            count = 0;
a58476887b3d 8031383: Error recovery in JavacParser could be improved
jlahoda
parents: 23131
diff changeset
   454
            errorPos = token.pos;
a58476887b3d 8031383: Error recovery in JavacParser could be improved
jlahoda
parents: 23131
diff changeset
   455
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   456
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   457
06bc494ca11e Initial load
duke
parents:
diff changeset
   458
06bc494ca11e Initial load
duke
parents:
diff changeset
   459
    /** Generate a syntax error at current position unless one was already
06bc494ca11e Initial load
duke
parents:
diff changeset
   460
     *  reported at the same position.
06bc494ca11e Initial load
duke
parents:
diff changeset
   461
     */
28147
72e7fdc79b78 8067384: Facilitate extension of the javac parser
rfield
parents: 27991
diff changeset
   462
    protected JCErroneous syntaxError(String key) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   463
        return syntaxError(token.pos, key);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   464
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   465
06bc494ca11e Initial load
duke
parents:
diff changeset
   466
    /** Generate a syntax error at current position unless one was
06bc494ca11e Initial load
duke
parents:
diff changeset
   467
     *  already reported at the same position.
06bc494ca11e Initial load
duke
parents:
diff changeset
   468
     */
28147
72e7fdc79b78 8067384: Facilitate extension of the javac parser
rfield
parents: 27991
diff changeset
   469
    protected JCErroneous syntaxError(String key, TokenKind arg) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   470
        return syntaxError(token.pos, key, arg);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   471
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   472
06bc494ca11e Initial load
duke
parents:
diff changeset
   473
    /** If next input token matches given token, skip it, otherwise report
06bc494ca11e Initial load
duke
parents:
diff changeset
   474
     *  an error.
06bc494ca11e Initial load
duke
parents:
diff changeset
   475
     */
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   476
    public void accept(TokenKind tk) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   477
        if (token.kind == tk) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   478
            nextToken();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   479
        } else {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   480
            setErrorEndPos(token.pos);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   481
            reportSyntaxError(S.prevToken().endPos, "expected", tk);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   482
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   483
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   484
06bc494ca11e Initial load
duke
parents:
diff changeset
   485
    /** Report an illegal start of expression/type error at given position.
06bc494ca11e Initial load
duke
parents:
diff changeset
   486
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   487
    JCExpression illegal(int pos) {
10455
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
   488
        setErrorEndPos(pos);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   489
        if ((mode & EXPR) != 0)
06bc494ca11e Initial load
duke
parents:
diff changeset
   490
            return syntaxError(pos, "illegal.start.of.expr");
06bc494ca11e Initial load
duke
parents:
diff changeset
   491
        else
06bc494ca11e Initial load
duke
parents:
diff changeset
   492
            return syntaxError(pos, "illegal.start.of.type");
06bc494ca11e Initial load
duke
parents:
diff changeset
   493
06bc494ca11e Initial load
duke
parents:
diff changeset
   494
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   495
06bc494ca11e Initial load
duke
parents:
diff changeset
   496
    /** Report an illegal start of expression/type error at current position.
06bc494ca11e Initial load
duke
parents:
diff changeset
   497
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   498
    JCExpression illegal() {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   499
        return illegal(token.pos);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   500
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   501
06bc494ca11e Initial load
duke
parents:
diff changeset
   502
    /** Diagnose a modifier flag from the set, if any. */
28147
72e7fdc79b78 8067384: Facilitate extension of the javac parser
rfield
parents: 27991
diff changeset
   503
    protected void checkNoMods(long mods) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   504
        if (mods != 0) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   505
            long lowestMod = mods & -mods;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   506
            error(token.pos, "mod.not.allowed.here",
939
38e24969c7e9 6717241: some diagnostic argument is prematurely converted into a String object
mcimadamore
parents: 735
diff changeset
   507
                      Flags.asFlagSet(lowestMod));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   508
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   509
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   510
06bc494ca11e Initial load
duke
parents:
diff changeset
   511
/* ---------- doc comments --------- */
06bc494ca11e Initial load
duke
parents:
diff changeset
   512
13077
16fb753bb5dc 7174143: encapsulate doc comment table
jjg
parents: 12715
diff changeset
   513
    /** A table to store all documentation comments
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   514
     *  indexed by the tree nodes they refer to.
06bc494ca11e Initial load
duke
parents:
diff changeset
   515
     *  defined only if option flag keepDocComment is set.
06bc494ca11e Initial load
duke
parents:
diff changeset
   516
     */
13077
16fb753bb5dc 7174143: encapsulate doc comment table
jjg
parents: 12715
diff changeset
   517
    private final DocCommentTable docComments;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   518
06bc494ca11e Initial load
duke
parents:
diff changeset
   519
    /** Make an entry into docComments hashtable,
06bc494ca11e Initial load
duke
parents:
diff changeset
   520
     *  provided flag keepDocComments is set and given doc comment is non-null.
06bc494ca11e Initial load
duke
parents:
diff changeset
   521
     *  @param tree   The tree to be used as index in the hashtable
06bc494ca11e Initial load
duke
parents:
diff changeset
   522
     *  @param dc     The doc comment to associate with the tree, or null.
06bc494ca11e Initial load
duke
parents:
diff changeset
   523
     */
28147
72e7fdc79b78 8067384: Facilitate extension of the javac parser
rfield
parents: 27991
diff changeset
   524
    protected void attach(JCTree tree, Comment dc) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   525
        if (keepDocComments && dc != null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   526
//          System.out.println("doc comment = ");System.out.println(dc);//DEBUG
13077
16fb753bb5dc 7174143: encapsulate doc comment table
jjg
parents: 12715
diff changeset
   527
            docComments.putComment(tree, dc);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   528
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   529
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   530
06bc494ca11e Initial load
duke
parents:
diff changeset
   531
/* -------- source positions ------- */
06bc494ca11e Initial load
duke
parents:
diff changeset
   532
28147
72e7fdc79b78 8067384: Facilitate extension of the javac parser
rfield
parents: 27991
diff changeset
   533
    protected void setErrorEndPos(int errPos) {
11055
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
   534
        endPosTable.setErrorEndPos(errPos);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   535
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   536
28147
72e7fdc79b78 8067384: Facilitate extension of the javac parser
rfield
parents: 27991
diff changeset
   537
    protected void storeEnd(JCTree tree, int endpos) {
11055
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
   538
        endPosTable.storeEnd(tree, endpos);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   539
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   540
28147
72e7fdc79b78 8067384: Facilitate extension of the javac parser
rfield
parents: 27991
diff changeset
   541
    protected <T extends JCTree> T to(T t) {
11055
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
   542
        return endPosTable.to(t);
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
   543
    }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   544
28147
72e7fdc79b78 8067384: Facilitate extension of the javac parser
rfield
parents: 27991
diff changeset
   545
    protected <T extends JCTree> T toP(T t) {
11055
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
   546
        return endPosTable.toP(t);
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
   547
    }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   548
06bc494ca11e Initial load
duke
parents:
diff changeset
   549
    /** Get the start position for a tree node.  The start position is
06bc494ca11e Initial load
duke
parents:
diff changeset
   550
     * defined to be the position of the first character of the first
06bc494ca11e Initial load
duke
parents:
diff changeset
   551
     * token of the node's source text.
06bc494ca11e Initial load
duke
parents:
diff changeset
   552
     * @param tree  The tree node
06bc494ca11e Initial load
duke
parents:
diff changeset
   553
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   554
    public int getStartPos(JCTree tree) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   555
        return TreeInfo.getStartPos(tree);
06bc494ca11e Initial load
duke
parents:
diff changeset
   556
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   557
06bc494ca11e Initial load
duke
parents:
diff changeset
   558
    /**
06bc494ca11e Initial load
duke
parents:
diff changeset
   559
     * Get the end position for a tree node.  The end position is
06bc494ca11e Initial load
duke
parents:
diff changeset
   560
     * defined to be the position of the last character of the last
06bc494ca11e Initial load
duke
parents:
diff changeset
   561
     * token of the node's source text.  Returns Position.NOPOS if end
06bc494ca11e Initial load
duke
parents:
diff changeset
   562
     * positions are not generated or the position is otherwise not
06bc494ca11e Initial load
duke
parents:
diff changeset
   563
     * found.
06bc494ca11e Initial load
duke
parents:
diff changeset
   564
     * @param tree  The tree node
06bc494ca11e Initial load
duke
parents:
diff changeset
   565
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   566
    public int getEndPos(JCTree tree) {
11055
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
   567
        return endPosTable.getEndPos(tree);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   568
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   569
06bc494ca11e Initial load
duke
parents:
diff changeset
   570
06bc494ca11e Initial load
duke
parents:
diff changeset
   571
06bc494ca11e Initial load
duke
parents:
diff changeset
   572
/* ---------- parsing -------------- */
06bc494ca11e Initial load
duke
parents:
diff changeset
   573
06bc494ca11e Initial load
duke
parents:
diff changeset
   574
    /**
06bc494ca11e Initial load
duke
parents:
diff changeset
   575
     * Ident = IDENTIFIER
06bc494ca11e Initial load
duke
parents:
diff changeset
   576
     */
28147
72e7fdc79b78 8067384: Facilitate extension of the javac parser
rfield
parents: 27991
diff changeset
   577
    protected Name ident() {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   578
        if (token.kind == IDENTIFIER) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   579
            Name name = token.name();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   580
            nextToken();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   581
            return name;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   582
        } else if (token.kind == ASSERT) {
25445
603f0c93d5c9 8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents: 25274
diff changeset
   583
            error(token.pos, "assert.as.identifier");
603f0c93d5c9 8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents: 25274
diff changeset
   584
            nextToken();
603f0c93d5c9 8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents: 25274
diff changeset
   585
            return names.error;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   586
        } else if (token.kind == ENUM) {
25445
603f0c93d5c9 8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents: 25274
diff changeset
   587
            error(token.pos, "enum.as.identifier");
603f0c93d5c9 8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents: 25274
diff changeset
   588
            nextToken();
603f0c93d5c9 8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents: 25274
diff changeset
   589
            return names.error;
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   590
        } else if (token.kind == THIS) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   591
            if (allowThisIdent) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   592
                // Make sure we're using a supported source version.
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   593
                checkTypeAnnotations();
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   594
                Name name = token.name();
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   595
                nextToken();
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   596
                return name;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   597
            } else {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   598
                error(token.pos, "this.as.identifier");
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   599
                nextToken();
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   600
                return names.error;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   601
            }
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
   602
        } else if (token.kind == UNDERSCORE) {
27991
8f4b68523da3 8061549: Disallow _ as a one-character identifier
jlahoda
parents: 27989
diff changeset
   603
            if (allowUnderscoreIdentifier) {
8f4b68523da3 8061549: Disallow _ as a one-character identifier
jlahoda
parents: 27989
diff changeset
   604
                warning(token.pos, "underscore.as.identifier");
8f4b68523da3 8061549: Disallow _ as a one-character identifier
jlahoda
parents: 27989
diff changeset
   605
            } else {
8f4b68523da3 8061549: Disallow _ as a one-character identifier
jlahoda
parents: 27989
diff changeset
   606
                error(token.pos, "underscore.as.identifier");
8f4b68523da3 8061549: Disallow _ as a one-character identifier
jlahoda
parents: 27989
diff changeset
   607
            }
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
   608
            Name name = token.name();
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
   609
            nextToken();
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
   610
            return name;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   611
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
   612
            accept(IDENTIFIER);
06bc494ca11e Initial load
duke
parents:
diff changeset
   613
            return names.error;
06bc494ca11e Initial load
duke
parents:
diff changeset
   614
        }
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
   615
    }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   616
06bc494ca11e Initial load
duke
parents:
diff changeset
   617
    /**
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   618
     * Qualident = Ident { DOT [Annotations] Ident }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   619
     */
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   620
    public JCExpression qualident(boolean allowAnnos) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   621
        JCExpression t = toP(F.at(token.pos).Ident(ident()));
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   622
        while (token.kind == DOT) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   623
            int pos = token.pos;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   624
            nextToken();
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   625
            List<JCAnnotation> tyannos = null;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   626
            if (allowAnnos) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   627
                tyannos = typeAnnotationsOpt();
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   628
            }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   629
            t = toP(F.at(pos).Select(t, ident()));
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   630
            if (tyannos != null && tyannos.nonEmpty()) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   631
                t = toP(F.at(tyannos.head.pos).AnnotatedType(tyannos, t));
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   632
            }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   633
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   634
        return t;
06bc494ca11e Initial load
duke
parents:
diff changeset
   635
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   636
10455
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
   637
    JCExpression literal(Name prefix) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   638
        return literal(prefix, token.pos);
10455
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
   639
    }
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
   640
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   641
    /**
06bc494ca11e Initial load
duke
parents:
diff changeset
   642
     * Literal =
06bc494ca11e Initial load
duke
parents:
diff changeset
   643
     *     INTLITERAL
06bc494ca11e Initial load
duke
parents:
diff changeset
   644
     *   | LONGLITERAL
06bc494ca11e Initial load
duke
parents:
diff changeset
   645
     *   | FLOATLITERAL
06bc494ca11e Initial load
duke
parents:
diff changeset
   646
     *   | DOUBLELITERAL
06bc494ca11e Initial load
duke
parents:
diff changeset
   647
     *   | CHARLITERAL
06bc494ca11e Initial load
duke
parents:
diff changeset
   648
     *   | STRINGLITERAL
06bc494ca11e Initial load
duke
parents:
diff changeset
   649
     *   | TRUE
06bc494ca11e Initial load
duke
parents:
diff changeset
   650
     *   | FALSE
06bc494ca11e Initial load
duke
parents:
diff changeset
   651
     *   | NULL
06bc494ca11e Initial load
duke
parents:
diff changeset
   652
     */
10455
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
   653
    JCExpression literal(Name prefix, int pos) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   654
        JCExpression t = errorTree;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   655
        switch (token.kind) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   656
        case INTLITERAL:
06bc494ca11e Initial load
duke
parents:
diff changeset
   657
            try {
06bc494ca11e Initial load
duke
parents:
diff changeset
   658
                t = F.at(pos).Literal(
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14267
diff changeset
   659
                    TypeTag.INT,
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   660
                    Convert.string2int(strval(prefix), token.radix()));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   661
            } catch (NumberFormatException ex) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   662
                error(token.pos, "int.number.too.large", strval(prefix));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   663
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   664
            break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   665
        case LONGLITERAL:
06bc494ca11e Initial load
duke
parents:
diff changeset
   666
            try {
06bc494ca11e Initial load
duke
parents:
diff changeset
   667
                t = F.at(pos).Literal(
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14267
diff changeset
   668
                    TypeTag.LONG,
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   669
                    new Long(Convert.string2long(strval(prefix), token.radix())));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   670
            } catch (NumberFormatException ex) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   671
                error(token.pos, "int.number.too.large", strval(prefix));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   672
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   673
            break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   674
        case FLOATLITERAL: {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   675
            String proper = token.radix() == 16 ?
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   676
                    ("0x"+ token.stringVal()) :
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   677
                    token.stringVal();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   678
            Float n;
06bc494ca11e Initial load
duke
parents:
diff changeset
   679
            try {
06bc494ca11e Initial load
duke
parents:
diff changeset
   680
                n = Float.valueOf(proper);
06bc494ca11e Initial load
duke
parents:
diff changeset
   681
            } catch (NumberFormatException ex) {
7636
030f141aa32b 6504896: TreeMaker.Literal(Object) does not support Booleans
jjg
parents: 7211
diff changeset
   682
                // error already reported in scanner
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   683
                n = Float.NaN;
06bc494ca11e Initial load
duke
parents:
diff changeset
   684
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   685
            if (n.floatValue() == 0.0f && !isZero(proper))
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   686
                error(token.pos, "fp.number.too.small");
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   687
            else if (n.floatValue() == Float.POSITIVE_INFINITY)
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   688
                error(token.pos, "fp.number.too.large");
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   689
            else
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14267
diff changeset
   690
                t = F.at(pos).Literal(TypeTag.FLOAT, n);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   691
            break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   692
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   693
        case DOUBLELITERAL: {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   694
            String proper = token.radix() == 16 ?
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   695
                    ("0x"+ token.stringVal()) :
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   696
                    token.stringVal();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   697
            Double n;
06bc494ca11e Initial load
duke
parents:
diff changeset
   698
            try {
06bc494ca11e Initial load
duke
parents:
diff changeset
   699
                n = Double.valueOf(proper);
06bc494ca11e Initial load
duke
parents:
diff changeset
   700
            } catch (NumberFormatException ex) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   701
                // error already reported in scanner
06bc494ca11e Initial load
duke
parents:
diff changeset
   702
                n = Double.NaN;
06bc494ca11e Initial load
duke
parents:
diff changeset
   703
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   704
            if (n.doubleValue() == 0.0d && !isZero(proper))
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   705
                error(token.pos, "fp.number.too.small");
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   706
            else if (n.doubleValue() == Double.POSITIVE_INFINITY)
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   707
                error(token.pos, "fp.number.too.large");
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   708
            else
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14267
diff changeset
   709
                t = F.at(pos).Literal(TypeTag.DOUBLE, n);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   710
            break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   711
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   712
        case CHARLITERAL:
06bc494ca11e Initial load
duke
parents:
diff changeset
   713
            t = F.at(pos).Literal(
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14267
diff changeset
   714
                TypeTag.CHAR,
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   715
                token.stringVal().charAt(0) + 0);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   716
            break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   717
        case STRINGLITERAL:
06bc494ca11e Initial load
duke
parents:
diff changeset
   718
            t = F.at(pos).Literal(
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14267
diff changeset
   719
                TypeTag.CLASS,
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   720
                token.stringVal());
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   721
            break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   722
        case TRUE: case FALSE:
06bc494ca11e Initial load
duke
parents:
diff changeset
   723
            t = F.at(pos).Literal(
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14267
diff changeset
   724
                TypeTag.BOOLEAN,
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   725
                (token.kind == TRUE ? 1 : 0));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   726
            break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   727
        case NULL:
06bc494ca11e Initial load
duke
parents:
diff changeset
   728
            t = F.at(pos).Literal(
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14267
diff changeset
   729
                TypeTag.BOT,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   730
                null);
06bc494ca11e Initial load
duke
parents:
diff changeset
   731
            break;
06bc494ca11e Initial load
duke
parents:
diff changeset
   732
        default:
8032
e1aa25ccdabb 6396503: javac should not require assertions enabled
jjg
parents: 7636
diff changeset
   733
            Assert.error();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   734
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   735
        if (t == errorTree)
06bc494ca11e Initial load
duke
parents:
diff changeset
   736
            t = F.at(pos).Erroneous();
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   737
        storeEnd(t, token.endPos);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   738
        nextToken();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   739
        return t;
06bc494ca11e Initial load
duke
parents:
diff changeset
   740
    }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   741
    //where
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   742
        boolean isZero(String s) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   743
            char[] cs = s.toCharArray();
3894
e470a29ed0a2 6882235: invalid exponent causes silent javac crash
jjg
parents: 3765
diff changeset
   744
            int base = ((cs.length > 1 && Character.toLowerCase(cs[1]) == 'x') ? 16 : 10);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   745
            int i = ((base==16) ? 2 : 0);
06bc494ca11e Initial load
duke
parents:
diff changeset
   746
            while (i < cs.length && (cs[i] == '0' || cs[i] == '.')) i++;
06bc494ca11e Initial load
duke
parents:
diff changeset
   747
            return !(i < cs.length && (Character.digit(cs[i], base) > 0));
06bc494ca11e Initial load
duke
parents:
diff changeset
   748
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   749
06bc494ca11e Initial load
duke
parents:
diff changeset
   750
        String strval(Name prefix) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   751
            String s = token.stringVal();
1260
a772ba9ba43d 6574134: Allow for alternative implementation of Name Table with garbage collection of name bytes
jjg
parents: 1258
diff changeset
   752
            return prefix.isEmpty() ? s : prefix + s;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   753
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   754
06bc494ca11e Initial load
duke
parents:
diff changeset
   755
    /** terms can be either expressions or types.
06bc494ca11e Initial load
duke
parents:
diff changeset
   756
     */
1258
1cf37d8837d1 6724118: change JavaCompiler to not use Scanner directly
jjg
parents: 939
diff changeset
   757
    public JCExpression parseExpression() {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   758
        return term(EXPR);
06bc494ca11e Initial load
duke
parents:
diff changeset
   759
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   760
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   761
    /**
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   762
     * parses (optional) type annotations followed by a type. If the
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   763
     * annotations are present before the type and are not consumed during array
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   764
     * parsing, this method returns a {@link JCAnnotatedType} consisting of
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   765
     * these annotations and the underlying type. Otherwise, it returns the
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   766
     * underlying type.
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   767
     *
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   768
     * <p>
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   769
     *
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   770
     * Note that this method sets {@code mode} to {@code TYPE} first, before
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   771
     * parsing annotations.
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   772
     */
1258
1cf37d8837d1 6724118: change JavaCompiler to not use Scanner directly
jjg
parents: 939
diff changeset
   773
    public JCExpression parseType() {
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   774
        List<JCAnnotation> annotations = typeAnnotationsOpt();
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   775
        return parseType(annotations);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   776
    }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   777
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   778
    public JCExpression parseType(List<JCAnnotation> annotations) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   779
        JCExpression result = unannotatedType();
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   780
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   781
        if (annotations.nonEmpty()) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   782
            result = insertAnnotationsToMostInner(result, annotations, false);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   783
        }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   784
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   785
        return result;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   786
    }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   787
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   788
    public JCExpression unannotatedType() {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   789
        return term(TYPE);
06bc494ca11e Initial load
duke
parents:
diff changeset
   790
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   791
28147
72e7fdc79b78 8067384: Facilitate extension of the javac parser
rfield
parents: 27991
diff changeset
   792
    protected JCExpression term(int newmode) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   793
        int prevmode = mode;
06bc494ca11e Initial load
duke
parents:
diff changeset
   794
        mode = newmode;
06bc494ca11e Initial load
duke
parents:
diff changeset
   795
        JCExpression t = term();
06bc494ca11e Initial load
duke
parents:
diff changeset
   796
        lastmode = mode;
06bc494ca11e Initial load
duke
parents:
diff changeset
   797
        mode = prevmode;
06bc494ca11e Initial load
duke
parents:
diff changeset
   798
        return t;
06bc494ca11e Initial load
duke
parents:
diff changeset
   799
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   800
06bc494ca11e Initial load
duke
parents:
diff changeset
   801
    /**
13844
56339cf983a3 7177970: fix issues in langtools doc comments
jjg
parents: 13439
diff changeset
   802
     *  {@literal
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   803
     *  Expression = Expression1 [ExpressionRest]
06bc494ca11e Initial load
duke
parents:
diff changeset
   804
     *  ExpressionRest = [AssignmentOperator Expression1]
06bc494ca11e Initial load
duke
parents:
diff changeset
   805
     *  AssignmentOperator = "=" | "+=" | "-=" | "*=" | "/=" |
06bc494ca11e Initial load
duke
parents:
diff changeset
   806
     *                       "&=" | "|=" | "^=" |
06bc494ca11e Initial load
duke
parents:
diff changeset
   807
     *                       "%=" | "<<=" | ">>=" | ">>>="
06bc494ca11e Initial load
duke
parents:
diff changeset
   808
     *  Type = Type1
06bc494ca11e Initial load
duke
parents:
diff changeset
   809
     *  TypeNoParams = TypeNoParams1
06bc494ca11e Initial load
duke
parents:
diff changeset
   810
     *  StatementExpression = Expression
06bc494ca11e Initial load
duke
parents:
diff changeset
   811
     *  ConstantExpression = Expression
13844
56339cf983a3 7177970: fix issues in langtools doc comments
jjg
parents: 13439
diff changeset
   812
     *  }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   813
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   814
    JCExpression term() {
06bc494ca11e Initial load
duke
parents:
diff changeset
   815
        JCExpression t = term1();
06bc494ca11e Initial load
duke
parents:
diff changeset
   816
        if ((mode & EXPR) != 0 &&
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   817
            token.kind == EQ || PLUSEQ.compareTo(token.kind) <= 0 && token.kind.compareTo(GTGTGTEQ) <= 0)
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   818
            return termRest(t);
06bc494ca11e Initial load
duke
parents:
diff changeset
   819
        else
06bc494ca11e Initial load
duke
parents:
diff changeset
   820
            return t;
06bc494ca11e Initial load
duke
parents:
diff changeset
   821
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   822
06bc494ca11e Initial load
duke
parents:
diff changeset
   823
    JCExpression termRest(JCExpression t) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   824
        switch (token.kind) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   825
        case EQ: {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   826
            int pos = token.pos;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   827
            nextToken();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   828
            mode = EXPR;
06bc494ca11e Initial load
duke
parents:
diff changeset
   829
            JCExpression t1 = term();
06bc494ca11e Initial load
duke
parents:
diff changeset
   830
            return toP(F.at(pos).Assign(t, t1));
06bc494ca11e Initial load
duke
parents:
diff changeset
   831
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   832
        case PLUSEQ:
06bc494ca11e Initial load
duke
parents:
diff changeset
   833
        case SUBEQ:
06bc494ca11e Initial load
duke
parents:
diff changeset
   834
        case STAREQ:
06bc494ca11e Initial load
duke
parents:
diff changeset
   835
        case SLASHEQ:
06bc494ca11e Initial load
duke
parents:
diff changeset
   836
        case PERCENTEQ:
06bc494ca11e Initial load
duke
parents:
diff changeset
   837
        case AMPEQ:
06bc494ca11e Initial load
duke
parents:
diff changeset
   838
        case BAREQ:
06bc494ca11e Initial load
duke
parents:
diff changeset
   839
        case CARETEQ:
06bc494ca11e Initial load
duke
parents:
diff changeset
   840
        case LTLTEQ:
06bc494ca11e Initial load
duke
parents:
diff changeset
   841
        case GTGTEQ:
06bc494ca11e Initial load
duke
parents:
diff changeset
   842
        case GTGTGTEQ:
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   843
            int pos = token.pos;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   844
            TokenKind tk = token.kind;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   845
            nextToken();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   846
            mode = EXPR;
06bc494ca11e Initial load
duke
parents:
diff changeset
   847
            JCExpression t1 = term();
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   848
            return F.at(pos).Assignop(optag(tk), t, t1);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   849
        default:
06bc494ca11e Initial load
duke
parents:
diff changeset
   850
            return t;
06bc494ca11e Initial load
duke
parents:
diff changeset
   851
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   852
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   853
06bc494ca11e Initial load
duke
parents:
diff changeset
   854
    /** Expression1   = Expression2 [Expression1Rest]
06bc494ca11e Initial load
duke
parents:
diff changeset
   855
     *  Type1         = Type2
06bc494ca11e Initial load
duke
parents:
diff changeset
   856
     *  TypeNoParams1 = TypeNoParams2
06bc494ca11e Initial load
duke
parents:
diff changeset
   857
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   858
    JCExpression term1() {
06bc494ca11e Initial load
duke
parents:
diff changeset
   859
        JCExpression t = term2();
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   860
        if ((mode & EXPR) != 0 && token.kind == QUES) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   861
            mode = EXPR;
06bc494ca11e Initial load
duke
parents:
diff changeset
   862
            return term1Rest(t);
06bc494ca11e Initial load
duke
parents:
diff changeset
   863
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
   864
            return t;
06bc494ca11e Initial load
duke
parents:
diff changeset
   865
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   866
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   867
06bc494ca11e Initial load
duke
parents:
diff changeset
   868
    /** Expression1Rest = ["?" Expression ":" Expression1]
06bc494ca11e Initial load
duke
parents:
diff changeset
   869
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   870
    JCExpression term1Rest(JCExpression t) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   871
        if (token.kind == QUES) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   872
            int pos = token.pos;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   873
            nextToken();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   874
            JCExpression t1 = term();
06bc494ca11e Initial load
duke
parents:
diff changeset
   875
            accept(COLON);
06bc494ca11e Initial load
duke
parents:
diff changeset
   876
            JCExpression t2 = term1();
06bc494ca11e Initial load
duke
parents:
diff changeset
   877
            return F.at(pos).Conditional(t, t1, t2);
06bc494ca11e Initial load
duke
parents:
diff changeset
   878
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
   879
            return t;
06bc494ca11e Initial load
duke
parents:
diff changeset
   880
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   881
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   882
06bc494ca11e Initial load
duke
parents:
diff changeset
   883
    /** Expression2   = Expression3 [Expression2Rest]
06bc494ca11e Initial load
duke
parents:
diff changeset
   884
     *  Type2         = Type3
06bc494ca11e Initial load
duke
parents:
diff changeset
   885
     *  TypeNoParams2 = TypeNoParams3
06bc494ca11e Initial load
duke
parents:
diff changeset
   886
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   887
    JCExpression term2() {
06bc494ca11e Initial load
duke
parents:
diff changeset
   888
        JCExpression t = term3();
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   889
        if ((mode & EXPR) != 0 && prec(token.kind) >= TreeInfo.orPrec) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   890
            mode = EXPR;
06bc494ca11e Initial load
duke
parents:
diff changeset
   891
            return term2Rest(t, TreeInfo.orPrec);
06bc494ca11e Initial load
duke
parents:
diff changeset
   892
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
   893
            return t;
06bc494ca11e Initial load
duke
parents:
diff changeset
   894
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   895
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   896
06bc494ca11e Initial load
duke
parents:
diff changeset
   897
    /*  Expression2Rest = {infixop Expression3}
06bc494ca11e Initial load
duke
parents:
diff changeset
   898
     *                  | Expression3 instanceof Type
06bc494ca11e Initial load
duke
parents:
diff changeset
   899
     *  infixop         = "||"
06bc494ca11e Initial load
duke
parents:
diff changeset
   900
     *                  | "&&"
06bc494ca11e Initial load
duke
parents:
diff changeset
   901
     *                  | "|"
06bc494ca11e Initial load
duke
parents:
diff changeset
   902
     *                  | "^"
06bc494ca11e Initial load
duke
parents:
diff changeset
   903
     *                  | "&"
06bc494ca11e Initial load
duke
parents:
diff changeset
   904
     *                  | "==" | "!="
06bc494ca11e Initial load
duke
parents:
diff changeset
   905
     *                  | "<" | ">" | "<=" | ">="
06bc494ca11e Initial load
duke
parents:
diff changeset
   906
     *                  | "<<" | ">>" | ">>>"
06bc494ca11e Initial load
duke
parents:
diff changeset
   907
     *                  | "+" | "-"
06bc494ca11e Initial load
duke
parents:
diff changeset
   908
     *                  | "*" | "/" | "%"
06bc494ca11e Initial load
duke
parents:
diff changeset
   909
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
   910
    JCExpression term2Rest(JCExpression t, int minprec) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   911
        JCExpression[] odStack = newOdStack();
06bc494ca11e Initial load
duke
parents:
diff changeset
   912
        Token[] opStack = newOpStack();
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   913
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   914
        // optimization, was odStack = new Tree[...]; opStack = new Tree[...];
06bc494ca11e Initial load
duke
parents:
diff changeset
   915
        int top = 0;
06bc494ca11e Initial load
duke
parents:
diff changeset
   916
        odStack[0] = t;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   917
        int startPos = token.pos;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   918
        Token topOp = Tokens.DUMMY;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   919
        while (prec(token.kind) >= minprec) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   920
            opStack[top] = topOp;
06bc494ca11e Initial load
duke
parents:
diff changeset
   921
            top++;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   922
            topOp = token;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   923
            nextToken();
11322
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
   924
            odStack[top] = (topOp.kind == INSTANCEOF) ? parseType() : term3();
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   925
            while (top > 0 && prec(topOp.kind) >= prec(token.kind)) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   926
                odStack[top-1] = makeOp(topOp.pos, topOp.kind, odStack[top-1],
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   927
                                        odStack[top]);
06bc494ca11e Initial load
duke
parents:
diff changeset
   928
                top--;
06bc494ca11e Initial load
duke
parents:
diff changeset
   929
                topOp = opStack[top];
06bc494ca11e Initial load
duke
parents:
diff changeset
   930
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   931
        }
8032
e1aa25ccdabb 6396503: javac should not require assertions enabled
jjg
parents: 7636
diff changeset
   932
        Assert.check(top == 0);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   933
        t = odStack[0];
06bc494ca11e Initial load
duke
parents:
diff changeset
   934
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
   935
        if (t.hasTag(JCTree.Tag.PLUS)) {
14263
473b1eaede64 8000310: Clean up use of StringBuffer in langtools
jjg
parents: 14062
diff changeset
   936
            StringBuilder buf = foldStrings(t);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   937
            if (buf != null) {
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14267
diff changeset
   938
                t = toP(F.at(startPos).Literal(TypeTag.CLASS, buf.toString()));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   939
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   940
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   941
14803
88347e495d34 8004504: ListBuffer could reuse List.nil() as the sentinel element
jlahoda
parents: 14725
diff changeset
   942
        odStackSupply.add(odStack);
88347e495d34 8004504: ListBuffer could reuse List.nil() as the sentinel element
jlahoda
parents: 14725
diff changeset
   943
        opStackSupply.add(opStack);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   944
        return t;
06bc494ca11e Initial load
duke
parents:
diff changeset
   945
    }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
   946
    //where
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   947
        /** Construct a binary or type test node.
06bc494ca11e Initial load
duke
parents:
diff changeset
   948
         */
06bc494ca11e Initial load
duke
parents:
diff changeset
   949
        private JCExpression makeOp(int pos,
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
   950
                                    TokenKind topOp,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   951
                                    JCExpression od1,
06bc494ca11e Initial load
duke
parents:
diff changeset
   952
                                    JCExpression od2)
06bc494ca11e Initial load
duke
parents:
diff changeset
   953
        {
06bc494ca11e Initial load
duke
parents:
diff changeset
   954
            if (topOp == INSTANCEOF) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   955
                return F.at(pos).TypeTest(od1, od2);
06bc494ca11e Initial load
duke
parents:
diff changeset
   956
            } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
   957
                return F.at(pos).Binary(optag(topOp), od1, od2);
06bc494ca11e Initial load
duke
parents:
diff changeset
   958
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   959
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   960
        /** If tree is a concatenation of string literals, replace it
06bc494ca11e Initial load
duke
parents:
diff changeset
   961
         *  by a single literal representing the concatenated string.
06bc494ca11e Initial load
duke
parents:
diff changeset
   962
         */
14263
473b1eaede64 8000310: Clean up use of StringBuffer in langtools
jjg
parents: 14062
diff changeset
   963
        protected StringBuilder foldStrings(JCTree tree) {
10200
56cc93e7b6ef 7068902: (javac) allow enabling or disabling of String folding
ksrini
parents: 10199
diff changeset
   964
            if (!allowStringFolding)
56cc93e7b6ef 7068902: (javac) allow enabling or disabling of String folding
ksrini
parents: 10199
diff changeset
   965
                return null;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   966
            List<String> buf = List.nil();
06bc494ca11e Initial load
duke
parents:
diff changeset
   967
            while (true) {
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
   968
                if (tree.hasTag(LITERAL)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   969
                    JCLiteral lit = (JCLiteral) tree;
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14267
diff changeset
   970
                    if (lit.typetag == TypeTag.CLASS) {
14263
473b1eaede64 8000310: Clean up use of StringBuffer in langtools
jjg
parents: 14062
diff changeset
   971
                        StringBuilder sbuf =
473b1eaede64 8000310: Clean up use of StringBuffer in langtools
jjg
parents: 14062
diff changeset
   972
                            new StringBuilder((String)lit.value);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   973
                        while (buf.nonEmpty()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
   974
                            sbuf.append(buf.head);
06bc494ca11e Initial load
duke
parents:
diff changeset
   975
                            buf = buf.tail;
06bc494ca11e Initial load
duke
parents:
diff changeset
   976
                        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   977
                        return sbuf;
06bc494ca11e Initial load
duke
parents:
diff changeset
   978
                    }
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
   979
                } else if (tree.hasTag(JCTree.Tag.PLUS)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   980
                    JCBinary op = (JCBinary)tree;
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
   981
                    if (op.rhs.hasTag(LITERAL)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   982
                        JCLiteral lit = (JCLiteral) op.rhs;
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14267
diff changeset
   983
                        if (lit.typetag == TypeTag.CLASS) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   984
                            buf = buf.prepend((String) lit.value);
06bc494ca11e Initial load
duke
parents:
diff changeset
   985
                            tree = op.lhs;
06bc494ca11e Initial load
duke
parents:
diff changeset
   986
                            continue;
06bc494ca11e Initial load
duke
parents:
diff changeset
   987
                        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   988
                    }
06bc494ca11e Initial load
duke
parents:
diff changeset
   989
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
   990
                return null;
06bc494ca11e Initial load
duke
parents:
diff changeset
   991
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
   992
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
   993
06bc494ca11e Initial load
duke
parents:
diff changeset
   994
        /** optimization: To save allocating a new operand/operator stack
06bc494ca11e Initial load
duke
parents:
diff changeset
   995
         *  for every binary operation, we use supplys.
06bc494ca11e Initial load
duke
parents:
diff changeset
   996
         */
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22155
diff changeset
   997
        ArrayList<JCExpression[]> odStackSupply = new ArrayList<>();
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22155
diff changeset
   998
        ArrayList<Token[]> opStackSupply = new ArrayList<>();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
   999
06bc494ca11e Initial load
duke
parents:
diff changeset
  1000
        private JCExpression[] newOdStack() {
14803
88347e495d34 8004504: ListBuffer could reuse List.nil() as the sentinel element
jlahoda
parents: 14725
diff changeset
  1001
            if (odStackSupply.isEmpty())
88347e495d34 8004504: ListBuffer could reuse List.nil() as the sentinel element
jlahoda
parents: 14725
diff changeset
  1002
                return new JCExpression[infixPrecedenceLevels + 1];
88347e495d34 8004504: ListBuffer could reuse List.nil() as the sentinel element
jlahoda
parents: 14725
diff changeset
  1003
            return odStackSupply.remove(odStackSupply.size() - 1);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1004
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1005
06bc494ca11e Initial load
duke
parents:
diff changeset
  1006
        private Token[] newOpStack() {
14803
88347e495d34 8004504: ListBuffer could reuse List.nil() as the sentinel element
jlahoda
parents: 14725
diff changeset
  1007
            if (opStackSupply.isEmpty())
88347e495d34 8004504: ListBuffer could reuse List.nil() as the sentinel element
jlahoda
parents: 14725
diff changeset
  1008
                return new Token[infixPrecedenceLevels + 1];
88347e495d34 8004504: ListBuffer could reuse List.nil() as the sentinel element
jlahoda
parents: 14725
diff changeset
  1009
            return opStackSupply.remove(opStackSupply.size() - 1);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1010
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1011
13844
56339cf983a3 7177970: fix issues in langtools doc comments
jjg
parents: 13439
diff changeset
  1012
    /**
56339cf983a3 7177970: fix issues in langtools doc comments
jjg
parents: 13439
diff changeset
  1013
     *  Expression3    = PrefixOp Expression3
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1014
     *                 | "(" Expr | TypeNoParams ")" Expression3
06bc494ca11e Initial load
duke
parents:
diff changeset
  1015
     *                 | Primary {Selector} {PostfixOp}
13844
56339cf983a3 7177970: fix issues in langtools doc comments
jjg
parents: 13439
diff changeset
  1016
     *
56339cf983a3 7177970: fix issues in langtools doc comments
jjg
parents: 13439
diff changeset
  1017
     *  {@literal
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1018
     *  Primary        = "(" Expression ")"
06bc494ca11e Initial load
duke
parents:
diff changeset
  1019
     *                 | Literal
06bc494ca11e Initial load
duke
parents:
diff changeset
  1020
     *                 | [TypeArguments] THIS [Arguments]
06bc494ca11e Initial load
duke
parents:
diff changeset
  1021
     *                 | [TypeArguments] SUPER SuperSuffix
06bc494ca11e Initial load
duke
parents:
diff changeset
  1022
     *                 | NEW [TypeArguments] Creator
11143
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1023
     *                 | "(" Arguments ")" "->" ( Expression | Block )
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1024
     *                 | Ident "->" ( Expression | Block )
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1025
     *                 | [Annotations] Ident { "." [Annotations] Ident }
11144
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
  1026
     *                 | Expression3 MemberReferenceSuffix
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1027
     *                   [ [Annotations] "[" ( "]" BracketsOpt "." CLASS | Expression "]" )
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1028
     *                   | Arguments
06bc494ca11e Initial load
duke
parents:
diff changeset
  1029
     *                   | "." ( CLASS | THIS | [TypeArguments] SUPER Arguments | NEW [TypeArguments] InnerCreator )
06bc494ca11e Initial load
duke
parents:
diff changeset
  1030
     *                   ]
06bc494ca11e Initial load
duke
parents:
diff changeset
  1031
     *                 | BasicType BracketsOpt "." CLASS
13844
56339cf983a3 7177970: fix issues in langtools doc comments
jjg
parents: 13439
diff changeset
  1032
     *  }
56339cf983a3 7177970: fix issues in langtools doc comments
jjg
parents: 13439
diff changeset
  1033
     *
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1034
     *  PrefixOp       = "++" | "--" | "!" | "~" | "+" | "-"
06bc494ca11e Initial load
duke
parents:
diff changeset
  1035
     *  PostfixOp      = "++" | "--"
06bc494ca11e Initial load
duke
parents:
diff changeset
  1036
     *  Type3          = Ident { "." Ident } [TypeArguments] {TypeSelector} BracketsOpt
06bc494ca11e Initial load
duke
parents:
diff changeset
  1037
     *                 | BasicType
06bc494ca11e Initial load
duke
parents:
diff changeset
  1038
     *  TypeNoParams3  = Ident { "." Ident } BracketsOpt
06bc494ca11e Initial load
duke
parents:
diff changeset
  1039
     *  Selector       = "." [TypeArguments] Ident [Arguments]
06bc494ca11e Initial load
duke
parents:
diff changeset
  1040
     *                 | "." THIS
06bc494ca11e Initial load
duke
parents:
diff changeset
  1041
     *                 | "." [TypeArguments] SUPER SuperSuffix
06bc494ca11e Initial load
duke
parents:
diff changeset
  1042
     *                 | "." NEW [TypeArguments] InnerCreator
06bc494ca11e Initial load
duke
parents:
diff changeset
  1043
     *                 | "[" Expression "]"
06bc494ca11e Initial load
duke
parents:
diff changeset
  1044
     *  TypeSelector   = "." Ident [TypeArguments]
06bc494ca11e Initial load
duke
parents:
diff changeset
  1045
     *  SuperSuffix    = Arguments | "." Ident [Arguments]
06bc494ca11e Initial load
duke
parents:
diff changeset
  1046
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1047
    protected JCExpression term3() {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1048
        int pos = token.pos;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1049
        JCExpression t;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1050
        List<JCExpression> typeArgs = typeArgumentsOpt(EXPR);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1051
        switch (token.kind) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1052
        case QUES:
06bc494ca11e Initial load
duke
parents:
diff changeset
  1053
            if ((mode & TYPE) != 0 && (mode & (TYPEARG|NOPARAMS)) == TYPEARG) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1054
                mode = TYPE;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1055
                return typeArgument();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1056
            } else
06bc494ca11e Initial load
duke
parents:
diff changeset
  1057
                return illegal();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1058
        case PLUSPLUS: case SUBSUB: case BANG: case TILDE: case PLUS: case SUB:
06bc494ca11e Initial load
duke
parents:
diff changeset
  1059
            if (typeArgs == null && (mode & EXPR) != 0) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1060
                TokenKind tk = token.kind;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1061
                nextToken();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1062
                mode = EXPR;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1063
                if (tk == SUB &&
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1064
                    (token.kind == INTLITERAL || token.kind == LONGLITERAL) &&
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1065
                    token.radix() == 10) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1066
                    mode = EXPR;
10455
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
  1067
                    t = literal(names.hyphen, pos);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1068
                } else {
11322
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1069
                    t = term3();
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1070
                    return F.at(pos).Unary(unoptag(tk), t);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1071
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1072
            } else return illegal();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1073
            break;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1074
        case LPAREN:
06bc494ca11e Initial load
duke
parents:
diff changeset
  1075
            if (typeArgs == null && (mode & EXPR) != 0) {
14725
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1076
                ParensResult pres = analyzeParens();
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1077
                switch (pres) {
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1078
                    case CAST:
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1079
                       accept(LPAREN);
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1080
                       mode = TYPE;
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1081
                       int pos1 = pos;
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1082
                       List<JCExpression> targets = List.of(t = term3());
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1083
                       while (token.kind == AMP) {
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1084
                           checkIntersectionTypesInCast();
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1085
                           accept(AMP);
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1086
                           targets = targets.prepend(term3());
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1087
                       }
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1088
                       if (targets.length() > 1) {
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1089
                           t = toP(F.at(pos1).TypeIntersection(targets.reverse()));
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1090
                       }
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1091
                       accept(RPAREN);
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1092
                       mode = EXPR;
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1093
                       JCExpression t1 = term3();
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1094
                       return F.at(pos).TypeCast(t, t1);
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1095
                    case IMPLICIT_LAMBDA:
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1096
                    case EXPLICIT_LAMBDA:
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1097
                        t = lambdaExpressionOrStatement(true, pres == ParensResult.EXPLICIT_LAMBDA, pos);
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1098
                        break;
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1099
                    default: //PARENS
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1100
                        accept(LPAREN);
11143
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1101
                        mode = EXPR;
14725
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1102
                        t = termRest(term1Rest(term2Rest(term3(), TreeInfo.orPrec)));
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1103
                        accept(RPAREN);
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1104
                        t = toP(F.at(pos).Parens(t));
11143
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1105
                        break;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1106
                }
11143
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1107
            } else {
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1108
                return illegal();
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1109
            }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1110
            break;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1111
        case THIS:
06bc494ca11e Initial load
duke
parents:
diff changeset
  1112
            if ((mode & EXPR) != 0) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1113
                mode = EXPR;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1114
                t = to(F.at(pos).Ident(names._this));
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1115
                nextToken();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1116
                if (typeArgs == null)
06bc494ca11e Initial load
duke
parents:
diff changeset
  1117
                    t = argumentsOpt(null, t);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1118
                else
06bc494ca11e Initial load
duke
parents:
diff changeset
  1119
                    t = arguments(typeArgs, t);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1120
                typeArgs = null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1121
            } else return illegal();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1122
            break;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1123
        case SUPER:
06bc494ca11e Initial load
duke
parents:
diff changeset
  1124
            if ((mode & EXPR) != 0) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1125
                mode = EXPR;
4870
a132763160d7 6919889: assorted position errors in compiler syntax trees
jjg
parents: 4704
diff changeset
  1126
                t = to(F.at(pos).Ident(names._super));
a132763160d7 6919889: assorted position errors in compiler syntax trees
jjg
parents: 4704
diff changeset
  1127
                t = superSuffix(typeArgs, t);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1128
                typeArgs = null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1129
            } else return illegal();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1130
            break;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1131
        case INTLITERAL: case LONGLITERAL: case FLOATLITERAL: case DOUBLELITERAL:
06bc494ca11e Initial load
duke
parents:
diff changeset
  1132
        case CHARLITERAL: case STRINGLITERAL:
06bc494ca11e Initial load
duke
parents:
diff changeset
  1133
        case TRUE: case FALSE: case NULL:
06bc494ca11e Initial load
duke
parents:
diff changeset
  1134
            if (typeArgs == null && (mode & EXPR) != 0) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1135
                mode = EXPR;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1136
                t = literal(names.empty);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1137
            } else return illegal();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1138
            break;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1139
        case NEW:
06bc494ca11e Initial load
duke
parents:
diff changeset
  1140
            if (typeArgs != null) return illegal();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1141
            if ((mode & EXPR) != 0) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1142
                mode = EXPR;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1143
                nextToken();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1144
                if (token.kind == LT) typeArgs = typeArguments(false);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1145
                t = creator(pos, typeArgs);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1146
                typeArgs = null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1147
            } else return illegal();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1148
            break;
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1149
        case MONKEYS_AT:
15718
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1150
            // Only annotated cast types and method references are valid
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1151
            List<JCAnnotation> typeAnnos = typeAnnotationsOpt();
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1152
            if (typeAnnos.isEmpty()) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1153
                // else there would be no '@'
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1154
                throw new AssertionError("Expected type annotations, but found none!");
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1155
            }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1156
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1157
            JCExpression expr = term3();
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1158
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1159
            if ((mode & TYPE) == 0) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1160
                // Type annotations on class literals no longer legal
15718
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1161
                switch (expr.getTag()) {
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1162
                case REFERENCE: {
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1163
                    JCMemberReference mref = (JCMemberReference) expr;
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1164
                    mref.expr = toP(F.at(pos).AnnotatedType(typeAnnos, mref.expr));
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1165
                    t = mref;
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1166
                    break;
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1167
                }
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1168
                case SELECT: {
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1169
                    JCFieldAccess sel = (JCFieldAccess) expr;
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1170
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1171
                    if (sel.name != names._class) {
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1172
                        return illegal();
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1173
                    } else {
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1174
                        log.error(token.pos, "no.annotations.on.dot.class");
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1175
                        return expr;
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1176
                    }
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1177
                }
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1178
                default:
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1179
                    return illegal(typeAnnos.head.pos);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1180
                }
15718
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1181
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1182
            } else {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1183
                // Type annotations targeting a cast
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1184
                t = insertAnnotationsToMostInner(expr, typeAnnos, false);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1185
            }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1186
            break;
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  1187
        case UNDERSCORE: case IDENTIFIER: case ASSERT: case ENUM:
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1188
            if (typeArgs != null) return illegal();
11143
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1189
            if ((mode & EXPR) != 0 && peekToken(ARROW)) {
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1190
                t = lambdaExpressionOrStatement(false, false, pos);
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1191
            } else {
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1192
                t = toP(F.at(token.pos).Ident(ident()));
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1193
                loop: while (true) {
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1194
                    pos = token.pos;
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1195
                    final List<JCAnnotation> annos = typeAnnotationsOpt();
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1196
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1197
                    // need to report an error later if LBRACKET is for array
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1198
                    // index access rather than array creation level
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1199
                    if (!annos.isEmpty() && token.kind != LBRACKET && token.kind != ELLIPSIS)
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1200
                        return illegal(annos.head.pos);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1201
11143
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1202
                    switch (token.kind) {
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1203
                    case LBRACKET:
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1204
                        nextToken();
11143
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1205
                        if (token.kind == RBRACKET) {
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1206
                            nextToken();
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1207
                            t = bracketsOpt(t);
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1208
                            t = toP(F.at(pos).TypeArray(t));
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1209
                            if (annos.nonEmpty()) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1210
                                t = toP(F.at(pos).AnnotatedType(annos, t));
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1211
                            }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1212
                            // .class is only allowed if there were no annotations
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1213
                            JCExpression nt = bracketsSuffix(t);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1214
                            if (nt != t && (annos.nonEmpty() || TreeInfo.containsTypeAnnotation(t))) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1215
                                // t and nt are different if bracketsSuffix parsed a .class.
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1216
                                // The check for nonEmpty covers the case when the whole array is annotated.
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1217
                                // Helper method isAnnotated looks for annos deeply within t.
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1218
                                syntaxError("no.annotations.on.dot.class");
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1219
                            }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1220
                            t = nt;
11143
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1221
                        } else {
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1222
                            if ((mode & EXPR) != 0) {
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1223
                                mode = EXPR;
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1224
                                JCExpression t1 = term();
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1225
                                if (!annos.isEmpty()) t = illegal(annos.head.pos);
11143
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1226
                                t = to(F.at(pos).Indexed(t, t1));
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1227
                            }
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1228
                            accept(RBRACKET);
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1229
                        }
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1230
                        break loop;
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1231
                    case LPAREN:
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1232
                        if ((mode & EXPR) != 0) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1233
                            mode = EXPR;
11143
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1234
                            t = arguments(typeArgs, t);
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1235
                            if (!annos.isEmpty()) t = illegal(annos.head.pos);
11143
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1236
                            typeArgs = null;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1237
                        }
11143
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1238
                        break loop;
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1239
                    case DOT:
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1240
                        nextToken();
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1241
                        int oldmode = mode;
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1242
                        mode &= ~NOPARAMS;
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1243
                        typeArgs = typeArgumentsOpt(EXPR);
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1244
                        mode = oldmode;
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1245
                        if ((mode & EXPR) != 0) {
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1246
                            switch (token.kind) {
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1247
                            case CLASS:
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1248
                                if (typeArgs != null) return illegal();
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1249
                                mode = EXPR;
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1250
                                t = to(F.at(pos).Select(t, names._class));
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1251
                                nextToken();
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1252
                                break loop;
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1253
                            case THIS:
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1254
                                if (typeArgs != null) return illegal();
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1255
                                mode = EXPR;
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1256
                                t = to(F.at(pos).Select(t, names._this));
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1257
                                nextToken();
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1258
                                break loop;
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1259
                            case SUPER:
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1260
                                mode = EXPR;
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1261
                                t = to(F.at(pos).Select(t, names._super));
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1262
                                t = superSuffix(typeArgs, t);
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1263
                                typeArgs = null;
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1264
                                break loop;
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1265
                            case NEW:
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1266
                                if (typeArgs != null) return illegal();
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1267
                                mode = EXPR;
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1268
                                int pos1 = token.pos;
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1269
                                nextToken();
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1270
                                if (token.kind == LT) typeArgs = typeArguments(false);
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1271
                                t = innerCreator(pos1, typeArgs, t);
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1272
                                typeArgs = null;
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1273
                                break loop;
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1274
                            }
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1275
                        }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1276
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1277
                        List<JCAnnotation> tyannos = null;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1278
                        if ((mode & TYPE) != 0 && token.kind == MONKEYS_AT) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1279
                            tyannos = typeAnnotationsOpt();
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1280
                        }
11143
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1281
                        // typeArgs saved for next loop iteration.
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1282
                        t = toP(F.at(pos).Select(t, ident()));
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1283
                        if (tyannos != null && tyannos.nonEmpty()) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1284
                            t = toP(F.at(tyannos.head.pos).AnnotatedType(tyannos, t));
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1285
                        }
11143
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1286
                        break;
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1287
                    case ELLIPSIS:
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1288
                        if (this.permitTypeAnnotationsPushBack) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1289
                            this.typeAnnotationsPushedBack = annos;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1290
                        } else if (annos.nonEmpty()) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1291
                            // Don't return here -- error recovery attempt
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1292
                            illegal(annos.head.pos);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1293
                        }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1294
                        break loop;
11322
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1295
                    case LT:
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1296
                        if ((mode & TYPE) == 0 && isUnboundMemberRef()) {
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1297
                            //this is an unbound method reference whose qualifier
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  1298
                            //is a generic type i.e. A<S>::m
11322
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1299
                            int pos1 = token.pos;
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1300
                            accept(LT);
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22155
diff changeset
  1301
                            ListBuffer<JCExpression> args = new ListBuffer<>();
11322
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1302
                            args.append(typeArgument());
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1303
                            while (token.kind == COMMA) {
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1304
                                nextToken();
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1305
                                args.append(typeArgument());
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1306
                            }
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1307
                            accept(GT);
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1308
                            t = toP(F.at(pos1).TypeApply(t, args.toList()));
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1309
                            while (token.kind == DOT) {
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1310
                                nextToken();
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1311
                                mode = TYPE;
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1312
                                t = toP(F.at(token.pos).Select(t, ident()));
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1313
                                t = typeArgumentsOpt(t);
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1314
                            }
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  1315
                            t = bracketsOpt(t);
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  1316
                            if (token.kind != COLCOL) {
11322
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1317
                                //method reference expected here
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1318
                                t = illegal();
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1319
                            }
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1320
                            mode = EXPR;
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1321
                            return term3Rest(t, typeArgs);
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1322
                        }
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1323
                        break loop;
11143
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1324
                    default:
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1325
                        break loop;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1326
                    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1327
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1328
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1329
            if (typeArgs != null) illegal();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1330
            t = typeArgumentsOpt(t);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1331
            break;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1332
        case BYTE: case SHORT: case CHAR: case INT: case LONG: case FLOAT:
06bc494ca11e Initial load
duke
parents:
diff changeset
  1333
        case DOUBLE: case BOOLEAN:
06bc494ca11e Initial load
duke
parents:
diff changeset
  1334
            if (typeArgs != null) illegal();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1335
            t = bracketsSuffix(bracketsOpt(basicType()));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1336
            break;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1337
        case VOID:
06bc494ca11e Initial load
duke
parents:
diff changeset
  1338
            if (typeArgs != null) illegal();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1339
            if ((mode & EXPR) != 0) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1340
                nextToken();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1341
                if (token.kind == DOT) {
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14267
diff changeset
  1342
                    JCPrimitiveTypeTree ti = toP(F.at(pos).TypeIdent(TypeTag.VOID));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1343
                    t = bracketsSuffix(ti);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1344
                } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1345
                    return illegal(pos);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1346
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1347
            } else {
2723
b659ca23d5f5 6829189: Java programming with JSR 292 needs language support
jrose
parents: 2212
diff changeset
  1348
                // 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
  1349
                // 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
  1350
                // The error will be reported in Attr.attribTypes or Attr.visitApply.
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14267
diff changeset
  1351
                JCPrimitiveTypeTree ti = to(F.at(pos).TypeIdent(TypeTag.VOID));
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1352
                nextToken();
2723
b659ca23d5f5 6829189: Java programming with JSR 292 needs language support
jrose
parents: 2212
diff changeset
  1353
                return ti;
b659ca23d5f5 6829189: Java programming with JSR 292 needs language support
jrose
parents: 2212
diff changeset
  1354
                //return illegal();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1355
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1356
            break;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1357
        default:
06bc494ca11e Initial load
duke
parents:
diff changeset
  1358
            return illegal();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1359
        }
11143
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1360
        return term3Rest(t, typeArgs);
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1361
    }
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1362
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1363
    JCExpression term3Rest(JCExpression t, List<JCExpression> typeArgs) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1364
        if (typeArgs != null) illegal();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1365
        while (true) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1366
            int pos1 = token.pos;
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1367
            final List<JCAnnotation> annos = typeAnnotationsOpt();
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1368
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1369
            if (token.kind == LBRACKET) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1370
                nextToken();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1371
                if ((mode & TYPE) != 0) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1372
                    int oldmode = mode;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1373
                    mode = TYPE;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1374
                    if (token.kind == RBRACKET) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1375
                        nextToken();
7072
4863847e93a5 6987760: remove 308 support from JDK7
jjg
parents: 6716
diff changeset
  1376
                        t = bracketsOpt(t);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1377
                        t = toP(F.at(pos1).TypeArray(t));
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  1378
                        if (token.kind == COLCOL) {
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  1379
                            mode = EXPR;
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  1380
                            continue;
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  1381
                        }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1382
                        if (annos.nonEmpty()) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1383
                            t = toP(F.at(pos1).AnnotatedType(annos, t));
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1384
                        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1385
                        return t;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1386
                    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1387
                    mode = oldmode;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1388
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1389
                if ((mode & EXPR) != 0) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1390
                    mode = EXPR;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1391
                    JCExpression t1 = term();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1392
                    t = to(F.at(pos1).Indexed(t, t1));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1393
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1394
                accept(RBRACKET);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1395
            } else if (token.kind == DOT) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1396
                nextToken();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1397
                typeArgs = typeArgumentsOpt(EXPR);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1398
                if (token.kind == SUPER && (mode & EXPR) != 0) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1399
                    mode = EXPR;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1400
                    t = to(F.at(pos1).Select(t, names._super));
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1401
                    nextToken();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1402
                    t = arguments(typeArgs, t);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1403
                    typeArgs = null;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1404
                } else if (token.kind == NEW && (mode & EXPR) != 0) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1405
                    if (typeArgs != null) return illegal();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1406
                    mode = EXPR;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1407
                    int pos2 = token.pos;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1408
                    nextToken();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1409
                    if (token.kind == LT) typeArgs = typeArguments(false);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1410
                    t = innerCreator(pos2, typeArgs, t);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1411
                    typeArgs = null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1412
                } else {
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1413
                    List<JCAnnotation> tyannos = null;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1414
                    if ((mode & TYPE) != 0 && token.kind == MONKEYS_AT) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1415
                        // is the mode check needed?
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1416
                        tyannos = typeAnnotationsOpt();
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1417
                    }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1418
                    t = toP(F.at(pos1).Select(t, ident()));
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1419
                    if (tyannos != null && tyannos.nonEmpty()) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1420
                        t = toP(F.at(tyannos.head.pos).AnnotatedType(tyannos, t));
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1421
                    }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1422
                    t = argumentsOpt(typeArgs, typeArgumentsOpt(t));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1423
                    typeArgs = null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1424
                }
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  1425
            } else if ((mode & EXPR) != 0 && token.kind == COLCOL) {
11144
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
  1426
                mode = EXPR;
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
  1427
                if (typeArgs != null) return illegal();
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  1428
                accept(COLCOL);
11144
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
  1429
                t = memberReferenceSuffix(pos1, t);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1430
            } else {
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1431
                if (!annos.isEmpty()) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1432
                    if (permitTypeAnnotationsPushBack)
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1433
                        typeAnnotationsPushedBack = annos;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1434
                    else
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1435
                        return illegal(annos.head.pos);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1436
                }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1437
                break;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1438
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1439
        }
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1440
        while ((token.kind == PLUSPLUS || token.kind == SUBSUB) && (mode & EXPR) != 0) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1441
            mode = EXPR;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1442
            t = to(F.at(token.pos).Unary(
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  1443
                  token.kind == PLUSPLUS ? POSTINC : POSTDEC, t));
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1444
            nextToken();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1445
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1446
        return toP(t);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1447
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1448
11322
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1449
    /**
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1450
     * If we see an identifier followed by a '&lt;' it could be an unbound
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1451
     * method reference or a binary expression. To disambiguate, look for a
15718
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1452
     * matching '&gt;' and see if the subsequent terminal is either '.' or '::'.
11322
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1453
     */
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1454
    @SuppressWarnings("fallthrough")
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1455
    boolean isUnboundMemberRef() {
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1456
        int pos = 0, depth = 0;
15718
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1457
        outer: for (Token t = S.token(pos) ; ; t = S.token(++pos)) {
11322
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1458
            switch (t.kind) {
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  1459
                case IDENTIFIER: case UNDERSCORE: case QUES: case EXTENDS: case SUPER:
11322
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1460
                case DOT: case RBRACKET: case LBRACKET: case COMMA:
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1461
                case BYTE: case SHORT: case INT: case LONG: case FLOAT:
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1462
                case DOUBLE: case BOOLEAN: case CHAR:
15718
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1463
                case MONKEYS_AT:
11322
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1464
                    break;
15718
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1465
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1466
                case LPAREN:
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1467
                    // skip annotation values
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1468
                    int nesting = 0;
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1469
                    for (; ; pos++) {
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1470
                        TokenKind tk2 = S.token(pos).kind;
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1471
                        switch (tk2) {
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1472
                            case EOF:
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1473
                                return false;
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1474
                            case LPAREN:
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1475
                                nesting++;
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1476
                                break;
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1477
                            case RPAREN:
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1478
                                nesting--;
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1479
                                if (nesting == 0) {
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1480
                                    continue outer;
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1481
                                }
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1482
                                break;
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1483
                        }
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1484
                    }
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1485
11322
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1486
                case LT:
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1487
                    depth++; break;
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1488
                case GTGTGT:
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1489
                    depth--;
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1490
                case GTGT:
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1491
                    depth--;
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1492
                case GT:
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1493
                    depth--;
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1494
                    if (depth == 0) {
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  1495
                        TokenKind nextKind = S.token(pos + 1).kind;
11322
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1496
                        return
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  1497
                            nextKind == TokenKind.DOT ||
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  1498
                            nextKind == TokenKind.LBRACKET ||
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  1499
                            nextKind == TokenKind.COLCOL;
11322
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1500
                    }
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1501
                    break;
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1502
                default:
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1503
                    return false;
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1504
            }
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1505
        }
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1506
    }
6ee85f80967a 7120463: Fix method reference parser support in order to avoid ambiguities
mcimadamore
parents: 11149
diff changeset
  1507
14725
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1508
    /**
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1509
     * If we see an identifier followed by a '&lt;' it could be an unbound
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1510
     * method reference or a binary expression. To disambiguate, look for a
15718
8e54c8e43d38 8008077: update reference impl for type-annotations
jjg
parents: 15711
diff changeset
  1511
     * matching '&gt;' and see if the subsequent terminal is either '.' or '::'.
14725
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1512
     */
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1513
    @SuppressWarnings("fallthrough")
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1514
    ParensResult analyzeParens() {
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1515
        int depth = 0;
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1516
        boolean type = false;
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1517
        outer: for (int lookahead = 0 ; ; lookahead++) {
14725
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1518
            TokenKind tk = S.token(lookahead).kind;
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1519
            switch (tk) {
17803
d73ddda4575f 8014643: Parser regression in JDK 8 when compiling super.x
mcimadamore
parents: 17578
diff changeset
  1520
                case COMMA:
14725
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1521
                    type = true;
17803
d73ddda4575f 8014643: Parser regression in JDK 8 when compiling super.x
mcimadamore
parents: 17578
diff changeset
  1522
                case EXTENDS: case SUPER: case DOT: case AMP:
14725
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1523
                    //skip
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1524
                    break;
17803
d73ddda4575f 8014643: Parser regression in JDK 8 when compiling super.x
mcimadamore
parents: 17578
diff changeset
  1525
                case QUES:
d73ddda4575f 8014643: Parser regression in JDK 8 when compiling super.x
mcimadamore
parents: 17578
diff changeset
  1526
                    if (peekToken(lookahead, EXTENDS) ||
d73ddda4575f 8014643: Parser regression in JDK 8 when compiling super.x
mcimadamore
parents: 17578
diff changeset
  1527
                            peekToken(lookahead, SUPER)) {
d73ddda4575f 8014643: Parser regression in JDK 8 when compiling super.x
mcimadamore
parents: 17578
diff changeset
  1528
                        //wildcards
d73ddda4575f 8014643: Parser regression in JDK 8 when compiling super.x
mcimadamore
parents: 17578
diff changeset
  1529
                        type = true;
d73ddda4575f 8014643: Parser regression in JDK 8 when compiling super.x
mcimadamore
parents: 17578
diff changeset
  1530
                    }
d73ddda4575f 8014643: Parser regression in JDK 8 when compiling super.x
mcimadamore
parents: 17578
diff changeset
  1531
                    break;
14725
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1532
                case BYTE: case SHORT: case INT: case LONG: case FLOAT:
22155
2f0a83a98593 8028235: Better error recovery for parsing 'void' as a type of the lambda parameter
jlahoda
parents: 22004
diff changeset
  1533
                case DOUBLE: case BOOLEAN: case CHAR: case VOID:
14725
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1534
                    if (peekToken(lookahead, RPAREN)) {
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1535
                        //Type, ')' -> cast
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1536
                        return ParensResult.CAST;
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  1537
                    } else if (peekToken(lookahead, LAX_IDENTIFIER)) {
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  1538
                        //Type, Identifier/'_'/'assert'/'enum' -> explicit lambda
14725
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1539
                        return ParensResult.EXPLICIT_LAMBDA;
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1540
                    }
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1541
                    break;
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1542
                case LPAREN:
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1543
                    if (lookahead != 0) {
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1544
                        // '(' in a non-starting position -> parens
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1545
                        return ParensResult.PARENS;
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1546
                    } else if (peekToken(lookahead, RPAREN)) {
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1547
                        // '(', ')' -> explicit lambda
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1548
                        return ParensResult.EXPLICIT_LAMBDA;
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1549
                    }
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1550
                    break;
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1551
                case RPAREN:
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1552
                    // if we have seen something that looks like a type,
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1553
                    // then it's a cast expression
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1554
                    if (type) return ParensResult.CAST;
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1555
                    // otherwise, disambiguate cast vs. parenthesized expression
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1556
                    // based on subsequent token.
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1557
                    switch (S.token(lookahead + 1).kind) {
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1558
                        /*case PLUSPLUS: case SUBSUB: */
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1559
                        case BANG: case TILDE:
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1560
                        case LPAREN: case THIS: case SUPER:
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1561
                        case INTLITERAL: case LONGLITERAL: case FLOATLITERAL:
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1562
                        case DOUBLELITERAL: case CHARLITERAL: case STRINGLITERAL:
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1563
                        case TRUE: case FALSE: case NULL:
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  1564
                        case NEW: case IDENTIFIER: case ASSERT: case ENUM: case UNDERSCORE:
14725
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1565
                        case BYTE: case SHORT: case CHAR: case INT:
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1566
                        case LONG: case FLOAT: case DOUBLE: case BOOLEAN: case VOID:
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1567
                            return ParensResult.CAST;
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1568
                        default:
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1569
                            return ParensResult.PARENS;
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1570
                    }
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  1571
                case UNDERSCORE:
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  1572
                case ASSERT:
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  1573
                case ENUM:
14725
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1574
                case IDENTIFIER:
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  1575
                    if (peekToken(lookahead, LAX_IDENTIFIER)) {
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  1576
                        // Identifier, Identifier/'_'/'assert'/'enum' -> explicit lambda
14725
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1577
                        return ParensResult.EXPLICIT_LAMBDA;
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1578
                    } else if (peekToken(lookahead, RPAREN, ARROW)) {
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1579
                        // Identifier, ')' '->' -> implicit lambda
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1580
                        return ParensResult.IMPLICIT_LAMBDA;
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1581
                    }
22004
203318f0799d 8029179: javac produces a compile error for valid boolean expressions
vromero
parents: 20609
diff changeset
  1582
                    type = false;
14725
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1583
                    break;
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1584
                case FINAL:
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1585
                case ELLIPSIS:
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1586
                    //those can only appear in explicit lambdas
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1587
                    return ParensResult.EXPLICIT_LAMBDA;
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1588
                case MONKEYS_AT:
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1589
                    type = true;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1590
                    lookahead += 1; //skip '@'
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1591
                    while (peekToken(lookahead, DOT)) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1592
                        lookahead += 2;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1593
                    }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1594
                    if (peekToken(lookahead, LPAREN)) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1595
                        lookahead++;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1596
                        //skip annotation values
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1597
                        int nesting = 0;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1598
                        for (; ; lookahead++) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1599
                            TokenKind tk2 = S.token(lookahead).kind;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1600
                            switch (tk2) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1601
                                case EOF:
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1602
                                    return ParensResult.PARENS;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1603
                                case LPAREN:
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1604
                                    nesting++;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1605
                                    break;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1606
                                case RPAREN:
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1607
                                    nesting--;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1608
                                    if (nesting == 0) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1609
                                        continue outer;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1610
                                    }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1611
                                break;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1612
                            }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1613
                        }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1614
                    }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1615
                    break;
14725
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1616
                case LBRACKET:
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  1617
                    if (peekToken(lookahead, RBRACKET, LAX_IDENTIFIER)) {
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  1618
                        // '[', ']', Identifier/'_'/'assert'/'enum' -> explicit lambda
14725
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1619
                        return ParensResult.EXPLICIT_LAMBDA;
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1620
                    } else if (peekToken(lookahead, RBRACKET, RPAREN) ||
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1621
                            peekToken(lookahead, RBRACKET, AMP)) {
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1622
                        // '[', ']', ')' -> cast
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1623
                        // '[', ']', '&' -> cast (intersection type)
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1624
                        return ParensResult.CAST;
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1625
                    } else if (peekToken(lookahead, RBRACKET)) {
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1626
                        //consume the ']' and skip
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1627
                        type = true;
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1628
                        lookahead++;
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1629
                        break;
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1630
                    } else {
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1631
                        return ParensResult.PARENS;
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1632
                    }
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1633
                case LT:
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1634
                    depth++; break;
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1635
                case GTGTGT:
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1636
                    depth--;
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1637
                case GTGT:
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1638
                    depth--;
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1639
                case GT:
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1640
                    depth--;
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1641
                    if (depth == 0) {
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1642
                        if (peekToken(lookahead, RPAREN) ||
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1643
                                peekToken(lookahead, AMP)) {
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1644
                            // '>', ')' -> cast
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1645
                            // '>', '&' -> cast
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1646
                            return ParensResult.CAST;
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  1647
                        } else if (peekToken(lookahead, LAX_IDENTIFIER, COMMA) ||
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  1648
                                peekToken(lookahead, LAX_IDENTIFIER, RPAREN, ARROW) ||
14725
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1649
                                peekToken(lookahead, ELLIPSIS)) {
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  1650
                            // '>', Identifier/'_'/'assert'/'enum', ',' -> explicit lambda
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  1651
                            // '>', Identifier/'_'/'assert'/'enum', ')', '->' -> explicit lambda
14725
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1652
                            // '>', '...' -> explicit lambda
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1653
                            return ParensResult.EXPLICIT_LAMBDA;
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1654
                        }
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1655
                        //it looks a type, but could still be (i) a cast to generic type,
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1656
                        //(ii) an unbound method reference or (iii) an explicit lambda
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1657
                        type = true;
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1658
                        break;
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1659
                    } else if (depth < 0) {
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1660
                        //unbalanced '<', '>' - not a generic type
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1661
                        return ParensResult.PARENS;
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1662
                    }
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1663
                    break;
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1664
                default:
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1665
                    //this includes EOF
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1666
                    return ParensResult.PARENS;
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1667
            }
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1668
        }
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1669
    }
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1670
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  1671
    /** Accepts all identifier-like tokens */
28147
72e7fdc79b78 8067384: Facilitate extension of the javac parser
rfield
parents: 27991
diff changeset
  1672
    protected Filter<TokenKind> LAX_IDENTIFIER = new Filter<TokenKind>() {
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  1673
        public boolean accepts(TokenKind t) {
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  1674
            return t == IDENTIFIER || t == UNDERSCORE || t == ASSERT || t == ENUM;
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  1675
        }
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  1676
    };
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  1677
14725
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1678
    enum ParensResult {
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1679
        CAST,
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1680
        EXPLICIT_LAMBDA,
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1681
        IMPLICIT_LAMBDA,
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22155
diff changeset
  1682
        PARENS
14725
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1683
    }
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  1684
11143
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1685
    JCExpression lambdaExpressionOrStatement(boolean hasParens, boolean explicitParams, int pos) {
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1686
        List<JCVariableDecl> params = explicitParams ?
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  1687
                formalParameters(true) :
11143
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1688
                implicitParameters(hasParens);
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1689
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1690
        return lambdaExpressionOrStatementRest(params, pos);
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1691
    }
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1692
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1693
    JCExpression lambdaExpressionOrStatementRest(List<JCVariableDecl> args, int pos) {
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1694
        checkLambda();
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1695
        accept(ARROW);
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1696
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1697
        return token.kind == LBRACE ?
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1698
            lambdaStatement(args, pos, pos) :
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1699
            lambdaExpression(args, pos);
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1700
    }
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1701
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1702
    JCExpression lambdaStatement(List<JCVariableDecl> args, int pos, int pos2) {
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1703
        JCBlock block = block(pos2, 0);
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1704
        return toP(F.at(pos).Lambda(args, block));
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1705
    }
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1706
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1707
    JCExpression lambdaExpression(List<JCVariableDecl> args, int pos) {
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1708
        JCTree expr = parseExpression();
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1709
        return toP(F.at(pos).Lambda(args, expr));
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1710
    }
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  1711
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1712
    /** SuperSuffix = Arguments | "." [TypeArguments] Ident [Arguments]
06bc494ca11e Initial load
duke
parents:
diff changeset
  1713
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1714
    JCExpression superSuffix(List<JCExpression> typeArgs, JCExpression t) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1715
        nextToken();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1716
        if (token.kind == LPAREN || typeArgs != null) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1717
            t = arguments(typeArgs, t);
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  1718
        } else if (token.kind == COLCOL) {
11144
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
  1719
            if (typeArgs != null) return illegal();
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
  1720
            t = memberReferenceSuffix(t);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1721
        } else {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1722
            int pos = token.pos;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1723
            accept(DOT);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1724
            typeArgs = (token.kind == LT) ? typeArguments(false) : null;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1725
            t = toP(F.at(pos).Select(t, ident()));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1726
            t = argumentsOpt(typeArgs, t);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1727
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1728
        return t;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1729
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1730
06bc494ca11e Initial load
duke
parents:
diff changeset
  1731
    /** BasicType = BYTE | SHORT | CHAR | INT | LONG | FLOAT | DOUBLE | BOOLEAN
06bc494ca11e Initial load
duke
parents:
diff changeset
  1732
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1733
    JCPrimitiveTypeTree basicType() {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1734
        JCPrimitiveTypeTree t = to(F.at(token.pos).TypeIdent(typetag(token.kind)));
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1735
        nextToken();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1736
        return t;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1737
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1738
06bc494ca11e Initial load
duke
parents:
diff changeset
  1739
    /** ArgumentsOpt = [ Arguments ]
06bc494ca11e Initial load
duke
parents:
diff changeset
  1740
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1741
    JCExpression argumentsOpt(List<JCExpression> typeArgs, JCExpression t) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1742
        if ((mode & EXPR) != 0 && token.kind == LPAREN || typeArgs != null) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1743
            mode = EXPR;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1744
            return arguments(typeArgs, t);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1745
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1746
            return t;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1747
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1748
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1749
06bc494ca11e Initial load
duke
parents:
diff changeset
  1750
    /** Arguments = "(" [Expression { COMMA Expression }] ")"
06bc494ca11e Initial load
duke
parents:
diff changeset
  1751
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1752
    List<JCExpression> arguments() {
20249
93f8eae31092 6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents: 19122
diff changeset
  1753
        ListBuffer<JCExpression> args = new ListBuffer<>();
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1754
        if (token.kind == LPAREN) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1755
            nextToken();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1756
            if (token.kind != RPAREN) {
1258
1cf37d8837d1 6724118: change JavaCompiler to not use Scanner directly
jjg
parents: 939
diff changeset
  1757
                args.append(parseExpression());
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1758
                while (token.kind == COMMA) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1759
                    nextToken();
1258
1cf37d8837d1 6724118: change JavaCompiler to not use Scanner directly
jjg
parents: 939
diff changeset
  1760
                    args.append(parseExpression());
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1761
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1762
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1763
            accept(RPAREN);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1764
        } else {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1765
            syntaxError(token.pos, "expected", LPAREN);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1766
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1767
        return args.toList();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1768
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1769
06bc494ca11e Initial load
duke
parents:
diff changeset
  1770
    JCMethodInvocation arguments(List<JCExpression> typeArgs, JCExpression t) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1771
        int pos = token.pos;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1772
        List<JCExpression> args = arguments();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1773
        return toP(F.at(pos).Apply(typeArgs, t, args));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1774
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1775
06bc494ca11e Initial load
duke
parents:
diff changeset
  1776
    /**  TypeArgumentsOpt = [ TypeArguments ]
06bc494ca11e Initial load
duke
parents:
diff changeset
  1777
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1778
    JCExpression typeArgumentsOpt(JCExpression t) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1779
        if (token.kind == LT &&
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1780
            (mode & TYPE) != 0 &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  1781
            (mode & NOPARAMS) == 0) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1782
            mode = TYPE;
9073
a29adf86aa0c 7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents: 8625
diff changeset
  1783
            return typeArguments(t, false);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1784
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1785
            return t;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1786
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1787
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1788
    List<JCExpression> typeArgumentsOpt() {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1789
        return typeArgumentsOpt(TYPE);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1790
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1791
06bc494ca11e Initial load
duke
parents:
diff changeset
  1792
    List<JCExpression> typeArgumentsOpt(int useMode) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1793
        if (token.kind == LT) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1794
            if ((mode & useMode) == 0 ||
06bc494ca11e Initial load
duke
parents:
diff changeset
  1795
                (mode & NOPARAMS) != 0) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1796
                illegal();
06bc494ca11e Initial load
duke
parents:
diff changeset
  1797
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1798
            mode = useMode;
9073
a29adf86aa0c 7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents: 8625
diff changeset
  1799
            return typeArguments(false);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1800
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1801
        return null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1802
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1803
13844
56339cf983a3 7177970: fix issues in langtools doc comments
jjg
parents: 13439
diff changeset
  1804
    /**
56339cf983a3 7177970: fix issues in langtools doc comments
jjg
parents: 13439
diff changeset
  1805
     *  {@literal
56339cf983a3 7177970: fix issues in langtools doc comments
jjg
parents: 13439
diff changeset
  1806
     *  TypeArguments  = "<" TypeArgument {"," TypeArgument} ">"
56339cf983a3 7177970: fix issues in langtools doc comments
jjg
parents: 13439
diff changeset
  1807
     *  }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1808
     */
9073
a29adf86aa0c 7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents: 8625
diff changeset
  1809
    List<JCExpression> typeArguments(boolean diamondAllowed) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1810
        if (token.kind == LT) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1811
            nextToken();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1812
            if (token.kind == GT && diamondAllowed) {
5321
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 5320
diff changeset
  1813
                checkDiamond();
9073
a29adf86aa0c 7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents: 8625
diff changeset
  1814
                mode |= DIAMOND;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1815
                nextToken();
5321
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 5320
diff changeset
  1816
                return List.nil();
9073
a29adf86aa0c 7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents: 8625
diff changeset
  1817
            } else {
20249
93f8eae31092 6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents: 19122
diff changeset
  1818
                ListBuffer<JCExpression> args = new ListBuffer<>();
1258
1cf37d8837d1 6724118: change JavaCompiler to not use Scanner directly
jjg
parents: 939
diff changeset
  1819
                args.append(((mode & EXPR) == 0) ? typeArgument() : parseType());
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1820
                while (token.kind == COMMA) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1821
                    nextToken();
9073
a29adf86aa0c 7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents: 8625
diff changeset
  1822
                    args.append(((mode & EXPR) == 0) ? typeArgument() : parseType());
a29adf86aa0c 7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents: 8625
diff changeset
  1823
                }
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1824
                switch (token.kind) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1825
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1826
                case GTGTGTEQ: case GTGTEQ: case GTEQ:
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1827
                case GTGTGT: case GTGT:
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1828
                    token = S.split();
9073
a29adf86aa0c 7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents: 8625
diff changeset
  1829
                    break;
10455
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
  1830
                case GT:
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1831
                    nextToken();
10455
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
  1832
                    break;
9073
a29adf86aa0c 7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents: 8625
diff changeset
  1833
                default:
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1834
                    args.append(syntaxError(token.pos, "expected", GT));
9073
a29adf86aa0c 7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents: 8625
diff changeset
  1835
                    break;
a29adf86aa0c 7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents: 8625
diff changeset
  1836
                }
a29adf86aa0c 7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents: 8625
diff changeset
  1837
                return args.toList();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1838
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1839
        } else {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1840
            return List.<JCExpression>of(syntaxError(token.pos, "expected", LT));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1841
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1842
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1843
13844
56339cf983a3 7177970: fix issues in langtools doc comments
jjg
parents: 13439
diff changeset
  1844
    /**
56339cf983a3 7177970: fix issues in langtools doc comments
jjg
parents: 13439
diff changeset
  1845
     *  {@literal
56339cf983a3 7177970: fix issues in langtools doc comments
jjg
parents: 13439
diff changeset
  1846
     *  TypeArgument = Type
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1847
     *               | [Annotations] "?"
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1848
     *               | [Annotations] "?" EXTENDS Type {"&" Type}
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1849
     *               | [Annotations] "?" SUPER Type
13844
56339cf983a3 7177970: fix issues in langtools doc comments
jjg
parents: 13439
diff changeset
  1850
     *  }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1851
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1852
    JCExpression typeArgument() {
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1853
        List<JCAnnotation> annotations = typeAnnotationsOpt();
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1854
        if (token.kind != QUES) return parseType(annotations);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1855
        int pos = token.pos;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1856
        nextToken();
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1857
        JCExpression result;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1858
        if (token.kind == EXTENDS) {
4870
a132763160d7 6919889: assorted position errors in compiler syntax trees
jjg
parents: 4704
diff changeset
  1859
            TypeBoundKind t = to(F.at(pos).TypeBoundKind(BoundKind.EXTENDS));
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1860
            nextToken();
4870
a132763160d7 6919889: assorted position errors in compiler syntax trees
jjg
parents: 4704
diff changeset
  1861
            JCExpression bound = parseType();
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1862
            result = F.at(pos).Wildcard(t, bound);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1863
        } else if (token.kind == SUPER) {
4870
a132763160d7 6919889: assorted position errors in compiler syntax trees
jjg
parents: 4704
diff changeset
  1864
            TypeBoundKind t = to(F.at(pos).TypeBoundKind(BoundKind.SUPER));
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1865
            nextToken();
4870
a132763160d7 6919889: assorted position errors in compiler syntax trees
jjg
parents: 4704
diff changeset
  1866
            JCExpression bound = parseType();
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1867
            result = F.at(pos).Wildcard(t, bound);
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  1868
        } else if (LAX_IDENTIFIER.accepts(token.kind)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1869
            //error recovery
06bc494ca11e Initial load
duke
parents:
diff changeset
  1870
            TypeBoundKind t = F.at(Position.NOPOS).TypeBoundKind(BoundKind.UNBOUND);
06bc494ca11e Initial load
duke
parents:
diff changeset
  1871
            JCExpression wc = toP(F.at(pos).Wildcard(t, null));
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1872
            JCIdent id = toP(F.at(token.pos).Ident(ident()));
10455
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
  1873
            JCErroneous err = F.at(pos).Erroneous(List.<JCTree>of(wc, id));
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
  1874
            reportSyntaxError(err, "expected3", GT, EXTENDS, SUPER);
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1875
            result = err;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1876
        } else {
4870
a132763160d7 6919889: assorted position errors in compiler syntax trees
jjg
parents: 4704
diff changeset
  1877
            TypeBoundKind t = toP(F.at(pos).TypeBoundKind(BoundKind.UNBOUND));
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1878
            result = toP(F.at(pos).Wildcard(t, null));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1879
        }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1880
        if (!annotations.isEmpty()) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1881
            result = toP(F.at(annotations.head.pos).AnnotatedType(annotations,result));
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1882
        }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1883
        return result;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1884
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1885
9073
a29adf86aa0c 7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents: 8625
diff changeset
  1886
    JCTypeApply typeArguments(JCExpression t, boolean diamondAllowed) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1887
        int pos = token.pos;
9073
a29adf86aa0c 7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents: 8625
diff changeset
  1888
        List<JCExpression> args = typeArguments(diamondAllowed);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1889
        return toP(F.at(pos).TypeApply(t, args));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1890
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1891
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1892
    /**
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1893
     * BracketsOpt = { [Annotations] "[" "]" }*
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1894
     *
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1895
     * <p>
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1896
     *
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1897
     * <code>annotations</code> is the list of annotations targeting
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1898
     * the expression <code>t</code>.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1899
     */
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1900
    private JCExpression bracketsOpt(JCExpression t,
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1901
            List<JCAnnotation> annotations) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1902
        List<JCAnnotation> nextLevelAnnotations = typeAnnotationsOpt();
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1903
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1904
        if (token.kind == LBRACKET) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1905
            int pos = token.pos;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1906
            nextToken();
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1907
            t = bracketsOptCont(t, pos, nextLevelAnnotations);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1908
        } else if (!nextLevelAnnotations.isEmpty()) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1909
            if (permitTypeAnnotationsPushBack) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1910
                this.typeAnnotationsPushedBack = nextLevelAnnotations;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1911
            } else {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1912
                return illegal(nextLevelAnnotations.head.pos);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1913
            }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1914
        }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1915
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1916
        if (!annotations.isEmpty()) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1917
            t = toP(F.at(token.pos).AnnotatedType(annotations, t));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1918
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1919
        return t;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1920
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1921
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1922
    /** BracketsOpt = [ "[" "]" { [Annotations] "[" "]"} ]
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1923
     */
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1924
    private JCExpression bracketsOpt(JCExpression t) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1925
        return bracketsOpt(t, List.<JCAnnotation>nil());
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1926
    }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1927
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1928
    private JCExpression bracketsOptCont(JCExpression t, int pos,
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1929
            List<JCAnnotation> annotations) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1930
        accept(RBRACKET);
7072
4863847e93a5 6987760: remove 308 support from JDK7
jjg
parents: 6716
diff changeset
  1931
        t = bracketsOpt(t);
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1932
        t = toP(F.at(pos).TypeArray(t));
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1933
        if (annotations.nonEmpty()) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1934
            t = toP(F.at(pos).AnnotatedType(annotations, t));
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1935
        }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1936
        return t;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1937
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1938
06bc494ca11e Initial load
duke
parents:
diff changeset
  1939
    /** BracketsSuffixExpr = "." CLASS
06bc494ca11e Initial load
duke
parents:
diff changeset
  1940
     *  BracketsSuffixType =
06bc494ca11e Initial load
duke
parents:
diff changeset
  1941
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  1942
    JCExpression bracketsSuffix(JCExpression t) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1943
        if ((mode & EXPR) != 0 && token.kind == DOT) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1944
            mode = EXPR;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1945
            int pos = token.pos;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1946
            nextToken();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1947
            accept(CLASS);
11055
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  1948
            if (token.pos == endPosTable.errorEndPos) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1949
                // error recovery
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1950
                Name name;
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  1951
                if (LAX_IDENTIFIER.accepts(token.kind)) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1952
                    name = token.name();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1953
                    nextToken();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1954
                } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1955
                    name = names.error;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1956
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1957
                t = F.at(pos).Erroneous(List.<JCTree>of(toP(F.at(pos).Select(t, name))));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1958
            } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  1959
                t = toP(F.at(pos).Select(t, names._class));
06bc494ca11e Initial load
duke
parents:
diff changeset
  1960
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1961
        } else if ((mode & TYPE) != 0) {
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  1962
            if (token.kind != COLCOL) {
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  1963
                mode = TYPE;
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  1964
            }
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  1965
        } else if (token.kind != COLCOL) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  1966
            syntaxError(token.pos, "dot.class.expected");
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  1967
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1968
        return t;
06bc494ca11e Initial load
duke
parents:
diff changeset
  1969
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  1970
11144
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
  1971
    /**
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  1972
     * MemberReferenceSuffix = "::" [TypeArguments] Ident
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  1973
     *                       | "::" [TypeArguments] "new"
11144
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
  1974
     */
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
  1975
    JCExpression memberReferenceSuffix(JCExpression t) {
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
  1976
        int pos1 = token.pos;
14062
b7439971a094 7177386: Add attribution support for method references
mcimadamore
parents: 14058
diff changeset
  1977
        accept(COLCOL);
11144
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
  1978
        return memberReferenceSuffix(pos1, t);
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
  1979
    }
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
  1980
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
  1981
    JCExpression memberReferenceSuffix(int pos1, JCExpression t) {
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
  1982
        checkMethodReferences();
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
  1983
        mode = EXPR;
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
  1984
        List<JCExpression> typeArgs = null;
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
  1985
        if (token.kind == LT) {
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
  1986
            typeArgs = typeArguments(false);
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
  1987
        }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1988
        Name refName;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  1989
        ReferenceMode refMode;
11144
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
  1990
        if (token.kind == NEW) {
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
  1991
            refMode = ReferenceMode.NEW;
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
  1992
            refName = names.init;
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
  1993
            nextToken();
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
  1994
        } else {
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
  1995
            refMode = ReferenceMode.INVOKE;
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
  1996
            refName = ident();
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
  1997
        }
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
  1998
        return toP(F.at(t.getStartPosition()).Reference(refMode, refName, t, typeArgs));
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
  1999
    }
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
  2000
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2001
    /** Creator = [Annotations] Qualident [TypeArguments] ( ArrayCreatorRest | ClassCreatorRest )
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2002
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2003
    JCExpression creator(int newpos, List<JCExpression> typeArgs) {
23800
f7ffcfe938f2 8035890: jdk8 javac -source 7 compiles test case it should not
jlahoda
parents: 23133
diff changeset
  2004
        List<JCAnnotation> newAnnotations = typeAnnotationsOpt();
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2005
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2006
        switch (token.kind) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2007
        case BYTE: case SHORT: case CHAR: case INT: case LONG: case FLOAT:
06bc494ca11e Initial load
duke
parents:
diff changeset
  2008
        case DOUBLE: case BOOLEAN:
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2009
            if (typeArgs == null) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2010
                if (newAnnotations.isEmpty()) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2011
                    return arrayCreatorRest(newpos, basicType());
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2012
                } else {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2013
                    return arrayCreatorRest(newpos, toP(F.at(newAnnotations.head.pos).AnnotatedType(newAnnotations, basicType())));
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2014
                }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2015
            }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2016
            break;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2017
        default:
06bc494ca11e Initial load
duke
parents:
diff changeset
  2018
        }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2019
        JCExpression t = qualident(true);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2020
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2021
        int oldmode = mode;
9073
a29adf86aa0c 7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents: 8625
diff changeset
  2022
        mode = TYPE;
a29adf86aa0c 7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents: 8625
diff changeset
  2023
        boolean diamondFound = false;
10199
48bd09ecc88a 7057297: Project Coin: diamond erroneously accepts in array initializer expressions
mcimadamore
parents: 9300
diff changeset
  2024
        int lastTypeargsPos = -1;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2025
        if (token.kind == LT) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2026
            lastTypeargsPos = token.pos;
9073
a29adf86aa0c 7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents: 8625
diff changeset
  2027
            t = typeArguments(t, true);
a29adf86aa0c 7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents: 8625
diff changeset
  2028
            diamondFound = (mode & DIAMOND) != 0;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2029
        }
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2030
        while (token.kind == DOT) {
9073
a29adf86aa0c 7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents: 8625
diff changeset
  2031
            if (diamondFound) {
a29adf86aa0c 7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents: 8625
diff changeset
  2032
                //cannot select after a diamond
10455
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
  2033
                illegal();
9073
a29adf86aa0c 7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents: 8625
diff changeset
  2034
            }
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2035
            int pos = token.pos;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2036
            nextToken();
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2037
            List<JCAnnotation> tyannos = typeAnnotationsOpt();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2038
            t = toP(F.at(pos).Select(t, ident()));
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2039
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2040
            if (tyannos != null && tyannos.nonEmpty()) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2041
                t = toP(F.at(tyannos.head.pos).AnnotatedType(tyannos, t));
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2042
            }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2043
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2044
            if (token.kind == LT) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2045
                lastTypeargsPos = token.pos;
9073
a29adf86aa0c 7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents: 8625
diff changeset
  2046
                t = typeArguments(t, true);
a29adf86aa0c 7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents: 8625
diff changeset
  2047
                diamondFound = (mode & DIAMOND) != 0;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2048
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2049
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2050
        mode = oldmode;
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2051
        if (token.kind == LBRACKET || token.kind == MONKEYS_AT) {
17578
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  2052
            // handle type annotations for non primitive arrays
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  2053
            if (newAnnotations.nonEmpty()) {
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  2054
                t = insertAnnotationsToMostInner(t, newAnnotations, false);
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  2055
            }
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  2056
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2057
            JCExpression e = arrayCreatorRest(newpos, t);
10199
48bd09ecc88a 7057297: Project Coin: diamond erroneously accepts in array initializer expressions
mcimadamore
parents: 9300
diff changeset
  2058
            if (diamondFound) {
48bd09ecc88a 7057297: Project Coin: diamond erroneously accepts in array initializer expressions
mcimadamore
parents: 9300
diff changeset
  2059
                reportSyntaxError(lastTypeargsPos, "cannot.create.array.with.diamond");
48bd09ecc88a 7057297: Project Coin: diamond erroneously accepts in array initializer expressions
mcimadamore
parents: 9300
diff changeset
  2060
                return toP(F.at(newpos).Erroneous(List.of(e)));
48bd09ecc88a 7057297: Project Coin: diamond erroneously accepts in array initializer expressions
mcimadamore
parents: 9300
diff changeset
  2061
            }
48bd09ecc88a 7057297: Project Coin: diamond erroneously accepts in array initializer expressions
mcimadamore
parents: 9300
diff changeset
  2062
            else if (typeArgs != null) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2063
                int pos = newpos;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2064
                if (!typeArgs.isEmpty() && typeArgs.head.pos != Position.NOPOS) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2065
                    // note: this should always happen but we should
06bc494ca11e Initial load
duke
parents:
diff changeset
  2066
                    // not rely on this as the parser is continuously
06bc494ca11e Initial load
duke
parents:
diff changeset
  2067
                    // modified to improve error recovery.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2068
                    pos = typeArgs.head.pos;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2069
                }
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2070
                setErrorEndPos(S.prevToken().endPos);
10455
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
  2071
                JCErroneous err = F.at(pos).Erroneous(typeArgs.prepend(e));
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
  2072
                reportSyntaxError(err, "cannot.create.array.with.type.arguments");
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
  2073
                return toP(err);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2074
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2075
            return e;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2076
        } else if (token.kind == LPAREN) {
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2077
            JCNewClass newClass = classCreatorRest(newpos, null, typeArgs, t);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2078
            if (newClass.def != null) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2079
                assert newClass.def.mods.annotations.isEmpty();
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2080
                if (newAnnotations.nonEmpty()) {
17578
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  2081
                    // Add type and declaration annotations to the new class;
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  2082
                    // com.sun.tools.javac.code.TypeAnnotations.TypeAnnotationPositions.visitNewClass(JCNewClass)
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  2083
                    // will later remove all type annotations and only leave the
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  2084
                    // declaration annotations.
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2085
                    newClass.def.mods.pos = earlier(newClass.def.mods.pos, newAnnotations.head.pos);
17578
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  2086
                    newClass.def.mods.annotations = newAnnotations;
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  2087
                }
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  2088
            } else {
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  2089
                // handle type annotations for instantiations
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  2090
                if (newAnnotations.nonEmpty()) {
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  2091
                    t = insertAnnotationsToMostInner(t, newAnnotations, false);
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  2092
                    newClass.clazz = t;
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2093
                }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2094
            }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2095
            return newClass;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2096
        } else {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2097
            setErrorEndPos(token.pos);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2098
            reportSyntaxError(token.pos, "expected2", LPAREN, LBRACKET);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2099
            t = toP(F.at(newpos).NewClass(null, typeArgs, t, List.<JCExpression>nil(), null));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2100
            return toP(F.at(newpos).Erroneous(List.<JCTree>of(t)));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2101
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2102
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2103
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2104
    /** InnerCreator = [Annotations] Ident [TypeArguments] ClassCreatorRest
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2105
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2106
    JCExpression innerCreator(int newpos, List<JCExpression> typeArgs, JCExpression encl) {
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2107
        List<JCAnnotation> newAnnotations = typeAnnotationsOpt();
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2108
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2109
        JCExpression t = toP(F.at(token.pos).Ident(ident()));
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2110
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2111
        if (newAnnotations.nonEmpty()) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2112
            t = toP(F.at(newAnnotations.head.pos).AnnotatedType(newAnnotations, t));
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2113
        }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2114
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2115
        if (token.kind == LT) {
5321
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 5320
diff changeset
  2116
            int oldmode = mode;
9073
a29adf86aa0c 7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
mcimadamore
parents: 8625
diff changeset
  2117
            t = typeArguments(t, true);
5321
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 5320
diff changeset
  2118
            mode = oldmode;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2119
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2120
        return classCreatorRest(newpos, encl, typeArgs, t);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2121
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2122
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2123
    /** ArrayCreatorRest = [Annotations] "[" ( "]" BracketsOpt ArrayInitializer
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2124
     *                         | Expression "]" {[Annotations]  "[" Expression "]"} BracketsOpt )
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2125
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2126
    JCExpression arrayCreatorRest(int newpos, JCExpression elemtype) {
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2127
        List<JCAnnotation> annos = typeAnnotationsOpt();
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2128
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2129
        accept(LBRACKET);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2130
        if (token.kind == RBRACKET) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2131
            accept(RBRACKET);
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2132
            elemtype = bracketsOpt(elemtype, annos);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2133
            if (token.kind == LBRACE) {
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2134
                JCNewArray na = (JCNewArray)arrayInitializer(newpos, elemtype);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2135
                if (annos.nonEmpty()) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2136
                    // when an array initializer is present then
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2137
                    // the parsed annotations should target the
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2138
                    // new array tree
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2139
                    // bracketsOpt inserts the annotation in
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2140
                    // elemtype, and it needs to be corrected
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2141
                    //
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2142
                    JCAnnotatedType annotated = (JCAnnotatedType)elemtype;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2143
                    assert annotated.annotations == annos;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2144
                    na.annotations = annotated.annotations;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2145
                    na.elemtype = annotated.underlyingType;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2146
                }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2147
                return na;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2148
            } else {
10455
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
  2149
                JCExpression t = toP(F.at(newpos).NewArray(elemtype, List.<JCExpression>nil(), null));
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2150
                return syntaxError(token.pos, List.<JCTree>of(t), "array.dimension.missing");
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2151
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2152
        } else {
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22155
diff changeset
  2153
            ListBuffer<JCExpression> dims = new ListBuffer<>();
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2154
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2155
            // maintain array dimension type annotations
20249
93f8eae31092 6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents: 19122
diff changeset
  2156
            ListBuffer<List<JCAnnotation>> dimAnnotations = new ListBuffer<>();
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2157
            dimAnnotations.append(annos);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2158
1258
1cf37d8837d1 6724118: change JavaCompiler to not use Scanner directly
jjg
parents: 939
diff changeset
  2159
            dims.append(parseExpression());
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2160
            accept(RBRACKET);
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2161
            while (token.kind == LBRACKET
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2162
                    || token.kind == MONKEYS_AT) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2163
                List<JCAnnotation> maybeDimAnnos = typeAnnotationsOpt();
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2164
                int pos = token.pos;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2165
                nextToken();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2166
                if (token.kind == RBRACKET) {
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2167
                    elemtype = bracketsOptCont(elemtype, pos, maybeDimAnnos);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2168
                } else {
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2169
                    if (token.kind == RBRACKET) { // no dimension
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2170
                        elemtype = bracketsOptCont(elemtype, pos, maybeDimAnnos);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2171
                    } else {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2172
                        dimAnnotations.append(maybeDimAnnos);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2173
                        dims.append(parseExpression());
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2174
                        accept(RBRACKET);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2175
                    }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2176
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2177
            }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2178
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2179
            JCNewArray na = toP(F.at(newpos).NewArray(elemtype, dims.toList(), null));
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2180
            na.dimAnnotations = dimAnnotations.toList();
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2181
            return na;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2182
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2183
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2184
06bc494ca11e Initial load
duke
parents:
diff changeset
  2185
    /** ClassCreatorRest = Arguments [ClassBody]
06bc494ca11e Initial load
duke
parents:
diff changeset
  2186
     */
3149
0cd06d598d6f 6843077: JSR 308: Annotations on types
jjg
parents: 2723
diff changeset
  2187
    JCNewClass classCreatorRest(int newpos,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2188
                                  JCExpression encl,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2189
                                  List<JCExpression> typeArgs,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2190
                                  JCExpression t)
06bc494ca11e Initial load
duke
parents:
diff changeset
  2191
    {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2192
        List<JCExpression> args = arguments();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2193
        JCClassDecl body = null;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2194
        if (token.kind == LBRACE) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2195
            int pos = token.pos;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2196
            List<JCTree> defs = classOrInterfaceBody(names.empty, false);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2197
            JCModifiers mods = F.at(Position.NOPOS).Modifiers(0);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2198
            body = toP(F.at(pos).AnonymousClassDef(mods, defs));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2199
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2200
        return toP(F.at(newpos).NewClass(encl, typeArgs, t, args, body));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2201
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2202
06bc494ca11e Initial load
duke
parents:
diff changeset
  2203
    /** ArrayInitializer = "{" [VariableInitializer {"," VariableInitializer}] [","] "}"
06bc494ca11e Initial load
duke
parents:
diff changeset
  2204
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2205
    JCExpression arrayInitializer(int newpos, JCExpression t) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2206
        accept(LBRACE);
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22155
diff changeset
  2207
        ListBuffer<JCExpression> elems = new ListBuffer<>();
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2208
        if (token.kind == COMMA) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2209
            nextToken();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2210
        } else if (token.kind != RBRACE) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2211
            elems.append(variableInitializer());
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2212
            while (token.kind == COMMA) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2213
                nextToken();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2214
                if (token.kind == RBRACE) break;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2215
                elems.append(variableInitializer());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2216
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2217
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2218
        accept(RBRACE);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2219
        return toP(F.at(newpos).NewArray(t, List.<JCExpression>nil(), elems.toList()));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2220
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2221
06bc494ca11e Initial load
duke
parents:
diff changeset
  2222
    /** VariableInitializer = ArrayInitializer | Expression
06bc494ca11e Initial load
duke
parents:
diff changeset
  2223
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2224
    public JCExpression variableInitializer() {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2225
        return token.kind == LBRACE ? arrayInitializer(token.pos, null) : parseExpression();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2226
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2227
06bc494ca11e Initial load
duke
parents:
diff changeset
  2228
    /** ParExpression = "(" Expression ")"
06bc494ca11e Initial load
duke
parents:
diff changeset
  2229
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2230
    JCExpression parExpression() {
11055
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  2231
        int pos = token.pos;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2232
        accept(LPAREN);
1258
1cf37d8837d1 6724118: change JavaCompiler to not use Scanner directly
jjg
parents: 939
diff changeset
  2233
        JCExpression t = parseExpression();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2234
        accept(RPAREN);
11055
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  2235
        return toP(F.at(pos).Parens(t));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2236
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2237
06bc494ca11e Initial load
duke
parents:
diff changeset
  2238
    /** Block = "{" BlockStatements "}"
06bc494ca11e Initial load
duke
parents:
diff changeset
  2239
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2240
    JCBlock block(int pos, long flags) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2241
        accept(LBRACE);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2242
        List<JCStatement> stats = blockStatements();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2243
        JCBlock t = F.at(pos).Block(flags, stats);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2244
        while (token.kind == CASE || token.kind == DEFAULT) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2245
            syntaxError("orphaned", token.kind);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2246
            switchBlockStatementGroups();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2247
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2248
        // the Block node has a field "endpos" for first char of last token, which is
06bc494ca11e Initial load
duke
parents:
diff changeset
  2249
        // usually but not necessarily the last char of the last token.
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2250
        t.endpos = token.pos;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2251
        accept(RBRACE);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2252
        return toP(t);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2253
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2254
06bc494ca11e Initial load
duke
parents:
diff changeset
  2255
    public JCBlock block() {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2256
        return block(token.pos, 0);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2257
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2258
06bc494ca11e Initial load
duke
parents:
diff changeset
  2259
    /** BlockStatements = { BlockStatement }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2260
     *  BlockStatement  = LocalVariableDeclarationStatement
06bc494ca11e Initial load
duke
parents:
diff changeset
  2261
     *                  | ClassOrInterfaceOrEnumDeclaration
06bc494ca11e Initial load
duke
parents:
diff changeset
  2262
     *                  | [Ident ":"] Statement
06bc494ca11e Initial load
duke
parents:
diff changeset
  2263
     *  LocalVariableDeclarationStatement
06bc494ca11e Initial load
duke
parents:
diff changeset
  2264
     *                  = { FINAL | '@' Annotation } Type VariableDeclarators ";"
06bc494ca11e Initial load
duke
parents:
diff changeset
  2265
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2266
    @SuppressWarnings("fallthrough")
06bc494ca11e Initial load
duke
parents:
diff changeset
  2267
    List<JCStatement> blockStatements() {
12466
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2268
        //todo: skip to anchor on error(?)
23133
a58476887b3d 8031383: Error recovery in JavacParser could be improved
jlahoda
parents: 23131
diff changeset
  2269
        int lastErrPos = -1;
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22155
diff changeset
  2270
        ListBuffer<JCStatement> stats = new ListBuffer<>();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2271
        while (true) {
12466
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2272
            List<JCStatement> stat = blockStatement();
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2273
            if (stat.isEmpty()) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2274
                return stats.toList();
12466
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2275
            } else {
23133
a58476887b3d 8031383: Error recovery in JavacParser could be improved
jlahoda
parents: 23131
diff changeset
  2276
                // error recovery
a58476887b3d 8031383: Error recovery in JavacParser could be improved
jlahoda
parents: 23131
diff changeset
  2277
                if (token.pos == lastErrPos)
a58476887b3d 8031383: Error recovery in JavacParser could be improved
jlahoda
parents: 23131
diff changeset
  2278
                    return stats.toList();
12466
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2279
                if (token.pos <= endPosTable.errorEndPos) {
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2280
                    skip(false, true, true, true);
23133
a58476887b3d 8031383: Error recovery in JavacParser could be improved
jlahoda
parents: 23131
diff changeset
  2281
                    lastErrPos = token.pos;
12466
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2282
                }
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2283
                stats.addAll(stat);
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2284
            }
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2285
        }
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2286
    }
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2287
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2288
    /*
26993
513b2cae81c3 8057652: Request to improve error messages for labeled declarations
jlahoda
parents: 25874
diff changeset
  2289
     * Parse a Statement (JLS 14.5). As an enhancement to improve error recovery,
513b2cae81c3 8057652: Request to improve error messages for labeled declarations
jlahoda
parents: 25874
diff changeset
  2290
     * this method will also recognize variable and class declarations (which are
513b2cae81c3 8057652: Request to improve error messages for labeled declarations
jlahoda
parents: 25874
diff changeset
  2291
     * not legal for a Statement) by delegating the parsing to BlockStatement (JLS 14.2).
513b2cae81c3 8057652: Request to improve error messages for labeled declarations
jlahoda
parents: 25874
diff changeset
  2292
     * If any illegal declarations are found, they will be wrapped in an erroneous tree,
513b2cae81c3 8057652: Request to improve error messages for labeled declarations
jlahoda
parents: 25874
diff changeset
  2293
     * and an error will be produced by this method.
12466
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2294
     */
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2295
    JCStatement parseStatementAsBlock() {
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2296
        int pos = token.pos;
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2297
        List<JCStatement> stats = blockStatement();
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2298
        if (stats.isEmpty()) {
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2299
            JCErroneous e = F.at(pos).Erroneous();
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2300
            error(e, "illegal.start.of.stmt");
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2301
            return F.at(pos).Exec(e);
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2302
        } else {
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2303
            JCStatement first = stats.head;
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2304
            String error = null;
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2305
            switch (first.getTag()) {
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2306
            case CLASSDEF:
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2307
                error = "class.not.allowed";
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2308
                break;
12466
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2309
            case VARDEF:
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2310
                error = "variable.not.allowed";
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2311
                break;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2312
            }
12466
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2313
            if (error != null) {
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2314
                error(first, error);
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2315
                List<JCBlock> blist = List.of(F.at(first.pos).Block(0, stats));
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2316
                return toP(F.at(pos).Exec(F.at(first.pos).Erroneous(blist)));
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2317
            }
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2318
            return first;
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2319
        }
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2320
    }
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2321
26993
513b2cae81c3 8057652: Request to improve error messages for labeled declarations
jlahoda
parents: 25874
diff changeset
  2322
    /**This method parses a statement appearing inside a block.
513b2cae81c3 8057652: Request to improve error messages for labeled declarations
jlahoda
parents: 25874
diff changeset
  2323
     */
12466
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2324
    List<JCStatement> blockStatement() {
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2325
        //todo: skip to anchor on error(?)
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2326
        int pos = token.pos;
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2327
        switch (token.kind) {
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2328
        case RBRACE: case CASE: case DEFAULT: case EOF:
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2329
            return List.nil();
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2330
        case LBRACE: case IF: case FOR: case WHILE: case DO: case TRY:
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2331
        case SWITCH: case SYNCHRONIZED: case RETURN: case THROW: case BREAK:
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2332
        case CONTINUE: case SEMI: case ELSE: case FINALLY: case CATCH:
26993
513b2cae81c3 8057652: Request to improve error messages for labeled declarations
jlahoda
parents: 25874
diff changeset
  2333
        case ASSERT:
513b2cae81c3 8057652: Request to improve error messages for labeled declarations
jlahoda
parents: 25874
diff changeset
  2334
            return List.of(parseSimpleStatement());
12466
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2335
        case MONKEYS_AT:
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2336
        case FINAL: {
13077
16fb753bb5dc 7174143: encapsulate doc comment table
jjg
parents: 12715
diff changeset
  2337
            Comment dc = token.comment(CommentStyle.JAVADOC);
12466
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2338
            JCModifiers mods = modifiersOpt();
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2339
            if (token.kind == INTERFACE ||
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2340
                token.kind == CLASS ||
25445
603f0c93d5c9 8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents: 25274
diff changeset
  2341
                token.kind == ENUM) {
12466
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2342
                return List.of(classOrInterfaceOrEnumDeclaration(mods, dc));
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2343
            } else {
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2344
                JCExpression t = parseType();
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2345
                ListBuffer<JCStatement> stats =
22165
ec53c8946fc2 8030807: langtools should still build using jdk 7
vromero
parents: 22163
diff changeset
  2346
                        variableDeclarators(mods, t, new ListBuffer<JCStatement>());
12466
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2347
                // A "LocalVariableDeclarationStatement" subsumes the terminating semicolon
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2348
                accept(SEMI);
25274
a06a738fc6be 8041648: do while loop that misses ending semicolon has wrong end position
jlahoda
parents: 24069
diff changeset
  2349
                storeEnd(stats.last(), S.prevToken().endPos);
12466
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2350
                return stats.toList();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2351
            }
12466
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2352
        }
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2353
        case ABSTRACT: case STRICTFP: {
13077
16fb753bb5dc 7174143: encapsulate doc comment table
jjg
parents: 12715
diff changeset
  2354
            Comment dc = token.comment(CommentStyle.JAVADOC);
12466
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2355
            JCModifiers mods = modifiersOpt();
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2356
            return List.of(classOrInterfaceOrEnumDeclaration(mods, dc));
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2357
        }
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2358
        case INTERFACE:
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2359
        case CLASS:
13077
16fb753bb5dc 7174143: encapsulate doc comment table
jjg
parents: 12715
diff changeset
  2360
            Comment dc = token.comment(CommentStyle.JAVADOC);
12466
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2361
            return List.of(classOrInterfaceOrEnumDeclaration(modifiersOpt(), dc));
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2362
        case ENUM:
25445
603f0c93d5c9 8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents: 25274
diff changeset
  2363
            error(token.pos, "local.enum");
603f0c93d5c9 8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents: 25274
diff changeset
  2364
            dc = token.comment(CommentStyle.JAVADOC);
603f0c93d5c9 8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents: 25274
diff changeset
  2365
            return List.of(classOrInterfaceOrEnumDeclaration(modifiersOpt(), dc));
12466
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2366
        default:
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2367
            Token prevToken = token;
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2368
            JCExpression t = term(EXPR | TYPE);
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2369
            if (token.kind == COLON && t.hasTag(IDENT)) {
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2370
                nextToken();
26993
513b2cae81c3 8057652: Request to improve error messages for labeled declarations
jlahoda
parents: 25874
diff changeset
  2371
                JCStatement stat = parseStatementAsBlock();
12466
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2372
                return List.<JCStatement>of(F.at(pos).Labelled(prevToken.name(), stat));
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  2373
            } else if ((lastmode & TYPE) != 0 && LAX_IDENTIFIER.accepts(token.kind)) {
12466
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2374
                pos = token.pos;
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2375
                JCModifiers mods = F.at(Position.NOPOS).Modifiers(0);
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2376
                F.at(pos);
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2377
                ListBuffer<JCStatement> stats =
22165
ec53c8946fc2 8030807: langtools should still build using jdk 7
vromero
parents: 22163
diff changeset
  2378
                        variableDeclarators(mods, t, new ListBuffer<JCStatement>());
12466
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2379
                // A "LocalVariableDeclarationStatement" subsumes the terminating semicolon
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2380
                accept(SEMI);
25274
a06a738fc6be 8041648: do while loop that misses ending semicolon has wrong end position
jlahoda
parents: 24069
diff changeset
  2381
                storeEnd(stats.last(), S.prevToken().endPos);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2382
                return stats.toList();
12466
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2383
            } else {
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2384
                // This Exec is an "ExpressionStatement"; it subsumes the terminating semicolon
25274
a06a738fc6be 8041648: do while loop that misses ending semicolon has wrong end position
jlahoda
parents: 24069
diff changeset
  2385
                t = checkExprStat(t);
12466
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2386
                accept(SEMI);
25274
a06a738fc6be 8041648: do while loop that misses ending semicolon has wrong end position
jlahoda
parents: 24069
diff changeset
  2387
                JCExpressionStatement expr = toP(F.at(pos).Exec(t));
12466
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2388
                return List.<JCStatement>of(expr);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2389
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2390
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2391
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2392
06bc494ca11e Initial load
duke
parents:
diff changeset
  2393
    /** Statement =
06bc494ca11e Initial load
duke
parents:
diff changeset
  2394
     *       Block
06bc494ca11e Initial load
duke
parents:
diff changeset
  2395
     *     | IF ParExpression Statement [ELSE Statement]
06bc494ca11e Initial load
duke
parents:
diff changeset
  2396
     *     | FOR "(" ForInitOpt ";" [Expression] ";" ForUpdateOpt ")" Statement
06bc494ca11e Initial load
duke
parents:
diff changeset
  2397
     *     | FOR "(" FormalParameter : Expression ")" Statement
06bc494ca11e Initial load
duke
parents:
diff changeset
  2398
     *     | WHILE ParExpression Statement
06bc494ca11e Initial load
duke
parents:
diff changeset
  2399
     *     | DO Statement WHILE ParExpression ";"
06bc494ca11e Initial load
duke
parents:
diff changeset
  2400
     *     | TRY Block ( Catches | [Catches] FinallyPart )
8234
5050975e2df0 7014734: Project Coin: Allow optional trailing semicolon to terminate resources list in try-with-resources
darcy
parents: 8224
diff changeset
  2401
     *     | TRY "(" ResourceSpecification ";"opt ")" Block [Catches] [FinallyPart]
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2402
     *     | SWITCH ParExpression "{" SwitchBlockStatementGroups "}"
06bc494ca11e Initial load
duke
parents:
diff changeset
  2403
     *     | SYNCHRONIZED ParExpression Block
06bc494ca11e Initial load
duke
parents:
diff changeset
  2404
     *     | RETURN [Expression] ";"
06bc494ca11e Initial load
duke
parents:
diff changeset
  2405
     *     | THROW Expression ";"
06bc494ca11e Initial load
duke
parents:
diff changeset
  2406
     *     | BREAK [Ident] ";"
06bc494ca11e Initial load
duke
parents:
diff changeset
  2407
     *     | CONTINUE [Ident] ";"
06bc494ca11e Initial load
duke
parents:
diff changeset
  2408
     *     | ASSERT Expression [ ":" Expression ] ";"
06bc494ca11e Initial load
duke
parents:
diff changeset
  2409
     *     | ";"
06bc494ca11e Initial load
duke
parents:
diff changeset
  2410
     */
28147
72e7fdc79b78 8067384: Facilitate extension of the javac parser
rfield
parents: 27991
diff changeset
  2411
    public JCStatement parseSimpleStatement() {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2412
        int pos = token.pos;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2413
        switch (token.kind) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2414
        case LBRACE:
06bc494ca11e Initial load
duke
parents:
diff changeset
  2415
            return block();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2416
        case IF: {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2417
            nextToken();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2418
            JCExpression cond = parExpression();
12466
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2419
            JCStatement thenpart = parseStatementAsBlock();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2420
            JCStatement elsepart = null;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2421
            if (token.kind == ELSE) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2422
                nextToken();
12466
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2423
                elsepart = parseStatementAsBlock();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2424
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2425
            return F.at(pos).If(cond, thenpart, elsepart);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2426
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2427
        case FOR: {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2428
            nextToken();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2429
            accept(LPAREN);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2430
            List<JCStatement> inits = token.kind == SEMI ? List.<JCStatement>nil() : forInit();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2431
            if (inits.length() == 1 &&
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  2432
                inits.head.hasTag(VARDEF) &&
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2433
                ((JCVariableDecl) inits.head).init == null &&
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2434
                token.kind == COLON) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2435
                JCVariableDecl var = (JCVariableDecl)inits.head;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2436
                accept(COLON);
1258
1cf37d8837d1 6724118: change JavaCompiler to not use Scanner directly
jjg
parents: 939
diff changeset
  2437
                JCExpression expr = parseExpression();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2438
                accept(RPAREN);
12466
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2439
                JCStatement body = parseStatementAsBlock();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2440
                return F.at(pos).ForeachLoop(var, expr, body);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2441
            } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2442
                accept(SEMI);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2443
                JCExpression cond = token.kind == SEMI ? null : parseExpression();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2444
                accept(SEMI);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2445
                List<JCExpressionStatement> steps = token.kind == RPAREN ? List.<JCExpressionStatement>nil() : forUpdate();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2446
                accept(RPAREN);
12466
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2447
                JCStatement body = parseStatementAsBlock();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2448
                return F.at(pos).ForLoop(inits, cond, steps, body);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2449
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2450
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2451
        case WHILE: {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2452
            nextToken();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2453
            JCExpression cond = parExpression();
12466
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2454
            JCStatement body = parseStatementAsBlock();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2455
            return F.at(pos).WhileLoop(cond, body);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2456
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2457
        case DO: {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2458
            nextToken();
12466
08863ee323df 7156633: (javac) incorrect errors when parsing variable declaration in block statements.
ksrini
parents: 12337
diff changeset
  2459
            JCStatement body = parseStatementAsBlock();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2460
            accept(WHILE);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2461
            JCExpression cond = parExpression();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2462
            accept(SEMI);
25274
a06a738fc6be 8041648: do while loop that misses ending semicolon has wrong end position
jlahoda
parents: 24069
diff changeset
  2463
            JCDoWhileLoop t = toP(F.at(pos).DoLoop(body, cond));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2464
            return t;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2465
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2466
        case TRY: {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2467
            nextToken();
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6146
diff changeset
  2468
            List<JCTree> resources = List.<JCTree>nil();
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2469
            if (token.kind == LPAREN) {
7211
163fe60f63de 6970016: Clean up ARM/try-with-resources implementation
mcimadamore
parents: 7076
diff changeset
  2470
                checkTryWithResources();
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2471
                nextToken();
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6146
diff changeset
  2472
                resources = resources();
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6146
diff changeset
  2473
                accept(RPAREN);
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6146
diff changeset
  2474
            }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2475
            JCBlock body = block();
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22155
diff changeset
  2476
            ListBuffer<JCCatch> catchers = new ListBuffer<>();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2477
            JCBlock finalizer = null;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2478
            if (token.kind == CATCH || token.kind == FINALLY) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2479
                while (token.kind == CATCH) catchers.append(catchClause());
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2480
                if (token.kind == FINALLY) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2481
                    nextToken();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2482
                    finalizer = block();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2483
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2484
            } else {
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6146
diff changeset
  2485
                if (allowTWR) {
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6146
diff changeset
  2486
                    if (resources.isEmpty())
7076
c96fa26247c8 6994946: option to specify only syntax errors as unrecoverable
jjg
parents: 7074
diff changeset
  2487
                        error(pos, "try.without.catch.finally.or.resource.decls");
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6146
diff changeset
  2488
                } else
7076
c96fa26247c8 6994946: option to specify only syntax errors as unrecoverable
jjg
parents: 7074
diff changeset
  2489
                    error(pos, "try.without.catch.or.finally");
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2490
            }
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6146
diff changeset
  2491
            return F.at(pos).Try(resources, body, catchers.toList(), finalizer);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2492
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2493
        case SWITCH: {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2494
            nextToken();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2495
            JCExpression selector = parExpression();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2496
            accept(LBRACE);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2497
            List<JCCase> cases = switchBlockStatementGroups();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2498
            JCSwitch t = to(F.at(pos).Switch(selector, cases));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2499
            accept(RBRACE);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2500
            return t;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2501
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2502
        case SYNCHRONIZED: {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2503
            nextToken();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2504
            JCExpression lock = parExpression();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2505
            JCBlock body = block();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2506
            return F.at(pos).Synchronized(lock, body);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2507
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2508
        case RETURN: {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2509
            nextToken();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2510
            JCExpression result = token.kind == SEMI ? null : parseExpression();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2511
            accept(SEMI);
25274
a06a738fc6be 8041648: do while loop that misses ending semicolon has wrong end position
jlahoda
parents: 24069
diff changeset
  2512
            JCReturn t = toP(F.at(pos).Return(result));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2513
            return t;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2514
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2515
        case THROW: {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2516
            nextToken();
1258
1cf37d8837d1 6724118: change JavaCompiler to not use Scanner directly
jjg
parents: 939
diff changeset
  2517
            JCExpression exc = parseExpression();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2518
            accept(SEMI);
25274
a06a738fc6be 8041648: do while loop that misses ending semicolon has wrong end position
jlahoda
parents: 24069
diff changeset
  2519
            JCThrow t = toP(F.at(pos).Throw(exc));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2520
            return t;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2521
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2522
        case BREAK: {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2523
            nextToken();
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  2524
            Name label = LAX_IDENTIFIER.accepts(token.kind) ? ident() : null;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2525
            accept(SEMI);
25274
a06a738fc6be 8041648: do while loop that misses ending semicolon has wrong end position
jlahoda
parents: 24069
diff changeset
  2526
            JCBreak t = toP(F.at(pos).Break(label));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2527
            return t;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2528
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2529
        case CONTINUE: {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2530
            nextToken();
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  2531
            Name label = LAX_IDENTIFIER.accepts(token.kind) ? ident() : null;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2532
            accept(SEMI);
25274
a06a738fc6be 8041648: do while loop that misses ending semicolon has wrong end position
jlahoda
parents: 24069
diff changeset
  2533
            JCContinue t =  toP(F.at(pos).Continue(label));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2534
            return t;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2535
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2536
        case SEMI:
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2537
            nextToken();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2538
            return toP(F.at(pos).Skip());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2539
        case ELSE:
14450
7a62c5b13d6e 8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents: 14359
diff changeset
  2540
            int elsePos = token.pos;
7a62c5b13d6e 8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents: 14359
diff changeset
  2541
            nextToken();
7a62c5b13d6e 8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents: 14359
diff changeset
  2542
            return doRecover(elsePos, BasicErrorRecoveryAction.BLOCK_STMT, "else.without.if");
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2543
        case FINALLY:
14450
7a62c5b13d6e 8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents: 14359
diff changeset
  2544
            int finallyPos = token.pos;
7a62c5b13d6e 8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents: 14359
diff changeset
  2545
            nextToken();
7a62c5b13d6e 8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents: 14359
diff changeset
  2546
            return doRecover(finallyPos, BasicErrorRecoveryAction.BLOCK_STMT, "finally.without.try");
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2547
        case CATCH:
14450
7a62c5b13d6e 8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents: 14359
diff changeset
  2548
            return doRecover(token.pos, BasicErrorRecoveryAction.CATCH_CLAUSE, "catch.without.try");
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2549
        case ASSERT: {
25445
603f0c93d5c9 8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents: 25274
diff changeset
  2550
            nextToken();
603f0c93d5c9 8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents: 25274
diff changeset
  2551
            JCExpression assertion = parseExpression();
603f0c93d5c9 8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents: 25274
diff changeset
  2552
            JCExpression message = null;
603f0c93d5c9 8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents: 25274
diff changeset
  2553
            if (token.kind == COLON) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2554
                nextToken();
25445
603f0c93d5c9 8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents: 25274
diff changeset
  2555
                message = parseExpression();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2556
            }
25445
603f0c93d5c9 8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents: 25274
diff changeset
  2557
            accept(SEMI);
603f0c93d5c9 8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents: 25274
diff changeset
  2558
            JCAssert t = toP(F.at(pos).Assert(assertion, message));
603f0c93d5c9 8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents: 25274
diff changeset
  2559
            return t;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2560
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2561
        default:
26993
513b2cae81c3 8057652: Request to improve error messages for labeled declarations
jlahoda
parents: 25874
diff changeset
  2562
            Assert.error();
513b2cae81c3 8057652: Request to improve error messages for labeled declarations
jlahoda
parents: 25874
diff changeset
  2563
            return null;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2564
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2565
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2566
26993
513b2cae81c3 8057652: Request to improve error messages for labeled declarations
jlahoda
parents: 25874
diff changeset
  2567
    @Override
513b2cae81c3 8057652: Request to improve error messages for labeled declarations
jlahoda
parents: 25874
diff changeset
  2568
    public JCStatement parseStatement() {
513b2cae81c3 8057652: Request to improve error messages for labeled declarations
jlahoda
parents: 25874
diff changeset
  2569
        return parseStatementAsBlock();
513b2cae81c3 8057652: Request to improve error messages for labeled declarations
jlahoda
parents: 25874
diff changeset
  2570
    }
513b2cae81c3 8057652: Request to improve error messages for labeled declarations
jlahoda
parents: 25874
diff changeset
  2571
14450
7a62c5b13d6e 8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents: 14359
diff changeset
  2572
    private JCStatement doRecover(int startPos, ErrorRecoveryAction action, String key) {
7a62c5b13d6e 8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents: 14359
diff changeset
  2573
        int errPos = S.errPos();
7a62c5b13d6e 8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents: 14359
diff changeset
  2574
        JCTree stm = action.doRecover(this);
7a62c5b13d6e 8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents: 14359
diff changeset
  2575
        S.errPos(errPos);
7a62c5b13d6e 8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents: 14359
diff changeset
  2576
        return toP(F.Exec(syntaxError(startPos, List.<JCTree>of(stm), key)));
7a62c5b13d6e 8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents: 14359
diff changeset
  2577
    }
7a62c5b13d6e 8000484: Bad error recovery when 'catch' without 'try' is found
vromero
parents: 14359
diff changeset
  2578
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2579
    /** CatchClause     = CATCH "(" FormalParameter ")" Block
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2580
     * TODO: the "FormalParameter" is not correct, it uses the special "catchTypes" rule below.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2581
     */
10455
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
  2582
    protected JCCatch catchClause() {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2583
        int pos = token.pos;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2584
        accept(CATCH);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2585
        accept(LPAREN);
5492
515e4b33b335 6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents: 5321
diff changeset
  2586
        JCModifiers mods = optFinal(Flags.PARAMETER);
515e4b33b335 6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents: 5321
diff changeset
  2587
        List<JCExpression> catchTypes = catchTypes();
515e4b33b335 6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents: 5321
diff changeset
  2588
        JCExpression paramType = catchTypes.size() > 1 ?
9300
c2de4dd9853b 7033809: Rename "disjunctive" to "union" in javax.lang.model
darcy
parents: 9073
diff changeset
  2589
                toP(F.at(catchTypes.head.getStartPosition()).TypeUnion(catchTypes)) :
5492
515e4b33b335 6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents: 5321
diff changeset
  2590
                catchTypes.head;
515e4b33b335 6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents: 5321
diff changeset
  2591
        JCVariableDecl formal = variableDeclaratorId(mods, paramType);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2592
        accept(RPAREN);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2593
        JCBlock body = block();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2594
        return F.at(pos).Catch(formal, body);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2595
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2596
5492
515e4b33b335 6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents: 5321
diff changeset
  2597
    List<JCExpression> catchTypes() {
20249
93f8eae31092 6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents: 19122
diff changeset
  2598
        ListBuffer<JCExpression> catchTypes = new ListBuffer<>();
5492
515e4b33b335 6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents: 5321
diff changeset
  2599
        catchTypes.add(parseType());
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2600
        while (token.kind == BAR) {
5492
515e4b33b335 6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents: 5321
diff changeset
  2601
            checkMulticatch();
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2602
            nextToken();
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2603
            // Instead of qualident this is now parseType.
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2604
            // But would that allow too much, e.g. arrays or generics?
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2605
            catchTypes.add(parseType());
5492
515e4b33b335 6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents: 5321
diff changeset
  2606
        }
515e4b33b335 6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents: 5321
diff changeset
  2607
        return catchTypes.toList();
515e4b33b335 6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents: 5321
diff changeset
  2608
    }
515e4b33b335 6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents: 5321
diff changeset
  2609
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2610
    /** SwitchBlockStatementGroups = { SwitchBlockStatementGroup }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2611
     *  SwitchBlockStatementGroup = SwitchLabel BlockStatements
06bc494ca11e Initial load
duke
parents:
diff changeset
  2612
     *  SwitchLabel = CASE ConstantExpression ":" | DEFAULT ":"
06bc494ca11e Initial load
duke
parents:
diff changeset
  2613
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2614
    List<JCCase> switchBlockStatementGroups() {
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22155
diff changeset
  2615
        ListBuffer<JCCase> cases = new ListBuffer<>();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2616
        while (true) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2617
            int pos = token.pos;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2618
            switch (token.kind) {
14056
0ea78d6e0b7b 7198582: (java) Minor refactor of JavacParser
ksrini
parents: 13844
diff changeset
  2619
            case CASE:
0ea78d6e0b7b 7198582: (java) Minor refactor of JavacParser
ksrini
parents: 13844
diff changeset
  2620
            case DEFAULT:
0ea78d6e0b7b 7198582: (java) Minor refactor of JavacParser
ksrini
parents: 13844
diff changeset
  2621
                cases.append(switchBlockStatementGroup());
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2622
                break;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2623
            case RBRACE: case EOF:
06bc494ca11e Initial load
duke
parents:
diff changeset
  2624
                return cases.toList();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2625
            default:
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2626
                nextToken(); // to ensure progress
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2627
                syntaxError(pos, "expected3",
939
38e24969c7e9 6717241: some diagnostic argument is prematurely converted into a String object
mcimadamore
parents: 735
diff changeset
  2628
                    CASE, DEFAULT, RBRACE);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2629
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2630
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2631
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2632
14056
0ea78d6e0b7b 7198582: (java) Minor refactor of JavacParser
ksrini
parents: 13844
diff changeset
  2633
    protected JCCase switchBlockStatementGroup() {
0ea78d6e0b7b 7198582: (java) Minor refactor of JavacParser
ksrini
parents: 13844
diff changeset
  2634
        int pos = token.pos;
0ea78d6e0b7b 7198582: (java) Minor refactor of JavacParser
ksrini
parents: 13844
diff changeset
  2635
        List<JCStatement> stats;
0ea78d6e0b7b 7198582: (java) Minor refactor of JavacParser
ksrini
parents: 13844
diff changeset
  2636
        JCCase c;
0ea78d6e0b7b 7198582: (java) Minor refactor of JavacParser
ksrini
parents: 13844
diff changeset
  2637
        switch (token.kind) {
0ea78d6e0b7b 7198582: (java) Minor refactor of JavacParser
ksrini
parents: 13844
diff changeset
  2638
        case CASE:
0ea78d6e0b7b 7198582: (java) Minor refactor of JavacParser
ksrini
parents: 13844
diff changeset
  2639
            nextToken();
0ea78d6e0b7b 7198582: (java) Minor refactor of JavacParser
ksrini
parents: 13844
diff changeset
  2640
            JCExpression pat = parseExpression();
0ea78d6e0b7b 7198582: (java) Minor refactor of JavacParser
ksrini
parents: 13844
diff changeset
  2641
            accept(COLON);
0ea78d6e0b7b 7198582: (java) Minor refactor of JavacParser
ksrini
parents: 13844
diff changeset
  2642
            stats = blockStatements();
0ea78d6e0b7b 7198582: (java) Minor refactor of JavacParser
ksrini
parents: 13844
diff changeset
  2643
            c = F.at(pos).Case(pat, stats);
0ea78d6e0b7b 7198582: (java) Minor refactor of JavacParser
ksrini
parents: 13844
diff changeset
  2644
            if (stats.isEmpty())
0ea78d6e0b7b 7198582: (java) Minor refactor of JavacParser
ksrini
parents: 13844
diff changeset
  2645
                storeEnd(c, S.prevToken().endPos);
0ea78d6e0b7b 7198582: (java) Minor refactor of JavacParser
ksrini
parents: 13844
diff changeset
  2646
            return c;
0ea78d6e0b7b 7198582: (java) Minor refactor of JavacParser
ksrini
parents: 13844
diff changeset
  2647
        case DEFAULT:
0ea78d6e0b7b 7198582: (java) Minor refactor of JavacParser
ksrini
parents: 13844
diff changeset
  2648
            nextToken();
0ea78d6e0b7b 7198582: (java) Minor refactor of JavacParser
ksrini
parents: 13844
diff changeset
  2649
            accept(COLON);
0ea78d6e0b7b 7198582: (java) Minor refactor of JavacParser
ksrini
parents: 13844
diff changeset
  2650
            stats = blockStatements();
0ea78d6e0b7b 7198582: (java) Minor refactor of JavacParser
ksrini
parents: 13844
diff changeset
  2651
            c = F.at(pos).Case(null, stats);
0ea78d6e0b7b 7198582: (java) Minor refactor of JavacParser
ksrini
parents: 13844
diff changeset
  2652
            if (stats.isEmpty())
0ea78d6e0b7b 7198582: (java) Minor refactor of JavacParser
ksrini
parents: 13844
diff changeset
  2653
                storeEnd(c, S.prevToken().endPos);
0ea78d6e0b7b 7198582: (java) Minor refactor of JavacParser
ksrini
parents: 13844
diff changeset
  2654
            return c;
0ea78d6e0b7b 7198582: (java) Minor refactor of JavacParser
ksrini
parents: 13844
diff changeset
  2655
        }
0ea78d6e0b7b 7198582: (java) Minor refactor of JavacParser
ksrini
parents: 13844
diff changeset
  2656
        throw new AssertionError("should not reach here");
0ea78d6e0b7b 7198582: (java) Minor refactor of JavacParser
ksrini
parents: 13844
diff changeset
  2657
    }
0ea78d6e0b7b 7198582: (java) Minor refactor of JavacParser
ksrini
parents: 13844
diff changeset
  2658
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2659
    /** MoreStatementExpressions = { COMMA StatementExpression }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2660
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2661
    <T extends ListBuffer<? super JCExpressionStatement>> T moreStatementExpressions(int pos,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2662
                                                                    JCExpression first,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2663
                                                                    T stats) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2664
        // This Exec is a "StatementExpression"; it subsumes no terminating token
06bc494ca11e Initial load
duke
parents:
diff changeset
  2665
        stats.append(toP(F.at(pos).Exec(checkExprStat(first))));
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2666
        while (token.kind == COMMA) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2667
            nextToken();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2668
            pos = token.pos;
1258
1cf37d8837d1 6724118: change JavaCompiler to not use Scanner directly
jjg
parents: 939
diff changeset
  2669
            JCExpression t = parseExpression();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2670
            // This Exec is a "StatementExpression"; it subsumes no terminating token
06bc494ca11e Initial load
duke
parents:
diff changeset
  2671
            stats.append(toP(F.at(pos).Exec(checkExprStat(t))));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2672
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2673
        return stats;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2674
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2675
06bc494ca11e Initial load
duke
parents:
diff changeset
  2676
    /** ForInit = StatementExpression MoreStatementExpressions
06bc494ca11e Initial load
duke
parents:
diff changeset
  2677
     *           |  { FINAL | '@' Annotation } Type VariableDeclarators
06bc494ca11e Initial load
duke
parents:
diff changeset
  2678
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2679
    List<JCStatement> forInit() {
20249
93f8eae31092 6386236: Please rename com.sun.tools.javac.util.ListBuffer.lb()
alundblad
parents: 19122
diff changeset
  2680
        ListBuffer<JCStatement> stats = new ListBuffer<>();
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2681
        int pos = token.pos;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2682
        if (token.kind == FINAL || token.kind == MONKEYS_AT) {
1258
1cf37d8837d1 6724118: change JavaCompiler to not use Scanner directly
jjg
parents: 939
diff changeset
  2683
            return variableDeclarators(optFinal(0), parseType(), stats).toList();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2684
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2685
            JCExpression t = term(EXPR | TYPE);
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  2686
            if ((lastmode & TYPE) != 0 && LAX_IDENTIFIER.accepts(token.kind)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2687
                return variableDeclarators(modifiersOpt(), t, stats).toList();
12715
139b8354de6a 7159445: (javac) emits inaccurate diagnostics for enhanced for-loops
ksrini
parents: 12466
diff changeset
  2688
            } else if ((lastmode & TYPE) != 0 && token.kind == COLON) {
139b8354de6a 7159445: (javac) emits inaccurate diagnostics for enhanced for-loops
ksrini
parents: 12466
diff changeset
  2689
                error(pos, "bad.initializer", "for-loop");
139b8354de6a 7159445: (javac) emits inaccurate diagnostics for enhanced for-loops
ksrini
parents: 12466
diff changeset
  2690
                return List.of((JCStatement)F.at(pos).VarDef(null, null, t, null));
139b8354de6a 7159445: (javac) emits inaccurate diagnostics for enhanced for-loops
ksrini
parents: 12466
diff changeset
  2691
            } else {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2692
                return moreStatementExpressions(pos, t, stats).toList();
12715
139b8354de6a 7159445: (javac) emits inaccurate diagnostics for enhanced for-loops
ksrini
parents: 12466
diff changeset
  2693
            }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2694
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2695
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2696
06bc494ca11e Initial load
duke
parents:
diff changeset
  2697
    /** ForUpdate = StatementExpression MoreStatementExpressions
06bc494ca11e Initial load
duke
parents:
diff changeset
  2698
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2699
    List<JCExpressionStatement> forUpdate() {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2700
        return moreStatementExpressions(token.pos,
1258
1cf37d8837d1 6724118: change JavaCompiler to not use Scanner directly
jjg
parents: 939
diff changeset
  2701
                                        parseExpression(),
22165
ec53c8946fc2 8030807: langtools should still build using jdk 7
vromero
parents: 22163
diff changeset
  2702
                                        new ListBuffer<JCExpressionStatement>()).toList();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2703
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2704
06bc494ca11e Initial load
duke
parents:
diff changeset
  2705
    /** AnnotationsOpt = { '@' Annotation }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2706
     *
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2707
     * @param kind Whether to parse an ANNOTATION or TYPE_ANNOTATION
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2708
     */
28147
72e7fdc79b78 8067384: Facilitate extension of the javac parser
rfield
parents: 27991
diff changeset
  2709
    protected List<JCAnnotation> annotationsOpt(Tag kind) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2710
        if (token.kind != MONKEYS_AT) return List.nil(); // optimization
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22155
diff changeset
  2711
        ListBuffer<JCAnnotation> buf = new ListBuffer<>();
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2712
        int prevmode = mode;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2713
        while (token.kind == MONKEYS_AT) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2714
            int pos = token.pos;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2715
            nextToken();
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2716
            buf.append(annotation(pos, kind));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2717
        }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2718
        lastmode = mode;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2719
        mode = prevmode;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2720
        List<JCAnnotation> annotations = buf.toList();
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2721
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2722
        return annotations;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2723
    }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2724
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2725
    List<JCAnnotation> typeAnnotationsOpt() {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2726
        List<JCAnnotation> annotations = annotationsOpt(Tag.TYPE_ANNOTATION);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2727
        return annotations;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2728
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2729
06bc494ca11e Initial load
duke
parents:
diff changeset
  2730
    /** ModifiersOpt = { Modifier }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2731
     *  Modifier = PUBLIC | PROTECTED | PRIVATE | STATIC | ABSTRACT | FINAL
06bc494ca11e Initial load
duke
parents:
diff changeset
  2732
     *           | NATIVE | SYNCHRONIZED | TRANSIENT | VOLATILE | "@"
06bc494ca11e Initial load
duke
parents:
diff changeset
  2733
     *           | "@" Annotation
06bc494ca11e Initial load
duke
parents:
diff changeset
  2734
     */
28147
72e7fdc79b78 8067384: Facilitate extension of the javac parser
rfield
parents: 27991
diff changeset
  2735
    protected JCModifiers modifiersOpt() {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2736
        return modifiersOpt(null);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2737
    }
10455
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
  2738
    protected JCModifiers modifiersOpt(JCModifiers partial) {
4870
a132763160d7 6919889: assorted position errors in compiler syntax trees
jjg
parents: 4704
diff changeset
  2739
        long flags;
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22155
diff changeset
  2740
        ListBuffer<JCAnnotation> annotations = new ListBuffer<>();
4870
a132763160d7 6919889: assorted position errors in compiler syntax trees
jjg
parents: 4704
diff changeset
  2741
        int pos;
a132763160d7 6919889: assorted position errors in compiler syntax trees
jjg
parents: 4704
diff changeset
  2742
        if (partial == null) {
a132763160d7 6919889: assorted position errors in compiler syntax trees
jjg
parents: 4704
diff changeset
  2743
            flags = 0;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2744
            pos = token.pos;
4870
a132763160d7 6919889: assorted position errors in compiler syntax trees
jjg
parents: 4704
diff changeset
  2745
        } else {
a132763160d7 6919889: assorted position errors in compiler syntax trees
jjg
parents: 4704
diff changeset
  2746
            flags = partial.flags;
a132763160d7 6919889: assorted position errors in compiler syntax trees
jjg
parents: 4704
diff changeset
  2747
            annotations.appendList(partial.annotations);
a132763160d7 6919889: assorted position errors in compiler syntax trees
jjg
parents: 4704
diff changeset
  2748
            pos = partial.pos;
a132763160d7 6919889: assorted position errors in compiler syntax trees
jjg
parents: 4704
diff changeset
  2749
        }
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
  2750
        if (token.deprecatedFlag()) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2751
            flags |= Flags.DEPRECATED;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2752
        }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2753
        int lastPos;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2754
    loop:
06bc494ca11e Initial load
duke
parents:
diff changeset
  2755
        while (true) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2756
            long flag;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2757
            switch (token.kind) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2758
            case PRIVATE     : flag = Flags.PRIVATE; break;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2759
            case PROTECTED   : flag = Flags.PROTECTED; break;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2760
            case PUBLIC      : flag = Flags.PUBLIC; break;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2761
            case STATIC      : flag = Flags.STATIC; break;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2762
            case TRANSIENT   : flag = Flags.TRANSIENT; break;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2763
            case FINAL       : flag = Flags.FINAL; break;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2764
            case ABSTRACT    : flag = Flags.ABSTRACT; break;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2765
            case NATIVE      : flag = Flags.NATIVE; break;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2766
            case VOLATILE    : flag = Flags.VOLATILE; break;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2767
            case SYNCHRONIZED: flag = Flags.SYNCHRONIZED; break;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2768
            case STRICTFP    : flag = Flags.STRICTFP; break;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2769
            case MONKEYS_AT  : flag = Flags.ANNOTATION; break;
14267
6321fbe0cf50 7192245: Add parser support for default methods
mcimadamore
parents: 14263
diff changeset
  2770
            case DEFAULT     : checkDefaultMethods(); flag = Flags.DEFAULT; break;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2771
            case ERROR       : flag = 0; nextToken(); break;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2772
            default: break loop;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2773
            }
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2774
            if ((flags & flag) != 0) error(token.pos, "repeated.modifier");
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2775
            lastPos = token.pos;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2776
            nextToken();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2777
            if (flag == Flags.ANNOTATION) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2778
                if (token.kind != INTERFACE) {
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2779
                    JCAnnotation ann = annotation(lastPos, Tag.ANNOTATION);
4870
a132763160d7 6919889: assorted position errors in compiler syntax trees
jjg
parents: 4704
diff changeset
  2780
                    // 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
  2781
                    if (flags == 0 && annotations.isEmpty())
a132763160d7 6919889: assorted position errors in compiler syntax trees
jjg
parents: 4704
diff changeset
  2782
                        pos = ann.pos;
a132763160d7 6919889: assorted position errors in compiler syntax trees
jjg
parents: 4704
diff changeset
  2783
                    annotations.append(ann);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2784
                    flag = 0;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2785
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2786
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2787
            flags |= flag;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2788
        }
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2789
        switch (token.kind) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2790
        case ENUM: flags |= Flags.ENUM; break;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2791
        case INTERFACE: flags |= Flags.INTERFACE; break;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2792
        default: break;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2793
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2794
06bc494ca11e Initial load
duke
parents:
diff changeset
  2795
        /* A modifiers tree with no modifier tokens or annotations
06bc494ca11e Initial load
duke
parents:
diff changeset
  2796
         * has no text position. */
6152
111b884a19a7 6972327: JCTree.pos incorrect for annotations without modifiers and package
jjg
parents: 6148
diff changeset
  2797
        if ((flags & (Flags.ModifierFlags | Flags.ANNOTATION)) == 0 && annotations.isEmpty())
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2798
            pos = Position.NOPOS;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2799
06bc494ca11e Initial load
duke
parents:
diff changeset
  2800
        JCModifiers mods = F.at(pos).Modifiers(flags, annotations.toList());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2801
        if (pos != Position.NOPOS)
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2802
            storeEnd(mods, S.prevToken().endPos);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2803
        return mods;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2804
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2805
06bc494ca11e Initial load
duke
parents:
diff changeset
  2806
    /** Annotation              = "@" Qualident [ "(" AnnotationFieldValues ")" ]
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2807
     *
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2808
     * @param pos position of "@" token
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2809
     * @param kind Whether to parse an ANNOTATION or TYPE_ANNOTATION
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2810
     */
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2811
    JCAnnotation annotation(int pos, Tag kind) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2812
        // accept(AT); // AT consumed by caller
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2813
        if (kind == Tag.TYPE_ANNOTATION) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2814
            checkTypeAnnotations();
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2815
        }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2816
        JCTree ident = qualident(false);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2817
        List<JCExpression> fieldValues = annotationFieldValuesOpt();
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2818
        JCAnnotation ann;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2819
        if (kind == Tag.ANNOTATION) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2820
            ann = F.at(pos).Annotation(ident, fieldValues);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2821
        } else if (kind == Tag.TYPE_ANNOTATION) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2822
            ann = F.at(pos).TypeAnnotation(ident, fieldValues);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2823
        } else {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2824
            throw new AssertionError("Unhandled annotation kind: " + kind);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2825
        }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2826
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2827
        storeEnd(ann, S.prevToken().endPos);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2828
        return ann;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2829
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2830
06bc494ca11e Initial load
duke
parents:
diff changeset
  2831
    List<JCExpression> annotationFieldValuesOpt() {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2832
        return (token.kind == LPAREN) ? annotationFieldValues() : List.<JCExpression>nil();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2833
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2834
06bc494ca11e Initial load
duke
parents:
diff changeset
  2835
    /** AnnotationFieldValues   = "(" [ AnnotationFieldValue { "," AnnotationFieldValue } ] ")" */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2836
    List<JCExpression> annotationFieldValues() {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2837
        accept(LPAREN);
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22155
diff changeset
  2838
        ListBuffer<JCExpression> buf = new ListBuffer<>();
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2839
        if (token.kind != RPAREN) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2840
            buf.append(annotationFieldValue());
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2841
            while (token.kind == COMMA) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2842
                nextToken();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2843
                buf.append(annotationFieldValue());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2844
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2845
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2846
        accept(RPAREN);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2847
        return buf.toList();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2848
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2849
06bc494ca11e Initial load
duke
parents:
diff changeset
  2850
    /** AnnotationFieldValue    = AnnotationValue
06bc494ca11e Initial load
duke
parents:
diff changeset
  2851
     *                          | Identifier "=" AnnotationValue
06bc494ca11e Initial load
duke
parents:
diff changeset
  2852
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2853
    JCExpression annotationFieldValue() {
16296
22c10640a521 8007427: Annotation element as '_' gives compiler error instead of a warning
mcimadamore
parents: 15718
diff changeset
  2854
        if (LAX_IDENTIFIER.accepts(token.kind)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2855
            mode = EXPR;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2856
            JCExpression t1 = term1();
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  2857
            if (t1.hasTag(IDENT) && token.kind == EQ) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2858
                int pos = token.pos;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2859
                accept(EQ);
4870
a132763160d7 6919889: assorted position errors in compiler syntax trees
jjg
parents: 4704
diff changeset
  2860
                JCExpression v = annotationValue();
a132763160d7 6919889: assorted position errors in compiler syntax trees
jjg
parents: 4704
diff changeset
  2861
                return toP(F.at(pos).Assign(t1, v));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2862
            } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2863
                return t1;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2864
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2865
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2866
        return annotationValue();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2867
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2868
06bc494ca11e Initial load
duke
parents:
diff changeset
  2869
    /* AnnotationValue          = ConditionalExpression
06bc494ca11e Initial load
duke
parents:
diff changeset
  2870
     *                          | Annotation
3997
35250de1d4ea 6337964: should ignore last comma in annotation array
darcy
parents: 3894
diff changeset
  2871
     *                          | "{" [ AnnotationValue { "," AnnotationValue } ] [","] "}"
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2872
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2873
    JCExpression annotationValue() {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2874
        int pos;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2875
        switch (token.kind) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2876
        case MONKEYS_AT:
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2877
            pos = token.pos;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2878
            nextToken();
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  2879
            return annotation(pos, Tag.ANNOTATION);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2880
        case LBRACE:
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2881
            pos = token.pos;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2882
            accept(LBRACE);
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22155
diff changeset
  2883
            ListBuffer<JCExpression> buf = new ListBuffer<>();
18645
4623b7161e9f 8012722: Single comma in array initializer should parse
emc
parents: 17803
diff changeset
  2884
            if (token.kind == COMMA) {
4623b7161e9f 8012722: Single comma in array initializer should parse
emc
parents: 17803
diff changeset
  2885
                nextToken();
4623b7161e9f 8012722: Single comma in array initializer should parse
emc
parents: 17803
diff changeset
  2886
            } else if (token.kind != RBRACE) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2887
                buf.append(annotationValue());
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2888
                while (token.kind == COMMA) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2889
                    nextToken();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2890
                    if (token.kind == RBRACE) break;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2891
                    buf.append(annotationValue());
06bc494ca11e Initial load
duke
parents:
diff changeset
  2892
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2893
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2894
            accept(RBRACE);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2895
            return toP(F.at(pos).NewArray(null, List.<JCExpression>nil(), buf.toList()));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2896
        default:
06bc494ca11e Initial load
duke
parents:
diff changeset
  2897
            mode = EXPR;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2898
            return term1();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2899
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2900
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2901
06bc494ca11e Initial load
duke
parents:
diff changeset
  2902
    /** VariableDeclarators = VariableDeclarator { "," VariableDeclarator }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2903
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2904
    public <T extends ListBuffer<? super JCVariableDecl>> T variableDeclarators(JCModifiers mods,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2905
                                                                         JCExpression type,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2906
                                                                         T vdefs)
06bc494ca11e Initial load
duke
parents:
diff changeset
  2907
    {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2908
        return variableDeclaratorsRest(token.pos, mods, type, ident(), false, null, vdefs);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2909
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2910
06bc494ca11e Initial load
duke
parents:
diff changeset
  2911
    /** VariableDeclaratorsRest = VariableDeclaratorRest { "," VariableDeclarator }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2912
     *  ConstantDeclaratorsRest = ConstantDeclaratorRest { "," ConstantDeclarator }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2913
     *
06bc494ca11e Initial load
duke
parents:
diff changeset
  2914
     *  @param reqInit  Is an initializer always required?
06bc494ca11e Initial load
duke
parents:
diff changeset
  2915
     *  @param dc       The documentation comment for the variable declarations, or null.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2916
     */
28147
72e7fdc79b78 8067384: Facilitate extension of the javac parser
rfield
parents: 27991
diff changeset
  2917
    protected <T extends ListBuffer<? super JCVariableDecl>> T variableDeclaratorsRest(int pos,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2918
                                                                     JCModifiers mods,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2919
                                                                     JCExpression type,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2920
                                                                     Name name,
06bc494ca11e Initial load
duke
parents:
diff changeset
  2921
                                                                     boolean reqInit,
13077
16fb753bb5dc 7174143: encapsulate doc comment table
jjg
parents: 12715
diff changeset
  2922
                                                                     Comment dc,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2923
                                                                     T vdefs)
06bc494ca11e Initial load
duke
parents:
diff changeset
  2924
    {
06bc494ca11e Initial load
duke
parents:
diff changeset
  2925
        vdefs.append(variableDeclaratorRest(pos, mods, type, name, reqInit, dc));
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2926
        while (token.kind == COMMA) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2927
            // All but last of multiple declarators subsume a comma
14803
88347e495d34 8004504: ListBuffer could reuse List.nil() as the sentinel element
jlahoda
parents: 14725
diff changeset
  2928
            storeEnd((JCTree)vdefs.last(), token.endPos);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2929
            nextToken();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2930
            vdefs.append(variableDeclarator(mods, type, reqInit, dc));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2931
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2932
        return vdefs;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2933
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2934
06bc494ca11e Initial load
duke
parents:
diff changeset
  2935
    /** VariableDeclarator = Ident VariableDeclaratorRest
06bc494ca11e Initial load
duke
parents:
diff changeset
  2936
     *  ConstantDeclarator = Ident ConstantDeclaratorRest
06bc494ca11e Initial load
duke
parents:
diff changeset
  2937
     */
13077
16fb753bb5dc 7174143: encapsulate doc comment table
jjg
parents: 12715
diff changeset
  2938
    JCVariableDecl variableDeclarator(JCModifiers mods, JCExpression type, boolean reqInit, Comment dc) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2939
        return variableDeclaratorRest(token.pos, mods, type, ident(), reqInit, dc);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2940
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2941
06bc494ca11e Initial load
duke
parents:
diff changeset
  2942
    /** VariableDeclaratorRest = BracketsOpt ["=" VariableInitializer]
06bc494ca11e Initial load
duke
parents:
diff changeset
  2943
     *  ConstantDeclaratorRest = BracketsOpt "=" VariableInitializer
06bc494ca11e Initial load
duke
parents:
diff changeset
  2944
     *
06bc494ca11e Initial load
duke
parents:
diff changeset
  2945
     *  @param reqInit  Is an initializer always required?
06bc494ca11e Initial load
duke
parents:
diff changeset
  2946
     *  @param dc       The documentation comment for the variable declarations, or null.
06bc494ca11e Initial load
duke
parents:
diff changeset
  2947
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2948
    JCVariableDecl variableDeclaratorRest(int pos, JCModifiers mods, JCExpression type, Name name,
13077
16fb753bb5dc 7174143: encapsulate doc comment table
jjg
parents: 12715
diff changeset
  2949
                                  boolean reqInit, Comment dc) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2950
        type = bracketsOpt(type);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2951
        JCExpression init = null;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2952
        if (token.kind == EQ) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2953
            nextToken();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2954
            init = variableInitializer();
06bc494ca11e Initial load
duke
parents:
diff changeset
  2955
        }
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2956
        else if (reqInit) syntaxError(token.pos, "expected", EQ);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2957
        JCVariableDecl result =
06bc494ca11e Initial load
duke
parents:
diff changeset
  2958
            toP(F.at(pos).VarDef(mods, name, type, init));
06bc494ca11e Initial load
duke
parents:
diff changeset
  2959
        attach(result, dc);
06bc494ca11e Initial load
duke
parents:
diff changeset
  2960
        return result;
06bc494ca11e Initial load
duke
parents:
diff changeset
  2961
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  2962
06bc494ca11e Initial load
duke
parents:
diff changeset
  2963
    /** VariableDeclaratorId = Ident BracketsOpt
06bc494ca11e Initial load
duke
parents:
diff changeset
  2964
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  2965
    JCVariableDecl variableDeclaratorId(JCModifiers mods, JCExpression type) {
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  2966
        return variableDeclaratorId(mods, type, false);
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  2967
    }
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  2968
    //where
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  2969
    JCVariableDecl variableDeclaratorId(JCModifiers mods, JCExpression type, boolean lambdaParameter) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2970
        int pos = token.pos;
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  2971
        Name name;
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  2972
        if (lambdaParameter && token.kind == UNDERSCORE) {
20609
dce669916b62 8023679: Improve error message for '_' used as a lambda parameter name
vromero
parents: 20249
diff changeset
  2973
            log.error(pos, "underscore.as.identifier.in.lambda");
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  2974
            name = token.name();
20609
dce669916b62 8023679: Improve error message for '_' used as a lambda parameter name
vromero
parents: 20249
diff changeset
  2975
            nextToken();
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  2976
        } else {
17578
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  2977
            if (allowThisIdent) {
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  2978
                JCExpression pn = qualident(false);
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  2979
                if (pn.hasTag(Tag.IDENT) && ((JCIdent)pn).name != names._this) {
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  2980
                    name = ((JCIdent)pn).name;
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  2981
                } else {
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  2982
                    if ((mods.flags & Flags.VARARGS) != 0) {
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  2983
                        log.error(token.pos, "varargs.and.receiver");
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  2984
                    }
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  2985
                    if (token.kind == LBRACKET) {
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  2986
                        log.error(token.pos, "array.and.receiver");
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  2987
                    }
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  2988
                    return toP(F.at(pos).ReceiverVarDef(mods, pn, type));
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  2989
                }
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  2990
            } else {
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  2991
                name = ident();
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  2992
            }
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  2993
        }
8047
c7f08cdb5c3c 6569633: Varargs: parser error when varargs element type is an array
mcimadamore
parents: 8033
diff changeset
  2994
        if ((mods.flags & Flags.VARARGS) != 0 &&
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2995
                token.kind == LBRACKET) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  2996
            log.error(token.pos, "varargs.and.old.array.syntax");
8047
c7f08cdb5c3c 6569633: Varargs: parser error when varargs element type is an array
mcimadamore
parents: 8033
diff changeset
  2997
        }
c7f08cdb5c3c 6569633: Varargs: parser error when varargs element type is an array
mcimadamore
parents: 8033
diff changeset
  2998
        type = bracketsOpt(type);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  2999
        return toP(F.at(pos).VarDef(mods, name, type, null));
06bc494ca11e Initial load
duke
parents:
diff changeset
  3000
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3001
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6146
diff changeset
  3002
    /** Resources = Resource { ";" Resources }
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6146
diff changeset
  3003
     */
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6146
diff changeset
  3004
    List<JCTree> resources() {
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22155
diff changeset
  3005
        ListBuffer<JCTree> defs = new ListBuffer<>();
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6146
diff changeset
  3006
        defs.append(resource());
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3007
        while (token.kind == SEMI) {
8234
5050975e2df0 7014734: Project Coin: Allow optional trailing semicolon to terminate resources list in try-with-resources
darcy
parents: 8224
diff changeset
  3008
            // All but last of multiple declarators must subsume a semicolon
14803
88347e495d34 8004504: ListBuffer could reuse List.nil() as the sentinel element
jlahoda
parents: 14725
diff changeset
  3009
            storeEnd(defs.last(), token.endPos);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3010
            int semiColonPos = token.pos;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3011
            nextToken();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3012
            if (token.kind == RPAREN) { // Optional trailing semicolon
8224
8f18e1622660 7013420: Project Coin: remove general expression support from try-with-resources statement
darcy
parents: 8047
diff changeset
  3013
                                       // after last resource
8f18e1622660 7013420: Project Coin: remove general expression support from try-with-resources statement
darcy
parents: 8047
diff changeset
  3014
                break;
8f18e1622660 7013420: Project Coin: remove general expression support from try-with-resources statement
darcy
parents: 8047
diff changeset
  3015
            }
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6146
diff changeset
  3016
            defs.append(resource());
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6146
diff changeset
  3017
        }
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6146
diff changeset
  3018
        return defs.toList();
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6146
diff changeset
  3019
    }
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6146
diff changeset
  3020
27844
8b5d79870a2f 7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents: 26993
diff changeset
  3021
    /** Resource = VariableModifiersOpt Type VariableDeclaratorId "=" Expression
8b5d79870a2f 7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents: 26993
diff changeset
  3022
     *           | Expression
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6146
diff changeset
  3023
     */
10455
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
  3024
    protected JCTree resource() {
27844
8b5d79870a2f 7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents: 26993
diff changeset
  3025
        int startPos = token.pos;
8b5d79870a2f 7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents: 26993
diff changeset
  3026
        if (token.kind == FINAL || token.kind == MONKEYS_AT) {
8b5d79870a2f 7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents: 26993
diff changeset
  3027
            JCModifiers mods = optFinal(Flags.FINAL);
8b5d79870a2f 7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents: 26993
diff changeset
  3028
            JCExpression t = parseType();
8b5d79870a2f 7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents: 26993
diff changeset
  3029
            return variableDeclaratorRest(token.pos, mods, t, ident(), true, null);
8b5d79870a2f 7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents: 26993
diff changeset
  3030
        }
8b5d79870a2f 7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents: 26993
diff changeset
  3031
        JCExpression t = term(EXPR | TYPE);
8b5d79870a2f 7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents: 26993
diff changeset
  3032
        if ((lastmode & TYPE) != 0 && LAX_IDENTIFIER.accepts(token.kind)) {
8b5d79870a2f 7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents: 26993
diff changeset
  3033
            JCModifiers mods = toP(F.at(startPos).Modifiers(Flags.FINAL));
8b5d79870a2f 7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents: 26993
diff changeset
  3034
            return variableDeclaratorRest(token.pos, mods, t, ident(), true, null);
8b5d79870a2f 7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents: 26993
diff changeset
  3035
        } else {
8b5d79870a2f 7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents: 26993
diff changeset
  3036
            checkVariableInTryWithResources(startPos);
8b5d79870a2f 7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents: 26993
diff changeset
  3037
            if (!t.hasTag(IDENT) && !t.hasTag(SELECT)) {
8b5d79870a2f 7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents: 26993
diff changeset
  3038
                log.error(t.pos(), "try.with.resources.expr.needs.var");
8b5d79870a2f 7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents: 26993
diff changeset
  3039
            }
8b5d79870a2f 7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents: 26993
diff changeset
  3040
8b5d79870a2f 7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents: 26993
diff changeset
  3041
            return t;
8b5d79870a2f 7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents: 26993
diff changeset
  3042
        }
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6146
diff changeset
  3043
    }
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6146
diff changeset
  3044
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3045
    /** CompilationUnit = [ { "@" Annotation } PACKAGE Qualident ";"] {ImportDeclaration} {TypeDeclaration}
06bc494ca11e Initial load
duke
parents:
diff changeset
  3046
     */
1258
1cf37d8837d1 6724118: change JavaCompiler to not use Scanner directly
jjg
parents: 939
diff changeset
  3047
    public JCTree.JCCompilationUnit parseCompilationUnit() {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3048
        Token firstToken = token;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3049
        JCModifiers mods = null;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3050
        boolean consumedToplevelDoc = false;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3051
        boolean seenImport = false;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3052
        boolean seenPackage = false;
24069
dfb8f11542fc 8034245: Refactor TopLevel tree node.
pgovereau
parents: 24062
diff changeset
  3053
        ListBuffer<JCTree> defs = new ListBuffer<>();
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3054
        if (token.kind == MONKEYS_AT)
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3055
            mods = modifiersOpt();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3056
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3057
        if (token.kind == PACKAGE) {
24069
dfb8f11542fc 8034245: Refactor TopLevel tree node.
pgovereau
parents: 24062
diff changeset
  3058
            int packagePos = token.pos;
dfb8f11542fc 8034245: Refactor TopLevel tree node.
pgovereau
parents: 24062
diff changeset
  3059
            List<JCAnnotation> annotations = List.nil();
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3060
            seenPackage = true;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3061
            if (mods != null) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3062
                checkNoMods(mods.flags);
24069
dfb8f11542fc 8034245: Refactor TopLevel tree node.
pgovereau
parents: 24062
diff changeset
  3063
                annotations = mods.annotations;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3064
                mods = null;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3065
            }
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3066
            nextToken();
24069
dfb8f11542fc 8034245: Refactor TopLevel tree node.
pgovereau
parents: 24062
diff changeset
  3067
            JCExpression pid = qualident(false);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3068
            accept(SEMI);
24069
dfb8f11542fc 8034245: Refactor TopLevel tree node.
pgovereau
parents: 24062
diff changeset
  3069
            JCPackageDecl pd = F.at(packagePos).PackageDecl(annotations, pid);
dfb8f11542fc 8034245: Refactor TopLevel tree node.
pgovereau
parents: 24062
diff changeset
  3070
            attach(pd, firstToken.comment(CommentStyle.JAVADOC));
dfb8f11542fc 8034245: Refactor TopLevel tree node.
pgovereau
parents: 24062
diff changeset
  3071
            consumedToplevelDoc = true;
dfb8f11542fc 8034245: Refactor TopLevel tree node.
pgovereau
parents: 24062
diff changeset
  3072
            storeEnd(pd, token.pos);
dfb8f11542fc 8034245: Refactor TopLevel tree node.
pgovereau
parents: 24062
diff changeset
  3073
            defs.append(pd);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3074
        }
24069
dfb8f11542fc 8034245: Refactor TopLevel tree node.
pgovereau
parents: 24062
diff changeset
  3075
1258
1cf37d8837d1 6724118: change JavaCompiler to not use Scanner directly
jjg
parents: 939
diff changeset
  3076
        boolean checkForImports = true;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3077
        boolean firstTypeDecl = true;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3078
        while (token.kind != EOF) {
27989
0da3e8ddfdd5 8065753: javac crashing on a html-like file
jlahoda
parents: 27844
diff changeset
  3079
            if (token.pos <= endPosTable.errorEndPos) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3080
                // error recovery
06bc494ca11e Initial load
duke
parents:
diff changeset
  3081
                skip(checkForImports, false, false, false);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3082
                if (token.kind == EOF)
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3083
                    break;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3084
            }
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3085
            if (checkForImports && mods == null && token.kind == IMPORT) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3086
                seenImport = true;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3087
                defs.append(importDeclaration());
06bc494ca11e Initial load
duke
parents:
diff changeset
  3088
            } else {
13077
16fb753bb5dc 7174143: encapsulate doc comment table
jjg
parents: 12715
diff changeset
  3089
                Comment docComment = token.comment(CommentStyle.JAVADOC);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3090
                if (firstTypeDecl && !seenImport && !seenPackage) {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
  3091
                    docComment = firstToken.comment(CommentStyle.JAVADOC);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3092
                    consumedToplevelDoc = true;
6716
71df48777dd1 6877202: Elements.getDocComment() is not getting JavaDocComments
jjg
parents: 6585
diff changeset
  3093
                }
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3094
                JCTree def = typeDeclaration(mods, docComment);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3095
                if (def instanceof JCExpressionStatement)
06bc494ca11e Initial load
duke
parents:
diff changeset
  3096
                    def = ((JCExpressionStatement)def).expr;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3097
                defs.append(def);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3098
                if (def instanceof JCClassDecl)
06bc494ca11e Initial load
duke
parents:
diff changeset
  3099
                    checkForImports = false;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3100
                mods = null;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3101
                firstTypeDecl = false;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3102
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3103
        }
24069
dfb8f11542fc 8034245: Refactor TopLevel tree node.
pgovereau
parents: 24062
diff changeset
  3104
        JCTree.JCCompilationUnit toplevel = F.at(firstToken.pos).TopLevel(defs.toList());
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3105
        if (!consumedToplevelDoc)
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
  3106
            attach(toplevel, firstToken.comment(CommentStyle.JAVADOC));
14803
88347e495d34 8004504: ListBuffer could reuse List.nil() as the sentinel element
jlahoda
parents: 14725
diff changeset
  3107
        if (defs.isEmpty())
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3108
            storeEnd(toplevel, S.prevToken().endPos);
1258
1cf37d8837d1 6724118: change JavaCompiler to not use Scanner directly
jjg
parents: 939
diff changeset
  3109
        if (keepDocComments)
1cf37d8837d1 6724118: change JavaCompiler to not use Scanner directly
jjg
parents: 939
diff changeset
  3110
            toplevel.docComments = docComments;
1cf37d8837d1 6724118: change JavaCompiler to not use Scanner directly
jjg
parents: 939
diff changeset
  3111
        if (keepLineMap)
1cf37d8837d1 6724118: change JavaCompiler to not use Scanner directly
jjg
parents: 939
diff changeset
  3112
            toplevel.lineMap = S.getLineMap();
16811
fca5473a5823 8011677: EndPosTables should avoid hidden references to Parser
jjg
parents: 16296
diff changeset
  3113
        this.endPosTable.setParser(null); // remove reference to parser
11055
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  3114
        toplevel.endPositions = this.endPosTable;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3115
        return toplevel;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3116
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3117
06bc494ca11e Initial load
duke
parents:
diff changeset
  3118
    /** ImportDeclaration = IMPORT [ STATIC ] Ident { "." Ident } [ "." "*" ] ";"
06bc494ca11e Initial load
duke
parents:
diff changeset
  3119
     */
28147
72e7fdc79b78 8067384: Facilitate extension of the javac parser
rfield
parents: 27991
diff changeset
  3120
    protected JCTree importDeclaration() {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3121
        int pos = token.pos;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3122
        nextToken();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3123
        boolean importStatic = false;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3124
        if (token.kind == STATIC) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3125
            importStatic = true;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3126
            nextToken();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3127
        }
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3128
        JCExpression pid = toP(F.at(token.pos).Ident(ident()));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3129
        do {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3130
            int pos1 = token.pos;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3131
            accept(DOT);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3132
            if (token.kind == STAR) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3133
                pid = to(F.at(pos1).Select(pid, names.asterisk));
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3134
                nextToken();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3135
                break;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3136
            } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3137
                pid = toP(F.at(pos1).Select(pid, ident()));
06bc494ca11e Initial load
duke
parents:
diff changeset
  3138
            }
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3139
        } while (token.kind == DOT);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3140
        accept(SEMI);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3141
        return toP(F.at(pos).Import(pid, importStatic));
06bc494ca11e Initial load
duke
parents:
diff changeset
  3142
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3143
06bc494ca11e Initial load
duke
parents:
diff changeset
  3144
    /** TypeDeclaration = ClassOrInterfaceOrEnumDeclaration
06bc494ca11e Initial load
duke
parents:
diff changeset
  3145
     *                  | ";"
06bc494ca11e Initial load
duke
parents:
diff changeset
  3146
     */
13077
16fb753bb5dc 7174143: encapsulate doc comment table
jjg
parents: 12715
diff changeset
  3147
    JCTree typeDeclaration(JCModifiers mods, Comment docComment) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3148
        int pos = token.pos;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3149
        if (mods == null && token.kind == SEMI) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3150
            nextToken();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3151
            return toP(F.at(pos).Skip());
06bc494ca11e Initial load
duke
parents:
diff changeset
  3152
        } else {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3153
            return classOrInterfaceOrEnumDeclaration(modifiersOpt(mods), docComment);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3154
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3155
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3156
06bc494ca11e Initial load
duke
parents:
diff changeset
  3157
    /** ClassOrInterfaceOrEnumDeclaration = ModifiersOpt
06bc494ca11e Initial load
duke
parents:
diff changeset
  3158
     *           (ClassDeclaration | InterfaceDeclaration | EnumDeclaration)
06bc494ca11e Initial load
duke
parents:
diff changeset
  3159
     *  @param mods     Any modifiers starting the class or interface declaration
06bc494ca11e Initial load
duke
parents:
diff changeset
  3160
     *  @param dc       The documentation comment for the class, or null.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3161
     */
28147
72e7fdc79b78 8067384: Facilitate extension of the javac parser
rfield
parents: 27991
diff changeset
  3162
    protected JCStatement classOrInterfaceOrEnumDeclaration(JCModifiers mods, Comment dc) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3163
        if (token.kind == CLASS) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3164
            return classDeclaration(mods, dc);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3165
        } else if (token.kind == INTERFACE) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3166
            return interfaceDeclaration(mods, dc);
25445
603f0c93d5c9 8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents: 25274
diff changeset
  3167
        } else if (token.kind == ENUM) {
603f0c93d5c9 8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents: 25274
diff changeset
  3168
            return enumDeclaration(mods, dc);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3169
        } else {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3170
            int pos = token.pos;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3171
            List<JCTree> errs;
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  3172
            if (LAX_IDENTIFIER.accepts(token.kind)) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3173
                errs = List.<JCTree>of(mods, toP(F.at(pos).Ident(ident())));
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3174
                setErrorEndPos(token.pos);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3175
            } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3176
                errs = List.<JCTree>of(mods);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3177
            }
25445
603f0c93d5c9 8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents: 25274
diff changeset
  3178
            return toP(F.Exec(syntaxError(pos, errs, "expected3",
603f0c93d5c9 8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents: 25274
diff changeset
  3179
                                          CLASS, INTERFACE, ENUM)));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3180
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3181
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3182
06bc494ca11e Initial load
duke
parents:
diff changeset
  3183
    /** ClassDeclaration = CLASS Ident TypeParametersOpt [EXTENDS Type]
06bc494ca11e Initial load
duke
parents:
diff changeset
  3184
     *                     [IMPLEMENTS TypeList] ClassBody
06bc494ca11e Initial load
duke
parents:
diff changeset
  3185
     *  @param mods    The modifiers starting the class declaration
06bc494ca11e Initial load
duke
parents:
diff changeset
  3186
     *  @param dc       The documentation comment for the class, or null.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3187
     */
13077
16fb753bb5dc 7174143: encapsulate doc comment table
jjg
parents: 12715
diff changeset
  3188
    protected JCClassDecl classDeclaration(JCModifiers mods, Comment dc) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3189
        int pos = token.pos;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3190
        accept(CLASS);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3191
        Name name = ident();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3192
06bc494ca11e Initial load
duke
parents:
diff changeset
  3193
        List<JCTypeParameter> typarams = typeParametersOpt();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3194
8625
6b51ef804d49 6639645: Modeling type implementing missing interfaces
jjg
parents: 8234
diff changeset
  3195
        JCExpression extending = null;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3196
        if (token.kind == EXTENDS) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3197
            nextToken();
1258
1cf37d8837d1 6724118: change JavaCompiler to not use Scanner directly
jjg
parents: 939
diff changeset
  3198
            extending = parseType();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3199
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3200
        List<JCExpression> implementing = List.nil();
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3201
        if (token.kind == IMPLEMENTS) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3202
            nextToken();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3203
            implementing = typeList();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3204
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3205
        List<JCTree> defs = classOrInterfaceBody(name, false);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3206
        JCClassDecl result = toP(F.at(pos).ClassDef(
06bc494ca11e Initial load
duke
parents:
diff changeset
  3207
            mods, name, typarams, extending, implementing, defs));
06bc494ca11e Initial load
duke
parents:
diff changeset
  3208
        attach(result, dc);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3209
        return result;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3210
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3211
06bc494ca11e Initial load
duke
parents:
diff changeset
  3212
    /** InterfaceDeclaration = INTERFACE Ident TypeParametersOpt
06bc494ca11e Initial load
duke
parents:
diff changeset
  3213
     *                         [EXTENDS TypeList] InterfaceBody
06bc494ca11e Initial load
duke
parents:
diff changeset
  3214
     *  @param mods    The modifiers starting the interface declaration
06bc494ca11e Initial load
duke
parents:
diff changeset
  3215
     *  @param dc       The documentation comment for the interface, or null.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3216
     */
13077
16fb753bb5dc 7174143: encapsulate doc comment table
jjg
parents: 12715
diff changeset
  3217
    protected JCClassDecl interfaceDeclaration(JCModifiers mods, Comment dc) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3218
        int pos = token.pos;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3219
        accept(INTERFACE);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3220
        Name name = ident();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3221
06bc494ca11e Initial load
duke
parents:
diff changeset
  3222
        List<JCTypeParameter> typarams = typeParametersOpt();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3223
06bc494ca11e Initial load
duke
parents:
diff changeset
  3224
        List<JCExpression> extending = List.nil();
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3225
        if (token.kind == EXTENDS) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3226
            nextToken();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3227
            extending = typeList();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3228
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3229
        List<JCTree> defs = classOrInterfaceBody(name, true);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3230
        JCClassDecl result = toP(F.at(pos).ClassDef(
06bc494ca11e Initial load
duke
parents:
diff changeset
  3231
            mods, name, typarams, null, extending, defs));
06bc494ca11e Initial load
duke
parents:
diff changeset
  3232
        attach(result, dc);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3233
        return result;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3234
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3235
06bc494ca11e Initial load
duke
parents:
diff changeset
  3236
    /** EnumDeclaration = ENUM Ident [IMPLEMENTS TypeList] EnumBody
06bc494ca11e Initial load
duke
parents:
diff changeset
  3237
     *  @param mods    The modifiers starting the enum declaration
06bc494ca11e Initial load
duke
parents:
diff changeset
  3238
     *  @param dc       The documentation comment for the enum, or null.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3239
     */
13077
16fb753bb5dc 7174143: encapsulate doc comment table
jjg
parents: 12715
diff changeset
  3240
    protected JCClassDecl enumDeclaration(JCModifiers mods, Comment dc) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3241
        int pos = token.pos;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3242
        accept(ENUM);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3243
        Name name = ident();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3244
06bc494ca11e Initial load
duke
parents:
diff changeset
  3245
        List<JCExpression> implementing = List.nil();
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3246
        if (token.kind == IMPLEMENTS) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3247
            nextToken();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3248
            implementing = typeList();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3249
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3250
06bc494ca11e Initial load
duke
parents:
diff changeset
  3251
        List<JCTree> defs = enumBody(name);
4870
a132763160d7 6919889: assorted position errors in compiler syntax trees
jjg
parents: 4704
diff changeset
  3252
        mods.flags |= Flags.ENUM;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3253
        JCClassDecl result = toP(F.at(pos).
4870
a132763160d7 6919889: assorted position errors in compiler syntax trees
jjg
parents: 4704
diff changeset
  3254
            ClassDef(mods, name, List.<JCTypeParameter>nil(),
25445
603f0c93d5c9 8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents: 25274
diff changeset
  3255
                     null, implementing, defs));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3256
        attach(result, dc);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3257
        return result;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3258
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3259
06bc494ca11e Initial load
duke
parents:
diff changeset
  3260
    /** EnumBody = "{" { EnumeratorDeclarationList } [","]
06bc494ca11e Initial load
duke
parents:
diff changeset
  3261
     *                  [ ";" {ClassBodyDeclaration} ] "}"
06bc494ca11e Initial load
duke
parents:
diff changeset
  3262
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  3263
    List<JCTree> enumBody(Name enumName) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3264
        accept(LBRACE);
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22155
diff changeset
  3265
        ListBuffer<JCTree> defs = new ListBuffer<>();
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3266
        if (token.kind == COMMA) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3267
            nextToken();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3268
        } else if (token.kind != RBRACE && token.kind != SEMI) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3269
            defs.append(enumeratorDeclaration(enumName));
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3270
            while (token.kind == COMMA) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3271
                nextToken();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3272
                if (token.kind == RBRACE || token.kind == SEMI) break;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3273
                defs.append(enumeratorDeclaration(enumName));
06bc494ca11e Initial load
duke
parents:
diff changeset
  3274
            }
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3275
            if (token.kind != SEMI && token.kind != RBRACE) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3276
                defs.append(syntaxError(token.pos, "expected3",
939
38e24969c7e9 6717241: some diagnostic argument is prematurely converted into a String object
mcimadamore
parents: 735
diff changeset
  3277
                                COMMA, RBRACE, SEMI));
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3278
                nextToken();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3279
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3280
        }
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3281
        if (token.kind == SEMI) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3282
            nextToken();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3283
            while (token.kind != RBRACE && token.kind != EOF) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3284
                defs.appendList(classOrInterfaceBodyDeclaration(enumName,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3285
                                                                false));
11055
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  3286
                if (token.pos <= endPosTable.errorEndPos) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3287
                    // error recovery
06bc494ca11e Initial load
duke
parents:
diff changeset
  3288
                   skip(false, true, true, false);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3289
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3290
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3291
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3292
        accept(RBRACE);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3293
        return defs.toList();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3294
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3295
06bc494ca11e Initial load
duke
parents:
diff changeset
  3296
    /** EnumeratorDeclaration = AnnotationsOpt [TypeArguments] IDENTIFIER [ Arguments ] [ "{" ClassBody "}" ]
06bc494ca11e Initial load
duke
parents:
diff changeset
  3297
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  3298
    JCTree enumeratorDeclaration(Name enumName) {
13077
16fb753bb5dc 7174143: encapsulate doc comment table
jjg
parents: 12715
diff changeset
  3299
        Comment dc = token.comment(CommentStyle.JAVADOC);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3300
        int flags = Flags.PUBLIC|Flags.STATIC|Flags.FINAL|Flags.ENUM;
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
  3301
        if (token.deprecatedFlag()) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3302
            flags |= Flags.DEPRECATED;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3303
        }
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3304
        int pos = token.pos;
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3305
        List<JCAnnotation> annotations = annotationsOpt(Tag.ANNOTATION);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3306
        JCModifiers mods = F.at(annotations.isEmpty() ? Position.NOPOS : pos).Modifiers(flags, annotations);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3307
        List<JCExpression> typeArgs = typeArgumentsOpt();
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3308
        int identPos = token.pos;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3309
        Name name = ident();
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3310
        int createPos = token.pos;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3311
        List<JCExpression> args = (token.kind == LPAREN)
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3312
            ? arguments() : List.<JCExpression>nil();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3313
        JCClassDecl body = null;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3314
        if (token.kind == LBRACE) {
23803
98c4ebaddefc 8034044: Class.getModifiers() returns "static" for anonymous classes
igerasim
parents: 23800
diff changeset
  3315
            JCModifiers mods1 = F.at(Position.NOPOS).Modifiers(Flags.ENUM);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3316
            List<JCTree> defs = classOrInterfaceBody(names.empty, false);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3317
            body = toP(F.at(identPos).AnonymousClassDef(mods1, defs));
06bc494ca11e Initial load
duke
parents:
diff changeset
  3318
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3319
        if (args.isEmpty() && body == null)
4704
5206047418c2 6472751: SourcePositions.getStartPos returns incorrect value for enum constants
jjg
parents: 3997
diff changeset
  3320
            createPos = identPos;
5206047418c2 6472751: SourcePositions.getStartPos returns incorrect value for enum constants
jjg
parents: 3997
diff changeset
  3321
        JCIdent ident = F.at(identPos).Ident(enumName);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3322
        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
  3323
        if (createPos != identPos)
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3324
            storeEnd(create, S.prevToken().endPos);
4704
5206047418c2 6472751: SourcePositions.getStartPos returns incorrect value for enum constants
jjg
parents: 3997
diff changeset
  3325
        ident = F.at(identPos).Ident(enumName);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3326
        JCTree result = toP(F.at(pos).VarDef(mods, name, ident, create));
06bc494ca11e Initial load
duke
parents:
diff changeset
  3327
        attach(result, dc);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3328
        return result;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3329
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3330
06bc494ca11e Initial load
duke
parents:
diff changeset
  3331
    /** TypeList = Type {"," Type}
06bc494ca11e Initial load
duke
parents:
diff changeset
  3332
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  3333
    List<JCExpression> typeList() {
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22155
diff changeset
  3334
        ListBuffer<JCExpression> ts = new ListBuffer<>();
1258
1cf37d8837d1 6724118: change JavaCompiler to not use Scanner directly
jjg
parents: 939
diff changeset
  3335
        ts.append(parseType());
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3336
        while (token.kind == COMMA) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3337
            nextToken();
1258
1cf37d8837d1 6724118: change JavaCompiler to not use Scanner directly
jjg
parents: 939
diff changeset
  3338
            ts.append(parseType());
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3339
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3340
        return ts.toList();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3341
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3342
06bc494ca11e Initial load
duke
parents:
diff changeset
  3343
    /** ClassBody     = "{" {ClassBodyDeclaration} "}"
06bc494ca11e Initial load
duke
parents:
diff changeset
  3344
     *  InterfaceBody = "{" {InterfaceBodyDeclaration} "}"
06bc494ca11e Initial load
duke
parents:
diff changeset
  3345
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  3346
    List<JCTree> classOrInterfaceBody(Name className, boolean isInterface) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3347
        accept(LBRACE);
11055
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  3348
        if (token.pos <= endPosTable.errorEndPos) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3349
            // error recovery
06bc494ca11e Initial load
duke
parents:
diff changeset
  3350
            skip(false, true, false, false);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3351
            if (token.kind == LBRACE)
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3352
                nextToken();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3353
        }
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22155
diff changeset
  3354
        ListBuffer<JCTree> defs = new ListBuffer<>();
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3355
        while (token.kind != RBRACE && token.kind != EOF) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3356
            defs.appendList(classOrInterfaceBodyDeclaration(className, isInterface));
11055
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  3357
            if (token.pos <= endPosTable.errorEndPos) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3358
               // error recovery
06bc494ca11e Initial load
duke
parents:
diff changeset
  3359
               skip(false, true, true, false);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3360
           }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3361
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3362
        accept(RBRACE);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3363
        return defs.toList();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3364
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3365
06bc494ca11e Initial load
duke
parents:
diff changeset
  3366
    /** ClassBodyDeclaration =
06bc494ca11e Initial load
duke
parents:
diff changeset
  3367
     *      ";"
06bc494ca11e Initial load
duke
parents:
diff changeset
  3368
     *    | [STATIC] Block
06bc494ca11e Initial load
duke
parents:
diff changeset
  3369
     *    | ModifiersOpt
06bc494ca11e Initial load
duke
parents:
diff changeset
  3370
     *      ( Type Ident
06bc494ca11e Initial load
duke
parents:
diff changeset
  3371
     *        ( VariableDeclaratorsRest ";" | MethodDeclaratorRest )
24062
09047fd2a43e 8038788: javac behaves incorrectly for annotations after method type parameters in some cases
jlahoda
parents: 23803
diff changeset
  3372
     *      | VOID Ident VoidMethodDeclaratorRest
09047fd2a43e 8038788: javac behaves incorrectly for annotations after method type parameters in some cases
jlahoda
parents: 23803
diff changeset
  3373
     *      | TypeParameters [Annotations]
09047fd2a43e 8038788: javac behaves incorrectly for annotations after method type parameters in some cases
jlahoda
parents: 23803
diff changeset
  3374
     *        ( Type Ident MethodDeclaratorRest
09047fd2a43e 8038788: javac behaves incorrectly for annotations after method type parameters in some cases
jlahoda
parents: 23803
diff changeset
  3375
     *        | VOID Ident VoidMethodDeclaratorRest
09047fd2a43e 8038788: javac behaves incorrectly for annotations after method type parameters in some cases
jlahoda
parents: 23803
diff changeset
  3376
     *        )
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3377
     *      | Ident ConstructorDeclaratorRest
06bc494ca11e Initial load
duke
parents:
diff changeset
  3378
     *      | TypeParameters Ident ConstructorDeclaratorRest
06bc494ca11e Initial load
duke
parents:
diff changeset
  3379
     *      | ClassOrInterfaceOrEnumDeclaration
06bc494ca11e Initial load
duke
parents:
diff changeset
  3380
     *      )
06bc494ca11e Initial load
duke
parents:
diff changeset
  3381
     *  InterfaceBodyDeclaration =
06bc494ca11e Initial load
duke
parents:
diff changeset
  3382
     *      ";"
24062
09047fd2a43e 8038788: javac behaves incorrectly for annotations after method type parameters in some cases
jlahoda
parents: 23803
diff changeset
  3383
     *    | ModifiersOpt
09047fd2a43e 8038788: javac behaves incorrectly for annotations after method type parameters in some cases
jlahoda
parents: 23803
diff changeset
  3384
     *      ( Type Ident
09047fd2a43e 8038788: javac behaves incorrectly for annotations after method type parameters in some cases
jlahoda
parents: 23803
diff changeset
  3385
     *        ( ConstantDeclaratorsRest ";" | MethodDeclaratorRest )
09047fd2a43e 8038788: javac behaves incorrectly for annotations after method type parameters in some cases
jlahoda
parents: 23803
diff changeset
  3386
     *      | VOID Ident MethodDeclaratorRest
09047fd2a43e 8038788: javac behaves incorrectly for annotations after method type parameters in some cases
jlahoda
parents: 23803
diff changeset
  3387
     *      | TypeParameters [Annotations]
09047fd2a43e 8038788: javac behaves incorrectly for annotations after method type parameters in some cases
jlahoda
parents: 23803
diff changeset
  3388
     *        ( Type Ident MethodDeclaratorRest
09047fd2a43e 8038788: javac behaves incorrectly for annotations after method type parameters in some cases
jlahoda
parents: 23803
diff changeset
  3389
     *        | VOID Ident VoidMethodDeclaratorRest
09047fd2a43e 8038788: javac behaves incorrectly for annotations after method type parameters in some cases
jlahoda
parents: 23803
diff changeset
  3390
     *        )
09047fd2a43e 8038788: javac behaves incorrectly for annotations after method type parameters in some cases
jlahoda
parents: 23803
diff changeset
  3391
     *      | ClassOrInterfaceOrEnumDeclaration
09047fd2a43e 8038788: javac behaves incorrectly for annotations after method type parameters in some cases
jlahoda
parents: 23803
diff changeset
  3392
     *      )
09047fd2a43e 8038788: javac behaves incorrectly for annotations after method type parameters in some cases
jlahoda
parents: 23803
diff changeset
  3393
     *
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3394
     */
10455
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
  3395
    protected List<JCTree> classOrInterfaceBodyDeclaration(Name className, boolean isInterface) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3396
        if (token.kind == SEMI) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3397
            nextToken();
6585
189f53daed52 6921495: spurious semicolons in class def cause empty NOPOS blocks
jjg
parents: 6152
diff changeset
  3398
            return List.<JCTree>nil();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3399
        } else {
13077
16fb753bb5dc 7174143: encapsulate doc comment table
jjg
parents: 12715
diff changeset
  3400
            Comment dc = token.comment(CommentStyle.JAVADOC);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3401
            int pos = token.pos;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3402
            JCModifiers mods = modifiersOpt();
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3403
            if (token.kind == CLASS ||
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3404
                token.kind == INTERFACE ||
25445
603f0c93d5c9 8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents: 25274
diff changeset
  3405
                token.kind == ENUM) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3406
                return List.<JCTree>of(classOrInterfaceOrEnumDeclaration(mods, dc));
23133
a58476887b3d 8031383: Error recovery in JavacParser could be improved
jlahoda
parents: 23131
diff changeset
  3407
            } else if (token.kind == LBRACE &&
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3408
                       (mods.flags & Flags.StandardFlags & ~Flags.STATIC) == 0 &&
06bc494ca11e Initial load
duke
parents:
diff changeset
  3409
                       mods.annotations.isEmpty()) {
23133
a58476887b3d 8031383: Error recovery in JavacParser could be improved
jlahoda
parents: 23131
diff changeset
  3410
                if (isInterface) {
a58476887b3d 8031383: Error recovery in JavacParser could be improved
jlahoda
parents: 23131
diff changeset
  3411
                    error(token.pos, "initializer.not.allowed");
a58476887b3d 8031383: Error recovery in JavacParser could be improved
jlahoda
parents: 23131
diff changeset
  3412
                }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3413
                return List.<JCTree>of(block(pos, mods.flags));
06bc494ca11e Initial load
duke
parents:
diff changeset
  3414
            } else {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3415
                pos = token.pos;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3416
                List<JCTypeParameter> typarams = typeParametersOpt();
8033
13d9c18b8fa1 6993305: starting position of a method without modifiers and with type parameters is incorrect
jjg
parents: 8032
diff changeset
  3417
                // if there are type parameters but no modifiers, save the start
13d9c18b8fa1 6993305: starting position of a method without modifiers and with type parameters is incorrect
jjg
parents: 8032
diff changeset
  3418
                // position of the method in the modifiers.
13d9c18b8fa1 6993305: starting position of a method without modifiers and with type parameters is incorrect
jjg
parents: 8032
diff changeset
  3419
                if (typarams.nonEmpty() && mods.pos == Position.NOPOS) {
13d9c18b8fa1 6993305: starting position of a method without modifiers and with type parameters is incorrect
jjg
parents: 8032
diff changeset
  3420
                    mods.pos = pos;
13d9c18b8fa1 6993305: starting position of a method without modifiers and with type parameters is incorrect
jjg
parents: 8032
diff changeset
  3421
                    storeEnd(mods, pos);
13d9c18b8fa1 6993305: starting position of a method without modifiers and with type parameters is incorrect
jjg
parents: 8032
diff changeset
  3422
                }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3423
                List<JCAnnotation> annosAfterParams = annotationsOpt(Tag.ANNOTATION);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3424
24062
09047fd2a43e 8038788: javac behaves incorrectly for annotations after method type parameters in some cases
jlahoda
parents: 23803
diff changeset
  3425
                if (annosAfterParams.nonEmpty()) {
09047fd2a43e 8038788: javac behaves incorrectly for annotations after method type parameters in some cases
jlahoda
parents: 23803
diff changeset
  3426
                    checkAnnotationsAfterTypeParams(annosAfterParams.head.pos);
09047fd2a43e 8038788: javac behaves incorrectly for annotations after method type parameters in some cases
jlahoda
parents: 23803
diff changeset
  3427
                    mods.annotations = mods.annotations.appendList(annosAfterParams);
09047fd2a43e 8038788: javac behaves incorrectly for annotations after method type parameters in some cases
jlahoda
parents: 23803
diff changeset
  3428
                    if (mods.pos == Position.NOPOS)
09047fd2a43e 8038788: javac behaves incorrectly for annotations after method type parameters in some cases
jlahoda
parents: 23803
diff changeset
  3429
                        mods.pos = mods.annotations.head.pos;
09047fd2a43e 8038788: javac behaves incorrectly for annotations after method type parameters in some cases
jlahoda
parents: 23803
diff changeset
  3430
                }
09047fd2a43e 8038788: javac behaves incorrectly for annotations after method type parameters in some cases
jlahoda
parents: 23803
diff changeset
  3431
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3432
                Token tk = token;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3433
                pos = token.pos;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3434
                JCExpression type;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3435
                boolean isVoid = token.kind == VOID;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3436
                if (isVoid) {
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14267
diff changeset
  3437
                    type = to(F.at(pos).TypeIdent(TypeTag.VOID));
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3438
                    nextToken();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3439
                } else {
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3440
                    // method returns types are un-annotated types
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3441
                    type = unannotatedType();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3442
                }
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3443
                if (token.kind == LPAREN && !isInterface && type.hasTag(IDENT)) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3444
                    if (isInterface || tk.name() != className)
7076
c96fa26247c8 6994946: option to specify only syntax errors as unrecoverable
jjg
parents: 7074
diff changeset
  3445
                        error(pos, "invalid.meth.decl.ret.type.req");
24062
09047fd2a43e 8038788: javac behaves incorrectly for annotations after method type parameters in some cases
jlahoda
parents: 23803
diff changeset
  3446
                    else if (annosAfterParams.nonEmpty())
09047fd2a43e 8038788: javac behaves incorrectly for annotations after method type parameters in some cases
jlahoda
parents: 23803
diff changeset
  3447
                        illegal(annosAfterParams.head.pos);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3448
                    return List.of(methodDeclaratorRest(
06bc494ca11e Initial load
duke
parents:
diff changeset
  3449
                        pos, mods, null, names.init, typarams,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3450
                        isInterface, true, dc));
06bc494ca11e Initial load
duke
parents:
diff changeset
  3451
                } else {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3452
                    pos = token.pos;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3453
                    Name name = ident();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3454
                    if (token.kind == LPAREN) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3455
                        return List.of(methodDeclaratorRest(
06bc494ca11e Initial load
duke
parents:
diff changeset
  3456
                            pos, mods, type, name, typarams,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3457
                            isInterface, isVoid, dc));
06bc494ca11e Initial load
duke
parents:
diff changeset
  3458
                    } else if (!isVoid && typarams.isEmpty()) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3459
                        List<JCTree> defs =
06bc494ca11e Initial load
duke
parents:
diff changeset
  3460
                            variableDeclaratorsRest(pos, mods, type, name, isInterface, dc,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3461
                                                    new ListBuffer<JCTree>()).toList();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3462
                        accept(SEMI);
25274
a06a738fc6be 8041648: do while loop that misses ending semicolon has wrong end position
jlahoda
parents: 24069
diff changeset
  3463
                        storeEnd(defs.last(), S.prevToken().endPos);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3464
                        return defs;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3465
                    } else {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3466
                        pos = token.pos;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3467
                        List<JCTree> err = isVoid
06bc494ca11e Initial load
duke
parents:
diff changeset
  3468
                            ? List.<JCTree>of(toP(F.at(pos).MethodDef(mods, name, type, typarams,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3469
                                List.<JCVariableDecl>nil(), List.<JCExpression>nil(), null, null)))
06bc494ca11e Initial load
duke
parents:
diff changeset
  3470
                            : null;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3471
                        return List.<JCTree>of(syntaxError(token.pos, err, "expected", LPAREN));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3472
                    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3473
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3474
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3475
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3476
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3477
06bc494ca11e Initial load
duke
parents:
diff changeset
  3478
    /** MethodDeclaratorRest =
24062
09047fd2a43e 8038788: javac behaves incorrectly for annotations after method type parameters in some cases
jlahoda
parents: 23803
diff changeset
  3479
     *      FormalParameters BracketsOpt [THROWS TypeList] ( MethodBody | [DEFAULT AnnotationValue] ";")
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3480
     *  VoidMethodDeclaratorRest =
24062
09047fd2a43e 8038788: javac behaves incorrectly for annotations after method type parameters in some cases
jlahoda
parents: 23803
diff changeset
  3481
     *      FormalParameters [THROWS TypeList] ( MethodBody | ";")
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3482
     *  ConstructorDeclaratorRest =
7072
4863847e93a5 6987760: remove 308 support from JDK7
jjg
parents: 6716
diff changeset
  3483
     *      "(" FormalParameterListOpt ")" [THROWS TypeList] MethodBody
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3484
     */
11147
20770e90d993 7119032: (javac) increase visibility of JavacParser methods to improve subtyping
ksrini
parents: 11144
diff changeset
  3485
    protected JCTree methodDeclaratorRest(int pos,
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3486
                              JCModifiers mods,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3487
                              JCExpression type,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3488
                              Name name,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3489
                              List<JCTypeParameter> typarams,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3490
                              boolean isInterface, boolean isVoid,
13077
16fb753bb5dc 7174143: encapsulate doc comment table
jjg
parents: 12715
diff changeset
  3491
                              Comment dc) {
15377
515846bb6637 8005166: Add support for static interface methods
mcimadamore
parents: 15375
diff changeset
  3492
        if (isInterface && (mods.flags & Flags.STATIC) != 0) {
515846bb6637 8005166: Add support for static interface methods
mcimadamore
parents: 15375
diff changeset
  3493
            checkStaticInterfaceMethods();
515846bb6637 8005166: Add support for static interface methods
mcimadamore
parents: 15375
diff changeset
  3494
        }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3495
        JCVariableDecl prevReceiverParam = this.receiverParam;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3496
        try {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3497
            this.receiverParam = null;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3498
            // Parsing formalParameters sets the receiverParam, if present
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3499
            List<JCVariableDecl> params = formalParameters();
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3500
            if (!isVoid) type = bracketsOpt(type);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3501
            List<JCExpression> thrown = List.nil();
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3502
            if (token.kind == THROWS) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3503
                nextToken();
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3504
                thrown = qualidentList();
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3505
            }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3506
            JCBlock body = null;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3507
            JCExpression defaultValue;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3508
            if (token.kind == LBRACE) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3509
                body = block();
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3510
                defaultValue = null;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3511
            } else {
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3512
                if (token.kind == DEFAULT) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3513
                    accept(DEFAULT);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3514
                    defaultValue = annotationValue();
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3515
                } else {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3516
                    defaultValue = null;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3517
                }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3518
                accept(SEMI);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3519
                if (token.pos <= endPosTable.errorEndPos) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3520
                    // error recovery
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3521
                    skip(false, true, false, false);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3522
                    if (token.kind == LBRACE) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3523
                        body = block();
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3524
                    }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3525
                }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3526
            }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3527
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3528
            JCMethodDecl result =
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3529
                    toP(F.at(pos).MethodDef(mods, name, type, typarams,
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3530
                                            receiverParam, params, thrown,
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3531
                                            body, defaultValue));
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3532
            attach(result, dc);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3533
            return result;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3534
        } finally {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3535
            this.receiverParam = prevReceiverParam;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3536
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3537
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3538
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3539
    /** QualidentList = [Annotations] Qualident {"," [Annotations] Qualident}
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3540
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  3541
    List<JCExpression> qualidentList() {
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22155
diff changeset
  3542
        ListBuffer<JCExpression> ts = new ListBuffer<>();
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3543
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3544
        List<JCAnnotation> typeAnnos = typeAnnotationsOpt();
17578
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  3545
        JCExpression qi = qualident(true);
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  3546
        if (!typeAnnos.isEmpty()) {
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  3547
            JCExpression at = insertAnnotationsToMostInner(qi, typeAnnos, false);
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  3548
            ts.append(at);
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  3549
        } else {
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  3550
            ts.append(qi);
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  3551
        }
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3552
        while (token.kind == COMMA) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3553
            nextToken();
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3554
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3555
            typeAnnos = typeAnnotationsOpt();
17578
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  3556
            qi = qualident(true);
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  3557
            if (!typeAnnos.isEmpty()) {
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  3558
                JCExpression at = insertAnnotationsToMostInner(qi, typeAnnos, false);
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  3559
                ts.append(at);
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  3560
            } else {
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  3561
                ts.append(qi);
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  3562
            }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3563
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3564
        return ts.toList();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3565
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3566
13844
56339cf983a3 7177970: fix issues in langtools doc comments
jjg
parents: 13439
diff changeset
  3567
    /**
56339cf983a3 7177970: fix issues in langtools doc comments
jjg
parents: 13439
diff changeset
  3568
     *  {@literal
56339cf983a3 7177970: fix issues in langtools doc comments
jjg
parents: 13439
diff changeset
  3569
     *  TypeParametersOpt = ["<" TypeParameter {"," TypeParameter} ">"]
56339cf983a3 7177970: fix issues in langtools doc comments
jjg
parents: 13439
diff changeset
  3570
     *  }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3571
     */
28147
72e7fdc79b78 8067384: Facilitate extension of the javac parser
rfield
parents: 27991
diff changeset
  3572
    protected List<JCTypeParameter> typeParametersOpt() {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3573
        if (token.kind == LT) {
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22155
diff changeset
  3574
            ListBuffer<JCTypeParameter> typarams = new ListBuffer<>();
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3575
            nextToken();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3576
            typarams.append(typeParameter());
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3577
            while (token.kind == COMMA) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3578
                nextToken();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3579
                typarams.append(typeParameter());
06bc494ca11e Initial load
duke
parents:
diff changeset
  3580
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3581
            accept(GT);
06bc494ca11e Initial load
duke
parents:
diff changeset
  3582
            return typarams.toList();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3583
        } else {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3584
            return List.nil();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3585
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3586
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3587
13844
56339cf983a3 7177970: fix issues in langtools doc comments
jjg
parents: 13439
diff changeset
  3588
    /**
56339cf983a3 7177970: fix issues in langtools doc comments
jjg
parents: 13439
diff changeset
  3589
     *  {@literal
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3590
     *  TypeParameter = [Annotations] TypeVariable [TypeParameterBound]
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3591
     *  TypeParameterBound = EXTENDS Type {"&" Type}
06bc494ca11e Initial load
duke
parents:
diff changeset
  3592
     *  TypeVariable = Ident
13844
56339cf983a3 7177970: fix issues in langtools doc comments
jjg
parents: 13439
diff changeset
  3593
     *  }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3594
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  3595
    JCTypeParameter typeParameter() {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3596
        int pos = token.pos;
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3597
        List<JCAnnotation> annos = typeAnnotationsOpt();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3598
        Name name = ident();
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22155
diff changeset
  3599
        ListBuffer<JCExpression> bounds = new ListBuffer<>();
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3600
        if (token.kind == EXTENDS) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3601
            nextToken();
1258
1cf37d8837d1 6724118: change JavaCompiler to not use Scanner directly
jjg
parents: 939
diff changeset
  3602
            bounds.append(parseType());
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3603
            while (token.kind == AMP) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3604
                nextToken();
1258
1cf37d8837d1 6724118: change JavaCompiler to not use Scanner directly
jjg
parents: 939
diff changeset
  3605
                bounds.append(parseType());
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3606
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3607
        }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3608
        return toP(F.at(pos).TypeParameter(name, bounds.toList(), annos));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3609
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3610
06bc494ca11e Initial load
duke
parents:
diff changeset
  3611
    /** FormalParameters = "(" [ FormalParameterList ] ")"
06bc494ca11e Initial load
duke
parents:
diff changeset
  3612
     *  FormalParameterList = [ FormalParameterListNovarargs , ] LastFormalParameter
06bc494ca11e Initial load
duke
parents:
diff changeset
  3613
     *  FormalParameterListNovarargs = [ FormalParameterListNovarargs , ] FormalParameter
06bc494ca11e Initial load
duke
parents:
diff changeset
  3614
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  3615
    List<JCVariableDecl> formalParameters() {
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  3616
        return formalParameters(false);
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  3617
    }
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  3618
    List<JCVariableDecl> formalParameters(boolean lambdaParameters) {
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22155
diff changeset
  3619
        ListBuffer<JCVariableDecl> params = new ListBuffer<>();
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3620
        JCVariableDecl lastParam;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3621
        accept(LPAREN);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3622
        if (token.kind != RPAREN) {
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3623
            this.allowThisIdent = true;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3624
            lastParam = formalParameter(lambdaParameters);
17578
46ac954e4a84 8013852: update reference impl for type-annotations
jjg
parents: 16811
diff changeset
  3625
            if (lastParam.nameexpr != null) {
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3626
                this.receiverParam = lastParam;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3627
            } else {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3628
                params.append(lastParam);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3629
            }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3630
            this.allowThisIdent = false;
22701
67811024e8b4 8030091: Request to update error messages from javac for negative varargs test cases
jlahoda
parents: 22165
diff changeset
  3631
            while (token.kind == COMMA) {
67811024e8b4 8030091: Request to update error messages from javac for negative varargs test cases
jlahoda
parents: 22165
diff changeset
  3632
                if ((lastParam.mods.flags & Flags.VARARGS) != 0) {
67811024e8b4 8030091: Request to update error messages from javac for negative varargs test cases
jlahoda
parents: 22165
diff changeset
  3633
                    error(lastParam, "varargs.must.be.last");
67811024e8b4 8030091: Request to update error messages from javac for negative varargs test cases
jlahoda
parents: 22165
diff changeset
  3634
                }
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3635
                nextToken();
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  3636
                params.append(lastParam = formalParameter(lambdaParameters));
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3637
            }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3638
        }
22701
67811024e8b4 8030091: Request to update error messages from javac for negative varargs test cases
jlahoda
parents: 22165
diff changeset
  3639
        if (token.kind == RPAREN) {
67811024e8b4 8030091: Request to update error messages from javac for negative varargs test cases
jlahoda
parents: 22165
diff changeset
  3640
            nextToken();
67811024e8b4 8030091: Request to update error messages from javac for negative varargs test cases
jlahoda
parents: 22165
diff changeset
  3641
        } else {
67811024e8b4 8030091: Request to update error messages from javac for negative varargs test cases
jlahoda
parents: 22165
diff changeset
  3642
            setErrorEndPos(token.pos);
67811024e8b4 8030091: Request to update error messages from javac for negative varargs test cases
jlahoda
parents: 22165
diff changeset
  3643
            reportSyntaxError(S.prevToken().endPos, "expected3", COMMA, RPAREN, LBRACKET);
67811024e8b4 8030091: Request to update error messages from javac for negative varargs test cases
jlahoda
parents: 22165
diff changeset
  3644
        }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3645
        return params.toList();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3646
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3647
11143
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  3648
    List<JCVariableDecl> implicitParameters(boolean hasParens) {
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  3649
        if (hasParens) {
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  3650
            accept(LPAREN);
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  3651
        }
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 22155
diff changeset
  3652
        ListBuffer<JCVariableDecl> params = new ListBuffer<>();
11143
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  3653
        if (token.kind != RPAREN && token.kind != ARROW) {
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  3654
            params.append(implicitParameter());
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  3655
            while (token.kind == COMMA) {
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  3656
                nextToken();
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  3657
                params.append(implicitParameter());
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  3658
            }
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  3659
        }
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  3660
        if (hasParens) {
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  3661
            accept(RPAREN);
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  3662
        }
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  3663
        return params.toList();
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  3664
    }
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  3665
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3666
    JCModifiers optFinal(long flags) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3667
        JCModifiers mods = modifiersOpt();
06bc494ca11e Initial load
duke
parents:
diff changeset
  3668
        checkNoMods(mods.flags & ~(Flags.FINAL | Flags.DEPRECATED));
06bc494ca11e Initial load
duke
parents:
diff changeset
  3669
        mods.flags |= flags;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3670
        return mods;
06bc494ca11e Initial load
duke
parents:
diff changeset
  3671
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3672
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3673
    /**
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3674
     * Inserts the annotations (and possibly a new array level)
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3675
     * to the left-most type in an array or nested type.
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3676
     *
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3677
     * When parsing a type like {@code @B Outer.Inner @A []}, the
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3678
     * {@code @A} annotation should target the array itself, while
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3679
     * {@code @B} targets the nested type {@code Outer}.
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3680
     *
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3681
     * Currently the parser parses the annotation first, then
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3682
     * the array, and then inserts the annotation to the left-most
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3683
     * nested type.
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3684
     *
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3685
     * When {@code createNewLevel} is true, then a new array
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3686
     * level is inserted as the most inner type, and have the
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3687
     * annotations target it.  This is useful in the case of
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3688
     * varargs, e.g. {@code String @A [] @B ...}, as the parser
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3689
     * first parses the type {@code String @A []} then inserts
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3690
     * a new array level with {@code @B} annotation.
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3691
     */
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3692
    private JCExpression insertAnnotationsToMostInner(
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3693
            JCExpression type, List<JCAnnotation> annos,
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3694
            boolean createNewLevel) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3695
        int origEndPos = getEndPos(type);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3696
        JCExpression mostInnerType = type;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3697
        JCArrayTypeTree mostInnerArrayType = null;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3698
        while (TreeInfo.typeIn(mostInnerType).hasTag(TYPEARRAY)) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3699
            mostInnerArrayType = (JCArrayTypeTree) TreeInfo.typeIn(mostInnerType);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3700
            mostInnerType = mostInnerArrayType.elemtype;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3701
        }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3702
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3703
        if (createNewLevel) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3704
            mostInnerType = to(F.at(token.pos).TypeArray(mostInnerType));
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3705
        }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3706
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3707
        JCExpression mostInnerTypeToReturn = mostInnerType;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3708
        if (annos.nonEmpty()) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3709
            JCExpression lastToModify = mostInnerType;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3710
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3711
            while (TreeInfo.typeIn(mostInnerType).hasTag(SELECT) ||
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3712
                    TreeInfo.typeIn(mostInnerType).hasTag(TYPEAPPLY)) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3713
                while (TreeInfo.typeIn(mostInnerType).hasTag(SELECT)) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3714
                    lastToModify = mostInnerType;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3715
                    mostInnerType = ((JCFieldAccess) TreeInfo.typeIn(mostInnerType)).getExpression();
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3716
                }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3717
                while (TreeInfo.typeIn(mostInnerType).hasTag(TYPEAPPLY)) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3718
                    lastToModify = mostInnerType;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3719
                    mostInnerType = ((JCTypeApply) TreeInfo.typeIn(mostInnerType)).clazz;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3720
                }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3721
            }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3722
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3723
            mostInnerType = F.at(annos.head.pos).AnnotatedType(annos, mostInnerType);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3724
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3725
            if (TreeInfo.typeIn(lastToModify).hasTag(TYPEAPPLY)) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3726
                ((JCTypeApply) TreeInfo.typeIn(lastToModify)).clazz = mostInnerType;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3727
            } else if (TreeInfo.typeIn(lastToModify).hasTag(SELECT)) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3728
                ((JCFieldAccess) TreeInfo.typeIn(lastToModify)).selected = mostInnerType;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3729
            } else {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3730
                // We never saw a SELECT or TYPEAPPLY, return the annotated type.
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3731
                mostInnerTypeToReturn = mostInnerType;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3732
            }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3733
        }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3734
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3735
        if (mostInnerArrayType == null) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3736
            return mostInnerTypeToReturn;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3737
        } else {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3738
            mostInnerArrayType.elemtype = mostInnerTypeToReturn;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3739
            storeEnd(type, origEndPos);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3740
            return type;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3741
        }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3742
    }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3743
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3744
    /** FormalParameter = { FINAL | '@' Annotation } Type VariableDeclaratorId
06bc494ca11e Initial load
duke
parents:
diff changeset
  3745
     *  LastFormalParameter = { FINAL | '@' Annotation } Type '...' Ident | FormalParameter
06bc494ca11e Initial load
duke
parents:
diff changeset
  3746
     */
10455
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
  3747
    protected JCVariableDecl formalParameter() {
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  3748
        return formalParameter(false);
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  3749
    }
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  3750
    protected JCVariableDecl formalParameter(boolean lambdaParameter) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3751
        JCModifiers mods = optFinal(Flags.PARAMETER);
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3752
        // need to distinguish between vararg annos and array annos
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3753
        // look at typeAnnotationsPushedBack comment
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3754
        this.permitTypeAnnotationsPushBack = true;
1258
1cf37d8837d1 6724118: change JavaCompiler to not use Scanner directly
jjg
parents: 939
diff changeset
  3755
        JCExpression type = parseType();
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3756
        this.permitTypeAnnotationsPushBack = false;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3757
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3758
        if (token.kind == ELLIPSIS) {
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3759
            List<JCAnnotation> varargsAnnos = typeAnnotationsPushedBack;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3760
            typeAnnotationsPushedBack = List.nil();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3761
            mods.flags |= Flags.VARARGS;
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3762
            // insert var arg type annotations
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3763
            type = insertAnnotationsToMostInner(type, varargsAnnos, true);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3764
            nextToken();
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3765
        } else {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3766
            // if not a var arg, then typeAnnotationsPushedBack should be null
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3767
            if (typeAnnotationsPushedBack.nonEmpty()) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3768
                reportSyntaxError(typeAnnotationsPushedBack.head.pos,
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3769
                        "illegal.start.of.type");
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3770
            }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  3771
            typeAnnotationsPushedBack = List.nil();
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3772
        }
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  3773
        return variableDeclaratorId(mods, type, lambdaParameter);
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3774
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3775
11143
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  3776
    protected JCVariableDecl implicitParameter() {
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  3777
        JCModifiers mods = F.at(token.pos).Modifiers(Flags.PARAMETER);
15367
31b57f2b8d0b 8005852: Treatment of '_' as identifier
mcimadamore
parents: 14803
diff changeset
  3778
        return variableDeclaratorId(mods, null, true);
11143
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  3779
    }
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  3780
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3781
/* ---------- auxiliary methods -------------- */
06bc494ca11e Initial load
duke
parents:
diff changeset
  3782
7076
c96fa26247c8 6994946: option to specify only syntax errors as unrecoverable
jjg
parents: 7074
diff changeset
  3783
    void error(int pos, String key, Object ... args) {
c96fa26247c8 6994946: option to specify only syntax errors as unrecoverable
jjg
parents: 7074
diff changeset
  3784
        log.error(DiagnosticFlag.SYNTAX, pos, key, args);
c96fa26247c8 6994946: option to specify only syntax errors as unrecoverable
jjg
parents: 7074
diff changeset
  3785
    }
c96fa26247c8 6994946: option to specify only syntax errors as unrecoverable
jjg
parents: 7074
diff changeset
  3786
10455
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
  3787
    void error(DiagnosticPosition pos, String key, Object ... args) {
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
  3788
        log.error(DiagnosticFlag.SYNTAX, pos, key, args);
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
  3789
    }
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
  3790
7076
c96fa26247c8 6994946: option to specify only syntax errors as unrecoverable
jjg
parents: 7074
diff changeset
  3791
    void warning(int pos, String key, Object ... args) {
c96fa26247c8 6994946: option to specify only syntax errors as unrecoverable
jjg
parents: 7074
diff changeset
  3792
        log.warning(pos, key, args);
c96fa26247c8 6994946: option to specify only syntax errors as unrecoverable
jjg
parents: 7074
diff changeset
  3793
    }
c96fa26247c8 6994946: option to specify only syntax errors as unrecoverable
jjg
parents: 7074
diff changeset
  3794
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3795
    /** Check that given tree is a legal expression statement.
06bc494ca11e Initial load
duke
parents:
diff changeset
  3796
     */
06bc494ca11e Initial load
duke
parents:
diff changeset
  3797
    protected JCExpression checkExprStat(JCExpression t) {
14722
aaa39655aa2e 8004105: Expression statement lambdas should be void-compatible
mcimadamore
parents: 14547
diff changeset
  3798
        if (!TreeInfo.isExpressionStatement(t)) {
10455
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
  3799
            JCExpression ret = F.at(t.pos).Erroneous(List.<JCTree>of(t));
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
  3800
            error(ret, "not.stmt");
3d070be0fff8 7073631: (javac) javac parser improvements for error position reporting
ksrini
parents: 10200
diff changeset
  3801
            return ret;
14722
aaa39655aa2e 8004105: Expression statement lambdas should be void-compatible
mcimadamore
parents: 14547
diff changeset
  3802
        } else {
aaa39655aa2e 8004105: Expression statement lambdas should be void-compatible
mcimadamore
parents: 14547
diff changeset
  3803
            return t;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3804
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3805
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3806
06bc494ca11e Initial load
duke
parents:
diff changeset
  3807
    /** Return precedence of operator represented by token,
06bc494ca11e Initial load
duke
parents:
diff changeset
  3808
     *  -1 if token is not a binary operator. @see TreeInfo.opPrec
06bc494ca11e Initial load
duke
parents:
diff changeset
  3809
     */
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3810
    static int prec(TokenKind token) {
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3811
        JCTree.Tag oc = optag(token);
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3812
        return (oc != NO_TAG) ? TreeInfo.opPrec(oc) : -1;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3813
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3814
5013
e942b2e52479 6931927: position issues with synthesized anonymous class
jjg
parents: 4870
diff changeset
  3815
    /**
e942b2e52479 6931927: position issues with synthesized anonymous class
jjg
parents: 4870
diff changeset
  3816
     * Return the lesser of two positions, making allowance for either one
e942b2e52479 6931927: position issues with synthesized anonymous class
jjg
parents: 4870
diff changeset
  3817
     * being unset.
e942b2e52479 6931927: position issues with synthesized anonymous class
jjg
parents: 4870
diff changeset
  3818
     */
e942b2e52479 6931927: position issues with synthesized anonymous class
jjg
parents: 4870
diff changeset
  3819
    static int earlier(int pos1, int pos2) {
e942b2e52479 6931927: position issues with synthesized anonymous class
jjg
parents: 4870
diff changeset
  3820
        if (pos1 == Position.NOPOS)
e942b2e52479 6931927: position issues with synthesized anonymous class
jjg
parents: 4870
diff changeset
  3821
            return pos2;
e942b2e52479 6931927: position issues with synthesized anonymous class
jjg
parents: 4870
diff changeset
  3822
        if (pos2 == Position.NOPOS)
e942b2e52479 6931927: position issues with synthesized anonymous class
jjg
parents: 4870
diff changeset
  3823
            return pos1;
e942b2e52479 6931927: position issues with synthesized anonymous class
jjg
parents: 4870
diff changeset
  3824
        return (pos1 < pos2 ? pos1 : pos2);
e942b2e52479 6931927: position issues with synthesized anonymous class
jjg
parents: 4870
diff changeset
  3825
    }
e942b2e52479 6931927: position issues with synthesized anonymous class
jjg
parents: 4870
diff changeset
  3826
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3827
    /** Return operation tag of binary operator represented by token,
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3828
     *  No_TAG if token is not a binary operator.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3829
     */
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3830
    static JCTree.Tag optag(TokenKind token) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3831
        switch (token) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3832
        case BARBAR:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3833
            return OR;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3834
        case AMPAMP:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3835
            return AND;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3836
        case BAR:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3837
            return BITOR;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3838
        case BAREQ:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3839
            return BITOR_ASG;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3840
        case CARET:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3841
            return BITXOR;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3842
        case CARETEQ:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3843
            return BITXOR_ASG;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3844
        case AMP:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3845
            return BITAND;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3846
        case AMPEQ:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3847
            return BITAND_ASG;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3848
        case EQEQ:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3849
            return JCTree.Tag.EQ;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3850
        case BANGEQ:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3851
            return NE;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3852
        case LT:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3853
            return JCTree.Tag.LT;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3854
        case GT:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3855
            return JCTree.Tag.GT;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3856
        case LTEQ:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3857
            return LE;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3858
        case GTEQ:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3859
            return GE;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3860
        case LTLT:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3861
            return SL;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3862
        case LTLTEQ:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3863
            return SL_ASG;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3864
        case GTGT:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3865
            return SR;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3866
        case GTGTEQ:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3867
            return SR_ASG;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3868
        case GTGTGT:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3869
            return USR;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3870
        case GTGTGTEQ:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3871
            return USR_ASG;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3872
        case PLUS:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3873
            return JCTree.Tag.PLUS;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3874
        case PLUSEQ:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3875
            return PLUS_ASG;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3876
        case SUB:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3877
            return MINUS;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3878
        case SUBEQ:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3879
            return MINUS_ASG;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3880
        case STAR:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3881
            return MUL;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3882
        case STAREQ:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3883
            return MUL_ASG;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3884
        case SLASH:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3885
            return DIV;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3886
        case SLASHEQ:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3887
            return DIV_ASG;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3888
        case PERCENT:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3889
            return MOD;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3890
        case PERCENTEQ:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3891
            return MOD_ASG;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3892
        case INSTANCEOF:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3893
            return TYPETEST;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3894
        default:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3895
            return NO_TAG;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3896
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3897
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3898
06bc494ca11e Initial load
duke
parents:
diff changeset
  3899
    /** Return operation tag of unary operator represented by token,
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3900
     *  No_TAG if token is not a binary operator.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3901
     */
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3902
    static JCTree.Tag unoptag(TokenKind token) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3903
        switch (token) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3904
        case PLUS:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3905
            return POS;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3906
        case SUB:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3907
            return NEG;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3908
        case BANG:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3909
            return NOT;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3910
        case TILDE:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3911
            return COMPL;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3912
        case PLUSPLUS:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3913
            return PREINC;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3914
        case SUBSUB:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3915
            return PREDEC;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3916
        default:
10950
e87b50888909 6921494: provide way to print javac tree tag values
jjg
parents: 10948
diff changeset
  3917
            return NO_TAG;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3918
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3919
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3920
06bc494ca11e Initial load
duke
parents:
diff changeset
  3921
    /** Return type tag of basic type represented by token,
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14267
diff changeset
  3922
     *  NONE if token is not a basic type identifier.
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3923
     */
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14267
diff changeset
  3924
    static TypeTag typetag(TokenKind token) {
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3925
        switch (token) {
06bc494ca11e Initial load
duke
parents:
diff changeset
  3926
        case BYTE:
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14267
diff changeset
  3927
            return TypeTag.BYTE;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3928
        case CHAR:
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14267
diff changeset
  3929
            return TypeTag.CHAR;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3930
        case SHORT:
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14267
diff changeset
  3931
            return TypeTag.SHORT;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3932
        case INT:
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14267
diff changeset
  3933
            return TypeTag.INT;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3934
        case LONG:
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14267
diff changeset
  3935
            return TypeTag.LONG;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3936
        case FLOAT:
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14267
diff changeset
  3937
            return TypeTag.FLOAT;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3938
        case DOUBLE:
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14267
diff changeset
  3939
            return TypeTag.DOUBLE;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3940
        case BOOLEAN:
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14267
diff changeset
  3941
            return TypeTag.BOOLEAN;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3942
        default:
14359
d4099818ab70 7200915: convert TypeTags from a series of small ints to an enum
jjg
parents: 14267
diff changeset
  3943
            return TypeTag.NONE;
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  3944
        }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3945
    }
06bc494ca11e Initial load
duke
parents:
diff changeset
  3946
5321
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 5320
diff changeset
  3947
    void checkDiamond() {
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 5320
diff changeset
  3948
        if (!allowDiamond) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3949
            error(token.pos, "diamond.not.supported.in.source", source.name);
5321
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 5320
diff changeset
  3950
            allowDiamond = true;
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 5320
diff changeset
  3951
        }
c8efe769cb3b 6939620: Switch to 'complex' diamond inference scheme
mcimadamore
parents: 5320
diff changeset
  3952
    }
5492
515e4b33b335 6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents: 5321
diff changeset
  3953
    void checkMulticatch() {
515e4b33b335 6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents: 5321
diff changeset
  3954
        if (!allowMulticatch) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3955
            error(token.pos, "multicatch.not.supported.in.source", source.name);
5492
515e4b33b335 6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents: 5321
diff changeset
  3956
            allowMulticatch = true;
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6146
diff changeset
  3957
        }
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6146
diff changeset
  3958
    }
7211
163fe60f63de 6970016: Clean up ARM/try-with-resources implementation
mcimadamore
parents: 7076
diff changeset
  3959
    void checkTryWithResources() {
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6146
diff changeset
  3960
        if (!allowTWR) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents: 10455
diff changeset
  3961
            error(token.pos, "try.with.resources.not.supported.in.source", source.name);
6148
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6146
diff changeset
  3962
            allowTWR = true;
3a8158299c51 6911256: Project Coin: Support Automatic Resource Management (ARM) blocks in the compiler
darcy
parents: 6146
diff changeset
  3963
        }
5492
515e4b33b335 6943289: Project Coin: Improved Exception Handling for Java (aka 'multicatch')
mcimadamore
parents: 5321
diff changeset
  3964
    }
27844
8b5d79870a2f 7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents: 26993
diff changeset
  3965
    void checkVariableInTryWithResources(int startPos) {
8b5d79870a2f 7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents: 26993
diff changeset
  3966
        if (!allowEffectivelyFinalVariablesInTWR) {
8b5d79870a2f 7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents: 26993
diff changeset
  3967
            error(startPos, "var.in.try.with.resources.not.supported.in.source", source.name);
8b5d79870a2f 7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents: 26993
diff changeset
  3968
            allowEffectivelyFinalVariablesInTWR = true;
8b5d79870a2f 7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents: 26993
diff changeset
  3969
        }
8b5d79870a2f 7196163: Project Coin: Allow effectively final variables to be used as resources in try-with-resources
jlahoda
parents: 26993
diff changeset
  3970
    }
11143
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  3971
    void checkLambda() {
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  3972
        if (!allowLambda) {
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  3973
            log.error(token.pos, "lambda.not.supported.in.source", source.name);
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  3974
            allowLambda = true;
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  3975
        }
9dbe313bfb74 7115050: Add parser support for lambda expressions
mcimadamore
parents: 11055
diff changeset
  3976
    }
11144
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
  3977
    void checkMethodReferences() {
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
  3978
        if (!allowMethodReferences) {
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
  3979
            log.error(token.pos, "method.references.not.supported.in.source", source.name);
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
  3980
            allowMethodReferences = true;
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
  3981
        }
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 11143
diff changeset
  3982
    }
14267
6321fbe0cf50 7192245: Add parser support for default methods
mcimadamore
parents: 14263
diff changeset
  3983
    void checkDefaultMethods() {
6321fbe0cf50 7192245: Add parser support for default methods
mcimadamore
parents: 14263
diff changeset
  3984
        if (!allowDefaultMethods) {
6321fbe0cf50 7192245: Add parser support for default methods
mcimadamore
parents: 14263
diff changeset
  3985
            log.error(token.pos, "default.methods.not.supported.in.source", source.name);
6321fbe0cf50 7192245: Add parser support for default methods
mcimadamore
parents: 14263
diff changeset
  3986
            allowDefaultMethods = true;
6321fbe0cf50 7192245: Add parser support for default methods
mcimadamore
parents: 14263
diff changeset
  3987
        }
6321fbe0cf50 7192245: Add parser support for default methods
mcimadamore
parents: 14263
diff changeset
  3988
    }
14725
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  3989
    void checkIntersectionTypesInCast() {
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  3990
        if (!allowIntersectionTypesInCast) {
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  3991
            log.error(token.pos, "intersection.types.in.cast.not.supported.in.source", source.name);
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  3992
            allowIntersectionTypesInCast = true;
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  3993
        }
65836e833f59 8002099: Add support for intersection types in cast expression
mcimadamore
parents: 14722
diff changeset
  3994
    }
15377
515846bb6637 8005166: Add support for static interface methods
mcimadamore
parents: 15375
diff changeset
  3995
    void checkStaticInterfaceMethods() {
515846bb6637 8005166: Add support for static interface methods
mcimadamore
parents: 15375
diff changeset
  3996
        if (!allowStaticInterfaceMethods) {
515846bb6637 8005166: Add support for static interface methods
mcimadamore
parents: 15375
diff changeset
  3997
            log.error(token.pos, "static.intf.methods.not.supported.in.source", source.name);
515846bb6637 8005166: Add support for static interface methods
mcimadamore
parents: 15375
diff changeset
  3998
            allowStaticInterfaceMethods = true;
515846bb6637 8005166: Add support for static interface methods
mcimadamore
parents: 15375
diff changeset
  3999
        }
515846bb6637 8005166: Add support for static interface methods
mcimadamore
parents: 15375
diff changeset
  4000
    }
15385
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  4001
    void checkTypeAnnotations() {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  4002
        if (!allowTypeAnnotations) {
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  4003
            log.error(token.pos, "type.annotations.not.supported.in.source", source.name);
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  4004
            allowTypeAnnotations = true;
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  4005
        }
ee1eebe7e210 8006775: JSR 308: Compiler changes in JDK8
jjg
parents: 15377
diff changeset
  4006
    }
28147
72e7fdc79b78 8067384: Facilitate extension of the javac parser
rfield
parents: 27991
diff changeset
  4007
    protected void checkAnnotationsAfterTypeParams(int pos) {
23800
f7ffcfe938f2 8035890: jdk8 javac -source 7 compiles test case it should not
jlahoda
parents: 23133
diff changeset
  4008
        if (!allowAnnotationsAfterTypeParams) {
f7ffcfe938f2 8035890: jdk8 javac -source 7 compiles test case it should not
jlahoda
parents: 23133
diff changeset
  4009
            log.error(pos, "annotations.after.type.params.not.supported.in.source", source.name);
f7ffcfe938f2 8035890: jdk8 javac -source 7 compiles test case it should not
jlahoda
parents: 23133
diff changeset
  4010
            allowAnnotationsAfterTypeParams = true;
f7ffcfe938f2 8035890: jdk8 javac -source 7 compiles test case it should not
jlahoda
parents: 23133
diff changeset
  4011
        }
f7ffcfe938f2 8035890: jdk8 javac -source 7 compiles test case it should not
jlahoda
parents: 23133
diff changeset
  4012
    }
11055
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4013
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4014
    /*
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4015
     * a functional source tree and end position mappings
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4016
     */
16811
fca5473a5823 8011677: EndPosTables should avoid hidden references to Parser
jjg
parents: 16296
diff changeset
  4017
    protected static class SimpleEndPosTable extends AbstractEndPosTable {
11055
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4018
23131
90aee246c017 8033287: Reduce the size of the endPosTable
jjg
parents: 22701
diff changeset
  4019
        private final IntHashTable endPosMap;
11055
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4020
16811
fca5473a5823 8011677: EndPosTables should avoid hidden references to Parser
jjg
parents: 16296
diff changeset
  4021
        SimpleEndPosTable(JavacParser parser) {
fca5473a5823 8011677: EndPosTables should avoid hidden references to Parser
jjg
parents: 16296
diff changeset
  4022
            super(parser);
23131
90aee246c017 8033287: Reduce the size of the endPosTable
jjg
parents: 22701
diff changeset
  4023
            endPosMap = new IntHashTable();
11055
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4024
        }
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4025
19122
1841f2fa76de 8017216: javac doesn't fill in end position for some errors of type not found
ksrini
parents: 18645
diff changeset
  4026
        public void storeEnd(JCTree tree, int endpos) {
23131
90aee246c017 8033287: Reduce the size of the endPosTable
jjg
parents: 22701
diff changeset
  4027
            endPosMap.putAtIndex(tree, errorEndPos > endpos ? errorEndPos : endpos,
90aee246c017 8033287: Reduce the size of the endPosTable
jjg
parents: 22701
diff changeset
  4028
                                 endPosMap.lookup(tree));
11055
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4029
        }
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4030
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4031
        protected <T extends JCTree> T to(T t) {
16811
fca5473a5823 8011677: EndPosTables should avoid hidden references to Parser
jjg
parents: 16296
diff changeset
  4032
            storeEnd(t, parser.token.endPos);
11055
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4033
            return t;
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4034
        }
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4035
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4036
        protected <T extends JCTree> T toP(T t) {
16811
fca5473a5823 8011677: EndPosTables should avoid hidden references to Parser
jjg
parents: 16296
diff changeset
  4037
            storeEnd(t, parser.S.prevToken().endPos);
11055
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4038
            return t;
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4039
        }
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4040
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4041
        public int getEndPos(JCTree tree) {
23131
90aee246c017 8033287: Reduce the size of the endPosTable
jjg
parents: 22701
diff changeset
  4042
            int value = endPosMap.getFromIndex(endPosMap.lookup(tree));
90aee246c017 8033287: Reduce the size of the endPosTable
jjg
parents: 22701
diff changeset
  4043
            // As long as Position.NOPOS==-1, this just returns value.
90aee246c017 8033287: Reduce the size of the endPosTable
jjg
parents: 22701
diff changeset
  4044
            return (value == -1) ? Position.NOPOS : value;
11055
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4045
        }
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4046
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4047
        public int replaceTree(JCTree oldTree, JCTree newTree) {
23131
90aee246c017 8033287: Reduce the size of the endPosTable
jjg
parents: 22701
diff changeset
  4048
            int pos = endPosMap.remove(oldTree);
90aee246c017 8033287: Reduce the size of the endPosTable
jjg
parents: 22701
diff changeset
  4049
            if (pos != -1) {
90aee246c017 8033287: Reduce the size of the endPosTable
jjg
parents: 22701
diff changeset
  4050
                storeEnd(newTree, pos);
11055
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4051
                return pos;
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4052
            }
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4053
            return Position.NOPOS;
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4054
        }
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4055
    }
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4056
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4057
    /*
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4058
     * a default skeletal implementation without any mapping overhead.
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4059
     */
16811
fca5473a5823 8011677: EndPosTables should avoid hidden references to Parser
jjg
parents: 16296
diff changeset
  4060
    protected static class EmptyEndPosTable extends AbstractEndPosTable {
fca5473a5823 8011677: EndPosTables should avoid hidden references to Parser
jjg
parents: 16296
diff changeset
  4061
fca5473a5823 8011677: EndPosTables should avoid hidden references to Parser
jjg
parents: 16296
diff changeset
  4062
        EmptyEndPosTable(JavacParser parser) {
fca5473a5823 8011677: EndPosTables should avoid hidden references to Parser
jjg
parents: 16296
diff changeset
  4063
            super(parser);
fca5473a5823 8011677: EndPosTables should avoid hidden references to Parser
jjg
parents: 16296
diff changeset
  4064
        }
11055
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4065
19122
1841f2fa76de 8017216: javac doesn't fill in end position for some errors of type not found
ksrini
parents: 18645
diff changeset
  4066
        public void storeEnd(JCTree tree, int endpos) { /* empty */ }
11055
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4067
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4068
        protected <T extends JCTree> T to(T t) {
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4069
            return t;
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4070
        }
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4071
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4072
        protected <T extends JCTree> T toP(T t) {
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4073
            return t;
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4074
        }
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4075
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4076
        public int getEndPos(JCTree tree) {
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4077
            return Position.NOPOS;
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4078
        }
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4079
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4080
        public int replaceTree(JCTree oldTree, JCTree newTree) {
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4081
            return Position.NOPOS;
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4082
        }
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4083
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4084
    }
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4085
16811
fca5473a5823 8011677: EndPosTables should avoid hidden references to Parser
jjg
parents: 16296
diff changeset
  4086
    protected static abstract class AbstractEndPosTable implements EndPosTable {
fca5473a5823 8011677: EndPosTables should avoid hidden references to Parser
jjg
parents: 16296
diff changeset
  4087
        /**
fca5473a5823 8011677: EndPosTables should avoid hidden references to Parser
jjg
parents: 16296
diff changeset
  4088
         * The current parser.
fca5473a5823 8011677: EndPosTables should avoid hidden references to Parser
jjg
parents: 16296
diff changeset
  4089
         */
fca5473a5823 8011677: EndPosTables should avoid hidden references to Parser
jjg
parents: 16296
diff changeset
  4090
        protected JavacParser parser;
11055
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4091
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4092
        /**
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4093
         * Store the last error position.
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4094
         */
28147
72e7fdc79b78 8067384: Facilitate extension of the javac parser
rfield
parents: 27991
diff changeset
  4095
        public int errorEndPos = Position.NOPOS;
11055
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4096
16811
fca5473a5823 8011677: EndPosTables should avoid hidden references to Parser
jjg
parents: 16296
diff changeset
  4097
        public AbstractEndPosTable(JavacParser parser) {
fca5473a5823 8011677: EndPosTables should avoid hidden references to Parser
jjg
parents: 16296
diff changeset
  4098
            this.parser = parser;
fca5473a5823 8011677: EndPosTables should avoid hidden references to Parser
jjg
parents: 16296
diff changeset
  4099
        }
fca5473a5823 8011677: EndPosTables should avoid hidden references to Parser
jjg
parents: 16296
diff changeset
  4100
11055
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4101
        /**
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4102
         * Store current token's ending position for a tree, the value of which
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4103
         * will be the greater of last error position and the ending position of
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4104
         * the current token.
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4105
         * @param t The tree.
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4106
         */
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4107
        protected abstract <T extends JCTree> T to(T t);
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4108
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4109
        /**
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4110
         * Store current token's ending position for a tree, the value of which
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4111
         * will be the greater of last error position and the ending position of
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4112
         * the previous token.
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4113
         * @param t The tree.
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4114
         */
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4115
        protected abstract <T extends JCTree> T toP(T t);
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4116
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4117
        /**
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4118
         * Set the error position during the parsing phases, the value of which
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4119
         * will be set only if it is greater than the last stored error position.
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4120
         * @param errPos The error position
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4121
         */
28147
72e7fdc79b78 8067384: Facilitate extension of the javac parser
rfield
parents: 27991
diff changeset
  4122
        public void setErrorEndPos(int errPos) {
11055
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4123
            if (errPos > errorEndPos) {
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4124
                errorEndPos = errPos;
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4125
            }
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4126
        }
16811
fca5473a5823 8011677: EndPosTables should avoid hidden references to Parser
jjg
parents: 16296
diff changeset
  4127
28147
72e7fdc79b78 8067384: Facilitate extension of the javac parser
rfield
parents: 27991
diff changeset
  4128
        public void setParser(JavacParser parser) {
16811
fca5473a5823 8011677: EndPosTables should avoid hidden references to Parser
jjg
parents: 16296
diff changeset
  4129
            this.parser = parser;
fca5473a5823 8011677: EndPosTables should avoid hidden references to Parser
jjg
parents: 16296
diff changeset
  4130
        }
11055
ec1418effa77 7106166: (javac) re-factor EndPos parser
ksrini
parents: 10950
diff changeset
  4131
    }
10
06bc494ca11e Initial load
duke
parents:
diff changeset
  4132
}