diff options
| author | Joerg Kubitz | 2021-09-01 09:04:23 +0000 |
|---|---|---|
| committer | Gayan Perera | 2021-09-20 16:37:22 +0000 |
| commit | 4d6015ee4e813cd4845be21b68c4d226056c7c2d (patch) | |
| tree | 349e60450de0ec7385ffe9ad7fd8ee3951f01f1e | |
| parent | f9169864da76ea22cff964f83c4d77c200a7c4e1 (diff) | |
| download | eclipse.jdt.core-4d6015ee4e813cd4845be21b68c4d226056c7c2d.tar.gz eclipse.jdt.core-4d6015ee4e813cd4845be21b68c4d226056c7c2d.tar.xz eclipse.jdt.core-4d6015ee4e813cd4845be21b68c4d226056c7c2d.zip | |
Bug 575733 - fixed Scanner.OptimizedLength=6I20210920-1800
OptimizedLength was 7.
But only indices 6 where initialized,
and only indices 0..4 are ever used in optimizedCurrentTokenSource2-6
Change-Id: Ida5acdb9a00d1443e43af021c0f4f91411097efc
Signed-off-by: Joerg Kubitz <jkubitz-eclipse@gmx.de>
Reviewed-on: https://git.eclipse.org/r/c/jdt/eclipse.jdt.core/+/184839
Reviewed-by: Gayan Perera <gayanper@gmail.com>
Tested-by: Gayan Perera <gayanper@gmail.com>
Tested-by: JDT Bot <jdt-bot@eclipse.org>
| -rw-r--r-- | org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Scanner.java | 6 | ||||
| -rw-r--r-- | org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/PublicScanner.java | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Scanner.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Scanner.java index f139d57261..77bd47db0d 100644 --- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Scanner.java +++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/Scanner.java @@ -186,9 +186,9 @@ public class Scanner implements TerminalTokens { new char[] {'\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000'}; static final int TableSize = 30, InternalTableSize = 6; //30*6 =210 entries - public static final int OptimizedLength = 7; + public static final int OptimizedLength = 6; public /*static*/ final char[][][][] charArray_length = - new char[OptimizedLength][TableSize][InternalTableSize][]; + new char[OptimizedLength - 1][TableSize][InternalTableSize][]; // support for detecting non-externalized string literals public static final char[] TAG_PREFIX= "//$NON-NLS-".toCharArray(); //$NON-NLS-1$ public static final int TAG_PREFIX_LENGTH= TAG_PREFIX.length; @@ -210,7 +210,7 @@ public class Scanner implements TerminalTokens { public boolean returnOnlyGreater = false; /*static*/ { - for (int i = 0; i < 6; i++) { + for (int i = 0; i < OptimizedLength - 1; i++) { for (int j = 0; j < TableSize; j++) { for (int k = 0; k < InternalTableSize; k++) { this.charArray_length[i][j][k] = initCharArray; diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/PublicScanner.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/PublicScanner.java index ffa8ea3c7c..23fe86f917 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/PublicScanner.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/PublicScanner.java @@ -159,9 +159,9 @@ public class PublicScanner implements IScanner, ITerminalSymbols { new char[] {'\u0000', '\u0000', '\u0000', '\u0000', '\u0000', '\u0000'}; static final int TableSize = 30, InternalTableSize = 6; //30*6 =210 entries - public static final int OptimizedLength = 7; + public static final int OptimizedLength = 6; public /*static*/ final char[][][][] charArray_length = - new char[OptimizedLength][TableSize][InternalTableSize][]; + new char[OptimizedLength - 1][TableSize][InternalTableSize][]; // support for detecting non-externalized string literals public static final char[] TAG_PREFIX= "//$NON-NLS-".toCharArray(); //$NON-NLS-1$ public static final int TAG_PREFIX_LENGTH= TAG_PREFIX.length; @@ -177,7 +177,7 @@ public class PublicScanner implements IScanner, ITerminalSymbols { public boolean returnOnlyGreater = false; /*static*/ { - for (int i = 0; i < 6; i++) { + for (int i = 0; i < OptimizedLength - 1; i++) { for (int j = 0; j < TableSize; j++) { for (int k = 0; k < InternalTableSize; k++) { this.charArray_length[i][j][k] = initCharArray; |