langtools/src/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
author jjg
Tue, 03 Jan 2012 11:37:00 -0800
changeset 11383 ae090403accf
parent 11144 8a4ae514eedf
child 13077 16fb753bb5dc
permissions -rw-r--r--
4881269: improve diagnostic for ill-formed tokens Reviewed-by: mcimadamore
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
     1
/*
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
     2
 * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
     4
 *
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
     7
 * published by the Free Software Foundation.  Oracle designates this
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
     8
 * particular file as subject to the "Classpath" exception as provided
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
     9
 * by Oracle in the LICENSE file that accompanied this code.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    10
 *
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    11
 * This code is distributed in the hope that it will be useful, but WITHOUT
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    13
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    14
 * version 2 for more details (a copy is included in the LICENSE file that
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    15
 * accompanied this code).
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    16
 *
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    17
 * You should have received a copy of the GNU General Public License version
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    18
 * 2 along with this work; if not, write to the Free Software Foundation,
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    19
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    20
 *
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    21
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    22
 * or visit www.oracle.com if you need additional information or have any
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    23
 * questions.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    24
 */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    25
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    26
package com.sun.tools.javac.parser;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    27
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    28
import com.sun.tools.javac.code.Source;
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
    29
import com.sun.tools.javac.parser.Tokens.Comment.CommentStyle;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    30
import com.sun.tools.javac.util.*;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    31
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
    32
import java.nio.CharBuffer;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    33
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    34
import static com.sun.tools.javac.parser.Tokens.*;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    35
import static com.sun.tools.javac.util.LayoutCharacters.*;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    36
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    37
/** The lexical analyzer maps an input stream consisting of
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    38
 *  ASCII characters and Unicode escapes into a token sequence.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    39
 *
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    40
 *  <p><b>This is NOT part of any supported API.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    41
 *  If you write code that depends on this, you do so at your own risk.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    42
 *  This code and its internal interfaces are subject to change or
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    43
 *  deletion without notice.</b>
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    44
 */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    45
public class JavaTokenizer {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    46
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    47
    private static boolean scannerDebug = false;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    48
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    49
    /** Allow hex floating-point literals.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    50
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    51
    private boolean allowHexFloats;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    52
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    53
    /** Allow binary literals.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    54
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    55
    private boolean allowBinaryLiterals;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    56
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    57
    /** Allow underscores in literals.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    58
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    59
    private boolean allowUnderscoresInLiterals;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    60
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    61
    /** The source language setting.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    62
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    63
    private Source source;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    64
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    65
    /** The log to be used for error reporting.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    66
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    67
    private final Log log;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    68
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    69
    /** The token factory. */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    70
    private final Tokens tokens;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    71
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    72
    /** The token kind, set by nextToken().
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    73
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    74
    protected TokenKind tk;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    75
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    76
    /** The token's radix, set by nextToken().
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    77
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    78
    protected int radix;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    79
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    80
    /** The token's name, set by nextToken().
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    81
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    82
    protected Name name;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    83
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    84
    /** The position where a lexical error occurred;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    85
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    86
    protected int errPos = Position.NOPOS;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    87
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
    88
    /** The Unicode reader (low-level stream reader).
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    89
     */
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
    90
    protected UnicodeReader reader;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    91
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
    92
    protected ScannerFactory fac;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    93
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    94
    private static final boolean hexFloatsWork = hexFloatsWork();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    95
    private static boolean hexFloatsWork() {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    96
        try {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    97
            Float.valueOf("0x1.0p1");
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    98
            return true;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    99
        } catch (NumberFormatException ex) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   100
            return false;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   101
        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   102
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   103
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   104
    /**
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   105
     * Create a scanner from the input array.  This method might
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   106
     * modify the array.  To avoid copying the input array, ensure
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   107
     * that {@code inputLength < input.length} or
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   108
     * {@code input[input.length -1]} is a white space character.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   109
     *
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   110
     * @param fac the factory which created this Scanner
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   111
     * @param input the input, might be modified
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   112
     * @param inputLength the size of the input.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   113
     * Must be positive and less than or equal to input.length.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   114
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   115
    protected JavaTokenizer(ScannerFactory fac, CharBuffer buf) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   116
        this(fac, new UnicodeReader(fac, buf));
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   117
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   118
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   119
    protected JavaTokenizer(ScannerFactory fac, char[] buf, int inputLength) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   120
        this(fac, new UnicodeReader(fac, buf, inputLength));
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   121
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   122
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   123
    protected JavaTokenizer(ScannerFactory fac, UnicodeReader reader) {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   124
        this.fac = fac;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   125
        this.log = fac.log;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   126
        this.tokens = fac.tokens;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   127
        this.source = fac.source;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   128
        this.reader = reader;
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   129
        this.allowBinaryLiterals = source.allowBinaryLiterals();
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   130
        this.allowHexFloats = source.allowHexFloats();
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   131
        this.allowUnderscoresInLiterals = source.allowUnderscoresInLiterals();
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   132
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   133
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   134
    /** Report an error at the given position using the provided arguments.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   135
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   136
    protected void lexError(int pos, String key, Object... args) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   137
        log.error(pos, key, args);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   138
        tk = TokenKind.ERROR;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   139
        errPos = pos;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   140
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   141
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   142
    /** Read next character in character or string literal and copy into sbuf.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   143
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   144
    private void scanLitChar(int pos) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   145
        if (reader.ch == '\\') {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   146
            if (reader.peekChar() == '\\' && !reader.isUnicode()) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   147
                reader.skipChar();
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   148
                reader.putChar('\\', true);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   149
            } else {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   150
                reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   151
                switch (reader.ch) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   152
                case '0': case '1': case '2': case '3':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   153
                case '4': case '5': case '6': case '7':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   154
                    char leadch = reader.ch;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   155
                    int oct = reader.digit(pos, 8);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   156
                    reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   157
                    if ('0' <= reader.ch && reader.ch <= '7') {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   158
                        oct = oct * 8 + reader.digit(pos, 8);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   159
                        reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   160
                        if (leadch <= '3' && '0' <= reader.ch && reader.ch <= '7') {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   161
                            oct = oct * 8 + reader.digit(pos, 8);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   162
                            reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   163
                        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   164
                    }
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   165
                    reader.putChar((char)oct);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   166
                    break;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   167
                case 'b':
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   168
                    reader.putChar('\b', true); break;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   169
                case 't':
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   170
                    reader.putChar('\t', true); break;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   171
                case 'n':
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   172
                    reader.putChar('\n', true); break;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   173
                case 'f':
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   174
                    reader.putChar('\f', true); break;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   175
                case 'r':
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   176
                    reader.putChar('\r', true); break;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   177
                case '\'':
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   178
                    reader.putChar('\'', true); break;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   179
                case '\"':
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   180
                    reader.putChar('\"', true); break;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   181
                case '\\':
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   182
                    reader.putChar('\\', true); break;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   183
                default:
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   184
                    lexError(reader.bp, "illegal.esc.char");
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   185
                }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   186
            }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   187
        } else if (reader.bp != reader.buflen) {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   188
            reader.putChar(true);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   189
        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   190
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   191
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   192
    private void scanDigits(int pos, int digitRadix) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   193
        char saveCh;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   194
        int savePos;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   195
        do {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   196
            if (reader.ch != '_') {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   197
                reader.putChar(false);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   198
            } else {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   199
                if (!allowUnderscoresInLiterals) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   200
                    lexError(pos, "unsupported.underscore.lit", source.name);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   201
                    allowUnderscoresInLiterals = true;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   202
                }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   203
            }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   204
            saveCh = reader.ch;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   205
            savePos = reader.bp;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   206
            reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   207
        } while (reader.digit(pos, digitRadix) >= 0 || reader.ch == '_');
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   208
        if (saveCh == '_')
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   209
            lexError(savePos, "illegal.underscore");
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   210
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   211
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   212
    /** Read fractional part of hexadecimal floating point number.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   213
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   214
    private void scanHexExponentAndSuffix(int pos) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   215
        if (reader.ch == 'p' || reader.ch == 'P') {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   216
            reader.putChar(true);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   217
            skipIllegalUnderscores();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   218
            if (reader.ch == '+' || reader.ch == '-') {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   219
                reader.putChar(true);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   220
            }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   221
            skipIllegalUnderscores();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   222
            if ('0' <= reader.ch && reader.ch <= '9') {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   223
                scanDigits(pos, 10);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   224
                if (!allowHexFloats) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   225
                    lexError(pos, "unsupported.fp.lit", source.name);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   226
                    allowHexFloats = true;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   227
                }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   228
                else if (!hexFloatsWork)
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   229
                    lexError(pos, "unsupported.cross.fp.lit");
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   230
            } else
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   231
                lexError(pos, "malformed.fp.lit");
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   232
        } else {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   233
            lexError(pos, "malformed.fp.lit");
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   234
        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   235
        if (reader.ch == 'f' || reader.ch == 'F') {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   236
            reader.putChar(true);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   237
            tk = TokenKind.FLOATLITERAL;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   238
            radix = 16;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   239
        } else {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   240
            if (reader.ch == 'd' || reader.ch == 'D') {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   241
                reader.putChar(true);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   242
            }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   243
            tk = TokenKind.DOUBLELITERAL;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   244
            radix = 16;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   245
        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   246
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   247
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   248
    /** Read fractional part of floating point number.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   249
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   250
    private void scanFraction(int pos) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   251
        skipIllegalUnderscores();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   252
        if ('0' <= reader.ch && reader.ch <= '9') {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   253
            scanDigits(pos, 10);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   254
        }
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   255
        int sp1 = reader.sp;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   256
        if (reader.ch == 'e' || reader.ch == 'E') {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   257
            reader.putChar(true);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   258
            skipIllegalUnderscores();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   259
            if (reader.ch == '+' || reader.ch == '-') {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   260
                reader.putChar(true);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   261
            }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   262
            skipIllegalUnderscores();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   263
            if ('0' <= reader.ch && reader.ch <= '9') {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   264
                scanDigits(pos, 10);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   265
                return;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   266
            }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   267
            lexError(pos, "malformed.fp.lit");
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   268
            reader.sp = sp1;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   269
        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   270
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   271
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   272
    /** Read fractional part and 'd' or 'f' suffix of floating point number.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   273
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   274
    private void scanFractionAndSuffix(int pos) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   275
        radix = 10;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   276
        scanFraction(pos);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   277
        if (reader.ch == 'f' || reader.ch == 'F') {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   278
            reader.putChar(true);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   279
            tk = TokenKind.FLOATLITERAL;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   280
        } else {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   281
            if (reader.ch == 'd' || reader.ch == 'D') {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   282
                reader.putChar(true);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   283
            }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   284
            tk = TokenKind.DOUBLELITERAL;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   285
        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   286
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   287
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   288
    /** Read fractional part and 'd' or 'f' suffix of floating point number.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   289
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   290
    private void scanHexFractionAndSuffix(int pos, boolean seendigit) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   291
        radix = 16;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   292
        Assert.check(reader.ch == '.');
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   293
        reader.putChar(true);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   294
        skipIllegalUnderscores();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   295
        if (reader.digit(pos, 16) >= 0) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   296
            seendigit = true;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   297
            scanDigits(pos, 16);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   298
        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   299
        if (!seendigit)
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   300
            lexError(pos, "invalid.hex.number");
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   301
        else
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   302
            scanHexExponentAndSuffix(pos);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   303
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   304
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   305
    private void skipIllegalUnderscores() {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   306
        if (reader.ch == '_') {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   307
            lexError(reader.bp, "illegal.underscore");
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   308
            while (reader.ch == '_')
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   309
                reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   310
        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   311
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   312
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   313
    /** Read a number.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   314
     *  @param radix  The radix of the number; one of 2, j8, 10, 16.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   315
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   316
    private void scanNumber(int pos, int radix) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   317
        // for octal, allow base-10 digit in case it's a float literal
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   318
        this.radix = radix;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   319
        int digitRadix = (radix == 8 ? 10 : radix);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   320
        boolean seendigit = false;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   321
        if (reader.digit(pos, digitRadix) >= 0) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   322
            seendigit = true;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   323
            scanDigits(pos, digitRadix);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   324
        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   325
        if (radix == 16 && reader.ch == '.') {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   326
            scanHexFractionAndSuffix(pos, seendigit);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   327
        } else if (seendigit && radix == 16 && (reader.ch == 'p' || reader.ch == 'P')) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   328
            scanHexExponentAndSuffix(pos);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   329
        } else if (digitRadix == 10 && reader.ch == '.') {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   330
            reader.putChar(true);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   331
            scanFractionAndSuffix(pos);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   332
        } else if (digitRadix == 10 &&
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   333
                   (reader.ch == 'e' || reader.ch == 'E' ||
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   334
                    reader.ch == 'f' || reader.ch == 'F' ||
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   335
                    reader.ch == 'd' || reader.ch == 'D')) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   336
            scanFractionAndSuffix(pos);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   337
        } else {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   338
            if (reader.ch == 'l' || reader.ch == 'L') {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   339
                reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   340
                tk = TokenKind.LONGLITERAL;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   341
            } else {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   342
                tk = TokenKind.INTLITERAL;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   343
            }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   344
        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   345
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   346
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   347
    /** Read an identifier.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   348
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   349
    private void scanIdent() {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   350
        boolean isJavaIdentifierPart;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   351
        char high;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   352
        do {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   353
            reader.putChar(true);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   354
            switch (reader.ch) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   355
            case 'A': case 'B': case 'C': case 'D': case 'E':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   356
            case 'F': case 'G': case 'H': case 'I': case 'J':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   357
            case 'K': case 'L': case 'M': case 'N': case 'O':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   358
            case 'P': case 'Q': case 'R': case 'S': case 'T':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   359
            case 'U': case 'V': case 'W': case 'X': case 'Y':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   360
            case 'Z':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   361
            case 'a': case 'b': case 'c': case 'd': case 'e':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   362
            case 'f': case 'g': case 'h': case 'i': case 'j':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   363
            case 'k': case 'l': case 'm': case 'n': case 'o':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   364
            case 'p': case 'q': case 'r': case 's': case 't':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   365
            case 'u': case 'v': case 'w': case 'x': case 'y':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   366
            case 'z':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   367
            case '$': case '_':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   368
            case '0': case '1': case '2': case '3': case '4':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   369
            case '5': case '6': case '7': case '8': case '9':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   370
            case '\u0000': case '\u0001': case '\u0002': case '\u0003':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   371
            case '\u0004': case '\u0005': case '\u0006': case '\u0007':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   372
            case '\u0008': case '\u000E': case '\u000F': case '\u0010':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   373
            case '\u0011': case '\u0012': case '\u0013': case '\u0014':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   374
            case '\u0015': case '\u0016': case '\u0017':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   375
            case '\u0018': case '\u0019': case '\u001B':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   376
            case '\u007F':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   377
                break;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   378
            case '\u001A': // EOI is also a legal identifier part
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   379
                if (reader.bp >= reader.buflen) {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   380
                    name = reader.name();
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   381
                    tk = tokens.lookupKind(name);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   382
                    return;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   383
                }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   384
                break;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   385
            default:
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   386
                if (reader.ch < '\u0080') {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   387
                    // all ASCII range chars already handled, above
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   388
                    isJavaIdentifierPart = false;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   389
                } else {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   390
                    high = reader.scanSurrogates();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   391
                    if (high != 0) {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   392
                        reader.putChar(high);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   393
                        isJavaIdentifierPart = Character.isJavaIdentifierPart(
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   394
                            Character.toCodePoint(high, reader.ch));
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   395
                    } else {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   396
                        isJavaIdentifierPart = Character.isJavaIdentifierPart(reader.ch);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   397
                    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   398
                }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   399
                if (!isJavaIdentifierPart) {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   400
                    name = reader.name();
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   401
                    tk = tokens.lookupKind(name);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   402
                    return;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   403
                }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   404
            }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   405
        } while (true);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   406
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   407
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   408
    /** Return true if reader.ch can be part of an operator.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   409
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   410
    private boolean isSpecial(char ch) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   411
        switch (ch) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   412
        case '!': case '%': case '&': case '*': case '?':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   413
        case '+': case '-': case ':': case '<': case '=':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   414
        case '>': case '^': case '|': case '~':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   415
        case '@':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   416
            return true;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   417
        default:
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   418
            return false;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   419
        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   420
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   421
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   422
    /** Read longest possible sequence of special characters and convert
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   423
     *  to token.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   424
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   425
    private void scanOperator() {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   426
        while (true) {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   427
            reader.putChar(false);
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   428
            Name newname = reader.name();
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   429
            TokenKind tk1 = tokens.lookupKind(newname);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   430
            if (tk1 == TokenKind.IDENTIFIER) {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   431
                reader.sp--;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   432
                break;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   433
            }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   434
            tk = tk1;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   435
            reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   436
            if (!isSpecial(reader.ch)) break;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   437
        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   438
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   439
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   440
    /** Read token.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   441
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   442
    public Token readToken() {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   443
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   444
        reader.sp = 0;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   445
        name = null;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   446
        radix = 0;
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   447
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   448
        int pos = 0;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   449
        int endPos = 0;
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   450
        List<Comment> comments = null;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   451
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   452
        try {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   453
            loop: while (true) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   454
                pos = reader.bp;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   455
                switch (reader.ch) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   456
                case ' ': // (Spec 3.6)
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   457
                case '\t': // (Spec 3.6)
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   458
                case FF: // (Spec 3.6)
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   459
                    do {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   460
                        reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   461
                    } while (reader.ch == ' ' || reader.ch == '\t' || reader.ch == FF);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   462
                    processWhiteSpace(pos, reader.bp);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   463
                    break;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   464
                case LF: // (Spec 3.4)
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   465
                    reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   466
                    processLineTerminator(pos, reader.bp);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   467
                    break;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   468
                case CR: // (Spec 3.4)
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   469
                    reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   470
                    if (reader.ch == LF) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   471
                        reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   472
                    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   473
                    processLineTerminator(pos, reader.bp);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   474
                    break;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   475
                case 'A': case 'B': case 'C': case 'D': case 'E':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   476
                case 'F': case 'G': case 'H': case 'I': case 'J':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   477
                case 'K': case 'L': case 'M': case 'N': case 'O':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   478
                case 'P': case 'Q': case 'R': case 'S': case 'T':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   479
                case 'U': case 'V': case 'W': case 'X': case 'Y':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   480
                case 'Z':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   481
                case 'a': case 'b': case 'c': case 'd': case 'e':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   482
                case 'f': case 'g': case 'h': case 'i': case 'j':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   483
                case 'k': case 'l': case 'm': case 'n': case 'o':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   484
                case 'p': case 'q': case 'r': case 's': case 't':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   485
                case 'u': case 'v': case 'w': case 'x': case 'y':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   486
                case 'z':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   487
                case '$': case '_':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   488
                    scanIdent();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   489
                    break loop;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   490
                case '0':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   491
                    reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   492
                    if (reader.ch == 'x' || reader.ch == 'X') {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   493
                        reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   494
                        skipIllegalUnderscores();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   495
                        if (reader.ch == '.') {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   496
                            scanHexFractionAndSuffix(pos, false);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   497
                        } else if (reader.digit(pos, 16) < 0) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   498
                            lexError(pos, "invalid.hex.number");
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   499
                        } else {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   500
                            scanNumber(pos, 16);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   501
                        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   502
                    } else if (reader.ch == 'b' || reader.ch == 'B') {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   503
                        if (!allowBinaryLiterals) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   504
                            lexError(pos, "unsupported.binary.lit", source.name);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   505
                            allowBinaryLiterals = true;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   506
                        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   507
                        reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   508
                        skipIllegalUnderscores();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   509
                        if (reader.digit(pos, 2) < 0) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   510
                            lexError(pos, "invalid.binary.number");
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   511
                        } else {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   512
                            scanNumber(pos, 2);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   513
                        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   514
                    } else {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   515
                        reader.putChar('0');
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   516
                        if (reader.ch == '_') {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   517
                            int savePos = reader.bp;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   518
                            do {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   519
                                reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   520
                            } while (reader.ch == '_');
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   521
                            if (reader.digit(pos, 10) < 0) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   522
                                lexError(savePos, "illegal.underscore");
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   523
                            }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   524
                        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   525
                        scanNumber(pos, 8);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   526
                    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   527
                    break loop;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   528
                case '1': case '2': case '3': case '4':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   529
                case '5': case '6': case '7': case '8': case '9':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   530
                    scanNumber(pos, 10);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   531
                    break loop;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   532
                case '.':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   533
                    reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   534
                    if ('0' <= reader.ch && reader.ch <= '9') {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   535
                        reader.putChar('.');
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   536
                        scanFractionAndSuffix(pos);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   537
                    } else if (reader.ch == '.') {
11383
ae090403accf 4881269: improve diagnostic for ill-formed tokens
jjg
parents: 11144
diff changeset
   538
                        int savePos = reader.bp;
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   539
                        reader.putChar('.'); reader.putChar('.', true);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   540
                        if (reader.ch == '.') {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   541
                            reader.scanChar();
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   542
                            reader.putChar('.');
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   543
                            tk = TokenKind.ELLIPSIS;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   544
                        } else {
11383
ae090403accf 4881269: improve diagnostic for ill-formed tokens
jjg
parents: 11144
diff changeset
   545
                            lexError(savePos, "illegal.dot");
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   546
                        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   547
                    } else {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   548
                        tk = TokenKind.DOT;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   549
                    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   550
                    break loop;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   551
                case ',':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   552
                    reader.scanChar(); tk = TokenKind.COMMA; break loop;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   553
                case ';':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   554
                    reader.scanChar(); tk = TokenKind.SEMI; break loop;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   555
                case '(':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   556
                    reader.scanChar(); tk = TokenKind.LPAREN; break loop;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   557
                case ')':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   558
                    reader.scanChar(); tk = TokenKind.RPAREN; break loop;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   559
                case '[':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   560
                    reader.scanChar(); tk = TokenKind.LBRACKET; break loop;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   561
                case ']':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   562
                    reader.scanChar(); tk = TokenKind.RBRACKET; break loop;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   563
                case '{':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   564
                    reader.scanChar(); tk = TokenKind.LBRACE; break loop;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   565
                case '}':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   566
                    reader.scanChar(); tk = TokenKind.RBRACE; break loop;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   567
                case '/':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   568
                    reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   569
                    if (reader.ch == '/') {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   570
                        do {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   571
                            reader.scanCommentChar();
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   572
                        } while (reader.ch != CR && reader.ch != LF && reader.bp < reader.buflen);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   573
                        if (reader.bp < reader.buflen) {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   574
                            comments = addDocReader(comments, processComment(pos, reader.bp, CommentStyle.LINE));
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   575
                        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   576
                        break;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   577
                    } else if (reader.ch == '*') {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   578
                        boolean isEmpty = false;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   579
                        reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   580
                        CommentStyle style;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   581
                        if (reader.ch == '*') {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   582
                            style = CommentStyle.JAVADOC;
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   583
                            reader.scanCommentChar();
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   584
                            if (reader.ch == '/') {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   585
                                isEmpty = true;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   586
                            }
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   587
                        } else {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   588
                            style = CommentStyle.BLOCK;
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   589
                        }
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   590
                        while (!isEmpty && reader.bp < reader.buflen) {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   591
                            if (reader.ch == '*') {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   592
                                reader.scanChar();
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   593
                                if (reader.ch == '/') break;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   594
                            } else {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   595
                                reader.scanCommentChar();
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   596
                            }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   597
                        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   598
                        if (reader.ch == '/') {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   599
                            reader.scanChar();
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   600
                            comments = addDocReader(comments, processComment(pos, reader.bp, style));
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   601
                            break;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   602
                        } else {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   603
                            lexError(pos, "unclosed.comment");
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   604
                            break loop;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   605
                        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   606
                    } else if (reader.ch == '=') {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   607
                        tk = TokenKind.SLASHEQ;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   608
                        reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   609
                    } else {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   610
                        tk = TokenKind.SLASH;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   611
                    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   612
                    break loop;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   613
                case '\'':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   614
                    reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   615
                    if (reader.ch == '\'') {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   616
                        lexError(pos, "empty.char.lit");
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   617
                    } else {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   618
                        if (reader.ch == CR || reader.ch == LF)
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   619
                            lexError(pos, "illegal.line.end.in.char.lit");
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   620
                        scanLitChar(pos);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   621
                        char ch2 = reader.ch;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   622
                        if (reader.ch == '\'') {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   623
                            reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   624
                            tk = TokenKind.CHARLITERAL;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   625
                        } else {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   626
                            lexError(pos, "unclosed.char.lit");
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   627
                        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   628
                    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   629
                    break loop;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   630
                case '\"':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   631
                    reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   632
                    while (reader.ch != '\"' && reader.ch != CR && reader.ch != LF && reader.bp < reader.buflen)
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   633
                        scanLitChar(pos);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   634
                    if (reader.ch == '\"') {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   635
                        tk = TokenKind.STRINGLITERAL;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   636
                        reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   637
                    } else {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   638
                        lexError(pos, "unclosed.str.lit");
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   639
                    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   640
                    break loop;
11144
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 10948
diff changeset
   641
                case '#':
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 10948
diff changeset
   642
                    reader.scanChar();
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 10948
diff changeset
   643
                    tk = TokenKind.HASH;
8a4ae514eedf 7115052: Add parser support for method references
mcimadamore
parents: 10948
diff changeset
   644
                    break loop;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   645
                default:
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   646
                    if (isSpecial(reader.ch)) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   647
                        scanOperator();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   648
                    } else {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   649
                        boolean isJavaIdentifierStart;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   650
                        if (reader.ch < '\u0080') {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   651
                            // all ASCII range chars already handled, above
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   652
                            isJavaIdentifierStart = false;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   653
                        } else {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   654
                            char high = reader.scanSurrogates();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   655
                            if (high != 0) {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   656
                                reader.putChar(high);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   657
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   658
                                isJavaIdentifierStart = Character.isJavaIdentifierStart(
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   659
                                    Character.toCodePoint(high, reader.ch));
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   660
                            } else {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   661
                                isJavaIdentifierStart = Character.isJavaIdentifierStart(reader.ch);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   662
                            }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   663
                        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   664
                        if (isJavaIdentifierStart) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   665
                            scanIdent();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   666
                        } else if (reader.bp == reader.buflen || reader.ch == EOI && reader.bp + 1 == reader.buflen) { // JLS 3.5
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   667
                            tk = TokenKind.EOF;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   668
                            pos = reader.buflen;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   669
                        } else {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   670
                            lexError(pos, "illegal.char", String.valueOf((int)reader.ch));
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   671
                            reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   672
                        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   673
                    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   674
                    break loop;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   675
                }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   676
            }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   677
            endPos = reader.bp;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   678
            switch (tk.tag) {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   679
                case DEFAULT: return new Token(tk, pos, endPos, comments);
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   680
                case NAMED: return new NamedToken(tk, pos, endPos, name, comments);
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   681
                case STRING: return new StringToken(tk, pos, endPos, reader.chars(), comments);
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   682
                case NUMERIC: return new NumericToken(tk, pos, endPos, reader.chars(), radix, comments);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   683
                default: throw new AssertionError();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   684
            }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   685
        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   686
        finally {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   687
            if (scannerDebug) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   688
                    System.out.println("nextToken(" + pos
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   689
                                       + "," + endPos + ")=|" +
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   690
                                       new String(reader.getRawCharacters(pos, endPos))
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   691
                                       + "|");
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   692
            }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   693
        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   694
    }
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   695
    //where
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   696
        List<Comment> addDocReader(List<Comment> docReaders, Comment docReader) {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   697
            return docReaders == null ?
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   698
                    List.of(docReader) :
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   699
                    docReaders.prepend(docReader);
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   700
        }
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   701
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   702
    /** Return the position where a lexical error occurred;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   703
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   704
    public int errPos() {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   705
        return errPos;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   706
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   707
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   708
    /** Set the position where a lexical error occurred;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   709
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   710
    public void errPos(int pos) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   711
        errPos = pos;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   712
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   713
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   714
    /**
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   715
     * Called when a complete comment has been scanned. pos and endPos
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   716
     * will mark the comment boundary.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   717
     */
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   718
    protected Tokens.Comment processComment(int pos, int endPos, CommentStyle style) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   719
        if (scannerDebug)
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   720
            System.out.println("processComment(" + pos
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   721
                               + "," + endPos + "," + style + ")=|"
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   722
                               + new String(reader.getRawCharacters(pos, endPos))
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   723
                               + "|");
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   724
        char[] buf = reader.getRawCharacters(pos, endPos);
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   725
        return new BasicComment<UnicodeReader>(new UnicodeReader(fac, buf, buf.length), style);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   726
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   727
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   728
    /**
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   729
     * Called when a complete whitespace run has been scanned. pos and endPos
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   730
     * will mark the whitespace boundary.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   731
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   732
    protected void processWhiteSpace(int pos, int endPos) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   733
        if (scannerDebug)
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   734
            System.out.println("processWhitespace(" + pos
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   735
                               + "," + endPos + ")=|" +
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   736
                               new String(reader.getRawCharacters(pos, endPos))
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   737
                               + "|");
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   738
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   739
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   740
    /**
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   741
     * Called when a line terminator has been processed.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   742
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   743
    protected void processLineTerminator(int pos, int endPos) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   744
        if (scannerDebug)
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   745
            System.out.println("processTerminator(" + pos
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   746
                               + "," + endPos + ")=|" +
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   747
                               new String(reader.getRawCharacters(pos, endPos))
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   748
                               + "|");
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   749
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   750
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   751
    /** Build a map for translating between line numbers and
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   752
     * positions in the input.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   753
     *
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   754
     * @return a LineMap */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   755
    public Position.LineMap getLineMap() {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   756
        return Position.makeLineMap(reader.getRawCharacters(), reader.buflen, false);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   757
    }
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   758
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   759
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   760
    /**
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   761
    * Scan a documentation comment; determine if a deprecated tag is present.
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   762
    * Called once the initial /, * have been skipped, positioned at the second *
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   763
    * (which is treated as the beginning of the first line).
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   764
    * Stops positioned at the closing '/'.
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   765
    */
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   766
    protected class BasicComment<U extends UnicodeReader> implements Comment {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   767
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   768
        CommentStyle cs;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   769
        U comment_reader;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   770
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   771
        protected boolean deprecatedFlag = false;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   772
        protected boolean scanned = false;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   773
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   774
        protected BasicComment(U comment_reader, CommentStyle cs) {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   775
            this.comment_reader = comment_reader;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   776
            this.cs = cs;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   777
        }
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   778
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   779
        public String getText() {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   780
            return null;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   781
        }
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   782
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   783
        public CommentStyle getStyle() {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   784
            return cs;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   785
        }
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   786
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   787
        public boolean isDeprecated() {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   788
            if (!scanned && cs == CommentStyle.JAVADOC) {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   789
                scanDocComment();
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   790
            }
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   791
            return deprecatedFlag;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   792
        }
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   793
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   794
        @SuppressWarnings("fallthrough")
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   795
        protected void scanDocComment() {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   796
            try {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   797
                boolean deprecatedPrefix = false;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   798
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   799
                comment_reader.bp += 3; // '/**'
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   800
                comment_reader.ch = comment_reader.buf[comment_reader.bp];
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   801
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   802
                forEachLine:
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   803
                while (comment_reader.bp < comment_reader.buflen) {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   804
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   805
                    // Skip optional WhiteSpace at beginning of line
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   806
                    while (comment_reader.bp < comment_reader.buflen && (comment_reader.ch == ' ' || comment_reader.ch == '\t' || comment_reader.ch == FF)) {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   807
                        comment_reader.scanCommentChar();
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   808
                    }
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   809
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   810
                    // Skip optional consecutive Stars
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   811
                    while (comment_reader.bp < comment_reader.buflen && comment_reader.ch == '*') {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   812
                        comment_reader.scanCommentChar();
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   813
                        if (comment_reader.ch == '/') {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   814
                            return;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   815
                        }
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   816
                    }
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   817
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   818
                    // Skip optional WhiteSpace after Stars
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   819
                    while (comment_reader.bp < comment_reader.buflen && (comment_reader.ch == ' ' || comment_reader.ch == '\t' || comment_reader.ch == FF)) {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   820
                        comment_reader.scanCommentChar();
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   821
                    }
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   822
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   823
                    deprecatedPrefix = false;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   824
                    // At beginning of line in the JavaDoc sense.
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   825
                    if (!deprecatedFlag) {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   826
                        String deprecated = "@deprecated";
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   827
                        int i = 0;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   828
                        while (comment_reader.bp < comment_reader.buflen && comment_reader.ch == deprecated.charAt(i)) {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   829
                            comment_reader.scanCommentChar();
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   830
                            i++;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   831
                            if (i == deprecated.length()) {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   832
                                deprecatedPrefix = true;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   833
                                break;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   834
                            }
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   835
                        }
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   836
                    }
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   837
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   838
                    if (deprecatedPrefix && comment_reader.bp < comment_reader.buflen) {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   839
                        if (Character.isWhitespace(comment_reader.ch)) {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   840
                            deprecatedFlag = true;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   841
                        } else if (comment_reader.ch == '*') {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   842
                            comment_reader.scanCommentChar();
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   843
                            if (comment_reader.ch == '/') {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   844
                                deprecatedFlag = true;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   845
                                return;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   846
                            }
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   847
                        }
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   848
                    }
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   849
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   850
                    // Skip rest of line
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   851
                    while (comment_reader.bp < comment_reader.buflen) {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   852
                        switch (comment_reader.ch) {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   853
                            case '*':
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   854
                                comment_reader.scanCommentChar();
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   855
                                if (comment_reader.ch == '/') {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   856
                                    return;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   857
                                }
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   858
                                break;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   859
                            case CR: // (Spec 3.4)
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   860
                                comment_reader.scanCommentChar();
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   861
                                if (comment_reader.ch != LF) {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   862
                                    continue forEachLine;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   863
                                }
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   864
                            /* fall through to LF case */
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   865
                            case LF: // (Spec 3.4)
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   866
                                comment_reader.scanCommentChar();
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   867
                                continue forEachLine;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   868
                            default:
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   869
                                comment_reader.scanCommentChar();
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   870
                        }
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   871
                    } // rest of line
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   872
                } // forEachLine
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   873
                return;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   874
            } finally {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   875
                scanned = true;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   876
            }
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   877
        }
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   878
    }
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   879
}