src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
author jlaskey
Wed, 09 Jan 2019 11:13:00 -0400
changeset 53227 f15d443f9731
parent 51713 d424675a9743
child 55263 830ca7b43b95
child 58678 9cf78a70fa4f
permissions -rw-r--r--
8215681: Remove compiler support for Raw String Literals from JDK 12 Reviewed-by: mcimadamore, jlahoda, sundar
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
     1
/*
50898
12133a6e2613 8205418: Assorted improvements to source code model
jlahoda
parents: 49580
diff changeset
     2
 * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
10815
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
49580
62b908c9f0e6 8199194: Add javac support for preview features
mcimadamore
parents: 48054
diff changeset
    28
import com.sun.tools.javac.code.Preview;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    29
import com.sun.tools.javac.code.Source;
48054
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47216
diff changeset
    30
import com.sun.tools.javac.code.Source.Feature;
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
    31
import com.sun.tools.javac.parser.Tokens.Comment.CommentStyle;
48054
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47216
diff changeset
    32
import com.sun.tools.javac.resources.CompilerProperties.Errors;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    33
import com.sun.tools.javac.util.*;
48054
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47216
diff changeset
    34
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticFlag;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    35
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
    36
import java.nio.CharBuffer;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    37
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    38
import static com.sun.tools.javac.parser.Tokens.*;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    39
import static com.sun.tools.javac.util.LayoutCharacters.*;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    40
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    41
/** The lexical analyzer maps an input stream consisting of
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    42
 *  ASCII characters and Unicode escapes into a token sequence.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    43
 *
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    44
 *  <p><b>This is NOT part of any supported API.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    45
 *  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
    46
 *  This code and its internal interfaces are subject to change or
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    47
 *  deletion without notice.</b>
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    48
 */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    49
public class JavaTokenizer {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    50
14801
d66cab4ef397 8003967: detect and remove all mutable implicit static enum fields in langtools
vromero
parents: 14720
diff changeset
    51
    private static final boolean scannerDebug = false;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    52
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    53
    /** The source language setting.
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 Source source;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    56
49580
62b908c9f0e6 8199194: Add javac support for preview features
mcimadamore
parents: 48054
diff changeset
    57
    /** The preview language setting. */
62b908c9f0e6 8199194: Add javac support for preview features
mcimadamore
parents: 48054
diff changeset
    58
    private Preview preview;
62b908c9f0e6 8199194: Add javac support for preview features
mcimadamore
parents: 48054
diff changeset
    59
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    60
    /** The log to be used for error reporting.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    61
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    62
    private final Log log;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    63
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    64
    /** The token factory. */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    65
    private final Tokens tokens;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    66
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    67
    /** The token kind, set by nextToken().
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    68
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    69
    protected TokenKind tk;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    70
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    71
    /** The token's radix, set by nextToken().
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    72
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    73
    protected int radix;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    74
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    75
    /** The token's name, set by nextToken().
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    76
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    77
    protected Name name;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    78
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    79
    /** The position where a lexical error occurred;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    80
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    81
    protected int errPos = Position.NOPOS;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    82
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
    83
    /** The Unicode reader (low-level stream reader).
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    84
     */
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
    85
    protected UnicodeReader reader;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    86
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
    87
    protected ScannerFactory fac;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    88
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    89
    private static final boolean hexFloatsWork = hexFloatsWork();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    90
    private static boolean hexFloatsWork() {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    91
        try {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    92
            Float.valueOf("0x1.0p1");
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    93
            return true;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    94
        } catch (NumberFormatException ex) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    95
            return false;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    96
        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    97
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    98
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
    99
    /**
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   100
     * Create a scanner from the input array.  This method might
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   101
     * modify the array.  To avoid copying the input array, ensure
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   102
     * that {@code inputLength < input.length} or
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   103
     * {@code input[input.length -1]} is a white space character.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   104
     *
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   105
     * @param fac the factory which created this Scanner
14259
fb94a1df0d53 8000208: fix langtools javadoc comment issues
jjg
parents: 14062
diff changeset
   106
     * @param buf the input, might be modified
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   107
     * Must be positive and less than or equal to input.length.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   108
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   109
    protected JavaTokenizer(ScannerFactory fac, CharBuffer buf) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   110
        this(fac, new UnicodeReader(fac, buf));
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   111
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   112
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   113
    protected JavaTokenizer(ScannerFactory fac, char[] buf, int inputLength) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   114
        this(fac, new UnicodeReader(fac, buf, inputLength));
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   115
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   116
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   117
    protected JavaTokenizer(ScannerFactory fac, UnicodeReader reader) {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   118
        this.fac = fac;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   119
        this.log = fac.log;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   120
        this.tokens = fac.tokens;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   121
        this.source = fac.source;
49580
62b908c9f0e6 8199194: Add javac support for preview features
mcimadamore
parents: 48054
diff changeset
   122
        this.preview = fac.preview;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   123
        this.reader = reader;
48054
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47216
diff changeset
   124
    }
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47216
diff changeset
   125
49580
62b908c9f0e6 8199194: Add javac support for preview features
mcimadamore
parents: 48054
diff changeset
   126
    protected void checkSourceLevel(int pos, Feature feature) {
62b908c9f0e6 8199194: Add javac support for preview features
mcimadamore
parents: 48054
diff changeset
   127
        if (preview.isPreview(feature) && !preview.isEnabled()) {
62b908c9f0e6 8199194: Add javac support for preview features
mcimadamore
parents: 48054
diff changeset
   128
            //preview feature without --preview flag, error
62b908c9f0e6 8199194: Add javac support for preview features
mcimadamore
parents: 48054
diff changeset
   129
            lexError(DiagnosticFlag.SOURCE_LEVEL, pos, preview.disabledError(feature));
62b908c9f0e6 8199194: Add javac support for preview features
mcimadamore
parents: 48054
diff changeset
   130
        } else if (!feature.allowedInSource(source)) {
62b908c9f0e6 8199194: Add javac support for preview features
mcimadamore
parents: 48054
diff changeset
   131
            //incompatible source level, error
48054
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47216
diff changeset
   132
            lexError(DiagnosticFlag.SOURCE_LEVEL, pos, feature.error(source.name));
49580
62b908c9f0e6 8199194: Add javac support for preview features
mcimadamore
parents: 48054
diff changeset
   133
        } else if (preview.isPreview(feature)) {
62b908c9f0e6 8199194: Add javac support for preview features
mcimadamore
parents: 48054
diff changeset
   134
            //use of preview feature, warn
62b908c9f0e6 8199194: Add javac support for preview features
mcimadamore
parents: 48054
diff changeset
   135
            preview.warnPreview(pos, feature);
48054
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47216
diff changeset
   136
        }
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   137
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   138
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   139
    /** Report an error at the given position using the provided arguments.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   140
     */
48054
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47216
diff changeset
   141
    protected void lexError(int pos, JCDiagnostic.Error key) {
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47216
diff changeset
   142
        log.error(pos, key);
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47216
diff changeset
   143
        tk = TokenKind.ERROR;
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47216
diff changeset
   144
        errPos = pos;
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47216
diff changeset
   145
    }
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47216
diff changeset
   146
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47216
diff changeset
   147
    protected void lexError(DiagnosticFlag flags, int pos, JCDiagnostic.Error key) {
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47216
diff changeset
   148
        log.error(flags, pos, key);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   149
        tk = TokenKind.ERROR;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   150
        errPos = pos;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   151
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   152
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   153
    /** Read next character in character or string literal and copy into sbuf.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   154
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   155
    private void scanLitChar(int pos) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   156
        if (reader.ch == '\\') {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   157
            if (reader.peekChar() == '\\' && !reader.isUnicode()) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   158
                reader.skipChar();
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   159
                reader.putChar('\\', true);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   160
            } else {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   161
                reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   162
                switch (reader.ch) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   163
                case '0': case '1': case '2': case '3':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   164
                case '4': case '5': case '6': case '7':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   165
                    char leadch = reader.ch;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   166
                    int oct = reader.digit(pos, 8);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   167
                    reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   168
                    if ('0' <= reader.ch && reader.ch <= '7') {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   169
                        oct = oct * 8 + reader.digit(pos, 8);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   170
                        reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   171
                        if (leadch <= '3' && '0' <= reader.ch && reader.ch <= '7') {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   172
                            oct = oct * 8 + reader.digit(pos, 8);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   173
                            reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   174
                        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   175
                    }
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   176
                    reader.putChar((char)oct);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   177
                    break;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   178
                case 'b':
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   179
                    reader.putChar('\b', true); break;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   180
                case 't':
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   181
                    reader.putChar('\t', true); break;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   182
                case 'n':
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   183
                    reader.putChar('\n', true); break;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   184
                case 'f':
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   185
                    reader.putChar('\f', true); break;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   186
                case 'r':
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   187
                    reader.putChar('\r', true); break;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   188
                case '\'':
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   189
                    reader.putChar('\'', true); break;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   190
                case '\"':
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   191
                    reader.putChar('\"', true); break;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   192
                case '\\':
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   193
                    reader.putChar('\\', true); break;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   194
                default:
48054
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47216
diff changeset
   195
                    lexError(reader.bp, Errors.IllegalEscChar);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   196
                }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   197
            }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   198
        } else if (reader.bp != reader.buflen) {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   199
            reader.putChar(true);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   200
        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   201
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   202
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   203
    private void scanDigits(int pos, int digitRadix) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   204
        char saveCh;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   205
        int savePos;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   206
        do {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   207
            if (reader.ch != '_') {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   208
                reader.putChar(false);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   209
            }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   210
            saveCh = reader.ch;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   211
            savePos = reader.bp;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   212
            reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   213
        } while (reader.digit(pos, digitRadix) >= 0 || reader.ch == '_');
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   214
        if (saveCh == '_')
48054
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47216
diff changeset
   215
            lexError(savePos, Errors.IllegalUnderscore);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   216
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   217
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   218
    /** Read fractional part of hexadecimal floating point number.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   219
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   220
    private void scanHexExponentAndSuffix(int pos) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   221
        if (reader.ch == 'p' || reader.ch == 'P') {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   222
            reader.putChar(true);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   223
            skipIllegalUnderscores();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   224
            if (reader.ch == '+' || reader.ch == '-') {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   225
                reader.putChar(true);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   226
            }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   227
            skipIllegalUnderscores();
25600
7f93cb0536fd 8048805: Request to investigate and update lexer error recovery in javac
jlahoda
parents: 25445
diff changeset
   228
            if (reader.digit(pos, 10) >= 0) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   229
                scanDigits(pos, 10);
25445
603f0c93d5c9 8011044: Remove support for 1.5 and earlier source and target options
ntoda
parents: 22163
diff changeset
   230
                if (!hexFloatsWork)
48054
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47216
diff changeset
   231
                    lexError(pos, Errors.UnsupportedCrossFpLit);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   232
            } else
48054
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47216
diff changeset
   233
                lexError(pos, Errors.MalformedFpLit);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   234
        } else {
48054
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47216
diff changeset
   235
            lexError(pos, Errors.MalformedFpLit);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   236
        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   237
        if (reader.ch == 'f' || reader.ch == 'F') {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   238
            reader.putChar(true);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   239
            tk = TokenKind.FLOATLITERAL;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   240
            radix = 16;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   241
        } else {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   242
            if (reader.ch == 'd' || reader.ch == 'D') {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   243
                reader.putChar(true);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   244
            }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   245
            tk = TokenKind.DOUBLELITERAL;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   246
            radix = 16;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   247
        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   248
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   249
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   250
    /** Read fractional part of floating point number.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   251
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   252
    private void scanFraction(int pos) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   253
        skipIllegalUnderscores();
25600
7f93cb0536fd 8048805: Request to investigate and update lexer error recovery in javac
jlahoda
parents: 25445
diff changeset
   254
        if (reader.digit(pos, 10) >= 0) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   255
            scanDigits(pos, 10);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   256
        }
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   257
        int sp1 = reader.sp;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   258
        if (reader.ch == 'e' || reader.ch == 'E') {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   259
            reader.putChar(true);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   260
            skipIllegalUnderscores();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   261
            if (reader.ch == '+' || reader.ch == '-') {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   262
                reader.putChar(true);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   263
            }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   264
            skipIllegalUnderscores();
25600
7f93cb0536fd 8048805: Request to investigate and update lexer error recovery in javac
jlahoda
parents: 25445
diff changeset
   265
            if (reader.digit(pos, 10) >= 0) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   266
                scanDigits(pos, 10);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   267
                return;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   268
            }
48054
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47216
diff changeset
   269
            lexError(pos, Errors.MalformedFpLit);
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   270
            reader.sp = sp1;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   271
        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   272
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   273
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   274
    /** Read fractional part and 'd' or 'f' suffix of floating point number.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   275
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   276
    private void scanFractionAndSuffix(int pos) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   277
        radix = 10;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   278
        scanFraction(pos);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   279
        if (reader.ch == 'f' || reader.ch == 'F') {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   280
            reader.putChar(true);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   281
            tk = TokenKind.FLOATLITERAL;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   282
        } else {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   283
            if (reader.ch == 'd' || reader.ch == 'D') {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   284
                reader.putChar(true);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   285
            }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   286
            tk = TokenKind.DOUBLELITERAL;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   287
        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   288
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   289
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   290
    /** Read fractional part and 'd' or 'f' suffix of floating point number.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   291
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   292
    private void scanHexFractionAndSuffix(int pos, boolean seendigit) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   293
        radix = 16;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   294
        Assert.check(reader.ch == '.');
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   295
        reader.putChar(true);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   296
        skipIllegalUnderscores();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   297
        if (reader.digit(pos, 16) >= 0) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   298
            seendigit = true;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   299
            scanDigits(pos, 16);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   300
        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   301
        if (!seendigit)
48054
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47216
diff changeset
   302
            lexError(pos, Errors.InvalidHexNumber);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   303
        else
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   304
            scanHexExponentAndSuffix(pos);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   305
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   306
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   307
    private void skipIllegalUnderscores() {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   308
        if (reader.ch == '_') {
48054
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47216
diff changeset
   309
            lexError(reader.bp, Errors.IllegalUnderscore);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   310
            while (reader.ch == '_')
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   311
                reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   312
        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   313
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   314
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   315
    /** Read a number.
34997
8174a7d851fb 8056897: Improve error recovery for empty binary and hexadecimal literals.
jlahoda
parents: 25874
diff changeset
   316
     *  @param radix  The radix of the number; one of 2, 8, 10, 16.
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   317
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   318
    private void scanNumber(int pos, int radix) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   319
        // for octal, allow base-10 digit in case it's a float literal
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   320
        this.radix = radix;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   321
        int digitRadix = (radix == 8 ? 10 : radix);
34997
8174a7d851fb 8056897: Improve error recovery for empty binary and hexadecimal literals.
jlahoda
parents: 25874
diff changeset
   322
        int firstDigit = reader.digit(pos, Math.max(10, digitRadix));
8174a7d851fb 8056897: Improve error recovery for empty binary and hexadecimal literals.
jlahoda
parents: 25874
diff changeset
   323
        boolean seendigit = firstDigit >= 0;
8174a7d851fb 8056897: Improve error recovery for empty binary and hexadecimal literals.
jlahoda
parents: 25874
diff changeset
   324
        boolean seenValidDigit = firstDigit >= 0 && firstDigit < digitRadix;
8174a7d851fb 8056897: Improve error recovery for empty binary and hexadecimal literals.
jlahoda
parents: 25874
diff changeset
   325
        if (seendigit) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   326
            scanDigits(pos, digitRadix);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   327
        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   328
        if (radix == 16 && reader.ch == '.') {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   329
            scanHexFractionAndSuffix(pos, seendigit);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   330
        } else if (seendigit && radix == 16 && (reader.ch == 'p' || reader.ch == 'P')) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   331
            scanHexExponentAndSuffix(pos);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   332
        } else if (digitRadix == 10 && reader.ch == '.') {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   333
            reader.putChar(true);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   334
            scanFractionAndSuffix(pos);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   335
        } else if (digitRadix == 10 &&
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   336
                   (reader.ch == 'e' || reader.ch == 'E' ||
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   337
                    reader.ch == 'f' || reader.ch == 'F' ||
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   338
                    reader.ch == 'd' || reader.ch == 'D')) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   339
            scanFractionAndSuffix(pos);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   340
        } else {
34997
8174a7d851fb 8056897: Improve error recovery for empty binary and hexadecimal literals.
jlahoda
parents: 25874
diff changeset
   341
            if (!seenValidDigit) {
8174a7d851fb 8056897: Improve error recovery for empty binary and hexadecimal literals.
jlahoda
parents: 25874
diff changeset
   342
                switch (radix) {
8174a7d851fb 8056897: Improve error recovery for empty binary and hexadecimal literals.
jlahoda
parents: 25874
diff changeset
   343
                case 2:
48054
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47216
diff changeset
   344
                    lexError(pos, Errors.InvalidBinaryNumber);
34997
8174a7d851fb 8056897: Improve error recovery for empty binary and hexadecimal literals.
jlahoda
parents: 25874
diff changeset
   345
                    break;
8174a7d851fb 8056897: Improve error recovery for empty binary and hexadecimal literals.
jlahoda
parents: 25874
diff changeset
   346
                case 16:
48054
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47216
diff changeset
   347
                    lexError(pos, Errors.InvalidHexNumber);
34997
8174a7d851fb 8056897: Improve error recovery for empty binary and hexadecimal literals.
jlahoda
parents: 25874
diff changeset
   348
                    break;
8174a7d851fb 8056897: Improve error recovery for empty binary and hexadecimal literals.
jlahoda
parents: 25874
diff changeset
   349
                }
8174a7d851fb 8056897: Improve error recovery for empty binary and hexadecimal literals.
jlahoda
parents: 25874
diff changeset
   350
            }
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   351
            if (reader.ch == 'l' || reader.ch == 'L') {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   352
                reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   353
                tk = TokenKind.LONGLITERAL;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   354
            } else {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   355
                tk = TokenKind.INTLITERAL;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   356
            }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   357
        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   358
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   359
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   360
    /** Read an identifier.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   361
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   362
    private void scanIdent() {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   363
        boolean isJavaIdentifierPart;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   364
        char high;
14720
c24c61d0d9a6 7144981: javac should ignore ignorable characters in input
vromero
parents: 14370
diff changeset
   365
        reader.putChar(true);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   366
        do {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   367
            switch (reader.ch) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   368
            case 'A': case 'B': case 'C': case 'D': case 'E':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   369
            case 'F': case 'G': case 'H': case 'I': case 'J':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   370
            case 'K': case 'L': case 'M': case 'N': case 'O':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   371
            case 'P': case 'Q': case 'R': case 'S': case 'T':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   372
            case 'U': case 'V': case 'W': case 'X': case 'Y':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   373
            case 'Z':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   374
            case 'a': case 'b': case 'c': case 'd': case 'e':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   375
            case 'f': case 'g': case 'h': case 'i': case 'j':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   376
            case 'k': case 'l': case 'm': case 'n': case 'o':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   377
            case 'p': case 'q': case 'r': case 's': case 't':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   378
            case 'u': case 'v': case 'w': case 'x': case 'y':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   379
            case 'z':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   380
            case '$': case '_':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   381
            case '0': case '1': case '2': case '3': case '4':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   382
            case '5': case '6': case '7': case '8': case '9':
14720
c24c61d0d9a6 7144981: javac should ignore ignorable characters in input
vromero
parents: 14370
diff changeset
   383
                break;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   384
            case '\u0000': case '\u0001': case '\u0002': case '\u0003':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   385
            case '\u0004': case '\u0005': case '\u0006': case '\u0007':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   386
            case '\u0008': case '\u000E': case '\u000F': case '\u0010':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   387
            case '\u0011': case '\u0012': case '\u0013': case '\u0014':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   388
            case '\u0015': case '\u0016': case '\u0017':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   389
            case '\u0018': case '\u0019': case '\u001B':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   390
            case '\u007F':
14720
c24c61d0d9a6 7144981: javac should ignore ignorable characters in input
vromero
parents: 14370
diff changeset
   391
                reader.scanChar();
c24c61d0d9a6 7144981: javac should ignore ignorable characters in input
vromero
parents: 14370
diff changeset
   392
                continue;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   393
            case '\u001A': // EOI is also a legal identifier part
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   394
                if (reader.bp >= reader.buflen) {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   395
                    name = reader.name();
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   396
                    tk = tokens.lookupKind(name);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   397
                    return;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   398
                }
14720
c24c61d0d9a6 7144981: javac should ignore ignorable characters in input
vromero
parents: 14370
diff changeset
   399
                reader.scanChar();
c24c61d0d9a6 7144981: javac should ignore ignorable characters in input
vromero
parents: 14370
diff changeset
   400
                continue;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   401
            default:
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   402
                if (reader.ch < '\u0080') {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   403
                    // all ASCII range chars already handled, above
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   404
                    isJavaIdentifierPart = false;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   405
                } else {
14720
c24c61d0d9a6 7144981: javac should ignore ignorable characters in input
vromero
parents: 14370
diff changeset
   406
                    if (Character.isIdentifierIgnorable(reader.ch)) {
c24c61d0d9a6 7144981: javac should ignore ignorable characters in input
vromero
parents: 14370
diff changeset
   407
                        reader.scanChar();
c24c61d0d9a6 7144981: javac should ignore ignorable characters in input
vromero
parents: 14370
diff changeset
   408
                        continue;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   409
                    } else {
25600
7f93cb0536fd 8048805: Request to investigate and update lexer error recovery in javac
jlahoda
parents: 25445
diff changeset
   410
                        int codePoint = reader.peekSurrogates();
7f93cb0536fd 8048805: Request to investigate and update lexer error recovery in javac
jlahoda
parents: 25445
diff changeset
   411
                        if (codePoint >= 0) {
7f93cb0536fd 8048805: Request to investigate and update lexer error recovery in javac
jlahoda
parents: 25445
diff changeset
   412
                            if (isJavaIdentifierPart = Character.isJavaIdentifierPart(codePoint)) {
7f93cb0536fd 8048805: Request to investigate and update lexer error recovery in javac
jlahoda
parents: 25445
diff changeset
   413
                                reader.putChar(true);
7f93cb0536fd 8048805: Request to investigate and update lexer error recovery in javac
jlahoda
parents: 25445
diff changeset
   414
                            }
14720
c24c61d0d9a6 7144981: javac should ignore ignorable characters in input
vromero
parents: 14370
diff changeset
   415
                        } else {
c24c61d0d9a6 7144981: javac should ignore ignorable characters in input
vromero
parents: 14370
diff changeset
   416
                            isJavaIdentifierPart = Character.isJavaIdentifierPart(reader.ch);
c24c61d0d9a6 7144981: javac should ignore ignorable characters in input
vromero
parents: 14370
diff changeset
   417
                        }
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   418
                    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   419
                }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   420
                if (!isJavaIdentifierPart) {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   421
                    name = reader.name();
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   422
                    tk = tokens.lookupKind(name);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   423
                    return;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   424
                }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   425
            }
14720
c24c61d0d9a6 7144981: javac should ignore ignorable characters in input
vromero
parents: 14370
diff changeset
   426
            reader.putChar(true);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   427
        } while (true);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   428
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   429
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   430
    /** Return true if reader.ch can be part of an operator.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   431
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   432
    private boolean isSpecial(char ch) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   433
        switch (ch) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   434
        case '!': case '%': case '&': case '*': case '?':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   435
        case '+': case '-': case ':': case '<': case '=':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   436
        case '>': case '^': case '|': case '~':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   437
        case '@':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   438
            return true;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   439
        default:
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   440
            return false;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   441
        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   442
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   443
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   444
    /** Read longest possible sequence of special characters and convert
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   445
     *  to token.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   446
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   447
    private void scanOperator() {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   448
        while (true) {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   449
            reader.putChar(false);
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   450
            Name newname = reader.name();
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   451
            TokenKind tk1 = tokens.lookupKind(newname);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   452
            if (tk1 == TokenKind.IDENTIFIER) {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   453
                reader.sp--;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   454
                break;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   455
            }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   456
            tk = tk1;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   457
            reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   458
            if (!isSpecial(reader.ch)) break;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   459
        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   460
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   461
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   462
    /** Read token.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   463
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   464
    public Token readToken() {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   465
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   466
        reader.sp = 0;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   467
        name = null;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   468
        radix = 0;
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   469
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   470
        int pos = 0;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   471
        int endPos = 0;
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   472
        List<Comment> comments = null;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   473
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   474
        try {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   475
            loop: while (true) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   476
                pos = reader.bp;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   477
                switch (reader.ch) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   478
                case ' ': // (Spec 3.6)
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   479
                case '\t': // (Spec 3.6)
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   480
                case FF: // (Spec 3.6)
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   481
                    do {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   482
                        reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   483
                    } while (reader.ch == ' ' || reader.ch == '\t' || reader.ch == FF);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   484
                    processWhiteSpace(pos, reader.bp);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   485
                    break;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   486
                case LF: // (Spec 3.4)
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   487
                    reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   488
                    processLineTerminator(pos, reader.bp);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   489
                    break;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   490
                case CR: // (Spec 3.4)
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 == LF) {
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
                    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   495
                    processLineTerminator(pos, reader.bp);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   496
                    break;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   497
                case 'A': case 'B': case 'C': case 'D': case 'E':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   498
                case 'F': case 'G': case 'H': case 'I': case 'J':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   499
                case 'K': case 'L': case 'M': case 'N': case 'O':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   500
                case 'P': case 'Q': case 'R': case 'S': case 'T':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   501
                case 'U': case 'V': case 'W': case 'X': case 'Y':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   502
                case 'Z':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   503
                case 'a': case 'b': case 'c': case 'd': case 'e':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   504
                case 'f': case 'g': case 'h': case 'i': case 'j':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   505
                case 'k': case 'l': case 'm': case 'n': case 'o':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   506
                case 'p': case 'q': case 'r': case 's': case 't':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   507
                case 'u': case 'v': case 'w': case 'x': case 'y':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   508
                case 'z':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   509
                case '$': case '_':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   510
                    scanIdent();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   511
                    break loop;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   512
                case '0':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   513
                    reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   514
                    if (reader.ch == 'x' || reader.ch == 'X') {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   515
                        reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   516
                        skipIllegalUnderscores();
34997
8174a7d851fb 8056897: Improve error recovery for empty binary and hexadecimal literals.
jlahoda
parents: 25874
diff changeset
   517
                        scanNumber(pos, 16);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   518
                    } else if (reader.ch == 'b' || reader.ch == 'B') {
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
                        skipIllegalUnderscores();
34997
8174a7d851fb 8056897: Improve error recovery for empty binary and hexadecimal literals.
jlahoda
parents: 25874
diff changeset
   521
                        scanNumber(pos, 2);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   522
                    } else {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   523
                        reader.putChar('0');
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   524
                        if (reader.ch == '_') {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   525
                            int savePos = reader.bp;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   526
                            do {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   527
                                reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   528
                            } while (reader.ch == '_');
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   529
                            if (reader.digit(pos, 10) < 0) {
48054
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47216
diff changeset
   530
                                lexError(savePos, Errors.IllegalUnderscore);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   531
                            }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   532
                        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   533
                        scanNumber(pos, 8);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   534
                    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   535
                    break loop;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   536
                case '1': case '2': case '3': case '4':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   537
                case '5': case '6': case '7': case '8': case '9':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   538
                    scanNumber(pos, 10);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   539
                    break loop;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   540
                case '.':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   541
                    reader.scanChar();
25600
7f93cb0536fd 8048805: Request to investigate and update lexer error recovery in javac
jlahoda
parents: 25445
diff changeset
   542
                    if (reader.digit(pos, 10) >= 0) {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   543
                        reader.putChar('.');
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   544
                        scanFractionAndSuffix(pos);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   545
                    } else if (reader.ch == '.') {
11383
ae090403accf 4881269: improve diagnostic for ill-formed tokens
jjg
parents: 11144
diff changeset
   546
                        int savePos = reader.bp;
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   547
                        reader.putChar('.'); reader.putChar('.', true);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   548
                        if (reader.ch == '.') {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   549
                            reader.scanChar();
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   550
                            reader.putChar('.');
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   551
                            tk = TokenKind.ELLIPSIS;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   552
                        } else {
48054
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47216
diff changeset
   553
                            lexError(savePos, Errors.IllegalDot);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   554
                        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   555
                    } else {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   556
                        tk = TokenKind.DOT;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   557
                    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   558
                    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.COMMA; 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.SEMI; 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.LPAREN; 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.RPAREN; 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(); tk = TokenKind.LBRACKET; break loop;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   569
                case ']':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   570
                    reader.scanChar(); tk = TokenKind.RBRACKET; break loop;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   571
                case '{':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   572
                    reader.scanChar(); tk = TokenKind.LBRACE; break loop;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   573
                case '}':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   574
                    reader.scanChar(); tk = TokenKind.RBRACE; break loop;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   575
                case '/':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   576
                    reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   577
                    if (reader.ch == '/') {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   578
                        do {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   579
                            reader.scanCommentChar();
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   580
                        } while (reader.ch != CR && reader.ch != LF && reader.bp < reader.buflen);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   581
                        if (reader.bp < reader.buflen) {
13077
16fb753bb5dc 7174143: encapsulate doc comment table
jjg
parents: 11383
diff changeset
   582
                            comments = addComment(comments, processComment(pos, reader.bp, CommentStyle.LINE));
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   583
                        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   584
                        break;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   585
                    } else if (reader.ch == '*') {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   586
                        boolean isEmpty = false;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   587
                        reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   588
                        CommentStyle style;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   589
                        if (reader.ch == '*') {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   590
                            style = CommentStyle.JAVADOC;
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   591
                            reader.scanCommentChar();
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   592
                            if (reader.ch == '/') {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   593
                                isEmpty = true;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   594
                            }
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   595
                        } else {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   596
                            style = CommentStyle.BLOCK;
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   597
                        }
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   598
                        while (!isEmpty && reader.bp < reader.buflen) {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   599
                            if (reader.ch == '*') {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   600
                                reader.scanChar();
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   601
                                if (reader.ch == '/') break;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   602
                            } else {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   603
                                reader.scanCommentChar();
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   604
                            }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   605
                        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   606
                        if (reader.ch == '/') {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   607
                            reader.scanChar();
13077
16fb753bb5dc 7174143: encapsulate doc comment table
jjg
parents: 11383
diff changeset
   608
                            comments = addComment(comments, processComment(pos, reader.bp, style));
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   609
                            break;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   610
                        } else {
48054
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47216
diff changeset
   611
                            lexError(pos, Errors.UnclosedComment);
10815
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
                        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   614
                    } else if (reader.ch == '=') {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   615
                        tk = TokenKind.SLASHEQ;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   616
                        reader.scanChar();
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
                        tk = TokenKind.SLASH;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   619
                    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   620
                    break loop;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   621
                case '\'':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   622
                    reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   623
                    if (reader.ch == '\'') {
48054
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47216
diff changeset
   624
                        lexError(pos, Errors.EmptyCharLit);
25600
7f93cb0536fd 8048805: Request to investigate and update lexer error recovery in javac
jlahoda
parents: 25445
diff changeset
   625
                        reader.scanChar();
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   626
                    } else {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   627
                        if (reader.ch == CR || reader.ch == LF)
48054
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47216
diff changeset
   628
                            lexError(pos, Errors.IllegalLineEndInCharLit);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   629
                        scanLitChar(pos);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   630
                        if (reader.ch == '\'') {
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
                            tk = TokenKind.CHARLITERAL;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   633
                        } else {
48054
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47216
diff changeset
   634
                            lexError(pos, Errors.UnclosedCharLit);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   635
                        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   636
                    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   637
                    break loop;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   638
                case '\"':
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   639
                    reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   640
                    while (reader.ch != '\"' && reader.ch != CR && reader.ch != LF && reader.bp < reader.buflen)
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   641
                        scanLitChar(pos);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   642
                    if (reader.ch == '\"') {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   643
                        tk = TokenKind.STRINGLITERAL;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   644
                        reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   645
                    } else {
48054
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47216
diff changeset
   646
                        lexError(pos, Errors.UnclosedStrLit);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   647
                    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   648
                    break loop;
53227
f15d443f9731 8215681: Remove compiler support for Raw String Literals from JDK 12
jlaskey
parents: 51713
diff changeset
   649
               default:
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   650
                    if (isSpecial(reader.ch)) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   651
                        scanOperator();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   652
                    } else {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   653
                        boolean isJavaIdentifierStart;
25600
7f93cb0536fd 8048805: Request to investigate and update lexer error recovery in javac
jlahoda
parents: 25445
diff changeset
   654
                        int codePoint = -1;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   655
                        if (reader.ch < '\u0080') {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   656
                            // all ASCII range chars already handled, above
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   657
                            isJavaIdentifierStart = false;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   658
                        } else {
25600
7f93cb0536fd 8048805: Request to investigate and update lexer error recovery in javac
jlahoda
parents: 25445
diff changeset
   659
                            codePoint = reader.peekSurrogates();
7f93cb0536fd 8048805: Request to investigate and update lexer error recovery in javac
jlahoda
parents: 25445
diff changeset
   660
                            if (codePoint >= 0) {
7f93cb0536fd 8048805: Request to investigate and update lexer error recovery in javac
jlahoda
parents: 25445
diff changeset
   661
                                if (isJavaIdentifierStart = Character.isJavaIdentifierStart(codePoint)) {
7f93cb0536fd 8048805: Request to investigate and update lexer error recovery in javac
jlahoda
parents: 25445
diff changeset
   662
                                    reader.putChar(true);
7f93cb0536fd 8048805: Request to investigate and update lexer error recovery in javac
jlahoda
parents: 25445
diff changeset
   663
                                }
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   664
                            } else {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   665
                                isJavaIdentifierStart = Character.isJavaIdentifierStart(reader.ch);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   666
                            }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   667
                        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   668
                        if (isJavaIdentifierStart) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   669
                            scanIdent();
25600
7f93cb0536fd 8048805: Request to investigate and update lexer error recovery in javac
jlahoda
parents: 25445
diff changeset
   670
                        } else if (reader.digit(pos, 10) >= 0) {
7f93cb0536fd 8048805: Request to investigate and update lexer error recovery in javac
jlahoda
parents: 25445
diff changeset
   671
                            scanNumber(pos, 10);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   672
                        } 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
   673
                            tk = TokenKind.EOF;
50898
12133a6e2613 8205418: Assorted improvements to source code model
jlahoda
parents: 49580
diff changeset
   674
                            pos = reader.realLength;
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   675
                        } else {
25600
7f93cb0536fd 8048805: Request to investigate and update lexer error recovery in javac
jlahoda
parents: 25445
diff changeset
   676
                            String arg;
7f93cb0536fd 8048805: Request to investigate and update lexer error recovery in javac
jlahoda
parents: 25445
diff changeset
   677
7f93cb0536fd 8048805: Request to investigate and update lexer error recovery in javac
jlahoda
parents: 25445
diff changeset
   678
                            if (codePoint >= 0) {
7f93cb0536fd 8048805: Request to investigate and update lexer error recovery in javac
jlahoda
parents: 25445
diff changeset
   679
                                char high = reader.ch;
7f93cb0536fd 8048805: Request to investigate and update lexer error recovery in javac
jlahoda
parents: 25445
diff changeset
   680
                                reader.scanChar();
7f93cb0536fd 8048805: Request to investigate and update lexer error recovery in javac
jlahoda
parents: 25445
diff changeset
   681
                                arg = String.format("\\u%04x\\u%04x", (int) high, (int)reader.ch);
7f93cb0536fd 8048805: Request to investigate and update lexer error recovery in javac
jlahoda
parents: 25445
diff changeset
   682
                            } else {
7f93cb0536fd 8048805: Request to investigate and update lexer error recovery in javac
jlahoda
parents: 25445
diff changeset
   683
                                arg = (32 < reader.ch && reader.ch < 127) ?
7f93cb0536fd 8048805: Request to investigate and update lexer error recovery in javac
jlahoda
parents: 25445
diff changeset
   684
                                                String.format("%s", reader.ch) :
7f93cb0536fd 8048805: Request to investigate and update lexer error recovery in javac
jlahoda
parents: 25445
diff changeset
   685
                                                String.format("\\u%04x", (int)reader.ch);
7f93cb0536fd 8048805: Request to investigate and update lexer error recovery in javac
jlahoda
parents: 25445
diff changeset
   686
                            }
48054
702043a4cdeb 8189749: Devise strategy for making source level checks more uniform
mcimadamore
parents: 47216
diff changeset
   687
                            lexError(pos, Errors.IllegalChar(arg));
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   688
                            reader.scanChar();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   689
                        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   690
                    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   691
                    break loop;
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
            endPos = reader.bp;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   695
            switch (tk.tag) {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   696
                case DEFAULT: return new Token(tk, pos, endPos, comments);
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   697
                case NAMED: return new NamedToken(tk, pos, endPos, name, comments);
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   698
                case STRING: return new StringToken(tk, pos, endPos, reader.chars(), comments);
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   699
                case NUMERIC: return new NumericToken(tk, pos, endPos, reader.chars(), radix, comments);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   700
                default: throw new AssertionError();
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   701
            }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   702
        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   703
        finally {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   704
            if (scannerDebug) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   705
                    System.out.println("nextToken(" + pos
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   706
                                       + "," + endPos + ")=|" +
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   707
                                       new String(reader.getRawCharacters(pos, endPos))
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   708
                                       + "|");
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   709
            }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   710
        }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   711
    }
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   712
    //where
13077
16fb753bb5dc 7174143: encapsulate doc comment table
jjg
parents: 11383
diff changeset
   713
        List<Comment> addComment(List<Comment> comments, Comment comment) {
16fb753bb5dc 7174143: encapsulate doc comment table
jjg
parents: 11383
diff changeset
   714
            return comments == null ?
16fb753bb5dc 7174143: encapsulate doc comment table
jjg
parents: 11383
diff changeset
   715
                    List.of(comment) :
16fb753bb5dc 7174143: encapsulate doc comment table
jjg
parents: 11383
diff changeset
   716
                    comments.prepend(comment);
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   717
        }
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   718
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   719
    /** Return the position where a lexical error occurred;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   720
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   721
    public int errPos() {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   722
        return errPos;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   723
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   724
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   725
    /** Set the position where a lexical error occurred;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   726
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   727
    public void errPos(int pos) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   728
        errPos = pos;
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   729
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   730
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   731
    /**
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   732
     * Called when a complete comment has been scanned. pos and endPos
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   733
     * will mark the comment boundary.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   734
     */
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   735
    protected Tokens.Comment processComment(int pos, int endPos, CommentStyle style) {
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   736
        if (scannerDebug)
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   737
            System.out.println("processComment(" + pos
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   738
                               + "," + endPos + "," + style + ")=|"
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   739
                               + new String(reader.getRawCharacters(pos, endPos))
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   740
                               + "|");
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   741
        char[] buf = reader.getRawCharacters(pos, endPos);
22163
3651128c74eb 8030244: Update langtools to use Diamond
briangoetz
parents: 16810
diff changeset
   742
        return new BasicComment<>(new UnicodeReader(fac, buf, buf.length), style);
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   743
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   744
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   745
    /**
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   746
     * Called when a complete whitespace run has been scanned. pos and endPos
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   747
     * will mark the whitespace boundary.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   748
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   749
    protected void processWhiteSpace(int pos, int endPos) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   750
        if (scannerDebug)
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   751
            System.out.println("processWhitespace(" + pos
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   752
                               + "," + endPos + ")=|" +
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   753
                               new String(reader.getRawCharacters(pos, endPos))
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   754
                               + "|");
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   755
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   756
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   757
    /**
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   758
     * Called when a line terminator has been processed.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   759
     */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   760
    protected void processLineTerminator(int pos, int endPos) {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   761
        if (scannerDebug)
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   762
            System.out.println("processTerminator(" + pos
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   763
                               + "," + endPos + ")=|" +
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   764
                               new String(reader.getRawCharacters(pos, endPos))
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   765
                               + "|");
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   766
    }
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   767
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   768
    /** Build a map for translating between line numbers and
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   769
     * positions in the input.
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   770
     *
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   771
     * @return a LineMap */
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   772
    public Position.LineMap getLineMap() {
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   773
        return Position.makeLineMap(reader.getRawCharacters(), reader.buflen, false);
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   774
    }
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   775
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   776
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   777
    /**
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   778
    * Scan a documentation comment; determine if a deprecated tag is present.
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   779
    * Called once the initial /, * have been skipped, positioned at the second *
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   780
    * (which is treated as the beginning of the first line).
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   781
    * Stops positioned at the closing '/'.
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   782
    */
16810
670d880283e2 8011676: Instances of Tokens.Comment should not be defined in inner classes
jjg
parents: 14801
diff changeset
   783
    protected static class BasicComment<U extends UnicodeReader> implements Comment {
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   784
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   785
        CommentStyle cs;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   786
        U comment_reader;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   787
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   788
        protected boolean deprecatedFlag = false;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   789
        protected boolean scanned = false;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   790
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   791
        protected BasicComment(U comment_reader, CommentStyle cs) {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   792
            this.comment_reader = comment_reader;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   793
            this.cs = cs;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   794
        }
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   795
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   796
        public String getText() {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   797
            return null;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   798
        }
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   799
13078
11d5e1c88864 7178297: provide mapping from doc comment position to source file position
jjg
parents: 13077
diff changeset
   800
        public int getSourcePos(int pos) {
11d5e1c88864 7178297: provide mapping from doc comment position to source file position
jjg
parents: 13077
diff changeset
   801
            return -1;
11d5e1c88864 7178297: provide mapping from doc comment position to source file position
jjg
parents: 13077
diff changeset
   802
        }
11d5e1c88864 7178297: provide mapping from doc comment position to source file position
jjg
parents: 13077
diff changeset
   803
10948
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   804
        public CommentStyle getStyle() {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   805
            return cs;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   806
        }
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   807
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   808
        public boolean isDeprecated() {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   809
            if (!scanned && cs == CommentStyle.JAVADOC) {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   810
                scanDocComment();
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   811
            }
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   812
            return deprecatedFlag;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   813
        }
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   814
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   815
        @SuppressWarnings("fallthrough")
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   816
        protected void scanDocComment() {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   817
            try {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   818
                boolean deprecatedPrefix = false;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   819
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   820
                comment_reader.bp += 3; // '/**'
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   821
                comment_reader.ch = comment_reader.buf[comment_reader.bp];
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   822
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   823
                forEachLine:
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   824
                while (comment_reader.bp < comment_reader.buflen) {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   825
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   826
                    // Skip optional WhiteSpace at beginning of line
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   827
                    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
   828
                        comment_reader.scanCommentChar();
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   829
                    }
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   830
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   831
                    // Skip optional consecutive Stars
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   832
                    while (comment_reader.bp < comment_reader.buflen && comment_reader.ch == '*') {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   833
                        comment_reader.scanCommentChar();
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   834
                        if (comment_reader.ch == '/') {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   835
                            return;
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
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   839
                    // Skip optional WhiteSpace after Stars
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   840
                    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
   841
                        comment_reader.scanCommentChar();
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   842
                    }
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   843
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   844
                    deprecatedPrefix = false;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   845
                    // At beginning of line in the JavaDoc sense.
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   846
                    if (!deprecatedFlag) {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   847
                        String deprecated = "@deprecated";
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   848
                        int i = 0;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   849
                        while (comment_reader.bp < comment_reader.buflen && comment_reader.ch == deprecated.charAt(i)) {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   850
                            comment_reader.scanCommentChar();
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   851
                            i++;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   852
                            if (i == deprecated.length()) {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   853
                                deprecatedPrefix = true;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   854
                                break;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   855
                            }
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   856
                        }
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   857
                    }
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   858
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   859
                    if (deprecatedPrefix && comment_reader.bp < comment_reader.buflen) {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   860
                        if (Character.isWhitespace(comment_reader.ch)) {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   861
                            deprecatedFlag = true;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   862
                        } else if (comment_reader.ch == '*') {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   863
                            comment_reader.scanCommentChar();
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   864
                            if (comment_reader.ch == '/') {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   865
                                deprecatedFlag = true;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   866
                                return;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   867
                            }
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   868
                        }
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   869
                    }
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   870
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   871
                    // Skip rest of line
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   872
                    while (comment_reader.bp < comment_reader.buflen) {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   873
                        switch (comment_reader.ch) {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   874
                            case '*':
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   875
                                comment_reader.scanCommentChar();
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   876
                                if (comment_reader.ch == '/') {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   877
                                    return;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   878
                                }
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   879
                                break;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   880
                            case CR: // (Spec 3.4)
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   881
                                comment_reader.scanCommentChar();
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   882
                                if (comment_reader.ch != LF) {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   883
                                    continue forEachLine;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   884
                                }
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   885
                            /* fall through to LF case */
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   886
                            case LF: // (Spec 3.4)
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   887
                                comment_reader.scanCommentChar();
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   888
                                continue forEachLine;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   889
                            default:
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   890
                                comment_reader.scanCommentChar();
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   891
                        }
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   892
                    } // rest of line
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   893
                } // forEachLine
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   894
                return;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   895
            } finally {
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   896
                scanned = true;
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   897
            }
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   898
        }
063463f6535f 7104201: Refactor DocCommentScanner
mcimadamore
parents: 10815
diff changeset
   899
    }
10815
a719aa5f1631 7096014: Javac tokens should retain state
mcimadamore
parents:
diff changeset
   900
}