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