Apache Lucene open-source search software
Remove some exclusions from generated Java files so that they're cleaned up after regeneration (reformatted). (#15393)
Dawid Weiss1e43d4f4bd1b
diff --git a/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/spotless/GoogleJavaFormatPlugin.java b/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/spotless/GoogleJavaFormatPlugin.javaindex b2815815d11..ae5cefbffe4 100644--- a/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/spotless/GoogleJavaFormatPlugin.java+++ b/build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/spotless/GoogleJavaFormatPlugin.java@@ -96,40 +96,10 @@ public class GoogleJavaFormatPlugin extends LuceneGradlePlugin {private void configureExclusions(Project project, ConfigurableFileTree ftree) {switch (project.getPath()) {- case ":lucene:core":- ftree.exclude("**/StandardTokenizerImpl.java");- break;-case ":lucene:analysis:common":+ // These two cause stack overflow errors in google java format. Just leave them.ftree.exclude("**/HTMLStripCharFilter.java", "**/UAX29URLEmailTokenizerImpl.java");break;-- case ":lucene:test-framework":- ftree.exclude(- "**/EmojiTokenizationTestUnicode_11_0.java", "**/WordBreakTestUnicode_9_0_0.java");- break;-- case ":lucene:queryparser":- ftree.exclude(- "**/classic/ParseException.java",- "**/classic/QueryParser.java",- "**/classic/QueryParserConstants.java",- "**/classic/QueryParserTokenManager.java",- "**/classic/Token.java",- "**/classic/TokenMgrError.java",- "**/standard/parser/ParseException.java",- "**/standard/parser/StandardSyntaxParser.java",- "**/standard/parser/StandardSyntaxParserConstants.java",- "**/standard/parser/StandardSyntaxParserTokenManager.java",- "**/standard/parser/Token.java",- "**/standard/parser/TokenMgrError.java",- "**/surround/parser/ParseException.java",- "**/surround/parser/QueryParser.java",- "**/surround/parser/QueryParserConstants.java",- "**/surround/parser/QueryParserTokenManager.java",- "**/surround/parser/Token.java",- "**/surround/parser/TokenMgrError.java");- break;}}}diff --git a/lucene/core/src/generated/checksums/regenerateStandardTokenizer.json b/lucene/core/src/generated/checksums/regenerateStandardTokenizer.jsonindex bf532d0abb8..a9d3fb208b5 100644--- a/lucene/core/src/generated/checksums/regenerateStandardTokenizer.json+++ b/lucene/core/src/generated/checksums/regenerateStandardTokenizer.json@@ -1,5 +1,5 @@{"gradle/regenerate/jflex/skeleton.disable.buffer.expansion.txt": "6e43a3a64a9b5eb82ec5b4bc21f95aff5a2a061e",- "lucene/core/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java": "f4d6311e03a97cb55301cfa55fab3338b1fdb725",+ "lucene/core/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java": "fc9832cd753927f00fdc1abb1639654cd049e9ff","lucene/core/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex": "6dd5ea9741b13281378be5680fdcc2bc2aef3aec"}diff --git a/lucene/core/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java b/lucene/core/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.javaindex 24bbcf1274e..9a93568061f 100644--- a/lucene/core/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java+++ b/lucene/core/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java@@ -24,25 +24,24 @@ package org.apache.lucene.analysis.standard;import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;/**- * This class implements Word Break rules from the Unicode Text Segmentation- * algorithm, as specified in- * <a href="http://unicode.org/reports/tr29/">Unicode Standard Annex #29</a>.- * <p>- * Tokens produced are of the following types:+ * This class implements Word Break rules from the Unicode Text Segmentation algorithm, as specified+ * in <a href="http://unicode.org/reports/tr29/">Unicode Standard Annex #29</a>.+ *+ * <p>Tokens produced are of the following types:+ ** <ul>- * <li><ALPHANUM>: A sequence of alphabetic and numeric characters</li>- * <li><NUM>: A number</li>- * <li><SOUTHEAST_ASIAN>: A sequence of characters from South and Southeast- * Asian languages, including Thai, Lao, Myanmar, and Khmer</li>- * <li><IDEOGRAPHIC>: A single CJKV ideographic character</li>- * <li><HIRAGANA>: A single hiragana character</li>- * <li><KATAKANA>: A sequence of katakana characters</li>- * <li><HANGUL>: A sequence of Hangul characters</li>- * <li><EMOJI>: A sequence of Emoji characters</li>+ * <li><ALPHANUM>: A sequence of alphabetic and numeric characters+ * <li><NUM>: A number+ * <li><SOUTHEAST_ASIAN>: A sequence of characters from South and Southeast Asian languages,+ * including Thai, Lao, Myanmar, and Khmer+ * <li><IDEOGRAPHIC>: A single CJKV ideographic character+ * <li><HIRAGANA>: A single hiragana character+ * <li><KATAKANA>: A sequence of katakana characters+ * <li><HANGUL>: A sequence of Hangul characters+ * <li><EMOJI>: A sequence of Emoji characters* </ul>*/--@SuppressWarnings({"fallthrough","unused"})+@SuppressWarnings({"fallthrough", "unused"})public final class StandardTokenizerImpl {/** This character denotes the end of file. */@@ -55,389 +54,379 @@ public final class StandardTokenizerImpl {public static final int YYINITIAL = 0;/**- * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l- * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l- * at the beginning of a line- * l is of the form l = 2*k, k a non negative integer+ * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l ZZ_LEXSTATE[l+1] is the state in+ * the DFA for the lexical state l at the beginning of a line l is of the form l = 2*k, k a non+ * negative integer*/- private static final int ZZ_LEXSTATE[] = {- 0, 0- };+ private static final int ZZ_LEXSTATE[] = {0, 0};- /**- * Top-level table for translating characters to character classes- */- private static final int [] ZZ_CMAP_TOP = zzUnpackcmap_top();+ /** Top-level table for translating characters to character classes */+ private static final int[] ZZ_CMAP_TOP = zzUnpackcmap_top();private static final String ZZ_CMAP_TOP_PACKED_0 =- "\1\0\1\u0100\1\u0200\1\u0300\1\u0400\1\u0500\1\u0600\1\u0700"+- "\1\u0800\1\u0900\1\u0a00\1\u0b00\1\u0c00\1\u0d00\1\u0e00\1\u0f00"+- "\1\u1000\1\u1100\1\u1200\1\u1300\1\u1400\1\u0100\1\u1500\1\u1600"+- "\1\u1700\1\u1800\1\u1900\1\u1a00\1\u1b00\1\u1c00\1\u0100\1\u1d00"+- "\1\u1e00\1\u1f00\1\u2000\1\u2100\1\u2200\1\u2300\1\u2400\1\u2500"+- "\1\u2000\1\u2600\1\u2000\1\u2700\1\u2800\1\u2900\1\u2a00\1\u2b00"+- "\1\u2c00\1\u2d00\1\u2e00\1\u2f00\31\u3000\1\u3100\121\u3000\1\u3200"+- "\4\u0100\1\u3300\1\u0100\1\u3400\1\u3500\1\u3600\1\u3700\1\u3800"+- "\1\u3900\53\u1100\1\u3a00\41\u2000\1\u3000\1\u3b00\1\u3c00\1\u0100"+- "\1\u3d00\1\u3e00\1\u3f00\1\u4000\1\u4100\1\u4200\1\u4300\1\u4400"+- "\1\u4500\1\u0100\1\u4600\1\u4700\1\u4800\1\u4900\1\u4a00\1\u4b00"+- "\1\u4c00\1\u2000\1\u4d00\1\u4e00\1\u4f00\1\u5000\1\u5100\1\u5200"+- "\1\u5300\1\u5400\1\u5500\1\u5600\1\u5700\1\u5800\1\u2000\1\u5900"+- "\1\u5a00\1\u5b00\1\u2000\3\u0100\1\u5c00\1\u5d00\1\u5e00\12\u2000"+- "\4\u0100\1\u5f00\17\u2000\2\u0100\1\u6000\41\u2000\2\u0100\1\u6100"+- "\1\u6200\2\u2000\1\u6300\1\u6400\100\u2000\1\u6500\1\u6600\12\u2000"+- "\1\u6700\24\u2000\1\u6800\1\u6900\1\u2000\1\u6a00\1\u6b00\1\u6c00"+- "\1\u6d00\2\u2000\1\u6e00\5\u2000\1\u6f00\1\u7000\1\u7100\5\u2000"+- "\1\u7200\1\u7300\4\u2000\1\u7400\1\u2000\1\u7500\1\u7600\1\u7700"+- "\1\u7800\1\u7900\1\u7a00\1\u7b00\1\u7c00\1\u7d00\1\u7e00\1\u7f00"+- "\4\u8000\1\u8100\246\u3000\1\u8200\20\u3000\1\u8300\1\u8400\25\u3000"+- "\1\u8500\34\u3000\1\u8600\14\u2000\2\u3000\1\u8700\u0b05\u2000\1\u8800"+- "\1\u8900\u02fe\u2000";-- private static int [] zzUnpackcmap_top() {- int [] result = new int[4352];+ "\1\0\1\u0100\1\u0200\1\u0300\1\u0400\1\u0500\1\u0600\1\u0700"+ + "\1\u0800\1\u0900\1\u0a00\1\u0b00\1\u0c00\1\u0d00\1\u0e00\1\u0f00"+ + "\1\u1000\1\u1100\1\u1200\1\u1300\1\u1400\1\u0100\1\u1500\1\u1600"+ + "\1\u1700\1\u1800\1\u1900\1\u1a00\1\u1b00\1\u1c00\1\u0100\1\u1d00"+ + "\1\u1e00\1\u1f00\1\u2000\1\u2100\1\u2200\1\u2300\1\u2400\1\u2500"+ + "\1\u2000\1\u2600\1\u2000\1\u2700\1\u2800\1\u2900\1\u2a00\1\u2b00"+ + "\1\u2c00\1\u2d00\1\u2e00\1\u2f00\31\u3000\1\u3100\121\u3000\1\u3200"+ + "\4\u0100\1\u3300\1\u0100\1\u3400\1\u3500\1\u3600\1\u3700\1\u3800"+ + "\1\u3900\53\u1100\1\u3a00\41\u2000\1\u3000\1\u3b00\1\u3c00\1\u0100"+ + "\1\u3d00\1\u3e00\1\u3f00\1\u4000\1\u4100\1\u4200\1\u4300\1\u4400"+ + "\1\u4500\1\u0100\1\u4600\1\u4700\1\u4800\1\u4900\1\u4a00\1\u4b00"+ + "\1\u4c00\1\u2000\1\u4d00\1\u4e00\1\u4f00\1\u5000\1\u5100\1\u5200"+ + "\1\u5300\1\u5400\1\u5500\1\u5600\1\u5700\1\u5800\1\u2000\1\u5900"+ + "\1\u5a00\1\u5b00\1\u2000\3\u0100\1\u5c00\1\u5d00\1\u5e00\12\u2000"+ + "\4\u0100\1\u5f00\17\u2000\2\u0100\1\u6000\41\u2000\2\u0100\1\u6100"+ + "\1\u6200\2\u2000\1\u6300\1\u6400\100\u2000\1\u6500\1\u6600\12\u2000"+ + "\1\u6700\24\u2000\1\u6800\1\u6900\1\u2000\1\u6a00\1\u6b00\1\u6c00"+ + "\1\u6d00\2\u2000\1\u6e00\5\u2000\1\u6f00\1\u7000\1\u7100\5\u2000"+ + "\1\u7200\1\u7300\4\u2000\1\u7400\1\u2000\1\u7500\1\u7600\1\u7700"+ + "\1\u7800\1\u7900\1\u7a00\1\u7b00\1\u7c00\1\u7d00\1\u7e00\1\u7f00"+ + "\4\u8000\1\u8100\246\u3000\1\u8200\20\u3000\1\u8300\1\u8400\25\u3000"+ + "\1\u8500\34\u3000\1\u8600\14\u2000\2\u3000\1\u8700\u0b05\u2000\1\u8800"+ + "\1\u8900\u02fe\u2000";++ private static int[] zzUnpackcmap_top() {+ int[] result = new int[4352];int offset = 0;offset = zzUnpackcmap_top(ZZ_CMAP_TOP_PACKED_0, offset, result);return result;}- private static int zzUnpackcmap_top(String packed, int offset, int [] result) {- int i = 0; /* index in packed string */- int j = offset; /* index in unpacked array */+ private static int zzUnpackcmap_top(String packed, int offset, int[] result) {+ int i = 0; /* index in packed string */+ int j = offset; /* index in unpacked array */int l = packed.length();while (i < l) {int count = packed.charAt(i++);int value = packed.charAt(i++);- do result[j++] = value; while (--count > 0);+ do result[j++] = value;+ while (--count > 0);}return j;}-- /**- * Second-level tables for translating characters to character classes- */- private static final int [] ZZ_CMAP_BLOCKS = zzUnpackcmap_blocks();+ /** Second-level tables for translating characters to character classes */+ private static final int[] ZZ_CMAP_BLOCKS = zzUnpackcmap_blocks();private static final String ZZ_CMAP_BLOCKS_PACKED_0 =- "\42\0\1\1\1\2\3\0\1\3\2\0\1\2\1\0"+- "\1\4\1\0\1\5\1\0\12\6\1\7\1\4\5\0"+- "\32\10\4\0\1\11\1\0\32\10\56\0\1\12\1\10"+- "\2\0\1\13\1\12\6\0\1\10\1\0\1\7\2\0"+- "\1\10\5\0\27\10\1\0\37\10\1\0\u01e0\10\6\0"+- "\7\10\7\0\24\10\160\13\5\10\1\0\2\10\2\0"+- "\4\10\1\4\1\10\6\0\1\10\1\7\3\10\1\0"+- "\1\10\1\0\24\10\1\0\123\10\1\0\213\10\1\0"+- "\7\13\246\10\1\0\46\10\2\0\1\10\1\0\2\10"+- "\1\0\1\10\1\0\51\10\1\4\7\0\55\13\1\0"+- "\1\13\1\0\2\13\1\0\2\13\1\0\1\13\10\0"+- "\33\14\4\0\4\14\1\10\1\7\13\0\6\13\6\0"+- "\2\4\2\0\13\13\1\0\1\13\3\0\53\10\25\13"+- "\12\15\1\0\1\15\1\4\1\0\2\10\1\13\143\10"+- "\1\0\1\10\10\13\1\0\6\13\2\10\2\13\1\0"+- "\4\13\2\10\12\15\3\10\2\0\1\10\17\0\1\13"+- "\1\10\1\13\36\10\33\13\2\0\131\10\13\13\1\10"+- "\16\0\12\15\41\10\11\13\2\10\2\0\1\4\1\0"+- "\1\10\2\0\1\13\2\0\26\10\4\13\1\10\11\13"+- "\1\10\3\13\1\10\5\13\22\0\31\10\3\13\4\0"+- "\13\10\65\0\25\10\1\0\10\10\25\0\61\13\66\10"+- "\3\13\1\10\22\13\1\10\7\13\12\10\2\13\2\0"+- "\12\15\1\0\20\10\3\13\1\0\10\10\2\0\2\10"+- "\2\0\26\10\1\0\7\10\1\0\1\10\3\0\4\10"+- "\2\0\1\13\1\10\7\13\2\0\2\13\2\0\3\13"+- "\1\10\10\0\1\13\4\0\2\10\1\0\3\10\2\13"+- "\2\0\12\15\2\10\12\0\1\10\1\0\1\13\2\0"+- "\3\13\1\0\6\10\4\0\2\10\2\0\26\10\1\0"+- "\7\10\1\0\2\10\1\0\2\10\1\0\2\10\2\0"+- "\1\13\1\0\5\13\4\0\2\13\2\0\3\13\3\0"+- "\1\13\7\0\4\10\1\0\1\10\7\0\12\15\2\13"+- "\3\10\1\13\13\0\3\13\1\0\11\10\1\0\3\10"+- "\1\0\26\10\1\0\7\10\1\0\2\10\1\0\5\10"+- "\2\0\1\13\1\10\10\13\1\0\3\13\1\0\3\13"+- "\2\0\1\10\17\0\2\10\2\13\2\0\12\15\11\0"+- "\1\10\6\13\1\0\3\13\1\0\10\10\2\0\2\10"+- "\2\0\26\10\1\0\7\10\1\0\2\10\1\0\5\10"+- "\2\0\1\13\1\10\7\13\2\0\2\13\2\0\3\13"+- "\10\0\2\13\4\0\2\10\1\0\3\10\2\13\2\0"+- "\12\15\1\0\1\10\20\0\1\13\1\10\1\0\6\10"+- "\3\0\3\10\1\0\4\10\3\0\2\10\1\0\1\10"+- "\1\0\2\10\3\0\2\10\3\0\3\10\3\0\14\10"+- "\4\0\5\13\3\0\3\13\1\0\4\13\2\0\1\10"+- "\6\0\1\13\16\0\12\15\20\0\5\13\10\10\1\0"+- "\3\10\1\0\27\10\1\0\20\10\3\0\1\10\7\13"+- "\1\0\3\13\1\0\4\13\7\0\2\13\1\0\3\10"+- "\5\0\2\10\2\13\2\0\12\15\20\0\1\10\3\13"+- "\1\0\10\10\1\0\3\10\1\0\27\10\1\0\12\10"+- "\1\0\5\10\2\0\1\13\1\10\7\13\1\0\3\13"+- "\1\0\4\13\7\0\2\13\7\0\1\10\1\0\2\10"+- "\2\13\2\0\12\15\1\0\2\10\15\0\4\13\1\0"+- "\10\10\1\0\3\10\1\0\51\10\2\13\1\10\7\13"+- "\1\0\3\13\1\0\4\13\1\10\5\0\3\10\1\13"+- "\7\0\3\10\2\13\2\0\12\15\12\0\6\10\2\0"+- "\2\13\1\0\22\10\3\0\30\10\1\0\11\10\1\0"+- "\1\10\2\0\7\10\3\0\1\13\4\0\6\13\1\0"+- "\1\13\1\0\10\13\6\0\12\15\2\0\2\13\15\0"+- "\60\16\1\17\2\16\7\17\5\0\7\16\10\17\1\0"+- "\12\15\47\0\2\16\1\0\1\16\1\0\5\16\1\0"+- "\30\16\1\0\1\16\1\0\12\16\1\17\2\16\11\17"+- "\1\16\2\0\5\16\1\0\1\16\1\0\6\17\2\0"+- "\12\15\2\0\4\16\40\0\1\10\27\0\2\13\6\0"+- "\12\15\13\0\1\13\1\0\1\13\1\0\1\13\4\0"+- "\2\13\10\10\1\0\44\10\4\0\24\13\1\0\2\13"+- "\5\10\13\13\1\0\44\13\11\0\1\13\71\0\53\16"+- "\24\17\1\16\12\15\6\0\6\16\4\17\4\16\3\17"+- "\1\16\3\17\2\16\7\17\3\16\4\17\15\16\14\17"+- "\1\16\1\17\12\15\4\17\2\16\46\10\1\0\1\10"+- "\5\0\1\10\2\0\53\10\1\0\4\10\u0100\20\111\10"+- "\1\0\4\10\2\0\7\10\1\0\1\10\1\0\4\10"+- "\2\0\51\10\1\0\4\10\2\0\41\10\1\0\4\10"+- "\2\0\7\10\1\0\1\10\1\0\4\10\2\0\17\10"+- "\1\0\71\10\1\0\4\10\2\0\103\10\2\0\3\13"+- "\40\0\20\10\20\0\126\10\2\0\6\10\3\0\u016c\10"+- "\2\0\21\10\1\0\32\10\5\0\113\10\3\0\13\10"+- "\7\0\15\10\1\0\4\10\3\13\13\0\22\10\3\13"+- "\13\0\22\10\2\13\14\0\15\10\1\0\3\10\1\0"+- "\2\13\14\0\64\16\40\17\3\0\1\16\4\0\1\16"+- "\1\17\2\0\12\15\41\0\4\13\1\0\12\15\6\0"+- "\131\10\7\0\5\10\2\13\42\10\1\13\1\10\5\0"+- "\106\10\12\0\37\10\1\0\14\13\4\0\14\13\12\0"+- "\12\15\36\16\2\0\5\16\13\0\54\16\4\0\32\16"+- "\6\0\12\15\1\16\3\0\2\16\40\0\27\10\5\13"+- "\4\0\65\16\12\17\1\0\35\17\2\0\1\13\12\15"+- "\6\0\12\15\6\0\16\16\2\0\17\13\101\0\5\13"+- "\57\10\21\13\7\10\4\0\12\15\21\0\11\13\14\0"+- "\3\13\36\10\15\13\2\10\12\15\54\10\16\13\14\0"+- "\44\10\24\13\10\0\12\15\3\0\3\10\12\15\44\10"+- "\2\0\11\10\7\0\53\10\2\0\3\10\20\0\3\13"+- "\1\0\25\13\4\10\1\13\6\10\1\13\2\10\3\13"+- "\1\10\5\0\300\10\72\13\1\0\5\13\26\10\2\0"+- "\6\10\2\0\46\10\2\0\6\10\2\0\10\10\1\0"+- "\1\10\1\0\1\10\1\0\1\10\1\0\37\10\2\0"+- "\65\10\1\0\7\10\1\0\1\10\3\0\3\10\1\0"+- "\7\10\3\0\4\10\2\0\6\10\4\0\15\10\5\0"+- "\3\10\1\0\7\10\17\0\1\13\1\21\2\13\10\0"+- "\2\5\12\0\1\5\2\0\1\7\2\0\5\13\1\11"+- "\14\0\1\12\2\0\2\11\3\0\1\4\4\0\1\12"+- "\12\0\1\11\13\0\5\13\1\0\12\13\1\0\1\10"+- "\15\0\1\10\20\0\15\10\63\0\23\13\1\22\15\13"+- "\21\0\1\10\4\0\1\10\2\0\12\10\1\0\1\10"+- "\3\0\5\10\4\0\1\12\1\0\1\10\1\0\1\10"+- "\1\0\1\10\1\0\4\10\1\0\12\10\1\23\2\0"+- "\4\10\5\0\5\10\4\0\1\10\21\0\51\10\13\0"+- "\6\12\17\0\2\12\u016f\0\2\12\14\0\1\12\137\0"+- "\1\12\106\0\1\12\31\0\13\12\4\0\3\12\273\0"+- "\14\10\1\23\47\10\300\0\2\12\12\0\1\12\11\0"+- "\1\12\72\0\4\12\1\0\6\12\1\0\14\12\1\0"+- "\162\12\12\0\166\12\2\0\13\12\1\0\1\12\1\0"+- "\1\12\6\0\1\12\3\0\1\12\6\0\1\12\12\0"+- "\2\12\17\0\1\12\2\0\1\12\4\0\1\12\1\0"+- "\1\12\4\0\3\12\1\0\1\12\13\0\5\12\55\0"+- "\3\12\11\0\1\12\16\0\1\12\16\0\1\12\164\0"+- "\2\12\317\0\3\12\23\0\2\12\63\0\1\12\4\0"+- "\1\12\252\0\57\10\1\0\57\10\1\0\205\10\6\0"+- "\4\10\3\13\2\10\14\0\46\10\1\0\1\10\5\0"+- "\1\10\2\0\70\10\7\0\1\10\17\0\1\13\27\10"+- "\11\0\7\10\1\0\7\10\1\0\7\10\1\0\7\10"+- "\1\0\7\10\1\0\7\10\1\0\7\10\1\0\7\10"+- "\1\0\40\13\57\0\1\10\120\0\32\24\1\0\131\24"+- "\14\0\326\24\57\0\1\10\1\0\1\24\31\0\11\24"+- "\6\13\1\12\5\25\2\0\3\24\2\10\1\12\3\0"+- "\126\26\2\0\2\13\2\25\3\26\133\25\1\0\4\25"+- "\5\0\53\10\1\0\136\20\21\0\33\10\65\0\20\25"+- "\227\0\1\12\1\0\1\12\66\0\57\25\1\0\130\25"+- "\250\0\u01b6\24\112\0\360\24\20\0\215\10\103\0\56\10"+- "\2\0\15\10\3\0\20\10\12\15\2\10\24\0\57\10"+- "\4\13\1\0\12\13\1\0\37\10\2\13\120\10\2\13"+- "\45\0\251\10\2\0\5\10\60\0\13\10\1\13\3\10"+- "\1\13\4\10\1\13\27\10\5\13\30\0\64\10\14\0"+- "\2\13\62\10\22\13\12\0\12\15\6\0\22\13\6\10"+- "\3\0\1\10\1\0\2\10\1\13\12\15\34\10\10\13"+- "\2\0\27\10\15\13\14\0\35\20\3\0\4\13\57\10"+- "\16\13\16\0\1\10\12\15\6\0\5\16\1\17\12\16"+- "\12\15\5\16\1\0\51\10\16\13\11\0\3\10\1\13"+- "\10\10\2\13\2\0\12\15\6\0\33\16\3\17\62\16"+- "\1\17\1\16\3\17\2\16\2\17\5\16\2\17\1\16"+- "\1\17\1\16\30\0\5\16\13\10\5\13\2\0\3\10"+- "\2\13\12\0\6\10\2\0\6\10\2\0\6\10\11\0"+- "\7\10\1\0\7\10\1\0\70\10\10\0\163\10\10\13"+- "\1\0\2\13\2\0\12\15\6\0\244\20\14\0\27\20"+- "\4\0\61\20\4\0\156\24\2\0\152\24\46\0\7\10"+- "\14\0\5\10\5\0\1\14\1\13\12\14\1\0\15\14"+- "\1\0\5\14\1\0\1\14\1\0\2\14\1\0\2\14"+- "\1\0\12\14\142\10\41\0\153\10\22\0\100\10\2\0"+- "\66\10\50\0\14\10\4\0\16\13\1\27\1\30\1\4"+- "\2\0\1\7\1\4\13\0\20\13\3\0\2\11\30\0"+- "\3\11\1\4\1\0\1\5\1\0\1\4\1\7\32\0"+- "\5\10\1\0\207\10\2\0\1\13\7\0\1\5\4\0"+- "\1\4\1\0\1\5\1\0\12\15\1\7\1\4\5\0"+- "\32\10\4\0\1\11\1\0\32\10\13\0\70\25\2\13"+- "\37\20\3\0\6\20\2\0\6\20\2\0\6\20\2\0"+- "\3\20\34\0\3\13\4\0\14\10\1\0\32\10\1\0"+- "\23\10\1\0\2\10\1\0\17\10\2\0\16\10\42\0"+- "\173\10\105\0\65\10\210\0\1\13\202\0\35\10\3\0"+- "\61\10\17\0\1\13\37\0\40\10\15\0\36\10\5\0"+- "\46\10\5\13\5\0\36\10\2\0\44\10\4\0\10\10"+- "\1\0\5\10\52\0\236\10\2\0\12\15\6\0\44\10"+- "\4\0\44\10\4\0\50\10\10\0\64\10\234\0\67\10"+- "\11\0\26\10\12\0\10\10\230\0\6\10\2\0\1\10"+- "\1\0\54\10\1\0\2\10\3\0\1\10\2\0\27\10"+- "\12\0\27\10\11\0\37\10\101\0\23\10\1\0\2\10"+- "\12\0\26\10\12\0\32\10\106\0\70\10\6\0\2\10"+- "\100\0\1\10\3\13\1\0\2\13\5\0\4\13\4\10"+- "\1\0\3\10\1\0\35\10\2\0\3\13\4\0\1\13"+- "\40\0\35\10\3\0\35\10\43\0\10\10\1\0\34\10"+- "\2\13\31\0\66\10\12\0\26\10\12\0\23\10\15\0"+- "\22\10\156\0\111\10\67\0\63\10\15\0\63\10\15\0"+- "\44\10\4\13\10\0\12\15\306\0\35\10\12\0\1\10"+- "\10\0\26\10\13\13\217\0\27\10\11\0\3\13\65\10"+- "\17\13\37\0\12\15\17\0\4\13\55\10\13\13\2\0"+- "\1\13\17\0\1\13\2\0\31\10\7\0\12\15\6\0"+- "\3\13\44\10\16\13\1\0\12\15\4\0\1\10\2\13"+- "\11\0\43\10\1\13\2\0\1\10\11\0\3\13\60\10"+- "\16\13\4\10\4\0\4\13\3\0\12\15\1\10\1\0"+- "\1\10\43\0\22\10\1\0\31\10\14\13\6\0\1\13"+- "\101\0\7\10\1\0\1\10\1\0\4\10\1\0\17\10"+- "\1\0\12\10\7\0\57\10\14\13\5\0\12\15\6\0"+- "\4\13\1\0\10\10\2\0\2\10\2\0\26\10\1\0"+- "\7\10\1\0\2\10\1\0\5\10\1\0\2\13\1\10"+- "\7\13\2\0\2\13\2\0\3\13\2\0\1\10\6\0"+- "\1\13\5\0\5\10\2\13\2\0\7\13\3\0\5\13"+- "\213\0\65\10\22\13\4\10\5\0\12\15\4\0\1\13"+- "\1\10\40\0\60\10\24\13\2\10\1\0\1\10\10\0"+- "\12\15\246\0\57\10\7\13\2\0\11\13\27\0\4\10"+- "\2\13\42\0\60\10\21\13\3\0\1\10\13\0\12\15"+- "\46\0\53\10\15\13\1\10\7\0\12\15\66\0\33\16"+- "\2\0\17\17\4\0\12\15\2\16\3\0\1\16\300\0"+- "\54\10\17\13\145\0\100\10\12\15\25\0\1\10\240\0"+- "\10\10\2\0\47\10\7\13\2\0\7\13\1\10\1\0"+- "\1\10\1\13\33\0\1\10\12\13\50\10\7\13\1\10"+- "\4\13\10\0\1\13\10\0\1\10\13\13\56\10\20\13"+- "\3\0\1\10\42\0\71\10\7\0\11\10\1\0\45\10"+- "\10\13\1\0\10\13\1\10\17\0\12\15\30\0\36\10"+- "\2\0\26\13\1\0\16\13\111\0\7\10\1\0\2\10"+- "\1\0\46\10\6\13\3\0\1\13\1\0\2\13\1\0"+- "\7\13\1\10\1\13\10\0\12\15\6\0\6\10\1\0"+- "\2\10\1\0\40\10\5\13\1\0\2\13\1\0\5\13"+- "\1\10\7\0\12\15\u0136\0\23\10\4\13\11\0\232\10"+- "\146\0\157\10\21\0\304\10\274\0\57\10\1\0\11\13"+- "\307\0\107\10\271\0\71\10\7\0\37\10\1\0\12\15"+- "\146\0\36\10\2\0\5\13\13\0\60\10\7\13\11\0"+- "\4\10\14\0\12\15\11\0\25\10\5\0\23\10\260\0"+- "\100\10\200\0\113\10\4\0\1\13\1\10\67\13\7\0"+- "\4\13\15\10\100\0\2\10\1\0\1\10\34\0\1\25"+- "\u011e\26\61\0\3\26\21\0\4\25\230\0\153\10\5\0"+- "\15\10\3\0\11\10\7\0\12\10\3\0\2\13\1\0"+- "\4\13\301\0\5\13\3\0\26\13\2\0\7\13\36\0"+- "\4\13\224\0\3\13\273\0\125\10\1\0\107\10\1\0"+- "\2\10\2\0\1\10\2\0\2\10\2\0\4\10\1\0"+- "\14\10\1\0\1\10\1\0\7\10\1\0\101\10\1\0"+- "\4\10\2\0\10\10\1\0\7\10\1\0\34\10\1\0"+- "\4\10\1\0\5\10\1\0\1\10\3\0\7\10\1\0"+- "\u0154\10\2\0\31\10\1\0\31\10\1\0\37\10\1\0"+- "\31\10\1\0\37\10\1\0\31\10\1\0\37\10\1\0"+- "\31\10\1\0\37\10\1\0\31\10\1\0\10\10\2\0"+- "\62\15\67\13\4\0\62\13\10\0\1\13\16\0\1\13"+- "\26\0\5\13\1\0\17\13\120\0\7\13\1\0\21\13"+- "\2\0\7\13\1\0\2\13\1\0\5\13\325\0\55\10"+- "\3\0\7\13\7\10\2\0\12\15\4\0\1\10\u0171\0"+- "\54\10\4\13\12\15\6\0\305\10\13\0\7\13\51\0"+- "\104\10\7\13\1\10\4\0\12\15\246\0\4\10\1\0"+- "\33\10\1\0\2\10\1\0\1\10\2\0\1\10\1\0"+- "\12\10\1\0\4\10\1\0\1\10\1\0\1\10\6\0"+- "\1\10\4\0\1\10\1\0\1\10\1\0\1\10\1\0"+- "\3\10\1\0\2\10\1\0\1\10\2\0\1\10\1\0"+- "\1\10\1\0\1\10\1\0\1\10\1\0\1\10\1\0"+- "\2\10\1\0\1\10\2\0\4\10\1\0\7\10\1\0"+- "\4\10\1\0\4\10\1\0\1\10\1\0\12\10\1\0"+- "\21\10\5\0\3\10\1\0\5\10\1\0\21\10\104\0"+- "\u0100\12\15\0\3\12\37\0\1\12\32\10\6\0\32\10"+- "\2\0\4\12\2\23\14\10\2\23\12\10\4\0\1\12"+- "\2\0\12\12\22\0\71\12\32\31\1\26\17\12\12\0"+- "\1\12\24\0\1\12\2\0\11\12\1\0\4\12\11\0"+- "\u01b2\12\5\32\u013e\12\10\0\u010a\12\60\0\200\12\164\0"+- "\14\12\125\0\53\12\14\0\4\12\70\0\10\12\12\0"+- "\6\12\50\0\10\12\36\0\122\12\14\0\57\12\1\0"+- "\12\12\1\0\u03b7\12\2\0\327\24\51\0\65\24\13\0"+- "\336\24\2\0\u0182\24\16\0\u0131\24\37\0\36\24\343\0"+- "\1\13\36\0\137\33\1\34\200\0\360\13\20\0";-- private static int [] zzUnpackcmap_blocks() {- int [] result = new int[35328];+ "\42\0\1\1\1\2\3\0\1\3\2\0\1\2\1\0"+ + "\1\4\1\0\1\5\1\0\12\6\1\7\1\4\5\0"+ + "\32\10\4\0\1\11\1\0\32\10\56\0\1\12\1\10"+ + "\2\0\1\13\1\12\6\0\1\10\1\0\1\7\2\0"+ + "\1\10\5\0\27\10\1\0\37\10\1\0\u01e0\10\6\0"+ + "\7\10\7\0\24\10\160\13\5\10\1\0\2\10\2\0"+ + "\4\10\1\4\1\10\6\0\1\10\1\7\3\10\1\0"+ + "\1\10\1\0\24\10\1\0\123\10\1\0\213\10\1\0"+ + "\7\13\246\10\1\0\46\10\2\0\1\10\1\0\2\10"+ + "\1\0\1\10\1\0\51\10\1\4\7\0\55\13\1\0"+ + "\1\13\1\0\2\13\1\0\2\13\1\0\1\13\10\0"+ + "\33\14\4\0\4\14\1\10\1\7\13\0\6\13\6\0"+ + "\2\4\2\0\13\13\1\0\1\13\3\0\53\10\25\13"+ + "\12\15\1\0\1\15\1\4\1\0\2\10\1\13\143\10"+ + "\1\0\1\10\10\13\1\0\6\13\2\10\2\13\1\0"+ + "\4\13\2\10\12\15\3\10\2\0\1\10\17\0\1\13"+ + "\1\10\1\13\36\10\33\13\2\0\131\10\13\13\1\10"+ + "\16\0\12\15\41\10\11\13\2\10\2\0\1\4\1\0"+ + "\1\10\2\0\1\13\2\0\26\10\4\13\1\10\11\13"+ + "\1\10\3\13\1\10\5\13\22\0\31\10\3\13\4\0"+ + "\13\10\65\0\25\10\1\0\10\10\25\0\61\13\66\10"+ + "\3\13\1\10\22\13\1\10\7\13\12\10\2\13\2\0"+ + "\12\15\1\0\20\10\3\13\1\0\10\10\2\0\2\10"+ + "\2\0\26\10\1\0\7\10\1\0\1\10\3\0\4\10"+ + "\2\0\1\13\1\10\7\13\2\0\2\13\2\0\3\13"+ + "\1\10\10\0\1\13\4\0\2\10\1\0\3\10\2\13"+ + "\2\0\12\15\2\10\12\0\1\10\1\0\1\13\2\0"+ + "\3\13\1\0\6\10\4\0\2\10\2\0\26\10\1\0"+ + "\7\10\1\0\2\10\1\0\2\10\1\0\2\10\2\0"+ + "\1\13\1\0\5\13\4\0\2\13\2\0\3\13\3\0"+ + "\1\13\7\0\4\10\1\0\1\10\7\0\12\15\2\13"+ + "\3\10\1\13\13\0\3\13\1\0\11\10\1\0\3\10"+ + "\1\0\26\10\1\0\7\10\1\0\2\10\1\0\5\10"+ + "\2\0\1\13\1\10\10\13\1\0\3\13\1\0\3\13"+ + "\2\0\1\10\17\0\2\10\2\13\2\0\12\15\11\0"+ + "\1\10\6\13\1\0\3\13\1\0\10\10\2\0\2\10"+ + "\2\0\26\10\1\0\7\10\1\0\2\10\1\0\5\10"+ + "\2\0\1\13\1\10\7\13\2\0\2\13\2\0\3\13"+ + "\10\0\2\13\4\0\2\10\1\0\3\10\2\13\2\0"+ + "\12\15\1\0\1\10\20\0\1\13\1\10\1\0\6\10"+ + "\3\0\3\10\1\0\4\10\3\0\2\10\1\0\1\10"+ + "\1\0\2\10\3\0\2\10\3\0\3\10\3\0\14\10"+ + "\4\0\5\13\3\0\3\13\1\0\4\13\2\0\1\10"+ + "\6\0\1\13\16\0\12\15\20\0\5\13\10\10\1\0"+ + "\3\10\1\0\27\10\1\0\20\10\3\0\1\10\7\13"+ + "\1\0\3\13\1\0\4\13\7\0\2\13\1\0\3\10"+ + "\5\0\2\10\2\13\2\0\12\15\20\0\1\10\3\13"+ + "\1\0\10\10\1\0\3\10\1\0\27\10\1\0\12\10"+ + "\1\0\5\10\2\0\1\13\1\10\7\13\1\0\3\13"+ + "\1\0\4\13\7\0\2\13\7\0\1\10\1\0\2\10"+ + "\2\13\2\0\12\15\1\0\2\10\15\0\4\13\1\0"+ + "\10\10\1\0\3\10\1\0\51\10\2\13\1\10\7\13"+ + "\1\0\3\13\1\0\4\13\1\10\5\0\3\10\1\13"+ + "\7\0\3\10\2\13\2\0\12\15\12\0\6\10\2\0"+ + "\2\13\1\0\22\10\3\0\30\10\1\0\11\10\1\0"+ + "\1\10\2\0\7\10\3\0\1\13\4\0\6\13\1\0"+ + "\1\13\1\0\10\13\6\0\12\15\2\0\2\13\15\0"+ + "\60\16\1\17\2\16\7\17\5\0\7\16\10\17\1\0"+ + "\12\15\47\0\2\16\1\0\1\16\1\0\5\16\1\0"+ + "\30\16\1\0\1\16\1\0\12\16\1\17\2\16\11\17"+ + "\1\16\2\0\5\16\1\0\1\16\1\0\6\17\2\0"+ + "\12\15\2\0\4\16\40\0\1\10\27\0\2\13\6\0"+ + "\12\15\13\0\1\13\1\0\1\13\1\0\1\13\4\0"+ + "\2\13\10\10\1\0\44\10\4\0\24\13\1\0\2\13"+ + "\5\10\13\13\1\0\44\13\11\0\1\13\71\0\53\16"+ + "\24\17\1\16\12\15\6\0\6\16\4\17\4\16\3\17"+ + "\1\16\3\17\2\16\7\17\3\16\4\17\15\16\14\17"+ + "\1\16\1\17\12\15\4\17\2\16\46\10\1\0\1\10"+ + "\5\0\1\10\2\0\53\10\1\0\4\10\u0100\20\111\10"+ + "\1\0\4\10\2\0\7\10\1\0\1\10\1\0\4\10"+ + "\2\0\51\10\1\0\4\10\2\0\41\10\1\0\4\10"+ + "\2\0\7\10\1\0\1\10\1\0\4\10\2\0\17\10"+ + "\1\0\71\10\1\0\4\10\2\0\103\10\2\0\3\13"+ + "\40\0\20\10\20\0\126\10\2\0\6\10\3\0\u016c\10"+ + "\2\0\21\10\1\0\32\10\5\0\113\10\3\0\13\10"+ + "\7\0\15\10\1\0\4\10\3\13\13\0\22\10\3\13"+ + "\13\0\22\10\2\13\14\0\15\10\1\0\3\10\1\0"+ + "\2\13\14\0\64\16\40\17\3\0\1\16\4\0\1\16"+ + "\1\17\2\0\12\15\41\0\4\13\1\0\12\15\6\0"+ + "\131\10\7\0\5\10\2\13\42\10\1\13\1\10\5\0"+ + "\106\10\12\0\37\10\1\0\14\13\4\0\14\13\12\0"+ + "\12\15\36\16\2\0\5\16\13\0\54\16\4\0\32\16"+ + "\6\0\12\15\1\16\3\0\2\16\40\0\27\10\5\13"+ + "\4\0\65\16\12\17\1\0\35\17\2\0\1\13\12\15"+ + "\6\0\12\15\6\0\16\16\2\0\17\13\101\0\5\13"+ + "\57\10\21\13\7\10\4\0\12\15\21\0\11\13\14\0"+ + "\3\13\36\10\15\13\2\10\12\15\54\10\16\13\14\0"+ + "\44\10\24\13\10\0\12\15\3\0\3\10\12\15\44\10"+ + "\2\0\11\10\7\0\53\10\2\0\3\10\20\0\3\13"+ + "\1\0\25\13\4\10\1\13\6\10\1\13\2\10\3\13"+ + "\1\10\5\0\300\10\72\13\1\0\5\13\26\10\2\0"+ + "\6\10\2\0\46\10\2\0\6\10\2\0\10\10\1\0"+ + "\1\10\1\0\1\10\1\0\1\10\1\0\37\10\2\0"+ + "\65\10\1\0\7\10\1\0\1\10\3\0\3\10\1\0"+ + "\7\10\3\0\4\10\2\0\6\10\4\0\15\10\5\0"+ + "\3\10\1\0\7\10\17\0\1\13\1\21\2\13\10\0"+ + "\2\5\12\0\1\5\2\0\1\7\2\0\5\13\1\11"+ + "\14\0\1\12\2\0\2\11\3\0\1\4\4\0\1\12"+ + "\12\0\1\11\13\0\5\13\1\0\12\13\1\0\1\10"+ + "\15\0\1\10\20\0\15\10\63\0\23\13\1\22\15\13"+ + "\21\0\1\10\4\0\1\10\2\0\12\10\1\0\1\10"+ + "\3\0\5\10\4\0\1\12\1\0\1\10\1\0\1\10"+ + "\1\0\1\10\1\0\4\10\1\0\12\10\1\23\2\0"+ + "\4\10\5\0\5\10\4\0\1\10\21\0\51\10\13\0"+ + "\6\12\17\0\2\12\u016f\0\2\12\14\0\1\12\137\0"+ + "\1\12\106\0\1\12\31\0\13\12\4\0\3\12\273\0"+ + "\14\10\1\23\47\10\300\0\2\12\12\0\1\12\11\0"+ + "\1\12\72\0\4\12\1\0\6\12\1\0\14\12\1\0"+ + "\162\12\12\0\166\12\2\0\13\12\1\0\1\12\1\0"+ + "\1\12\6\0\1\12\3\0\1\12\6\0\1\12\12\0"+ + "\2\12\17\0\1\12\2\0\1\12\4\0\1\12\1\0"+ + "\1\12\4\0\3\12\1\0\1\12\13\0\5\12\55\0"+ + "\3\12\11\0\1\12\16\0\1\12\16\0\1\12\164\0"+ + "\2\12\317\0\3\12\23\0\2\12\63\0\1\12\4\0"+ + "\1\12\252\0\57\10\1\0\57\10\1\0\205\10\6\0"+ + "\4\10\3\13\2\10\14\0\46\10\1\0\1\10\5\0"+ + "\1\10\2\0\70\10\7\0\1\10\17\0\1\13\27\10"+ + "\11\0\7\10\1\0\7\10\1\0\7\10\1\0\7\10"+ + "\1\0\7\10\1\0\7\10\1\0\7\10\1\0\7\10"+ + "\1\0\40\13\57\0\1\10\120\0\32\24\1\0\131\24"+ + "\14\0\326\24\57\0\1\10\1\0\1\24\31\0\11\24"+ + "\6\13\1\12\5\25\2\0\3\24\2\10\1\12\3\0"+ + "\126\26\2\0\2\13\2\25\3\26\133\25\1\0\4\25"+ + "\5\0\53\10\1\0\136\20\21\0\33\10\65\0\20\25"+ + "\227\0\1\12\1\0\1\12\66\0\57\25\1\0\130\25"+ + "\250\0\u01b6\24\112\0\360\24\20\0\215\10\103\0\56\10"+ + "\2\0\15\10\3\0\20\10\12\15\2\10\24\0\57\10"+ + "\4\13\1\0\12\13\1\0\37\10\2\13\120\10\2\13"+ + "\45\0\251\10\2\0\5\10\60\0\13\10\1\13\3\10"+ + "\1\13\4\10\1\13\27\10\5\13\30\0\64\10\14\0"+ + "\2\13\62\10\22\13\12\0\12\15\6\0\22\13\6\10"+ + "\3\0\1\10\1\0\2\10\1\13\12\15\34\10\10\13"+ + "\2\0\27\10\15\13\14\0\35\20\3\0\4\13\57\10"+ + "\16\13\16\0\1\10\12\15\6\0\5\16\1\17\12\16"+ + "\12\15\5\16\1\0\51\10\16\13\11\0\3\10\1\13"+ + "\10\10\2\13\2\0\12\15\6\0\33\16\3\17\62\16"+ + "\1\17\1\16\3\17\2\16\2\17\5\16\2\17\1\16"+ + "\1\17\1\16\30\0\5\16\13\10\5\13\2\0\3\10"+ + "\2\13\12\0\6\10\2\0\6\10\2\0\6\10\11\0"+ + "\7\10\1\0\7\10\1\0\70\10\10\0\163\10\10\13"+ + "\1\0\2\13\2\0\12\15\6\0\244\20\14\0\27\20"+ + "\4\0\61\20\4\0\156\24\2\0\152\24\46\0\7\10"+ + "\14\0\5\10\5\0\1\14\1\13\12\14\1\0\15\14"+ + "\1\0\5\14\1\0\1\14\1\0\2\14\1\0\2\14"+ + "\1\0\12\14\142\10\41\0\153\10\22\0\100\10\2\0"+ + "\66\10\50\0\14\10\4\0\16\13\1\27\1\30\1\4"+ + "\2\0\1\7\1\4\13\0\20\13\3\0\2\11\30\0"+ + "\3\11\1\4\1\0\1\5\1\0\1\4\1\7\32\0"+ + "\5\10\1\0\207\10\2\0\1\13\7\0\1\5\4\0"+ + "\1\4\1\0\1\5\1\0\12\15\1\7\1\4\5\0"+ + "\32\10\4\0\1\11\1\0\32\10\13\0\70\25\2\13"+ + "\37\20\3\0\6\20\2\0\6\20\2\0\6\20\2\0"+ + "\3\20\34\0\3\13\4\0\14\10\1\0\32\10\1\0"+ + "\23\10\1\0\2\10\1\0\17\10\2\0\16\10\42\0"+ + "\173\10\105\0\65\10\210\0\1\13\202\0\35\10\3\0"+ + "\61\10\17\0\1\13\37\0\40\10\15\0\36\10\5\0"+ + "\46\10\5\13\5\0\36\10\2\0\44\10\4\0\10\10"+ + "\1\0\5\10\52\0\236\10\2\0\12\15\6\0\44\10"+ + "\4\0\44\10\4\0\50\10\10\0\64\10\234\0\67\10"+ + "\11\0\26\10\12\0\10\10\230\0\6\10\2\0\1\10"+ + "\1\0\54\10\1\0\2\10\3\0\1\10\2\0\27\10"+ + "\12\0\27\10\11\0\37\10\101\0\23\10\1\0\2\10"+ + "\12\0\26\10\12\0\32\10\106\0\70\10\6\0\2\10"+ + "\100\0\1\10\3\13\1\0\2\13\5\0\4\13\4\10"+ + "\1\0\3\10\1\0\35\10\2\0\3\13\4\0\1\13"+ + "\40\0\35\10\3\0\35\10\43\0\10\10\1\0\34\10"+ + "\2\13\31\0\66\10\12\0\26\10\12\0\23\10\15\0"+ + "\22\10\156\0\111\10\67\0\63\10\15\0\63\10\15\0"+ + "\44\10\4\13\10\0\12\15\306\0\35\10\12\0\1\10"+ + "\10\0\26\10\13\13\217\0\27\10\11\0\3\13\65\10"+ + "\17\13\37\0\12\15\17\0\4\13\55\10\13\13\2\0"+ + "\1\13\17\0\1\13\2\0\31\10\7\0\12\15\6\0"+ + "\3\13\44\10\16\13\1\0\12\15\4\0\1\10\2\13"+ + "\11\0\43\10\1\13\2\0\1\10\11\0\3\13\60\10"+ + "\16\13\4\10\4\0\4\13\3\0\12\15\1\10\1\0"+ + "\1\10\43\0\22\10\1\0\31\10\14\13\6\0\1\13"+ + "\101\0\7\10\1\0\1\10\1\0\4\10\1\0\17\10"+ + "\1\0\12\10\7\0\57\10\14\13\5\0\12\15\6\0"+ + "\4\13\1\0\10\10\2\0\2\10\2\0\26\10\1\0"+ + "\7\10\1\0\2\10\1\0\5\10\1\0\2\13\1\10"+ + "\7\13\2\0\2\13\2\0\3\13\2\0\1\10\6\0"+ + "\1\13\5\0\5\10\2\13\2\0\7\13\3\0\5\13"+ + "\213\0\65\10\22\13\4\10\5\0\12\15\4\0\1\13"+ + "\1\10\40\0\60\10\24\13\2\10\1\0\1\10\10\0"+ + "\12\15\246\0\57\10\7\13\2\0\11\13\27\0\4\10"+ + "\2\13\42\0\60\10\21\13\3\0\1\10\13\0\12\15"+ + "\46\0\53\10\15\13\1\10\7\0\12\15\66\0\33\16"+ + "\2\0\17\17\4\0\12\15\2\16\3\0\1\16\300\0"+ + "\54\10\17\13\145\0\100\10\12\15\25\0\1\10\240\0"+ + "\10\10\2\0\47\10\7\13\2\0\7\13\1\10\1\0"+ + "\1\10\1\13\33\0\1\10\12\13\50\10\7\13\1\10"+ + "\4\13\10\0\1\13\10\0\1\10\13\13\56\10\20\13"+ + "\3\0\1\10\42\0\71\10\7\0\11\10\1\0\45\10"+ + "\10\13\1\0\10\13\1\10\17\0\12\15\30\0\36\10"+ + "\2\0\26\13\1\0\16\13\111\0\7\10\1\0\2\10"+ + "\1\0\46\10\6\13\3\0\1\13\1\0\2\13\1\0"+ + "\7\13\1\10\1\13\10\0\12\15\6\0\6\10\1\0"+ + "\2\10\1\0\40\10\5\13\1\0\2\13\1\0\5\13"+ + "\1\10\7\0\12\15\u0136\0\23\10\4\13\11\0\232\10"+ + "\146\0\157\10\21\0\304\10\274\0\57\10\1\0\11\13"+ + "\307\0\107\10\271\0\71\10\7\0\37\10\1\0\12\15"+ + "\146\0\36\10\2\0\5\13\13\0\60\10\7\13\11\0"+ + "\4\10\14\0\12\15\11\0\25\10\5\0\23\10\260\0"+ + "\100\10\200\0\113\10\4\0\1\13\1\10\67\13\7\0"+ + "\4\13\15\10\100\0\2\10\1\0\1\10\34\0\1\25"+ + "\u011e\26\61\0\3\26\21\0\4\25\230\0\153\10\5\0"+ + "\15\10\3\0\11\10\7\0\12\10\3\0\2\13\1\0"+ + "\4\13\301\0\5\13\3\0\26\13\2\0\7\13\36\0"+ + "\4\13\224\0\3\13\273\0\125\10\1\0\107\10\1\0"+ + "\2\10\2\0\1\10\2\0\2\10\2\0\4\10\1\0"+ + "\14\10\1\0\1\10\1\0\7\10\1\0\101\10\1\0"+ + "\4\10\2\0\10\10\1\0\7\10\1\0\34\10\1\0"+ + "\4\10\1\0\5\10\1\0\1\10\3\0\7\10\1\0"+ + "\u0154\10\2\0\31\10\1\0\31\10\1\0\37\10\1\0"+ + "\31\10\1\0\37\10\1\0\31\10\1\0\37\10\1\0"+ + "\31\10\1\0\37\10\1\0\31\10\1\0\10\10\2\0"+ + "\62\15\67\13\4\0\62\13\10\0\1\13\16\0\1\13"+ + "\26\0\5\13\1\0\17\13\120\0\7\13\1\0\21\13"+ + "\2\0\7\13\1\0\2\13\1\0\5\13\325\0\55\10"+ + "\3\0\7\13\7\10\2\0\12\15\4\0\1\10\u0171\0"+ + "\54\10\4\13\12\15\6\0\305\10\13\0\7\13\51\0"+ + "\104\10\7\13\1\10\4\0\12\15\246\0\4\10\1\0"+ + "\33\10\1\0\2\10\1\0\1\10\2\0\1\10\1\0"+ + "\12\10\1\0\4\10\1\0\1\10\1\0\1\10\6\0"+ + "\1\10\4\0\1\10\1\0\1\10\1\0\1\10\1\0"+ + "\3\10\1\0\2\10\1\0\1\10\2\0\1\10\1\0"+ + "\1\10\1\0\1\10\1\0\1\10\1\0\1\10\1\0"+ + "\2\10\1\0\1\10\2\0\4\10\1\0\7\10\1\0"+ + "\4\10\1\0\4\10\1\0\1\10\1\0\12\10\1\0"+ + "\21\10\5\0\3\10\1\0\5\10\1\0\21\10\104\0"+ + "\u0100\12\15\0\3\12\37\0\1\12\32\10\6\0\32\10"+ + "\2\0\4\12\2\23\14\10\2\23\12\10\4\0\1\12"+ + "\2\0\12\12\22\0\71\12\32\31\1\26\17\12\12\0"+ + "\1\12\24\0\1\12\2\0\11\12\1\0\4\12\11\0"+ + "\u01b2\12\5\32\u013e\12\10\0\u010a\12\60\0\200\12\164\0"+ + "\14\12\125\0\53\12\14\0\4\12\70\0\10\12\12\0"+ + "\6\12\50\0\10\12\36\0\122\12\14\0\57\12\1\0"+ + "\12\12\1\0\u03b7\12\2\0\327\24\51\0\65\24\13\0"+ + "\336\24\2\0\u0182\24\16\0\u0131\24\37\0\36\24\343\0"+ + "\1\13\36\0\137\33\1\34\200\0\360\13\20\0";++ private static int[] zzUnpackcmap_blocks() {+ int[] result = new int[35328];int offset = 0;offset = zzUnpackcmap_blocks(ZZ_CMAP_BLOCKS_PACKED_0, offset, result);return result;}- private static int zzUnpackcmap_blocks(String packed, int offset, int [] result) {- int i = 0; /* index in packed string */- int j = offset; /* index in unpacked array */+ private static int zzUnpackcmap_blocks(String packed, int offset, int[] result) {+ int i = 0; /* index in packed string */+ int j = offset; /* index in unpacked array */int l = packed.length();while (i < l) {int count = packed.charAt(i++);int value = packed.charAt(i++);- do result[j++] = value; while (--count > 0);+ do result[j++] = value;+ while (--count > 0);}return j;}- /**- * Translates DFA states to action switch labels.- */- private static final int [] ZZ_ACTION = zzUnpackAction();+ /** Translates DFA states to action switch labels. */+ private static final int[] ZZ_ACTION = zzUnpackAction();private static final String ZZ_ACTION_PACKED_0 =- "\1\0\2\1\1\2\1\3\1\1\1\4\1\3\1\2"+- "\1\5\1\6\1\1\1\4\1\7\1\10\1\11\1\1"+- "\1\4\1\0\1\4\2\0\1\2\1\4\1\2\1\0"+- "\2\3\1\0\1\3\2\4\1\0\1\3\1\0\2\4"+- "\1\0\4\4\1\0\1\4\2\0\1\4\2\3\2\4"+- "\1\0\3\4\1\3\3\4";-- private static int [] zzUnpackAction() {- int [] result = new int[59];+ "\1\0\2\1\1\2\1\3\1\1\1\4\1\3\1\2"+ + "\1\5\1\6\1\1\1\4\1\7\1\10\1\11\1\1"+ + "\1\4\1\0\1\4\2\0\1\2\1\4\1\2\1\0"+ + "\2\3\1\0\1\3\2\4\1\0\1\3\1\0\2\4"+ + "\1\0\4\4\1\0\1\4\2\0\1\4\2\3\2\4"+ + "\1\0\3\4\1\3\3\4";++ private static int[] zzUnpackAction() {+ int[] result = new int[59];int offset = 0;offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);return result;}- private static int zzUnpackAction(String packed, int offset, int [] result) {- int i = 0; /* index in packed string */- int j = offset; /* index in unpacked array */+ private static int zzUnpackAction(String packed, int offset, int[] result) {+ int i = 0; /* index in packed string */+ int j = offset; /* index in unpacked array */int l = packed.length();while (i < l) {int count = packed.charAt(i++);int value = packed.charAt(i++);- do result[j++] = value; while (--count > 0);+ do result[j++] = value;+ while (--count > 0);}return j;}-- /**- * Translates a state to a row index in the transition table- */- private static final int [] ZZ_ROWMAP = zzUnpackRowMap();+ /** Translates a state to a row index in the transition table */+ private static final int[] ZZ_ROWMAP = zzUnpackRowMap();private static final String ZZ_ROWMAP_PACKED_0 =- "\0\0\0\35\0\72\0\127\0\164\0\221\0\256\0\313"+- "\0\350\0\u0105\0\u0122\0\u013f\0\u015c\0\u0179\0\u0196\0\u01b3"+- "\0\u01d0\0\u01ed\0\72\0\u020a\0\u0227\0\u0244\0\u0261\0\u027e"+- "\0\u029b\0\u02b8\0\u02d5\0\u02f2\0\221\0\u030f\0\u032c\0\u0349"+- "\0\u0366\0\u0383\0\u013f\0\u03a0\0\u03bd\0\u01d0\0\u03da\0\u03f7"+- "\0\u0414\0\u0431\0\u044e\0\u046b\0\u0488\0\u04a5\0\u04c2\0\u04df"+- "\0\u04fc\0\u0519\0\u0536\0\u0553\0\35\0\u0570\0\u058d\0\u05aa"+- "\0\u05c7\0\164\0\u05e4";-- private static int [] zzUnpackRowMap() {- int [] result = new int[59];+ "\0\0\0\35\0\72\0\127\0\164\0\221\0\256\0\313"+ + "\0\350\0\u0105\0\u0122\0\u013f\0\u015c\0\u0179\0\u0196\0\u01b3"+ + "\0\u01d0\0\u01ed\0\72\0\u020a\0\u0227\0\u0244\0\u0261\0\u027e"+ + "\0\u029b\0\u02b8\0\u02d5\0\u02f2\0\221\0\u030f\0\u032c\0\u0349"+ + "\0\u0366\0\u0383\0\u013f\0\u03a0\0\u03bd\0\u01d0\0\u03da\0\u03f7"+ + "\0\u0414\0\u0431\0\u044e\0\u046b\0\u0488\0\u04a5\0\u04c2\0\u04df"+ + "\0\u04fc\0\u0519\0\u0536\0\u0553\0\35\0\u0570\0\u058d\0\u05aa"+ + "\0\u05c7\0\164\0\u05e4";++ private static int[] zzUnpackRowMap() {+ int[] result = new int[59];int offset = 0;offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);return result;}- private static int zzUnpackRowMap(String packed, int offset, int [] result) {- int i = 0; /* index in packed string */- int j = offset; /* index in unpacked array */+ private static int zzUnpackRowMap(String packed, int offset, int[] result) {+ int i = 0; /* index in packed string */+ int j = offset; /* index in unpacked array */int l = packed.length() - 1;while (i < l) {int high = packed.charAt(i++) << 16;@@ -446,141 +435,141 @@ public final class StandardTokenizerImpl {return j;}- /**- * The transition table of the DFA- */- private static final int [] ZZ_TRANS = zzUnpacktrans();+ /** The transition table of the DFA */+ private static final int[] ZZ_TRANS = zzUnpacktrans();private static final String ZZ_TRANS_PACKED_0 =- "\2\2\1\3\3\2\1\4\1\2\1\5\1\6\1\7"+- "\1\2\1\10\1\11\2\12\1\13\1\14\1\2\1\15"+- "\1\16\1\17\1\20\2\2\1\21\1\22\2\2\50\0"+- "\1\23\3\0\1\23\1\0\1\23\1\24\5\0\1\25"+- "\1\0\3\23\3\0\3\26\1\11\1\0\1\5\1\27"+- "\1\0\1\4\1\10\1\11\1\0\1\4\1\5\1\4"+- "\1\30\1\5\3\0\1\11\1\31\1\0\3\4\3\0"+- "\1\32\1\0\1\32\1\33\1\32\1\5\1\34\1\0"+- "\1\5\1\10\1\33\1\0\5\5\3\0\2\5\1\0"+- "\3\5\6\0\1\11\1\0\1\5\1\35\1\0\1\35"+- "\1\10\1\11\1\0\1\35\1\5\2\35\1\5\1\0"+- "\1\36\1\0\2\35\1\0\3\35\13\0\1\7\3\0"+- "\1\7\1\0\1\37\1\7\5\0\1\40\1\0\3\7"+- "\1\0\1\41\1\0\1\42\1\0\1\32\1\33\1\32"+- "\1\5\1\34\1\0\2\10\1\33\1\0\1\10\1\5"+- "\2\10\1\5\3\0\2\10\1\0\3\10\3\0\3\26"+- "\1\11\1\0\1\5\1\27\1\0\1\11\1\10\1\11"+- "\1\0\1\11\1\5\2\11\1\5\3\0\2\11\1\0"+- "\3\11\13\0\1\12\2\0\2\12\1\0\2\12\4\0"+- "\2\12\1\0\3\12\3\0\1\32\1\0\1\32\1\33"+- "\1\32\1\5\1\34\1\0\1\13\1\10\1\33\1\0"+- "\4\13\1\5\3\0\2\13\1\0\3\13\12\0\1\7"+- "\6\0\1\43\1\0\1\7\14\0\1\32\1\0\1\32"+- "\1\33\1\32\1\5\1\34\1\0\1\15\1\10\1\33"+- "\1\0\1\15\1\5\1\44\1\15\1\5\3\0\1\5"+- "\1\45\1\0\3\15\13\0\1\16\3\0\1\16\1\0"+- "\2\16\4\0\2\16\1\0\3\16\11\0\1\34\1\0"+- "\1\17\3\0\1\17\1\0\2\17\2\0\1\17\1\0"+- "\2\17\1\0\3\17\13\0\1\20\3\0\1\20\1\0"+- "\2\20\4\0\2\20\1\0\3\20\13\0\1\46\3\0"+- "\1\46\1\0\2\46\4\0\2\46\1\47\3\46\13\0"+- "\1\22\3\0\1\22\1\0\1\50\1\22\7\0\3\22"+- "\13\0\1\24\3\0\1\24\1\0\2\24\5\0\1\25"+- "\1\0\3\24\22\0\1\51\20\0\1\11\4\0\1\26"+- "\1\0\1\11\1\0\1\26\1\0\2\26\4\0\2\26"+- "\1\0\3\26\6\0\1\11\1\0\1\5\1\27\1\0"+- "\1\27\1\10\1\11\1\0\1\27\1\5\2\27\1\5"+- "\1\0\1\36\1\0\2\27\1\0\3\27\3\0\3\26"+- "\1\11\1\0\1\5\1\27\1\0\1\30\1\10\1\11"+- "\1\0\1\30\1\5\2\30\1\5\3\0\1\11\1\31"+- "\1\0\3\30\3\0\3\26\1\11\1\0\1\5\1\27"+- "\1\0\1\11\1\10\1\11\1\0\1\11\1\5\1\11"+- "\1\52\1\5\3\0\2\11\1\0\3\11\10\0\1\5"+- "\2\0\1\32\1\5\2\0\1\32\1\5\2\32\1\5"+- "\3\0\2\32\1\0\3\32\3\0\3\53\1\33\1\0"+- "\1\5\1\34\1\0\1\33\1\10\1\33\1\0\1\33"+- "\1\5\2\33\1\5\3\0\2\33\1\0\3\33\6\0"+- "\1\33\1\0\1\5\1\34\1\0\1\34\1\10\1\33"+- "\1\0\1\34\1\5\2\34\1\5\1\0\1\36\1\0"+- "\2\34\1\0\3\34\11\0\1\34\1\0\1\36\3\0"+- "\1\36\1\0\2\36\2\0\1\36\1\0\2\36\1\0"+- "\3\36\12\0\1\54\1\7\3\0\1\7\1\0\1\37"+- "\1\7\1\54\4\0\1\40\1\0\3\7\21\0\1\55"+- "\11\0\1\56\14\0\1\41\1\42\2\0\1\41\1\0"+- "\2\41\4\0\2\41\1\0\3\41\6\0\1\33\1\0"+- "\1\5\1\34\1\0\1\42\1\10\1\33\1\0\1\42"+- "\1\5\2\42\1\5\3\0\2\42\1\0\3\42\3\0"+- "\1\32\1\0\1\32\1\33\1\32\1\5\1\34\1\54"+- "\1\15\1\10\1\33\1\0\1\15\1\5\1\44\1\15"+- "\1\57\3\0\1\5\1\45\1\0\3\15\3\0\1\32"+- "\1\0\1\32\1\33\1\32\1\5\1\34\1\0\1\5"+- "\1\10\1\33\1\0\2\5\1\60\2\5\3\0\2\5"+- "\1\0\1\5\1\61\1\5\13\0\1\47\3\0\1\47"+- "\1\0\2\47\4\0\2\47\1\0\3\47\12\0\1\54"+- "\1\22\3\0\1\22\1\0\1\50\1\22\1\54\6\0"+- "\3\22\13\0\1\51\3\0\1\51\1\0\2\51\7\0"+- "\3\51\3\0\3\26\1\11\1\0\1\5\1\27\1\0"+- "\1\52\1\10\1\11\1\0\1\52\1\5\2\52\1\5"+- "\3\0\2\11\1\0\3\52\6\0\1\33\4\0\1\53"+- "\1\0\1\33\1\0\1\53\1\0\2\53\4\0\2\53"+- "\1\0\3\53\13\0\1\54\3\0\1\54\1\0\1\62"+- "\1\54\5\0\1\63\1\0\3\54\12\0\1\54\6\0"+- "\1\64\1\0\1\54\6\0\1\22\35\0\1\56\1\65"+- "\3\0\1\32\1\0\1\32\1\33\1\32\1\5\1\34"+- "\1\0\1\57\1\10\1\33\1\0\1\57\1\5\1\66"+- "\1\57\1\5\3\0\1\5\1\67\1\0\3\57\3\0"+- "\1\32\1\0\1\32\1\33\1\32\1\5\1\34\1\54"+- "\1\5\1\10\1\33\1\0\2\5\1\70\1\5\1\57"+- "\3\0\2\5\1\0\1\71\2\5\3\0\1\32\1\0"+- "\1\32\1\33\1\32\1\5\1\34\1\0\1\5\1\10"+- "\1\33\1\0\5\5\3\0\2\5\1\0\1\5\1\61"+- "\1\72\12\0\2\54\3\0\1\54\1\0\1\62\2\54"+- "\4\0\1\63\1\0\3\54\21\0\1\55\25\0\1\54"+- "\6\0\1\64\1\0\1\54\14\0\1\32\1\0\1\32"+- "\1\33\1\32\1\5\1\34\1\54\1\57\1\10\1\33"+- "\1\0\1\57\1\5\1\66\2\57\3\0\1\5\1\67"+- "\1\0\3\57\3\0\1\32\1\0\1\32\1\33\1\32"+- "\1\5\1\34\1\0\1\5\1\10\1\33\1\0\2\5"+- "\1\60\2\5\3\0\2\5\1\0\3\5\3\0\1\32"+- "\1\0\1\32\1\33\1\32\1\5\1\34\1\54\1\5"+- "\1\10\1\33\1\0\2\5\1\70\1\5\1\57\3\0"+- "\2\5\1\0\3\5\3\0\1\32\1\0\1\32\1\33"+- "\1\32\1\5\1\34\1\0\1\71\1\10\1\33\1\0"+- "\1\71\1\5\1\73\1\71\1\5\3\0\2\5\1\0"+- "\3\71\3\0\1\32\1\0\1\32\1\33\1\32\1\5"+- "\1\34\1\54\1\71\1\10\1\33\1\0\1\71\1\5"+- "\1\73\1\71\1\57\3\0\2\5\1\0\3\71";-- private static int [] zzUnpacktrans() {- int [] result = new int[1537];+ "\2\2\1\3\3\2\1\4\1\2\1\5\1\6\1\7"+ + "\1\2\1\10\1\11\2\12\1\13\1\14\1\2\1\15"+ + "\1\16\1\17\1\20\2\2\1\21\1\22\2\2\50\0"+ + "\1\23\3\0\1\23\1\0\1\23\1\24\5\0\1\25"+ + "\1\0\3\23\3\0\3\26\1\11\1\0\1\5\1\27"+ + "\1\0\1\4\1\10\1\11\1\0\1\4\1\5\1\4"+ + "\1\30\1\5\3\0\1\11\1\31\1\0\3\4\3\0"+ + "\1\32\1\0\1\32\1\33\1\32\1\5\1\34\1\0"+ + "\1\5\1\10\1\33\1\0\5\5\3\0\2\5\1\0"+ + "\3\5\6\0\1\11\1\0\1\5\1\35\1\0\1\35"+ + "\1\10\1\11\1\0\1\35\1\5\2\35\1\5\1\0"+ + "\1\36\1\0\2\35\1\0\3\35\13\0\1\7\3\0"+ + "\1\7\1\0\1\37\1\7\5\0\1\40\1\0\3\7"+ + "\1\0\1\41\1\0\1\42\1\0\1\32\1\33\1\32"+ + "\1\5\1\34\1\0\2\10\1\33\1\0\1\10\1\5"+ + "\2\10\1\5\3\0\2\10\1\0\3\10\3\0\3\26"+ + "\1\11\1\0\1\5\1\27\1\0\1\11\1\10\1\11"+ + "\1\0\1\11\1\5\2\11\1\5\3\0\2\11\1\0"+ + "\3\11\13\0\1\12\2\0\2\12\1\0\2\12\4\0"+ + "\2\12\1\0\3\12\3\0\1\32\1\0\1\32\1\33"+ + "\1\32\1\5\1\34\1\0\1\13\1\10\1\33\1\0"+ + "\4\13\1\5\3\0\2\13\1\0\3\13\12\0\1\7"+ + "\6\0\1\43\1\0\1\7\14\0\1\32\1\0\1\32"+ + "\1\33\1\32\1\5\1\34\1\0\1\15\1\10\1\33"+ + "\1\0\1\15\1\5\1\44\1\15\1\5\3\0\1\5"+ + "\1\45\1\0\3\15\13\0\1\16\3\0\1\16\1\0"+ + "\2\16\4\0\2\16\1\0\3\16\11\0\1\34\1\0"+ + "\1\17\3\0\1\17\1\0\2\17\2\0\1\17\1\0"+ + "\2\17\1\0\3\17\13\0\1\20\3\0\1\20\1\0"+ + "\2\20\4\0\2\20\1\0\3\20\13\0\1\46\3\0"+ + "\1\46\1\0\2\46\4\0\2\46\1\47\3\46\13\0"+ + "\1\22\3\0\1\22\1\0\1\50\1\22\7\0\3\22"+ + "\13\0\1\24\3\0\1\24\1\0\2\24\5\0\1\25"+ + "\1\0\3\24\22\0\1\51\20\0\1\11\4\0\1\26"+ + "\1\0\1\11\1\0\1\26\1\0\2\26\4\0\2\26"+ + "\1\0\3\26\6\0\1\11\1\0\1\5\1\27\1\0"+ + "\1\27\1\10\1\11\1\0\1\27\1\5\2\27\1\5"+ + "\1\0\1\36\1\0\2\27\1\0\3\27\3\0\3\26"+ + "\1\11\1\0\1\5\1\27\1\0\1\30\1\10\1\11"+ + "\1\0\1\30\1\5\2\30\1\5\3\0\1\11\1\31"+ + "\1\0\3\30\3\0\3\26\1\11\1\0\1\5\1\27"+ + "\1\0\1\11\1\10\1\11\1\0\1\11\1\5\1\11"+ + "\1\52\1\5\3\0\2\11\1\0\3\11\10\0\1\5"+ + "\2\0\1\32\1\5\2\0\1\32\1\5\2\32\1\5"+ + "\3\0\2\32\1\0\3\32\3\0\3\53\1\33\1\0"+ + "\1\5\1\34\1\0\1\33\1\10\1\33\1\0\1\33"+ + "\1\5\2\33\1\5\3\0\2\33\1\0\3\33\6\0"+ + "\1\33\1\0\1\5\1\34\1\0\1\34\1\10\1\33"+ + "\1\0\1\34\1\5\2\34\1\5\1\0\1\36\1\0"+ + "\2\34\1\0\3\34\11\0\1\34\1\0\1\36\3\0"+ + "\1\36\1\0\2\36\2\0\1\36\1\0\2\36\1\0"+ + "\3\36\12\0\1\54\1\7\3\0\1\7\1\0\1\37"+ + "\1\7\1\54\4\0\1\40\1\0\3\7\21\0\1\55"+ + "\11\0\1\56\14\0\1\41\1\42\2\0\1\41\1\0"+ + "\2\41\4\0\2\41\1\0\3\41\6\0\1\33\1\0"+ + "\1\5\1\34\1\0\1\42\1\10\1\33\1\0\1\42"+ + "\1\5\2\42\1\5\3\0\2\42\1\0\3\42\3\0"+ + "\1\32\1\0\1\32\1\33\1\32\1\5\1\34\1\54"+ + "\1\15\1\10\1\33\1\0\1\15\1\5\1\44\1\15"+ + "\1\57\3\0\1\5\1\45\1\0\3\15\3\0\1\32"+ + "\1\0\1\32\1\33\1\32\1\5\1\34\1\0\1\5"+ + "\1\10\1\33\1\0\2\5\1\60\2\5\3\0\2\5"+ + "\1\0\1\5\1\61\1\5\13\0\1\47\3\0\1\47"+ + "\1\0\2\47\4\0\2\47\1\0\3\47\12\0\1\54"+ + "\1\22\3\0\1\22\1\0\1\50\1\22\1\54\6\0"+ + "\3\22\13\0\1\51\3\0\1\51\1\0\2\51\7\0"+ + "\3\51\3\0\3\26\1\11\1\0\1\5\1\27\1\0"+ + "\1\52\1\10\1\11\1\0\1\52\1\5\2\52\1\5"+ + "\3\0\2\11\1\0\3\52\6\0\1\33\4\0\1\53"+ + "\1\0\1\33\1\0\1\53\1\0\2\53\4\0\2\53"+ + "\1\0\3\53\13\0\1\54\3\0\1\54\1\0\1\62"+ + "\1\54\5\0\1\63\1\0\3\54\12\0\1\54\6\0"+ + "\1\64\1\0\1\54\6\0\1\22\35\0\1\56\1\65"+ + "\3\0\1\32\1\0\1\32\1\33\1\32\1\5\1\34"+ + "\1\0\1\57\1\10\1\33\1\0\1\57\1\5\1\66"+ + "\1\57\1\5\3\0\1\5\1\67\1\0\3\57\3\0"+ + "\1\32\1\0\1\32\1\33\1\32\1\5\1\34\1\54"+ + "\1\5\1\10\1\33\1\0\2\5\1\70\1\5\1\57"+ + "\3\0\2\5\1\0\1\71\2\5\3\0\1\32\1\0"+ + "\1\32\1\33\1\32\1\5\1\34\1\0\1\5\1\10"+ + "\1\33\1\0\5\5\3\0\2\5\1\0\1\5\1\61"+ + "\1\72\12\0\2\54\3\0\1\54\1\0\1\62\2\54"+ + "\4\0\1\63\1\0\3\54\21\0\1\55\25\0\1\54"+ + "\6\0\1\64\1\0\1\54\14\0\1\32\1\0\1\32"+ + "\1\33\1\32\1\5\1\34\1\54\1\57\1\10\1\33"+ + "\1\0\1\57\1\5\1\66\2\57\3\0\1\5\1\67"+ + "\1\0\3\57\3\0\1\32\1\0\1\32\1\33\1\32"+ + "\1\5\1\34\1\0\1\5\1\10\1\33\1\0\2\5"+ + "\1\60\2\5\3\0\2\5\1\0\3\5\3\0\1\32"+ + "\1\0\1\32\1\33\1\32\1\5\1\34\1\54\1\5"+ + "\1\10\1\33\1\0\2\5\1\70\1\5\1\57\3\0"+ + "\2\5\1\0\3\5\3\0\1\32\1\0\1\32\1\33"+ + "\1\32\1\5\1\34\1\0\1\71\1\10\1\33\1\0"+ + "\1\71\1\5\1\73\1\71\1\5\3\0\2\5\1\0"+ + "\3\71\3\0\1\32\1\0\1\32\1\33\1\32\1\5"+ + "\1\34\1\54\1\71\1\10\1\33\1\0\1\71\1\5"+ + "\1\73\1\71\1\57\3\0\2\5\1\0\3\71";++ private static int[] zzUnpacktrans() {+ int[] result = new int[1537];int offset = 0;offset = zzUnpacktrans(ZZ_TRANS_PACKED_0, offset, result);return result;}- private static int zzUnpacktrans(String packed, int offset, int [] result) {- int i = 0; /* index in packed string */- int j = offset; /* index in unpacked array */+ private static int zzUnpacktrans(String packed, int offset, int[] result) {+ int i = 0; /* index in packed string */+ int j = offset; /* index in unpacked array */int l = packed.length();while (i < l) {int count = packed.charAt(i++);int value = packed.charAt(i++);value--;- do result[j++] = value; while (--count > 0);+ do result[j++] = value;+ while (--count > 0);}return j;}-/** Error code for "Unknown internal scanner error". */private static final int ZZ_UNKNOWN_ERROR = 0;+/** Error code for "could not match input". */private static final int ZZ_NO_MATCH = 1;+/** Error code for "pushback value was too large". */private static final int ZZ_PUSHBACK_2BIG = 2;/**- * Error messages for {@link #ZZ_UNKNOWN_ERROR}, {@link #ZZ_NO_MATCH}, and- * {@link #ZZ_PUSHBACK_2BIG} respectively.+ * Error messages for {@link #ZZ_UNKNOWN_ERROR}, {@link #ZZ_NO_MATCH}, and {@link+ * #ZZ_PUSHBACK_2BIG} respectively.*/private static final String ZZ_ERROR_MSG[] = {"Unknown internal scanner error",@@ -588,31 +577,30 @@ public final class StandardTokenizerImpl {"Error: pushback value was too large"};- /**- * ZZ_ATTRIBUTE[aState] contains the attributes of state {@code aState}- */- private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute();+ /** ZZ_ATTRIBUTE[aState] contains the attributes of state {@code aState} */+ private static final int[] ZZ_ATTRIBUTE = zzUnpackAttribute();private static final String ZZ_ATTRIBUTE_PACKED_0 =- "\1\0\1\11\20\1\1\0\1\1\2\0\3\1\1\0"+- "\2\1\1\0\3\1\1\0\1\1\1\0\2\1\1\0"+- "\4\1\1\0\1\1\2\0\5\1\1\0\1\11\6\1";+ "\1\0\1\11\20\1\1\0\1\1\2\0\3\1\1\0"+ + "\2\1\1\0\3\1\1\0\1\1\1\0\2\1\1\0"+ + "\4\1\1\0\1\1\2\0\5\1\1\0\1\11\6\1";- private static int [] zzUnpackAttribute() {- int [] result = new int[59];+ private static int[] zzUnpackAttribute() {+ int[] result = new int[59];int offset = 0;offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);return result;}- private static int zzUnpackAttribute(String packed, int offset, int [] result) {- int i = 0; /* index in packed string */- int j = offset; /* index in unpacked array */+ private static int zzUnpackAttribute(String packed, int offset, int[] result) {+ int i = 0; /* index in packed string */+ int j = offset; /* index in unpacked array */int l = packed.length();while (i < l) {int count = packed.charAt(i++);int value = packed.charAt(i++);- do result[j++] = value; while (--count > 0);+ do result[j++] = value;+ while (--count > 0);}return j;}@@ -646,6 +634,7 @@ public final class StandardTokenizerImpl {/*** Whether the scanner is at the end of file.+ ** @see #yyatEOF*/private boolean zzAtEOF;@@ -653,8 +642,8 @@ public final class StandardTokenizerImpl {/*** The number of occupied positions in {@link #zzBuffer} beyond {@link #zzEndRead}.*- * <p>When a lead/high surrogate has been read from the input stream into the final- * {@link #zzBuffer} position, this will have a value of 1; otherwise, it will have a value of 0.+ * <p>When a lead/high surrogate has been read from the input stream into the final {@link+ * #zzBuffer} position, this will have a value of 1; otherwise, it will have a value of 0.*/private int zzFinalHighSurrogate = 0;@@ -685,12 +674,12 @@ public final class StandardTokenizerImpl {public static final int NUMERIC_TYPE = StandardTokenizer.NUM;/**- * Chars in class \p{Line_Break = Complex_Context} are from South East Asian- * scripts (Thai, Lao, Myanmar, Khmer, etc.). Sequences of these are kept- * together as as a single token rather than broken up, because the logic- * required to break them at word boundaries is too complex for UAX#29.- * <p>- * See Unicode Line Breaking Algorithm: http://www.unicode.org/reports/tr14/#SA+ * Chars in class \p{Line_Break = Complex_Context} are from South East Asian scripts (Thai, Lao,+ * Myanmar, Khmer, etc.). Sequences of these are kept together as as a single token rather than+ * broken up, because the logic required to break them at word boundaries is too complex for+ * UAX#29.+ *+ * <p>See Unicode Line Breaking Algorithm: http://www.unicode.org/reports/tr14/#SA*/public static final int SOUTH_EAST_ASIAN_TYPE = StandardTokenizer.SOUTHEAST_ASIAN;@@ -710,63 +699,56 @@ public final class StandardTokenizerImpl {public static final int EMOJI_TYPE = StandardTokenizer.EMOJI;/** Character count processed so far */- public final int yychar()- {+ public final int yychar() {// jflex supports > 2GB docs but not lucenereturn (int) yychar;}- /**- * Fills CharTermAttribute with the current token text.- */+ /** Fills CharTermAttribute with the current token text. */public final void getText(CharTermAttribute t) {- t.copyBuffer(zzBuffer, zzStartRead, zzMarkedPos-zzStartRead);+ t.copyBuffer(zzBuffer, zzStartRead, zzMarkedPos - zzStartRead);}- /**- * Sets the scanner buffer size in chars- */- public final void setBufferSize(int numChars) {- ZZ_BUFFERSIZE = numChars;- char[] newZzBuffer = new char[ZZ_BUFFERSIZE];- System.arraycopy(zzBuffer, 0, newZzBuffer, 0, Math.min(zzBuffer.length, ZZ_BUFFERSIZE));- zzBuffer = newZzBuffer;- }-+ /** Sets the scanner buffer size in chars */+ public final void setBufferSize(int numChars) {+ ZZ_BUFFERSIZE = numChars;+ char[] newZzBuffer = new char[ZZ_BUFFERSIZE];+ System.arraycopy(zzBuffer, 0, newZzBuffer, 0, Math.min(zzBuffer.length, ZZ_BUFFERSIZE));+ zzBuffer = newZzBuffer;+ }/*** Creates a new scanner*- * @param in the java.io.Reader to read input from.+ * @param in the java.io.Reader to read input from.*/public StandardTokenizerImpl(java.io.Reader in) {this.zzReader = in;}-/** Returns the maximum size of the scanner buffer, which limits the size of tokens. */private int zzMaxBufferLen() {return Integer.MAX_VALUE;}- /** Whether the scanner buffer can grow to accommodate a larger token. */+ /** Whether the scanner buffer can grow to accommodate a larger token. */private boolean zzCanGrow() {return true;}- /**- * Translates raw input code points to DFA table row- */+ /** Translates raw input code points to DFA table row */private static int zzCMap(int input) {int offset = input & 255;- return offset == input ? ZZ_CMAP_BLOCKS[offset] : ZZ_CMAP_BLOCKS[ZZ_CMAP_TOP[input >> 8] | offset];+ return offset == input+ ? ZZ_CMAP_BLOCKS[offset]+ : ZZ_CMAP_BLOCKS[ZZ_CMAP_TOP[input >> 8] | offset];}/*** Refills the input buffer.** @return {@code false} iff there was new input.- * @exception java.io.IOException if any I/O-Error occurs+ * @exception java.io.IOException if any I/O-Error occurs*/private boolean zzRefill() throws java.io.IOException {@@ -774,9 +756,7 @@ public final class StandardTokenizerImpl {if (zzStartRead > 0) {zzEndRead += zzFinalHighSurrogate;zzFinalHighSurrogate = 0;- System.arraycopy(zzBuffer, zzStartRead,- zzBuffer, 0,- zzEndRead - zzStartRead);+ System.arraycopy(zzBuffer, zzStartRead, zzBuffer, 0, zzEndRead - zzStartRead);/* translate stored positions */zzEndRead -= zzStartRead;@@ -806,12 +786,12 @@ public final class StandardTokenizerImpl {if (numRead == 1) {return true;}- } else { // There is room in the buffer for at least one more char- int c = zzReader.read(); // Expecting to read a paired low surrogate char+ } else { // There is room in the buffer for at least one more char+ int c = zzReader.read(); // Expecting to read a paired low surrogate charif (c == -1) {return true;} else {- zzBuffer[zzEndRead++] = (char)c;+ zzBuffer[zzEndRead++] = (char) c;}}}@@ -823,7 +803,6 @@ public final class StandardTokenizerImpl {return true;}-/*** Closes the input reader.*@@ -838,7 +817,6 @@ public final class StandardTokenizerImpl {}}-/*** Resets the scanner to read from a new input stream.*@@ -861,23 +839,20 @@ public final class StandardTokenizerImpl {}}- /**- * Resets the input position.- */+ /** Resets the input position. */private final void yyResetPosition() {- zzAtBOL = true;- zzAtEOF = false;- zzCurrentPos = 0;- zzMarkedPos = 0;- zzStartRead = 0;- zzEndRead = 0;- zzFinalHighSurrogate = 0;- yyline = 0;- yycolumn = 0;- yychar = 0L;+ zzAtBOL = true;+ zzAtEOF = false;+ zzCurrentPos = 0;+ zzMarkedPos = 0;+ zzStartRead = 0;+ zzEndRead = 0;+ zzFinalHighSurrogate = 0;+ yyline = 0;+ yycolumn = 0;+ yychar = 0L;}-/*** Returns whether the scanner has reached the end of the reader it reads from.*@@ -887,7 +862,6 @@ public final class StandardTokenizerImpl {return zzAtEOF;}-/*** Returns the current lexical state.*@@ -897,7 +871,6 @@ public final class StandardTokenizerImpl {return zzLexicalState;}-/*** Enters a new lexical state.*@@ -907,47 +880,42 @@ public final class StandardTokenizerImpl {zzLexicalState = newState;}-/*** Returns the text matched by the current regular expression.** @return the matched text.*/public final String yytext() {- return new String(zzBuffer, zzStartRead, zzMarkedPos-zzStartRead);+ return new String(zzBuffer, zzStartRead, zzMarkedPos - zzStartRead);}-/*** Returns the character at the given position from the matched text.** <p>It is equivalent to {@code yytext().charAt(pos)}, but faster.** @param position the position of the character to fetch. A value from 0 to {@code yylength()-1}.- ** @return the character at {@code position}.*/public final char yycharat(int position) {return zzBuffer[zzStartRead + position];}-/*** How many characters were matched.** @return the length of the matched text region.*/public final int yylength() {- return zzMarkedPos-zzStartRead;+ return zzMarkedPos - zzStartRead;}-/*** Reports an error that occurred while scanning.** <p>In a well-formed scanner (no or only correct usage of {@code yypushback(int)} and a- * match-all fallback rule) this method will only be called with things that- * "Can't Possibly Happen".+ * match-all fallback rule) this method will only be called with things that "Can't Possibly+ * Happen".** <p>If this method is called, something is seriously wrong (e.g. a JFlex bug producing a faulty* scanner etc.).@@ -967,7 +935,6 @@ public final class StandardTokenizerImpl {throw new Error(message);}-/*** Pushes the specified amount of characters back into the input stream.*@@ -976,16 +943,12 @@ public final class StandardTokenizerImpl {* @param number the number of characters to be read again. This number must not be greater than* {@link #yylength()}.*/- public void yypushback(int number) {- if ( number > yylength() )- zzScanError(ZZ_PUSHBACK_2BIG);+ public void yypushback(int number) {+ if (number > yylength()) zzScanError(ZZ_PUSHBACK_2BIG);zzMarkedPos -= number;}---/*** Resumes scanning until the next regular expression is matched, the end of input is encountered* or an I/O-Error occurs.@@ -993,8 +956,7 @@ public final class StandardTokenizerImpl {* @return the next token.* @exception java.io.IOException if any I/O-Error occurs.*/- public int getNextToken() throws java.io.IOException- {+ public int getNextToken() throws java.io.IOException {int zzInput;int zzAction;@@ -1004,14 +966,14 @@ public final class StandardTokenizerImpl {int zzEndReadL = zzEndRead;char[] zzBufferL = zzBuffer;- int [] zzTransL = ZZ_TRANS;- int [] zzRowMapL = ZZ_ROWMAP;- int [] zzAttrL = ZZ_ATTRIBUTE;+ int[] zzTransL = ZZ_TRANS;+ int[] zzRowMapL = ZZ_ROWMAP;+ int[] zzAttrL = ZZ_ATTRIBUTE;while (true) {zzMarkedPosL = zzMarkedPos;- yychar+= zzMarkedPosL-zzStartRead;+ yychar += zzMarkedPosL - zzStartRead;zzAction = -1;@@ -1021,52 +983,48 @@ public final class StandardTokenizerImpl {// set up zzAction for empty match case:int zzAttributes = zzAttrL[zzState];- if ( (zzAttributes & 1) == 1 ) {+ if ((zzAttributes & 1) == 1) {zzAction = zzState;}-- zzForAction: {+ zzForAction:+ {while (true) {if (zzCurrentPosL < zzEndReadL) {zzInput = Character.codePointAt(zzBufferL, zzCurrentPosL, zzEndReadL);zzCurrentPosL += Character.charCount(zzInput);- }- else if (zzAtEOF) {+ } else if (zzAtEOF) {zzInput = YYEOF;break zzForAction;- }- else {+ } else {// store back cached positions- zzCurrentPos = zzCurrentPosL;- zzMarkedPos = zzMarkedPosL;+ zzCurrentPos = zzCurrentPosL;+ zzMarkedPos = zzMarkedPosL;boolean eof = zzRefill();// get translated positions and possibly new buffer- zzCurrentPosL = zzCurrentPos;- zzMarkedPosL = zzMarkedPos;- zzBufferL = zzBuffer;- zzEndReadL = zzEndRead;+ zzCurrentPosL = zzCurrentPos;+ zzMarkedPosL = zzMarkedPos;+ zzBufferL = zzBuffer;+ zzEndReadL = zzEndRead;if (eof) {zzInput = YYEOF;break zzForAction;- }- else {+ } else {zzInput = Character.codePointAt(zzBufferL, zzCurrentPosL, zzEndReadL);zzCurrentPosL += Character.charCount(zzInput);}}- int zzNext = zzTransL[ zzRowMapL[zzState] + zzCMap(zzInput) ];+ int zzNext = zzTransL[zzRowMapL[zzState] + zzCMap(zzInput)];if (zzNext == -1) break zzForAction;zzState = zzNext;zzAttributes = zzAttrL[zzState];- if ( (zzAttributes & 1) == 1 ) {+ if ((zzAttributes & 1) == 1) {zzAction = zzState;zzMarkedPosL = zzCurrentPosL;- if ( (zzAttributes & 8) == 8 ) break zzForAction;+ if ((zzAttributes & 8) == 8) break zzForAction;}-}}@@ -1075,63 +1033,78 @@ public final class StandardTokenizerImpl {if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {zzAtEOF = true;- {- return YYEOF;- }- }- else {+ {+ return YYEOF;+ }+ } else {switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {case 1:- { break; /* Not numeric, word, ideographic, hiragana, emoji or SE Asian -- ignore it. */+ {+ break; /* Not numeric, word, ideographic, hiragana, emoji or SE Asian -- ignore it. */}// fall through- case 10: break;+ case 10:+ break;case 2:- { return NUMERIC_TYPE;+ {+ return NUMERIC_TYPE;}// fall through- case 11: break;+ case 11:+ break;case 3:- { return WORD_TYPE;+ {+ return WORD_TYPE;}// fall through- case 12: break;+ case 12:+ break;case 4:- { return EMOJI_TYPE;+ {+ return EMOJI_TYPE;}// fall through- case 13: break;+ case 13:+ break;case 5:- { return SOUTH_EAST_ASIAN_TYPE;+ {+ return SOUTH_EAST_ASIAN_TYPE;}// fall through- case 14: break;+ case 14:+ break;case 6:- { return HANGUL_TYPE;+ {+ return HANGUL_TYPE;}// fall through- case 15: break;+ case 15:+ break;case 7:- { return IDEOGRAPHIC_TYPE;+ {+ return IDEOGRAPHIC_TYPE;}// fall through- case 16: break;+ case 16:+ break;case 8:- { return KATAKANA_TYPE;+ {+ return KATAKANA_TYPE;}// fall through- case 17: break;+ case 17:+ break;case 9:- { return HIRAGANA_TYPE;+ {+ return HIRAGANA_TYPE;}// fall through- case 18: break;+ case 18:+ break;default:zzScanError(ZZ_NO_MATCH);}}}}--}diff --git a/lucene/queryparser/src/generated/checksums/regenerateClassicQueryParser.json b/lucene/queryparser/src/generated/checksums/regenerateClassicQueryParser.jsonindex 20195832496..d351532f00c 100644--- a/lucene/queryparser/src/generated/checksums/regenerateClassicQueryParser.json+++ b/lucene/queryparser/src/generated/checksums/regenerateClassicQueryParser.json@@ -1,9 +1,9 @@{- "lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/ParseException.java": "7a8a8fd5b2ea78f9a17f54cbae8b0e4496e8988e",- "lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.java": "2dfb7df4e711425be20c33a277a27d7e2972def1",+ "lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/ParseException.java": "d4f22934f0f8eb7ae70f47339cf04cac297a044b",+ "lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.java": "b88944c9c1ac6a3e6e8508a0c5ae84aad3306694","lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.jj": "82890f966a2456daf2b6100d3d79f77a861a2e03",- "lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserConstants.java": "e59a3fd38b66a3d56779c55955c1e014225a1f50",- "lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserTokenManager.java": "f5eb2a03a65caecff718b234d29390800c3e9be2",- "lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/Token.java": "310665ba37d982327fcb55cc3523d629ef29ef54",- "lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/TokenMgrError.java": "31afe7034729960514f50fdc3c9b33e0def44f1d"+ "lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserConstants.java": "80d2d516553d87539dce33f732e774a67fb800ea",+ "lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserTokenManager.java": "1263b08f33f1b5e8642f4733ea830b3b03628942",+ "lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/Token.java": "5748b8acdf890eb94fa39c9d7ac86fc35e688438",+ "lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/TokenMgrError.java": "a0082ca9014c48ede4c5aa4b84aa3c114ed8000a"}diff --git a/lucene/queryparser/src/generated/checksums/regenerateFlexibleStandardSyntaxParser.json b/lucene/queryparser/src/generated/checksums/regenerateFlexibleStandardSyntaxParser.jsonindex 555e6bf0386..4c7cf8841a4 100644--- a/lucene/queryparser/src/generated/checksums/regenerateFlexibleStandardSyntaxParser.json+++ b/lucene/queryparser/src/generated/checksums/regenerateFlexibleStandardSyntaxParser.json@@ -1,9 +1,9 @@{- "lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/ParseException.java": "c1b095461818be6bf073ca12c383bf7c06443b7e",- "lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.java": "55bd0228665fc67e6310558eb45c32ed1e20c32d",+ "lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/ParseException.java": "cbdf1aa67b982cb79db23dd0498ad80d60107d64",+ "lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.java": "8733ffc409ccbd8991fe5a2f7c179d2d4474d09f","lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.jj": "cbcfc2d93dd684ab31e7824210cd167be210bce3",- "lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParserConstants.java": "d5e76f5f5522ae4b758d5c2f12e496fe182ae1f2",- "lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParserTokenManager.java": "49df9bdd3ca4a5f64aa5e3a9f1751e0bae637f03",- "lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/Token.java": "d4603a7c273e0ef5e9c8890552779e40864185f4",- "lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/TokenMgrError.java": "d474a0039c288e5e7dfa0a0e22e16e0e0fdaeaab"+ "lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParserConstants.java": "d779299b01504a1900a82fce172ced993bb867c2",+ "lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParserTokenManager.java": "39f107d1aefe3ad2d953e4d3c49bd392a4d82a50",+ "lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/Token.java": "8147fbc071eb833c04ab2baa6161f91245f39ad8",+ "lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/TokenMgrError.java": "7ffe1903324d6b016e3f83fbdf2ab10e4e866e91"}diff --git a/lucene/queryparser/src/generated/checksums/regenerateSurroundQueryParser.json b/lucene/queryparser/src/generated/checksums/regenerateSurroundQueryParser.jsonindex 6ded352cfa1..28cdd7a6265 100644--- a/lucene/queryparser/src/generated/checksums/regenerateSurroundQueryParser.json+++ b/lucene/queryparser/src/generated/checksums/regenerateSurroundQueryParser.json@@ -1,9 +1,9 @@{- "lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/ParseException.java": "d8b3e605b4bfb01697df5ce246e84fa2b691fb4f",- "lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParser.java": "b6fc4a6567f497c60c26f752db7f229dd6504cd7",+ "lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/ParseException.java": "2224fb9524be521d47488d49b137dd2acec065e8",+ "lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParser.java": "394e02d5928b980973e58b1a8acc6b5461a2719e","lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParser.jj": "b81635f8de654757290d99911adece916afe369a",- "lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParserConstants.java": "8feb77878890c27e874be457d839eba48192c40f",- "lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParserTokenManager.java": "fcd1afca116eb6fa411d171e0b8a3c8729db1e0c",- "lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/Token.java": "a5eea2a3043e0aa2781f4a43b9ab9c5d59add80e",- "lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/TokenMgrError.java": "ee5fbd796ed8bd1c6e1a4b9e3d894f391da36236"+ "lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParserConstants.java": "e329bce57db896ffe9e4b30ea787e8221ea610b1",+ "lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParserTokenManager.java": "ca1ab7c0d7c8c5171d851cbcfe1c7d705c9c7ccc",+ "lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/Token.java": "6b9b713e674e44485dd1ad3575e51a1a28060f01",+ "lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/TokenMgrError.java": "71d5ea8e9fd854673632d1bb03a85972e1a0ba3a"}diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/ParseException.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/ParseException.javaindex c496e545fad..f6ed7b18433 100644--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/ParseException.java+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/ParseException.java@@ -3,39 +3,30 @@package org.apache.lucene.queryparser.classic;/**- * This exception is thrown when parse errors are encountered.- * You can explicitly create objects of this exception type by- * calling the method generateParseException in the generated- * parser.+ * This exception is thrown when parse errors are encountered. You can explicitly create objects of+ * this exception type by calling the method generateParseException in the generated parser.*- * You can modify this class to customize your error reporting- * mechanisms so long as you retain the public fields.+ * <p>You can modify this class to customize your error reporting mechanisms so long as you retain+ * the public fields.*/public class ParseException extends Exception {/**- * The version identifier for this Serializable class.- * Increment only if the <i>serialized</i> form of the- * class changes.+ * The version identifier for this Serializable class. Increment only if the <i>serialized</i>+ * form of the class changes.*/private static final long serialVersionUID = 1L;- /**- * The end of line string for this machine.- */+ /** The end of line string for this machine. */protected static String EOL = System.getProperty("line.separator", "\n");/**- * This constructor is used by the method "generateParseException"- * in the generated parser. Calling this constructor generates- * a new object of this type with the fields "currentToken",+ * This constructor is used by the method "generateParseException" in the generated parser.+ * Calling this constructor generates a new object of this type with the fields "currentToken",* "expectedTokenSequences", and "tokenImage" set.*/- public ParseException(Token currentTokenVal,- int[][] expectedTokenSequencesVal,- String[] tokenImageVal- )- {+ public ParseException(+ Token currentTokenVal, int[][] expectedTokenSequencesVal, String[] tokenImageVal) {super(initialise(currentTokenVal, expectedTokenSequencesVal, tokenImageVal));currentToken = currentTokenVal;expectedTokenSequences = expectedTokenSequencesVal;@@ -43,15 +34,12 @@ public class ParseException extends Exception {}/**- * The following constructors are for use by you for whatever- * purpose you can think of. Constructing the exception in this- * manner makes the exception behave in the normal way - i.e., as- * documented in the class "Throwable". The fields "errorToken",- * "expectedTokenSequences", and "tokenImage" do not contain- * relevant information. The JavaCC generated code does not use- * these constructors.+ * The following constructors are for use by you for whatever purpose you can think of.+ * Constructing the exception in this manner makes the exception behave in the normal way - i.e.,+ * as documented in the class "Throwable". The fields "errorToken", "expectedTokenSequences", and+ * "tokenImage" do not contain relevant information. The JavaCC generated code does not use these+ * constructors.*/-public ParseException() {super();}@@ -61,38 +49,31 @@ public class ParseException extends Exception {super(message);}-/**- * This is the last token that has been consumed successfully. If- * this object has been created due to a parse error, the token- * following this token will (therefore) be the first error token.+ * This is the last token that has been consumed successfully. If this object has been created due+ * to a parse error, the token following this token will (therefore) be the first error token.*/public Token currentToken;/**- * Each entry in this array is an array of integers. Each array- * of integers represents a sequence of tokens (by their ordinal- * values) that is expected at this point of the parse.+ * Each entry in this array is an array of integers. Each array of integers represents a sequence+ * of tokens (by their ordinal values) that is expected at this point of the parse.*/public int[][] expectedTokenSequences;/**- * This is a reference to the "tokenImage" array of the generated- * parser within which the parse error occurred. This array is- * defined in the generated ...Constants interface.+ * This is a reference to the "tokenImage" array of the generated parser within which the parse+ * error occurred. This array is defined in the generated ...Constants interface.*/public String[] tokenImage;/**- * It uses "currentToken" and "expectedTokenSequences" to generate a parse- * error message and returns it. If this object has been created- * due to a parse error, and you do not catch it (it gets thrown- * from the parser) the correct error message- * gets displayed.+ * It uses "currentToken" and "expectedTokenSequences" to generate a parse error message and+ * returns it. If this object has been created due to a parse error, and you do not catch it (it+ * gets thrown from the parser) the correct error message gets displayed.*/- private static String initialise(Token currentToken,- int[][] expectedTokenSequences,- String[] tokenImage) {+ private static String initialise(+ Token currentToken, int[][] expectedTokenSequences, String[] tokenImage) {StringBuilder expected = new StringBuilder();int maxSize = 0;@@ -123,73 +104,69 @@ public class ParseException extends Exception {tok = tok.next;}if (currentToken.next != null) {- retval += "\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn;+ retval +=+ "\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn;}retval += "." + EOL;--+if (expectedTokenSequences.length == 0) {- // Nothing to add here+ // Nothing to add here} else {- if (expectedTokenSequences.length == 1) {- retval += "Was expecting:" + EOL + " ";- } else {- retval += "Was expecting one of:" + EOL + " ";- }- retval += expected.toString();+ if (expectedTokenSequences.length == 1) {+ retval += "Was expecting:" + EOL + " ";+ } else {+ retval += "Was expecting one of:" + EOL + " ";+ }+ retval += expected.toString();}-+return retval;}-/**- * Used to convert raw characters to their escaped version- * when these raw version cannot be used as part of an ASCII- * string literal.+ * Used to convert raw characters to their escaped version when these raw version cannot be used+ * as part of an ASCII string literal.*/static String add_escapes(String str) {- StringBuilder retval = new StringBuilder();- char ch;- for (int i = 0; i < str.length(); i++) {- switch (str.charAt(i))- {- case '\b':- retval.append("\\b");- continue;- case '\t':- retval.append("\\t");- continue;- case '\n':- retval.append("\\n");- continue;- case '\f':- retval.append("\\f");- continue;- case '\r':- retval.append("\\r");- continue;- case '\"':- retval.append("\\\"");- continue;- case '\'':- retval.append("\\\'");- continue;- case '\\':- retval.append("\\\\");- continue;- default:- if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {- String s = "0000" + Integer.toString(ch, 16);- retval.append("\\u" + s.substring(s.length() - 4, s.length()));- } else {- retval.append(ch);- }- continue;- }+ StringBuilder retval = new StringBuilder();+ char ch;+ for (int i = 0; i < str.length(); i++) {+ switch (str.charAt(i)) {+ case '\b':+ retval.append("\\b");+ continue;+ case '\t':+ retval.append("\\t");+ continue;+ case '\n':+ retval.append("\\n");+ continue;+ case '\f':+ retval.append("\\f");+ continue;+ case '\r':+ retval.append("\\r");+ continue;+ case '\"':+ retval.append("\\\"");+ continue;+ case '\'':+ retval.append("\\\'");+ continue;+ case '\\':+ retval.append("\\\\");+ continue;+ default:+ if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {+ String s = "0000" + Integer.toString(ch, 16);+ retval.append("\\u" + s.substring(s.length() - 4, s.length()));+ } else {+ retval.append(ch);+ }+ continue;}- return retval.toString();- }-+ }+ return retval.toString();+ }}/* (filtered)*/diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.javaindex e759ecc6269..a69fb588c4f 100644--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.java+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParser.java@@ -6,114 +6,108 @@ import java.io.StringReader;import java.util.ArrayList;import java.util.List;import java.util.Locale;-import org.apache.lucene.analysis.Analyzer;import org.apache.lucene.document.DateTools;+import org.apache.lucene.internal.hppc.IntHashSet;+import org.apache.lucene.queryparser.charstream.CharStream;+import org.apache.lucene.queryparser.charstream.FastCharStream;import org.apache.lucene.search.BooleanClause;import org.apache.lucene.search.Query;import org.apache.lucene.search.TermRangeQuery;-import org.apache.lucene.queryparser.charstream.CharStream;-import org.apache.lucene.queryparser.charstream.FastCharStream;-import org.apache.lucene.internal.hppc.IntHashSet;/**- * This class is generated by JavaCC. The most important method is- * {@link #parse(String)}.+ * This class is generated by JavaCC. The most important method is {@link #parse(String)}.+ *+ * <p>The syntax for query strings is as follows: A Query is a series of clauses. A clause may be+ * prefixed by:*- * The syntax for query strings is as follows:- * A Query is a series of clauses.- * A clause may be prefixed by:* <ul>- * <li> a plus (<code>+</code>) or a minus (<code>-</code>) sign, indicating- * that the clause is required or prohibited respectively; or- * <li> a term followed by a colon, indicating the field to be searched.- * This enables one to construct queries which search multiple fields.+ * <li>a plus (<code>+</code>) or a minus (<code>-</code>) sign, indicating that the clause is+ * required or prohibited respectively; or+ * <li>a term followed by a colon, indicating the field to be searched. This enables one to+ * construct queries which search multiple fields.* </ul>** A clause may be either:+ ** <ul>- * <li> a term, indicating all the documents that contain this term; or- * <li> a nested query, enclosed in parentheses. Note that this may be used- * with a <code>+</code>/<code>-</code> prefix to require any of a set of- * terms.+ * <li>a term, indicating all the documents that contain this term; or+ * <li>a nested query, enclosed in parentheses. Note that this may be used with a <code>+</code>/+ * <code>-</code> prefix to require any of a set of terms.* </ul>** Thus, in BNF, the query grammar is:+ ** <pre>* Query ::= ( Clause )** Clause ::= ["+", "-"] [<TERM> ":"] ( <TERM> | "(" Query ")" )* </pre>*- * <p>- * Examples of appropriately formatted queries can be found in the <a- * href="{@docRoot}/org/apache/lucene/queryparser/classic/package-summary.html#package.description">query syntax- * documentation</a>.- * </p>+ * <p>Examples of appropriately formatted queries can be found in the <a+ * href="{@docRoot}/org/apache/lucene/queryparser/classic/package-summary.html#package.description">query+ * syntax documentation</a>.+ *+ * <p>In {@link TermRangeQuery}s, QueryParser tries to detect date values, e.g. <code>+ * date:[6/1/2005 TO 6/4/2005]</code> produces a range query that searches for "date" fields between+ * 2005-06-01 and 2005-06-04. Note that the format of the accepted input depends on {@link+ * #setLocale(Locale) the locale}. A {@link org.apache.lucene.document.DateTools.Resolution} has to+ * be set, if you want to use {@link DateTools} for date conversion.+ *+ * <p>The date resolution that shall be used for RangeQueries can be set using {@link+ * #setDateResolution(DateTools.Resolution)} or {@link #setDateResolution(String,+ * DateTools.Resolution)}. The former sets the default date resolution for all fields, whereas the+ * latter can be used to set field specific date resolutions. Field specific date resolutions take,+ * if set, precedence over the default date resolution.*- * <p>- * In {@link TermRangeQuery}s, QueryParser tries to detect date values, e.g.- * <code>date:[6/1/2005 TO 6/4/2005]</code> produces a range query that searches- * for "date" fields between 2005-06-01 and 2005-06-04. Note that the format- * of the accepted input depends on {@link #setLocale(Locale) the locale}.- * A {@link org.apache.lucene.document.DateTools.Resolution} has to be set,- * if you want to use {@link DateTools} for date conversion.- * </p>- * <p>- * The date resolution that shall be used for RangeQueries can be set- * using {@link #setDateResolution(DateTools.Resolution)}- * or {@link #setDateResolution(String, DateTools.Resolution)}. The former- * sets the default date resolution for all fields, whereas the latter can- * be used to set field specific date resolutions. Field specific date- * resolutions take, if set, precedence over the default date resolution.- * </p>- * <p>- * If you don't use {@link DateTools} in your index, you can create your own- * query parser that inherits QueryParser and overwrites- * {@link #getRangeQuery(String, String, String, boolean, boolean)} to- * use a different method for date conversion.- * </p>+ * <p>If you don't use {@link DateTools} in your index, you can create your own query parser that+ * inherits QueryParser and overwrites {@link #getRangeQuery(String, String, String, boolean,+ * boolean)} to use a different method for date conversion.*- * <p>Note that QueryParser is <em>not</em> thread-safe.</p>+ * <p>Note that QueryParser is <em>not</em> thread-safe.*- * <p><b>NOTE</b>: there is a new QueryParser in contrib, which matches- * the same syntax as this class, but is more modular,- * enabling substantial customization to how a query is created.+ * <p><b>NOTE</b>: there is a new QueryParser in contrib, which matches the same syntax as this+ * class, but is more modular, enabling substantial customization to how a query is created.*/-@SuppressWarnings({"unused","null"}) public class QueryParser extends QueryParserBase implements QueryParserConstants {- /** The default operator for parsing queries.- * Use {@link QueryParserBase#setDefaultOperator} to change it.+@SuppressWarnings({"unused", "null"})+public class QueryParser extends QueryParserBase implements QueryParserConstants {+ /**+ * The default operator for parsing queries. Use {@link QueryParserBase#setDefaultOperator} to+ * change it.*/- static public enum Operator { OR, AND }+ public static enum Operator {+ OR,+ AND+ }/** default split on whitespace behavior */public static final boolean DEFAULT_SPLIT_ON_WHITESPACE = false;- /** Create a query parser.- * @param f the default field for query terms.- * @param a used to find terms in the query text.+ /**+ * Create a query parser.+ *+ * @param f the default field for query terms.+ * @param a used to find terms in the query text.*/- public QueryParser(String f, Analyzer a) {+ public QueryParser(String f, Analyzer a) {this(new FastCharStream(new StringReader("")));init(f, a);}/**- * Set to true if phrase queries will be automatically generated- * when the analyzer returns more than one term from whitespace- * delimited text.- * NOTE: this behavior may not be suitable for all languages.- * <p>- * Set to false if phrase queries should only be generated when- * surrounded by double quotes.- * <p>- * The combination splitOnWhitespace=false and autoGeneratePhraseQueries=true- * is disallowed. See <a href="https://issues.apache.org/jira/browse/LUCENE-7533">LUCENE-7533</a>.+ * Set to true if phrase queries will be automatically generated when the analyzer returns more+ * than one term from whitespace delimited text. NOTE: this behavior may not be suitable for all+ * languages.+ *+ * <p>Set to false if phrase queries should only be generated when surrounded by double quotes.+ *+ * <p>The combination splitOnWhitespace=false and autoGeneratePhraseQueries=true is disallowed.+ * See <a href="https://issues.apache.org/jira/browse/LUCENE-7533">LUCENE-7533</a>.*/@Overridepublic void setAutoGeneratePhraseQueries(boolean value) {if (splitOnWhitespace == false && value == true) {- throw new IllegalArgumentException- ("setAutoGeneratePhraseQueries(true) is disallowed when getSplitOnWhitespace() == false");+ throw new IllegalArgumentException(+ "setAutoGeneratePhraseQueries(true) is disallowed when getSplitOnWhitespace() == false");}this.autoGeneratePhraseQueries = value;}@@ -126,169 +120,161 @@ import org.apache.lucene.internal.hppc.IntHashSet;}/**- * Whether query text should be split on whitespace prior to analysis.- * Default is <code>{@value #DEFAULT_SPLIT_ON_WHITESPACE}</code>.- * <p>- * The combination splitOnWhitespace=false and autoGeneratePhraseQueries=true- * is disallowed. See <a href="https://issues.apache.org/jira/browse/LUCENE-7533">LUCENE-7533</a>.+ * Whether query text should be split on whitespace prior to analysis. Default is <code>+ * {@value #DEFAULT_SPLIT_ON_WHITESPACE}</code>.+ *+ * <p>The combination splitOnWhitespace=false and autoGeneratePhraseQueries=true is disallowed.+ * See <a href="https://issues.apache.org/jira/browse/LUCENE-7533">LUCENE-7533</a>.*/public void setSplitOnWhitespace(boolean splitOnWhitespace) {if (splitOnWhitespace == false && getAutoGeneratePhraseQueries() == true) {- throw new IllegalArgumentException- ("setSplitOnWhitespace(false) is disallowed when getAutoGeneratePhraseQueries() == true");+ throw new IllegalArgumentException(+ "setSplitOnWhitespace(false) is disallowed when getAutoGeneratePhraseQueries() == true");}this.splitOnWhitespace = splitOnWhitespace;}private boolean splitOnWhitespace = DEFAULT_SPLIT_ON_WHITESPACE;- private static IntHashSet disallowedPostMultiTerm- = IntHashSet.from(COLON, STAR, FUZZY_SLOP, CARAT, AND, OR);+ private static IntHashSet disallowedPostMultiTerm =+ IntHashSet.from(COLON, STAR, FUZZY_SLOP, CARAT, AND, OR);+private static boolean allowedPostMultiTerm(int tokenKind) {return disallowedPostMultiTerm.contains(tokenKind) == false;}-// * Query ::= ( Clause )*-// * Clause ::= ["+", "-"] [<TERM> ":"] ( <TERM> | "(" Query ")" )- final public-int Conjunction() throws ParseException {int ret = CONJ_NONE;- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case AND:- case OR:{- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case AND:{- jj_consume_token(AND);-ret = CONJ_AND;- break;- }- case OR:{- jj_consume_token(OR);-ret = CONJ_OR;- break;+ // * Query ::= ( Clause )*+ // * Clause ::= ["+", "-"] [<TERM> ":"] ( <TERM> | "(" Query ")" )+ public final int Conjunction() throws ParseException {+ int ret = CONJ_NONE;+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case AND:+ case OR:+ {+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case AND:+ {+ jj_consume_token(AND);+ ret = CONJ_AND;+ break;+ }+ case OR:+ {+ jj_consume_token(OR);+ ret = CONJ_OR;+ break;+ }+ default:+ jj_la1[0] = jj_gen;+ jj_consume_token(-1);+ throw new ParseException();+ }+ break;}default:- jj_la1[0] = jj_gen;- jj_consume_token(-1);- throw new ParseException();- }- break;- }- default:- jj_la1[1] = jj_gen;- ;+ jj_la1[1] = jj_gen;+ ;+ }+ {+ if ("" != null) return ret;}-{if ("" != null) return ret;}throw new Error("Missing return statement in function");-}+ }- final public int Modifiers() throws ParseException {int ret = MOD_NONE;- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case NOT:- case PLUS:- case MINUS:{- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case PLUS:{- jj_consume_token(PLUS);-ret = MOD_REQ;- break;- }- case MINUS:{- jj_consume_token(MINUS);-ret = MOD_NOT;- break;- }- case NOT:{- jj_consume_token(NOT);-ret = MOD_NOT;- break;+ public final int Modifiers() throws ParseException {+ int ret = MOD_NONE;+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case NOT:+ case PLUS:+ case MINUS:+ {+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case PLUS:+ {+ jj_consume_token(PLUS);+ ret = MOD_REQ;+ break;+ }+ case MINUS:+ {+ jj_consume_token(MINUS);+ ret = MOD_NOT;+ break;+ }+ case NOT:+ {+ jj_consume_token(NOT);+ ret = MOD_NOT;+ break;+ }+ default:+ jj_la1[2] = jj_gen;+ jj_consume_token(-1);+ throw new ParseException();+ }+ break;}default:- jj_la1[2] = jj_gen;- jj_consume_token(-1);- throw new ParseException();- }- break;- }- default:- jj_la1[3] = jj_gen;- ;+ jj_la1[3] = jj_gen;+ ;+ }+ {+ if ("" != null) return ret;}-{if ("" != null) return ret;}throw new Error("Missing return statement in function");-}+ }-// This makes sure that there is no garbage after the query string- @Override final public Query TopLevelQuery(String field) throws ParseException {Query q;+ // This makes sure that there is no garbage after the query string+ @Override+ public final Query TopLevelQuery(String field) throws ParseException {+ Query q;q = Query(field);jj_consume_token(0);-{if ("" != null) return q;}+ {+ if ("" != null) return q;+ }throw new Error("Missing return statement in function");-}+ }- final public Query Query(String field) throws ParseException {List<BooleanClause> clauses = new ArrayList<BooleanClause>();- Query q, firstQuery=null;- int conj, mods;+ public final Query Query(String field) throws ParseException {+ List<BooleanClause> clauses = new ArrayList<BooleanClause>();+ Query q, firstQuery = null;+ int conj, mods;if (jj_2_1(2)) {firstQuery = MultiTerm(field, clauses);} else {- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case NOT:- case PLUS:- case MINUS:- case BAREOPER:- case LPAREN:- case STAR:- case QUOTED:- case TERM:- case PREFIXTERM:- case WILDTERM:- case REGEXPTERM:- case RANGEIN_START:- case RANGEEX_START:- case NUMBER:{- mods = Modifiers();- q = Clause(field);-addClause(clauses, CONJ_NONE, mods, q);- if (mods == MOD_NONE) {- firstQuery = q;- }- break;- }- default:- jj_la1[4] = jj_gen;- jj_consume_token(-1);- throw new ParseException();+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case NOT:+ case PLUS:+ case MINUS:+ case BAREOPER:+ case LPAREN:+ case STAR:+ case QUOTED:+ case TERM:+ case PREFIXTERM:+ case WILDTERM:+ case REGEXPTERM:+ case RANGEIN_START:+ case RANGEEX_START:+ case NUMBER:+ {+ mods = Modifiers();+ q = Clause(field);+ addClause(clauses, CONJ_NONE, mods, q);+ if (mods == MOD_NONE) {+ firstQuery = q;+ }+ break;+ }+ default:+ jj_la1[4] = jj_gen;+ jj_consume_token(-1);+ throw new ParseException();}}label_1:while (true) {- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case AND:- case OR:- case NOT:- case PLUS:- case MINUS:- case BAREOPER:- case LPAREN:- case STAR:- case QUOTED:- case TERM:- case PREFIXTERM:- case WILDTERM:- case REGEXPTERM:- case RANGEIN_START:- case RANGEEX_START:- case NUMBER:{- ;- break;- }- default:- jj_la1[5] = jj_gen;- break label_1;- }- if (jj_2_2(2)) {- MultiTerm(field, clauses);- } else {- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {case AND:case OR:case NOT:@@ -304,352 +290,434 @@ addClause(clauses, CONJ_NONE, mods, q);case REGEXPTERM:case RANGEIN_START:case RANGEEX_START:- case NUMBER:{- conj = Conjunction();- mods = Modifiers();- q = Clause(field);-addClause(clauses, conj, mods, q);- break;+ case NUMBER:+ {+ ;+ break;}default:- jj_la1[6] = jj_gen;- jj_consume_token(-1);- throw new ParseException();- }+ jj_la1[5] = jj_gen;+ break label_1;}- }-if (clauses.size() == 1 && firstQuery != null) {- {if ("" != null) return firstQuery;}- } else {- {if ("" != null) return getBooleanQuery(clauses);}- }- throw new Error("Missing return statement in function");-}-- final public Query Clause(String field) throws ParseException {Query q;- Token fieldToken=null, boost=null;- if (jj_2_3(2)) {- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case TERM:{- fieldToken = jj_consume_token(TERM);- jj_consume_token(COLON);-field=discardEscapeChar(fieldToken.image);- break;- }- case STAR:{- jj_consume_token(STAR);- jj_consume_token(COLON);-field="*";- break;+ if (jj_2_2(2)) {+ MultiTerm(field, clauses);+ } else {+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case AND:+ case OR:+ case NOT:+ case PLUS:+ case MINUS:+ case BAREOPER:+ case LPAREN:+ case STAR:+ case QUOTED:+ case TERM:+ case PREFIXTERM:+ case WILDTERM:+ case REGEXPTERM:+ case RANGEIN_START:+ case RANGEEX_START:+ case NUMBER:+ {+ conj = Conjunction();+ mods = Modifiers();+ q = Clause(field);+ addClause(clauses, conj, mods, q);+ break;+ }+ default:+ jj_la1[6] = jj_gen;+ jj_consume_token(-1);+ throw new ParseException();}- default:- jj_la1[7] = jj_gen;- jj_consume_token(-1);- throw new ParseException();}- } else {- ;}- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case BAREOPER:- case STAR:- case QUOTED:- case TERM:- case PREFIXTERM:- case WILDTERM:- case REGEXPTERM:- case RANGEIN_START:- case RANGEEX_START:- case NUMBER:{- q = Term(field);- break;- }- case LPAREN:{- jj_consume_token(LPAREN);- q = Query(field);- jj_consume_token(RPAREN);- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case CARAT:{- jj_consume_token(CARAT);- boost = jj_consume_token(NUMBER);- break;- }- default:- jj_la1[8] = jj_gen;- ;+ if (clauses.size() == 1 && firstQuery != null) {+ {+ if ("" != null) return firstQuery;}- break;+ } else {+ {+ if ("" != null) return getBooleanQuery(clauses);}- default:- jj_la1[9] = jj_gen;- jj_consume_token(-1);- throw new ParseException();}-{if ("" != null) return handleBoost(q, boost);}throw new Error("Missing return statement in function");-}+ }- final public Query Term(String field) throws ParseException {Token term, boost=null, fuzzySlop=null, goop1, goop2;- boolean prefix = false;- boolean wildcard = false;- boolean fuzzy = false;- boolean regexp = false;- boolean startInc=false;- boolean endInc=false;- Query q;- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case BAREOPER:- case STAR:- case TERM:- case PREFIXTERM:- case WILDTERM:- case REGEXPTERM:- case NUMBER:{- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case TERM:{- term = jj_consume_token(TERM);- break;- }- case STAR:{- term = jj_consume_token(STAR);-wildcard=true;- break;- }- case PREFIXTERM:{- term = jj_consume_token(PREFIXTERM);-prefix=true;- break;- }- case WILDTERM:{- term = jj_consume_token(WILDTERM);-wildcard=true;- break;- }- case REGEXPTERM:{- term = jj_consume_token(REGEXPTERM);-regexp=true;- break;- }- case NUMBER:{- term = jj_consume_token(NUMBER);- break;- }- case BAREOPER:{- term = jj_consume_token(BAREOPER);-term.image = term.image.substring(0,1);- break;- }- default:- jj_la1[10] = jj_gen;- jj_consume_token(-1);- throw new ParseException();- }- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case CARAT:- case FUZZY_SLOP:{- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case CARAT:{- jj_consume_token(CARAT);- boost = jj_consume_token(NUMBER);- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case FUZZY_SLOP:{- fuzzySlop = jj_consume_token(FUZZY_SLOP);-fuzzy=true;+ public final Query Clause(String field) throws ParseException {+ Query q;+ Token fieldToken = null, boost = null;+ if (jj_2_3(2)) {+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case TERM:+ {+ fieldToken = jj_consume_token(TERM);+ jj_consume_token(COLON);+ field = discardEscapeChar(fieldToken.image);break;- }- default:- jj_la1[11] = jj_gen;- ;- }- break;}- case FUZZY_SLOP:{- fuzzySlop = jj_consume_token(FUZZY_SLOP);-fuzzy=true;- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case CARAT:{- jj_consume_token(CARAT);- boost = jj_consume_token(NUMBER);+ case STAR:+ {+ jj_consume_token(STAR);+ jj_consume_token(COLON);+ field = "*";break;- }- default:- jj_la1[12] = jj_gen;- ;- }- break;}default:- jj_la1[13] = jj_gen;+ jj_la1[7] = jj_gen;jj_consume_token(-1);throw new ParseException();- }- break;- }- default:- jj_la1[14] = jj_gen;- ;- }-q = handleBareTokenQuery(field, term, fuzzySlop, prefix, wildcard, fuzzy, regexp);- break;- }- case RANGEIN_START:- case RANGEEX_START:{- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case RANGEIN_START:{- jj_consume_token(RANGEIN_START);-startInc = true;- break;- }- case RANGEEX_START:{- jj_consume_token(RANGEEX_START);- break;- }- default:- jj_la1[15] = jj_gen;- jj_consume_token(-1);- throw new ParseException();- }- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case RANGE_GOOP:{- goop1 = jj_consume_token(RANGE_GOOP);- break;- }- case RANGE_QUOTED:{- goop1 = jj_consume_token(RANGE_QUOTED);- break;- }- case RANGE_TO:{- goop1 = jj_consume_token(RANGE_TO);- break;- }- default:- jj_la1[16] = jj_gen;- jj_consume_token(-1);- throw new ParseException();}- jj_consume_token(RANGE_TO);- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case RANGE_GOOP:{- goop2 = jj_consume_token(RANGE_GOOP);- break;- }- case RANGE_QUOTED:{- goop2 = jj_consume_token(RANGE_QUOTED);- break;- }- case RANGE_TO:{- goop2 = jj_consume_token(RANGE_TO);- break;- }- default:- jj_la1[17] = jj_gen;- jj_consume_token(-1);- throw new ParseException();- }- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case RANGEIN_END:{- jj_consume_token(RANGEIN_END);-endInc = true;- break;+ } else {+ ;+ }+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case BAREOPER:+ case STAR:+ case QUOTED:+ case TERM:+ case PREFIXTERM:+ case WILDTERM:+ case REGEXPTERM:+ case RANGEIN_START:+ case RANGEEX_START:+ case NUMBER:+ {+ q = Term(field);+ break;}- case RANGEEX_END:{- jj_consume_token(RANGEEX_END);- break;+ case LPAREN:+ {+ jj_consume_token(LPAREN);+ q = Query(field);+ jj_consume_token(RPAREN);+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case CARAT:+ {+ jj_consume_token(CARAT);+ boost = jj_consume_token(NUMBER);+ break;+ }+ default:+ jj_la1[8] = jj_gen;+ ;+ }+ break;}default:- jj_la1[18] = jj_gen;+ jj_la1[9] = jj_gen;jj_consume_token(-1);throw new ParseException();- }- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case CARAT:{- jj_consume_token(CARAT);- boost = jj_consume_token(NUMBER);- break;- }- default:- jj_la1[19] = jj_gen;- ;- }-boolean startOpen=false;- boolean endOpen=false;- if (goop1.kind == RANGE_QUOTED) {- goop1.image = goop1.image.substring(1, goop1.image.length()-1);- } else if ("*".equals(goop1.image)) {- startOpen=true;- }- if (goop2.kind == RANGE_QUOTED) {- goop2.image = goop2.image.substring(1, goop2.image.length()-1);- } else if ("*".equals(goop2.image)) {- endOpen=true;- }- q = getRangeQuery(field, startOpen ? null : discardEscapeChar(goop1.image), endOpen ? null : discardEscapeChar(goop2.image), startInc, endInc);- break;- }- case QUOTED:{- term = jj_consume_token(QUOTED);- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case CARAT:- case FUZZY_SLOP:{- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case CARAT:{- jj_consume_token(CARAT);- boost = jj_consume_token(NUMBER);- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case FUZZY_SLOP:{- fuzzySlop = jj_consume_token(FUZZY_SLOP);-fuzzy=true;- break;- }- default:- jj_la1[20] = jj_gen;- ;+ }+ {+ if ("" != null) return handleBoost(q, boost);+ }+ throw new Error("Missing return statement in function");+ }++ public final Query Term(String field) throws ParseException {+ Token term, boost = null, fuzzySlop = null, goop1, goop2;+ boolean prefix = false;+ boolean wildcard = false;+ boolean fuzzy = false;+ boolean regexp = false;+ boolean startInc = false;+ boolean endInc = false;+ Query q;+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case BAREOPER:+ case STAR:+ case TERM:+ case PREFIXTERM:+ case WILDTERM:+ case REGEXPTERM:+ case NUMBER:+ {+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case TERM:+ {+ term = jj_consume_token(TERM);+ break;+ }+ case STAR:+ {+ term = jj_consume_token(STAR);+ wildcard = true;+ break;+ }+ case PREFIXTERM:+ {+ term = jj_consume_token(PREFIXTERM);+ prefix = true;+ break;+ }+ case WILDTERM:+ {+ term = jj_consume_token(WILDTERM);+ wildcard = true;+ break;+ }+ case REGEXPTERM:+ {+ term = jj_consume_token(REGEXPTERM);+ regexp = true;+ break;+ }+ case NUMBER:+ {+ term = jj_consume_token(NUMBER);+ break;+ }+ case BAREOPER:+ {+ term = jj_consume_token(BAREOPER);+ term.image = term.image.substring(0, 1);+ break;+ }+ default:+ jj_la1[10] = jj_gen;+ jj_consume_token(-1);+ throw new ParseException();}+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case CARAT:+ case FUZZY_SLOP:+ {+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case CARAT:+ {+ jj_consume_token(CARAT);+ boost = jj_consume_token(NUMBER);+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case FUZZY_SLOP:+ {+ fuzzySlop = jj_consume_token(FUZZY_SLOP);+ fuzzy = true;+ break;+ }+ default:+ jj_la1[11] = jj_gen;+ ;+ }+ break;+ }+ case FUZZY_SLOP:+ {+ fuzzySlop = jj_consume_token(FUZZY_SLOP);+ fuzzy = true;+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case CARAT:+ {+ jj_consume_token(CARAT);+ boost = jj_consume_token(NUMBER);+ break;+ }+ default:+ jj_la1[12] = jj_gen;+ ;+ }+ break;+ }+ default:+ jj_la1[13] = jj_gen;+ jj_consume_token(-1);+ throw new ParseException();+ }+ break;+ }+ default:+ jj_la1[14] = jj_gen;+ ;+ }+ q = handleBareTokenQuery(field, term, fuzzySlop, prefix, wildcard, fuzzy, regexp);break;+ }+ case RANGEIN_START:+ case RANGEEX_START:+ {+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case RANGEIN_START:+ {+ jj_consume_token(RANGEIN_START);+ startInc = true;+ break;+ }+ case RANGEEX_START:+ {+ jj_consume_token(RANGEEX_START);+ break;+ }+ default:+ jj_la1[15] = jj_gen;+ jj_consume_token(-1);+ throw new ParseException();}- case FUZZY_SLOP:{- fuzzySlop = jj_consume_token(FUZZY_SLOP);-fuzzy=true;- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case CARAT:{- jj_consume_token(CARAT);- boost = jj_consume_token(NUMBER);- break;- }- default:- jj_la1[21] = jj_gen;- ;+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case RANGE_GOOP:+ {+ goop1 = jj_consume_token(RANGE_GOOP);+ break;+ }+ case RANGE_QUOTED:+ {+ goop1 = jj_consume_token(RANGE_QUOTED);+ break;+ }+ case RANGE_TO:+ {+ goop1 = jj_consume_token(RANGE_TO);+ break;+ }+ default:+ jj_la1[16] = jj_gen;+ jj_consume_token(-1);+ throw new ParseException();}- break;+ jj_consume_token(RANGE_TO);+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case RANGE_GOOP:+ {+ goop2 = jj_consume_token(RANGE_GOOP);+ break;+ }+ case RANGE_QUOTED:+ {+ goop2 = jj_consume_token(RANGE_QUOTED);+ break;+ }+ case RANGE_TO:+ {+ goop2 = jj_consume_token(RANGE_TO);+ break;+ }+ default:+ jj_la1[17] = jj_gen;+ jj_consume_token(-1);+ throw new ParseException();}- default:- jj_la1[22] = jj_gen;- jj_consume_token(-1);- throw new ParseException();+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case RANGEIN_END:+ {+ jj_consume_token(RANGEIN_END);+ endInc = true;+ break;+ }+ case RANGEEX_END:+ {+ jj_consume_token(RANGEEX_END);+ break;+ }+ default:+ jj_la1[18] = jj_gen;+ jj_consume_token(-1);+ throw new ParseException();+ }+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case CARAT:+ {+ jj_consume_token(CARAT);+ boost = jj_consume_token(NUMBER);+ break;+ }+ default:+ jj_la1[19] = jj_gen;+ ;+ }+ boolean startOpen = false;+ boolean endOpen = false;+ if (goop1.kind == RANGE_QUOTED) {+ goop1.image = goop1.image.substring(1, goop1.image.length() - 1);+ } else if ("*".equals(goop1.image)) {+ startOpen = true;+ }+ if (goop2.kind == RANGE_QUOTED) {+ goop2.image = goop2.image.substring(1, goop2.image.length() - 1);+ } else if ("*".equals(goop2.image)) {+ endOpen = true;+ }+ q =+ getRangeQuery(+ field,+ startOpen ? null : discardEscapeChar(goop1.image),+ endOpen ? null : discardEscapeChar(goop2.image),+ startInc,+ endInc);+ break;}- break;+ case QUOTED:+ {+ term = jj_consume_token(QUOTED);+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case CARAT:+ case FUZZY_SLOP:+ {+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case CARAT:+ {+ jj_consume_token(CARAT);+ boost = jj_consume_token(NUMBER);+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case FUZZY_SLOP:+ {+ fuzzySlop = jj_consume_token(FUZZY_SLOP);+ fuzzy = true;+ break;+ }+ default:+ jj_la1[20] = jj_gen;+ ;+ }+ break;+ }+ case FUZZY_SLOP:+ {+ fuzzySlop = jj_consume_token(FUZZY_SLOP);+ fuzzy = true;+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case CARAT:+ {+ jj_consume_token(CARAT);+ boost = jj_consume_token(NUMBER);+ break;+ }+ default:+ jj_la1[21] = jj_gen;+ ;+ }+ break;+ }+ default:+ jj_la1[22] = jj_gen;+ jj_consume_token(-1);+ throw new ParseException();+ }+ break;+ }+ default:+ jj_la1[23] = jj_gen;+ ;+ }+ q = handleQuotedTerm(field, term, fuzzySlop);+ break;}default:- jj_la1[23] = jj_gen;- ;- }-q = handleQuotedTerm(field, term, fuzzySlop);- break;- }- default:- jj_la1[24] = jj_gen;- jj_consume_token(-1);- throw new ParseException();+ jj_la1[24] = jj_gen;+ jj_consume_token(-1);+ throw new ParseException();+ }+ {+ if ("" != null) return handleBoost(q, boost);}-{if ("" != null) return handleBoost(q, boost);}throw new Error("Missing return statement in function");-}+ }-/** Returns the first query if splitOnWhitespace=true or otherwise the entire produced query */- final public Query MultiTerm(String field, List<BooleanClause> clauses) throws ParseException {Token text, whitespace, followingText;- Query firstQuery = null;+ /** Returns the first query if splitOnWhitespace=true or otherwise the entire produced query */+ public final Query MultiTerm(String field, List<BooleanClause> clauses) throws ParseException {+ Token text, whitespace, followingText;+ Query firstQuery = null;text = jj_consume_token(TERM);-if (splitOnWhitespace) {+ if (splitOnWhitespace) {firstQuery = getFieldQuery(field, discardEscapeChar(text.image), false);addClause(clauses, CONJ_NONE, MOD_NONE, firstQuery);}@@ -662,7 +730,7 @@ if (splitOnWhitespace) {label_2:while (true) {followingText = jj_consume_token(TERM);-if (splitOnWhitespace) {+ if (splitOnWhitespace) {Query q = getFieldQuery(field, discardEscapeChar(followingText.image), false);addClause(clauses, CONJ_NONE, MOD_NONE, q);} else { // build up the text to send to analysis@@ -674,40 +742,53 @@ if (splitOnWhitespace) {break label_2;}}-if (splitOnWhitespace == false) {+ if (splitOnWhitespace == false) {firstQuery = getFieldQuery(field, discardEscapeChar(text.image), false);addMultiTermClauses(clauses, firstQuery);}- {if ("" != null) return firstQuery;}+ {+ if ("" != null) return firstQuery;+ }throw new Error("Missing return statement in function");-}+ }- private boolean jj_2_1(int xla)- {- jj_la = xla; jj_lastpos = jj_scanpos = token;- try { return (!jj_3_1()); }- catch(LookaheadSuccess ls) { return true; }- finally { jj_save(0, xla); }+ private boolean jj_2_1(int xla) {+ jj_la = xla;+ jj_lastpos = jj_scanpos = token;+ try {+ return (!jj_3_1());+ } catch (LookaheadSuccess ls) {+ return true;+ } finally {+ jj_save(0, xla);+ }}- private boolean jj_2_2(int xla)- {- jj_la = xla; jj_lastpos = jj_scanpos = token;- try { return (!jj_3_2()); }- catch(LookaheadSuccess ls) { return true; }- finally { jj_save(1, xla); }+ private boolean jj_2_2(int xla) {+ jj_la = xla;+ jj_lastpos = jj_scanpos = token;+ try {+ return (!jj_3_2());+ } catch (LookaheadSuccess ls) {+ return true;+ } finally {+ jj_save(1, xla);+ }}- private boolean jj_2_3(int xla)- {- jj_la = xla; jj_lastpos = jj_scanpos = token;- try { return (!jj_3_3()); }- catch(LookaheadSuccess ls) { return true; }- finally { jj_save(2, xla); }+ private boolean jj_2_3(int xla) {+ jj_la = xla;+ jj_lastpos = jj_scanpos = token;+ try {+ return (!jj_3_3());+ } catch (LookaheadSuccess ls) {+ return true;+ } finally {+ jj_save(2, xla);+ }}- private boolean jj_3R_MultiTerm_381_3_3()- {+ private boolean jj_3R_MultiTerm_381_3_3() {if (jj_scan_token(TERM)) return true;jj_lookingAhead = true;jj_semLA = getToken(1).kind == TERM && allowedPostMultiTerm(getToken(2).kind);@@ -717,208 +798,249 @@ if (splitOnWhitespace == false) {if (jj_3R_MultiTerm_391_5_7()) return true;while (true) {xsp = jj_scanpos;- if (jj_3R_MultiTerm_391_5_7()) { jj_scanpos = xsp; break; }+ if (jj_3R_MultiTerm_391_5_7()) {+ jj_scanpos = xsp;+ break;+ }}return false;}- private boolean jj_3R_MultiTerm_389_3_6()- {+ private boolean jj_3R_MultiTerm_389_3_6() {return false;}- private boolean jj_3R_Clause_306_9_5()- {+ private boolean jj_3R_Clause_306_9_5() {if (jj_scan_token(STAR)) return true;if (jj_scan_token(COLON)) return true;return false;}- private boolean jj_3R_Clause_305_7_4()- {+ private boolean jj_3R_Clause_305_7_4() {if (jj_scan_token(TERM)) return true;if (jj_scan_token(COLON)) return true;return false;}- private boolean jj_3_2()- {+ private boolean jj_3_2() {if (jj_3R_MultiTerm_381_3_3()) return true;return false;}- private boolean jj_3_1()- {+ private boolean jj_3_1() {if (jj_3R_MultiTerm_381_3_3()) return true;return false;}- private boolean jj_3R_MultiTerm_391_5_7()- {+ private boolean jj_3R_MultiTerm_391_5_7() {if (jj_scan_token(TERM)) return true;return false;}- private boolean jj_3_3()- {+ private boolean jj_3_3() {Token xsp;xsp = jj_scanpos;if (jj_3R_Clause_305_7_4()) {- jj_scanpos = xsp;- if (jj_3R_Clause_306_9_5()) return true;+ jj_scanpos = xsp;+ if (jj_3R_Clause_306_9_5()) return true;}return false;}/** Generated Token Manager. */public QueryParserTokenManager token_source;+/** Current token. */public Token token;+/** Next token. */public Token jj_nt;+private int jj_ntk;private Token jj_scanpos, jj_lastpos;private int jj_la;+/** Whether we are looking ahead. */private boolean jj_lookingAhead = false;+private boolean jj_semLA;private int jj_gen;- final private int[] jj_la1 = new int[25];- static private int[] jj_la1_0;- static private int[] jj_la1_1;+ private final int[] jj_la1 = new int[25];+ private static int[] jj_la1_0;+ private static int[] jj_la1_1;+static {- jj_la1_init_0();- jj_la1_init_1();- }- private static void jj_la1_init_0() {- jj_la1_0 = new int[] {0x300,0x300,0x1c00,0x1c00,0xfda7c00,0xfda7f00,0xfda7f00,0x120000,0x40000,0xfda6000,0x9d22000,0x200000,0x40000,0x240000,0x240000,0x6000000,0x90000000,0x90000000,0x60000000,0x40000,0x200000,0x40000,0x240000,0x240000,0xfda2000,};- }- private static void jj_la1_init_1() {- jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};- }- final private JJCalls[] jj_2_rtns = new JJCalls[3];+ jj_la1_init_0();+ jj_la1_init_1();+ }++ private static void jj_la1_init_0() {+ jj_la1_0 =+ new int[] {+ 0x300,+ 0x300,+ 0x1c00,+ 0x1c00,+ 0xfda7c00,+ 0xfda7f00,+ 0xfda7f00,+ 0x120000,+ 0x40000,+ 0xfda6000,+ 0x9d22000,+ 0x200000,+ 0x40000,+ 0x240000,+ 0x240000,+ 0x6000000,+ 0x90000000,+ 0x90000000,+ 0x60000000,+ 0x40000,+ 0x200000,+ 0x40000,+ 0x240000,+ 0x240000,+ 0xfda2000,+ };+ }++ private static void jj_la1_init_1() {+ jj_la1_1 =+ new int[] {+ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x1,+ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,+ };+ }++ private final JJCalls[] jj_2_rtns = new JJCalls[3];private boolean jj_rescan = false;private int jj_gc = 0;/** Constructor with user supplied CharStream. */protected QueryParser(CharStream stream) {- token_source = new QueryParserTokenManager(stream);- token = new Token();- jj_ntk = -1;- jj_gen = 0;- for (int i = 0; i < 25; i++) jj_la1[i] = -1;- for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();+ token_source = new QueryParserTokenManager(stream);+ token = new Token();+ jj_ntk = -1;+ jj_gen = 0;+ for (int i = 0; i < 25; i++) jj_la1[i] = -1;+ for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();}/** Reinitialise. */- @Override public void ReInit(CharStream stream) {- token_source.ReInit(stream);- token = new Token();- jj_ntk = -1;- jj_lookingAhead = false;- jj_gen = 0;- for (int i = 0; i < 25; i++) jj_la1[i] = -1;- for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();+ @Override+ public void ReInit(CharStream stream) {+ token_source.ReInit(stream);+ token = new Token();+ jj_ntk = -1;+ jj_lookingAhead = false;+ jj_gen = 0;+ for (int i = 0; i < 25; i++) jj_la1[i] = -1;+ for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();}/** Constructor with generated Token Manager. */protected QueryParser(QueryParserTokenManager tm) {- token_source = tm;- token = new Token();- jj_ntk = -1;- jj_gen = 0;- for (int i = 0; i < 25; i++) jj_la1[i] = -1;- for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();+ token_source = tm;+ token = new Token();+ jj_ntk = -1;+ jj_gen = 0;+ for (int i = 0; i < 25; i++) jj_la1[i] = -1;+ for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();}/** Reinitialise. */public void ReInit(QueryParserTokenManager tm) {- token_source = tm;- token = new Token();- jj_ntk = -1;- jj_gen = 0;- for (int i = 0; i < 25; i++) jj_la1[i] = -1;- for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();+ token_source = tm;+ token = new Token();+ jj_ntk = -1;+ jj_gen = 0;+ for (int i = 0; i < 25; i++) jj_la1[i] = -1;+ for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();}private Token jj_consume_token(int kind) throws ParseException {- Token oldToken;- if ((oldToken = token).next != null) token = token.next;- else token = token.next = token_source.getNextToken();- jj_ntk = -1;- if (token.kind == kind) {- jj_gen++;- if (++jj_gc > 100) {- jj_gc = 0;- for (int i = 0; i < jj_2_rtns.length; i++) {- JJCalls c = jj_2_rtns[i];- while (c != null) {- if (c.gen < jj_gen) c.first = null;- c = c.next;- }- }- }- return token;- }- token = oldToken;- jj_kind = kind;- throw generateParseException();+ Token oldToken;+ if ((oldToken = token).next != null) token = token.next;+ else token = token.next = token_source.getNextToken();+ jj_ntk = -1;+ if (token.kind == kind) {+ jj_gen++;+ if (++jj_gc > 100) {+ jj_gc = 0;+ for (int i = 0; i < jj_2_rtns.length; i++) {+ JJCalls c = jj_2_rtns[i];+ while (c != null) {+ if (c.gen < jj_gen) c.first = null;+ c = c.next;+ }+ }+ }+ return token;+ }+ token = oldToken;+ jj_kind = kind;+ throw generateParseException();}@SuppressWarnings("serial")- static private final class LookaheadSuccess extends java.lang.Error {+ private static final class LookaheadSuccess extends java.lang.Error {@Overridepublic Throwable fillInStackTrace() {return this;}}- static private final LookaheadSuccess jj_ls = new LookaheadSuccess();++ private static final LookaheadSuccess jj_ls = new LookaheadSuccess();+private boolean jj_scan_token(int kind) {- if (jj_scanpos == jj_lastpos) {- jj_la--;- if (jj_scanpos.next == null) {- jj_lastpos = jj_scanpos = jj_scanpos.next = token_source.getNextToken();- } else {- jj_lastpos = jj_scanpos = jj_scanpos.next;- }- } else {- jj_scanpos = jj_scanpos.next;- }- if (jj_rescan) {- int i = 0; Token tok = token;- while (tok != null && tok != jj_scanpos) { i++; tok = tok.next; }- if (tok != null) jj_add_error_token(kind, i);- }- if (jj_scanpos.kind != kind) return true;- if (jj_la == 0 && jj_scanpos == jj_lastpos) throw jj_ls;- return false;+ if (jj_scanpos == jj_lastpos) {+ jj_la--;+ if (jj_scanpos.next == null) {+ jj_lastpos = jj_scanpos = jj_scanpos.next = token_source.getNextToken();+ } else {+ jj_lastpos = jj_scanpos = jj_scanpos.next;+ }+ } else {+ jj_scanpos = jj_scanpos.next;+ }+ if (jj_rescan) {+ int i = 0;+ Token tok = token;+ while (tok != null && tok != jj_scanpos) {+ i++;+ tok = tok.next;+ }+ if (tok != null) jj_add_error_token(kind, i);+ }+ if (jj_scanpos.kind != kind) return true;+ if (jj_la == 0 && jj_scanpos == jj_lastpos) throw jj_ls;+ return false;}--/** Get the next Token. */- final public Token getNextToken() {- if (token.next != null) token = token.next;- else token = token.next = token_source.getNextToken();- jj_ntk = -1;- jj_gen++;- return token;+ /** Get the next Token. */+ public final Token getNextToken() {+ if (token.next != null) token = token.next;+ else token = token.next = token_source.getNextToken();+ jj_ntk = -1;+ jj_gen++;+ return token;}-/** Get the specific Token. */- final public Token getToken(int index) {- Token t = jj_lookingAhead ? jj_scanpos : token;- for (int i = 0; i < index; i++) {- if (t.next != null) t = t.next;- else t = t.next = token_source.getNextToken();- }- return t;+ /** Get the specific Token. */+ public final Token getToken(int index) {+ Token t = jj_lookingAhead ? jj_scanpos : token;+ for (int i = 0; i < index; i++) {+ if (t.next != null) t = t.next;+ else t = t.next = token_source.getNextToken();+ }+ return t;}private int jj_ntk_f() {- if ((jj_nt=token.next) == null)- return (jj_ntk = (token.next=token_source.getNextToken()).kind);- else- return (jj_ntk = jj_nt.kind);+ if ((jj_nt = token.next) == null)+ return (jj_ntk = (token.next = token_source.getNextToken()).kind);+ else return (jj_ntk = jj_nt.kind);}private java.util.List<int[]> jj_expentries = new java.util.ArrayList<>();@@ -928,135 +1050,142 @@ if (splitOnWhitespace == false) {private int jj_endpos;private void jj_add_error_token(int kind, int pos) {- if (pos >= 100) {- return;- }-- if (pos == jj_endpos + 1) {- jj_lasttokens[jj_endpos++] = kind;- } else if (jj_endpos != 0) {- jj_expentry = new int[jj_endpos];-- for (int i = 0; i < jj_endpos; i++) {- jj_expentry[i] = jj_lasttokens[i];- }-- for (int[] oldentry : jj_expentries) {- if (oldentry.length == jj_expentry.length) {- boolean isMatched = true;-- for (int i = 0; i < jj_expentry.length; i++) {- if (oldentry[i] != jj_expentry[i]) {- isMatched = false;- break;- }-- }- if (isMatched) {- jj_expentries.add(jj_expentry);- break;- }- }- }-- if (pos != 0) {- jj_lasttokens[(jj_endpos = pos) - 1] = kind;- }- }+ if (pos >= 100) {+ return;+ }++ if (pos == jj_endpos + 1) {+ jj_lasttokens[jj_endpos++] = kind;+ } else if (jj_endpos != 0) {+ jj_expentry = new int[jj_endpos];++ for (int i = 0; i < jj_endpos; i++) {+ jj_expentry[i] = jj_lasttokens[i];+ }++ for (int[] oldentry : jj_expentries) {+ if (oldentry.length == jj_expentry.length) {+ boolean isMatched = true;++ for (int i = 0; i < jj_expentry.length; i++) {+ if (oldentry[i] != jj_expentry[i]) {+ isMatched = false;+ break;+ }+ }+ if (isMatched) {+ jj_expentries.add(jj_expentry);+ break;+ }+ }+ }++ if (pos != 0) {+ jj_lasttokens[(jj_endpos = pos) - 1] = kind;+ }+ }}/** Generate ParseException. */public ParseException generateParseException() {- jj_expentries.clear();- boolean[] la1tokens = new boolean[33];- if (jj_kind >= 0) {- la1tokens[jj_kind] = true;- jj_kind = -1;- }- for (int i = 0; i < 25; i++) {- if (jj_la1[i] == jj_gen) {- for (int j = 0; j < 32; j++) {- if ((jj_la1_0[i] & (1<<j)) != 0) {- la1tokens[j] = true;- }- if ((jj_la1_1[i] & (1<<j)) != 0) {- la1tokens[32+j] = true;- }- }- }- }- for (int i = 0; i < 33; i++) {- if (la1tokens[i]) {- jj_expentry = new int[1];- jj_expentry[0] = i;- jj_expentries.add(jj_expentry);- }- }- jj_endpos = 0;- jj_rescan_token();- jj_add_error_token(0, 0);- int[][] exptokseq = new int[jj_expentries.size()][];- for (int i = 0; i < jj_expentries.size(); i++) {- exptokseq[i] = jj_expentries.get(i);- }- return new ParseException(token, exptokseq, tokenImage);+ jj_expentries.clear();+ boolean[] la1tokens = new boolean[33];+ if (jj_kind >= 0) {+ la1tokens[jj_kind] = true;+ jj_kind = -1;+ }+ for (int i = 0; i < 25; i++) {+ if (jj_la1[i] == jj_gen) {+ for (int j = 0; j < 32; j++) {+ if ((jj_la1_0[i] & (1 << j)) != 0) {+ la1tokens[j] = true;+ }+ if ((jj_la1_1[i] & (1 << j)) != 0) {+ la1tokens[32 + j] = true;+ }+ }+ }+ }+ for (int i = 0; i < 33; i++) {+ if (la1tokens[i]) {+ jj_expentry = new int[1];+ jj_expentry[0] = i;+ jj_expentries.add(jj_expentry);+ }+ }+ jj_endpos = 0;+ jj_rescan_token();+ jj_add_error_token(0, 0);+ int[][] exptokseq = new int[jj_expentries.size()][];+ for (int i = 0; i < jj_expentries.size(); i++) {+ exptokseq[i] = jj_expentries.get(i);+ }+ return new ParseException(token, exptokseq, tokenImage);}private boolean trace_enabled;-/** Trace enabled. */- final public boolean trace_enabled() {- return trace_enabled;+ /** Trace enabled. */+ public final boolean trace_enabled() {+ return trace_enabled;}/** Enable tracing. */- final public void enable_tracing() {- }+ public final void enable_tracing() {}/** Disable tracing. */- final public void disable_tracing() {- }+ public final void disable_tracing() {}private void jj_rescan_token() {- jj_rescan = true;- for (int i = 0; i < 3; i++) {- try {- JJCalls p = jj_2_rtns[i];-- do {- if (p.gen > jj_gen) {- jj_la = p.arg; jj_lastpos = jj_scanpos = p.first;- switch (i) {- case 0: jj_3_1(); break;- case 1: jj_3_2(); break;- case 2: jj_3_3(); break;- }- }- p = p.next;- } while (p != null);-- } catch(LookaheadSuccess ls) { }- }- jj_rescan = false;+ jj_rescan = true;+ for (int i = 0; i < 3; i++) {+ try {+ JJCalls p = jj_2_rtns[i];++ do {+ if (p.gen > jj_gen) {+ jj_la = p.arg;+ jj_lastpos = jj_scanpos = p.first;+ switch (i) {+ case 0:+ jj_3_1();+ break;+ case 1:+ jj_3_2();+ break;+ case 2:+ jj_3_3();+ break;+ }+ }+ p = p.next;+ } while (p != null);++ } catch (LookaheadSuccess ls) {+ }+ }+ jj_rescan = false;}private void jj_save(int index, int xla) {- JJCalls p = jj_2_rtns[index];- while (p.gen > jj_gen) {- if (p.next == null) { p = p.next = new JJCalls(); break; }- p = p.next;- }-- p.gen = jj_gen + xla - jj_la;- p.first = token;- p.arg = xla;+ JJCalls p = jj_2_rtns[index];+ while (p.gen > jj_gen) {+ if (p.next == null) {+ p = p.next = new JJCalls();+ break;+ }+ p = p.next;+ }++ p.gen = jj_gen + xla - jj_la;+ p.first = token;+ p.arg = xla;}static final class JJCalls {- int gen;- Token first;- int arg;- JJCalls next;+ int gen;+ Token first;+ int arg;+ JJCalls next;}-}diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserConstants.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserConstants.javaindex 02a5b5f228b..1d13e02b2fc 100644--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserConstants.java+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserConstants.java@@ -1,82 +1,111 @@/* Generated By:JavaCC: Do not edit this line. QueryParserConstants.java */package org.apache.lucene.queryparser.classic;--/**- * Token literal values and constants.- * Generated by org.javacc.parser.OtherFilesGen#start()- */+/** Token literal values and constants. Generated by org.javacc.parser.OtherFilesGen#start() */public interface QueryParserConstants {/** End of File. */int EOF = 0;+/** RegularExpression Id. */int _NUM_CHAR = 1;+/** RegularExpression Id. */int _ESCAPED_CHAR = 2;+/** RegularExpression Id. */int _TERM_START_CHAR = 3;+/** RegularExpression Id. */int _TERM_CHAR = 4;+/** RegularExpression Id. */int _WHITESPACE = 5;+/** RegularExpression Id. */int _QUOTED_CHAR = 6;+/** RegularExpression Id. */int AND = 8;+/** RegularExpression Id. */int OR = 9;+/** RegularExpression Id. */int NOT = 10;+/** RegularExpression Id. */int PLUS = 11;+/** RegularExpression Id. */int MINUS = 12;+/** RegularExpression Id. */int BAREOPER = 13;+/** RegularExpression Id. */int LPAREN = 14;+/** RegularExpression Id. */int RPAREN = 15;+/** RegularExpression Id. */int COLON = 16;+/** RegularExpression Id. */int STAR = 17;+/** RegularExpression Id. */int CARAT = 18;+/** RegularExpression Id. */int QUOTED = 19;+/** RegularExpression Id. */int TERM = 20;+/** RegularExpression Id. */int FUZZY_SLOP = 21;+/** RegularExpression Id. */int PREFIXTERM = 22;+/** RegularExpression Id. */int WILDTERM = 23;+/** RegularExpression Id. */int REGEXPTERM = 24;+/** RegularExpression Id. */int RANGEIN_START = 25;+/** RegularExpression Id. */int RANGEEX_START = 26;+/** RegularExpression Id. */int NUMBER = 27;+/** RegularExpression Id. */int RANGE_TO = 28;+/** RegularExpression Id. */int RANGEIN_END = 29;+/** RegularExpression Id. */int RANGEEX_END = 30;+/** RegularExpression Id. */int RANGE_QUOTED = 31;+/** RegularExpression Id. */int RANGE_GOOP = 32;/** Lexical state. */int Boost = 0;+/** Lexical state. */int Range = 1;+/** Lexical state. */int DEFAULT = 2;@@ -116,5 +145,4 @@ public interface QueryParserConstants {"<RANGE_QUOTED>","<RANGE_GOOP>",};-}diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserTokenManager.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserTokenManager.javaindex 3707bf06ec4..98319f65ef1 100644--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserTokenManager.java+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserTokenManager.java@@ -1,1205 +1,1171 @@/* QueryParserTokenManager.java *//* Generated By:JavaCC: Do not edit this line. QueryParserTokenManager.java */package org.apache.lucene.queryparser.classic;- import org.apache.lucene.queryparser.charstream.CharStream;-----------+import org.apache.lucene.queryparser.charstream.CharStream;/** Token Manager. */-@SuppressWarnings ("unused")+@SuppressWarnings("unused")public class QueryParserTokenManager implements QueryParserConstants {// Debug output.// (debugStream omitted).// Set debug output.// (setDebugStream omitted).-private final int jjStopStringLiteralDfa_2(int pos, long active0){- switch (pos)- {- default :- return -1;- }-}-private final int jjStartNfa_2(int pos, long active0){- return jjMoveNfa_2(jjStopStringLiteralDfa_2(pos, active0), pos + 1);-}-private int jjStopAtPos(int pos, int kind)-{- jjmatchedKind = kind;- jjmatchedPos = pos;- return pos + 1;-}-private int jjMoveStringLiteralDfa0_2(){- switch(curChar)- {+ private final int jjStopStringLiteralDfa_2(int pos, long active0) {+ switch (pos) {+ default:+ return -1;+ }+ }++ private final int jjStartNfa_2(int pos, long active0) {+ return jjMoveNfa_2(jjStopStringLiteralDfa_2(pos, active0), pos + 1);+ }++ private int jjStopAtPos(int pos, int kind) {+ jjmatchedKind = kind;+ jjmatchedPos = pos;+ return pos + 1;+ }++ private int jjMoveStringLiteralDfa0_2() {+ switch (curChar) {case 40:- return jjStopAtPos(0, 14);+ return jjStopAtPos(0, 14);case 41:- return jjStopAtPos(0, 15);+ return jjStopAtPos(0, 15);case 42:- return jjStartNfaWithStates_2(0, 17, 49);+ return jjStartNfaWithStates_2(0, 17, 49);case 43:- return jjStartNfaWithStates_2(0, 11, 15);+ return jjStartNfaWithStates_2(0, 11, 15);case 45:- return jjStartNfaWithStates_2(0, 12, 15);+ return jjStartNfaWithStates_2(0, 12, 15);case 58:- return jjStopAtPos(0, 16);+ return jjStopAtPos(0, 16);case 91:- return jjStopAtPos(0, 25);+ return jjStopAtPos(0, 25);case 94:- return jjStopAtPos(0, 18);+ return jjStopAtPos(0, 18);case 123:- return jjStopAtPos(0, 26);- default :- return jjMoveNfa_2(0, 0);- }-}-private int jjStartNfaWithStates_2(int pos, int kind, int state)-{- jjmatchedKind = kind;- jjmatchedPos = pos;- try { curChar = input_stream.readChar(); }- catch(java.io.IOException e) { return pos + 1; }- return jjMoveNfa_2(state, pos + 1);-}-static final long[] jjbitVec0 = {- 0x1L, 0x0L, 0x0L, 0x0L-};-static final long[] jjbitVec1 = {- 0xfffffffffffffffeL, 0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffffffffffffL-};-static final long[] jjbitVec3 = {- 0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL-};-static final long[] jjbitVec4 = {- 0xfffefffffffffffeL, 0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffffffffffffL-};-private int jjMoveNfa_2(int startState, int curPos)-{- int startsAt = 0;- jjnewStateCnt = 49;- int i = 1;- jjstateSet[0] = startState;- int kind = 0x7fffffff;- for (;;)- {- if (++jjround == 0x7fffffff)- ReInitRounds();- if (curChar < 64)- {- long l = 1L << curChar;- do- {- switch(jjstateSet[--i])- {- case 49:- case 33:- if ((0xfbff7cf8ffffd9ffL & l) == 0L)- break;- if (kind > 23)- kind = 23;- { jjCheckNAddTwoStates(33, 34); }- break;- case 0:- if ((0xfbff54f8ffffd9ffL & l) != 0L)- {- if (kind > 23)- kind = 23;- { jjCheckNAddTwoStates(33, 34); }- }- else if ((0x100002600L & l) != 0L)- {- if (kind > 7)- kind = 7;- }- else if ((0x280200000000L & l) != 0L)- jjstateSet[jjnewStateCnt++] = 15;- else if (curChar == 47)- { jjCheckNAddStates(0, 2); }- else if (curChar == 34)- { jjCheckNAddStates(3, 5); }- if ((0x7bff50f8ffffd9ffL & l) != 0L)- {- if (kind > 20)- kind = 20;- { jjCheckNAddStates(6, 10); }- }- else if (curChar == 42)- {- if (kind > 22)- kind = 22;- }- else if (curChar == 33)- {- if (kind > 10)- kind = 10;- }- if (curChar == 38)- jjstateSet[jjnewStateCnt++] = 4;- break;- case 4:- if (curChar == 38 && kind > 8)- kind = 8;- break;- case 5:- if (curChar == 38)- jjstateSet[jjnewStateCnt++] = 4;- break;- case 13:- if (curChar == 33 && kind > 10)- kind = 10;- break;- case 14:- if ((0x280200000000L & l) != 0L)- jjstateSet[jjnewStateCnt++] = 15;- break;- case 15:- if ((0x100002600L & l) != 0L && kind > 13)- kind = 13;- break;- case 16:- if (curChar == 34)- { jjCheckNAddStates(3, 5); }- break;- case 17:- if ((0xfffffffbffffffffL & l) != 0L)- { jjCheckNAddStates(3, 5); }- break;- case 19:- { jjCheckNAddStates(3, 5); }- break;- case 20:- if (curChar == 34 && kind > 19)- kind = 19;- break;- case 22:- if ((0x3ff000000000000L & l) == 0L)- break;- if (kind > 21)- kind = 21;- { jjCheckNAddStates(11, 14); }- break;- case 23:- if (curChar == 46)- { jjCheckNAdd(24); }- break;- case 24:- if ((0x3ff000000000000L & l) == 0L)- break;- if (kind > 21)- kind = 21;- { jjCheckNAddStates(15, 17); }- break;- case 25:- if ((0x7bff78f8ffffd9ffL & l) == 0L)- break;- if (kind > 21)- kind = 21;- { jjCheckNAddTwoStates(25, 26); }- break;- case 27:- if (kind > 21)- kind = 21;- { jjCheckNAddTwoStates(25, 26); }- break;- case 28:- if ((0x7bff78f8ffffd9ffL & l) == 0L)- break;- if (kind > 21)- kind = 21;- { jjCheckNAddTwoStates(28, 29); }- break;- case 30:- if (kind > 21)- kind = 21;- { jjCheckNAddTwoStates(28, 29); }- break;- case 31:- if (curChar == 42 && kind > 22)- kind = 22;- break;- case 32:- if ((0xfbff54f8ffffd9ffL & l) == 0L)- break;- if (kind > 23)- kind = 23;- { jjCheckNAddTwoStates(33, 34); }- break;- case 35:- if (kind > 23)- kind = 23;- { jjCheckNAddTwoStates(33, 34); }- break;- case 36:- case 38:- if (curChar == 47)- { jjCheckNAddStates(0, 2); }- break;- case 37:- if ((0xffff7fffffffffffL & l) != 0L)- { jjCheckNAddStates(0, 2); }- break;- case 40:- if (curChar == 47 && kind > 24)- kind = 24;- break;- case 41:- if ((0x7bff50f8ffffd9ffL & l) == 0L)- break;- if (kind > 20)- kind = 20;- { jjCheckNAddStates(6, 10); }- break;- case 42:- if ((0x7bff78f8ffffd9ffL & l) == 0L)- break;- if (kind > 20)- kind = 20;- { jjCheckNAddTwoStates(42, 43); }- break;- case 44:- if (kind > 20)- kind = 20;- { jjCheckNAddTwoStates(42, 43); }- break;- case 45:- if ((0x7bff78f8ffffd9ffL & l) != 0L)- { jjCheckNAddStates(18, 20); }- break;- case 47:- { jjCheckNAddStates(18, 20); }- break;- default : break;- }- } while(i != startsAt);- }- else if (curChar < 128)- {- long l = 1L << (curChar & 077);- do- {- switch(jjstateSet[--i])- {- case 49:- if ((0x97ffffff87ffffffL & l) != 0L)- {- if (kind > 23)- kind = 23;- { jjCheckNAddTwoStates(33, 34); }- }- else if (curChar == 92)- { jjCheckNAdd(35); }- break;- case 0:- if ((0x97ffffff87ffffffL & l) != 0L)- {- if (kind > 20)- kind = 20;- { jjCheckNAddStates(6, 10); }- }- else if (curChar == 92)- { jjCheckNAddStates(21, 23); }- else if (curChar == 126)- {- if (kind > 21)- kind = 21;- { jjCheckNAddStates(24, 26); }- }- if ((0x97ffffff87ffffffL & l) != 0L)- {- if (kind > 23)- kind = 23;- { jjCheckNAddTwoStates(33, 34); }- }- if (curChar == 78)- jjstateSet[jjnewStateCnt++] = 11;- else if (curChar == 124)- jjstateSet[jjnewStateCnt++] = 8;- else if (curChar == 79)- jjstateSet[jjnewStateCnt++] = 6;- else if (curChar == 65)- jjstateSet[jjnewStateCnt++] = 2;- break;- case 1:- if (curChar == 68 && kind > 8)- kind = 8;- break;- case 2:- if (curChar == 78)- jjstateSet[jjnewStateCnt++] = 1;- break;- case 3:- if (curChar == 65)- jjstateSet[jjnewStateCnt++] = 2;- break;- case 6:- if (curChar == 82 && kind > 9)- kind = 9;- break;- case 7:- if (curChar == 79)- jjstateSet[jjnewStateCnt++] = 6;- break;- case 8:- if (curChar == 124 && kind > 9)- kind = 9;- break;- case 9:- if (curChar == 124)- jjstateSet[jjnewStateCnt++] = 8;- break;- case 10:- if (curChar == 84 && kind > 10)- kind = 10;- break;- case 11:- if (curChar == 79)- jjstateSet[jjnewStateCnt++] = 10;- break;- case 12:- if (curChar == 78)- jjstateSet[jjnewStateCnt++] = 11;- break;- case 17:- if ((0xffffffffefffffffL & l) != 0L)- { jjCheckNAddStates(3, 5); }- break;- case 18:- if (curChar == 92)- jjstateSet[jjnewStateCnt++] = 19;- break;- case 19:- { jjCheckNAddStates(3, 5); }- break;- case 21:- if (curChar != 126)- break;- if (kind > 21)- kind = 21;- { jjCheckNAddStates(24, 26); }- break;- case 25:- if ((0x97ffffff87ffffffL & l) == 0L)- break;- if (kind > 21)- kind = 21;- { jjCheckNAddTwoStates(25, 26); }- break;- case 26:- if (curChar == 92)- jjstateSet[jjnewStateCnt++] = 27;- break;- case 27:- if (kind > 21)- kind = 21;- { jjCheckNAddTwoStates(25, 26); }- break;- case 28:- if ((0x97ffffff87ffffffL & l) == 0L)- break;- if (kind > 21)- kind = 21;- { jjCheckNAddTwoStates(28, 29); }- break;- case 29:- if (curChar == 92)- jjstateSet[jjnewStateCnt++] = 30;- break;- case 30:- if (kind > 21)- kind = 21;- { jjCheckNAddTwoStates(28, 29); }- break;- case 32:- if ((0x97ffffff87ffffffL & l) == 0L)- break;- if (kind > 23)- kind = 23;- { jjCheckNAddTwoStates(33, 34); }- break;- case 33:- if ((0x97ffffff87ffffffL & l) == 0L)- break;- if (kind > 23)- kind = 23;- { jjCheckNAddTwoStates(33, 34); }- break;- case 34:- if (curChar == 92)- { jjCheckNAdd(35); }- break;- case 35:- if (kind > 23)- kind = 23;- { jjCheckNAddTwoStates(33, 34); }- break;- case 37:- { jjAddStates(0, 2); }- break;- case 39:- if (curChar == 92)- jjstateSet[jjnewStateCnt++] = 38;- break;- case 41:- if ((0x97ffffff87ffffffL & l) == 0L)- break;- if (kind > 20)- kind = 20;- { jjCheckNAddStates(6, 10); }- break;- case 42:- if ((0x97ffffff87ffffffL & l) == 0L)- break;- if (kind > 20)- kind = 20;- { jjCheckNAddTwoStates(42, 43); }- break;- case 43:- if (curChar == 92)- { jjCheckNAdd(44); }- break;- case 44:- if (kind > 20)- kind = 20;- { jjCheckNAddTwoStates(42, 43); }- break;- case 45:- if ((0x97ffffff87ffffffL & l) != 0L)- { jjCheckNAddStates(18, 20); }- break;- case 46:- if (curChar == 92)- { jjCheckNAdd(47); }- break;- case 47:- { jjCheckNAddStates(18, 20); }- break;- case 48:- if (curChar == 92)- { jjCheckNAddStates(21, 23); }- break;- default : break;- }- } while(i != startsAt);- }- else- {- int hiByte = (curChar >> 8);- int i1 = hiByte >> 6;- long l1 = 1L << (hiByte & 077);- int i2 = (curChar & 0xff) >> 6;- long l2 = 1L << (curChar & 077);- do- {- switch(jjstateSet[--i])- {- case 49:- case 33:- if (!jjCanMove_2(hiByte, i1, i2, l1, l2))- break;- if (kind > 23)- kind = 23;- { jjCheckNAddTwoStates(33, 34); }- break;- case 0:- if (jjCanMove_0(hiByte, i1, i2, l1, l2))- {- if (kind > 7)- kind = 7;- }- if (jjCanMove_2(hiByte, i1, i2, l1, l2))- {- if (kind > 23)- kind = 23;- { jjCheckNAddTwoStates(33, 34); }- }- if (jjCanMove_2(hiByte, i1, i2, l1, l2))- {- if (kind > 20)- kind = 20;- { jjCheckNAddStates(6, 10); }- }- break;- case 15:- if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 13)- kind = 13;- break;- case 17:- case 19:- if (jjCanMove_1(hiByte, i1, i2, l1, l2))- { jjCheckNAddStates(3, 5); }- break;- case 25:- if (!jjCanMove_2(hiByte, i1, i2, l1, l2))- break;- if (kind > 21)- kind = 21;- { jjCheckNAddTwoStates(25, 26); }- break;- case 27:- if (!jjCanMove_1(hiByte, i1, i2, l1, l2))- break;- if (kind > 21)- kind = 21;- { jjCheckNAddTwoStates(25, 26); }- break;- case 28:- if (!jjCanMove_2(hiByte, i1, i2, l1, l2))- break;- if (kind > 21)- kind = 21;- { jjCheckNAddTwoStates(28, 29); }- break;- case 30:- if (!jjCanMove_1(hiByte, i1, i2, l1, l2))- break;- if (kind > 21)- kind = 21;- { jjCheckNAddTwoStates(28, 29); }- break;- case 32:- if (!jjCanMove_2(hiByte, i1, i2, l1, l2))- break;- if (kind > 23)- kind = 23;- { jjCheckNAddTwoStates(33, 34); }- break;- case 35:- if (!jjCanMove_1(hiByte, i1, i2, l1, l2))- break;- if (kind > 23)- kind = 23;- { jjCheckNAddTwoStates(33, 34); }- break;- case 37:- if (jjCanMove_1(hiByte, i1, i2, l1, l2))- { jjAddStates(0, 2); }- break;- case 41:- if (!jjCanMove_2(hiByte, i1, i2, l1, l2))- break;- if (kind > 20)- kind = 20;- { jjCheckNAddStates(6, 10); }- break;- case 42:- if (!jjCanMove_2(hiByte, i1, i2, l1, l2))- break;- if (kind > 20)- kind = 20;- { jjCheckNAddTwoStates(42, 43); }- break;- case 44:- if (!jjCanMove_1(hiByte, i1, i2, l1, l2))- break;- if (kind > 20)- kind = 20;- { jjCheckNAddTwoStates(42, 43); }- break;- case 45:- if (jjCanMove_2(hiByte, i1, i2, l1, l2))- { jjCheckNAddStates(18, 20); }- break;- case 47:- if (jjCanMove_1(hiByte, i1, i2, l1, l2))- { jjCheckNAddStates(18, 20); }- break;- default : if (i1 == 0 || l1 == 0 || i2 == 0 || l2 == 0) break; else break;- }- } while(i != startsAt);+ return jjStopAtPos(0, 26);+ default:+ return jjMoveNfa_2(0, 0);+ }+ }++ private int jjStartNfaWithStates_2(int pos, int kind, int state) {+ jjmatchedKind = kind;+ jjmatchedPos = pos;+ try {+ curChar = input_stream.readChar();+ } catch (java.io.IOException e) {+ return pos + 1;+ }+ return jjMoveNfa_2(state, pos + 1);+ }++ static final long[] jjbitVec0 = {0x1L, 0x0L, 0x0L, 0x0L};+ static final long[] jjbitVec1 = {+ 0xfffffffffffffffeL, 0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffffffffffffL+ };+ static final long[] jjbitVec3 = {0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL};+ static final long[] jjbitVec4 = {+ 0xfffefffffffffffeL, 0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffffffffffffL+ };++ private int jjMoveNfa_2(int startState, int curPos) {+ int startsAt = 0;+ jjnewStateCnt = 49;+ int i = 1;+ jjstateSet[0] = startState;+ int kind = 0x7fffffff;+ for (; ; ) {+ if (++jjround == 0x7fffffff) ReInitRounds();+ if (curChar < 64) {+ long l = 1L << curChar;+ do {+ switch (jjstateSet[--i]) {+ case 49:+ case 33:+ if ((0xfbff7cf8ffffd9ffL & l) == 0L) break;+ if (kind > 23) kind = 23;+ {+ jjCheckNAddTwoStates(33, 34);+ }+ break;+ case 0:+ if ((0xfbff54f8ffffd9ffL & l) != 0L) {+ if (kind > 23) kind = 23;+ {+ jjCheckNAddTwoStates(33, 34);+ }+ } else if ((0x100002600L & l) != 0L) {+ if (kind > 7) kind = 7;+ } else if ((0x280200000000L & l) != 0L) jjstateSet[jjnewStateCnt++] = 15;+ else if (curChar == 47) {+ jjCheckNAddStates(0, 2);+ } else if (curChar == 34) {+ jjCheckNAddStates(3, 5);+ }+ if ((0x7bff50f8ffffd9ffL & l) != 0L) {+ if (kind > 20) kind = 20;+ {+ jjCheckNAddStates(6, 10);+ }+ } else if (curChar == 42) {+ if (kind > 22) kind = 22;+ } else if (curChar == 33) {+ if (kind > 10) kind = 10;+ }+ if (curChar == 38) jjstateSet[jjnewStateCnt++] = 4;+ break;+ case 4:+ if (curChar == 38 && kind > 8) kind = 8;+ break;+ case 5:+ if (curChar == 38) jjstateSet[jjnewStateCnt++] = 4;+ break;+ case 13:+ if (curChar == 33 && kind > 10) kind = 10;+ break;+ case 14:+ if ((0x280200000000L & l) != 0L) jjstateSet[jjnewStateCnt++] = 15;+ break;+ case 15:+ if ((0x100002600L & l) != 0L && kind > 13) kind = 13;+ break;+ case 16:+ if (curChar == 34) {+ jjCheckNAddStates(3, 5);+ }+ break;+ case 17:+ if ((0xfffffffbffffffffL & l) != 0L) {+ jjCheckNAddStates(3, 5);+ }+ break;+ case 19:+ {+ jjCheckNAddStates(3, 5);+ }+ break;+ case 20:+ if (curChar == 34 && kind > 19) kind = 19;+ break;+ case 22:+ if ((0x3ff000000000000L & l) == 0L) break;+ if (kind > 21) kind = 21;+ {+ jjCheckNAddStates(11, 14);+ }+ break;+ case 23:+ if (curChar == 46) {+ jjCheckNAdd(24);+ }+ break;+ case 24:+ if ((0x3ff000000000000L & l) == 0L) break;+ if (kind > 21) kind = 21;+ {+ jjCheckNAddStates(15, 17);+ }+ break;+ case 25:+ if ((0x7bff78f8ffffd9ffL & l) == 0L) break;+ if (kind > 21) kind = 21;+ {+ jjCheckNAddTwoStates(25, 26);+ }+ break;+ case 27:+ if (kind > 21) kind = 21;+ {+ jjCheckNAddTwoStates(25, 26);+ }+ break;+ case 28:+ if ((0x7bff78f8ffffd9ffL & l) == 0L) break;+ if (kind > 21) kind = 21;+ {+ jjCheckNAddTwoStates(28, 29);+ }+ break;+ case 30:+ if (kind > 21) kind = 21;+ {+ jjCheckNAddTwoStates(28, 29);+ }+ break;+ case 31:+ if (curChar == 42 && kind > 22) kind = 22;+ break;+ case 32:+ if ((0xfbff54f8ffffd9ffL & l) == 0L) break;+ if (kind > 23) kind = 23;+ {+ jjCheckNAddTwoStates(33, 34);+ }+ break;+ case 35:+ if (kind > 23) kind = 23;+ {+ jjCheckNAddTwoStates(33, 34);+ }+ break;+ case 36:+ case 38:+ if (curChar == 47) {+ jjCheckNAddStates(0, 2);+ }+ break;+ case 37:+ if ((0xffff7fffffffffffL & l) != 0L) {+ jjCheckNAddStates(0, 2);+ }+ break;+ case 40:+ if (curChar == 47 && kind > 24) kind = 24;+ break;+ case 41:+ if ((0x7bff50f8ffffd9ffL & l) == 0L) break;+ if (kind > 20) kind = 20;+ {+ jjCheckNAddStates(6, 10);+ }+ break;+ case 42:+ if ((0x7bff78f8ffffd9ffL & l) == 0L) break;+ if (kind > 20) kind = 20;+ {+ jjCheckNAddTwoStates(42, 43);+ }+ break;+ case 44:+ if (kind > 20) kind = 20;+ {+ jjCheckNAddTwoStates(42, 43);+ }+ break;+ case 45:+ if ((0x7bff78f8ffffd9ffL & l) != 0L) {+ jjCheckNAddStates(18, 20);+ }+ break;+ case 47:+ {+ jjCheckNAddStates(18, 20);+ }+ break;+ default:+ break;+ }+ } while (i != startsAt);+ } else if (curChar < 128) {+ long l = 1L << (curChar & 077);+ do {+ switch (jjstateSet[--i]) {+ case 49:+ if ((0x97ffffff87ffffffL & l) != 0L) {+ if (kind > 23) kind = 23;+ {+ jjCheckNAddTwoStates(33, 34);+ }+ } else if (curChar == 92) {+ jjCheckNAdd(35);+ }+ break;+ case 0:+ if ((0x97ffffff87ffffffL & l) != 0L) {+ if (kind > 20) kind = 20;+ {+ jjCheckNAddStates(6, 10);+ }+ } else if (curChar == 92) {+ jjCheckNAddStates(21, 23);+ } else if (curChar == 126) {+ if (kind > 21) kind = 21;+ {+ jjCheckNAddStates(24, 26);+ }+ }+ if ((0x97ffffff87ffffffL & l) != 0L) {+ if (kind > 23) kind = 23;+ {+ jjCheckNAddTwoStates(33, 34);+ }+ }+ if (curChar == 78) jjstateSet[jjnewStateCnt++] = 11;+ else if (curChar == 124) jjstateSet[jjnewStateCnt++] = 8;+ else if (curChar == 79) jjstateSet[jjnewStateCnt++] = 6;+ else if (curChar == 65) jjstateSet[jjnewStateCnt++] = 2;+ break;+ case 1:+ if (curChar == 68 && kind > 8) kind = 8;+ break;+ case 2:+ if (curChar == 78) jjstateSet[jjnewStateCnt++] = 1;+ break;+ case 3:+ if (curChar == 65) jjstateSet[jjnewStateCnt++] = 2;+ break;+ case 6:+ if (curChar == 82 && kind > 9) kind = 9;+ break;+ case 7:+ if (curChar == 79) jjstateSet[jjnewStateCnt++] = 6;+ break;+ case 8:+ if (curChar == 124 && kind > 9) kind = 9;+ break;+ case 9:+ if (curChar == 124) jjstateSet[jjnewStateCnt++] = 8;+ break;+ case 10:+ if (curChar == 84 && kind > 10) kind = 10;+ break;+ case 11:+ if (curChar == 79) jjstateSet[jjnewStateCnt++] = 10;+ break;+ case 12:+ if (curChar == 78) jjstateSet[jjnewStateCnt++] = 11;+ break;+ case 17:+ if ((0xffffffffefffffffL & l) != 0L) {+ jjCheckNAddStates(3, 5);+ }+ break;+ case 18:+ if (curChar == 92) jjstateSet[jjnewStateCnt++] = 19;+ break;+ case 19:+ {+ jjCheckNAddStates(3, 5);+ }+ break;+ case 21:+ if (curChar != 126) break;+ if (kind > 21) kind = 21;+ {+ jjCheckNAddStates(24, 26);+ }+ break;+ case 25:+ if ((0x97ffffff87ffffffL & l) == 0L) break;+ if (kind > 21) kind = 21;+ {+ jjCheckNAddTwoStates(25, 26);+ }+ break;+ case 26:+ if (curChar == 92) jjstateSet[jjnewStateCnt++] = 27;+ break;+ case 27:+ if (kind > 21) kind = 21;+ {+ jjCheckNAddTwoStates(25, 26);+ }+ break;+ case 28:+ if ((0x97ffffff87ffffffL & l) == 0L) break;+ if (kind > 21) kind = 21;+ {+ jjCheckNAddTwoStates(28, 29);+ }+ break;+ case 29:+ if (curChar == 92) jjstateSet[jjnewStateCnt++] = 30;+ break;+ case 30:+ if (kind > 21) kind = 21;+ {+ jjCheckNAddTwoStates(28, 29);+ }+ break;+ case 32:+ if ((0x97ffffff87ffffffL & l) == 0L) break;+ if (kind > 23) kind = 23;+ {+ jjCheckNAddTwoStates(33, 34);+ }+ break;+ case 33:+ if ((0x97ffffff87ffffffL & l) == 0L) break;+ if (kind > 23) kind = 23;+ {+ jjCheckNAddTwoStates(33, 34);+ }+ break;+ case 34:+ if (curChar == 92) {+ jjCheckNAdd(35);+ }+ break;+ case 35:+ if (kind > 23) kind = 23;+ {+ jjCheckNAddTwoStates(33, 34);+ }+ break;+ case 37:+ {+ jjAddStates(0, 2);+ }+ break;+ case 39:+ if (curChar == 92) jjstateSet[jjnewStateCnt++] = 38;+ break;+ case 41:+ if ((0x97ffffff87ffffffL & l) == 0L) break;+ if (kind > 20) kind = 20;+ {+ jjCheckNAddStates(6, 10);+ }+ break;+ case 42:+ if ((0x97ffffff87ffffffL & l) == 0L) break;+ if (kind > 20) kind = 20;+ {+ jjCheckNAddTwoStates(42, 43);+ }+ break;+ case 43:+ if (curChar == 92) {+ jjCheckNAdd(44);+ }+ break;+ case 44:+ if (kind > 20) kind = 20;+ {+ jjCheckNAddTwoStates(42, 43);+ }+ break;+ case 45:+ if ((0x97ffffff87ffffffL & l) != 0L) {+ jjCheckNAddStates(18, 20);+ }+ break;+ case 46:+ if (curChar == 92) {+ jjCheckNAdd(47);+ }+ break;+ case 47:+ {+ jjCheckNAddStates(18, 20);+ }+ break;+ case 48:+ if (curChar == 92) {+ jjCheckNAddStates(21, 23);+ }+ break;+ default:+ break;+ }+ } while (i != startsAt);+ } else {+ int hiByte = (curChar >> 8);+ int i1 = hiByte >> 6;+ long l1 = 1L << (hiByte & 077);+ int i2 = (curChar & 0xff) >> 6;+ long l2 = 1L << (curChar & 077);+ do {+ switch (jjstateSet[--i]) {+ case 49:+ case 33:+ if (!jjCanMove_2(hiByte, i1, i2, l1, l2)) break;+ if (kind > 23) kind = 23;+ {+ jjCheckNAddTwoStates(33, 34);+ }+ break;+ case 0:+ if (jjCanMove_0(hiByte, i1, i2, l1, l2)) {+ if (kind > 7) kind = 7;+ }+ if (jjCanMove_2(hiByte, i1, i2, l1, l2)) {+ if (kind > 23) kind = 23;+ {+ jjCheckNAddTwoStates(33, 34);+ }+ }+ if (jjCanMove_2(hiByte, i1, i2, l1, l2)) {+ if (kind > 20) kind = 20;+ {+ jjCheckNAddStates(6, 10);+ }+ }+ break;+ case 15:+ if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 13) kind = 13;+ break;+ case 17:+ case 19:+ if (jjCanMove_1(hiByte, i1, i2, l1, l2)) {+ jjCheckNAddStates(3, 5);+ }+ break;+ case 25:+ if (!jjCanMove_2(hiByte, i1, i2, l1, l2)) break;+ if (kind > 21) kind = 21;+ {+ jjCheckNAddTwoStates(25, 26);+ }+ break;+ case 27:+ if (!jjCanMove_1(hiByte, i1, i2, l1, l2)) break;+ if (kind > 21) kind = 21;+ {+ jjCheckNAddTwoStates(25, 26);+ }+ break;+ case 28:+ if (!jjCanMove_2(hiByte, i1, i2, l1, l2)) break;+ if (kind > 21) kind = 21;+ {+ jjCheckNAddTwoStates(28, 29);+ }+ break;+ case 30:+ if (!jjCanMove_1(hiByte, i1, i2, l1, l2)) break;+ if (kind > 21) kind = 21;+ {+ jjCheckNAddTwoStates(28, 29);+ }+ break;+ case 32:+ if (!jjCanMove_2(hiByte, i1, i2, l1, l2)) break;+ if (kind > 23) kind = 23;+ {+ jjCheckNAddTwoStates(33, 34);+ }+ break;+ case 35:+ if (!jjCanMove_1(hiByte, i1, i2, l1, l2)) break;+ if (kind > 23) kind = 23;+ {+ jjCheckNAddTwoStates(33, 34);+ }+ break;+ case 37:+ if (jjCanMove_1(hiByte, i1, i2, l1, l2)) {+ jjAddStates(0, 2);+ }+ break;+ case 41:+ if (!jjCanMove_2(hiByte, i1, i2, l1, l2)) break;+ if (kind > 20) kind = 20;+ {+ jjCheckNAddStates(6, 10);+ }+ break;+ case 42:+ if (!jjCanMove_2(hiByte, i1, i2, l1, l2)) break;+ if (kind > 20) kind = 20;+ {+ jjCheckNAddTwoStates(42, 43);+ }+ break;+ case 44:+ if (!jjCanMove_1(hiByte, i1, i2, l1, l2)) break;+ if (kind > 20) kind = 20;+ {+ jjCheckNAddTwoStates(42, 43);+ }+ break;+ case 45:+ if (jjCanMove_2(hiByte, i1, i2, l1, l2)) {+ jjCheckNAddStates(18, 20);+ }+ break;+ case 47:+ if (jjCanMove_1(hiByte, i1, i2, l1, l2)) {+ jjCheckNAddStates(18, 20);+ }+ break;+ default:+ if (i1 == 0 || l1 == 0 || i2 == 0 || l2 == 0) break;+ else break;+ }+ } while (i != startsAt);}- if (kind != 0x7fffffff)- {- jjmatchedKind = kind;- jjmatchedPos = curPos;- kind = 0x7fffffff;+ if (kind != 0x7fffffff) {+ jjmatchedKind = kind;+ jjmatchedPos = curPos;+ kind = 0x7fffffff;}++curPos;- if ((i = jjnewStateCnt) == (startsAt = 49 - (jjnewStateCnt = startsAt)))- return curPos;- try { curChar = input_stream.readChar(); }- catch(java.io.IOException e) { return curPos; }- }-}-private int jjMoveStringLiteralDfa0_0()-{- return jjMoveNfa_0(0, 0);-}-private int jjMoveNfa_0(int startState, int curPos)-{- int startsAt = 0;- jjnewStateCnt = 3;- int i = 1;- jjstateSet[0] = startState;- int kind = 0x7fffffff;- for (;;)- {- if (++jjround == 0x7fffffff)- ReInitRounds();- if (curChar < 64)- {- long l = 1L << curChar;- do- {- switch(jjstateSet[--i])- {- case 0:- if ((0x3ff000000000000L & l) == 0L)- break;- if (kind > 27)- kind = 27;- { jjAddStates(27, 28); }- break;- case 1:- if (curChar == 46)- { jjCheckNAdd(2); }- break;- case 2:- if ((0x3ff000000000000L & l) == 0L)- break;- if (kind > 27)- kind = 27;- { jjCheckNAdd(2); }- break;- default : break;- }- } while(i != startsAt);+ if ((i = jjnewStateCnt) == (startsAt = 49 - (jjnewStateCnt = startsAt))) return curPos;+ try {+ curChar = input_stream.readChar();+ } catch (java.io.IOException e) {+ return curPos;}- else if (curChar < 128)- {- long l = 1L << (curChar & 077);- do- {- switch(jjstateSet[--i])- {- default : break;- }- } while(i != startsAt);- }- else- {- int hiByte = (curChar >> 8);- int i1 = hiByte >> 6;- long l1 = 1L << (hiByte & 077);- int i2 = (curChar & 0xff) >> 6;- long l2 = 1L << (curChar & 077);- do- {- switch(jjstateSet[--i])- {- default : if (i1 == 0 || l1 == 0 || i2 == 0 || l2 == 0) break; else break;- }- } while(i != startsAt);+ }+ }++ private int jjMoveStringLiteralDfa0_0() {+ return jjMoveNfa_0(0, 0);+ }++ private int jjMoveNfa_0(int startState, int curPos) {+ int startsAt = 0;+ jjnewStateCnt = 3;+ int i = 1;+ jjstateSet[0] = startState;+ int kind = 0x7fffffff;+ for (; ; ) {+ if (++jjround == 0x7fffffff) ReInitRounds();+ if (curChar < 64) {+ long l = 1L << curChar;+ do {+ switch (jjstateSet[--i]) {+ case 0:+ if ((0x3ff000000000000L & l) == 0L) break;+ if (kind > 27) kind = 27;+ {+ jjAddStates(27, 28);+ }+ break;+ case 1:+ if (curChar == 46) {+ jjCheckNAdd(2);+ }+ break;+ case 2:+ if ((0x3ff000000000000L & l) == 0L) break;+ if (kind > 27) kind = 27;+ {+ jjCheckNAdd(2);+ }+ break;+ default:+ break;+ }+ } while (i != startsAt);+ } else if (curChar < 128) {+ long l = 1L << (curChar & 077);+ do {+ switch (jjstateSet[--i]) {+ default:+ break;+ }+ } while (i != startsAt);+ } else {+ int hiByte = (curChar >> 8);+ int i1 = hiByte >> 6;+ long l1 = 1L << (hiByte & 077);+ int i2 = (curChar & 0xff) >> 6;+ long l2 = 1L << (curChar & 077);+ do {+ switch (jjstateSet[--i]) {+ default:+ if (i1 == 0 || l1 == 0 || i2 == 0 || l2 == 0) break;+ else break;+ }+ } while (i != startsAt);}- if (kind != 0x7fffffff)- {- jjmatchedKind = kind;- jjmatchedPos = curPos;- kind = 0x7fffffff;+ if (kind != 0x7fffffff) {+ jjmatchedKind = kind;+ jjmatchedPos = curPos;+ kind = 0x7fffffff;}++curPos;- if ((i = jjnewStateCnt) == (startsAt = 3 - (jjnewStateCnt = startsAt)))- return curPos;- try { curChar = input_stream.readChar(); }- catch(java.io.IOException e) { return curPos; }- }-}-private final int jjStopStringLiteralDfa_1(int pos, long active0){- switch (pos)- {+ if ((i = jjnewStateCnt) == (startsAt = 3 - (jjnewStateCnt = startsAt))) return curPos;+ try {+ curChar = input_stream.readChar();+ } catch (java.io.IOException e) {+ return curPos;+ }+ }+ }++ private final int jjStopStringLiteralDfa_1(int pos, long active0) {+ switch (pos) {case 0:- if ((active0 & 0x10000000L) != 0L)- {- jjmatchedKind = 32;- return 6;- }- return -1;- default :- return -1;- }-}-private final int jjStartNfa_1(int pos, long active0){- return jjMoveNfa_1(jjStopStringLiteralDfa_1(pos, active0), pos + 1);-}-private int jjMoveStringLiteralDfa0_1(){- switch(curChar)- {+ if ((active0 & 0x10000000L) != 0L) {+ jjmatchedKind = 32;+ return 6;+ }+ return -1;+ default:+ return -1;+ }+ }++ private final int jjStartNfa_1(int pos, long active0) {+ return jjMoveNfa_1(jjStopStringLiteralDfa_1(pos, active0), pos + 1);+ }++ private int jjMoveStringLiteralDfa0_1() {+ switch (curChar) {case 84:- return jjMoveStringLiteralDfa1_1(0x10000000L);+ return jjMoveStringLiteralDfa1_1(0x10000000L);case 93:- return jjStopAtPos(0, 29);+ return jjStopAtPos(0, 29);case 125:- return jjStopAtPos(0, 30);- default :- return jjMoveNfa_1(0, 0);- }-}-private int jjMoveStringLiteralDfa1_1(long active0){- try { curChar = input_stream.readChar(); }- catch(java.io.IOException e) {+ return jjStopAtPos(0, 30);+ default:+ return jjMoveNfa_1(0, 0);+ }+ }++ private int jjMoveStringLiteralDfa1_1(long active0) {+ try {+ curChar = input_stream.readChar();+ } catch (java.io.IOException e) {jjStopStringLiteralDfa_1(0, active0);return 1;- }- switch(curChar)- {+ }+ switch (curChar) {case 79:- if ((active0 & 0x10000000L) != 0L)- return jjStartNfaWithStates_1(1, 28, 6);- break;- default :- break;- }- return jjStartNfa_1(0, active0);-}-private int jjStartNfaWithStates_1(int pos, int kind, int state)-{- jjmatchedKind = kind;- jjmatchedPos = pos;- try { curChar = input_stream.readChar(); }- catch(java.io.IOException e) { return pos + 1; }- return jjMoveNfa_1(state, pos + 1);-}-private int jjMoveNfa_1(int startState, int curPos)-{- int startsAt = 0;- jjnewStateCnt = 7;- int i = 1;- jjstateSet[0] = startState;- int kind = 0x7fffffff;- for (;;)- {- if (++jjround == 0x7fffffff)- ReInitRounds();- if (curChar < 64)- {- long l = 1L << curChar;- do- {- switch(jjstateSet[--i])- {- case 0:- if ((0xfffffffeffffffffL & l) != 0L)- {- if (kind > 32)- kind = 32;- { jjCheckNAdd(6); }- }- if ((0x100002600L & l) != 0L)- {- if (kind > 7)- kind = 7;- }- else if (curChar == 34)- { jjCheckNAddTwoStates(2, 4); }- break;- case 1:- if (curChar == 34)- { jjCheckNAddTwoStates(2, 4); }- break;- case 2:- if ((0xfffffffbffffffffL & l) != 0L)- { jjCheckNAddStates(29, 31); }- break;- case 3:- if (curChar == 34)- { jjCheckNAddStates(29, 31); }- break;- case 5:- if (curChar == 34 && kind > 31)- kind = 31;- break;- case 6:- if ((0xfffffffeffffffffL & l) == 0L)- break;- if (kind > 32)- kind = 32;- { jjCheckNAdd(6); }- break;- default : break;- }- } while(i != startsAt);- }- else if (curChar < 128)- {- long l = 1L << (curChar & 077);- do- {- switch(jjstateSet[--i])- {- case 0:- case 6:- if ((0xdfffffffdfffffffL & l) == 0L)- break;- if (kind > 32)- kind = 32;- { jjCheckNAdd(6); }- break;- case 2:- { jjAddStates(29, 31); }- break;- case 4:- if (curChar == 92)- jjstateSet[jjnewStateCnt++] = 3;- break;- default : break;- }- } while(i != startsAt);- }- else- {- int hiByte = (curChar >> 8);- int i1 = hiByte >> 6;- long l1 = 1L << (hiByte & 077);- int i2 = (curChar & 0xff) >> 6;- long l2 = 1L << (curChar & 077);- do- {- switch(jjstateSet[--i])- {- case 0:- if (jjCanMove_0(hiByte, i1, i2, l1, l2))- {- if (kind > 7)- kind = 7;- }- if (jjCanMove_1(hiByte, i1, i2, l1, l2))- {- if (kind > 32)- kind = 32;- { jjCheckNAdd(6); }- }- break;- case 2:- if (jjCanMove_1(hiByte, i1, i2, l1, l2))- { jjAddStates(29, 31); }- break;- case 6:- if (!jjCanMove_1(hiByte, i1, i2, l1, l2))- break;- if (kind > 32)- kind = 32;- { jjCheckNAdd(6); }- break;- default : if (i1 == 0 || l1 == 0 || i2 == 0 || l2 == 0) break; else break;- }- } while(i != startsAt);+ if ((active0 & 0x10000000L) != 0L) return jjStartNfaWithStates_1(1, 28, 6);+ break;+ default:+ break;+ }+ return jjStartNfa_1(0, active0);+ }++ private int jjStartNfaWithStates_1(int pos, int kind, int state) {+ jjmatchedKind = kind;+ jjmatchedPos = pos;+ try {+ curChar = input_stream.readChar();+ } catch (java.io.IOException e) {+ return pos + 1;+ }+ return jjMoveNfa_1(state, pos + 1);+ }++ private int jjMoveNfa_1(int startState, int curPos) {+ int startsAt = 0;+ jjnewStateCnt = 7;+ int i = 1;+ jjstateSet[0] = startState;+ int kind = 0x7fffffff;+ for (; ; ) {+ if (++jjround == 0x7fffffff) ReInitRounds();+ if (curChar < 64) {+ long l = 1L << curChar;+ do {+ switch (jjstateSet[--i]) {+ case 0:+ if ((0xfffffffeffffffffL & l) != 0L) {+ if (kind > 32) kind = 32;+ {+ jjCheckNAdd(6);+ }+ }+ if ((0x100002600L & l) != 0L) {+ if (kind > 7) kind = 7;+ } else if (curChar == 34) {+ jjCheckNAddTwoStates(2, 4);+ }+ break;+ case 1:+ if (curChar == 34) {+ jjCheckNAddTwoStates(2, 4);+ }+ break;+ case 2:+ if ((0xfffffffbffffffffL & l) != 0L) {+ jjCheckNAddStates(29, 31);+ }+ break;+ case 3:+ if (curChar == 34) {+ jjCheckNAddStates(29, 31);+ }+ break;+ case 5:+ if (curChar == 34 && kind > 31) kind = 31;+ break;+ case 6:+ if ((0xfffffffeffffffffL & l) == 0L) break;+ if (kind > 32) kind = 32;+ {+ jjCheckNAdd(6);+ }+ break;+ default:+ break;+ }+ } while (i != startsAt);+ } else if (curChar < 128) {+ long l = 1L << (curChar & 077);+ do {+ switch (jjstateSet[--i]) {+ case 0:+ case 6:+ if ((0xdfffffffdfffffffL & l) == 0L) break;+ if (kind > 32) kind = 32;+ {+ jjCheckNAdd(6);+ }+ break;+ case 2:+ {+ jjAddStates(29, 31);+ }+ break;+ case 4:+ if (curChar == 92) jjstateSet[jjnewStateCnt++] = 3;+ break;+ default:+ break;+ }+ } while (i != startsAt);+ } else {+ int hiByte = (curChar >> 8);+ int i1 = hiByte >> 6;+ long l1 = 1L << (hiByte & 077);+ int i2 = (curChar & 0xff) >> 6;+ long l2 = 1L << (curChar & 077);+ do {+ switch (jjstateSet[--i]) {+ case 0:+ if (jjCanMove_0(hiByte, i1, i2, l1, l2)) {+ if (kind > 7) kind = 7;+ }+ if (jjCanMove_1(hiByte, i1, i2, l1, l2)) {+ if (kind > 32) kind = 32;+ {+ jjCheckNAdd(6);+ }+ }+ break;+ case 2:+ if (jjCanMove_1(hiByte, i1, i2, l1, l2)) {+ jjAddStates(29, 31);+ }+ break;+ case 6:+ if (!jjCanMove_1(hiByte, i1, i2, l1, l2)) break;+ if (kind > 32) kind = 32;+ {+ jjCheckNAdd(6);+ }+ break;+ default:+ if (i1 == 0 || l1 == 0 || i2 == 0 || l2 == 0) break;+ else break;+ }+ } while (i != startsAt);}- if (kind != 0x7fffffff)- {- jjmatchedKind = kind;- jjmatchedPos = curPos;- kind = 0x7fffffff;+ if (kind != 0x7fffffff) {+ jjmatchedKind = kind;+ jjmatchedPos = curPos;+ kind = 0x7fffffff;}++curPos;- if ((i = jjnewStateCnt) == (startsAt = 7 - (jjnewStateCnt = startsAt)))- return curPos;- try { curChar = input_stream.readChar(); }- catch(java.io.IOException e) { return curPos; }- }-}+ if ((i = jjnewStateCnt) == (startsAt = 7 - (jjnewStateCnt = startsAt))) return curPos;+ try {+ curChar = input_stream.readChar();+ } catch (java.io.IOException e) {+ return curPos;+ }+ }+ }-/** Token literal values. */-public static final String[] jjstrLiteralImages = {-"", null, null, null, null, null, null, null, null, null, null, "\53", "\55",-null, "\50", "\51", "\72", "\52", "\136", null, null, null, null, null, null,-"\133", "\173", null, "\124\117", "\135", "\175", null, null, };-protected Token jjFillToken()-{- final Token t;- final String curTokenImage;- final int beginLine;- final int endLine;- final int beginColumn;- final int endColumn;- String im = jjstrLiteralImages[jjmatchedKind];- curTokenImage = (im == null) ? input_stream.GetImage() : im;- beginLine = input_stream.getBeginLine();- beginColumn = input_stream.getBeginColumn();- endLine = input_stream.getEndLine();- endColumn = input_stream.getEndColumn();- t = Token.newToken(jjmatchedKind, curTokenImage);+ /** Token literal values. */+ public static final String[] jjstrLiteralImages = {+ "",+ null,+ null,+ null,+ null,+ null,+ null,+ null,+ null,+ null,+ null,+ "\53",+ "\55",+ null,+ "\50",+ "\51",+ "\72",+ "\52",+ "\136",+ null,+ null,+ null,+ null,+ null,+ null,+ "\133",+ "\173",+ null,+ "\124\117",+ "\135",+ "\175",+ null,+ null,+ };- t.beginLine = beginLine;- t.endLine = endLine;- t.beginColumn = beginColumn;- t.endColumn = endColumn;+ protected Token jjFillToken() {+ final Token t;+ final String curTokenImage;+ final int beginLine;+ final int endLine;+ final int beginColumn;+ final int endColumn;+ String im = jjstrLiteralImages[jjmatchedKind];+ curTokenImage = (im == null) ? input_stream.GetImage() : im;+ beginLine = input_stream.getBeginLine();+ beginColumn = input_stream.getBeginColumn();+ endLine = input_stream.getEndLine();+ endColumn = input_stream.getEndColumn();+ t = Token.newToken(jjmatchedKind, curTokenImage);- return t;-}-static final int[] jjnextStates = {- 37, 39, 40, 17, 18, 20, 42, 43, 45, 46, 31, 22, 23, 25, 26, 24,- 25, 26, 45, 46, 31, 44, 47, 35, 22, 28, 29, 0, 1, 2, 4, 5,-};-private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2)-{- switch(hiByte)- {+ t.beginLine = beginLine;+ t.endLine = endLine;+ t.beginColumn = beginColumn;+ t.endColumn = endColumn;++ return t;+ }++ static final int[] jjnextStates = {+ 37, 39, 40, 17, 18, 20, 42, 43, 45, 46, 31, 22, 23, 25, 26, 24,+ 25, 26, 45, 46, 31, 44, 47, 35, 22, 28, 29, 0, 1, 2, 4, 5,+ };++ private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2) {+ switch (hiByte) {case 48:- return ((jjbitVec0[i2] & l2) != 0L);- default :- return false;- }-}-private static final boolean jjCanMove_1(int hiByte, int i1, int i2, long l1, long l2)-{- switch(hiByte)- {+ return ((jjbitVec0[i2] & l2) != 0L);+ default:+ return false;+ }+ }++ private static final boolean jjCanMove_1(int hiByte, int i1, int i2, long l1, long l2) {+ switch (hiByte) {case 0:- return ((jjbitVec3[i2] & l2) != 0L);- default :- if ((jjbitVec1[i1] & l1) != 0L)- return true;- return false;- }-}-private static final boolean jjCanMove_2(int hiByte, int i1, int i2, long l1, long l2)-{- switch(hiByte)- {+ return ((jjbitVec3[i2] & l2) != 0L);+ default:+ if ((jjbitVec1[i1] & l1) != 0L) return true;+ return false;+ }+ }++ private static final boolean jjCanMove_2(int hiByte, int i1, int i2, long l1, long l2) {+ switch (hiByte) {case 0:- return ((jjbitVec3[i2] & l2) != 0L);+ return ((jjbitVec3[i2] & l2) != 0L);case 48:- return ((jjbitVec1[i2] & l2) != 0L);- default :- if ((jjbitVec4[i1] & l1) != 0L)- return true;- return false;- }-}+ return ((jjbitVec1[i2] & l2) != 0L);+ default:+ if ((jjbitVec4[i1] & l1) != 0L) return true;+ return false;+ }+ }-int curLexState = 2;-int defaultLexState = 2;-int jjnewStateCnt;-int jjround;-int jjmatchedPos;-int jjmatchedKind;+ int curLexState = 2;+ int defaultLexState = 2;+ int jjnewStateCnt;+ int jjround;+ int jjmatchedPos;+ int jjmatchedKind;-/** Get the next Token. */-public Token getNextToken()-{- Token matchedToken;- int curPos = 0;+ /** Get the next Token. */+ public Token getNextToken() {+ Token matchedToken;+ int curPos = 0;- EOFLoop :- for (;;)- {- try- {- curChar = input_stream.BeginToken();- }- catch(Exception e)- {- jjmatchedKind = 0;- jjmatchedPos = -1;- matchedToken = jjFillToken();- return matchedToken;- }+ EOFLoop:+ for (; ; ) {+ try {+ curChar = input_stream.BeginToken();+ } catch (Exception e) {+ jjmatchedKind = 0;+ jjmatchedPos = -1;+ matchedToken = jjFillToken();+ return matchedToken;+ }- switch(curLexState)- {- case 0:- jjmatchedKind = 0x7fffffff;- jjmatchedPos = 0;- curPos = jjMoveStringLiteralDfa0_0();- break;- case 1:- jjmatchedKind = 0x7fffffff;- jjmatchedPos = 0;- curPos = jjMoveStringLiteralDfa0_1();- break;- case 2:- jjmatchedKind = 0x7fffffff;- jjmatchedPos = 0;- curPos = jjMoveStringLiteralDfa0_2();- break;- }- if (jjmatchedKind != 0x7fffffff)- {- if (jjmatchedPos + 1 < curPos)- input_stream.backup(curPos - jjmatchedPos - 1);- if ((jjtoToken[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L)- {- matchedToken = jjFillToken();- if (jjnewLexState[jjmatchedKind] != -1)- curLexState = jjnewLexState[jjmatchedKind];- return matchedToken;- }- else- {- if (jjnewLexState[jjmatchedKind] != -1)- curLexState = jjnewLexState[jjmatchedKind];- continue EOFLoop;+ switch (curLexState) {+ case 0:+ jjmatchedKind = 0x7fffffff;+ jjmatchedPos = 0;+ curPos = jjMoveStringLiteralDfa0_0();+ break;+ case 1:+ jjmatchedKind = 0x7fffffff;+ jjmatchedPos = 0;+ curPos = jjMoveStringLiteralDfa0_1();+ break;+ case 2:+ jjmatchedKind = 0x7fffffff;+ jjmatchedPos = 0;+ curPos = jjMoveStringLiteralDfa0_2();+ break;+ }+ if (jjmatchedKind != 0x7fffffff) {+ if (jjmatchedPos + 1 < curPos) input_stream.backup(curPos - jjmatchedPos - 1);+ if ((jjtoToken[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L) {+ matchedToken = jjFillToken();+ if (jjnewLexState[jjmatchedKind] != -1) curLexState = jjnewLexState[jjmatchedKind];+ return matchedToken;+ } else {+ if (jjnewLexState[jjmatchedKind] != -1) curLexState = jjnewLexState[jjmatchedKind];+ continue EOFLoop;}- }- int error_line = input_stream.getEndLine();- int error_column = input_stream.getEndColumn();- String error_after = null;- boolean EOFSeen = false;- try { input_stream.readChar(); input_stream.backup(1); }- catch (java.io.IOException e1) {+ }+ int error_line = input_stream.getEndLine();+ int error_column = input_stream.getEndColumn();+ String error_after = null;+ boolean EOFSeen = false;+ try {+ input_stream.readChar();+ input_stream.backup(1);+ } catch (java.io.IOException e1) {EOFSeen = true;error_after = curPos <= 1 ? "" : input_stream.GetImage();if (curChar == '\n' || curChar == '\r') {- error_line++;- error_column = 0;- }- else- error_column++;- }- if (!EOFSeen) {+ error_line++;+ error_column = 0;+ } else error_column++;+ }+ if (!EOFSeen) {input_stream.backup(1);error_after = curPos <= 1 ? "" : input_stream.GetImage();- }- throw new TokenMgrError(EOFSeen, curLexState, error_line, error_column, error_after, curChar, TokenMgrError.LEXICAL_ERROR);+ }+ throw new TokenMgrError(+ EOFSeen,+ curLexState,+ error_line,+ error_column,+ error_after,+ curChar,+ TokenMgrError.LEXICAL_ERROR);+ }}-}-void SkipLexicalActions(Token matchedToken)-{- switch(jjmatchedKind)- {- default :- break;- }-}-void MoreLexicalActions()-{- jjimageLen += (lengthOfMatch = jjmatchedPos + 1);- switch(jjmatchedKind)- {- default :- break;- }-}-void TokenLexicalActions(Token matchedToken)-{- switch(jjmatchedKind)- {- default :- break;- }-}-private void jjCheckNAdd(int state)-{- if (jjrounds[state] != jjround)- {+ void SkipLexicalActions(Token matchedToken) {+ switch (jjmatchedKind) {+ default:+ break;+ }+ }++ void MoreLexicalActions() {+ jjimageLen += (lengthOfMatch = jjmatchedPos + 1);+ switch (jjmatchedKind) {+ default:+ break;+ }+ }++ void TokenLexicalActions(Token matchedToken) {+ switch (jjmatchedKind) {+ default:+ break;+ }+ }++ private void jjCheckNAdd(int state) {+ if (jjrounds[state] != jjround) {jjstateSet[jjnewStateCnt++] = state;jjrounds[state] = jjround;- }-}-private void jjAddStates(int start, int end)-{- do {+ }+ }++ private void jjAddStates(int start, int end) {+ do {jjstateSet[jjnewStateCnt++] = jjnextStates[start];- } while (start++ != end);-}-private void jjCheckNAddTwoStates(int state1, int state2)-{- jjCheckNAdd(state1);- jjCheckNAdd(state2);-}+ } while (start++ != end);+ }-private void jjCheckNAddStates(int start, int end)-{- do {- jjCheckNAdd(jjnextStates[start]);- } while (start++ != end);-}+ private void jjCheckNAddTwoStates(int state1, int state2) {+ jjCheckNAdd(state1);+ jjCheckNAdd(state2);+ }- /** Constructor. */- public QueryParserTokenManager(CharStream stream){+ private void jjCheckNAddStates(int start, int end) {+ do {+ jjCheckNAdd(jjnextStates[start]);+ } while (start++ != end);+ }+ /** Constructor. */+ public QueryParserTokenManager(CharStream stream) {input_stream = stream;}/** Constructor. */- public QueryParserTokenManager (CharStream stream, int lexState){+ public QueryParserTokenManager(CharStream stream, int lexState) {ReInit(stream);SwitchTo(lexState);}/** Reinitialise parser. */-- public void ReInit(CharStream stream)- {-+ public void ReInit(CharStream stream) {- jjmatchedPos =- jjnewStateCnt =- 0;+ jjmatchedPos = jjnewStateCnt = 0;curLexState = defaultLexState;input_stream = stream;ReInitRounds();}- private void ReInitRounds()- {+ private void ReInitRounds() {int i;jjround = 0x80000001;- for (i = 49; i-- > 0;)- jjrounds[i] = 0x80000000;+ for (i = 49; i-- > 0; ) jjrounds[i] = 0x80000000;}/** Reinitialise parser. */- public void ReInit(CharStream stream, int lexState)-- {+ public void ReInit(CharStream stream, int lexState) {+ReInit(stream);SwitchTo(lexState);}/** Switch to specified lex state. */- public void SwitchTo(int lexState)- {+ public void SwitchTo(int lexState) {if (lexState >= 3 || lexState < 0)- throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE);- else- curLexState = lexState;+ throw new TokenMgrError(+ "Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.",+ TokenMgrError.INVALID_LEXICAL_STATE);+ else curLexState = lexState;}+ /** Lexer state names. */+ public static final String[] lexStateNames = {+ "Boost", "Range", "DEFAULT",+ };-/** Lexer state names. */-public static final String[] lexStateNames = {- "Boost",- "Range",- "DEFAULT",-};+ /** Lex State array. */+ public static final int[] jjnewLexState = {+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, -1, -1, -1, -1,+ -1, 1, 1, 2, -1, 2, 2, -1, -1,+ };-/** Lex State array. */-public static final int[] jjnewLexState = {- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, -1, -1, -1, -1, -1,- 1, 1, 2, -1, 2, 2, -1, -1,-};-static final long[] jjtoToken = {- 0x1ffffff01L,-};-static final long[] jjtoSkip = {- 0x80L,-};-static final long[] jjtoSpecial = {- 0x0L,-};-static final long[] jjtoMore = {- 0x0L,-};- protected CharStream input_stream;+ static final long[] jjtoToken = {+ 0x1ffffff01L,+ };+ static final long[] jjtoSkip = {+ 0x80L,+ };+ static final long[] jjtoSpecial = {+ 0x0L,+ };+ static final long[] jjtoMore = {+ 0x0L,+ };+ protected CharStream input_stream;- private final int[] jjrounds = new int[49];- private final int[] jjstateSet = new int[2 * 49];- private final StringBuilder jjimage = new StringBuilder();- private StringBuilder image = jjimage;- private int jjimageLen;- private int lengthOfMatch;- protected int curChar;+ private final int[] jjrounds = new int[49];+ private final int[] jjstateSet = new int[2 * 49];+ private final StringBuilder jjimage = new StringBuilder();+ private StringBuilder image = jjimage;+ private int jjimageLen;+ private int lengthOfMatch;+ protected int curChar;}diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/Token.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/Token.javaindex 1b9ccd8538e..c4aad3b49ad 100644--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/Token.java+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/Token.java@@ -2,131 +2,105 @@/* JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COLUMN=true,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */package org.apache.lucene.queryparser.classic;-/**- * Describes the input token stream.- */-+/** Describes the input token stream. */public class Token implements java.io.Serializable {/**- * The version identifier for this Serializable class.- * Increment only if the <i>serialized</i> form of the- * class changes.+ * The version identifier for this Serializable class. Increment only if the <i>serialized</i>+ * form of the class changes.*/private static final long serialVersionUID = 1L;/**- * An integer that describes the kind of this token. This numbering- * system is determined by JavaCCParser, and a table of these numbers is- * stored in the file ...Constants.java.+ * An integer that describes the kind of this token. This numbering system is determined by+ * JavaCCParser, and a table of these numbers is stored in the file ...Constants.java.*/public int kind;/** The line number of the first character of this Token. */public int beginLine;+/** The column number of the first character of this Token. */public int beginColumn;+/** The line number of the last character of this Token. */public int endLine;+/** The column number of the last character of this Token. */public int endColumn;- /**- * The string image of the token.- */+ /** The string image of the token. */public String image;/**- * A reference to the next regular (non-special) token from the input- * stream. If this is the last token from the input stream, or if the- * token manager has not read tokens beyond this one, this field is- * set to null. This is true only if this token is also a regular- * token. Otherwise, see below for a description of the contents of- * this field.+ * A reference to the next regular (non-special) token from the input stream. If this is the last+ * token from the input stream, or if the token manager has not read tokens beyond this one, this+ * field is set to null. This is true only if this token is also a regular token. Otherwise, see+ * below for a description of the contents of this field.*/public Token next;/**- * This field is used to access special tokens that occur prior to this- * token, but after the immediately preceding regular (non-special) token.- * If there are no such special tokens, this field is set to null.- * When there are more than one such special token, this field refers- * to the last of these special tokens, which in turn refers to the next- * previous special token through its specialToken field, and so on- * until the first special token (whose specialToken field is null).- * The next fields of special tokens refer to other special tokens that- * immediately follow it (without an intervening regular token). If there- * is no such token, this field is null.+ * This field is used to access special tokens that occur prior to this token, but after the+ * immediately preceding regular (non-special) token. If there are no such special tokens, this+ * field is set to null. When there are more than one such special token, this field refers to the+ * last of these special tokens, which in turn refers to the next previous special token through+ * its specialToken field, and so on until the first special token (whose specialToken field is+ * null). The next fields of special tokens refer to other special tokens that immediately follow+ * it (without an intervening regular token). If there is no such token, this field is null.*/public Token specialToken;/**- * An optional attribute value of the Token.- * Tokens which are not used as syntactic sugar will often contain- * meaningful values that will be used later on by the compiler or- * interpreter. This attribute value is often different from the image.- * Any subclass of Token that actually wants to return a non-null value can- * override this method as appropriate.+ * An optional attribute value of the Token. Tokens which are not used as syntactic sugar will+ * often contain meaningful values that will be used later on by the compiler or interpreter. This+ * attribute value is often different from the image. Any subclass of Token that actually wants to+ * return a non-null value can override this method as appropriate.*/public Object getValue() {return null;}- /**- * No-argument constructor- */+ /** No-argument constructor */public Token() {}- /**- * Constructs a new token for the specified Image.- */- public Token(int kind)- {+ /** Constructs a new token for the specified Image. */+ public Token(int kind) {this(kind, null);}- /**- * Constructs a new token for the specified Image and Kind.- */- public Token(int kind, String image)- {+ /** Constructs a new token for the specified Image and Kind. */+ public Token(int kind, String image) {this.kind = kind;this.image = image;}- /**- * Returns the image.- */+ /** Returns the image. */@Override- public String toString()- {+ public String toString() {return image;}/**- * Returns a new Token object, by default. However, if you want, you- * can create and return subclass objects based on the value of ofKind.- * Simply add the cases to the switch for all those special cases.- * For example, if you have a subclass of Token called IDToken that- * you want to create if ofKind is ID, simply add something like :+ * Returns a new Token object, by default. However, if you want, you can create and return+ * subclass objects based on the value of ofKind. Simply add the cases to the switch for all those+ * special cases. For example, if you have a subclass of Token called IDToken that you want to+ * create if ofKind is ID, simply add something like :*- * case MyParserConstants.ID : return new IDToken(ofKind, image);+ * <p>case MyParserConstants.ID : return new IDToken(ofKind, image);*- * to the following switch statement. Then you can cast matchedToken- * variable to the appropriate type and use sit in your lexical actions.+ * <p>to the following switch statement. Then you can cast matchedToken variable to the+ * appropriate type and use sit in your lexical actions.*/- public static Token newToken(int ofKind, String image)- {- switch(ofKind)- {- default : return new Token(ofKind, image);+ public static Token newToken(int ofKind, String image) {+ switch (ofKind) {+ default:+ return new Token(ofKind, image);}}- public static Token newToken(int ofKind)- {+ public static Token newToken(int ofKind) {return newToken(ofKind, null);}-}/* (filtered)*/diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/TokenMgrError.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/TokenMgrError.javaindex 1415b79e37c..642dca53e96 100644--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/TokenMgrError.java+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/TokenMgrError.java@@ -3,14 +3,12 @@package org.apache.lucene.queryparser.classic;/** Token Manager Error. */-@SuppressWarnings("all")-public class TokenMgrError extends Error-{+@SuppressWarnings("all")+public class TokenMgrError extends Error {/**- * The version identifier for this Serializable class.- * Increment only if the <i>serialized</i> form of the- * class changes.+ * The version identifier for this Serializable class. Increment only if the <i>serialized</i>+ * form of the class changes.*/private static final long serialVersionUID = 1L;@@ -18,42 +16,30 @@ public class TokenMgrError extends Error* Ordinals for various reasons why an Error of this type can be thrown.*/- /**- * Lexical error occurred.- */+ /** Lexical error occurred. */public static final int LEXICAL_ERROR = 0;- /**- * An attempt was made to create a second instance of a static token manager.- */+ /** An attempt was made to create a second instance of a static token manager. */public static final int STATIC_LEXER_ERROR = 1;- /**- * Tried to change to an invalid lexical state.- */+ /** Tried to change to an invalid lexical state. */public static final int INVALID_LEXICAL_STATE = 2;- /**- * Detected (and bailed out of) an infinite loop in the token manager.- */+ /** Detected (and bailed out of) an infinite loop in the token manager. */public static final int LOOP_DETECTED = 3;- /**- * Indicates the reason why the exception is thrown. It will have- * one of the above 4 values.- */+ /** Indicates the reason why the exception is thrown. It will have one of the above 4 values. */int errorCode;/**- * Replaces unprintable characters by their escaped (or unicode escaped)- * equivalents in the given string+ * Replaces unprintable characters by their escaped (or unicode escaped) equivalents in the given+ * string*/protected static final String addEscapes(String str) {StringBuilder retval = new StringBuilder();char ch;for (int i = 0; i < str.length(); i++) {- switch (str.charAt(i))- {+ switch (str.charAt(i)) {case '\b':retval.append("\\b");continue;@@ -92,34 +78,47 @@ public class TokenMgrError extends Error}/**- * Returns a detailed message for the Error when it is thrown by the- * token manager to indicate a lexical error.- * Parameters :- * EOFSeen : indicates if EOF caused the lexical error- * lexState : lexical state in which this error occurred- * errorLine : line number when the error occurred- * errorColumn : column number when the error occurred- * errorAfter : prefix that was seen before this error occurred- * curchar : the offending character- * Note: You can customize the lexical error message by modifying this method.+ * Returns a detailed message for the Error when it is thrown by the token manager to indicate a+ * lexical error. Parameters : EOFSeen : indicates if EOF caused the lexical error lexState :+ * lexical state in which this error occurred errorLine : line number when the error occurred+ * errorColumn : column number when the error occurred errorAfter : prefix that was seen before+ * this error occurred curchar : the offending character Note: You can customize the lexical error+ * message by modifying this method.*/- protected static String LexicalErr(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, int curChar) {- return("Lexical error at line " + //- errorLine + ", column " + //- errorColumn + ". Encountered: " + //- (EOFSeen ? "<EOF>" : ("'" + addEscapes(String.valueOf((char) curChar)) + "' (" + curChar + "),")) + //- (errorAfter == null || errorAfter.length() == 0 ? "" : " after prefix \"" + addEscapes(errorAfter) + "\"")) + //- (lexState == 0 ? "" : " (in lexical state " + lexState + ")");+ protected static String LexicalErr(+ boolean EOFSeen,+ int lexState,+ int errorLine,+ int errorColumn,+ String errorAfter,+ int curChar) {+ return ("Lexical error at line "+ + //+ errorLine+ + ", column "+ + //+ errorColumn+ + ". Encountered: "+ + //+ (EOFSeen+ ? "<EOF>"+ : ("'" + addEscapes(String.valueOf((char) curChar)) + "' (" + curChar + "),"))+ + //+ (errorAfter == null || errorAfter.length() == 0+ ? ""+ : " after prefix \"" + addEscapes(errorAfter) + "\""))+ + //+ (lexState == 0 ? "" : " (in lexical state " + lexState + ")");}/**- * You can also modify the body of this method to customize your error messages.- * For example, cases like LOOP_DETECTED and INVALID_LEXICAL_STATE are not- * of end-users concern, so you can return something like :+ * You can also modify the body of this method to customize your error messages. For example,+ * cases like LOOP_DETECTED and INVALID_LEXICAL_STATE are not of end-users concern, so you can+ * return something like :*- * "Internal Error : Please file a bug report .... "+ * <p>"Internal Error : Please file a bug report .... "*- * from this method for such cases in the release version of your parser.+ * <p>from this method for such cases in the release version of your parser.*/@Overridepublic String getMessage() {@@ -131,8 +130,7 @@ public class TokenMgrError extends Error*//** No arg constructor. */- public TokenMgrError() {- }+ public TokenMgrError() {}/** Constructor with message and reason. */public TokenMgrError(String message, int reason) {@@ -141,7 +139,14 @@ public class TokenMgrError extends Error}/** Full Constructor. */- public TokenMgrError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, int curChar, int reason) {+ public TokenMgrError(+ boolean EOFSeen,+ int lexState,+ int errorLine,+ int errorColumn,+ String errorAfter,+ int curChar,+ int reason) {this(LexicalErr(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);}}diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/ParseException.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/ParseException.javaindex e4c7d6e8448..0862558fef6 100644--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/ParseException.java+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/ParseException.java@@ -16,109 +16,88 @@* See the License for the specific language governing permissions and* limitations under the License.*/- package org.apache.lucene.queryparser.flexible.standard.parser;+package org.apache.lucene.queryparser.flexible.standard.parser;- import org.apache.lucene.queryparser.flexible.core.QueryNodeParseException;- import org.apache.lucene.queryparser.flexible.core.messages.QueryParserMessages;- import org.apache.lucene.queryparser.flexible.messages.Message;- import org.apache.lucene.queryparser.flexible.messages.MessageImpl;-+import org.apache.lucene.queryparser.flexible.core.QueryNodeParseException;+import org.apache.lucene.queryparser.flexible.core.messages.QueryParserMessages;+import org.apache.lucene.queryparser.flexible.messages.Message;+import org.apache.lucene.queryparser.flexible.messages.MessageImpl;/**- * This exception is thrown when parse errors are encountered.- * You can explicitly create objects of this exception type by- * calling the method generateParseException in the generated- * parser.+ * This exception is thrown when parse errors are encountered. You can explicitly create objects of+ * this exception type by calling the method generateParseException in the generated parser.*- * You can modify this class to customize your error reporting- * mechanisms so long as you retain the public fields.+ * <p>You can modify this class to customize your error reporting mechanisms so long as you retain+ * the public fields.*/public class ParseException extends QueryNodeParseException {/**- * The version identifier for this Serializable class.- * Increment only if the <i>serialized</i> form of the- * class changes.+ * The version identifier for this Serializable class. Increment only if the <i>serialized</i>+ * form of the class changes.*/private static final long serialVersionUID = 1L;- /**- * The end of line string for this machine.- */+ /** The end of line string for this machine. */protected static String EOL = System.getProperty("line.separator", "\n");/**- * This constructor is used by the method "generateParseException"- * in the generated parser. Calling this constructor generates- * a new object of this type with the fields "currentToken",+ * This constructor is used by the method "generateParseException" in the generated parser.+ * Calling this constructor generates a new object of this type with the fields "currentToken",* "expectedTokenSequences", and "tokenImage" set.*/- public ParseException(Token currentTokenVal,- int[][] expectedTokenSequencesVal, String[] tokenImageVal)- {- super(new MessageImpl(QueryParserMessages.INVALID_SYNTAX, initialise(- currentTokenVal, expectedTokenSequencesVal, tokenImageVal)));- this.currentToken = currentTokenVal;- this.expectedTokenSequences = expectedTokenSequencesVal;- this.tokenImage = tokenImageVal;- }-+ public ParseException(+ Token currentTokenVal, int[][] expectedTokenSequencesVal, String[] tokenImageVal) {+ super(+ new MessageImpl(+ QueryParserMessages.INVALID_SYNTAX,+ initialise(currentTokenVal, expectedTokenSequencesVal, tokenImageVal)));+ this.currentToken = currentTokenVal;+ this.expectedTokenSequences = expectedTokenSequencesVal;+ this.tokenImage = tokenImageVal;+ }/**- * The following constructors are for use by you for whatever- * purpose you can think of. Constructing the exception in this- * manner makes the exception behave in the normal way - i.e., as- * documented in the class "Throwable". The fields "errorToken",- * "expectedTokenSequences", and "tokenImage" do not contain- * relevant information. The JavaCC generated code does not use- * these constructors.+ * The following constructors are for use by you for whatever purpose you can think of.+ * Constructing the exception in this manner makes the exception behave in the normal way - i.e.,+ * as documented in the class "Throwable". The fields "errorToken", "expectedTokenSequences", and+ * "tokenImage" do not contain relevant information. The JavaCC generated code does not use these+ * constructors.*/-- public ParseException()- {- super(new MessageImpl(QueryParserMessages.INVALID_SYNTAX, "Error"));- }-+ public ParseException() {+ super(new MessageImpl(QueryParserMessages.INVALID_SYNTAX, "Error"));+ }/** Constructor with message. */- public ParseException(Message message)- {- super(message);- }--+ public ParseException(Message message) {+ super(message);+ }/**- * This is the last token that has been consumed successfully. If- * this object has been created due to a parse error, the token- * following this token will (therefore) be the first error token.+ * This is the last token that has been consumed successfully. If this object has been created due+ * to a parse error, the token following this token will (therefore) be the first error token.*/public Token currentToken;/**- * Each entry in this array is an array of integers. Each array- * of integers represents a sequence of tokens (by their ordinal- * values) that is expected at this point of the parse.+ * Each entry in this array is an array of integers. Each array of integers represents a sequence+ * of tokens (by their ordinal values) that is expected at this point of the parse.*/public int[][] expectedTokenSequences;/**- * This is a reference to the "tokenImage" array of the generated- * parser within which the parse error occurred. This array is- * defined in the generated ...Constants interface.+ * This is a reference to the "tokenImage" array of the generated parser within which the parse+ * error occurred. This array is defined in the generated ...Constants interface.*/public String[] tokenImage;/**- * It uses "currentToken" and "expectedTokenSequences" to generate a parse- * error message and returns it. If this object has been created- * due to a parse error, and you do not catch it (it gets thrown- * from the parser) the correct error message- * gets displayed.+ * It uses "currentToken" and "expectedTokenSequences" to generate a parse error message and+ * returns it. If this object has been created due to a parse error, and you do not catch it (it+ * gets thrown from the parser) the correct error message gets displayed.*/- private static String initialise(Token currentToken,- int[][] expectedTokenSequences,- String[] tokenImage) {+ private static String initialise(+ Token currentToken, int[][] expectedTokenSequences, String[] tokenImage) {StringBuilder expected = new StringBuilder();int maxSize = 0;@@ -149,73 +128,69 @@ public class ParseException extends QueryNodeParseException {tok = tok.next;}if (currentToken.next != null) {- retval += "\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn;+ retval +=+ "\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn;}retval += "." + EOL;--+if (expectedTokenSequences.length == 0) {- // Nothing to add here+ // Nothing to add here} else {- if (expectedTokenSequences.length == 1) {- retval += "Was expecting:" + EOL + " ";- } else {- retval += "Was expecting one of:" + EOL + " ";- }- retval += expected.toString();+ if (expectedTokenSequences.length == 1) {+ retval += "Was expecting:" + EOL + " ";+ } else {+ retval += "Was expecting one of:" + EOL + " ";+ }+ retval += expected.toString();}-+return retval;}-/**- * Used to convert raw characters to their escaped version- * when these raw version cannot be used as part of an ASCII- * string literal.+ * Used to convert raw characters to their escaped version when these raw version cannot be used+ * as part of an ASCII string literal.*/static String add_escapes(String str) {- StringBuilder retval = new StringBuilder();- char ch;- for (int i = 0; i < str.length(); i++) {- switch (str.charAt(i))- {- case '\b':- retval.append("\\b");- continue;- case '\t':- retval.append("\\t");- continue;- case '\n':- retval.append("\\n");- continue;- case '\f':- retval.append("\\f");- continue;- case '\r':- retval.append("\\r");- continue;- case '\"':- retval.append("\\\"");- continue;- case '\'':- retval.append("\\\'");- continue;- case '\\':- retval.append("\\\\");- continue;- default:- if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {- String s = "0000" + Integer.toString(ch, 16);- retval.append("\\u" + s.substring(s.length() - 4, s.length()));- } else {- retval.append(ch);- }- continue;- }+ StringBuilder retval = new StringBuilder();+ char ch;+ for (int i = 0; i < str.length(); i++) {+ switch (str.charAt(i)) {+ case '\b':+ retval.append("\\b");+ continue;+ case '\t':+ retval.append("\\t");+ continue;+ case '\n':+ retval.append("\\n");+ continue;+ case '\f':+ retval.append("\\f");+ continue;+ case '\r':+ retval.append("\\r");+ continue;+ case '\"':+ retval.append("\\\"");+ continue;+ case '\'':+ retval.append("\\\'");+ continue;+ case '\\':+ retval.append("\\\\");+ continue;+ default:+ if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {+ String s = "0000" + Integer.toString(ch, 16);+ retval.append("\\u" + s.substring(s.length() - 4, s.length()));+ } else {+ retval.append(ch);+ }+ continue;}- return retval.toString();- }-+ }+ return retval.toString();+ }}/* (filtered)*/diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.javaindex d2db631cde2..2cc6ec12132 100644--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.java+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.java@@ -18,11 +18,16 @@*/package org.apache.lucene.queryparser.flexible.standard.parser;-import java.io.StringReader;+import static org.apache.lucene.queryparser.flexible.standard.parser.EscapeQuerySyntaxImpl.discardEscapeChar;+import java.io.Reader;-import java.util.Collections;+import java.io.StringReader;import java.util.ArrayList;-+import java.util.Collections;+import org.apache.lucene.queryparser.charstream.CharStream;+import org.apache.lucene.queryparser.charstream.FastCharStream;+import org.apache.lucene.queryparser.flexible.core.QueryNodeParseException;+import org.apache.lucene.queryparser.flexible.core.messages.QueryParserMessages;import org.apache.lucene.queryparser.flexible.core.nodes.AndQueryNode;import org.apache.lucene.queryparser.flexible.core.nodes.BooleanQueryNode;import org.apache.lucene.queryparser.flexible.core.nodes.BoostQueryNode;@@ -34,11 +39,13 @@ import org.apache.lucene.queryparser.flexible.core.nodes.OrQueryNode;import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;import org.apache.lucene.queryparser.flexible.core.nodes.QuotedFieldQueryNode;import org.apache.lucene.queryparser.flexible.core.nodes.SlopQueryNode;+import org.apache.lucene.queryparser.flexible.core.parser.SyntaxParser;import org.apache.lucene.queryparser.flexible.messages.Message;import org.apache.lucene.queryparser.flexible.messages.MessageImpl;-import org.apache.lucene.queryparser.flexible.core.QueryNodeParseException;-import org.apache.lucene.queryparser.flexible.core.messages.QueryParserMessages;-import org.apache.lucene.queryparser.flexible.core.parser.SyntaxParser;+import org.apache.lucene.queryparser.flexible.standard.nodes.IntervalQueryNode;+import org.apache.lucene.queryparser.flexible.standard.nodes.MinShouldMatchNode;+import org.apache.lucene.queryparser.flexible.standard.nodes.RegexpQueryNode;+import org.apache.lucene.queryparser.flexible.standard.nodes.TermRangeQueryNode;import org.apache.lucene.queryparser.flexible.standard.nodes.intervalfn.After;import org.apache.lucene.queryparser.flexible.standard.nodes.intervalfn.AnalyzedText;import org.apache.lucene.queryparser.flexible.standard.nodes.intervalfn.AtLeast;@@ -62,26 +69,19 @@ import org.apache.lucene.queryparser.flexible.standard.nodes.intervalfn.Unordereimport org.apache.lucene.queryparser.flexible.standard.nodes.intervalfn.UnorderedNoOverlaps;import org.apache.lucene.queryparser.flexible.standard.nodes.intervalfn.Wildcard;import org.apache.lucene.queryparser.flexible.standard.nodes.intervalfn.Within;-import org.apache.lucene.queryparser.flexible.standard.nodes.IntervalQueryNode;-import org.apache.lucene.queryparser.flexible.standard.nodes.MinShouldMatchNode;-import org.apache.lucene.queryparser.flexible.standard.nodes.RegexpQueryNode;-import org.apache.lucene.queryparser.charstream.CharStream;-import org.apache.lucene.queryparser.charstream.FastCharStream;-import org.apache.lucene.queryparser.flexible.standard.nodes.TermRangeQueryNode;--import static org.apache.lucene.queryparser.flexible.standard.parser.EscapeQuerySyntaxImpl.discardEscapeChar;-/**- * Parser for the standard Lucene syntax- */-@SuppressWarnings({"unused","null"}) public class StandardSyntaxParser implements SyntaxParser, StandardSyntaxParserConstants {+/** Parser for the standard Lucene syntax */+@SuppressWarnings({"unused", "null"})+public class StandardSyntaxParser implements SyntaxParser, StandardSyntaxParserConstants {public StandardSyntaxParser() {this(new FastCharStream(Reader.nullReader()));}/**- * Parses a query string, returning a {@link org.apache.lucene.queryparser.flexible.core.nodes.QueryNode}.- * @param query the query string to be parsed.+ * Parses a query string, returning a {@link+ * org.apache.lucene.queryparser.flexible.core.nodes.QueryNode}.+ *+ * @param query the query string to be parsed.* @throws ParseException if the parsing fails*/@Override@@ -93,7 +93,8 @@ import static org.apache.lucene.queryparser.flexible.standard.parser.EscapeQuerytme.setQuery(query);throw tme;} catch (Error tme) {- Message message = new MessageImpl(QueryParserMessages.INVALID_SYNTAX_CANNOT_PARSE, query, tme.getMessage());+ Message message =+ new MessageImpl(QueryParserMessages.INVALID_SYNTAX_CANNOT_PARSE, query, tme.getMessage());QueryNodeParseException e = new QueryNodeParseException(tme);e.setQuery(query);e.setNonLocalizedMessage(message);@@ -109,40 +110,45 @@ import static org.apache.lucene.queryparser.flexible.standard.parser.EscapeQueryreturn Integer.parseInt(token.image);}- final public QueryNode TopLevelQuery(CharSequence field) throws ParseException {QueryNode q;+ public final QueryNode TopLevelQuery(CharSequence field) throws ParseException {+ QueryNode q;q = Query(field);jj_consume_token(0);-{if ("" != null) return q;}+ {+ if ("" != null) return q;+ }throw new Error("Missing return statement in function");-}+ }- final private QueryNode Query(CharSequence field) throws ParseException {ArrayList<QueryNode> clauses = new ArrayList<>();- QueryNode node;+ private final QueryNode Query(CharSequence field) throws ParseException {+ ArrayList<QueryNode> clauses = new ArrayList<>();+ QueryNode node;label_1:while (true) {node = DisjQuery(field);-clauses.add(node);- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case NOT:- case FN_PREFIX:- case PLUS:- case MINUS:- case QUOTED:- case NUMBER:- case TERM:- case REGEXPTERM:- case RANGEIN_START:- case RANGEEX_START:- case LPAREN:{- ;- break;- }- default:- jj_la1[0] = jj_gen;- break label_1;+ clauses.add(node);+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case NOT:+ case FN_PREFIX:+ case PLUS:+ case MINUS:+ case QUOTED:+ case NUMBER:+ case TERM:+ case REGEXPTERM:+ case RANGEIN_START:+ case RANGEEX_START:+ case LPAREN:+ {+ ;+ break;+ }+ default:+ jj_la1[0] = jj_gen;+ break label_1;}}-// Handle the case of a "pure" negation query which+ // Handle the case of a "pure" negation query which// needs to be wrapped as a boolean query, otherwise// the returned result drops the negation.if (clauses.size() == 1) {@@ -153,293 +159,376 @@ clauses.add(node);}}- {if ("" != null) return clauses.size() == 1 ? clauses.get(0) : new BooleanQueryNode(clauses);}+ {+ if ("" != null) return clauses.size() == 1 ? clauses.get(0) : new BooleanQueryNode(clauses);+ }throw new Error("Missing return statement in function");-}+ }- final private QueryNode DisjQuery(CharSequence field) throws ParseException {ArrayList<QueryNode> clauses = new ArrayList<>();- QueryNode node;+ private final QueryNode DisjQuery(CharSequence field) throws ParseException {+ ArrayList<QueryNode> clauses = new ArrayList<>();+ QueryNode node;node = ConjQuery(field);-clauses.add(node);+ clauses.add(node);label_2:while (true) {- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case OR:{- ;- break;- }- default:- jj_la1[1] = jj_gen;- break label_2;+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case OR:+ {+ ;+ break;+ }+ default:+ jj_la1[1] = jj_gen;+ break label_2;}jj_consume_token(OR);node = ConjQuery(field);-clauses.add(node);+ clauses.add(node);+ }+ {+ if ("" != null) return clauses.size() == 1 ? clauses.get(0) : new OrQueryNode(clauses);}-{if ("" != null) return clauses.size() == 1 ? clauses.get(0) : new OrQueryNode(clauses);}throw new Error("Missing return statement in function");-}+ }- final private QueryNode ConjQuery(CharSequence field) throws ParseException {ArrayList<QueryNode> clauses = new ArrayList<>();- QueryNode node;+ private final QueryNode ConjQuery(CharSequence field) throws ParseException {+ ArrayList<QueryNode> clauses = new ArrayList<>();+ QueryNode node;node = ModClause(field);-clauses.add(node);+ clauses.add(node);label_3:while (true) {- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case AND:{- ;- break;- }- default:- jj_la1[2] = jj_gen;- break label_3;+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case AND:+ {+ ;+ break;+ }+ default:+ jj_la1[2] = jj_gen;+ break label_3;}jj_consume_token(AND);node = ModClause(field);-clauses.add(node);+ clauses.add(node);+ }+ {+ if ("" != null) return clauses.size() == 1 ? clauses.get(0) : new AndQueryNode(clauses);}-{if ("" != null) return clauses.size() == 1 ? clauses.get(0) : new AndQueryNode(clauses);}throw new Error("Missing return statement in function");-}+ }- final private QueryNode ModClause(CharSequence field) throws ParseException {QueryNode q;- ModifierQueryNode.Modifier modifier = ModifierQueryNode.Modifier.MOD_NONE;- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case NOT:- case PLUS:- case MINUS:{- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case PLUS:{- jj_consume_token(PLUS);-modifier = ModifierQueryNode.Modifier.MOD_REQ;- break;- }+ private final QueryNode ModClause(CharSequence field) throws ParseException {+ QueryNode q;+ ModifierQueryNode.Modifier modifier = ModifierQueryNode.Modifier.MOD_NONE;+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {case NOT:- case MINUS:{- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case MINUS:{- jj_consume_token(MINUS);- break;+ case PLUS:+ case MINUS:+ {+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case PLUS:+ {+ jj_consume_token(PLUS);+ modifier = ModifierQueryNode.Modifier.MOD_REQ;+ break;+ }+ case NOT:+ case MINUS:+ {+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case MINUS:+ {+ jj_consume_token(MINUS);+ break;+ }+ case NOT:+ {+ jj_consume_token(NOT);+ break;+ }+ default:+ jj_la1[3] = jj_gen;+ jj_consume_token(-1);+ throw new ParseException();+ }+ modifier = ModifierQueryNode.Modifier.MOD_NOT;+ break;+ }+ default:+ jj_la1[4] = jj_gen;+ jj_consume_token(-1);+ throw new ParseException();}- case NOT:{- jj_consume_token(NOT);break;- }- default:- jj_la1[3] = jj_gen;- jj_consume_token(-1);- throw new ParseException();- }-modifier = ModifierQueryNode.Modifier.MOD_NOT;- break;}default:- jj_la1[4] = jj_gen;- jj_consume_token(-1);- throw new ParseException();- }- break;- }- default:- jj_la1[5] = jj_gen;- ;+ jj_la1[5] = jj_gen;+ ;}q = Clause(field);-if (modifier != ModifierQueryNode.Modifier.MOD_NONE) {+ if (modifier != ModifierQueryNode.Modifier.MOD_NONE) {q = new ModifierQueryNode(q, modifier);}- {if ("" != null) return q;}+ {+ if ("" != null) return q;+ }throw new Error("Missing return statement in function");-}+ }- final private QueryNode Clause(CharSequence field) throws ParseException {QueryNode q;+ private final QueryNode Clause(CharSequence field) throws ParseException {+ QueryNode q;if (jj_2_3(2)) {q = FieldRangeExpr(field);} else {- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case FN_PREFIX:- case QUOTED:- case NUMBER:- case TERM:- case REGEXPTERM:- case RANGEIN_START:- case RANGEEX_START:- case LPAREN:{- if (jj_2_1(2)) {- field = FieldName();- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case OP_COLON:{- jj_consume_token(OP_COLON);- break;+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case FN_PREFIX:+ case QUOTED:+ case NUMBER:+ case TERM:+ case REGEXPTERM:+ case RANGEIN_START:+ case RANGEEX_START:+ case LPAREN:+ {+ if (jj_2_1(2)) {+ field = FieldName();+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case OP_COLON:+ {+ jj_consume_token(OP_COLON);+ break;+ }+ case OP_EQUAL:+ {+ jj_consume_token(OP_EQUAL);+ break;+ }+ default:+ jj_la1[6] = jj_gen;+ jj_consume_token(-1);+ throw new ParseException();+ }+ } else {+ ;}- case OP_EQUAL:{- jj_consume_token(OP_EQUAL);- break;- }- default:- jj_la1[6] = jj_gen;- jj_consume_token(-1);- throw new ParseException();- }- } else {- ;- }- if (jj_2_2(2)) {- q = Term(field);- } else {- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case LPAREN:{- q = GroupingExpr(field);- break;+ if (jj_2_2(2)) {+ q = Term(field);+ } else {+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case LPAREN:+ {+ q = GroupingExpr(field);+ break;+ }+ case FN_PREFIX:+ case QUOTED:+ case NUMBER:+ case TERM:+ {+ q = IntervalExpr(field);+ break;+ }+ default:+ jj_la1[7] = jj_gen;+ jj_consume_token(-1);+ throw new ParseException();+ }}- case FN_PREFIX:- case QUOTED:- case NUMBER:- case TERM:{- q = IntervalExpr(field);break;- }- default:- jj_la1[7] = jj_gen;- jj_consume_token(-1);- throw new ParseException();}- }- break;- }- default:- jj_la1[8] = jj_gen;- jj_consume_token(-1);- throw new ParseException();+ default:+ jj_la1[8] = jj_gen;+ jj_consume_token(-1);+ throw new ParseException();}}-{if ("" != null) return q;}+ {+ if ("" != null) return q;+ }throw new Error("Missing return statement in function");-}+ }- final private CharSequence FieldName() throws ParseException {Token name;+ private final CharSequence FieldName() throws ParseException {+ Token name;name = jj_consume_token(TERM);-{if ("" != null) return discardEscapeChar(name.image);}+ {+ if ("" != null) return discardEscapeChar(name.image);+ }throw new Error("Missing return statement in function");-}+ }- final private QueryNode GroupingExpr(CharSequence field) throws ParseException {QueryNode q;- Token boost, minShouldMatch = null;+ private final QueryNode GroupingExpr(CharSequence field) throws ParseException {+ QueryNode q;+ Token boost, minShouldMatch = null;jj_consume_token(LPAREN);q = Query(field);jj_consume_token(RPAREN);- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case CARAT:{- q = Boost(q);- break;- }- default:- jj_la1[9] = jj_gen;- ;+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case CARAT:+ {+ q = Boost(q);+ break;+ }+ default:+ jj_la1[9] = jj_gen;+ ;}- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case 56:{- jj_consume_token(56);- minShouldMatch = jj_consume_token(NUMBER);- break;- }- default:- jj_la1[10] = jj_gen;- ;+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case 56:+ {+ jj_consume_token(56);+ minShouldMatch = jj_consume_token(NUMBER);+ break;+ }+ default:+ jj_la1[10] = jj_gen;+ ;}-if (minShouldMatch != null) {+ if (minShouldMatch != null) {q = new MinShouldMatchNode(parseInt(minShouldMatch), new GroupQueryNode(q));} else {q = new GroupQueryNode(q);}- {if ("" != null) return q;}+ {+ if ("" != null) return q;+ }throw new Error("Missing return statement in function");-}+ }- final private IntervalQueryNode IntervalExpr(CharSequence field) throws ParseException {IntervalFunction source;+ private final IntervalQueryNode IntervalExpr(CharSequence field) throws ParseException {+ IntervalFunction source;source = IntervalFun();-{if ("" != null) return new IntervalQueryNode(field == null ? null : field.toString(), source);}+ {+ if ("" != null) return new IntervalQueryNode(field == null ? null : field.toString(), source);+ }throw new Error("Missing return statement in function");-}+ }- final private IntervalFunction IntervalFun() throws ParseException {IntervalFunction source;+ private final IntervalFunction IntervalFun() throws ParseException {+ IntervalFunction source;if (jj_2_4(2)) {source = IntervalAtLeast();-{if ("" != null) return source;}+ {+ if ("" != null) return source;+ }} else if (jj_2_5(2)) {source = IntervalMaxWidth();-{if ("" != null) return source;}+ {+ if ("" != null) return source;+ }} else if (jj_2_6(2)) {source = IntervalMaxGaps();-{if ("" != null) return source;}+ {+ if ("" != null) return source;+ }} else if (jj_2_7(2)) {source = IntervalOrdered();-{if ("" != null) return source;}+ {+ if ("" != null) return source;+ }} else if (jj_2_8(2)) {source = IntervalUnordered();-{if ("" != null) return source;}+ {+ if ("" != null) return source;+ }} else if (jj_2_9(2)) {source = IntervalUnorderedNoOverlaps();-{if ("" != null) return source;}+ {+ if ("" != null) return source;+ }} else if (jj_2_10(2)) {source = IntervalOr();-{if ("" != null) return source;}+ {+ if ("" != null) return source;+ }} else if (jj_2_11(2)) {source = IntervalWildcard();-{if ("" != null) return source;}+ {+ if ("" != null) return source;+ }} else if (jj_2_12(2)) {source = IntervalAfter();-{if ("" != null) return source;}+ {+ if ("" != null) return source;+ }} else if (jj_2_13(2)) {source = IntervalBefore();-{if ("" != null) return source;}+ {+ if ("" != null) return source;+ }} else if (jj_2_14(2)) {source = IntervalPhrase();-{if ("" != null) return source;}+ {+ if ("" != null) return source;+ }} else if (jj_2_15(2)) {source = IntervalContaining();-{if ("" != null) return source;}+ {+ if ("" != null) return source;+ }} else if (jj_2_16(2)) {source = IntervalNotContaining();-{if ("" != null) return source;}+ {+ if ("" != null) return source;+ }} else if (jj_2_17(2)) {source = IntervalContainedBy();-{if ("" != null) return source;}+ {+ if ("" != null) return source;+ }} else if (jj_2_18(2)) {source = IntervalNotContainedBy();-{if ("" != null) return source;}+ {+ if ("" != null) return source;+ }} else if (jj_2_19(2)) {source = IntervalWithin();-{if ("" != null) return source;}+ {+ if ("" != null) return source;+ }} else if (jj_2_20(2)) {source = IntervalNotWithin();-{if ("" != null) return source;}+ {+ if ("" != null) return source;+ }} else if (jj_2_21(2)) {source = IntervalOverlapping();-{if ("" != null) return source;}+ {+ if ("" != null) return source;+ }} else if (jj_2_22(2)) {source = IntervalNonOverlapping();-{if ("" != null) return source;}+ {+ if ("" != null) return source;+ }} else if (jj_2_23(2)) {source = IntervalExtend();-{if ("" != null) return source;}+ {+ if ("" != null) return source;+ }} else if (jj_2_24(2)) {source = IntervalFuzzyTerm();-{if ("" != null) return source;}+ {+ if ("" != null) return source;+ }} else if (jj_2_25(2)) {source = IntervalText();-{if ("" != null) return source;}+ {+ if ("" != null) return source;+ }} else {jj_consume_token(-1);throw new ParseException();}throw new Error("Missing return statement in function");-}+ }- final private IntervalFunction IntervalAtLeast() throws ParseException {IntervalFunction source;- ArrayList<IntervalFunction> sources = new ArrayList<IntervalFunction>();- Token minShouldMatch;+ private final IntervalFunction IntervalAtLeast() throws ParseException {+ IntervalFunction source;+ ArrayList<IntervalFunction> sources = new ArrayList<IntervalFunction>();+ Token minShouldMatch;jj_consume_token(FN_PREFIX);jj_consume_token(ATLEAST);jj_consume_token(LPAREN);@@ -447,242 +536,289 @@ if (minShouldMatch != null) {label_4:while (true) {source = IntervalFun();-sources.add(source);- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case FN_PREFIX:- case QUOTED:- case NUMBER:- case TERM:{- ;- break;- }- default:- jj_la1[11] = jj_gen;- break label_4;+ sources.add(source);+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case FN_PREFIX:+ case QUOTED:+ case NUMBER:+ case TERM:+ {+ ;+ break;+ }+ default:+ jj_la1[11] = jj_gen;+ break label_4;}}jj_consume_token(RPAREN);-{if ("" != null) return new AtLeast(parseInt(minShouldMatch), sources);}+ {+ if ("" != null) return new AtLeast(parseInt(minShouldMatch), sources);+ }throw new Error("Missing return statement in function");-}+ }- final private IntervalFunction IntervalMaxWidth() throws ParseException {IntervalFunction source;- Token maxWidth;+ private final IntervalFunction IntervalMaxWidth() throws ParseException {+ IntervalFunction source;+ Token maxWidth;jj_consume_token(FN_PREFIX);jj_consume_token(MAXWIDTH);jj_consume_token(LPAREN);maxWidth = jj_consume_token(NUMBER);source = IntervalFun();jj_consume_token(RPAREN);-{if ("" != null) return new MaxWidth(parseInt(maxWidth), source);}+ {+ if ("" != null) return new MaxWidth(parseInt(maxWidth), source);+ }throw new Error("Missing return statement in function");-}+ }- final private IntervalFunction IntervalMaxGaps() throws ParseException {IntervalFunction source;- Token maxGaps;+ private final IntervalFunction IntervalMaxGaps() throws ParseException {+ IntervalFunction source;+ Token maxGaps;jj_consume_token(FN_PREFIX);jj_consume_token(MAXGAPS);jj_consume_token(LPAREN);maxGaps = jj_consume_token(NUMBER);source = IntervalFun();jj_consume_token(RPAREN);-{if ("" != null) return new MaxGaps(parseInt(maxGaps), source);}+ {+ if ("" != null) return new MaxGaps(parseInt(maxGaps), source);+ }throw new Error("Missing return statement in function");-}+ }- final private IntervalFunction IntervalUnordered() throws ParseException {IntervalFunction source;- ArrayList<IntervalFunction> sources = new ArrayList<IntervalFunction>();+ private final IntervalFunction IntervalUnordered() throws ParseException {+ IntervalFunction source;+ ArrayList<IntervalFunction> sources = new ArrayList<IntervalFunction>();jj_consume_token(FN_PREFIX);jj_consume_token(UNORDERED);jj_consume_token(LPAREN);label_5:while (true) {source = IntervalFun();-sources.add(source);- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case FN_PREFIX:- case QUOTED:- case NUMBER:- case TERM:{- ;- break;- }- default:- jj_la1[12] = jj_gen;- break label_5;+ sources.add(source);+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case FN_PREFIX:+ case QUOTED:+ case NUMBER:+ case TERM:+ {+ ;+ break;+ }+ default:+ jj_la1[12] = jj_gen;+ break label_5;}}jj_consume_token(RPAREN);-{if ("" != null) return new Unordered(sources);}+ {+ if ("" != null) return new Unordered(sources);+ }throw new Error("Missing return statement in function");-}+ }- final private IntervalFunction IntervalUnorderedNoOverlaps() throws ParseException {IntervalFunction a, b;+ private final IntervalFunction IntervalUnorderedNoOverlaps() throws ParseException {+ IntervalFunction a, b;jj_consume_token(FN_PREFIX);jj_consume_token(UNORDERED_NO_OVERLAPS);jj_consume_token(LPAREN);a = IntervalFun();b = IntervalFun();jj_consume_token(RPAREN);-{if ("" != null) return new UnorderedNoOverlaps(a, b);}+ {+ if ("" != null) return new UnorderedNoOverlaps(a, b);+ }throw new Error("Missing return statement in function");-}+ }- final private IntervalFunction IntervalOrdered() throws ParseException {IntervalFunction source;- ArrayList<IntervalFunction> sources = new ArrayList<IntervalFunction>();+ private final IntervalFunction IntervalOrdered() throws ParseException {+ IntervalFunction source;+ ArrayList<IntervalFunction> sources = new ArrayList<IntervalFunction>();jj_consume_token(FN_PREFIX);jj_consume_token(ORDERED);jj_consume_token(LPAREN);label_6:while (true) {source = IntervalFun();-sources.add(source);- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case FN_PREFIX:- case QUOTED:- case NUMBER:- case TERM:{- ;- break;- }- default:- jj_la1[13] = jj_gen;- break label_6;+ sources.add(source);+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case FN_PREFIX:+ case QUOTED:+ case NUMBER:+ case TERM:+ {+ ;+ break;+ }+ default:+ jj_la1[13] = jj_gen;+ break label_6;}}jj_consume_token(RPAREN);-{if ("" != null) return new Ordered(sources);}+ {+ if ("" != null) return new Ordered(sources);+ }throw new Error("Missing return statement in function");-}+ }- final private IntervalFunction IntervalOr() throws ParseException {IntervalFunction source;- ArrayList<IntervalFunction> sources = new ArrayList<IntervalFunction>();+ private final IntervalFunction IntervalOr() throws ParseException {+ IntervalFunction source;+ ArrayList<IntervalFunction> sources = new ArrayList<IntervalFunction>();jj_consume_token(FN_PREFIX);jj_consume_token(FN_OR);jj_consume_token(LPAREN);label_7:while (true) {source = IntervalFun();-sources.add(source);- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case FN_PREFIX:- case QUOTED:- case NUMBER:- case TERM:{- ;- break;- }- default:- jj_la1[14] = jj_gen;- break label_7;+ sources.add(source);+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case FN_PREFIX:+ case QUOTED:+ case NUMBER:+ case TERM:+ {+ ;+ break;+ }+ default:+ jj_la1[14] = jj_gen;+ break label_7;}}jj_consume_token(RPAREN);-{if ("" != null) return new Or(sources);}+ {+ if ("" != null) return new Or(sources);+ }throw new Error("Missing return statement in function");-}+ }- final private IntervalFunction IntervalPhrase() throws ParseException {IntervalFunction source;- ArrayList<IntervalFunction> sources = new ArrayList<IntervalFunction>();+ private final IntervalFunction IntervalPhrase() throws ParseException {+ IntervalFunction source;+ ArrayList<IntervalFunction> sources = new ArrayList<IntervalFunction>();jj_consume_token(FN_PREFIX);jj_consume_token(PHRASE);jj_consume_token(LPAREN);label_8:while (true) {source = IntervalFun();-sources.add(source);- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case FN_PREFIX:- case QUOTED:- case NUMBER:- case TERM:{- ;- break;- }- default:- jj_la1[15] = jj_gen;- break label_8;+ sources.add(source);+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case FN_PREFIX:+ case QUOTED:+ case NUMBER:+ case TERM:+ {+ ;+ break;+ }+ default:+ jj_la1[15] = jj_gen;+ break label_8;}}jj_consume_token(RPAREN);-{if ("" != null) return new Phrase(sources);}+ {+ if ("" != null) return new Phrase(sources);+ }throw new Error("Missing return statement in function");-}+ }- final private IntervalFunction IntervalBefore() throws ParseException {IntervalFunction source;- IntervalFunction reference;+ private final IntervalFunction IntervalBefore() throws ParseException {+ IntervalFunction source;+ IntervalFunction reference;jj_consume_token(FN_PREFIX);jj_consume_token(BEFORE);jj_consume_token(LPAREN);source = IntervalFun();reference = IntervalFun();jj_consume_token(RPAREN);-{if ("" != null) return new Before(source, reference);}+ {+ if ("" != null) return new Before(source, reference);+ }throw new Error("Missing return statement in function");-}+ }- final private IntervalFunction IntervalAfter() throws ParseException {IntervalFunction source;- IntervalFunction reference;+ private final IntervalFunction IntervalAfter() throws ParseException {+ IntervalFunction source;+ IntervalFunction reference;jj_consume_token(FN_PREFIX);jj_consume_token(AFTER);jj_consume_token(LPAREN);source = IntervalFun();reference = IntervalFun();jj_consume_token(RPAREN);-{if ("" != null) return new After(source, reference);}+ {+ if ("" != null) return new After(source, reference);+ }throw new Error("Missing return statement in function");-}+ }- final private IntervalFunction IntervalContaining() throws ParseException {IntervalFunction big;- IntervalFunction small;+ private final IntervalFunction IntervalContaining() throws ParseException {+ IntervalFunction big;+ IntervalFunction small;jj_consume_token(FN_PREFIX);jj_consume_token(CONTAINING);jj_consume_token(LPAREN);big = IntervalFun();small = IntervalFun();jj_consume_token(RPAREN);-{if ("" != null) return new Containing(big, small);}+ {+ if ("" != null) return new Containing(big, small);+ }throw new Error("Missing return statement in function");-}+ }- final private IntervalFunction IntervalNotContaining() throws ParseException {IntervalFunction minuend;- IntervalFunction subtrahend;+ private final IntervalFunction IntervalNotContaining() throws ParseException {+ IntervalFunction minuend;+ IntervalFunction subtrahend;jj_consume_token(FN_PREFIX);jj_consume_token(NOT_CONTAINING);jj_consume_token(LPAREN);minuend = IntervalFun();subtrahend = IntervalFun();jj_consume_token(RPAREN);-{if ("" != null) return new NotContaining(minuend, subtrahend);}+ {+ if ("" != null) return new NotContaining(minuend, subtrahend);+ }throw new Error("Missing return statement in function");-}+ }- final private IntervalFunction IntervalContainedBy() throws ParseException {IntervalFunction big;- IntervalFunction small;+ private final IntervalFunction IntervalContainedBy() throws ParseException {+ IntervalFunction big;+ IntervalFunction small;jj_consume_token(FN_PREFIX);jj_consume_token(CONTAINED_BY);jj_consume_token(LPAREN);small = IntervalFun();big = IntervalFun();jj_consume_token(RPAREN);-{if ("" != null) return new ContainedBy(small, big);}+ {+ if ("" != null) return new ContainedBy(small, big);+ }throw new Error("Missing return statement in function");-}+ }- final private IntervalFunction IntervalNotContainedBy() throws ParseException {IntervalFunction big;- IntervalFunction small;+ private final IntervalFunction IntervalNotContainedBy() throws ParseException {+ IntervalFunction big;+ IntervalFunction small;jj_consume_token(FN_PREFIX);jj_consume_token(NOT_CONTAINED_BY);jj_consume_token(LPAREN);small = IntervalFun();big = IntervalFun();jj_consume_token(RPAREN);-{if ("" != null) return new NotContainedBy(small, big);}+ {+ if ("" != null) return new NotContainedBy(small, big);+ }throw new Error("Missing return statement in function");-}+ }- final private IntervalFunction IntervalWithin() throws ParseException {IntervalFunction source, reference;- Token positions;+ private final IntervalFunction IntervalWithin() throws ParseException {+ IntervalFunction source, reference;+ Token positions;jj_consume_token(FN_PREFIX);jj_consume_token(WITHIN);jj_consume_token(LPAREN);@@ -690,12 +826,15 @@ sources.add(source);positions = jj_consume_token(NUMBER);reference = IntervalFun();jj_consume_token(RPAREN);-{if ("" != null) return new Within(source, parseInt(positions), reference);}+ {+ if ("" != null) return new Within(source, parseInt(positions), reference);+ }throw new Error("Missing return statement in function");-}+ }- final private IntervalFunction IntervalExtend() throws ParseException {IntervalFunction source;- Token before, after;+ private final IntervalFunction IntervalExtend() throws ParseException {+ IntervalFunction source;+ Token before, after;jj_consume_token(FN_PREFIX);jj_consume_token(EXTEND);jj_consume_token(LPAREN);@@ -703,12 +842,15 @@ sources.add(source);before = jj_consume_token(NUMBER);after = jj_consume_token(NUMBER);jj_consume_token(RPAREN);-{if ("" != null) return new Extend(source, parseInt(before), parseInt(after));}+ {+ if ("" != null) return new Extend(source, parseInt(before), parseInt(after));+ }throw new Error("Missing return statement in function");-}+ }- final private IntervalFunction IntervalNotWithin() throws ParseException {IntervalFunction minuend, subtrahend;- Token positions;+ private final IntervalFunction IntervalNotWithin() throws ParseException {+ IntervalFunction minuend, subtrahend;+ Token positions;jj_consume_token(FN_PREFIX);jj_consume_token(NOT_WITHIN);jj_consume_token(LPAREN);@@ -716,116 +858,138 @@ sources.add(source);positions = jj_consume_token(NUMBER);subtrahend = IntervalFun();jj_consume_token(RPAREN);-{if ("" != null) return new NotWithin(minuend, parseInt(positions), subtrahend);}+ {+ if ("" != null) return new NotWithin(minuend, parseInt(positions), subtrahend);+ }throw new Error("Missing return statement in function");-}+ }- final private IntervalFunction IntervalOverlapping() throws ParseException {IntervalFunction source, reference;+ private final IntervalFunction IntervalOverlapping() throws ParseException {+ IntervalFunction source, reference;jj_consume_token(FN_PREFIX);jj_consume_token(OVERLAPPING);jj_consume_token(LPAREN);source = IntervalFun();reference = IntervalFun();jj_consume_token(RPAREN);-{if ("" != null) return new Overlapping(source, reference);}+ {+ if ("" != null) return new Overlapping(source, reference);+ }throw new Error("Missing return statement in function");-}+ }- final private IntervalFunction IntervalNonOverlapping() throws ParseException {IntervalFunction minuend, subtrahend;+ private final IntervalFunction IntervalNonOverlapping() throws ParseException {+ IntervalFunction minuend, subtrahend;jj_consume_token(FN_PREFIX);jj_consume_token(NON_OVERLAPPING);jj_consume_token(LPAREN);minuend = IntervalFun();subtrahend = IntervalFun();jj_consume_token(RPAREN);-{if ("" != null) return new NonOverlapping(minuend, subtrahend);}+ {+ if ("" != null) return new NonOverlapping(minuend, subtrahend);+ }throw new Error("Missing return statement in function");-}+ }- final private IntervalFunction IntervalWildcard() throws ParseException {String wildcard;- Token maxExpansions = null;+ private final IntervalFunction IntervalWildcard() throws ParseException {+ String wildcard;+ Token maxExpansions = null;jj_consume_token(FN_PREFIX);jj_consume_token(WILDCARD);jj_consume_token(LPAREN);- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case NUMBER:- case TERM:{- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case TERM:{- jj_consume_token(TERM);- break;+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case NUMBER:+ case TERM:+ {+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case TERM:+ {+ jj_consume_token(TERM);+ break;+ }+ case NUMBER:+ {+ jj_consume_token(NUMBER);+ break;+ }+ default:+ jj_la1[16] = jj_gen;+ jj_consume_token(-1);+ throw new ParseException();+ }+ wildcard = token.image;+ break;}- case NUMBER:{- jj_consume_token(NUMBER);- break;+ case QUOTED:+ {+ jj_consume_token(QUOTED);+ wildcard = token.image.substring(1, token.image.length() - 1);+ break;}default:- jj_la1[16] = jj_gen;+ jj_la1[17] = jj_gen;jj_consume_token(-1);throw new ParseException();- }-wildcard = token.image;- break;- }- case QUOTED:{- jj_consume_token(QUOTED);-wildcard = token.image.substring(1, token.image.length() - 1);- break;- }- default:- jj_la1[17] = jj_gen;- jj_consume_token(-1);- throw new ParseException();}- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case NUMBER:{- maxExpansions = jj_consume_token(NUMBER);- break;- }- default:- jj_la1[18] = jj_gen;- ;+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case NUMBER:+ {+ maxExpansions = jj_consume_token(NUMBER);+ break;+ }+ default:+ jj_la1[18] = jj_gen;+ ;}jj_consume_token(RPAREN);-{if ("" != null) return new Wildcard(wildcard, maxExpansions == null ? 0 : parseInt(maxExpansions));}+ {+ if ("" != null)+ return new Wildcard(wildcard, maxExpansions == null ? 0 : parseInt(maxExpansions));+ }throw new Error("Missing return statement in function");-}+ }- final private IntervalFunction IntervalFuzzyTerm() throws ParseException {String term;- Token maxEdits = null;- Token maxExpansions = null;+ private final IntervalFunction IntervalFuzzyTerm() throws ParseException {+ String term;+ Token maxEdits = null;+ Token maxExpansions = null;jj_consume_token(FN_PREFIX);jj_consume_token(FUZZYTERM);jj_consume_token(LPAREN);- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case NUMBER:- case TERM:{- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case TERM:{- jj_consume_token(TERM);- break;+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case NUMBER:+ case TERM:+ {+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case TERM:+ {+ jj_consume_token(TERM);+ break;+ }+ case NUMBER:+ {+ jj_consume_token(NUMBER);+ break;+ }+ default:+ jj_la1[19] = jj_gen;+ jj_consume_token(-1);+ throw new ParseException();+ }+ term = token.image;+ break;}- case NUMBER:{- jj_consume_token(NUMBER);- break;+ case QUOTED:+ {+ jj_consume_token(QUOTED);+ term = token.image.substring(1, token.image.length() - 1);+ break;}default:- jj_la1[19] = jj_gen;+ jj_la1[20] = jj_gen;jj_consume_token(-1);throw new ParseException();- }-term = token.image;- break;- }- case QUOTED:{- jj_consume_token(QUOTED);-term = token.image.substring(1, token.image.length() - 1);- break;- }- default:- jj_la1[20] = jj_gen;- jj_consume_token(-1);- throw new ParseException();}if (jj_2_26(2)) {maxEdits = jj_consume_token(NUMBER);@@ -838,120 +1002,158 @@ term = token.image.substring(1, token.image.length() - 1);;}jj_consume_token(RPAREN);-{if ("" != null) return new FuzzyTerm(term,- maxEdits == null ? null : parseInt(maxEdits),- maxExpansions == null ? null : parseInt(maxExpansions));}+ {+ if ("" != null)+ return new FuzzyTerm(+ term,+ maxEdits == null ? null : parseInt(maxEdits),+ maxExpansions == null ? null : parseInt(maxExpansions));+ }throw new Error("Missing return statement in function");-}+ }- final private IntervalFunction IntervalText() throws ParseException {- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case QUOTED:{- jj_consume_token(QUOTED);-{if ("" != null) return new AnalyzedText(token.image.substring(1, token.image.length() - 1));}- break;- }- case NUMBER:- case TERM:{- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case TERM:{- jj_consume_token(TERM);- break;+ private final IntervalFunction IntervalText() throws ParseException {+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case QUOTED:+ {+ jj_consume_token(QUOTED);+ {+ if ("" != null)+ return new AnalyzedText(token.image.substring(1, token.image.length() - 1));+ }+ break;}- case NUMBER:{- jj_consume_token(NUMBER);- break;+ case NUMBER:+ case TERM:+ {+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case TERM:+ {+ jj_consume_token(TERM);+ break;+ }+ case NUMBER:+ {+ jj_consume_token(NUMBER);+ break;+ }+ default:+ jj_la1[21] = jj_gen;+ jj_consume_token(-1);+ throw new ParseException();+ }+ {+ if ("" != null) return new AnalyzedText(token.image);+ }+ break;}default:- jj_la1[21] = jj_gen;+ jj_la1[22] = jj_gen;jj_consume_token(-1);throw new ParseException();- }-{if ("" != null) return new AnalyzedText(token.image);}- break;- }- default:- jj_la1[22] = jj_gen;- jj_consume_token(-1);- throw new ParseException();}throw new Error("Missing return statement in function");-}+ }- final private QueryNode Boost(QueryNode node) throws ParseException {Token boost;+ private final QueryNode Boost(QueryNode node) throws ParseException {+ Token boost;jj_consume_token(CARAT);boost = jj_consume_token(NUMBER);-{if ("" != null) return node == null ? node : new BoostQueryNode(node, parseFloat(boost));}+ {+ if ("" != null) return node == null ? node : new BoostQueryNode(node, parseFloat(boost));+ }throw new Error("Missing return statement in function");-}+ }- final private QueryNode FuzzyOp(CharSequence field, Token term, QueryNode node) throws ParseException {Token similarity = null;+ private final QueryNode FuzzyOp(CharSequence field, Token term, QueryNode node)+ throws ParseException {+ Token similarity = null;jj_consume_token(TILDE);if (jj_2_28(2)) {similarity = jj_consume_token(NUMBER);} else {;}-float fms = org.apache.lucene.search.FuzzyQuery.defaultMaxEdits;+ float fms = org.apache.lucene.search.FuzzyQuery.defaultMaxEdits;if (similarity != null) {fms = parseFloat(similarity);if (fms < 0.0f) {- {if (true) throw new ParseException(new MessageImpl(QueryParserMessages.INVALID_SYNTAX_FUZZY_LIMITS));}+ {+ if (true)+ throw new ParseException(+ new MessageImpl(QueryParserMessages.INVALID_SYNTAX_FUZZY_LIMITS));+ }} else if (fms >= 1.0f && fms != (int) fms) {- {if (true) throw new ParseException(new MessageImpl(QueryParserMessages.INVALID_SYNTAX_FUZZY_EDITS));}+ {+ if (true)+ throw new ParseException(+ new MessageImpl(QueryParserMessages.INVALID_SYNTAX_FUZZY_EDITS));+ }}}- {if ("" != null) return new FuzzyQueryNode(field, discardEscapeChar(term.image), fms, term.beginColumn, term.endColumn);}+ {+ if ("" != null)+ return new FuzzyQueryNode(+ field, discardEscapeChar(term.image), fms, term.beginColumn, term.endColumn);+ }throw new Error("Missing return statement in function");-}+ }- final private TermRangeQueryNode FieldRangeExpr(CharSequence field) throws ParseException {Token operator, term;- FieldQueryNode qLower, qUpper;- boolean lowerInclusive, upperInclusive;+ private final TermRangeQueryNode FieldRangeExpr(CharSequence field) throws ParseException {+ Token operator, term;+ FieldQueryNode qLower, qUpper;+ boolean lowerInclusive, upperInclusive;field = FieldName();- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case OP_LESSTHAN:{- jj_consume_token(OP_LESSTHAN);- break;- }- case OP_LESSTHANEQ:{- jj_consume_token(OP_LESSTHANEQ);- break;- }- case OP_MORETHAN:{- jj_consume_token(OP_MORETHAN);- break;- }- case OP_MORETHANEQ:{- jj_consume_token(OP_MORETHANEQ);- break;- }- default:- jj_la1[23] = jj_gen;- jj_consume_token(-1);- throw new ParseException();+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case OP_LESSTHAN:+ {+ jj_consume_token(OP_LESSTHAN);+ break;+ }+ case OP_LESSTHANEQ:+ {+ jj_consume_token(OP_LESSTHANEQ);+ break;+ }+ case OP_MORETHAN:+ {+ jj_consume_token(OP_MORETHAN);+ break;+ }+ case OP_MORETHANEQ:+ {+ jj_consume_token(OP_MORETHANEQ);+ break;+ }+ default:+ jj_la1[23] = jj_gen;+ jj_consume_token(-1);+ throw new ParseException();}-operator = token;- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case TERM:{- jj_consume_token(TERM);- break;- }- case QUOTED:{- jj_consume_token(QUOTED);- break;- }- case NUMBER:{- jj_consume_token(NUMBER);- break;- }- default:- jj_la1[24] = jj_gen;- jj_consume_token(-1);- throw new ParseException();+ operator = token;+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case TERM:+ {+ jj_consume_token(TERM);+ break;+ }+ case QUOTED:+ {+ jj_consume_token(QUOTED);+ break;+ }+ case NUMBER:+ {+ jj_consume_token(NUMBER);+ break;+ }+ default:+ jj_la1[24] = jj_gen;+ jj_consume_token(-1);+ throw new ParseException();}-term = token;-if (term.kind == QUOTED) {+ term = token;+ if (term.kind == QUOTED) {term.image = term.image.substring(1, term.image.length() - 1);}switch (operator.kind) {@@ -959,490 +1161,639 @@ if (term.kind == QUOTED) {lowerInclusive = true;upperInclusive = false;qLower = new FieldQueryNode(field, "*", term.beginColumn, term.endColumn);- qUpper = new FieldQueryNode(field, discardEscapeChar(term.image), term.beginColumn, term.endColumn);+ qUpper =+ new FieldQueryNode(+ field, discardEscapeChar(term.image), term.beginColumn, term.endColumn);break;case OP_LESSTHANEQ:lowerInclusive = true;upperInclusive = true;qLower = new FieldQueryNode(field, "*", term.beginColumn, term.endColumn);- qUpper = new FieldQueryNode(field, discardEscapeChar(term.image), term.beginColumn, term.endColumn);+ qUpper =+ new FieldQueryNode(+ field, discardEscapeChar(term.image), term.beginColumn, term.endColumn);break;case OP_MORETHAN:lowerInclusive = false;upperInclusive = true;- qLower = new FieldQueryNode(field, discardEscapeChar(term.image), term.beginColumn, term.endColumn);+ qLower =+ new FieldQueryNode(+ field, discardEscapeChar(term.image), term.beginColumn, term.endColumn);qUpper = new FieldQueryNode(field, "*", term.beginColumn, term.endColumn);break;case OP_MORETHANEQ:lowerInclusive = true;upperInclusive = true;- qLower = new FieldQueryNode(field, discardEscapeChar(term.image), term.beginColumn, term.endColumn);+ qLower =+ new FieldQueryNode(+ field, discardEscapeChar(term.image), term.beginColumn, term.endColumn);qUpper = new FieldQueryNode(field, "*", term.beginColumn, term.endColumn);break;default:- {if (true) throw new Error("Unhandled case, operator=" + operator);}+ {+ if (true) throw new Error("Unhandled case, operator=" + operator);+ }+ }+ {+ if ("" != null) return new TermRangeQueryNode(qLower, qUpper, lowerInclusive, upperInclusive);}- {if ("" != null) return new TermRangeQueryNode(qLower, qUpper, lowerInclusive, upperInclusive);}throw new Error("Missing return statement in function");-}+ }- final private QueryNode Term(CharSequence field) throws ParseException {QueryNode q;- Token term, fuzzySlop=null;- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case REGEXPTERM:{- term = jj_consume_token(REGEXPTERM);-String v = term.image.substring(1, term.image.length() - 1);+ private final QueryNode Term(CharSequence field) throws ParseException {+ QueryNode q;+ Token term, fuzzySlop = null;+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case REGEXPTERM:+ {+ term = jj_consume_token(REGEXPTERM);+ String v = term.image.substring(1, term.image.length() - 1);q = new RegexpQueryNode(field, v, 0, v.length());- break;- }- case NUMBER:- case TERM:{- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case TERM:{- term = jj_consume_token(TERM);- break;+ break;}- case NUMBER:{- term = jj_consume_token(NUMBER);- break;+ case NUMBER:+ case TERM:+ {+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case TERM:+ {+ term = jj_consume_token(TERM);+ break;+ }+ case NUMBER:+ {+ term = jj_consume_token(NUMBER);+ break;+ }+ default:+ jj_la1[25] = jj_gen;+ jj_consume_token(-1);+ throw new ParseException();+ }+ q =+ new FieldQueryNode(+ field, discardEscapeChar(term.image), term.beginColumn, term.endColumn);+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case TILDE:+ {+ q = FuzzyOp(field, term, q);+ break;+ }+ default:+ jj_la1[26] = jj_gen;+ ;+ }+ break;+ }+ case RANGEIN_START:+ case RANGEEX_START:+ {+ q = TermRangeExpr(field);+ break;+ }+ case QUOTED:+ {+ q = QuotedTerm(field);+ break;}default:- jj_la1[25] = jj_gen;+ jj_la1[27] = jj_gen;jj_consume_token(-1);throw new ParseException();- }-q = new FieldQueryNode(field, discardEscapeChar(term.image), term.beginColumn, term.endColumn);- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case TILDE:{- q = FuzzyOp(field, term, q);- break;+ }+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case CARAT:+ {+ q = Boost(q);+ break;}default:- jj_la1[26] = jj_gen;+ jj_la1[28] = jj_gen;;- }- break;- }- case RANGEIN_START:- case RANGEEX_START:{- q = TermRangeExpr(field);- break;- }- case QUOTED:{- q = QuotedTerm(field);- break;- }- default:- jj_la1[27] = jj_gen;- jj_consume_token(-1);- throw new ParseException();}- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case CARAT:{- q = Boost(q);- break;- }- default:- jj_la1[28] = jj_gen;- ;+ {+ if ("" != null) return q;}-{if ("" != null) return q;}throw new Error("Missing return statement in function");-}+ }- final private QueryNode QuotedTerm(CharSequence field) throws ParseException {QueryNode q;- Token term, slop;+ private final QueryNode QuotedTerm(CharSequence field) throws ParseException {+ QueryNode q;+ Token term, slop;term = jj_consume_token(QUOTED);-String image = term.image.substring(1, term.image.length() - 1);- q = new QuotedFieldQueryNode(field, discardEscapeChar(image), term.beginColumn + 1, term.endColumn - 1);- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case TILDE:{- jj_consume_token(TILDE);- slop = jj_consume_token(NUMBER);-q = new SlopQueryNode(q, parseInt(slop));- break;- }- default:- jj_la1[29] = jj_gen;- ;+ String image = term.image.substring(1, term.image.length() - 1);+ q =+ new QuotedFieldQueryNode(+ field, discardEscapeChar(image), term.beginColumn + 1, term.endColumn - 1);+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case TILDE:+ {+ jj_consume_token(TILDE);+ slop = jj_consume_token(NUMBER);+ q = new SlopQueryNode(q, parseInt(slop));+ break;+ }+ default:+ jj_la1[29] = jj_gen;+ ;+ }+ {+ if ("" != null) return q;}-{if ("" != null) return q;}throw new Error("Missing return statement in function");-}+ }- final private TermRangeQueryNode TermRangeExpr(CharSequence field) throws ParseException {Token left, right;- boolean leftInclusive = false;- boolean rightInclusive = false;- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case RANGEIN_START:{- jj_consume_token(RANGEIN_START);-leftInclusive = true;- break;- }- case RANGEEX_START:{- jj_consume_token(RANGEEX_START);- break;- }- default:- jj_la1[30] = jj_gen;- jj_consume_token(-1);- throw new ParseException();+ private final TermRangeQueryNode TermRangeExpr(CharSequence field) throws ParseException {+ Token left, right;+ boolean leftInclusive = false;+ boolean rightInclusive = false;+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case RANGEIN_START:+ {+ jj_consume_token(RANGEIN_START);+ leftInclusive = true;+ break;+ }+ case RANGEEX_START:+ {+ jj_consume_token(RANGEEX_START);+ break;+ }+ default:+ jj_la1[30] = jj_gen;+ jj_consume_token(-1);+ throw new ParseException();}- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case RANGE_GOOP:{- jj_consume_token(RANGE_GOOP);- break;- }- case RANGE_QUOTED:{- jj_consume_token(RANGE_QUOTED);- break;- }- case RANGE_TO:{- jj_consume_token(RANGE_TO);- break;- }- default:- jj_la1[31] = jj_gen;- jj_consume_token(-1);- throw new ParseException();+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case RANGE_GOOP:+ {+ jj_consume_token(RANGE_GOOP);+ break;+ }+ case RANGE_QUOTED:+ {+ jj_consume_token(RANGE_QUOTED);+ break;+ }+ case RANGE_TO:+ {+ jj_consume_token(RANGE_TO);+ break;+ }+ default:+ jj_la1[31] = jj_gen;+ jj_consume_token(-1);+ throw new ParseException();}-left = token;+ left = token;jj_consume_token(RANGE_TO);- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case RANGE_GOOP:{- jj_consume_token(RANGE_GOOP);- break;- }- case RANGE_QUOTED:{- jj_consume_token(RANGE_QUOTED);- break;- }- case RANGE_TO:{- jj_consume_token(RANGE_TO);- break;- }- default:- jj_la1[32] = jj_gen;- jj_consume_token(-1);- throw new ParseException();+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case RANGE_GOOP:+ {+ jj_consume_token(RANGE_GOOP);+ break;+ }+ case RANGE_QUOTED:+ {+ jj_consume_token(RANGE_QUOTED);+ break;+ }+ case RANGE_TO:+ {+ jj_consume_token(RANGE_TO);+ break;+ }+ default:+ jj_la1[32] = jj_gen;+ jj_consume_token(-1);+ throw new ParseException();}-right = token;- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case RANGEIN_END:{- jj_consume_token(RANGEIN_END);-rightInclusive = true;- break;- }- case RANGEEX_END:{- jj_consume_token(RANGEEX_END);- break;- }- default:- jj_la1[33] = jj_gen;- jj_consume_token(-1);- throw new ParseException();+ right = token;+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case RANGEIN_END:+ {+ jj_consume_token(RANGEIN_END);+ rightInclusive = true;+ break;+ }+ case RANGEEX_END:+ {+ jj_consume_token(RANGEEX_END);+ break;+ }+ default:+ jj_la1[33] = jj_gen;+ jj_consume_token(-1);+ throw new ParseException();}-if (left.kind == RANGE_QUOTED) {+ if (left.kind == RANGE_QUOTED) {left.image = left.image.substring(1, left.image.length() - 1);}if (right.kind == RANGE_QUOTED) {right.image = right.image.substring(1, right.image.length() - 1);}- FieldQueryNode qLower = new FieldQueryNode(field,- discardEscapeChar(left.image), left.beginColumn, left.endColumn);- FieldQueryNode qUpper = new FieldQueryNode(field,- discardEscapeChar(right.image), right.beginColumn, right.endColumn);+ FieldQueryNode qLower =+ new FieldQueryNode(field, discardEscapeChar(left.image), left.beginColumn, left.endColumn);+ FieldQueryNode qUpper =+ new FieldQueryNode(+ field, discardEscapeChar(right.image), right.beginColumn, right.endColumn);- {if ("" != null) return new TermRangeQueryNode(qLower, qUpper, leftInclusive, rightInclusive);}+ {+ if ("" != null) return new TermRangeQueryNode(qLower, qUpper, leftInclusive, rightInclusive);+ }throw new Error("Missing return statement in function");-}+ }- private boolean jj_2_1(int xla)- {- jj_la = xla; jj_lastpos = jj_scanpos = token;- try { return (!jj_3_1()); }- catch(LookaheadSuccess ls) { return true; }- finally { jj_save(0, xla); }+ private boolean jj_2_1(int xla) {+ jj_la = xla;+ jj_lastpos = jj_scanpos = token;+ try {+ return (!jj_3_1());+ } catch (LookaheadSuccess ls) {+ return true;+ } finally {+ jj_save(0, xla);+ }}- private boolean jj_2_2(int xla)- {- jj_la = xla; jj_lastpos = jj_scanpos = token;- try { return (!jj_3_2()); }- catch(LookaheadSuccess ls) { return true; }- finally { jj_save(1, xla); }+ private boolean jj_2_2(int xla) {+ jj_la = xla;+ jj_lastpos = jj_scanpos = token;+ try {+ return (!jj_3_2());+ } catch (LookaheadSuccess ls) {+ return true;+ } finally {+ jj_save(1, xla);+ }}- private boolean jj_2_3(int xla)- {- jj_la = xla; jj_lastpos = jj_scanpos = token;- try { return (!jj_3_3()); }- catch(LookaheadSuccess ls) { return true; }- finally { jj_save(2, xla); }+ private boolean jj_2_3(int xla) {+ jj_la = xla;+ jj_lastpos = jj_scanpos = token;+ try {+ return (!jj_3_3());+ } catch (LookaheadSuccess ls) {+ return true;+ } finally {+ jj_save(2, xla);+ }}- private boolean jj_2_4(int xla)- {- jj_la = xla; jj_lastpos = jj_scanpos = token;- try { return (!jj_3_4()); }- catch(LookaheadSuccess ls) { return true; }- finally { jj_save(3, xla); }+ private boolean jj_2_4(int xla) {+ jj_la = xla;+ jj_lastpos = jj_scanpos = token;+ try {+ return (!jj_3_4());+ } catch (LookaheadSuccess ls) {+ return true;+ } finally {+ jj_save(3, xla);+ }}- private boolean jj_2_5(int xla)- {- jj_la = xla; jj_lastpos = jj_scanpos = token;- try { return (!jj_3_5()); }- catch(LookaheadSuccess ls) { return true; }- finally { jj_save(4, xla); }+ private boolean jj_2_5(int xla) {+ jj_la = xla;+ jj_lastpos = jj_scanpos = token;+ try {+ return (!jj_3_5());+ } catch (LookaheadSuccess ls) {+ return true;+ } finally {+ jj_save(4, xla);+ }}- private boolean jj_2_6(int xla)- {- jj_la = xla; jj_lastpos = jj_scanpos = token;- try { return (!jj_3_6()); }- catch(LookaheadSuccess ls) { return true; }- finally { jj_save(5, xla); }+ private boolean jj_2_6(int xla) {+ jj_la = xla;+ jj_lastpos = jj_scanpos = token;+ try {+ return (!jj_3_6());+ } catch (LookaheadSuccess ls) {+ return true;+ } finally {+ jj_save(5, xla);+ }}- private boolean jj_2_7(int xla)- {- jj_la = xla; jj_lastpos = jj_scanpos = token;- try { return (!jj_3_7()); }- catch(LookaheadSuccess ls) { return true; }- finally { jj_save(6, xla); }+ private boolean jj_2_7(int xla) {+ jj_la = xla;+ jj_lastpos = jj_scanpos = token;+ try {+ return (!jj_3_7());+ } catch (LookaheadSuccess ls) {+ return true;+ } finally {+ jj_save(6, xla);+ }}- private boolean jj_2_8(int xla)- {- jj_la = xla; jj_lastpos = jj_scanpos = token;- try { return (!jj_3_8()); }- catch(LookaheadSuccess ls) { return true; }- finally { jj_save(7, xla); }+ private boolean jj_2_8(int xla) {+ jj_la = xla;+ jj_lastpos = jj_scanpos = token;+ try {+ return (!jj_3_8());+ } catch (LookaheadSuccess ls) {+ return true;+ } finally {+ jj_save(7, xla);+ }}- private boolean jj_2_9(int xla)- {- jj_la = xla; jj_lastpos = jj_scanpos = token;- try { return (!jj_3_9()); }- catch(LookaheadSuccess ls) { return true; }- finally { jj_save(8, xla); }+ private boolean jj_2_9(int xla) {+ jj_la = xla;+ jj_lastpos = jj_scanpos = token;+ try {+ return (!jj_3_9());+ } catch (LookaheadSuccess ls) {+ return true;+ } finally {+ jj_save(8, xla);+ }}- private boolean jj_2_10(int xla)- {- jj_la = xla; jj_lastpos = jj_scanpos = token;- try { return (!jj_3_10()); }- catch(LookaheadSuccess ls) { return true; }- finally { jj_save(9, xla); }+ private boolean jj_2_10(int xla) {+ jj_la = xla;+ jj_lastpos = jj_scanpos = token;+ try {+ return (!jj_3_10());+ } catch (LookaheadSuccess ls) {+ return true;+ } finally {+ jj_save(9, xla);+ }}- private boolean jj_2_11(int xla)- {- jj_la = xla; jj_lastpos = jj_scanpos = token;- try { return (!jj_3_11()); }- catch(LookaheadSuccess ls) { return true; }- finally { jj_save(10, xla); }+ private boolean jj_2_11(int xla) {+ jj_la = xla;+ jj_lastpos = jj_scanpos = token;+ try {+ return (!jj_3_11());+ } catch (LookaheadSuccess ls) {+ return true;+ } finally {+ jj_save(10, xla);+ }}- private boolean jj_2_12(int xla)- {- jj_la = xla; jj_lastpos = jj_scanpos = token;- try { return (!jj_3_12()); }- catch(LookaheadSuccess ls) { return true; }- finally { jj_save(11, xla); }+ private boolean jj_2_12(int xla) {+ jj_la = xla;+ jj_lastpos = jj_scanpos = token;+ try {+ return (!jj_3_12());+ } catch (LookaheadSuccess ls) {+ return true;+ } finally {+ jj_save(11, xla);+ }}- private boolean jj_2_13(int xla)- {- jj_la = xla; jj_lastpos = jj_scanpos = token;- try { return (!jj_3_13()); }- catch(LookaheadSuccess ls) { return true; }- finally { jj_save(12, xla); }+ private boolean jj_2_13(int xla) {+ jj_la = xla;+ jj_lastpos = jj_scanpos = token;+ try {+ return (!jj_3_13());+ } catch (LookaheadSuccess ls) {+ return true;+ } finally {+ jj_save(12, xla);+ }}- private boolean jj_2_14(int xla)- {- jj_la = xla; jj_lastpos = jj_scanpos = token;- try { return (!jj_3_14()); }- catch(LookaheadSuccess ls) { return true; }- finally { jj_save(13, xla); }+ private boolean jj_2_14(int xla) {+ jj_la = xla;+ jj_lastpos = jj_scanpos = token;+ try {+ return (!jj_3_14());+ } catch (LookaheadSuccess ls) {+ return true;+ } finally {+ jj_save(13, xla);+ }}- private boolean jj_2_15(int xla)- {- jj_la = xla; jj_lastpos = jj_scanpos = token;- try { return (!jj_3_15()); }- catch(LookaheadSuccess ls) { return true; }- finally { jj_save(14, xla); }+ private boolean jj_2_15(int xla) {+ jj_la = xla;+ jj_lastpos = jj_scanpos = token;+ try {+ return (!jj_3_15());+ } catch (LookaheadSuccess ls) {+ return true;+ } finally {+ jj_save(14, xla);+ }}- private boolean jj_2_16(int xla)- {- jj_la = xla; jj_lastpos = jj_scanpos = token;- try { return (!jj_3_16()); }- catch(LookaheadSuccess ls) { return true; }- finally { jj_save(15, xla); }+ private boolean jj_2_16(int xla) {+ jj_la = xla;+ jj_lastpos = jj_scanpos = token;+ try {+ return (!jj_3_16());+ } catch (LookaheadSuccess ls) {+ return true;+ } finally {+ jj_save(15, xla);+ }}- private boolean jj_2_17(int xla)- {- jj_la = xla; jj_lastpos = jj_scanpos = token;- try { return (!jj_3_17()); }- catch(LookaheadSuccess ls) { return true; }- finally { jj_save(16, xla); }+ private boolean jj_2_17(int xla) {+ jj_la = xla;+ jj_lastpos = jj_scanpos = token;+ try {+ return (!jj_3_17());+ } catch (LookaheadSuccess ls) {+ return true;+ } finally {+ jj_save(16, xla);+ }}- private boolean jj_2_18(int xla)- {- jj_la = xla; jj_lastpos = jj_scanpos = token;- try { return (!jj_3_18()); }- catch(LookaheadSuccess ls) { return true; }- finally { jj_save(17, xla); }+ private boolean jj_2_18(int xla) {+ jj_la = xla;+ jj_lastpos = jj_scanpos = token;+ try {+ return (!jj_3_18());+ } catch (LookaheadSuccess ls) {+ return true;+ } finally {+ jj_save(17, xla);+ }}- private boolean jj_2_19(int xla)- {- jj_la = xla; jj_lastpos = jj_scanpos = token;- try { return (!jj_3_19()); }- catch(LookaheadSuccess ls) { return true; }- finally { jj_save(18, xla); }+ private boolean jj_2_19(int xla) {+ jj_la = xla;+ jj_lastpos = jj_scanpos = token;+ try {+ return (!jj_3_19());+ } catch (LookaheadSuccess ls) {+ return true;+ } finally {+ jj_save(18, xla);+ }}- private boolean jj_2_20(int xla)- {- jj_la = xla; jj_lastpos = jj_scanpos = token;- try { return (!jj_3_20()); }- catch(LookaheadSuccess ls) { return true; }- finally { jj_save(19, xla); }+ private boolean jj_2_20(int xla) {+ jj_la = xla;+ jj_lastpos = jj_scanpos = token;+ try {+ return (!jj_3_20());+ } catch (LookaheadSuccess ls) {+ return true;+ } finally {+ jj_save(19, xla);+ }}- private boolean jj_2_21(int xla)- {- jj_la = xla; jj_lastpos = jj_scanpos = token;- try { return (!jj_3_21()); }- catch(LookaheadSuccess ls) { return true; }- finally { jj_save(20, xla); }+ private boolean jj_2_21(int xla) {+ jj_la = xla;+ jj_lastpos = jj_scanpos = token;+ try {+ return (!jj_3_21());+ } catch (LookaheadSuccess ls) {+ return true;+ } finally {+ jj_save(20, xla);+ }}- private boolean jj_2_22(int xla)- {- jj_la = xla; jj_lastpos = jj_scanpos = token;- try { return (!jj_3_22()); }- catch(LookaheadSuccess ls) { return true; }- finally { jj_save(21, xla); }+ private boolean jj_2_22(int xla) {+ jj_la = xla;+ jj_lastpos = jj_scanpos = token;+ try {+ return (!jj_3_22());+ } catch (LookaheadSuccess ls) {+ return true;+ } finally {+ jj_save(21, xla);+ }}- private boolean jj_2_23(int xla)- {- jj_la = xla; jj_lastpos = jj_scanpos = token;- try { return (!jj_3_23()); }- catch(LookaheadSuccess ls) { return true; }- finally { jj_save(22, xla); }+ private boolean jj_2_23(int xla) {+ jj_la = xla;+ jj_lastpos = jj_scanpos = token;+ try {+ return (!jj_3_23());+ } catch (LookaheadSuccess ls) {+ return true;+ } finally {+ jj_save(22, xla);+ }}- private boolean jj_2_24(int xla)- {- jj_la = xla; jj_lastpos = jj_scanpos = token;- try { return (!jj_3_24()); }- catch(LookaheadSuccess ls) { return true; }- finally { jj_save(23, xla); }+ private boolean jj_2_24(int xla) {+ jj_la = xla;+ jj_lastpos = jj_scanpos = token;+ try {+ return (!jj_3_24());+ } catch (LookaheadSuccess ls) {+ return true;+ } finally {+ jj_save(23, xla);+ }}- private boolean jj_2_25(int xla)- {- jj_la = xla; jj_lastpos = jj_scanpos = token;- try { return (!jj_3_25()); }- catch(LookaheadSuccess ls) { return true; }- finally { jj_save(24, xla); }+ private boolean jj_2_25(int xla) {+ jj_la = xla;+ jj_lastpos = jj_scanpos = token;+ try {+ return (!jj_3_25());+ } catch (LookaheadSuccess ls) {+ return true;+ } finally {+ jj_save(24, xla);+ }}- private boolean jj_2_26(int xla)- {- jj_la = xla; jj_lastpos = jj_scanpos = token;- try { return (!jj_3_26()); }- catch(LookaheadSuccess ls) { return true; }- finally { jj_save(25, xla); }+ private boolean jj_2_26(int xla) {+ jj_la = xla;+ jj_lastpos = jj_scanpos = token;+ try {+ return (!jj_3_26());+ } catch (LookaheadSuccess ls) {+ return true;+ } finally {+ jj_save(25, xla);+ }}- private boolean jj_2_27(int xla)- {- jj_la = xla; jj_lastpos = jj_scanpos = token;- try { return (!jj_3_27()); }- catch(LookaheadSuccess ls) { return true; }- finally { jj_save(26, xla); }+ private boolean jj_2_27(int xla) {+ jj_la = xla;+ jj_lastpos = jj_scanpos = token;+ try {+ return (!jj_3_27());+ } catch (LookaheadSuccess ls) {+ return true;+ } finally {+ jj_save(26, xla);+ }}- private boolean jj_2_28(int xla)- {- jj_la = xla; jj_lastpos = jj_scanpos = token;- try { return (!jj_3_28()); }- catch(LookaheadSuccess ls) { return true; }- finally { jj_save(27, xla); }+ private boolean jj_2_28(int xla) {+ jj_la = xla;+ jj_lastpos = jj_scanpos = token;+ try {+ return (!jj_3_28());+ } catch (LookaheadSuccess ls) {+ return true;+ } finally {+ jj_save(27, xla);+ }}- private boolean jj_3R_IntervalUnorderedNoOverlaps_464_3_17()- {+ private boolean jj_3R_IntervalUnorderedNoOverlaps_464_3_17() {if (jj_scan_token(FN_PREFIX)) return true;if (jj_scan_token(UNORDERED_NO_OVERLAPS)) return true;return false;}- private boolean jj_3R_IntervalContainedBy_556_3_25()- {+ private boolean jj_3R_IntervalContainedBy_556_3_25() {if (jj_scan_token(FN_PREFIX)) return true;if (jj_scan_token(CONTAINED_BY)) return true;return false;}- private boolean jj_3R_FieldRangeExpr_743_3_11()- {+ private boolean jj_3R_FieldRangeExpr_743_3_11() {if (jj_3R_FieldName_343_3_9()) return true;Token xsp;xsp = jj_scanpos;if (jj_scan_token(17)) {- jj_scanpos = xsp;- if (jj_scan_token(18)) {- jj_scanpos = xsp;- if (jj_scan_token(19)) {- jj_scanpos = xsp;- if (jj_scan_token(20)) return true;- }- }+ jj_scanpos = xsp;+ if (jj_scan_token(18)) {+ jj_scanpos = xsp;+ if (jj_scan_token(19)) {+ jj_scanpos = xsp;+ if (jj_scan_token(20)) return true;+ }+ }}return false;}- private boolean jj_3R_IntervalWildcard_646_3_19()- {+ private boolean jj_3R_IntervalWildcard_646_3_19() {if (jj_scan_token(FN_PREFIX)) return true;if (jj_scan_token(WILDCARD)) return true;return false;}- private boolean jj_3R_QuotedTerm_833_5_47()- {+ private boolean jj_3R_QuotedTerm_833_5_47() {if (jj_scan_token(TILDE)) return true;return false;}- private boolean jj_3R_IntervalUnordered_453_3_16()- {+ private boolean jj_3R_IntervalUnordered_453_3_16() {if (jj_scan_token(FN_PREFIX)) return true;if (jj_scan_token(UNORDERED)) return true;return false;}- private boolean jj_3R_IntervalNotContaining_545_3_24()- {+ private boolean jj_3R_IntervalNotContaining_545_3_24() {if (jj_scan_token(FN_PREFIX)) return true;if (jj_scan_token(NOT_CONTAINING)) return true;return false;}- private boolean jj_3R_QuotedTerm_828_3_43()- {+ private boolean jj_3R_QuotedTerm_828_3_43() {if (jj_scan_token(QUOTED)) return true;Token xsp;xsp = jj_scanpos;@@ -1450,420 +1801,361 @@ if (left.kind == RANGE_QUOTED) {return false;}- private boolean jj_3R_IntervalNonOverlapping_635_3_30()- {+ private boolean jj_3R_IntervalNonOverlapping_635_3_30() {if (jj_scan_token(FN_PREFIX)) return true;if (jj_scan_token(NON_OVERLAPPING)) return true;return false;}- private boolean jj_3R_IntervalMaxGaps_441_3_14()- {+ private boolean jj_3R_IntervalMaxGaps_441_3_14() {if (jj_scan_token(FN_PREFIX)) return true;if (jj_scan_token(MAXGAPS)) return true;return false;}- private boolean jj_3_28()- {+ private boolean jj_3_28() {if (jj_scan_token(NUMBER)) return true;return false;}- private boolean jj_3R_IntervalContaining_534_3_23()- {+ private boolean jj_3R_IntervalContaining_534_3_23() {if (jj_scan_token(FN_PREFIX)) return true;if (jj_scan_token(CONTAINING)) return true;return false;}- private boolean jj_3R_FieldName_343_3_9()- {+ private boolean jj_3R_FieldName_343_3_9() {if (jj_scan_token(TERM)) return true;return false;}- private boolean jj_3R_IntervalOverlapping_625_3_29()- {+ private boolean jj_3R_IntervalOverlapping_625_3_29() {if (jj_scan_token(FN_PREFIX)) return true;if (jj_scan_token(OVERLAPPING)) return true;return false;}- private boolean jj_3R_Term_805_10_41()- {+ private boolean jj_3R_Term_805_10_41() {if (jj_3R_FuzzyOp_716_3_45()) return true;return false;}- private boolean jj_3R_Term_807_8_37()- {+ private boolean jj_3R_Term_807_8_37() {if (jj_3R_QuotedTerm_828_3_43()) return true;return false;}- private boolean jj_3R_FuzzyOp_716_3_45()- {+ private boolean jj_3R_FuzzyOp_716_3_45() {if (jj_scan_token(TILDE)) return true;return false;}- private boolean jj_3R_Term_809_5_38()- {+ private boolean jj_3R_Term_809_5_38() {if (jj_3R_Boost_699_3_44()) return true;return false;}- private boolean jj_3R_Term_806_8_36()- {+ private boolean jj_3R_Term_806_8_36() {if (jj_3R_TermRangeExpr_854_3_42()) return true;return false;}- private boolean jj_3_2()- {+ private boolean jj_3_2() {if (jj_3R_Term_797_3_10()) return true;return false;}- private boolean jj_3R_IntervalMaxWidth_429_3_13()- {+ private boolean jj_3R_IntervalMaxWidth_429_3_13() {if (jj_scan_token(FN_PREFIX)) return true;if (jj_scan_token(MAXWIDTH)) return true;return false;}- private boolean jj_3R_Term_803_8_35()- {+ private boolean jj_3R_Term_803_8_35() {Token xsp;xsp = jj_scanpos;if (jj_scan_token(25)) {- jj_scanpos = xsp;- if (jj_scan_token(24)) return true;+ jj_scanpos = xsp;+ if (jj_scan_token(24)) return true;}xsp = jj_scanpos;if (jj_3R_Term_805_10_41()) jj_scanpos = xsp;return false;}- private boolean jj_3R_IntervalAfter_523_3_20()- {+ private boolean jj_3R_IntervalAfter_523_3_20() {if (jj_scan_token(FN_PREFIX)) return true;if (jj_scan_token(AFTER)) return true;return false;}- private boolean jj_3_1()- {+ private boolean jj_3_1() {if (jj_3R_FieldName_343_3_9()) return true;Token xsp;xsp = jj_scanpos;if (jj_scan_token(15)) {- jj_scanpos = xsp;- if (jj_scan_token(16)) return true;+ jj_scanpos = xsp;+ if (jj_scan_token(16)) return true;}return false;}- private boolean jj_3_3()- {+ private boolean jj_3_3() {if (jj_3R_FieldRangeExpr_743_3_11()) return true;return false;}- private boolean jj_3R_Term_798_8_34()- {+ private boolean jj_3R_Term_798_8_34() {if (jj_scan_token(REGEXPTERM)) return true;return false;}- private boolean jj_3R_IntervalNotWithin_610_3_28()- {+ private boolean jj_3R_IntervalNotWithin_610_3_28() {if (jj_scan_token(FN_PREFIX)) return true;if (jj_scan_token(NOT_WITHIN)) return true;return false;}- private boolean jj_3R_IntervalBefore_512_3_21()- {+ private boolean jj_3R_IntervalBefore_512_3_21() {if (jj_scan_token(FN_PREFIX)) return true;if (jj_scan_token(BEFORE)) return true;return false;}- private boolean jj_3R_Term_797_3_10()- {+ private boolean jj_3R_Term_797_3_10() {Token xsp;xsp = jj_scanpos;if (jj_3R_Term_798_8_34()) {- jj_scanpos = xsp;- if (jj_3R_Term_803_8_35()) {- jj_scanpos = xsp;- if (jj_3R_Term_806_8_36()) {- jj_scanpos = xsp;- if (jj_3R_Term_807_8_37()) return true;- }- }+ jj_scanpos = xsp;+ if (jj_3R_Term_803_8_35()) {+ jj_scanpos = xsp;+ if (jj_3R_Term_806_8_36()) {+ jj_scanpos = xsp;+ if (jj_3R_Term_807_8_37()) return true;+ }+ }}xsp = jj_scanpos;if (jj_3R_Term_809_5_38()) jj_scanpos = xsp;return false;}- private boolean jj_3R_IntervalAtLeast_417_3_12()- {+ private boolean jj_3R_IntervalAtLeast_417_3_12() {if (jj_scan_token(FN_PREFIX)) return true;if (jj_scan_token(ATLEAST)) return true;return false;}- private boolean jj_3R_Boost_699_3_44()- {+ private boolean jj_3R_Boost_699_3_44() {if (jj_scan_token(CARAT)) return true;return false;}- private boolean jj_3_25()- {+ private boolean jj_3_25() {if (jj_3R_IntervalText_684_5_33()) return true;return false;}- private boolean jj_3_24()- {+ private boolean jj_3_24() {if (jj_3R_IntervalFuzzyTerm_665_3_32()) return true;return false;}- private boolean jj_3_23()- {+ private boolean jj_3_23() {if (jj_3R_IntervalExtend_594_3_31()) return true;return false;}- private boolean jj_3_22()- {+ private boolean jj_3_22() {if (jj_3R_IntervalNonOverlapping_635_3_30()) return true;return false;}- private boolean jj_3_21()- {+ private boolean jj_3_21() {if (jj_3R_IntervalOverlapping_625_3_29()) return true;return false;}- private boolean jj_3R_IntervalPhrase_500_3_22()- {+ private boolean jj_3R_IntervalPhrase_500_3_22() {if (jj_scan_token(FN_PREFIX)) return true;if (jj_scan_token(PHRASE)) return true;return false;}- private boolean jj_3_20()- {+ private boolean jj_3_20() {if (jj_3R_IntervalNotWithin_610_3_28()) return true;return false;}- private boolean jj_3R_IntervalExtend_594_3_31()- {+ private boolean jj_3R_IntervalExtend_594_3_31() {if (jj_scan_token(FN_PREFIX)) return true;if (jj_scan_token(EXTEND)) return true;return false;}- private boolean jj_3_19()- {+ private boolean jj_3_19() {if (jj_3R_IntervalWithin_578_3_27()) return true;return false;}- private boolean jj_3_18()- {+ private boolean jj_3_18() {if (jj_3R_IntervalNotContainedBy_567_3_26()) return true;return false;}- private boolean jj_3R_IntervalText_685_5_40()- {+ private boolean jj_3R_IntervalText_685_5_40() {Token xsp;xsp = jj_scanpos;if (jj_scan_token(25)) {- jj_scanpos = xsp;- if (jj_scan_token(24)) return true;+ jj_scanpos = xsp;+ if (jj_scan_token(24)) return true;}return false;}- private boolean jj_3_17()- {+ private boolean jj_3_17() {if (jj_3R_IntervalContainedBy_556_3_25()) return true;return false;}- private boolean jj_3R_IntervalText_684_5_39()- {+ private boolean jj_3R_IntervalText_684_5_39() {if (jj_scan_token(QUOTED)) return true;return false;}- private boolean jj_3R_IntervalText_684_5_33()- {+ private boolean jj_3R_IntervalText_684_5_33() {Token xsp;xsp = jj_scanpos;if (jj_3R_IntervalText_684_5_39()) {- jj_scanpos = xsp;- if (jj_3R_IntervalText_685_5_40()) return true;+ jj_scanpos = xsp;+ if (jj_3R_IntervalText_685_5_40()) return true;}return false;}- private boolean jj_3_16()- {+ private boolean jj_3_16() {if (jj_3R_IntervalNotContaining_545_3_24()) return true;return false;}- private boolean jj_3_15()- {+ private boolean jj_3_15() {if (jj_3R_IntervalContaining_534_3_23()) return true;return false;}- private boolean jj_3_14()- {+ private boolean jj_3_14() {if (jj_3R_IntervalPhrase_500_3_22()) return true;return false;}- private boolean jj_3_13()- {+ private boolean jj_3_13() {if (jj_3R_IntervalBefore_512_3_21()) return true;return false;}- private boolean jj_3_12()- {+ private boolean jj_3_12() {if (jj_3R_IntervalAfter_523_3_20()) return true;return false;}- private boolean jj_3_11()- {+ private boolean jj_3_11() {if (jj_3R_IntervalWildcard_646_3_19()) return true;return false;}- private boolean jj_3_10()- {+ private boolean jj_3_10() {if (jj_3R_IntervalOr_488_3_18()) return true;return false;}- private boolean jj_3_9()- {+ private boolean jj_3_9() {if (jj_3R_IntervalUnorderedNoOverlaps_464_3_17()) return true;return false;}- private boolean jj_3R_IntervalOr_488_3_18()- {+ private boolean jj_3R_IntervalOr_488_3_18() {if (jj_scan_token(FN_PREFIX)) return true;if (jj_scan_token(FN_OR)) return true;return false;}- private boolean jj_3_8()- {+ private boolean jj_3_8() {if (jj_3R_IntervalUnordered_453_3_16()) return true;return false;}- private boolean jj_3_7()- {+ private boolean jj_3_7() {if (jj_3R_IntervalOrdered_476_3_15()) return true;return false;}- private boolean jj_3_6()- {+ private boolean jj_3_6() {if (jj_3R_IntervalMaxGaps_441_3_14()) return true;return false;}- private boolean jj_3_5()- {+ private boolean jj_3_5() {if (jj_3R_IntervalMaxWidth_429_3_13()) return true;return false;}- private boolean jj_3_4()- {+ private boolean jj_3_4() {if (jj_3R_IntervalAtLeast_417_3_12()) return true;return false;}- private boolean jj_3_27()- {+ private boolean jj_3_27() {if (jj_scan_token(NUMBER)) return true;return false;}- private boolean jj_3R_IntervalWithin_578_3_27()- {+ private boolean jj_3R_IntervalWithin_578_3_27() {if (jj_scan_token(FN_PREFIX)) return true;if (jj_scan_token(WITHIN)) return true;return false;}- private boolean jj_3_26()- {+ private boolean jj_3_26() {if (jj_scan_token(NUMBER)) return true;return false;}- private boolean jj_3R_TermRangeExpr_855_6_46()- {+ private boolean jj_3R_TermRangeExpr_855_6_46() {if (jj_scan_token(RANGEIN_START)) return true;return false;}- private boolean jj_3R_IntervalOrdered_476_3_15()- {+ private boolean jj_3R_IntervalOrdered_476_3_15() {if (jj_scan_token(FN_PREFIX)) return true;if (jj_scan_token(ORDERED)) return true;return false;}- private boolean jj_3R_IntervalFuzzyTerm_665_3_32()- {+ private boolean jj_3R_IntervalFuzzyTerm_665_3_32() {if (jj_scan_token(FN_PREFIX)) return true;if (jj_scan_token(FUZZYTERM)) return true;return false;}- private boolean jj_3R_TermRangeExpr_854_3_42()- {+ private boolean jj_3R_TermRangeExpr_854_3_42() {Token xsp;xsp = jj_scanpos;if (jj_3R_TermRangeExpr_855_6_46()) {- jj_scanpos = xsp;- if (jj_scan_token(28)) return true;+ jj_scanpos = xsp;+ if (jj_scan_token(28)) return true;}xsp = jj_scanpos;if (jj_scan_token(55)) {- jj_scanpos = xsp;- if (jj_scan_token(54)) {- jj_scanpos = xsp;- if (jj_scan_token(51)) return true;- }+ jj_scanpos = xsp;+ if (jj_scan_token(54)) {+ jj_scanpos = xsp;+ if (jj_scan_token(51)) return true;+ }}return false;}- private boolean jj_3R_IntervalNotContainedBy_567_3_26()- {+ private boolean jj_3R_IntervalNotContainedBy_567_3_26() {if (jj_scan_token(FN_PREFIX)) return true;if (jj_scan_token(NOT_CONTAINED_BY)) return true;return false;@@ -1871,149 +2163,201 @@ if (left.kind == RANGE_QUOTED) {/** Generated Token Manager. */public StandardSyntaxParserTokenManager token_source;+/** Current token. */public Token token;+/** Next token. */public Token jj_nt;+private int jj_ntk;private Token jj_scanpos, jj_lastpos;private int jj_la;private int jj_gen;- final private int[] jj_la1 = new int[34];- static private int[] jj_la1_0;- static private int[] jj_la1_1;+ private final int[] jj_la1 = new int[34];+ private static int[] jj_la1_0;+ private static int[] jj_la1_1;+static {- jj_la1_init_0();- jj_la1_init_1();- }- private static void jj_la1_init_0() {- jj_la1_0 = new int[] {0x3f803c00,0x200,0x100,0x2400,0x3400,0x3400,0x18000,0x23800800,0x3f800800,0x200000,0x0,0x3800800,0x3800800,0x3800800,0x3800800,0x3800800,0x3000000,0x3800000,0x1000000,0x3000000,0x3800000,0x3000000,0x3800000,0x1e0000,0x3800000,0x3000000,0x400000,0x1f800000,0x200000,0x400000,0x18000000,0x0,0x0,0x0,};- }- private static void jj_la1_init_1() {- jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc80000,0xc80000,0x300000,};- }- final private JJCalls[] jj_2_rtns = new JJCalls[28];+ jj_la1_init_0();+ jj_la1_init_1();+ }++ private static void jj_la1_init_0() {+ jj_la1_0 =+ new int[] {+ 0x3f803c00,+ 0x200,+ 0x100,+ 0x2400,+ 0x3400,+ 0x3400,+ 0x18000,+ 0x23800800,+ 0x3f800800,+ 0x200000,+ 0x0,+ 0x3800800,+ 0x3800800,+ 0x3800800,+ 0x3800800,+ 0x3800800,+ 0x3000000,+ 0x3800000,+ 0x1000000,+ 0x3000000,+ 0x3800000,+ 0x3000000,+ 0x3800000,+ 0x1e0000,+ 0x3800000,+ 0x3000000,+ 0x400000,+ 0x1f800000,+ 0x200000,+ 0x400000,+ 0x18000000,+ 0x0,+ 0x0,+ 0x0,+ };+ }++ private static void jj_la1_init_1() {+ jj_la1_1 =+ new int[] {+ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1000000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,+ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xc80000, 0xc80000,+ 0x300000,+ };+ }++ private final JJCalls[] jj_2_rtns = new JJCalls[28];private boolean jj_rescan = false;private int jj_gc = 0;/** Constructor with user supplied CharStream. */public StandardSyntaxParser(CharStream stream) {- token_source = new StandardSyntaxParserTokenManager(stream);- token = new Token();- jj_ntk = -1;- jj_gen = 0;- for (int i = 0; i < 34; i++) jj_la1[i] = -1;- for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();+ token_source = new StandardSyntaxParserTokenManager(stream);+ token = new Token();+ jj_ntk = -1;+ jj_gen = 0;+ for (int i = 0; i < 34; i++) jj_la1[i] = -1;+ for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();}/** Reinitialise. */public void ReInit(CharStream stream) {- token_source.ReInit(stream);- token = new Token();- jj_ntk = -1;- jj_gen = 0;- for (int i = 0; i < 34; i++) jj_la1[i] = -1;- for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();+ token_source.ReInit(stream);+ token = new Token();+ jj_ntk = -1;+ jj_gen = 0;+ for (int i = 0; i < 34; i++) jj_la1[i] = -1;+ for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();}/** Constructor with generated Token Manager. */public StandardSyntaxParser(StandardSyntaxParserTokenManager tm) {- token_source = tm;- token = new Token();- jj_ntk = -1;- jj_gen = 0;- for (int i = 0; i < 34; i++) jj_la1[i] = -1;- for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();+ token_source = tm;+ token = new Token();+ jj_ntk = -1;+ jj_gen = 0;+ for (int i = 0; i < 34; i++) jj_la1[i] = -1;+ for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();}/** Reinitialise. */public void ReInit(StandardSyntaxParserTokenManager tm) {- token_source = tm;- token = new Token();- jj_ntk = -1;- jj_gen = 0;- for (int i = 0; i < 34; i++) jj_la1[i] = -1;- for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();+ token_source = tm;+ token = new Token();+ jj_ntk = -1;+ jj_gen = 0;+ for (int i = 0; i < 34; i++) jj_la1[i] = -1;+ for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();}private Token jj_consume_token(int kind) throws ParseException {- Token oldToken;- if ((oldToken = token).next != null) token = token.next;- else token = token.next = token_source.getNextToken();- jj_ntk = -1;- if (token.kind == kind) {- jj_gen++;- if (++jj_gc > 100) {- jj_gc = 0;- for (int i = 0; i < jj_2_rtns.length; i++) {- JJCalls c = jj_2_rtns[i];- while (c != null) {- if (c.gen < jj_gen) c.first = null;- c = c.next;- }- }- }- return token;- }- token = oldToken;- jj_kind = kind;- throw generateParseException();+ Token oldToken;+ if ((oldToken = token).next != null) token = token.next;+ else token = token.next = token_source.getNextToken();+ jj_ntk = -1;+ if (token.kind == kind) {+ jj_gen++;+ if (++jj_gc > 100) {+ jj_gc = 0;+ for (int i = 0; i < jj_2_rtns.length; i++) {+ JJCalls c = jj_2_rtns[i];+ while (c != null) {+ if (c.gen < jj_gen) c.first = null;+ c = c.next;+ }+ }+ }+ return token;+ }+ token = oldToken;+ jj_kind = kind;+ throw generateParseException();}@SuppressWarnings("serial")- static private final class LookaheadSuccess extends java.lang.Error {+ private static final class LookaheadSuccess extends java.lang.Error {@Overridepublic Throwable fillInStackTrace() {return this;}}- static private final LookaheadSuccess jj_ls = new LookaheadSuccess();++ private static final LookaheadSuccess jj_ls = new LookaheadSuccess();+private boolean jj_scan_token(int kind) {- if (jj_scanpos == jj_lastpos) {- jj_la--;- if (jj_scanpos.next == null) {- jj_lastpos = jj_scanpos = jj_scanpos.next = token_source.getNextToken();- } else {- jj_lastpos = jj_scanpos = jj_scanpos.next;- }- } else {- jj_scanpos = jj_scanpos.next;- }- if (jj_rescan) {- int i = 0; Token tok = token;- while (tok != null && tok != jj_scanpos) { i++; tok = tok.next; }- if (tok != null) jj_add_error_token(kind, i);- }- if (jj_scanpos.kind != kind) return true;- if (jj_la == 0 && jj_scanpos == jj_lastpos) throw jj_ls;- return false;- }---/** Get the next Token. */- final public Token getNextToken() {- if (token.next != null) token = token.next;- else token = token.next = token_source.getNextToken();- jj_ntk = -1;- jj_gen++;- return token;- }--/** Get the specific Token. */- final public Token getToken(int index) {- Token t = token;- for (int i = 0; i < index; i++) {- if (t.next != null) t = t.next;- else t = t.next = token_source.getNextToken();- }- return t;+ if (jj_scanpos == jj_lastpos) {+ jj_la--;+ if (jj_scanpos.next == null) {+ jj_lastpos = jj_scanpos = jj_scanpos.next = token_source.getNextToken();+ } else {+ jj_lastpos = jj_scanpos = jj_scanpos.next;+ }+ } else {+ jj_scanpos = jj_scanpos.next;+ }+ if (jj_rescan) {+ int i = 0;+ Token tok = token;+ while (tok != null && tok != jj_scanpos) {+ i++;+ tok = tok.next;+ }+ if (tok != null) jj_add_error_token(kind, i);+ }+ if (jj_scanpos.kind != kind) return true;+ if (jj_la == 0 && jj_scanpos == jj_lastpos) throw jj_ls;+ return false;+ }++ /** Get the next Token. */+ public final Token getNextToken() {+ if (token.next != null) token = token.next;+ else token = token.next = token_source.getNextToken();+ jj_ntk = -1;+ jj_gen++;+ return token;+ }++ /** Get the specific Token. */+ public final Token getToken(int index) {+ Token t = token;+ for (int i = 0; i < index; i++) {+ if (t.next != null) t = t.next;+ else t = t.next = token_source.getNextToken();+ }+ return t;}private int jj_ntk_f() {- if ((jj_nt=token.next) == null)- return (jj_ntk = (token.next=token_source.getNextToken()).kind);- else- return (jj_ntk = jj_nt.kind);+ if ((jj_nt = token.next) == null)+ return (jj_ntk = (token.next = token_source.getNextToken()).kind);+ else return (jj_ntk = jj_nt.kind);}private java.util.List<int[]> jj_expentries = new java.util.ArrayList<>();@@ -2023,160 +2367,217 @@ if (left.kind == RANGE_QUOTED) {private int jj_endpos;private void jj_add_error_token(int kind, int pos) {- if (pos >= 100) {- return;- }-- if (pos == jj_endpos + 1) {- jj_lasttokens[jj_endpos++] = kind;- } else if (jj_endpos != 0) {- jj_expentry = new int[jj_endpos];-- for (int i = 0; i < jj_endpos; i++) {- jj_expentry[i] = jj_lasttokens[i];- }-- for (int[] oldentry : jj_expentries) {- if (oldentry.length == jj_expentry.length) {- boolean isMatched = true;-- for (int i = 0; i < jj_expentry.length; i++) {- if (oldentry[i] != jj_expentry[i]) {- isMatched = false;- break;- }-- }- if (isMatched) {- jj_expentries.add(jj_expentry);- break;- }- }- }-- if (pos != 0) {- jj_lasttokens[(jj_endpos = pos) - 1] = kind;- }- }+ if (pos >= 100) {+ return;+ }++ if (pos == jj_endpos + 1) {+ jj_lasttokens[jj_endpos++] = kind;+ } else if (jj_endpos != 0) {+ jj_expentry = new int[jj_endpos];++ for (int i = 0; i < jj_endpos; i++) {+ jj_expentry[i] = jj_lasttokens[i];+ }++ for (int[] oldentry : jj_expentries) {+ if (oldentry.length == jj_expentry.length) {+ boolean isMatched = true;++ for (int i = 0; i < jj_expentry.length; i++) {+ if (oldentry[i] != jj_expentry[i]) {+ isMatched = false;+ break;+ }+ }+ if (isMatched) {+ jj_expentries.add(jj_expentry);+ break;+ }+ }+ }++ if (pos != 0) {+ jj_lasttokens[(jj_endpos = pos) - 1] = kind;+ }+ }}/** Generate ParseException. */public ParseException generateParseException() {- jj_expentries.clear();- boolean[] la1tokens = new boolean[57];- if (jj_kind >= 0) {- la1tokens[jj_kind] = true;- jj_kind = -1;- }- for (int i = 0; i < 34; i++) {- if (jj_la1[i] == jj_gen) {- for (int j = 0; j < 32; j++) {- if ((jj_la1_0[i] & (1<<j)) != 0) {- la1tokens[j] = true;- }- if ((jj_la1_1[i] & (1<<j)) != 0) {- la1tokens[32+j] = true;- }- }- }- }- for (int i = 0; i < 57; i++) {- if (la1tokens[i]) {- jj_expentry = new int[1];- jj_expentry[0] = i;- jj_expentries.add(jj_expentry);- }- }- jj_endpos = 0;- jj_rescan_token();- jj_add_error_token(0, 0);- int[][] exptokseq = new int[jj_expentries.size()][];- for (int i = 0; i < jj_expentries.size(); i++) {- exptokseq[i] = jj_expentries.get(i);- }- return new ParseException(token, exptokseq, tokenImage);+ jj_expentries.clear();+ boolean[] la1tokens = new boolean[57];+ if (jj_kind >= 0) {+ la1tokens[jj_kind] = true;+ jj_kind = -1;+ }+ for (int i = 0; i < 34; i++) {+ if (jj_la1[i] == jj_gen) {+ for (int j = 0; j < 32; j++) {+ if ((jj_la1_0[i] & (1 << j)) != 0) {+ la1tokens[j] = true;+ }+ if ((jj_la1_1[i] & (1 << j)) != 0) {+ la1tokens[32 + j] = true;+ }+ }+ }+ }+ for (int i = 0; i < 57; i++) {+ if (la1tokens[i]) {+ jj_expentry = new int[1];+ jj_expentry[0] = i;+ jj_expentries.add(jj_expentry);+ }+ }+ jj_endpos = 0;+ jj_rescan_token();+ jj_add_error_token(0, 0);+ int[][] exptokseq = new int[jj_expentries.size()][];+ for (int i = 0; i < jj_expentries.size(); i++) {+ exptokseq[i] = jj_expentries.get(i);+ }+ return new ParseException(token, exptokseq, tokenImage);}private boolean trace_enabled;-/** Trace enabled. */- final public boolean trace_enabled() {- return trace_enabled;+ /** Trace enabled. */+ public final boolean trace_enabled() {+ return trace_enabled;}/** Enable tracing. */- final public void enable_tracing() {- }+ public final void enable_tracing() {}/** Disable tracing. */- final public void disable_tracing() {- }+ public final void disable_tracing() {}private void jj_rescan_token() {- jj_rescan = true;- for (int i = 0; i < 28; i++) {- try {- JJCalls p = jj_2_rtns[i];-- do {- if (p.gen > jj_gen) {- jj_la = p.arg; jj_lastpos = jj_scanpos = p.first;- switch (i) {- case 0: jj_3_1(); break;- case 1: jj_3_2(); break;- case 2: jj_3_3(); break;- case 3: jj_3_4(); break;- case 4: jj_3_5(); break;- case 5: jj_3_6(); break;- case 6: jj_3_7(); break;- case 7: jj_3_8(); break;- case 8: jj_3_9(); break;- case 9: jj_3_10(); break;- case 10: jj_3_11(); break;- case 11: jj_3_12(); break;- case 12: jj_3_13(); break;- case 13: jj_3_14(); break;- case 14: jj_3_15(); break;- case 15: jj_3_16(); break;- case 16: jj_3_17(); break;- case 17: jj_3_18(); break;- case 18: jj_3_19(); break;- case 19: jj_3_20(); break;- case 20: jj_3_21(); break;- case 21: jj_3_22(); break;- case 22: jj_3_23(); break;- case 23: jj_3_24(); break;- case 24: jj_3_25(); break;- case 25: jj_3_26(); break;- case 26: jj_3_27(); break;- case 27: jj_3_28(); break;- }- }- p = p.next;- } while (p != null);-- } catch(LookaheadSuccess ls) { }- }- jj_rescan = false;+ jj_rescan = true;+ for (int i = 0; i < 28; i++) {+ try {+ JJCalls p = jj_2_rtns[i];++ do {+ if (p.gen > jj_gen) {+ jj_la = p.arg;+ jj_lastpos = jj_scanpos = p.first;+ switch (i) {+ case 0:+ jj_3_1();+ break;+ case 1:+ jj_3_2();+ break;+ case 2:+ jj_3_3();+ break;+ case 3:+ jj_3_4();+ break;+ case 4:+ jj_3_5();+ break;+ case 5:+ jj_3_6();+ break;+ case 6:+ jj_3_7();+ break;+ case 7:+ jj_3_8();+ break;+ case 8:+ jj_3_9();+ break;+ case 9:+ jj_3_10();+ break;+ case 10:+ jj_3_11();+ break;+ case 11:+ jj_3_12();+ break;+ case 12:+ jj_3_13();+ break;+ case 13:+ jj_3_14();+ break;+ case 14:+ jj_3_15();+ break;+ case 15:+ jj_3_16();+ break;+ case 16:+ jj_3_17();+ break;+ case 17:+ jj_3_18();+ break;+ case 18:+ jj_3_19();+ break;+ case 19:+ jj_3_20();+ break;+ case 20:+ jj_3_21();+ break;+ case 21:+ jj_3_22();+ break;+ case 22:+ jj_3_23();+ break;+ case 23:+ jj_3_24();+ break;+ case 24:+ jj_3_25();+ break;+ case 25:+ jj_3_26();+ break;+ case 26:+ jj_3_27();+ break;+ case 27:+ jj_3_28();+ break;+ }+ }+ p = p.next;+ } while (p != null);++ } catch (LookaheadSuccess ls) {+ }+ }+ jj_rescan = false;}private void jj_save(int index, int xla) {- JJCalls p = jj_2_rtns[index];- while (p.gen > jj_gen) {- if (p.next == null) { p = p.next = new JJCalls(); break; }- p = p.next;- }+ JJCalls p = jj_2_rtns[index];+ while (p.gen > jj_gen) {+ if (p.next == null) {+ p = p.next = new JJCalls();+ break;+ }+ p = p.next;+ }- p.gen = jj_gen + xla - jj_la;- p.first = token;- p.arg = xla;+ p.gen = jj_gen + xla - jj_la;+ p.first = token;+ p.arg = xla;}static final class JJCalls {- int gen;- Token first;- int arg;- JJCalls next;+ int gen;+ Token first;+ int arg;+ JJCalls next;}-}diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParserConstants.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParserConstants.javaindex 1f1d33c134f..2474ddcbd9a 100644--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParserConstants.java+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParserConstants.java@@ -17,128 +17,180 @@*/package org.apache.lucene.queryparser.flexible.standard.parser;--/**- * Token literal values and constants.- * Generated by org.javacc.parser.OtherFilesGen#start()- */+/** Token literal values and constants. Generated by org.javacc.parser.OtherFilesGen#start() */public interface StandardSyntaxParserConstants {/** End of File. */int EOF = 0;+/** RegularExpression Id. */int _NUM_CHAR = 1;+/** RegularExpression Id. */int _ESCAPED_CHAR = 2;+/** RegularExpression Id. */int _TERM_START_CHAR = 3;+/** RegularExpression Id. */int _TERM_CHAR = 4;+/** RegularExpression Id. */int _WHITESPACE = 5;+/** RegularExpression Id. */int _QUOTED_CHAR = 6;+/** RegularExpression Id. */int AND = 8;+/** RegularExpression Id. */int OR = 9;+/** RegularExpression Id. */int NOT = 10;+/** RegularExpression Id. */int FN_PREFIX = 11;+/** RegularExpression Id. */int PLUS = 12;+/** RegularExpression Id. */int MINUS = 13;+/** RegularExpression Id. */int RPAREN = 14;+/** RegularExpression Id. */int OP_COLON = 15;+/** RegularExpression Id. */int OP_EQUAL = 16;+/** RegularExpression Id. */int OP_LESSTHAN = 17;+/** RegularExpression Id. */int OP_LESSTHANEQ = 18;+/** RegularExpression Id. */int OP_MORETHAN = 19;+/** RegularExpression Id. */int OP_MORETHANEQ = 20;+/** RegularExpression Id. */int CARAT = 21;+/** RegularExpression Id. */int TILDE = 22;+/** RegularExpression Id. */int QUOTED = 23;+/** RegularExpression Id. */int NUMBER = 24;+/** RegularExpression Id. */int TERM = 25;+/** RegularExpression Id. */int REGEXPTERM = 26;+/** RegularExpression Id. */int RANGEIN_START = 27;+/** RegularExpression Id. */int RANGEEX_START = 28;+/** RegularExpression Id. */int LPAREN = 29;+/** RegularExpression Id. */int ATLEAST = 30;+/** RegularExpression Id. */int AFTER = 31;+/** RegularExpression Id. */int BEFORE = 32;+/** RegularExpression Id. */int CONTAINED_BY = 33;+/** RegularExpression Id. */int CONTAINING = 34;+/** RegularExpression Id. */int EXTEND = 35;+/** RegularExpression Id. */int FN_OR = 36;+/** RegularExpression Id. */int FUZZYTERM = 37;+/** RegularExpression Id. */int MAXGAPS = 38;+/** RegularExpression Id. */int MAXWIDTH = 39;+/** RegularExpression Id. */int NON_OVERLAPPING = 40;+/** RegularExpression Id. */int NOT_CONTAINED_BY = 41;+/** RegularExpression Id. */int NOT_CONTAINING = 42;+/** RegularExpression Id. */int NOT_WITHIN = 43;+/** RegularExpression Id. */int ORDERED = 44;+/** RegularExpression Id. */int OVERLAPPING = 45;+/** RegularExpression Id. */int PHRASE = 46;+/** RegularExpression Id. */int UNORDERED = 47;+/** RegularExpression Id. */int UNORDERED_NO_OVERLAPS = 48;+/** RegularExpression Id. */int WILDCARD = 49;+/** RegularExpression Id. */int WITHIN = 50;+/** RegularExpression Id. */int RANGE_TO = 51;+/** RegularExpression Id. */int RANGEIN_END = 52;+/** RegularExpression Id. */int RANGEEX_END = 53;+/** RegularExpression Id. */int RANGE_QUOTED = 54;+/** RegularExpression Id. */int RANGE_GOOP = 55;/** Lexical state. */int Function = 0;+/** Lexical state. */int Range = 1;+/** Lexical state. */int DEFAULT = 2;@@ -202,5 +254,4 @@ public interface StandardSyntaxParserConstants {"<RANGE_GOOP>","\"@\"",};-}diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParserTokenManager.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParserTokenManager.javaindex 7d3b735a4e3..7040d84951b 100644--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParserTokenManager.java+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParserTokenManager.java@@ -17,2258 +17,1998 @@* limitations under the License.*/package org.apache.lucene.queryparser.flexible.standard.parser;- import org.apache.lucene.queryparser.charstream.CharStream;-------------------------------------------------+import org.apache.lucene.queryparser.charstream.CharStream;/** Token Manager. */-@SuppressWarnings ("unused")+@SuppressWarnings("unused")public class StandardSyntaxParserTokenManager implements StandardSyntaxParserConstants {// Debug output.// (debugStream omitted).// Set debug output.// (setDebugStream omitted).-private final int jjStopStringLiteralDfa_2(int pos, long active0){- switch (pos)- {+ private final int jjStopStringLiteralDfa_2(int pos, long active0) {+ switch (pos) {case 0:- if ((active0 & 0x800L) != 0L)- {- jjmatchedKind = 25;- return 32;- }- return -1;+ if ((active0 & 0x800L) != 0L) {+ jjmatchedKind = 25;+ return 32;+ }+ return -1;case 1:- if ((active0 & 0x800L) != 0L)- {- jjmatchedKind = 25;- jjmatchedPos = 1;- return 32;- }- return -1;- default :- return -1;- }-}-private final int jjStartNfa_2(int pos, long active0){- return jjMoveNfa_2(jjStopStringLiteralDfa_2(pos, active0), pos + 1);-}-private int jjStopAtPos(int pos, int kind)-{- jjmatchedKind = kind;- jjmatchedPos = pos;- return pos + 1;-}-private int jjMoveStringLiteralDfa0_2(){- switch(curChar)- {+ if ((active0 & 0x800L) != 0L) {+ jjmatchedKind = 25;+ jjmatchedPos = 1;+ return 32;+ }+ return -1;+ default:+ return -1;+ }+ }++ private final int jjStartNfa_2(int pos, long active0) {+ return jjMoveNfa_2(jjStopStringLiteralDfa_2(pos, active0), pos + 1);+ }++ private int jjStopAtPos(int pos, int kind) {+ jjmatchedKind = kind;+ jjmatchedPos = pos;+ return pos + 1;+ }++ private int jjMoveStringLiteralDfa0_2() {+ switch (curChar) {case 40:- return jjStopAtPos(0, 29);+ return jjStopAtPos(0, 29);case 41:- return jjStopAtPos(0, 14);+ return jjStopAtPos(0, 14);case 43:- return jjStopAtPos(0, 12);+ return jjStopAtPos(0, 12);case 45:- return jjStopAtPos(0, 13);+ return jjStopAtPos(0, 13);case 58:- return jjStopAtPos(0, 15);+ return jjStopAtPos(0, 15);case 60:- jjmatchedKind = 17;- return jjMoveStringLiteralDfa1_2(0x40000L);+ jjmatchedKind = 17;+ return jjMoveStringLiteralDfa1_2(0x40000L);case 61:- return jjStopAtPos(0, 16);+ return jjStopAtPos(0, 16);case 62:- jjmatchedKind = 19;- return jjMoveStringLiteralDfa1_2(0x100000L);+ jjmatchedKind = 19;+ return jjMoveStringLiteralDfa1_2(0x100000L);case 64:- return jjStopAtPos(0, 56);+ return jjStopAtPos(0, 56);case 91:- return jjStopAtPos(0, 27);+ return jjStopAtPos(0, 27);case 94:- return jjStopAtPos(0, 21);+ return jjStopAtPos(0, 21);case 102:- return jjMoveStringLiteralDfa1_2(0x800L);+ return jjMoveStringLiteralDfa1_2(0x800L);case 123:- return jjStopAtPos(0, 28);+ return jjStopAtPos(0, 28);case 126:- return jjStopAtPos(0, 22);- default :- return jjMoveNfa_2(0, 0);- }-}-private int jjMoveStringLiteralDfa1_2(long active0){- try { curChar = input_stream.readChar(); }- catch(java.io.IOException e) {+ return jjStopAtPos(0, 22);+ default:+ return jjMoveNfa_2(0, 0);+ }+ }++ private int jjMoveStringLiteralDfa1_2(long active0) {+ try {+ curChar = input_stream.readChar();+ } catch (java.io.IOException e) {jjStopStringLiteralDfa_2(0, active0);return 1;- }- switch(curChar)- {+ }+ switch (curChar) {case 61:- if ((active0 & 0x40000L) != 0L)- return jjStopAtPos(1, 18);- else if ((active0 & 0x100000L) != 0L)- return jjStopAtPos(1, 20);- break;+ if ((active0 & 0x40000L) != 0L) return jjStopAtPos(1, 18);+ else if ((active0 & 0x100000L) != 0L) return jjStopAtPos(1, 20);+ break;case 110:- return jjMoveStringLiteralDfa2_2(active0, 0x800L);- default :- break;- }- return jjStartNfa_2(0, active0);-}-private int jjMoveStringLiteralDfa2_2(long old0, long active0){- if (((active0 &= old0)) == 0L)- return jjStartNfa_2(0, old0);- try { curChar = input_stream.readChar(); }- catch(java.io.IOException e) {+ return jjMoveStringLiteralDfa2_2(active0, 0x800L);+ default:+ break;+ }+ return jjStartNfa_2(0, active0);+ }++ private int jjMoveStringLiteralDfa2_2(long old0, long active0) {+ if (((active0 &= old0)) == 0L) return jjStartNfa_2(0, old0);+ try {+ curChar = input_stream.readChar();+ } catch (java.io.IOException e) {jjStopStringLiteralDfa_2(1, active0);return 2;- }- switch(curChar)- {+ }+ switch (curChar) {case 58:- if ((active0 & 0x800L) != 0L)- return jjStopAtPos(2, 11);- break;- default :- break;- }- return jjStartNfa_2(1, active0);-}-static final long[] jjbitVec0 = {- 0x1L, 0x0L, 0x0L, 0x0L-};-static final long[] jjbitVec1 = {- 0xfffffffffffffffeL, 0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffffffffffffL-};-static final long[] jjbitVec3 = {- 0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL-};-static final long[] jjbitVec4 = {- 0xfffefffffffffffeL, 0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffffffffffffL-};-private int jjMoveNfa_2(int startState, int curPos)-{- int startsAt = 0;- jjnewStateCnt = 32;- int i = 1;- jjstateSet[0] = startState;- int kind = 0x7fffffff;- for (;;)- {- if (++jjround == 0x7fffffff)- ReInitRounds();- if (curChar < 64)- {- long l = 1L << curChar;- do- {- switch(jjstateSet[--i])- {- case 32:- case 23:- if ((0x8bff7cf8ffffd9ffL & l) == 0L)- break;- if (kind > 25)- kind = 25;- { jjCheckNAddTwoStates(23, 24); }- break;- case 0:- if ((0x8bff54f8ffffd9ffL & l) != 0L)- {- if (kind > 25)- kind = 25;- { jjCheckNAddTwoStates(23, 24); }- }- else if ((0x100002600L & l) != 0L)- {- if (kind > 7)- kind = 7;- }- else if (curChar == 47)- { jjCheckNAddStates(0, 2); }- else if (curChar == 34)- { jjCheckNAddStates(3, 5); }- else if (curChar == 33)- {- if (kind > 10)- kind = 10;- }- if ((0x3ff000000000000L & l) != 0L)- {- if (kind > 24)- kind = 24;- { jjCheckNAddTwoStates(19, 20); }- }- else if (curChar == 38)- jjstateSet[jjnewStateCnt++] = 4;- break;- case 4:- if (curChar == 38 && kind > 8)- kind = 8;- break;- case 5:- if (curChar == 38)- jjstateSet[jjnewStateCnt++] = 4;- break;- case 13:- if (curChar == 33 && kind > 10)- kind = 10;- break;- case 14:- if (curChar == 34)- { jjCheckNAddStates(3, 5); }- break;- case 15:- if ((0xfffffffbffffffffL & l) != 0L)- { jjCheckNAddStates(3, 5); }- break;- case 17:- { jjCheckNAddStates(3, 5); }- break;- case 18:- if (curChar == 34 && kind > 23)- kind = 23;- break;- case 19:- if ((0x3ff000000000000L & l) == 0L)- break;- if (kind > 24)- kind = 24;- { jjCheckNAddTwoStates(19, 20); }- break;- case 20:- if (curChar == 46)- { jjCheckNAdd(21); }- break;- case 21:- if ((0x3ff000000000000L & l) == 0L)- break;- if (kind > 24)- kind = 24;- { jjCheckNAdd(21); }- break;- case 22:- if ((0x8bff54f8ffffd9ffL & l) == 0L)- break;- if (kind > 25)- kind = 25;- { jjCheckNAddTwoStates(23, 24); }- break;- case 25:- if (kind > 25)- kind = 25;- { jjCheckNAddTwoStates(23, 24); }- break;- case 27:- case 29:- if (curChar == 47)- { jjCheckNAddStates(0, 2); }- break;- case 28:- if ((0xffff7fffffffffffL & l) != 0L)- { jjCheckNAddStates(0, 2); }- break;- case 31:- if (curChar == 47 && kind > 26)- kind = 26;- break;- default : break;- }- } while(i != startsAt);- }- else if (curChar < 128)- {- long l = 1L << (curChar & 077);- do- {- switch(jjstateSet[--i])- {- case 32:- if ((0x97ffffff87fffffeL & l) != 0L)- {- if (kind > 25)- kind = 25;- { jjCheckNAddTwoStates(23, 24); }- }- else if (curChar == 92)- { jjCheckNAddTwoStates(25, 25); }- break;- case 0:- if ((0x97ffffff87fffffeL & l) != 0L)- {- if (kind > 25)- kind = 25;- { jjCheckNAddTwoStates(23, 24); }- }- else if (curChar == 92)- { jjCheckNAdd(25); }- if (curChar == 78)- jjstateSet[jjnewStateCnt++] = 11;- else if (curChar == 124)- jjstateSet[jjnewStateCnt++] = 8;- else if (curChar == 79)- jjstateSet[jjnewStateCnt++] = 6;- else if (curChar == 65)- jjstateSet[jjnewStateCnt++] = 2;- break;- case 1:- if (curChar == 68 && kind > 8)- kind = 8;- break;- case 2:- if (curChar == 78)- jjstateSet[jjnewStateCnt++] = 1;- break;- case 3:- if (curChar == 65)- jjstateSet[jjnewStateCnt++] = 2;- break;- case 6:- if (curChar == 82 && kind > 9)- kind = 9;- break;- case 7:- if (curChar == 79)- jjstateSet[jjnewStateCnt++] = 6;- break;- case 8:- if (curChar == 124 && kind > 9)- kind = 9;- break;- case 9:- if (curChar == 124)- jjstateSet[jjnewStateCnt++] = 8;- break;- case 10:- if (curChar == 84 && kind > 10)- kind = 10;- break;- case 11:- if (curChar == 79)- jjstateSet[jjnewStateCnt++] = 10;- break;- case 12:- if (curChar == 78)- jjstateSet[jjnewStateCnt++] = 11;- break;- case 15:- if ((0xffffffffefffffffL & l) != 0L)- { jjCheckNAddStates(3, 5); }- break;- case 16:- if (curChar == 92)- jjstateSet[jjnewStateCnt++] = 17;- break;- case 17:- { jjCheckNAddStates(3, 5); }- break;- case 22:- if ((0x97ffffff87fffffeL & l) == 0L)- break;- if (kind > 25)- kind = 25;- { jjCheckNAddTwoStates(23, 24); }- break;- case 23:- if ((0x97ffffff87fffffeL & l) == 0L)- break;- if (kind > 25)- kind = 25;- { jjCheckNAddTwoStates(23, 24); }- break;- case 24:- if (curChar == 92)- { jjCheckNAddTwoStates(25, 25); }- break;- case 25:- if (kind > 25)- kind = 25;- { jjCheckNAddTwoStates(23, 24); }- break;- case 26:- if (curChar == 92)- { jjCheckNAdd(25); }- break;- case 28:- { jjAddStates(0, 2); }- break;- case 30:- if (curChar == 92)- jjstateSet[jjnewStateCnt++] = 29;- break;- default : break;- }- } while(i != startsAt);- }- else- {- int hiByte = (curChar >> 8);- int i1 = hiByte >> 6;- long l1 = 1L << (hiByte & 077);- int i2 = (curChar & 0xff) >> 6;- long l2 = 1L << (curChar & 077);- do- {- switch(jjstateSet[--i])- {- case 32:- case 23:- if (!jjCanMove_2(hiByte, i1, i2, l1, l2))- break;- if (kind > 25)- kind = 25;- { jjCheckNAddTwoStates(23, 24); }- break;- case 0:- if (jjCanMove_0(hiByte, i1, i2, l1, l2))- {- if (kind > 7)- kind = 7;- }- if (jjCanMove_2(hiByte, i1, i2, l1, l2))- {- if (kind > 25)- kind = 25;- { jjCheckNAddTwoStates(23, 24); }- }- break;- case 15:- case 17:- if (jjCanMove_1(hiByte, i1, i2, l1, l2))- { jjCheckNAddStates(3, 5); }- break;- case 22:- if (!jjCanMove_2(hiByte, i1, i2, l1, l2))- break;- if (kind > 25)- kind = 25;- { jjCheckNAddTwoStates(23, 24); }- break;- case 25:- if (!jjCanMove_1(hiByte, i1, i2, l1, l2))- break;- if (kind > 25)- kind = 25;- { jjCheckNAddTwoStates(23, 24); }- break;- case 28:- if (jjCanMove_1(hiByte, i1, i2, l1, l2))- { jjAddStates(0, 2); }- break;- default : if (i1 == 0 || l1 == 0 || i2 == 0 || l2 == 0) break; else break;- }- } while(i != startsAt);+ if ((active0 & 0x800L) != 0L) return jjStopAtPos(2, 11);+ break;+ default:+ break;+ }+ return jjStartNfa_2(1, active0);+ }++ static final long[] jjbitVec0 = {0x1L, 0x0L, 0x0L, 0x0L};+ static final long[] jjbitVec1 = {+ 0xfffffffffffffffeL, 0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffffffffffffL+ };+ static final long[] jjbitVec3 = {0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL};+ static final long[] jjbitVec4 = {+ 0xfffefffffffffffeL, 0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffffffffffffL+ };++ private int jjMoveNfa_2(int startState, int curPos) {+ int startsAt = 0;+ jjnewStateCnt = 32;+ int i = 1;+ jjstateSet[0] = startState;+ int kind = 0x7fffffff;+ for (; ; ) {+ if (++jjround == 0x7fffffff) ReInitRounds();+ if (curChar < 64) {+ long l = 1L << curChar;+ do {+ switch (jjstateSet[--i]) {+ case 32:+ case 23:+ if ((0x8bff7cf8ffffd9ffL & l) == 0L) break;+ if (kind > 25) kind = 25;+ {+ jjCheckNAddTwoStates(23, 24);+ }+ break;+ case 0:+ if ((0x8bff54f8ffffd9ffL & l) != 0L) {+ if (kind > 25) kind = 25;+ {+ jjCheckNAddTwoStates(23, 24);+ }+ } else if ((0x100002600L & l) != 0L) {+ if (kind > 7) kind = 7;+ } else if (curChar == 47) {+ jjCheckNAddStates(0, 2);+ } else if (curChar == 34) {+ jjCheckNAddStates(3, 5);+ } else if (curChar == 33) {+ if (kind > 10) kind = 10;+ }+ if ((0x3ff000000000000L & l) != 0L) {+ if (kind > 24) kind = 24;+ {+ jjCheckNAddTwoStates(19, 20);+ }+ } else if (curChar == 38) jjstateSet[jjnewStateCnt++] = 4;+ break;+ case 4:+ if (curChar == 38 && kind > 8) kind = 8;+ break;+ case 5:+ if (curChar == 38) jjstateSet[jjnewStateCnt++] = 4;+ break;+ case 13:+ if (curChar == 33 && kind > 10) kind = 10;+ break;+ case 14:+ if (curChar == 34) {+ jjCheckNAddStates(3, 5);+ }+ break;+ case 15:+ if ((0xfffffffbffffffffL & l) != 0L) {+ jjCheckNAddStates(3, 5);+ }+ break;+ case 17:+ {+ jjCheckNAddStates(3, 5);+ }+ break;+ case 18:+ if (curChar == 34 && kind > 23) kind = 23;+ break;+ case 19:+ if ((0x3ff000000000000L & l) == 0L) break;+ if (kind > 24) kind = 24;+ {+ jjCheckNAddTwoStates(19, 20);+ }+ break;+ case 20:+ if (curChar == 46) {+ jjCheckNAdd(21);+ }+ break;+ case 21:+ if ((0x3ff000000000000L & l) == 0L) break;+ if (kind > 24) kind = 24;+ {+ jjCheckNAdd(21);+ }+ break;+ case 22:+ if ((0x8bff54f8ffffd9ffL & l) == 0L) break;+ if (kind > 25) kind = 25;+ {+ jjCheckNAddTwoStates(23, 24);+ }+ break;+ case 25:+ if (kind > 25) kind = 25;+ {+ jjCheckNAddTwoStates(23, 24);+ }+ break;+ case 27:+ case 29:+ if (curChar == 47) {+ jjCheckNAddStates(0, 2);+ }+ break;+ case 28:+ if ((0xffff7fffffffffffL & l) != 0L) {+ jjCheckNAddStates(0, 2);+ }+ break;+ case 31:+ if (curChar == 47 && kind > 26) kind = 26;+ break;+ default:+ break;+ }+ } while (i != startsAt);+ } else if (curChar < 128) {+ long l = 1L << (curChar & 077);+ do {+ switch (jjstateSet[--i]) {+ case 32:+ if ((0x97ffffff87fffffeL & l) != 0L) {+ if (kind > 25) kind = 25;+ {+ jjCheckNAddTwoStates(23, 24);+ }+ } else if (curChar == 92) {+ jjCheckNAddTwoStates(25, 25);+ }+ break;+ case 0:+ if ((0x97ffffff87fffffeL & l) != 0L) {+ if (kind > 25) kind = 25;+ {+ jjCheckNAddTwoStates(23, 24);+ }+ } else if (curChar == 92) {+ jjCheckNAdd(25);+ }+ if (curChar == 78) jjstateSet[jjnewStateCnt++] = 11;+ else if (curChar == 124) jjstateSet[jjnewStateCnt++] = 8;+ else if (curChar == 79) jjstateSet[jjnewStateCnt++] = 6;+ else if (curChar == 65) jjstateSet[jjnewStateCnt++] = 2;+ break;+ case 1:+ if (curChar == 68 && kind > 8) kind = 8;+ break;+ case 2:+ if (curChar == 78) jjstateSet[jjnewStateCnt++] = 1;+ break;+ case 3:+ if (curChar == 65) jjstateSet[jjnewStateCnt++] = 2;+ break;+ case 6:+ if (curChar == 82 && kind > 9) kind = 9;+ break;+ case 7:+ if (curChar == 79) jjstateSet[jjnewStateCnt++] = 6;+ break;+ case 8:+ if (curChar == 124 && kind > 9) kind = 9;+ break;+ case 9:+ if (curChar == 124) jjstateSet[jjnewStateCnt++] = 8;+ break;+ case 10:+ if (curChar == 84 && kind > 10) kind = 10;+ break;+ case 11:+ if (curChar == 79) jjstateSet[jjnewStateCnt++] = 10;+ break;+ case 12:+ if (curChar == 78) jjstateSet[jjnewStateCnt++] = 11;+ break;+ case 15:+ if ((0xffffffffefffffffL & l) != 0L) {+ jjCheckNAddStates(3, 5);+ }+ break;+ case 16:+ if (curChar == 92) jjstateSet[jjnewStateCnt++] = 17;+ break;+ case 17:+ {+ jjCheckNAddStates(3, 5);+ }+ break;+ case 22:+ if ((0x97ffffff87fffffeL & l) == 0L) break;+ if (kind > 25) kind = 25;+ {+ jjCheckNAddTwoStates(23, 24);+ }+ break;+ case 23:+ if ((0x97ffffff87fffffeL & l) == 0L) break;+ if (kind > 25) kind = 25;+ {+ jjCheckNAddTwoStates(23, 24);+ }+ break;+ case 24:+ if (curChar == 92) {+ jjCheckNAddTwoStates(25, 25);+ }+ break;+ case 25:+ if (kind > 25) kind = 25;+ {+ jjCheckNAddTwoStates(23, 24);+ }+ break;+ case 26:+ if (curChar == 92) {+ jjCheckNAdd(25);+ }+ break;+ case 28:+ {+ jjAddStates(0, 2);+ }+ break;+ case 30:+ if (curChar == 92) jjstateSet[jjnewStateCnt++] = 29;+ break;+ default:+ break;+ }+ } while (i != startsAt);+ } else {+ int hiByte = (curChar >> 8);+ int i1 = hiByte >> 6;+ long l1 = 1L << (hiByte & 077);+ int i2 = (curChar & 0xff) >> 6;+ long l2 = 1L << (curChar & 077);+ do {+ switch (jjstateSet[--i]) {+ case 32:+ case 23:+ if (!jjCanMove_2(hiByte, i1, i2, l1, l2)) break;+ if (kind > 25) kind = 25;+ {+ jjCheckNAddTwoStates(23, 24);+ }+ break;+ case 0:+ if (jjCanMove_0(hiByte, i1, i2, l1, l2)) {+ if (kind > 7) kind = 7;+ }+ if (jjCanMove_2(hiByte, i1, i2, l1, l2)) {+ if (kind > 25) kind = 25;+ {+ jjCheckNAddTwoStates(23, 24);+ }+ }+ break;+ case 15:+ case 17:+ if (jjCanMove_1(hiByte, i1, i2, l1, l2)) {+ jjCheckNAddStates(3, 5);+ }+ break;+ case 22:+ if (!jjCanMove_2(hiByte, i1, i2, l1, l2)) break;+ if (kind > 25) kind = 25;+ {+ jjCheckNAddTwoStates(23, 24);+ }+ break;+ case 25:+ if (!jjCanMove_1(hiByte, i1, i2, l1, l2)) break;+ if (kind > 25) kind = 25;+ {+ jjCheckNAddTwoStates(23, 24);+ }+ break;+ case 28:+ if (jjCanMove_1(hiByte, i1, i2, l1, l2)) {+ jjAddStates(0, 2);+ }+ break;+ default:+ if (i1 == 0 || l1 == 0 || i2 == 0 || l2 == 0) break;+ else break;+ }+ } while (i != startsAt);}- if (kind != 0x7fffffff)- {- jjmatchedKind = kind;- jjmatchedPos = curPos;- kind = 0x7fffffff;+ if (kind != 0x7fffffff) {+ jjmatchedKind = kind;+ jjmatchedPos = curPos;+ kind = 0x7fffffff;}++curPos;- if ((i = jjnewStateCnt) == (startsAt = 32 - (jjnewStateCnt = startsAt)))- return curPos;- try { curChar = input_stream.readChar(); }- catch(java.io.IOException e) { return curPos; }- }-}-private final int jjStopStringLiteralDfa_0(int pos, long active0){- switch (pos)- {+ if ((i = jjnewStateCnt) == (startsAt = 32 - (jjnewStateCnt = startsAt))) return curPos;+ try {+ curChar = input_stream.readChar();+ } catch (java.io.IOException e) {+ return curPos;+ }+ }+ }++ private final int jjStopStringLiteralDfa_0(int pos, long active0) {+ switch (pos) {case 0:- if ((active0 & 0x800000000000L) != 0L)- return 19;- if ((active0 & 0x80000000L) != 0L)- return 79;- if ((active0 & 0x400000000L) != 0L)- return 63;- return -1;+ if ((active0 & 0x800000000000L) != 0L) return 19;+ if ((active0 & 0x80000000L) != 0L) return 79;+ if ((active0 & 0x400000000L) != 0L) return 63;+ return -1;case 1:- if ((active0 & 0x400000000L) != 0L)- return 62;- if ((active0 & 0x800000000000L) != 0L)- return 18;- return -1;+ if ((active0 & 0x400000000L) != 0L) return 62;+ if ((active0 & 0x800000000000L) != 0L) return 18;+ return -1;case 2:- if ((active0 & 0x800000000000L) != 0L)- return 17;- if ((active0 & 0x400000000L) != 0L)- return 61;- return -1;+ if ((active0 & 0x800000000000L) != 0L) return 17;+ if ((active0 & 0x400000000L) != 0L) return 61;+ return -1;case 3:- if ((active0 & 0x400000000L) != 0L)- return 60;- if ((active0 & 0x800000000000L) != 0L)- return 16;- return -1;+ if ((active0 & 0x400000000L) != 0L) return 60;+ if ((active0 & 0x800000000000L) != 0L) return 16;+ return -1;case 4:- if ((active0 & 0x800000000000L) != 0L)- return 15;- if ((active0 & 0x400000000L) != 0L)- return 59;- return -1;+ if ((active0 & 0x800000000000L) != 0L) return 15;+ if ((active0 & 0x400000000L) != 0L) return 59;+ return -1;case 5:- if ((active0 & 0x400000000L) != 0L)- return 58;- if ((active0 & 0x800000000000L) != 0L)- return 14;- return -1;+ if ((active0 & 0x400000000L) != 0L) return 58;+ if ((active0 & 0x800000000000L) != 0L) return 14;+ return -1;case 6:- if ((active0 & 0x800000000000L) != 0L)- return 13;- if ((active0 & 0x400000000L) != 0L)- return 57;- return -1;+ if ((active0 & 0x800000000000L) != 0L) return 13;+ if ((active0 & 0x400000000L) != 0L) return 57;+ return -1;case 7:- if ((active0 & 0x800000000000L) != 0L)- return 12;- return -1;+ if ((active0 & 0x800000000000L) != 0L) return 12;+ return -1;case 8:- if ((active0 & 0x800000000000L) != 0L)- return 11;- return -1;- default :- return -1;- }-}-private final int jjStartNfa_0(int pos, long active0){- return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0), pos + 1);-}-private int jjMoveStringLiteralDfa0_0(){- switch(curChar)- {+ if ((active0 & 0x800000000000L) != 0L) return 11;+ return -1;+ default:+ return -1;+ }+ }++ private final int jjStartNfa_0(int pos, long active0) {+ return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0), pos + 1);+ }++ private int jjMoveStringLiteralDfa0_0() {+ switch (curChar) {case 40:- return jjStopAtPos(0, 29);+ return jjStopAtPos(0, 29);case 97:- return jjMoveStringLiteralDfa1_0(0x80000000L);+ return jjMoveStringLiteralDfa1_0(0x80000000L);case 98:- return jjMoveStringLiteralDfa1_0(0x100000000L);+ return jjMoveStringLiteralDfa1_0(0x100000000L);case 99:- return jjMoveStringLiteralDfa1_0(0x400000000L);+ return jjMoveStringLiteralDfa1_0(0x400000000L);case 101:- return jjMoveStringLiteralDfa1_0(0x800000000L);+ return jjMoveStringLiteralDfa1_0(0x800000000L);case 111:- return jjMoveStringLiteralDfa1_0(0x301000000000L);+ return jjMoveStringLiteralDfa1_0(0x301000000000L);case 112:- return jjMoveStringLiteralDfa1_0(0x400000000000L);+ return jjMoveStringLiteralDfa1_0(0x400000000000L);case 117:- return jjMoveStringLiteralDfa1_0(0x800000000000L);+ return jjMoveStringLiteralDfa1_0(0x800000000000L);case 119:- return jjMoveStringLiteralDfa1_0(0x6000000000000L);- default :- return jjMoveNfa_0(0, 0);- }-}-private int jjMoveStringLiteralDfa1_0(long active0){- try { curChar = input_stream.readChar(); }- catch(java.io.IOException e) {+ return jjMoveStringLiteralDfa1_0(0x6000000000000L);+ default:+ return jjMoveNfa_0(0, 0);+ }+ }++ private int jjMoveStringLiteralDfa1_0(long active0) {+ try {+ curChar = input_stream.readChar();+ } catch (java.io.IOException e) {jjStopStringLiteralDfa_0(0, active0);return 1;- }- switch(curChar)- {+ }+ switch (curChar) {case 101:- return jjMoveStringLiteralDfa2_0(active0, 0x100000000L);+ return jjMoveStringLiteralDfa2_0(active0, 0x100000000L);case 102:- return jjMoveStringLiteralDfa2_0(active0, 0x80000000L);+ return jjMoveStringLiteralDfa2_0(active0, 0x80000000L);case 104:- return jjMoveStringLiteralDfa2_0(active0, 0x400000000000L);+ return jjMoveStringLiteralDfa2_0(active0, 0x400000000000L);case 105:- return jjMoveStringLiteralDfa2_0(active0, 0x6000000000000L);+ return jjMoveStringLiteralDfa2_0(active0, 0x6000000000000L);case 110:- return jjMoveStringLiteralDfa2_0(active0, 0x800000000000L);+ return jjMoveStringLiteralDfa2_0(active0, 0x800000000000L);case 111:- return jjMoveStringLiteralDfa2_0(active0, 0x400000000L);+ return jjMoveStringLiteralDfa2_0(active0, 0x400000000L);case 114:- if ((active0 & 0x1000000000L) != 0L)- {- jjmatchedKind = 36;- jjmatchedPos = 1;- }- return jjMoveStringLiteralDfa2_0(active0, 0x100000000000L);+ if ((active0 & 0x1000000000L) != 0L) {+ jjmatchedKind = 36;+ jjmatchedPos = 1;+ }+ return jjMoveStringLiteralDfa2_0(active0, 0x100000000000L);case 118:- return jjMoveStringLiteralDfa2_0(active0, 0x200000000000L);+ return jjMoveStringLiteralDfa2_0(active0, 0x200000000000L);case 120:- return jjMoveStringLiteralDfa2_0(active0, 0x800000000L);- default :- break;- }- return jjStartNfa_0(0, active0);-}-private int jjMoveStringLiteralDfa2_0(long old0, long active0){- if (((active0 &= old0)) == 0L)- return jjStartNfa_0(0, old0);- try { curChar = input_stream.readChar(); }- catch(java.io.IOException e) {+ return jjMoveStringLiteralDfa2_0(active0, 0x800000000L);+ default:+ break;+ }+ return jjStartNfa_0(0, active0);+ }++ private int jjMoveStringLiteralDfa2_0(long old0, long active0) {+ if (((active0 &= old0)) == 0L) return jjStartNfa_0(0, old0);+ try {+ curChar = input_stream.readChar();+ } catch (java.io.IOException e) {jjStopStringLiteralDfa_0(1, active0);return 2;- }- switch(curChar)- {+ }+ switch (curChar) {case 100:- return jjMoveStringLiteralDfa3_0(active0, 0x100000000000L);+ return jjMoveStringLiteralDfa3_0(active0, 0x100000000000L);case 101:- return jjMoveStringLiteralDfa3_0(active0, 0x200000000000L);+ return jjMoveStringLiteralDfa3_0(active0, 0x200000000000L);case 102:- return jjMoveStringLiteralDfa3_0(active0, 0x100000000L);+ return jjMoveStringLiteralDfa3_0(active0, 0x100000000L);case 108:- return jjMoveStringLiteralDfa3_0(active0, 0x2000000000000L);+ return jjMoveStringLiteralDfa3_0(active0, 0x2000000000000L);case 110:- return jjMoveStringLiteralDfa3_0(active0, 0x400000000L);+ return jjMoveStringLiteralDfa3_0(active0, 0x400000000L);case 111:- return jjMoveStringLiteralDfa3_0(active0, 0x800000000000L);+ return jjMoveStringLiteralDfa3_0(active0, 0x800000000000L);case 114:- return jjMoveStringLiteralDfa3_0(active0, 0x400000000000L);+ return jjMoveStringLiteralDfa3_0(active0, 0x400000000000L);case 116:- return jjMoveStringLiteralDfa3_0(active0, 0x4000880000000L);- default :- break;- }- return jjStartNfa_0(1, active0);-}-private int jjMoveStringLiteralDfa3_0(long old0, long active0){- if (((active0 &= old0)) == 0L)- return jjStartNfa_0(1, old0);- try { curChar = input_stream.readChar(); }- catch(java.io.IOException e) {+ return jjMoveStringLiteralDfa3_0(active0, 0x4000880000000L);+ default:+ break;+ }+ return jjStartNfa_0(1, active0);+ }++ private int jjMoveStringLiteralDfa3_0(long old0, long active0) {+ if (((active0 &= old0)) == 0L) return jjStartNfa_0(1, old0);+ try {+ curChar = input_stream.readChar();+ } catch (java.io.IOException e) {jjStopStringLiteralDfa_0(2, active0);return 3;- }- switch(curChar)- {+ }+ switch (curChar) {case 97:- return jjMoveStringLiteralDfa4_0(active0, 0x400000000000L);+ return jjMoveStringLiteralDfa4_0(active0, 0x400000000000L);case 100:- return jjMoveStringLiteralDfa4_0(active0, 0x2000000000000L);+ return jjMoveStringLiteralDfa4_0(active0, 0x2000000000000L);case 101:- return jjMoveStringLiteralDfa4_0(active0, 0x100880000000L);+ return jjMoveStringLiteralDfa4_0(active0, 0x100880000000L);case 104:- return jjMoveStringLiteralDfa4_0(active0, 0x4000000000000L);+ return jjMoveStringLiteralDfa4_0(active0, 0x4000000000000L);case 111:- return jjMoveStringLiteralDfa4_0(active0, 0x100000000L);+ return jjMoveStringLiteralDfa4_0(active0, 0x100000000L);case 114:- return jjMoveStringLiteralDfa4_0(active0, 0xa00000000000L);+ return jjMoveStringLiteralDfa4_0(active0, 0xa00000000000L);case 116:- return jjMoveStringLiteralDfa4_0(active0, 0x400000000L);- default :- break;- }- return jjStartNfa_0(2, active0);-}-private int jjMoveStringLiteralDfa4_0(long old0, long active0){- if (((active0 &= old0)) == 0L)- return jjStartNfa_0(2, old0);- try { curChar = input_stream.readChar(); }- catch(java.io.IOException e) {+ return jjMoveStringLiteralDfa4_0(active0, 0x400000000L);+ default:+ break;+ }+ return jjStartNfa_0(2, active0);+ }++ private int jjMoveStringLiteralDfa4_0(long old0, long active0) {+ if (((active0 &= old0)) == 0L) return jjStartNfa_0(2, old0);+ try {+ curChar = input_stream.readChar();+ } catch (java.io.IOException e) {jjStopStringLiteralDfa_0(3, active0);return 4;- }- switch(curChar)- {+ }+ switch (curChar) {case 97:- return jjMoveStringLiteralDfa5_0(active0, 0x400000000L);+ return jjMoveStringLiteralDfa5_0(active0, 0x400000000L);case 99:- return jjMoveStringLiteralDfa5_0(active0, 0x2000000000000L);+ return jjMoveStringLiteralDfa5_0(active0, 0x2000000000000L);case 100:- return jjMoveStringLiteralDfa5_0(active0, 0x800000000000L);+ return jjMoveStringLiteralDfa5_0(active0, 0x800000000000L);case 105:- return jjMoveStringLiteralDfa5_0(active0, 0x4000000000000L);+ return jjMoveStringLiteralDfa5_0(active0, 0x4000000000000L);case 108:- return jjMoveStringLiteralDfa5_0(active0, 0x200000000000L);+ return jjMoveStringLiteralDfa5_0(active0, 0x200000000000L);case 110:- return jjMoveStringLiteralDfa5_0(active0, 0x800000000L);+ return jjMoveStringLiteralDfa5_0(active0, 0x800000000L);case 114:- if ((active0 & 0x80000000L) != 0L)- return jjStopAtPos(4, 31);- return jjMoveStringLiteralDfa5_0(active0, 0x100100000000L);+ if ((active0 & 0x80000000L) != 0L) return jjStopAtPos(4, 31);+ return jjMoveStringLiteralDfa5_0(active0, 0x100100000000L);case 115:- return jjMoveStringLiteralDfa5_0(active0, 0x400000000000L);- default :- break;- }- return jjStartNfa_0(3, active0);-}-private int jjMoveStringLiteralDfa5_0(long old0, long active0){- if (((active0 &= old0)) == 0L)- return jjStartNfa_0(3, old0);- try { curChar = input_stream.readChar(); }- catch(java.io.IOException e) {+ return jjMoveStringLiteralDfa5_0(active0, 0x400000000000L);+ default:+ break;+ }+ return jjStartNfa_0(3, active0);+ }++ private int jjMoveStringLiteralDfa5_0(long old0, long active0) {+ if (((active0 &= old0)) == 0L) return jjStartNfa_0(3, old0);+ try {+ curChar = input_stream.readChar();+ } catch (java.io.IOException e) {jjStopStringLiteralDfa_0(4, active0);return 5;- }- switch(curChar)- {+ }+ switch (curChar) {case 97:- return jjMoveStringLiteralDfa6_0(active0, 0x2200000000000L);+ return jjMoveStringLiteralDfa6_0(active0, 0x2200000000000L);case 100:- if ((active0 & 0x800000000L) != 0L)- return jjStopAtPos(5, 35);- break;+ if ((active0 & 0x800000000L) != 0L) return jjStopAtPos(5, 35);+ break;case 101:- if ((active0 & 0x100000000L) != 0L)- return jjStopAtPos(5, 32);- else if ((active0 & 0x400000000000L) != 0L)- return jjStopAtPos(5, 46);- return jjMoveStringLiteralDfa6_0(active0, 0x900000000000L);+ if ((active0 & 0x100000000L) != 0L) return jjStopAtPos(5, 32);+ else if ((active0 & 0x400000000000L) != 0L) return jjStopAtPos(5, 46);+ return jjMoveStringLiteralDfa6_0(active0, 0x900000000000L);case 105:- return jjMoveStringLiteralDfa6_0(active0, 0x400000000L);+ return jjMoveStringLiteralDfa6_0(active0, 0x400000000L);case 110:- if ((active0 & 0x4000000000000L) != 0L)- return jjStopAtPos(5, 50);- break;- default :- break;- }- return jjStartNfa_0(4, active0);-}-private int jjMoveStringLiteralDfa6_0(long old0, long active0){- if (((active0 &= old0)) == 0L)- return jjStartNfa_0(4, old0);- try { curChar = input_stream.readChar(); }- catch(java.io.IOException e) {+ if ((active0 & 0x4000000000000L) != 0L) return jjStopAtPos(5, 50);+ break;+ default:+ break;+ }+ return jjStartNfa_0(4, active0);+ }++ private int jjMoveStringLiteralDfa6_0(long old0, long active0) {+ if (((active0 &= old0)) == 0L) return jjStartNfa_0(4, old0);+ try {+ curChar = input_stream.readChar();+ } catch (java.io.IOException e) {jjStopStringLiteralDfa_0(5, active0);return 6;- }- switch(curChar)- {+ }+ switch (curChar) {case 100:- if ((active0 & 0x100000000000L) != 0L)- return jjStopAtPos(6, 44);- break;+ if ((active0 & 0x100000000000L) != 0L) return jjStopAtPos(6, 44);+ break;case 110:- return jjMoveStringLiteralDfa7_0(active0, 0x400000000L);+ return jjMoveStringLiteralDfa7_0(active0, 0x400000000L);case 112:- return jjMoveStringLiteralDfa7_0(active0, 0x200000000000L);+ return jjMoveStringLiteralDfa7_0(active0, 0x200000000000L);case 114:- return jjMoveStringLiteralDfa7_0(active0, 0x2800000000000L);- default :- break;- }- return jjStartNfa_0(5, active0);-}-private int jjMoveStringLiteralDfa7_0(long old0, long active0){- if (((active0 &= old0)) == 0L)- return jjStartNfa_0(5, old0);- try { curChar = input_stream.readChar(); }- catch(java.io.IOException e) {+ return jjMoveStringLiteralDfa7_0(active0, 0x2800000000000L);+ default:+ break;+ }+ return jjStartNfa_0(5, active0);+ }++ private int jjMoveStringLiteralDfa7_0(long old0, long active0) {+ if (((active0 &= old0)) == 0L) return jjStartNfa_0(5, old0);+ try {+ curChar = input_stream.readChar();+ } catch (java.io.IOException e) {jjStopStringLiteralDfa_0(6, active0);return 7;- }- switch(curChar)- {+ }+ switch (curChar) {case 100:- if ((active0 & 0x2000000000000L) != 0L)- return jjStopAtPos(7, 49);- break;+ if ((active0 & 0x2000000000000L) != 0L) return jjStopAtPos(7, 49);+ break;case 101:- return jjMoveStringLiteralDfa8_0(active0, 0x800000000000L);+ return jjMoveStringLiteralDfa8_0(active0, 0x800000000000L);case 105:- return jjMoveStringLiteralDfa8_0(active0, 0x400000000L);+ return jjMoveStringLiteralDfa8_0(active0, 0x400000000L);case 112:- return jjMoveStringLiteralDfa8_0(active0, 0x200000000000L);- default :- break;- }- return jjStartNfa_0(6, active0);-}-private int jjMoveStringLiteralDfa8_0(long old0, long active0){- if (((active0 &= old0)) == 0L)- return jjStartNfa_0(6, old0);- try { curChar = input_stream.readChar(); }- catch(java.io.IOException e) {+ return jjMoveStringLiteralDfa8_0(active0, 0x200000000000L);+ default:+ break;+ }+ return jjStartNfa_0(6, active0);+ }++ private int jjMoveStringLiteralDfa8_0(long old0, long active0) {+ if (((active0 &= old0)) == 0L) return jjStartNfa_0(6, old0);+ try {+ curChar = input_stream.readChar();+ } catch (java.io.IOException e) {jjStopStringLiteralDfa_0(7, active0);return 8;- }- switch(curChar)- {+ }+ switch (curChar) {case 100:- if ((active0 & 0x800000000000L) != 0L)- return jjStartNfaWithStates_0(8, 47, 11);- break;+ if ((active0 & 0x800000000000L) != 0L) return jjStartNfaWithStates_0(8, 47, 11);+ break;case 105:- return jjMoveStringLiteralDfa9_0(active0, 0x200000000000L);+ return jjMoveStringLiteralDfa9_0(active0, 0x200000000000L);case 110:- return jjMoveStringLiteralDfa9_0(active0, 0x400000000L);- default :- break;- }- return jjStartNfa_0(7, active0);-}-private int jjMoveStringLiteralDfa9_0(long old0, long active0){- if (((active0 &= old0)) == 0L)- return jjStartNfa_0(7, old0);- try { curChar = input_stream.readChar(); }- catch(java.io.IOException e) {+ return jjMoveStringLiteralDfa9_0(active0, 0x400000000L);+ default:+ break;+ }+ return jjStartNfa_0(7, active0);+ }++ private int jjMoveStringLiteralDfa9_0(long old0, long active0) {+ if (((active0 &= old0)) == 0L) return jjStartNfa_0(7, old0);+ try {+ curChar = input_stream.readChar();+ } catch (java.io.IOException e) {jjStopStringLiteralDfa_0(8, active0);return 9;- }- switch(curChar)- {+ }+ switch (curChar) {case 103:- if ((active0 & 0x400000000L) != 0L)- return jjStopAtPos(9, 34);- break;+ if ((active0 & 0x400000000L) != 0L) return jjStopAtPos(9, 34);+ break;case 110:- return jjMoveStringLiteralDfa10_0(active0, 0x200000000000L);- default :- break;- }- return jjStartNfa_0(8, active0);-}-private int jjMoveStringLiteralDfa10_0(long old0, long active0){- if (((active0 &= old0)) == 0L)- return jjStartNfa_0(8, old0);- try { curChar = input_stream.readChar(); }- catch(java.io.IOException e) {+ return jjMoveStringLiteralDfa10_0(active0, 0x200000000000L);+ default:+ break;+ }+ return jjStartNfa_0(8, active0);+ }++ private int jjMoveStringLiteralDfa10_0(long old0, long active0) {+ if (((active0 &= old0)) == 0L) return jjStartNfa_0(8, old0);+ try {+ curChar = input_stream.readChar();+ } catch (java.io.IOException e) {jjStopStringLiteralDfa_0(9, active0);return 10;- }- switch(curChar)- {+ }+ switch (curChar) {case 103:- if ((active0 & 0x200000000000L) != 0L)- return jjStopAtPos(10, 45);- break;- default :- break;- }- return jjStartNfa_0(9, active0);-}-private int jjStartNfaWithStates_0(int pos, int kind, int state)-{- jjmatchedKind = kind;- jjmatchedPos = pos;- try { curChar = input_stream.readChar(); }- catch(java.io.IOException e) { return pos + 1; }- return jjMoveNfa_0(state, pos + 1);-}-private int jjMoveNfa_0(int startState, int curPos)-{- int startsAt = 0;- jjnewStateCnt = 199;- int i = 1;- jjstateSet[0] = startState;- int kind = 0x7fffffff;- for (;;)- {- if (++jjround == 0x7fffffff)- ReInitRounds();- if (curChar < 64)- {- long l = 1L << curChar;- do- {- switch(jjstateSet[--i])- {- case 0:- if ((0x100002600L & l) != 0L)- kind = 7;- break;- default : break;- }- } while(i != startsAt);- }- else if (curChar < 128)- {- long l = 1L << (curChar & 077);- do- {- switch(jjstateSet[--i])- {- case 18:- if (curChar == 111)- jjstateSet[jjnewStateCnt++] = 34;- if (curChar == 111)- jjstateSet[jjnewStateCnt++] = 17;- break;- case 13:- if (curChar == 101)- jjstateSet[jjnewStateCnt++] = 29;- if (curChar == 101)- jjstateSet[jjnewStateCnt++] = 12;- break;- case 60:- if (curChar == 97)- jjstateSet[jjnewStateCnt++] = 68;- if (curChar == 97)- jjstateSet[jjnewStateCnt++] = 59;- break;- case 19:- if (curChar == 110)- jjstateSet[jjnewStateCnt++] = 35;- if (curChar == 110)- jjstateSet[jjnewStateCnt++] = 18;- break;- case 57:- if (curChar == 101)- jjstateSet[jjnewStateCnt++] = 65;- if (curChar == 101)- jjstateSet[jjnewStateCnt++] = 56;- break;- case 58:- if (curChar == 110)- jjstateSet[jjnewStateCnt++] = 66;- if (curChar == 110)- jjstateSet[jjnewStateCnt++] = 57;- break;- case 59:- if (curChar == 105)- jjstateSet[jjnewStateCnt++] = 67;- if (curChar == 105)- jjstateSet[jjnewStateCnt++] = 58;- break;- case 61:- if (curChar == 116)- jjstateSet[jjnewStateCnt++] = 69;- if (curChar == 116)- jjstateSet[jjnewStateCnt++] = 60;- break;- case 14:- if (curChar == 114)- jjstateSet[jjnewStateCnt++] = 30;- if (curChar == 114)- jjstateSet[jjnewStateCnt++] = 13;- break;- case 62:- if (curChar == 110)- jjstateSet[jjnewStateCnt++] = 70;- if (curChar == 110)- jjstateSet[jjnewStateCnt++] = 61;- break;- case 15:- if (curChar == 101)- jjstateSet[jjnewStateCnt++] = 31;- if (curChar == 101)- jjstateSet[jjnewStateCnt++] = 14;- break;- case 63:- if (curChar == 111)- jjstateSet[jjnewStateCnt++] = 71;- if (curChar == 111)- jjstateSet[jjnewStateCnt++] = 62;- break;- case 16:- if (curChar == 100)- jjstateSet[jjnewStateCnt++] = 32;- if (curChar == 100)- jjstateSet[jjnewStateCnt++] = 15;- break;- case 0:- if (curChar == 109)- { jjAddStates(6, 9); }- else if (curChar == 110)- { jjAddStates(10, 17); }- else if (curChar == 97)- { jjAddStates(18, 19); }- else if (curChar == 99)- { jjAddStates(20, 21); }- else if (curChar == 102)- { jjAddStates(22, 23); }- else if (curChar == 117)- { jjAddStates(24, 25); }- break;- case 11:- if (curChar == 110)- jjstateSet[jjnewStateCnt++] = 27;- else if (curChar == 78)- jjstateSet[jjnewStateCnt++] = 10;- break;- case 17:- if (curChar == 114)- jjstateSet[jjnewStateCnt++] = 33;- if (curChar == 114)- jjstateSet[jjnewStateCnt++] = 16;- break;- case 79:- if (curChar == 116)- jjstateSet[jjnewStateCnt++] = 83;- if (curChar == 116)- jjstateSet[jjnewStateCnt++] = 78;- break;- case 12:- if (curChar == 100)- jjstateSet[jjnewStateCnt++] = 28;- if (curChar == 100)- jjstateSet[jjnewStateCnt++] = 11;- break;- case 1:- if (curChar == 117)- { jjAddStates(24, 25); }- break;- case 2:- if (curChar == 115 && kind > 48)- kind = 48;- break;- case 3:- case 20:- if (curChar == 112)- { jjCheckNAdd(2); }- break;- case 4:- if (curChar == 97)- jjstateSet[jjnewStateCnt++] = 3;- break;- case 5:- if (curChar == 108)- jjstateSet[jjnewStateCnt++] = 4;- break;- case 6:- if (curChar == 114)- jjstateSet[jjnewStateCnt++] = 5;- break;- case 7:- if (curChar == 101)- jjstateSet[jjnewStateCnt++] = 6;- break;- case 8:- if (curChar == 118)- jjstateSet[jjnewStateCnt++] = 7;- break;- case 9:- if (curChar == 79)- jjstateSet[jjnewStateCnt++] = 8;- break;- case 10:- if (curChar == 111)- jjstateSet[jjnewStateCnt++] = 9;- break;- case 21:- if (curChar == 97)- jjstateSet[jjnewStateCnt++] = 20;- break;- case 22:- if (curChar == 108)- jjstateSet[jjnewStateCnt++] = 21;- break;- case 23:- if (curChar == 114)- jjstateSet[jjnewStateCnt++] = 22;- break;- case 24:- if (curChar == 101)- jjstateSet[jjnewStateCnt++] = 23;- break;- case 25:- if (curChar == 118)- jjstateSet[jjnewStateCnt++] = 24;- break;- case 26:- if (curChar == 111)- jjstateSet[jjnewStateCnt++] = 25;- break;- case 27:- if (curChar == 111)- jjstateSet[jjnewStateCnt++] = 26;- break;- case 28:- if (curChar == 110)- jjstateSet[jjnewStateCnt++] = 27;- break;- case 29:- if (curChar == 100)- jjstateSet[jjnewStateCnt++] = 28;- break;- case 30:- if (curChar == 101)- jjstateSet[jjnewStateCnt++] = 29;- break;- case 31:- if (curChar == 114)- jjstateSet[jjnewStateCnt++] = 30;- break;- case 32:- if (curChar == 101)- jjstateSet[jjnewStateCnt++] = 31;- break;- case 33:- if (curChar == 100)- jjstateSet[jjnewStateCnt++] = 32;- break;- case 34:- if (curChar == 114)- jjstateSet[jjnewStateCnt++] = 33;- break;- case 35:- if (curChar == 111)- jjstateSet[jjnewStateCnt++] = 34;- break;- case 36:- if (curChar == 110)- jjstateSet[jjnewStateCnt++] = 35;- break;- case 37:- if (curChar == 102)- { jjAddStates(22, 23); }- break;- case 38:- if (curChar == 109 && kind > 37)- kind = 37;- break;- case 39:- case 46:- if (curChar == 114)- { jjCheckNAdd(38); }- break;- case 40:- if (curChar == 101)- jjstateSet[jjnewStateCnt++] = 39;- break;- case 41:- if (curChar == 116)- jjstateSet[jjnewStateCnt++] = 40;- break;- case 42:- if (curChar == 121)- jjstateSet[jjnewStateCnt++] = 41;- break;- case 43:- if (curChar == 122)- jjstateSet[jjnewStateCnt++] = 42;- break;- case 44:- if (curChar == 122)- jjstateSet[jjnewStateCnt++] = 43;- break;- case 45:- if (curChar == 117)- jjstateSet[jjnewStateCnt++] = 44;- break;- case 47:- if (curChar == 101)- jjstateSet[jjnewStateCnt++] = 46;- break;- case 48:- if (curChar == 84)- jjstateSet[jjnewStateCnt++] = 47;- break;- case 49:- if (curChar == 121)- jjstateSet[jjnewStateCnt++] = 48;- break;- case 50:- if (curChar == 122)- jjstateSet[jjnewStateCnt++] = 49;- break;- case 51:- if (curChar == 122)- jjstateSet[jjnewStateCnt++] = 50;- break;- case 52:- if (curChar == 117)- jjstateSet[jjnewStateCnt++] = 51;- break;- case 53:- if (curChar == 99)- { jjAddStates(20, 21); }- break;- case 54:- if (curChar == 121 && kind > 33)- kind = 33;- break;- case 55:- if (curChar == 66)- { jjCheckNAdd(54); }- break;- case 56:- if (curChar == 100)- jjstateSet[jjnewStateCnt++] = 55;- break;- case 64:- if (curChar == 98)- { jjCheckNAdd(54); }- break;- case 65:- if (curChar == 100)- jjstateSet[jjnewStateCnt++] = 64;- break;- case 66:- if (curChar == 101)- jjstateSet[jjnewStateCnt++] = 65;- break;- case 67:- if (curChar == 110)- jjstateSet[jjnewStateCnt++] = 66;- break;- case 68:- if (curChar == 105)- jjstateSet[jjnewStateCnt++] = 67;- break;- case 69:- if (curChar == 97)- jjstateSet[jjnewStateCnt++] = 68;- break;- case 70:- if (curChar == 116)- jjstateSet[jjnewStateCnt++] = 69;- break;- case 71:- if (curChar == 110)- jjstateSet[jjnewStateCnt++] = 70;- break;- case 72:- if (curChar == 111)- jjstateSet[jjnewStateCnt++] = 71;- break;- case 73:- if (curChar == 97)- { jjAddStates(18, 19); }- break;- case 74:- if (curChar == 116 && kind > 30)- kind = 30;- break;- case 75:- case 80:- if (curChar == 115)- { jjCheckNAdd(74); }- break;- case 76:- if (curChar == 97)- jjstateSet[jjnewStateCnt++] = 75;- break;- case 77:- if (curChar == 101)- jjstateSet[jjnewStateCnt++] = 76;- break;- case 78:- if (curChar == 108)- jjstateSet[jjnewStateCnt++] = 77;- break;- case 81:- if (curChar == 97)- jjstateSet[jjnewStateCnt++] = 80;- break;- case 82:- if (curChar == 101)- jjstateSet[jjnewStateCnt++] = 81;- break;- case 83:- if (curChar == 76)- jjstateSet[jjnewStateCnt++] = 82;- break;- case 84:- if (curChar == 116)- jjstateSet[jjnewStateCnt++] = 83;- break;- case 85:- if (curChar == 110)- { jjAddStates(10, 17); }- break;- case 86:- if (curChar == 103 && kind > 40)- kind = 40;- break;- case 87:- case 99:- if (curChar == 110)- { jjCheckNAdd(86); }- break;- case 88:- if (curChar == 105)- jjstateSet[jjnewStateCnt++] = 87;- break;- case 89:- if (curChar == 112)- jjstateSet[jjnewStateCnt++] = 88;- break;- case 90:- if (curChar == 112)- jjstateSet[jjnewStateCnt++] = 89;- break;- case 91:- if (curChar == 97)- jjstateSet[jjnewStateCnt++] = 90;- break;- case 92:- if (curChar == 108)- jjstateSet[jjnewStateCnt++] = 91;- break;- case 93:- if (curChar == 114)- jjstateSet[jjnewStateCnt++] = 92;- break;- case 94:- if (curChar == 101)- jjstateSet[jjnewStateCnt++] = 93;- break;- case 95:- if (curChar == 118)- jjstateSet[jjnewStateCnt++] = 94;- break;- case 96:- if (curChar == 79)- jjstateSet[jjnewStateCnt++] = 95;- break;- case 97:- if (curChar == 110)- jjstateSet[jjnewStateCnt++] = 96;- break;- case 98:- if (curChar == 111)- jjstateSet[jjnewStateCnt++] = 97;- break;- case 100:- if (curChar == 105)- jjstateSet[jjnewStateCnt++] = 99;- break;- case 101:- if (curChar == 112)- jjstateSet[jjnewStateCnt++] = 100;- break;- case 102:- if (curChar == 112)- jjstateSet[jjnewStateCnt++] = 101;- break;- case 103:- if (curChar == 97)- jjstateSet[jjnewStateCnt++] = 102;- break;- case 104:- if (curChar == 108)- jjstateSet[jjnewStateCnt++] = 103;- break;- case 105:- if (curChar == 114)- jjstateSet[jjnewStateCnt++] = 104;- break;- case 106:- if (curChar == 101)- jjstateSet[jjnewStateCnt++] = 105;- break;- case 107:- if (curChar == 118)- jjstateSet[jjnewStateCnt++] = 106;- break;- case 108:- if (curChar == 111)- jjstateSet[jjnewStateCnt++] = 107;- break;- case 109:- if (curChar == 110)- jjstateSet[jjnewStateCnt++] = 108;- break;- case 110:- if (curChar == 111)- jjstateSet[jjnewStateCnt++] = 109;- break;- case 111:- if (curChar == 121 && kind > 41)- kind = 41;- break;- case 112:- if (curChar == 66)- { jjCheckNAdd(111); }- break;- case 113:- if (curChar == 100)- jjstateSet[jjnewStateCnt++] = 112;- break;- case 114:- if (curChar == 101)- jjstateSet[jjnewStateCnt++] = 113;- break;- case 115:- if (curChar == 110)- jjstateSet[jjnewStateCnt++] = 114;- break;- case 116:- if (curChar == 105)- jjstateSet[jjnewStateCnt++] = 115;- break;- case 117:- if (curChar == 97)- jjstateSet[jjnewStateCnt++] = 116;- break;- case 118:- if (curChar == 116)- jjstateSet[jjnewStateCnt++] = 117;- break;- case 119:- if (curChar == 110)- jjstateSet[jjnewStateCnt++] = 118;- break;- case 120:- if (curChar == 111)- jjstateSet[jjnewStateCnt++] = 119;- break;- case 121:- if (curChar == 67)- jjstateSet[jjnewStateCnt++] = 120;- break;- case 122:- if (curChar == 116)- jjstateSet[jjnewStateCnt++] = 121;- break;- case 123:- if (curChar == 111)- jjstateSet[jjnewStateCnt++] = 122;- break;- case 124:- if (curChar == 98)- { jjCheckNAdd(111); }- break;- case 125:- if (curChar == 100)- jjstateSet[jjnewStateCnt++] = 124;- break;- case 126:- if (curChar == 101)- jjstateSet[jjnewStateCnt++] = 125;- break;- case 127:- if (curChar == 110)- jjstateSet[jjnewStateCnt++] = 126;- break;- case 128:- if (curChar == 105)- jjstateSet[jjnewStateCnt++] = 127;- break;- case 129:- if (curChar == 97)- jjstateSet[jjnewStateCnt++] = 128;- break;- case 130:- if (curChar == 116)- jjstateSet[jjnewStateCnt++] = 129;- break;- case 131:- if (curChar == 110)- jjstateSet[jjnewStateCnt++] = 130;- break;- case 132:- if (curChar == 111)- jjstateSet[jjnewStateCnt++] = 131;- break;- case 133:- if (curChar == 99)- jjstateSet[jjnewStateCnt++] = 132;- break;- case 134:- if (curChar == 116)- jjstateSet[jjnewStateCnt++] = 133;- break;- case 135:- if (curChar == 111)- jjstateSet[jjnewStateCnt++] = 134;- break;- case 136:- if (curChar == 103 && kind > 42)- kind = 42;- break;- case 137:- case 148:- if (curChar == 110)- { jjCheckNAdd(136); }- break;- case 138:- if (curChar == 105)- jjstateSet[jjnewStateCnt++] = 137;- break;- case 139:- if (curChar == 110)- jjstateSet[jjnewStateCnt++] = 138;- break;- case 140:- if (curChar == 105)- jjstateSet[jjnewStateCnt++] = 139;- break;- case 141:- if (curChar == 97)- jjstateSet[jjnewStateCnt++] = 140;- break;- case 142:- if (curChar == 116)- jjstateSet[jjnewStateCnt++] = 141;- break;- case 143:- if (curChar == 110)- jjstateSet[jjnewStateCnt++] = 142;- break;- case 144:- if (curChar == 111)- jjstateSet[jjnewStateCnt++] = 143;- break;- case 145:- if (curChar == 67)- jjstateSet[jjnewStateCnt++] = 144;- break;- case 146:- if (curChar == 116)- jjstateSet[jjnewStateCnt++] = 145;- break;- case 147:- if (curChar == 111)- jjstateSet[jjnewStateCnt++] = 146;- break;- case 149:- if (curChar == 105)- jjstateSet[jjnewStateCnt++] = 148;- break;- case 150:- if (curChar == 110)- jjstateSet[jjnewStateCnt++] = 149;- break;- case 151:- if (curChar == 105)- jjstateSet[jjnewStateCnt++] = 150;- break;- case 152:- if (curChar == 97)- jjstateSet[jjnewStateCnt++] = 151;- break;- case 153:- if (curChar == 116)- jjstateSet[jjnewStateCnt++] = 152;- break;- case 154:- if (curChar == 110)- jjstateSet[jjnewStateCnt++] = 153;- break;- case 155:- if (curChar == 111)- jjstateSet[jjnewStateCnt++] = 154;- break;- case 156:- if (curChar == 99)- jjstateSet[jjnewStateCnt++] = 155;- break;- case 157:- if (curChar == 116)- jjstateSet[jjnewStateCnt++] = 156;- break;- case 158:- if (curChar == 111)- jjstateSet[jjnewStateCnt++] = 157;- break;- case 159:- if (curChar == 110 && kind > 43)- kind = 43;- break;- case 160:- case 167:- if (curChar == 105)- { jjCheckNAdd(159); }- break;- case 161:- if (curChar == 104)- jjstateSet[jjnewStateCnt++] = 160;- break;- case 162:- if (curChar == 116)- jjstateSet[jjnewStateCnt++] = 161;- break;- case 163:- if (curChar == 105)- jjstateSet[jjnewStateCnt++] = 162;- break;- case 164:- if (curChar == 87)- jjstateSet[jjnewStateCnt++] = 163;- break;- case 165:- if (curChar == 116)- jjstateSet[jjnewStateCnt++] = 164;- break;- case 166:- if (curChar == 111)- jjstateSet[jjnewStateCnt++] = 165;- break;- case 168:- if (curChar == 104)- jjstateSet[jjnewStateCnt++] = 167;- break;- case 169:- if (curChar == 116)- jjstateSet[jjnewStateCnt++] = 168;- break;- case 170:- if (curChar == 105)- jjstateSet[jjnewStateCnt++] = 169;- break;- case 171:- if (curChar == 119)- jjstateSet[jjnewStateCnt++] = 170;- break;- case 172:- if (curChar == 116)- jjstateSet[jjnewStateCnt++] = 171;- break;- case 173:- if (curChar == 111)- jjstateSet[jjnewStateCnt++] = 172;- break;- case 174:- if (curChar == 109)- { jjAddStates(6, 9); }- break;- case 175:- if (curChar == 115 && kind > 38)- kind = 38;- break;- case 176:- case 181:- if (curChar == 112)- { jjCheckNAdd(175); }- break;- case 177:- if (curChar == 97)- jjstateSet[jjnewStateCnt++] = 176;- break;- case 178:- if (curChar == 103)- jjstateSet[jjnewStateCnt++] = 177;- break;- case 179:- if (curChar == 120)- jjstateSet[jjnewStateCnt++] = 178;- break;- case 180:- if (curChar == 97)- jjstateSet[jjnewStateCnt++] = 179;- break;- case 182:- if (curChar == 97)- jjstateSet[jjnewStateCnt++] = 181;- break;- case 183:- if (curChar == 71)- jjstateSet[jjnewStateCnt++] = 182;- break;- case 184:- if (curChar == 120)- jjstateSet[jjnewStateCnt++] = 183;- break;- case 185:- if (curChar == 97)- jjstateSet[jjnewStateCnt++] = 184;- break;- case 186:- if (curChar == 104 && kind > 39)- kind = 39;- break;- case 187:- case 193:- if (curChar == 116)- { jjCheckNAdd(186); }- break;- case 188:- if (curChar == 100)- jjstateSet[jjnewStateCnt++] = 187;- break;- case 189:- if (curChar == 105)- jjstateSet[jjnewStateCnt++] = 188;- break;- case 190:- if (curChar == 119)- jjstateSet[jjnewStateCnt++] = 189;- break;- case 191:- if (curChar == 120)- jjstateSet[jjnewStateCnt++] = 190;- break;- case 192:- if (curChar == 97)- jjstateSet[jjnewStateCnt++] = 191;- break;- case 194:- if (curChar == 100)- jjstateSet[jjnewStateCnt++] = 193;- break;- case 195:- if (curChar == 105)- jjstateSet[jjnewStateCnt++] = 194;- break;- case 196:- if (curChar == 87)- jjstateSet[jjnewStateCnt++] = 195;- break;- case 197:- if (curChar == 120)- jjstateSet[jjnewStateCnt++] = 196;- break;- case 198:- if (curChar == 97)- jjstateSet[jjnewStateCnt++] = 197;- break;- default : break;- }- } while(i != startsAt);- }- else- {- int hiByte = (curChar >> 8);- int i1 = hiByte >> 6;- long l1 = 1L << (hiByte & 077);- int i2 = (curChar & 0xff) >> 6;- long l2 = 1L << (curChar & 077);- do- {- switch(jjstateSet[--i])- {- case 0:- if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 7)- kind = 7;- break;- default : if (i1 == 0 || l1 == 0 || i2 == 0 || l2 == 0) break; else break;- }- } while(i != startsAt);+ if ((active0 & 0x200000000000L) != 0L) return jjStopAtPos(10, 45);+ break;+ default:+ break;+ }+ return jjStartNfa_0(9, active0);+ }++ private int jjStartNfaWithStates_0(int pos, int kind, int state) {+ jjmatchedKind = kind;+ jjmatchedPos = pos;+ try {+ curChar = input_stream.readChar();+ } catch (java.io.IOException e) {+ return pos + 1;+ }+ return jjMoveNfa_0(state, pos + 1);+ }++ private int jjMoveNfa_0(int startState, int curPos) {+ int startsAt = 0;+ jjnewStateCnt = 199;+ int i = 1;+ jjstateSet[0] = startState;+ int kind = 0x7fffffff;+ for (; ; ) {+ if (++jjround == 0x7fffffff) ReInitRounds();+ if (curChar < 64) {+ long l = 1L << curChar;+ do {+ switch (jjstateSet[--i]) {+ case 0:+ if ((0x100002600L & l) != 0L) kind = 7;+ break;+ default:+ break;+ }+ } while (i != startsAt);+ } else if (curChar < 128) {+ long l = 1L << (curChar & 077);+ do {+ switch (jjstateSet[--i]) {+ case 18:+ if (curChar == 111) jjstateSet[jjnewStateCnt++] = 34;+ if (curChar == 111) jjstateSet[jjnewStateCnt++] = 17;+ break;+ case 13:+ if (curChar == 101) jjstateSet[jjnewStateCnt++] = 29;+ if (curChar == 101) jjstateSet[jjnewStateCnt++] = 12;+ break;+ case 60:+ if (curChar == 97) jjstateSet[jjnewStateCnt++] = 68;+ if (curChar == 97) jjstateSet[jjnewStateCnt++] = 59;+ break;+ case 19:+ if (curChar == 110) jjstateSet[jjnewStateCnt++] = 35;+ if (curChar == 110) jjstateSet[jjnewStateCnt++] = 18;+ break;+ case 57:+ if (curChar == 101) jjstateSet[jjnewStateCnt++] = 65;+ if (curChar == 101) jjstateSet[jjnewStateCnt++] = 56;+ break;+ case 58:+ if (curChar == 110) jjstateSet[jjnewStateCnt++] = 66;+ if (curChar == 110) jjstateSet[jjnewStateCnt++] = 57;+ break;+ case 59:+ if (curChar == 105) jjstateSet[jjnewStateCnt++] = 67;+ if (curChar == 105) jjstateSet[jjnewStateCnt++] = 58;+ break;+ case 61:+ if (curChar == 116) jjstateSet[jjnewStateCnt++] = 69;+ if (curChar == 116) jjstateSet[jjnewStateCnt++] = 60;+ break;+ case 14:+ if (curChar == 114) jjstateSet[jjnewStateCnt++] = 30;+ if (curChar == 114) jjstateSet[jjnewStateCnt++] = 13;+ break;+ case 62:+ if (curChar == 110) jjstateSet[jjnewStateCnt++] = 70;+ if (curChar == 110) jjstateSet[jjnewStateCnt++] = 61;+ break;+ case 15:+ if (curChar == 101) jjstateSet[jjnewStateCnt++] = 31;+ if (curChar == 101) jjstateSet[jjnewStateCnt++] = 14;+ break;+ case 63:+ if (curChar == 111) jjstateSet[jjnewStateCnt++] = 71;+ if (curChar == 111) jjstateSet[jjnewStateCnt++] = 62;+ break;+ case 16:+ if (curChar == 100) jjstateSet[jjnewStateCnt++] = 32;+ if (curChar == 100) jjstateSet[jjnewStateCnt++] = 15;+ break;+ case 0:+ if (curChar == 109) {+ jjAddStates(6, 9);+ } else if (curChar == 110) {+ jjAddStates(10, 17);+ } else if (curChar == 97) {+ jjAddStates(18, 19);+ } else if (curChar == 99) {+ jjAddStates(20, 21);+ } else if (curChar == 102) {+ jjAddStates(22, 23);+ } else if (curChar == 117) {+ jjAddStates(24, 25);+ }+ break;+ case 11:+ if (curChar == 110) jjstateSet[jjnewStateCnt++] = 27;+ else if (curChar == 78) jjstateSet[jjnewStateCnt++] = 10;+ break;+ case 17:+ if (curChar == 114) jjstateSet[jjnewStateCnt++] = 33;+ if (curChar == 114) jjstateSet[jjnewStateCnt++] = 16;+ break;+ case 79:+ if (curChar == 116) jjstateSet[jjnewStateCnt++] = 83;+ if (curChar == 116) jjstateSet[jjnewStateCnt++] = 78;+ break;+ case 12:+ if (curChar == 100) jjstateSet[jjnewStateCnt++] = 28;+ if (curChar == 100) jjstateSet[jjnewStateCnt++] = 11;+ break;+ case 1:+ if (curChar == 117) {+ jjAddStates(24, 25);+ }+ break;+ case 2:+ if (curChar == 115 && kind > 48) kind = 48;+ break;+ case 3:+ case 20:+ if (curChar == 112) {+ jjCheckNAdd(2);+ }+ break;+ case 4:+ if (curChar == 97) jjstateSet[jjnewStateCnt++] = 3;+ break;+ case 5:+ if (curChar == 108) jjstateSet[jjnewStateCnt++] = 4;+ break;+ case 6:+ if (curChar == 114) jjstateSet[jjnewStateCnt++] = 5;+ break;+ case 7:+ if (curChar == 101) jjstateSet[jjnewStateCnt++] = 6;+ break;+ case 8:+ if (curChar == 118) jjstateSet[jjnewStateCnt++] = 7;+ break;+ case 9:+ if (curChar == 79) jjstateSet[jjnewStateCnt++] = 8;+ break;+ case 10:+ if (curChar == 111) jjstateSet[jjnewStateCnt++] = 9;+ break;+ case 21:+ if (curChar == 97) jjstateSet[jjnewStateCnt++] = 20;+ break;+ case 22:+ if (curChar == 108) jjstateSet[jjnewStateCnt++] = 21;+ break;+ case 23:+ if (curChar == 114) jjstateSet[jjnewStateCnt++] = 22;+ break;+ case 24:+ if (curChar == 101) jjstateSet[jjnewStateCnt++] = 23;+ break;+ case 25:+ if (curChar == 118) jjstateSet[jjnewStateCnt++] = 24;+ break;+ case 26:+ if (curChar == 111) jjstateSet[jjnewStateCnt++] = 25;+ break;+ case 27:+ if (curChar == 111) jjstateSet[jjnewStateCnt++] = 26;+ break;+ case 28:+ if (curChar == 110) jjstateSet[jjnewStateCnt++] = 27;+ break;+ case 29:+ if (curChar == 100) jjstateSet[jjnewStateCnt++] = 28;+ break;+ case 30:+ if (curChar == 101) jjstateSet[jjnewStateCnt++] = 29;+ break;+ case 31:+ if (curChar == 114) jjstateSet[jjnewStateCnt++] = 30;+ break;+ case 32:+ if (curChar == 101) jjstateSet[jjnewStateCnt++] = 31;+ break;+ case 33:+ if (curChar == 100) jjstateSet[jjnewStateCnt++] = 32;+ break;+ case 34:+ if (curChar == 114) jjstateSet[jjnewStateCnt++] = 33;+ break;+ case 35:+ if (curChar == 111) jjstateSet[jjnewStateCnt++] = 34;+ break;+ case 36:+ if (curChar == 110) jjstateSet[jjnewStateCnt++] = 35;+ break;+ case 37:+ if (curChar == 102) {+ jjAddStates(22, 23);+ }+ break;+ case 38:+ if (curChar == 109 && kind > 37) kind = 37;+ break;+ case 39:+ case 46:+ if (curChar == 114) {+ jjCheckNAdd(38);+ }+ break;+ case 40:+ if (curChar == 101) jjstateSet[jjnewStateCnt++] = 39;+ break;+ case 41:+ if (curChar == 116) jjstateSet[jjnewStateCnt++] = 40;+ break;+ case 42:+ if (curChar == 121) jjstateSet[jjnewStateCnt++] = 41;+ break;+ case 43:+ if (curChar == 122) jjstateSet[jjnewStateCnt++] = 42;+ break;+ case 44:+ if (curChar == 122) jjstateSet[jjnewStateCnt++] = 43;+ break;+ case 45:+ if (curChar == 117) jjstateSet[jjnewStateCnt++] = 44;+ break;+ case 47:+ if (curChar == 101) jjstateSet[jjnewStateCnt++] = 46;+ break;+ case 48:+ if (curChar == 84) jjstateSet[jjnewStateCnt++] = 47;+ break;+ case 49:+ if (curChar == 121) jjstateSet[jjnewStateCnt++] = 48;+ break;+ case 50:+ if (curChar == 122) jjstateSet[jjnewStateCnt++] = 49;+ break;+ case 51:+ if (curChar == 122) jjstateSet[jjnewStateCnt++] = 50;+ break;+ case 52:+ if (curChar == 117) jjstateSet[jjnewStateCnt++] = 51;+ break;+ case 53:+ if (curChar == 99) {+ jjAddStates(20, 21);+ }+ break;+ case 54:+ if (curChar == 121 && kind > 33) kind = 33;+ break;+ case 55:+ if (curChar == 66) {+ jjCheckNAdd(54);+ }+ break;+ case 56:+ if (curChar == 100) jjstateSet[jjnewStateCnt++] = 55;+ break;+ case 64:+ if (curChar == 98) {+ jjCheckNAdd(54);+ }+ break;+ case 65:+ if (curChar == 100) jjstateSet[jjnewStateCnt++] = 64;+ break;+ case 66:+ if (curChar == 101) jjstateSet[jjnewStateCnt++] = 65;+ break;+ case 67:+ if (curChar == 110) jjstateSet[jjnewStateCnt++] = 66;+ break;+ case 68:+ if (curChar == 105) jjstateSet[jjnewStateCnt++] = 67;+ break;+ case 69:+ if (curChar == 97) jjstateSet[jjnewStateCnt++] = 68;+ break;+ case 70:+ if (curChar == 116) jjstateSet[jjnewStateCnt++] = 69;+ break;+ case 71:+ if (curChar == 110) jjstateSet[jjnewStateCnt++] = 70;+ break;+ case 72:+ if (curChar == 111) jjstateSet[jjnewStateCnt++] = 71;+ break;+ case 73:+ if (curChar == 97) {+ jjAddStates(18, 19);+ }+ break;+ case 74:+ if (curChar == 116 && kind > 30) kind = 30;+ break;+ case 75:+ case 80:+ if (curChar == 115) {+ jjCheckNAdd(74);+ }+ break;+ case 76:+ if (curChar == 97) jjstateSet[jjnewStateCnt++] = 75;+ break;+ case 77:+ if (curChar == 101) jjstateSet[jjnewStateCnt++] = 76;+ break;+ case 78:+ if (curChar == 108) jjstateSet[jjnewStateCnt++] = 77;+ break;+ case 81:+ if (curChar == 97) jjstateSet[jjnewStateCnt++] = 80;+ break;+ case 82:+ if (curChar == 101) jjstateSet[jjnewStateCnt++] = 81;+ break;+ case 83:+ if (curChar == 76) jjstateSet[jjnewStateCnt++] = 82;+ break;+ case 84:+ if (curChar == 116) jjstateSet[jjnewStateCnt++] = 83;+ break;+ case 85:+ if (curChar == 110) {+ jjAddStates(10, 17);+ }+ break;+ case 86:+ if (curChar == 103 && kind > 40) kind = 40;+ break;+ case 87:+ case 99:+ if (curChar == 110) {+ jjCheckNAdd(86);+ }+ break;+ case 88:+ if (curChar == 105) jjstateSet[jjnewStateCnt++] = 87;+ break;+ case 89:+ if (curChar == 112) jjstateSet[jjnewStateCnt++] = 88;+ break;+ case 90:+ if (curChar == 112) jjstateSet[jjnewStateCnt++] = 89;+ break;+ case 91:+ if (curChar == 97) jjstateSet[jjnewStateCnt++] = 90;+ break;+ case 92:+ if (curChar == 108) jjstateSet[jjnewStateCnt++] = 91;+ break;+ case 93:+ if (curChar == 114) jjstateSet[jjnewStateCnt++] = 92;+ break;+ case 94:+ if (curChar == 101) jjstateSet[jjnewStateCnt++] = 93;+ break;+ case 95:+ if (curChar == 118) jjstateSet[jjnewStateCnt++] = 94;+ break;+ case 96:+ if (curChar == 79) jjstateSet[jjnewStateCnt++] = 95;+ break;+ case 97:+ if (curChar == 110) jjstateSet[jjnewStateCnt++] = 96;+ break;+ case 98:+ if (curChar == 111) jjstateSet[jjnewStateCnt++] = 97;+ break;+ case 100:+ if (curChar == 105) jjstateSet[jjnewStateCnt++] = 99;+ break;+ case 101:+ if (curChar == 112) jjstateSet[jjnewStateCnt++] = 100;+ break;+ case 102:+ if (curChar == 112) jjstateSet[jjnewStateCnt++] = 101;+ break;+ case 103:+ if (curChar == 97) jjstateSet[jjnewStateCnt++] = 102;+ break;+ case 104:+ if (curChar == 108) jjstateSet[jjnewStateCnt++] = 103;+ break;+ case 105:+ if (curChar == 114) jjstateSet[jjnewStateCnt++] = 104;+ break;+ case 106:+ if (curChar == 101) jjstateSet[jjnewStateCnt++] = 105;+ break;+ case 107:+ if (curChar == 118) jjstateSet[jjnewStateCnt++] = 106;+ break;+ case 108:+ if (curChar == 111) jjstateSet[jjnewStateCnt++] = 107;+ break;+ case 109:+ if (curChar == 110) jjstateSet[jjnewStateCnt++] = 108;+ break;+ case 110:+ if (curChar == 111) jjstateSet[jjnewStateCnt++] = 109;+ break;+ case 111:+ if (curChar == 121 && kind > 41) kind = 41;+ break;+ case 112:+ if (curChar == 66) {+ jjCheckNAdd(111);+ }+ break;+ case 113:+ if (curChar == 100) jjstateSet[jjnewStateCnt++] = 112;+ break;+ case 114:+ if (curChar == 101) jjstateSet[jjnewStateCnt++] = 113;+ break;+ case 115:+ if (curChar == 110) jjstateSet[jjnewStateCnt++] = 114;+ break;+ case 116:+ if (curChar == 105) jjstateSet[jjnewStateCnt++] = 115;+ break;+ case 117:+ if (curChar == 97) jjstateSet[jjnewStateCnt++] = 116;+ break;+ case 118:+ if (curChar == 116) jjstateSet[jjnewStateCnt++] = 117;+ break;+ case 119:+ if (curChar == 110) jjstateSet[jjnewStateCnt++] = 118;+ break;+ case 120:+ if (curChar == 111) jjstateSet[jjnewStateCnt++] = 119;+ break;+ case 121:+ if (curChar == 67) jjstateSet[jjnewStateCnt++] = 120;+ break;+ case 122:+ if (curChar == 116) jjstateSet[jjnewStateCnt++] = 121;+ break;+ case 123:+ if (curChar == 111) jjstateSet[jjnewStateCnt++] = 122;+ break;+ case 124:+ if (curChar == 98) {+ jjCheckNAdd(111);+ }+ break;+ case 125:+ if (curChar == 100) jjstateSet[jjnewStateCnt++] = 124;+ break;+ case 126:+ if (curChar == 101) jjstateSet[jjnewStateCnt++] = 125;+ break;+ case 127:+ if (curChar == 110) jjstateSet[jjnewStateCnt++] = 126;+ break;+ case 128:+ if (curChar == 105) jjstateSet[jjnewStateCnt++] = 127;+ break;+ case 129:+ if (curChar == 97) jjstateSet[jjnewStateCnt++] = 128;+ break;+ case 130:+ if (curChar == 116) jjstateSet[jjnewStateCnt++] = 129;+ break;+ case 131:+ if (curChar == 110) jjstateSet[jjnewStateCnt++] = 130;+ break;+ case 132:+ if (curChar == 111) jjstateSet[jjnewStateCnt++] = 131;+ break;+ case 133:+ if (curChar == 99) jjstateSet[jjnewStateCnt++] = 132;+ break;+ case 134:+ if (curChar == 116) jjstateSet[jjnewStateCnt++] = 133;+ break;+ case 135:+ if (curChar == 111) jjstateSet[jjnewStateCnt++] = 134;+ break;+ case 136:+ if (curChar == 103 && kind > 42) kind = 42;+ break;+ case 137:+ case 148:+ if (curChar == 110) {+ jjCheckNAdd(136);+ }+ break;+ case 138:+ if (curChar == 105) jjstateSet[jjnewStateCnt++] = 137;+ break;+ case 139:+ if (curChar == 110) jjstateSet[jjnewStateCnt++] = 138;+ break;+ case 140:+ if (curChar == 105) jjstateSet[jjnewStateCnt++] = 139;+ break;+ case 141:+ if (curChar == 97) jjstateSet[jjnewStateCnt++] = 140;+ break;+ case 142:+ if (curChar == 116) jjstateSet[jjnewStateCnt++] = 141;+ break;+ case 143:+ if (curChar == 110) jjstateSet[jjnewStateCnt++] = 142;+ break;+ case 144:+ if (curChar == 111) jjstateSet[jjnewStateCnt++] = 143;+ break;+ case 145:+ if (curChar == 67) jjstateSet[jjnewStateCnt++] = 144;+ break;+ case 146:+ if (curChar == 116) jjstateSet[jjnewStateCnt++] = 145;+ break;+ case 147:+ if (curChar == 111) jjstateSet[jjnewStateCnt++] = 146;+ break;+ case 149:+ if (curChar == 105) jjstateSet[jjnewStateCnt++] = 148;+ break;+ case 150:+ if (curChar == 110) jjstateSet[jjnewStateCnt++] = 149;+ break;+ case 151:+ if (curChar == 105) jjstateSet[jjnewStateCnt++] = 150;+ break;+ case 152:+ if (curChar == 97) jjstateSet[jjnewStateCnt++] = 151;+ break;+ case 153:+ if (curChar == 116) jjstateSet[jjnewStateCnt++] = 152;+ break;+ case 154:+ if (curChar == 110) jjstateSet[jjnewStateCnt++] = 153;+ break;+ case 155:+ if (curChar == 111) jjstateSet[jjnewStateCnt++] = 154;+ break;+ case 156:+ if (curChar == 99) jjstateSet[jjnewStateCnt++] = 155;+ break;+ case 157:+ if (curChar == 116) jjstateSet[jjnewStateCnt++] = 156;+ break;+ case 158:+ if (curChar == 111) jjstateSet[jjnewStateCnt++] = 157;+ break;+ case 159:+ if (curChar == 110 && kind > 43) kind = 43;+ break;+ case 160:+ case 167:+ if (curChar == 105) {+ jjCheckNAdd(159);+ }+ break;+ case 161:+ if (curChar == 104) jjstateSet[jjnewStateCnt++] = 160;+ break;+ case 162:+ if (curChar == 116) jjstateSet[jjnewStateCnt++] = 161;+ break;+ case 163:+ if (curChar == 105) jjstateSet[jjnewStateCnt++] = 162;+ break;+ case 164:+ if (curChar == 87) jjstateSet[jjnewStateCnt++] = 163;+ break;+ case 165:+ if (curChar == 116) jjstateSet[jjnewStateCnt++] = 164;+ break;+ case 166:+ if (curChar == 111) jjstateSet[jjnewStateCnt++] = 165;+ break;+ case 168:+ if (curChar == 104) jjstateSet[jjnewStateCnt++] = 167;+ break;+ case 169:+ if (curChar == 116) jjstateSet[jjnewStateCnt++] = 168;+ break;+ case 170:+ if (curChar == 105) jjstateSet[jjnewStateCnt++] = 169;+ break;+ case 171:+ if (curChar == 119) jjstateSet[jjnewStateCnt++] = 170;+ break;+ case 172:+ if (curChar == 116) jjstateSet[jjnewStateCnt++] = 171;+ break;+ case 173:+ if (curChar == 111) jjstateSet[jjnewStateCnt++] = 172;+ break;+ case 174:+ if (curChar == 109) {+ jjAddStates(6, 9);+ }+ break;+ case 175:+ if (curChar == 115 && kind > 38) kind = 38;+ break;+ case 176:+ case 181:+ if (curChar == 112) {+ jjCheckNAdd(175);+ }+ break;+ case 177:+ if (curChar == 97) jjstateSet[jjnewStateCnt++] = 176;+ break;+ case 178:+ if (curChar == 103) jjstateSet[jjnewStateCnt++] = 177;+ break;+ case 179:+ if (curChar == 120) jjstateSet[jjnewStateCnt++] = 178;+ break;+ case 180:+ if (curChar == 97) jjstateSet[jjnewStateCnt++] = 179;+ break;+ case 182:+ if (curChar == 97) jjstateSet[jjnewStateCnt++] = 181;+ break;+ case 183:+ if (curChar == 71) jjstateSet[jjnewStateCnt++] = 182;+ break;+ case 184:+ if (curChar == 120) jjstateSet[jjnewStateCnt++] = 183;+ break;+ case 185:+ if (curChar == 97) jjstateSet[jjnewStateCnt++] = 184;+ break;+ case 186:+ if (curChar == 104 && kind > 39) kind = 39;+ break;+ case 187:+ case 193:+ if (curChar == 116) {+ jjCheckNAdd(186);+ }+ break;+ case 188:+ if (curChar == 100) jjstateSet[jjnewStateCnt++] = 187;+ break;+ case 189:+ if (curChar == 105) jjstateSet[jjnewStateCnt++] = 188;+ break;+ case 190:+ if (curChar == 119) jjstateSet[jjnewStateCnt++] = 189;+ break;+ case 191:+ if (curChar == 120) jjstateSet[jjnewStateCnt++] = 190;+ break;+ case 192:+ if (curChar == 97) jjstateSet[jjnewStateCnt++] = 191;+ break;+ case 194:+ if (curChar == 100) jjstateSet[jjnewStateCnt++] = 193;+ break;+ case 195:+ if (curChar == 105) jjstateSet[jjnewStateCnt++] = 194;+ break;+ case 196:+ if (curChar == 87) jjstateSet[jjnewStateCnt++] = 195;+ break;+ case 197:+ if (curChar == 120) jjstateSet[jjnewStateCnt++] = 196;+ break;+ case 198:+ if (curChar == 97) jjstateSet[jjnewStateCnt++] = 197;+ break;+ default:+ break;+ }+ } while (i != startsAt);+ } else {+ int hiByte = (curChar >> 8);+ int i1 = hiByte >> 6;+ long l1 = 1L << (hiByte & 077);+ int i2 = (curChar & 0xff) >> 6;+ long l2 = 1L << (curChar & 077);+ do {+ switch (jjstateSet[--i]) {+ case 0:+ if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 7) kind = 7;+ break;+ default:+ if (i1 == 0 || l1 == 0 || i2 == 0 || l2 == 0) break;+ else break;+ }+ } while (i != startsAt);}- if (kind != 0x7fffffff)- {- jjmatchedKind = kind;- jjmatchedPos = curPos;- kind = 0x7fffffff;+ if (kind != 0x7fffffff) {+ jjmatchedKind = kind;+ jjmatchedPos = curPos;+ kind = 0x7fffffff;}++curPos;- if ((i = jjnewStateCnt) == (startsAt = 199 - (jjnewStateCnt = startsAt)))- return curPos;- try { curChar = input_stream.readChar(); }- catch(java.io.IOException e) { return curPos; }- }-}-private final int jjStopStringLiteralDfa_1(int pos, long active0){- switch (pos)- {+ if ((i = jjnewStateCnt) == (startsAt = 199 - (jjnewStateCnt = startsAt))) return curPos;+ try {+ curChar = input_stream.readChar();+ } catch (java.io.IOException e) {+ return curPos;+ }+ }+ }++ private final int jjStopStringLiteralDfa_1(int pos, long active0) {+ switch (pos) {case 0:- if ((active0 & 0x8000000000000L) != 0L)- {- jjmatchedKind = 55;- return 6;- }- return -1;- default :- return -1;- }-}-private final int jjStartNfa_1(int pos, long active0){- return jjMoveNfa_1(jjStopStringLiteralDfa_1(pos, active0), pos + 1);-}-private int jjMoveStringLiteralDfa0_1(){- switch(curChar)- {+ if ((active0 & 0x8000000000000L) != 0L) {+ jjmatchedKind = 55;+ return 6;+ }+ return -1;+ default:+ return -1;+ }+ }++ private final int jjStartNfa_1(int pos, long active0) {+ return jjMoveNfa_1(jjStopStringLiteralDfa_1(pos, active0), pos + 1);+ }++ private int jjMoveStringLiteralDfa0_1() {+ switch (curChar) {case 84:- return jjMoveStringLiteralDfa1_1(0x8000000000000L);+ return jjMoveStringLiteralDfa1_1(0x8000000000000L);case 93:- return jjStopAtPos(0, 52);+ return jjStopAtPos(0, 52);case 125:- return jjStopAtPos(0, 53);- default :- return jjMoveNfa_1(0, 0);- }-}-private int jjMoveStringLiteralDfa1_1(long active0){- try { curChar = input_stream.readChar(); }- catch(java.io.IOException e) {+ return jjStopAtPos(0, 53);+ default:+ return jjMoveNfa_1(0, 0);+ }+ }++ private int jjMoveStringLiteralDfa1_1(long active0) {+ try {+ curChar = input_stream.readChar();+ } catch (java.io.IOException e) {jjStopStringLiteralDfa_1(0, active0);return 1;- }- switch(curChar)- {+ }+ switch (curChar) {case 79:- if ((active0 & 0x8000000000000L) != 0L)- return jjStartNfaWithStates_1(1, 51, 6);- break;- default :- break;- }- return jjStartNfa_1(0, active0);-}-private int jjStartNfaWithStates_1(int pos, int kind, int state)-{- jjmatchedKind = kind;- jjmatchedPos = pos;- try { curChar = input_stream.readChar(); }- catch(java.io.IOException e) { return pos + 1; }- return jjMoveNfa_1(state, pos + 1);-}-private int jjMoveNfa_1(int startState, int curPos)-{- int startsAt = 0;- jjnewStateCnt = 7;- int i = 1;- jjstateSet[0] = startState;- int kind = 0x7fffffff;- for (;;)- {- if (++jjround == 0x7fffffff)- ReInitRounds();- if (curChar < 64)- {- long l = 1L << curChar;- do- {- switch(jjstateSet[--i])- {- case 0:- if ((0xfffffffeffffffffL & l) != 0L)- {- if (kind > 55)- kind = 55;- { jjCheckNAdd(6); }- }- if ((0x100002600L & l) != 0L)- {- if (kind > 7)- kind = 7;- }- else if (curChar == 34)- { jjCheckNAddTwoStates(2, 4); }- break;- case 1:- if (curChar == 34)- { jjCheckNAddTwoStates(2, 4); }- break;- case 2:- if ((0xfffffffbffffffffL & l) != 0L)- { jjCheckNAddStates(26, 28); }- break;- case 3:- if (curChar == 34)- { jjCheckNAddStates(26, 28); }- break;- case 5:- if (curChar == 34 && kind > 54)- kind = 54;- break;- case 6:- if ((0xfffffffeffffffffL & l) == 0L)- break;- if (kind > 55)- kind = 55;- { jjCheckNAdd(6); }- break;- default : break;- }- } while(i != startsAt);- }- else if (curChar < 128)- {- long l = 1L << (curChar & 077);- do- {- switch(jjstateSet[--i])- {- case 0:- case 6:- if ((0xdfffffffdfffffffL & l) == 0L)- break;- if (kind > 55)- kind = 55;- { jjCheckNAdd(6); }- break;- case 2:- { jjAddStates(26, 28); }- break;- case 4:- if (curChar == 92)- jjstateSet[jjnewStateCnt++] = 3;- break;- default : break;- }- } while(i != startsAt);- }- else- {- int hiByte = (curChar >> 8);- int i1 = hiByte >> 6;- long l1 = 1L << (hiByte & 077);- int i2 = (curChar & 0xff) >> 6;- long l2 = 1L << (curChar & 077);- do- {- switch(jjstateSet[--i])- {- case 0:- if (jjCanMove_0(hiByte, i1, i2, l1, l2))- {- if (kind > 7)- kind = 7;- }- if (jjCanMove_1(hiByte, i1, i2, l1, l2))- {- if (kind > 55)- kind = 55;- { jjCheckNAdd(6); }- }- break;- case 2:- if (jjCanMove_1(hiByte, i1, i2, l1, l2))- { jjAddStates(26, 28); }- break;- case 6:- if (!jjCanMove_1(hiByte, i1, i2, l1, l2))- break;- if (kind > 55)- kind = 55;- { jjCheckNAdd(6); }- break;- default : if (i1 == 0 || l1 == 0 || i2 == 0 || l2 == 0) break; else break;- }- } while(i != startsAt);+ if ((active0 & 0x8000000000000L) != 0L) return jjStartNfaWithStates_1(1, 51, 6);+ break;+ default:+ break;+ }+ return jjStartNfa_1(0, active0);+ }++ private int jjStartNfaWithStates_1(int pos, int kind, int state) {+ jjmatchedKind = kind;+ jjmatchedPos = pos;+ try {+ curChar = input_stream.readChar();+ } catch (java.io.IOException e) {+ return pos + 1;+ }+ return jjMoveNfa_1(state, pos + 1);+ }++ private int jjMoveNfa_1(int startState, int curPos) {+ int startsAt = 0;+ jjnewStateCnt = 7;+ int i = 1;+ jjstateSet[0] = startState;+ int kind = 0x7fffffff;+ for (; ; ) {+ if (++jjround == 0x7fffffff) ReInitRounds();+ if (curChar < 64) {+ long l = 1L << curChar;+ do {+ switch (jjstateSet[--i]) {+ case 0:+ if ((0xfffffffeffffffffL & l) != 0L) {+ if (kind > 55) kind = 55;+ {+ jjCheckNAdd(6);+ }+ }+ if ((0x100002600L & l) != 0L) {+ if (kind > 7) kind = 7;+ } else if (curChar == 34) {+ jjCheckNAddTwoStates(2, 4);+ }+ break;+ case 1:+ if (curChar == 34) {+ jjCheckNAddTwoStates(2, 4);+ }+ break;+ case 2:+ if ((0xfffffffbffffffffL & l) != 0L) {+ jjCheckNAddStates(26, 28);+ }+ break;+ case 3:+ if (curChar == 34) {+ jjCheckNAddStates(26, 28);+ }+ break;+ case 5:+ if (curChar == 34 && kind > 54) kind = 54;+ break;+ case 6:+ if ((0xfffffffeffffffffL & l) == 0L) break;+ if (kind > 55) kind = 55;+ {+ jjCheckNAdd(6);+ }+ break;+ default:+ break;+ }+ } while (i != startsAt);+ } else if (curChar < 128) {+ long l = 1L << (curChar & 077);+ do {+ switch (jjstateSet[--i]) {+ case 0:+ case 6:+ if ((0xdfffffffdfffffffL & l) == 0L) break;+ if (kind > 55) kind = 55;+ {+ jjCheckNAdd(6);+ }+ break;+ case 2:+ {+ jjAddStates(26, 28);+ }+ break;+ case 4:+ if (curChar == 92) jjstateSet[jjnewStateCnt++] = 3;+ break;+ default:+ break;+ }+ } while (i != startsAt);+ } else {+ int hiByte = (curChar >> 8);+ int i1 = hiByte >> 6;+ long l1 = 1L << (hiByte & 077);+ int i2 = (curChar & 0xff) >> 6;+ long l2 = 1L << (curChar & 077);+ do {+ switch (jjstateSet[--i]) {+ case 0:+ if (jjCanMove_0(hiByte, i1, i2, l1, l2)) {+ if (kind > 7) kind = 7;+ }+ if (jjCanMove_1(hiByte, i1, i2, l1, l2)) {+ if (kind > 55) kind = 55;+ {+ jjCheckNAdd(6);+ }+ }+ break;+ case 2:+ if (jjCanMove_1(hiByte, i1, i2, l1, l2)) {+ jjAddStates(26, 28);+ }+ break;+ case 6:+ if (!jjCanMove_1(hiByte, i1, i2, l1, l2)) break;+ if (kind > 55) kind = 55;+ {+ jjCheckNAdd(6);+ }+ break;+ default:+ if (i1 == 0 || l1 == 0 || i2 == 0 || l2 == 0) break;+ else break;+ }+ } while (i != startsAt);}- if (kind != 0x7fffffff)- {- jjmatchedKind = kind;- jjmatchedPos = curPos;- kind = 0x7fffffff;+ if (kind != 0x7fffffff) {+ jjmatchedKind = kind;+ jjmatchedPos = curPos;+ kind = 0x7fffffff;}++curPos;- if ((i = jjnewStateCnt) == (startsAt = 7 - (jjnewStateCnt = startsAt)))- return curPos;- try { curChar = input_stream.readChar(); }- catch(java.io.IOException e) { return curPos; }- }-}+ if ((i = jjnewStateCnt) == (startsAt = 7 - (jjnewStateCnt = startsAt))) return curPos;+ try {+ curChar = input_stream.readChar();+ } catch (java.io.IOException e) {+ return curPos;+ }+ }+ }-/** Token literal values. */-public static final String[] jjstrLiteralImages = {-"", null, null, null, null, null, null, null, null, null, null, "\146\156\72",-"\53", "\55", "\51", "\72", "\75", "\74", "\74\75", "\76", "\76\75", "\136", "\176",-null, null, null, null, "\133", "\173", "\50", null, "\141\146\164\145\162",-"\142\145\146\157\162\145", null, "\143\157\156\164\141\151\156\151\156\147", "\145\170\164\145\156\144",-"\157\162", null, null, null, null, null, null, null, "\157\162\144\145\162\145\144",-"\157\166\145\162\154\141\160\160\151\156\147", "\160\150\162\141\163\145", "\165\156\157\162\144\145\162\145\144", null,-"\167\151\154\144\143\141\162\144", "\167\151\164\150\151\156", "\124\117", "\135", "\175", null, null, "\100", };-protected Token jjFillToken()-{- final Token t;- final String curTokenImage;- final int beginLine;- final int endLine;- final int beginColumn;- final int endColumn;- String im = jjstrLiteralImages[jjmatchedKind];- curTokenImage = (im == null) ? input_stream.GetImage() : im;- beginLine = input_stream.getBeginLine();- beginColumn = input_stream.getBeginColumn();- endLine = input_stream.getEndLine();- endColumn = input_stream.getEndColumn();- t = Token.newToken(jjmatchedKind, curTokenImage);+ /** Token literal values. */+ public static final String[] jjstrLiteralImages = {+ "",+ null,+ null,+ null,+ null,+ null,+ null,+ null,+ null,+ null,+ null,+ "\146\156\72",+ "\53",+ "\55",+ "\51",+ "\72",+ "\75",+ "\74",+ "\74\75",+ "\76",+ "\76\75",+ "\136",+ "\176",+ null,+ null,+ null,+ null,+ "\133",+ "\173",+ "\50",+ null,+ "\141\146\164\145\162",+ "\142\145\146\157\162\145",+ null,+ "\143\157\156\164\141\151\156\151\156\147",+ "\145\170\164\145\156\144",+ "\157\162",+ null,+ null,+ null,+ null,+ null,+ null,+ null,+ "\157\162\144\145\162\145\144",+ "\157\166\145\162\154\141\160\160\151\156\147",+ "\160\150\162\141\163\145",+ "\165\156\157\162\144\145\162\145\144",+ null,+ "\167\151\154\144\143\141\162\144",+ "\167\151\164\150\151\156",+ "\124\117",+ "\135",+ "\175",+ null,+ null,+ "\100",+ };++ protected Token jjFillToken() {+ final Token t;+ final String curTokenImage;+ final int beginLine;+ final int endLine;+ final int beginColumn;+ final int endColumn;+ String im = jjstrLiteralImages[jjmatchedKind];+ curTokenImage = (im == null) ? input_stream.GetImage() : im;+ beginLine = input_stream.getBeginLine();+ beginColumn = input_stream.getBeginColumn();+ endLine = input_stream.getEndLine();+ endColumn = input_stream.getEndColumn();+ t = Token.newToken(jjmatchedKind, curTokenImage);++ t.beginLine = beginLine;+ t.endLine = endLine;+ t.beginColumn = beginColumn;+ t.endColumn = endColumn;++ return t;+ }- t.beginLine = beginLine;- t.endLine = endLine;- t.beginColumn = beginColumn;- t.endColumn = endColumn;+ static final int[] jjnextStates = {+ 28, 30, 31, 15, 16, 18, 180, 185, 192, 198, 98, 110, 123, 135, 147, 158, 166, 173, 79, 84, 63,+ 72, 45, 52, 19, 36, 2, 4, 5,+ };- return t;-}-static final int[] jjnextStates = {- 28, 30, 31, 15, 16, 18, 180, 185, 192, 198, 98, 110, 123, 135, 147, 158,- 166, 173, 79, 84, 63, 72, 45, 52, 19, 36, 2, 4, 5,-};-private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2)-{- switch(hiByte)- {+ private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2) {+ switch (hiByte) {case 48:- return ((jjbitVec0[i2] & l2) != 0L);- default :- return false;- }-}-private static final boolean jjCanMove_1(int hiByte, int i1, int i2, long l1, long l2)-{- switch(hiByte)- {+ return ((jjbitVec0[i2] & l2) != 0L);+ default:+ return false;+ }+ }++ private static final boolean jjCanMove_1(int hiByte, int i1, int i2, long l1, long l2) {+ switch (hiByte) {case 0:- return ((jjbitVec3[i2] & l2) != 0L);- default :- if ((jjbitVec1[i1] & l1) != 0L)- return true;- return false;- }-}-private static final boolean jjCanMove_2(int hiByte, int i1, int i2, long l1, long l2)-{- switch(hiByte)- {+ return ((jjbitVec3[i2] & l2) != 0L);+ default:+ if ((jjbitVec1[i1] & l1) != 0L) return true;+ return false;+ }+ }++ private static final boolean jjCanMove_2(int hiByte, int i1, int i2, long l1, long l2) {+ switch (hiByte) {case 0:- return ((jjbitVec3[i2] & l2) != 0L);+ return ((jjbitVec3[i2] & l2) != 0L);case 48:- return ((jjbitVec1[i2] & l2) != 0L);- default :- if ((jjbitVec4[i1] & l1) != 0L)- return true;- return false;- }-}--int curLexState = 2;-int defaultLexState = 2;-int jjnewStateCnt;-int jjround;-int jjmatchedPos;-int jjmatchedKind;--/** Get the next Token. */-public Token getNextToken()-{- Token matchedToken;- int curPos = 0;+ return ((jjbitVec1[i2] & l2) != 0L);+ default:+ if ((jjbitVec4[i1] & l1) != 0L) return true;+ return false;+ }+ }- EOFLoop :- for (;;)- {- try- {- curChar = input_stream.BeginToken();- }- catch(Exception e)- {- jjmatchedKind = 0;- jjmatchedPos = -1;- matchedToken = jjFillToken();- return matchedToken;- }+ int curLexState = 2;+ int defaultLexState = 2;+ int jjnewStateCnt;+ int jjround;+ int jjmatchedPos;+ int jjmatchedKind;++ /** Get the next Token. */+ public Token getNextToken() {+ Token matchedToken;+ int curPos = 0;++ EOFLoop:+ for (; ; ) {+ try {+ curChar = input_stream.BeginToken();+ } catch (Exception e) {+ jjmatchedKind = 0;+ jjmatchedPos = -1;+ matchedToken = jjFillToken();+ return matchedToken;+ }- switch(curLexState)- {- case 0:- jjmatchedKind = 0x7fffffff;- jjmatchedPos = 0;- curPos = jjMoveStringLiteralDfa0_0();- break;- case 1:- jjmatchedKind = 0x7fffffff;- jjmatchedPos = 0;- curPos = jjMoveStringLiteralDfa0_1();- break;- case 2:- jjmatchedKind = 0x7fffffff;- jjmatchedPos = 0;- curPos = jjMoveStringLiteralDfa0_2();- break;- }- if (jjmatchedKind != 0x7fffffff)- {- if (jjmatchedPos + 1 < curPos)- input_stream.backup(curPos - jjmatchedPos - 1);- if ((jjtoToken[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L)- {- matchedToken = jjFillToken();- if (jjnewLexState[jjmatchedKind] != -1)- curLexState = jjnewLexState[jjmatchedKind];- return matchedToken;- }- else- {- if (jjnewLexState[jjmatchedKind] != -1)- curLexState = jjnewLexState[jjmatchedKind];- continue EOFLoop;+ switch (curLexState) {+ case 0:+ jjmatchedKind = 0x7fffffff;+ jjmatchedPos = 0;+ curPos = jjMoveStringLiteralDfa0_0();+ break;+ case 1:+ jjmatchedKind = 0x7fffffff;+ jjmatchedPos = 0;+ curPos = jjMoveStringLiteralDfa0_1();+ break;+ case 2:+ jjmatchedKind = 0x7fffffff;+ jjmatchedPos = 0;+ curPos = jjMoveStringLiteralDfa0_2();+ break;+ }+ if (jjmatchedKind != 0x7fffffff) {+ if (jjmatchedPos + 1 < curPos) input_stream.backup(curPos - jjmatchedPos - 1);+ if ((jjtoToken[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L) {+ matchedToken = jjFillToken();+ if (jjnewLexState[jjmatchedKind] != -1) curLexState = jjnewLexState[jjmatchedKind];+ return matchedToken;+ } else {+ if (jjnewLexState[jjmatchedKind] != -1) curLexState = jjnewLexState[jjmatchedKind];+ continue EOFLoop;}- }- int error_line = input_stream.getEndLine();- int error_column = input_stream.getEndColumn();- String error_after = null;- boolean EOFSeen = false;- try { input_stream.readChar(); input_stream.backup(1); }- catch (java.io.IOException e1) {+ }+ int error_line = input_stream.getEndLine();+ int error_column = input_stream.getEndColumn();+ String error_after = null;+ boolean EOFSeen = false;+ try {+ input_stream.readChar();+ input_stream.backup(1);+ } catch (java.io.IOException e1) {EOFSeen = true;error_after = curPos <= 1 ? "" : input_stream.GetImage();if (curChar == '\n' || curChar == '\r') {- error_line++;- error_column = 0;- }- else- error_column++;- }- if (!EOFSeen) {+ error_line++;+ error_column = 0;+ } else error_column++;+ }+ if (!EOFSeen) {input_stream.backup(1);error_after = curPos <= 1 ? "" : input_stream.GetImage();- }- throw new TokenMgrError(EOFSeen, curLexState, error_line, error_column, error_after, curChar, TokenMgrError.LEXICAL_ERROR);+ }+ throw new TokenMgrError(+ EOFSeen,+ curLexState,+ error_line,+ error_column,+ error_after,+ curChar,+ TokenMgrError.LEXICAL_ERROR);+ }}-}-void SkipLexicalActions(Token matchedToken)-{- switch(jjmatchedKind)- {- default :- break;- }-}-void MoreLexicalActions()-{- jjimageLen += (lengthOfMatch = jjmatchedPos + 1);- switch(jjmatchedKind)- {- default :- break;- }-}-void TokenLexicalActions(Token matchedToken)-{- switch(jjmatchedKind)- {- default :- break;- }-}-private void jjCheckNAdd(int state)-{- if (jjrounds[state] != jjround)- {+ void SkipLexicalActions(Token matchedToken) {+ switch (jjmatchedKind) {+ default:+ break;+ }+ }++ void MoreLexicalActions() {+ jjimageLen += (lengthOfMatch = jjmatchedPos + 1);+ switch (jjmatchedKind) {+ default:+ break;+ }+ }++ void TokenLexicalActions(Token matchedToken) {+ switch (jjmatchedKind) {+ default:+ break;+ }+ }++ private void jjCheckNAdd(int state) {+ if (jjrounds[state] != jjround) {jjstateSet[jjnewStateCnt++] = state;jjrounds[state] = jjround;- }-}-private void jjAddStates(int start, int end)-{- do {+ }+ }++ private void jjAddStates(int start, int end) {+ do {jjstateSet[jjnewStateCnt++] = jjnextStates[start];- } while (start++ != end);-}-private void jjCheckNAddTwoStates(int state1, int state2)-{- jjCheckNAdd(state1);- jjCheckNAdd(state2);-}+ } while (start++ != end);+ }-private void jjCheckNAddStates(int start, int end)-{- do {- jjCheckNAdd(jjnextStates[start]);- } while (start++ != end);-}+ private void jjCheckNAddTwoStates(int state1, int state2) {+ jjCheckNAdd(state1);+ jjCheckNAdd(state2);+ }- /** Constructor. */- public StandardSyntaxParserTokenManager(CharStream stream){+ private void jjCheckNAddStates(int start, int end) {+ do {+ jjCheckNAdd(jjnextStates[start]);+ } while (start++ != end);+ }+ /** Constructor. */+ public StandardSyntaxParserTokenManager(CharStream stream) {input_stream = stream;}/** Constructor. */- public StandardSyntaxParserTokenManager (CharStream stream, int lexState){+ public StandardSyntaxParserTokenManager(CharStream stream, int lexState) {ReInit(stream);SwitchTo(lexState);}/** Reinitialise parser. */-- public void ReInit(CharStream stream)- {-+ public void ReInit(CharStream stream) {- jjmatchedPos =- jjnewStateCnt =- 0;+ jjmatchedPos = jjnewStateCnt = 0;curLexState = defaultLexState;input_stream = stream;ReInitRounds();}- private void ReInitRounds()- {+ private void ReInitRounds() {int i;jjround = 0x80000001;- for (i = 199; i-- > 0;)- jjrounds[i] = 0x80000000;+ for (i = 199; i-- > 0; ) jjrounds[i] = 0x80000000;}/** Reinitialise parser. */- public void ReInit(CharStream stream, int lexState)-- {+ public void ReInit(CharStream stream, int lexState) {+ReInit(stream);SwitchTo(lexState);}/** Switch to specified lex state. */- public void SwitchTo(int lexState)- {+ public void SwitchTo(int lexState) {if (lexState >= 3 || lexState < 0)- throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE);- else- curLexState = lexState;+ throw new TokenMgrError(+ "Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.",+ TokenMgrError.INVALID_LEXICAL_STATE);+ else curLexState = lexState;}--/** Lexer state names. */-public static final String[] lexStateNames = {- "Function",- "Range",- "DEFAULT",-};--/** Lex State array. */-public static final int[] jjnewLexState = {- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,- -1, -1, 1, 1, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,- -1, -1, 2, 2, -1, -1, -1,-};-static final long[] jjtoToken = {- 0x1ffffffffffff01L,-};-static final long[] jjtoSkip = {- 0x80L,-};-static final long[] jjtoSpecial = {- 0x0L,-};-static final long[] jjtoMore = {- 0x0L,-};- protected CharStream input_stream;-- private final int[] jjrounds = new int[199];- private final int[] jjstateSet = new int[2 * 199];- private final StringBuilder jjimage = new StringBuilder();- private StringBuilder image = jjimage;- private int jjimageLen;- private int lengthOfMatch;- protected int curChar;+ /** Lexer state names. */+ public static final String[] lexStateNames = {+ "Function", "Range", "DEFAULT",+ };++ /** Lex State array. */+ public static final int[] jjnewLexState = {+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,+ -1,+ -1, -1, 1, 1, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,+ -1, -1, 2, 2, -1, -1, -1,+ };++ static final long[] jjtoToken = {+ 0x1ffffffffffff01L,+ };+ static final long[] jjtoSkip = {+ 0x80L,+ };+ static final long[] jjtoSpecial = {+ 0x0L,+ };+ static final long[] jjtoMore = {+ 0x0L,+ };+ protected CharStream input_stream;++ private final int[] jjrounds = new int[199];+ private final int[] jjstateSet = new int[2 * 199];+ private final StringBuilder jjimage = new StringBuilder();+ private StringBuilder image = jjimage;+ private int jjimageLen;+ private int lengthOfMatch;+ protected int curChar;}diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/Token.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/Token.javaindex 420bada1bc9..27e6c402e3b 100644--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/Token.java+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/Token.java@@ -18,131 +18,105 @@*/package org.apache.lucene.queryparser.flexible.standard.parser;-/**- * Describes the input token stream.- */-+/** Describes the input token stream. */public class Token implements java.io.Serializable {/**- * The version identifier for this Serializable class.- * Increment only if the <i>serialized</i> form of the- * class changes.+ * The version identifier for this Serializable class. Increment only if the <i>serialized</i>+ * form of the class changes.*/private static final long serialVersionUID = 1L;/**- * An integer that describes the kind of this token. This numbering- * system is determined by JavaCCParser, and a table of these numbers is- * stored in the file ...Constants.java.+ * An integer that describes the kind of this token. This numbering system is determined by+ * JavaCCParser, and a table of these numbers is stored in the file ...Constants.java.*/public int kind;/** The line number of the first character of this Token. */public int beginLine;+/** The column number of the first character of this Token. */public int beginColumn;+/** The line number of the last character of this Token. */public int endLine;+/** The column number of the last character of this Token. */public int endColumn;- /**- * The string image of the token.- */+ /** The string image of the token. */public String image;/**- * A reference to the next regular (non-special) token from the input- * stream. If this is the last token from the input stream, or if the- * token manager has not read tokens beyond this one, this field is- * set to null. This is true only if this token is also a regular- * token. Otherwise, see below for a description of the contents of- * this field.+ * A reference to the next regular (non-special) token from the input stream. If this is the last+ * token from the input stream, or if the token manager has not read tokens beyond this one, this+ * field is set to null. This is true only if this token is also a regular token. Otherwise, see+ * below for a description of the contents of this field.*/public Token next;/**- * This field is used to access special tokens that occur prior to this- * token, but after the immediately preceding regular (non-special) token.- * If there are no such special tokens, this field is set to null.- * When there are more than one such special token, this field refers- * to the last of these special tokens, which in turn refers to the next- * previous special token through its specialToken field, and so on- * until the first special token (whose specialToken field is null).- * The next fields of special tokens refer to other special tokens that- * immediately follow it (without an intervening regular token). If there- * is no such token, this field is null.+ * This field is used to access special tokens that occur prior to this token, but after the+ * immediately preceding regular (non-special) token. If there are no such special tokens, this+ * field is set to null. When there are more than one such special token, this field refers to the+ * last of these special tokens, which in turn refers to the next previous special token through+ * its specialToken field, and so on until the first special token (whose specialToken field is+ * null). The next fields of special tokens refer to other special tokens that immediately follow+ * it (without an intervening regular token). If there is no such token, this field is null.*/public Token specialToken;/**- * An optional attribute value of the Token.- * Tokens which are not used as syntactic sugar will often contain- * meaningful values that will be used later on by the compiler or- * interpreter. This attribute value is often different from the image.- * Any subclass of Token that actually wants to return a non-null value can- * override this method as appropriate.+ * An optional attribute value of the Token. Tokens which are not used as syntactic sugar will+ * often contain meaningful values that will be used later on by the compiler or interpreter. This+ * attribute value is often different from the image. Any subclass of Token that actually wants to+ * return a non-null value can override this method as appropriate.*/public Object getValue() {return null;}- /**- * No-argument constructor- */+ /** No-argument constructor */public Token() {}- /**- * Constructs a new token for the specified Image.- */- public Token(int kind)- {+ /** Constructs a new token for the specified Image. */+ public Token(int kind) {this(kind, null);}- /**- * Constructs a new token for the specified Image and Kind.- */- public Token(int kind, String image)- {+ /** Constructs a new token for the specified Image and Kind. */+ public Token(int kind, String image) {this.kind = kind;this.image = image;}- /**- * Returns the image.- */+ /** Returns the image. */@Override- public String toString()- {+ public String toString() {return image;}/**- * Returns a new Token object, by default. However, if you want, you- * can create and return subclass objects based on the value of ofKind.- * Simply add the cases to the switch for all those special cases.- * For example, if you have a subclass of Token called IDToken that- * you want to create if ofKind is ID, simply add something like :+ * Returns a new Token object, by default. However, if you want, you can create and return+ * subclass objects based on the value of ofKind. Simply add the cases to the switch for all those+ * special cases. For example, if you have a subclass of Token called IDToken that you want to+ * create if ofKind is ID, simply add something like :*- * case MyParserConstants.ID : return new IDToken(ofKind, image);+ * <p>case MyParserConstants.ID : return new IDToken(ofKind, image);*- * to the following switch statement. Then you can cast matchedToken- * variable to the appropriate type and use sit in your lexical actions.+ * <p>to the following switch statement. Then you can cast matchedToken variable to the+ * appropriate type and use sit in your lexical actions.*/- public static Token newToken(int ofKind, String image)- {- switch(ofKind)- {- default : return new Token(ofKind, image);+ public static Token newToken(int ofKind, String image) {+ switch (ofKind) {+ default:+ return new Token(ofKind, image);}}- public static Token newToken(int ofKind)- {+ public static Token newToken(int ofKind) {return newToken(ofKind, null);}-}/* (filtered)*/diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/TokenMgrError.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/TokenMgrError.javaindex bf336f5d907..410b038bd8e 100644--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/TokenMgrError.java+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/TokenMgrError.java@@ -19,14 +19,12 @@package org.apache.lucene.queryparser.flexible.standard.parser;/** Token Manager Error. */-@SuppressWarnings("all")-public class TokenMgrError extends Error-{+@SuppressWarnings("all")+public class TokenMgrError extends Error {/**- * The version identifier for this Serializable class.- * Increment only if the <i>serialized</i> form of the- * class changes.+ * The version identifier for this Serializable class. Increment only if the <i>serialized</i>+ * form of the class changes.*/private static final long serialVersionUID = 1L;@@ -34,42 +32,30 @@ public class TokenMgrError extends Error* Ordinals for various reasons why an Error of this type can be thrown.*/- /**- * Lexical error occurred.- */+ /** Lexical error occurred. */public static final int LEXICAL_ERROR = 0;- /**- * An attempt was made to create a second instance of a static token manager.- */+ /** An attempt was made to create a second instance of a static token manager. */public static final int STATIC_LEXER_ERROR = 1;- /**- * Tried to change to an invalid lexical state.- */+ /** Tried to change to an invalid lexical state. */public static final int INVALID_LEXICAL_STATE = 2;- /**- * Detected (and bailed out of) an infinite loop in the token manager.- */+ /** Detected (and bailed out of) an infinite loop in the token manager. */public static final int LOOP_DETECTED = 3;- /**- * Indicates the reason why the exception is thrown. It will have- * one of the above 4 values.- */+ /** Indicates the reason why the exception is thrown. It will have one of the above 4 values. */int errorCode;/**- * Replaces unprintable characters by their escaped (or unicode escaped)- * equivalents in the given string+ * Replaces unprintable characters by their escaped (or unicode escaped) equivalents in the given+ * string*/protected static final String addEscapes(String str) {StringBuilder retval = new StringBuilder();char ch;for (int i = 0; i < str.length(); i++) {- switch (str.charAt(i))- {+ switch (str.charAt(i)) {case '\b':retval.append("\\b");continue;@@ -108,34 +94,47 @@ public class TokenMgrError extends Error}/**- * Returns a detailed message for the Error when it is thrown by the- * token manager to indicate a lexical error.- * Parameters :- * EOFSeen : indicates if EOF caused the lexical error- * lexState : lexical state in which this error occurred- * errorLine : line number when the error occurred- * errorColumn : column number when the error occurred- * errorAfter : prefix that was seen before this error occurred- * curchar : the offending character- * Note: You can customize the lexical error message by modifying this method.+ * Returns a detailed message for the Error when it is thrown by the token manager to indicate a+ * lexical error. Parameters : EOFSeen : indicates if EOF caused the lexical error lexState :+ * lexical state in which this error occurred errorLine : line number when the error occurred+ * errorColumn : column number when the error occurred errorAfter : prefix that was seen before+ * this error occurred curchar : the offending character Note: You can customize the lexical error+ * message by modifying this method.*/- protected static String LexicalErr(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, int curChar) {- return("Lexical error at line " + //- errorLine + ", column " + //- errorColumn + ". Encountered: " + //- (EOFSeen ? "<EOF>" : ("'" + addEscapes(String.valueOf((char) curChar)) + "' (" + curChar + "),")) + //- (errorAfter == null || errorAfter.length() == 0 ? "" : " after prefix \"" + addEscapes(errorAfter) + "\"")) + //- (lexState == 0 ? "" : " (in lexical state " + lexState + ")");+ protected static String LexicalErr(+ boolean EOFSeen,+ int lexState,+ int errorLine,+ int errorColumn,+ String errorAfter,+ int curChar) {+ return ("Lexical error at line "+ + //+ errorLine+ + ", column "+ + //+ errorColumn+ + ". Encountered: "+ + //+ (EOFSeen+ ? "<EOF>"+ : ("'" + addEscapes(String.valueOf((char) curChar)) + "' (" + curChar + "),"))+ + //+ (errorAfter == null || errorAfter.length() == 0+ ? ""+ : " after prefix \"" + addEscapes(errorAfter) + "\""))+ + //+ (lexState == 0 ? "" : " (in lexical state " + lexState + ")");}/**- * You can also modify the body of this method to customize your error messages.- * For example, cases like LOOP_DETECTED and INVALID_LEXICAL_STATE are not- * of end-users concern, so you can return something like :+ * You can also modify the body of this method to customize your error messages. For example,+ * cases like LOOP_DETECTED and INVALID_LEXICAL_STATE are not of end-users concern, so you can+ * return something like :*- * "Internal Error : Please file a bug report .... "+ * <p>"Internal Error : Please file a bug report .... "*- * from this method for such cases in the release version of your parser.+ * <p>from this method for such cases in the release version of your parser.*/@Overridepublic String getMessage() {@@ -147,8 +146,7 @@ public class TokenMgrError extends Error*//** No arg constructor. */- public TokenMgrError() {- }+ public TokenMgrError() {}/** Constructor with message and reason. */public TokenMgrError(String message, int reason) {@@ -157,7 +155,14 @@ public class TokenMgrError extends Error}/** Full Constructor. */- public TokenMgrError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, int curChar, int reason) {+ public TokenMgrError(+ boolean EOFSeen,+ int lexState,+ int errorLine,+ int errorColumn,+ String errorAfter,+ int curChar,+ int reason) {this(LexicalErr(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);}}diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/ParseException.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/ParseException.javaindex 296ff4b8d7f..9fc602891c3 100644--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/ParseException.java+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/ParseException.java@@ -3,39 +3,30 @@package org.apache.lucene.queryparser.surround.parser;/**- * This exception is thrown when parse errors are encountered.- * You can explicitly create objects of this exception type by- * calling the method generateParseException in the generated- * parser.+ * This exception is thrown when parse errors are encountered. You can explicitly create objects of+ * this exception type by calling the method generateParseException in the generated parser.*- * You can modify this class to customize your error reporting- * mechanisms so long as you retain the public fields.+ * <p>You can modify this class to customize your error reporting mechanisms so long as you retain+ * the public fields.*/public class ParseException extends Exception {/**- * The version identifier for this Serializable class.- * Increment only if the <i>serialized</i> form of the- * class changes.+ * The version identifier for this Serializable class. Increment only if the <i>serialized</i>+ * form of the class changes.*/private static final long serialVersionUID = 1L;- /**- * The end of line string for this machine.- */+ /** The end of line string for this machine. */protected static String EOL = System.getProperty("line.separator", "\n");/**- * This constructor is used by the method "generateParseException"- * in the generated parser. Calling this constructor generates- * a new object of this type with the fields "currentToken",+ * This constructor is used by the method "generateParseException" in the generated parser.+ * Calling this constructor generates a new object of this type with the fields "currentToken",* "expectedTokenSequences", and "tokenImage" set.*/- public ParseException(Token currentTokenVal,- int[][] expectedTokenSequencesVal,- String[] tokenImageVal- )- {+ public ParseException(+ Token currentTokenVal, int[][] expectedTokenSequencesVal, String[] tokenImageVal) {super(initialise(currentTokenVal, expectedTokenSequencesVal, tokenImageVal));currentToken = currentTokenVal;expectedTokenSequences = expectedTokenSequencesVal;@@ -43,15 +34,12 @@ public class ParseException extends Exception {}/**- * The following constructors are for use by you for whatever- * purpose you can think of. Constructing the exception in this- * manner makes the exception behave in the normal way - i.e., as- * documented in the class "Throwable". The fields "errorToken",- * "expectedTokenSequences", and "tokenImage" do not contain- * relevant information. The JavaCC generated code does not use- * these constructors.+ * The following constructors are for use by you for whatever purpose you can think of.+ * Constructing the exception in this manner makes the exception behave in the normal way - i.e.,+ * as documented in the class "Throwable". The fields "errorToken", "expectedTokenSequences", and+ * "tokenImage" do not contain relevant information. The JavaCC generated code does not use these+ * constructors.*/-public ParseException() {super();}@@ -61,38 +49,31 @@ public class ParseException extends Exception {super(message);}-/**- * This is the last token that has been consumed successfully. If- * this object has been created due to a parse error, the token- * following this token will (therefore) be the first error token.+ * This is the last token that has been consumed successfully. If this object has been created due+ * to a parse error, the token following this token will (therefore) be the first error token.*/public Token currentToken;/**- * Each entry in this array is an array of integers. Each array- * of integers represents a sequence of tokens (by their ordinal- * values) that is expected at this point of the parse.+ * Each entry in this array is an array of integers. Each array of integers represents a sequence+ * of tokens (by their ordinal values) that is expected at this point of the parse.*/public int[][] expectedTokenSequences;/**- * This is a reference to the "tokenImage" array of the generated- * parser within which the parse error occurred. This array is- * defined in the generated ...Constants interface.+ * This is a reference to the "tokenImage" array of the generated parser within which the parse+ * error occurred. This array is defined in the generated ...Constants interface.*/public String[] tokenImage;/**- * It uses "currentToken" and "expectedTokenSequences" to generate a parse- * error message and returns it. If this object has been created- * due to a parse error, and you do not catch it (it gets thrown- * from the parser) the correct error message- * gets displayed.+ * It uses "currentToken" and "expectedTokenSequences" to generate a parse error message and+ * returns it. If this object has been created due to a parse error, and you do not catch it (it+ * gets thrown from the parser) the correct error message gets displayed.*/- private static String initialise(Token currentToken,- int[][] expectedTokenSequences,- String[] tokenImage) {+ private static String initialise(+ Token currentToken, int[][] expectedTokenSequences, String[] tokenImage) {StringBuilder expected = new StringBuilder();int maxSize = 0;@@ -123,73 +104,69 @@ public class ParseException extends Exception {tok = tok.next;}if (currentToken.next != null) {- retval += "\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn;+ retval +=+ "\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn;}retval += "." + EOL;--+if (expectedTokenSequences.length == 0) {- // Nothing to add here+ // Nothing to add here} else {- if (expectedTokenSequences.length == 1) {- retval += "Was expecting:" + EOL + " ";- } else {- retval += "Was expecting one of:" + EOL + " ";- }- retval += expected.toString();+ if (expectedTokenSequences.length == 1) {+ retval += "Was expecting:" + EOL + " ";+ } else {+ retval += "Was expecting one of:" + EOL + " ";+ }+ retval += expected.toString();}-+return retval;}-/**- * Used to convert raw characters to their escaped version- * when these raw version cannot be used as part of an ASCII- * string literal.+ * Used to convert raw characters to their escaped version when these raw version cannot be used+ * as part of an ASCII string literal.*/static String add_escapes(String str) {- StringBuilder retval = new StringBuilder();- char ch;- for (int i = 0; i < str.length(); i++) {- switch (str.charAt(i))- {- case '\b':- retval.append("\\b");- continue;- case '\t':- retval.append("\\t");- continue;- case '\n':- retval.append("\\n");- continue;- case '\f':- retval.append("\\f");- continue;- case '\r':- retval.append("\\r");- continue;- case '\"':- retval.append("\\\"");- continue;- case '\'':- retval.append("\\\'");- continue;- case '\\':- retval.append("\\\\");- continue;- default:- if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {- String s = "0000" + Integer.toString(ch, 16);- retval.append("\\u" + s.substring(s.length() - 4, s.length()));- } else {- retval.append(ch);- }- continue;- }+ StringBuilder retval = new StringBuilder();+ char ch;+ for (int i = 0; i < str.length(); i++) {+ switch (str.charAt(i)) {+ case '\b':+ retval.append("\\b");+ continue;+ case '\t':+ retval.append("\\t");+ continue;+ case '\n':+ retval.append("\\n");+ continue;+ case '\f':+ retval.append("\\f");+ continue;+ case '\r':+ retval.append("\\r");+ continue;+ case '\"':+ retval.append("\\\"");+ continue;+ case '\'':+ retval.append("\\\'");+ continue;+ case '\\':+ retval.append("\\\\");+ continue;+ default:+ if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {+ String s = "0000" + Integer.toString(ch, 16);+ retval.append("\\u" + s.substring(s.length() - 4, s.length()));+ } else {+ retval.append(ch);+ }+ continue;}- return retval.toString();- }-+ }+ return retval.toString();+ }}/* (filtered)*/diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParser.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParser.javaindex 24c99d6b5c3..e9d60587fba 100644--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParser.java+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParser.java@@ -2,51 +2,44 @@/* Generated By:JavaCC: Do not edit this line. QueryParser.java */package org.apache.lucene.queryparser.surround.parser;+import java.io.StringReader;import java.util.ArrayList;import java.util.List;-import java.io.StringReader;-----import org.apache.lucene.queryparser.surround.query.SrndQuery;-import org.apache.lucene.queryparser.surround.query.FieldsQuery;-import org.apache.lucene.queryparser.surround.query.OrQuery;+import org.apache.lucene.queryparser.charstream.CharStream;+import org.apache.lucene.queryparser.charstream.FastCharStream;import org.apache.lucene.queryparser.surround.query.AndQuery;-import org.apache.lucene.queryparser.surround.query.NotQuery;import org.apache.lucene.queryparser.surround.query.DistanceQuery;-import org.apache.lucene.queryparser.surround.query.SrndTermQuery;+import org.apache.lucene.queryparser.surround.query.FieldsQuery;+import org.apache.lucene.queryparser.surround.query.NotQuery;+import org.apache.lucene.queryparser.surround.query.OrQuery;import org.apache.lucene.queryparser.surround.query.SrndPrefixQuery;+import org.apache.lucene.queryparser.surround.query.SrndQuery;+import org.apache.lucene.queryparser.surround.query.SrndTermQuery;import org.apache.lucene.queryparser.surround.query.SrndTruncQuery;-import org.apache.lucene.queryparser.charstream.CharStream;-import org.apache.lucene.queryparser.charstream.FastCharStream;/**- * This class is generated by JavaCC. The only method that clients should need- * to call is {@link #parse parse()}.+ * This class is generated by JavaCC. The only method that clients should need to call is {@link+ * #parse parse()}.*-- * <p>This parser generates queries that make use of position information- * (Span queries). It provides positional operators (<code>w</code> and- * <code>n</code>) that accept a numeric distance, as well as boolean- * operators (<code>and</code>, <code>or</code>, and <code>not</code>,- * wildcards (<code>*</code> and <code>?</code>), quoting (with- * <code>"</code>), and boosting (via <code>^</code>).</p>-- * <p>The operators (W, N, AND, OR, NOT) can be expressed lower-cased or- * upper-cased, and the non-unary operators (everything but NOT) support- * both infix <code>(a AND b AND c)</code> and prefix <code>AND(a, b,- * c)</code> notation. </p>-- * <p>The W and N operators express a positional relationship among their- * operands. W is ordered, and N is unordered. The distance is 1 by- * default, meaning the operands are adjacent, or may be provided as a- * prefix from 2-99. So, for example, 3W(a, b) means that terms a and b- * must appear within three positions of each other, or in other words, up- * to two terms may appear between a and b. </p>+ * <p>This parser generates queries that make use of position information (Span queries). It+ * provides positional operators (<code>w</code> and <code>n</code>) that accept a numeric distance,+ * as well as boolean operators (<code>and</code>, <code>or</code>, and <code>not</code>, wildcards+ * (<code>*</code> and <code>?</code>), quoting (with <code>"</code>), and boosting (via <code>^+ * </code>).+ *+ * <p>The operators (W, N, AND, OR, NOT) can be expressed lower-cased or upper-cased, and the+ * non-unary operators (everything but NOT) support both infix <code>(a AND b AND c)</code> and+ * prefix <code>AND(a, b,+ * c)</code> notation.+ *+ * <p>The W and N operators express a positional relationship among their operands. W is ordered,+ * and N is unordered. The distance is 1 by default, meaning the operands are adjacent, or may be+ * provided as a prefix from 2-99. So, for example, 3W(a, b) means that terms a and b must appear+ * within three positions of each other, or in other words, up to two terms may appear between a and+ * b.*/--@SuppressWarnings({"unused","null"}) public class QueryParser implements QueryParserConstants {+@SuppressWarnings({"unused", "null"})+public class QueryParser implements QueryParserConstants {static final int MINIMUM_PREFIX_LENGTH = 3;static final int MINIMUM_CHARS_IN_TRUNC = 3;static final String TRUNCATION_ERROR_MESSAGE = "Too unrestrictive truncation: ";@@ -57,7 +50,7 @@ import org.apache.lucene.queryparser.charstream.FastCharStream;static final char ANY_CHAR = '?';static final char FIELD_OPERATOR = ':';- static public SrndQuery parse(String query) throws ParseException {+ public static SrndQuery parse(String query) throws ParseException {QueryParser parser = new QueryParser();return parser.parse2(query);}@@ -75,8 +68,7 @@ import org.apache.lucene.queryparser.charstream.FastCharStream;}}- protected SrndQuery getFieldsQuery(- SrndQuery q, ArrayList<String> fieldNames) {+ protected SrndQuery getFieldsQuery(SrndQuery q, ArrayList<String> fieldNames) {/* FIXME: check acceptable subquery: at least one subquery should not be* a fields query.*/@@ -88,22 +80,22 @@ import org.apache.lucene.queryparser.charstream.FastCharStream;}protected SrndQuery getAndQuery(List<SrndQuery> queries, boolean infix, Token andToken) {- return new AndQuery( queries, infix, andToken.image);+ return new AndQuery(queries, infix, andToken.image);}protected SrndQuery getNotQuery(List<SrndQuery> queries, Token notToken) {- return new NotQuery( queries, notToken.image);+ return new NotQuery(queries, notToken.image);}protected static int getOpDistance(String distanceOp) {/* W, 2W, 3W etc -> 1, 2 3, etc. Same for N, 2N ... */return distanceOp.length() == 1- ? 1- : Integer.parseInt( distanceOp.substring( 0, distanceOp.length() - 1));+ ? 1+ : Integer.parseInt(distanceOp.substring(0, distanceOp.length() - 1));}protected static void checkDistanceSubQueries(DistanceQuery distq, String opName)- throws ParseException {+ throws ParseException {String m = distq.distanceSubQueryNotAllowed();if (m != null) {throw new ParseException("Operator " + opName + ": " + m);@@ -111,21 +103,14 @@ import org.apache.lucene.queryparser.charstream.FastCharStream;}protected SrndQuery getDistanceQuery(- List<SrndQuery> queries,- boolean infix,- Token dToken,- boolean ordered) throws ParseException {- DistanceQuery dq = new DistanceQuery(queries,- infix,- getOpDistance(dToken.image),- dToken.image,- ordered);+ List<SrndQuery> queries, boolean infix, Token dToken, boolean ordered) throws ParseException {+ DistanceQuery dq =+ new DistanceQuery(queries, infix, getOpDistance(dToken.image), dToken.image, ordered);checkDistanceSubQueries(dq, dToken.image);return dq;}- protected SrndQuery getTermQuery(- String term, boolean quoted) {+ protected SrndQuery getTermQuery(String term, boolean quoted) {return new SrndTermQuery(term, quoted);}@@ -133,8 +118,7 @@ import org.apache.lucene.queryparser.charstream.FastCharStream;return (suffixed.length() - 1) >= MINIMUM_PREFIX_LENGTH;}- protected SrndQuery getPrefixQuery(- String prefix, boolean quoted) {+ protected SrndQuery getPrefixQuery(String prefix, boolean quoted) {return new SrndPrefixQuery(prefix, quoted, TRUNCATOR);}@@ -154,23 +138,30 @@ import org.apache.lucene.queryparser.charstream.FastCharStream;return new SrndTruncQuery(truncated);}- final public SrndQuery TopSrndQuery() throws ParseException {SrndQuery q;+ public final SrndQuery TopSrndQuery() throws ParseException {+ SrndQuery q;q = FieldsQuery();jj_consume_token(0);-{if ("" != null) return q;}+ {+ if ("" != null) return q;+ }throw new Error("Missing return statement in function");-}+ }- final public SrndQuery FieldsQuery() throws ParseException {SrndQuery q;- ArrayList<String> fieldNames;+ public final SrndQuery FieldsQuery() throws ParseException {+ SrndQuery q;+ ArrayList<String> fieldNames;fieldNames = OptionalFields();q = OrQuery();-{if ("" != null) return (fieldNames == null) ? q : getFieldsQuery(q, fieldNames);}+ {+ if ("" != null) return (fieldNames == null) ? q : getFieldsQuery(q, fieldNames);+ }throw new Error("Missing return statement in function");-}+ }- final public ArrayList<String> OptionalFields() throws ParseException {Token fieldName;- ArrayList<String> fieldNames = null;+ public final ArrayList<String> OptionalFields() throws ParseException {+ Token fieldName;+ ArrayList<String> fieldNames = null;label_1:while (true) {if (jj_2_1(2)) {@@ -179,338 +170,423 @@ import org.apache.lucene.queryparser.charstream.FastCharStream;break label_1;}// to the colon- fieldName = jj_consume_token(TERM);+ fieldName = jj_consume_token(TERM);jj_consume_token(COLON);-if (fieldNames == null) {+ if (fieldNames == null) {fieldNames = new ArrayList<String>();}fieldNames.add(fieldName.image);}-{if ("" != null) return fieldNames;}+ {+ if ("" != null) return fieldNames;+ }throw new Error("Missing return statement in function");-}+ }- final public SrndQuery OrQuery() throws ParseException {SrndQuery q;- ArrayList<SrndQuery> queries = null;- Token oprt = null;+ public final SrndQuery OrQuery() throws ParseException {+ SrndQuery q;+ ArrayList<SrndQuery> queries = null;+ Token oprt = null;q = AndQuery();label_2:while (true) {- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case OR:{- ;- break;- }- default:- jj_la1[0] = jj_gen;- break label_2;+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case OR:+ {+ ;+ break;+ }+ default:+ jj_la1[0] = jj_gen;+ break label_2;}oprt = jj_consume_token(OR);-/* keep only last used operator */+ /* keep only last used operator */if (queries == null) {queries = new ArrayList<SrndQuery>();queries.add(q);}q = AndQuery();-queries.add(q);+ queries.add(q);+ }+ {+ if ("" != null) return (queries == null) ? q : getOrQuery(queries, true /* infix */, oprt);}-{if ("" != null) return (queries == null) ? q : getOrQuery(queries, true /* infix */, oprt);}throw new Error("Missing return statement in function");-}+ }- final public SrndQuery AndQuery() throws ParseException {SrndQuery q;- ArrayList<SrndQuery> queries = null;- Token oprt = null;+ public final SrndQuery AndQuery() throws ParseException {+ SrndQuery q;+ ArrayList<SrndQuery> queries = null;+ Token oprt = null;q = NotQuery();label_3:while (true) {- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case AND:{- ;- break;- }- default:- jj_la1[1] = jj_gen;- break label_3;+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case AND:+ {+ ;+ break;+ }+ default:+ jj_la1[1] = jj_gen;+ break label_3;}oprt = jj_consume_token(AND);-/* keep only last used operator */+ /* keep only last used operator */if (queries == null) {queries = new ArrayList<SrndQuery>();queries.add(q);}q = NotQuery();-queries.add(q);+ queries.add(q);+ }+ {+ if ("" != null) return (queries == null) ? q : getAndQuery(queries, true /* infix */, oprt);}-{if ("" != null) return (queries == null) ? q : getAndQuery(queries, true /* infix */, oprt);}throw new Error("Missing return statement in function");-}+ }- final public SrndQuery NotQuery() throws ParseException {SrndQuery q;- ArrayList<SrndQuery> queries = null;- Token oprt = null;+ public final SrndQuery NotQuery() throws ParseException {+ SrndQuery q;+ ArrayList<SrndQuery> queries = null;+ Token oprt = null;q = NQuery();label_4:while (true) {- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case NOT:{- ;- break;- }- default:- jj_la1[2] = jj_gen;- break label_4;+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case NOT:+ {+ ;+ break;+ }+ default:+ jj_la1[2] = jj_gen;+ break label_4;}oprt = jj_consume_token(NOT);-/* keep only last used operator */+ /* keep only last used operator */if (queries == null) {queries = new ArrayList<SrndQuery>();queries.add(q);}q = NQuery();-queries.add(q);+ queries.add(q);+ }+ {+ if ("" != null) return (queries == null) ? q : getNotQuery(queries, oprt);}-{if ("" != null) return (queries == null) ? q : getNotQuery(queries, oprt);}throw new Error("Missing return statement in function");-}+ }- final public SrndQuery NQuery() throws ParseException {SrndQuery q;- ArrayList<SrndQuery> queries;- Token dt;+ public final SrndQuery NQuery() throws ParseException {+ SrndQuery q;+ ArrayList<SrndQuery> queries;+ Token dt;q = WQuery();label_5:while (true) {- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case N:{- ;- break;- }- default:- jj_la1[3] = jj_gen;- break label_5;+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case N:+ {+ ;+ break;+ }+ default:+ jj_la1[3] = jj_gen;+ break label_5;}dt = jj_consume_token(N);-queries = new ArrayList<SrndQuery>();+ queries = new ArrayList<SrndQuery>();queries.add(q); /* left associative */q = WQuery();-queries.add(q);+ queries.add(q);q = getDistanceQuery(queries, true /* infix */, dt, false /* not ordered */);}-{if ("" != null) return q;}+ {+ if ("" != null) return q;+ }throw new Error("Missing return statement in function");-}+ }- final public SrndQuery WQuery() throws ParseException {SrndQuery q;- ArrayList<SrndQuery> queries;- Token wt;+ public final SrndQuery WQuery() throws ParseException {+ SrndQuery q;+ ArrayList<SrndQuery> queries;+ Token wt;q = PrimaryQuery();label_6:while (true) {- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case W:{- ;- break;- }- default:- jj_la1[4] = jj_gen;- break label_6;+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case W:+ {+ ;+ break;+ }+ default:+ jj_la1[4] = jj_gen;+ break label_6;}wt = jj_consume_token(W);-queries = new ArrayList<SrndQuery>();+ queries = new ArrayList<SrndQuery>();queries.add(q); /* left associative */q = PrimaryQuery();-queries.add(q);+ queries.add(q);q = getDistanceQuery(queries, true /* infix */, wt, true /* ordered */);}-{if ("" != null) return q;}+ {+ if ("" != null) return q;+ }throw new Error("Missing return statement in function");-}+ }- final public SrndQuery PrimaryQuery() throws ParseException {/* bracketed weighted query or weighted term */- SrndQuery q;- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case LPAREN:{- jj_consume_token(LPAREN);- q = FieldsQuery();- jj_consume_token(RPAREN);- break;- }- case OR:- case AND:- case W:- case N:{- q = PrefixOperatorQuery();- break;- }- case TRUNCQUOTED:- case QUOTED:- case SUFFIXTERM:- case TRUNCTERM:- case TERM:{- q = SimpleTerm();- break;- }- default:- jj_la1[5] = jj_gen;- jj_consume_token(-1);- throw new ParseException();+ public final SrndQuery PrimaryQuery() throws ParseException {+ /* bracketed weighted query or weighted term */+ SrndQuery q;+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case LPAREN:+ {+ jj_consume_token(LPAREN);+ q = FieldsQuery();+ jj_consume_token(RPAREN);+ break;+ }+ case OR:+ case AND:+ case W:+ case N:+ {+ q = PrefixOperatorQuery();+ break;+ }+ case TRUNCQUOTED:+ case QUOTED:+ case SUFFIXTERM:+ case TRUNCTERM:+ case TERM:+ {+ q = SimpleTerm();+ break;+ }+ default:+ jj_la1[5] = jj_gen;+ jj_consume_token(-1);+ throw new ParseException();}OptionalWeights(q);-{if ("" != null) return q;}+ {+ if ("" != null) return q;+ }throw new Error("Missing return statement in function");-}+ }- final public SrndQuery PrefixOperatorQuery() throws ParseException {Token oprt;- List<SrndQuery> queries;- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case OR:{- oprt = jj_consume_token(OR);- /* prefix OR */+ public final SrndQuery PrefixOperatorQuery() throws ParseException {+ Token oprt;+ List<SrndQuery> queries;+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case OR:+ {+ oprt = jj_consume_token(OR);+ /* prefix OR */queries = FieldsQueryList();-{if ("" != null) return getOrQuery(queries, false /* not infix */, oprt);}- break;- }- case AND:{- oprt = jj_consume_token(AND);- /* prefix AND */+ {+ if ("" != null) return getOrQuery(queries, false /* not infix */, oprt);+ }+ break;+ }+ case AND:+ {+ oprt = jj_consume_token(AND);+ /* prefix AND */queries = FieldsQueryList();-{if ("" != null) return getAndQuery(queries, false /* not infix */, oprt);}- break;- }- case N:{- oprt = jj_consume_token(N);- /* prefix N */+ {+ if ("" != null) return getAndQuery(queries, false /* not infix */, oprt);+ }+ break;+ }+ case N:+ {+ oprt = jj_consume_token(N);+ /* prefix N */queries = FieldsQueryList();-{if ("" != null) return getDistanceQuery(queries, false /* not infix */, oprt, false /* not ordered */);}- break;- }- case W:{- oprt = jj_consume_token(W);- /* prefix W */+ {+ if ("" != null)+ return getDistanceQuery(+ queries, false /* not infix */, oprt, false /* not ordered */);+ }+ break;+ }+ case W:+ {+ oprt = jj_consume_token(W);+ /* prefix W */queries = FieldsQueryList();-{if ("" != null) return getDistanceQuery(queries, false /* not infix */, oprt, true /* ordered */);}- break;- }- default:- jj_la1[6] = jj_gen;- jj_consume_token(-1);- throw new ParseException();+ {+ if ("" != null)+ return getDistanceQuery(queries, false /* not infix */, oprt, true /* ordered */);+ }+ break;+ }+ default:+ jj_la1[6] = jj_gen;+ jj_consume_token(-1);+ throw new ParseException();}throw new Error("Missing return statement in function");-}+ }- final public List<SrndQuery> FieldsQueryList() throws ParseException {SrndQuery q;- ArrayList<SrndQuery> queries = new ArrayList<SrndQuery>();+ public final List<SrndQuery> FieldsQueryList() throws ParseException {+ SrndQuery q;+ ArrayList<SrndQuery> queries = new ArrayList<SrndQuery>();jj_consume_token(LPAREN);q = FieldsQuery();-queries.add(q);+ queries.add(q);label_7:while (true) {jj_consume_token(COMMA);q = FieldsQuery();-queries.add(q);- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case COMMA:{- ;- break;- }- default:- jj_la1[7] = jj_gen;- break label_7;+ queries.add(q);+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case COMMA:+ {+ ;+ break;+ }+ default:+ jj_la1[7] = jj_gen;+ break label_7;}}jj_consume_token(RPAREN);-{if ("" != null) return queries;}+ {+ if ("" != null) return queries;+ }throw new Error("Missing return statement in function");-}+ }- final public SrndQuery SimpleTerm() throws ParseException {Token term;- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case TERM:{- term = jj_consume_token(TERM);-{if ("" != null) return getTermQuery(term.image, false /* not quoted */);}- break;- }- case QUOTED:{- term = jj_consume_token(QUOTED);-{if ("" != null) return getTermQuery(term.image.substring(1, term.image.length()-1), true /* quoted */);}- break;- }- case SUFFIXTERM:{- term = jj_consume_token(SUFFIXTERM);-/* ending in * */- if (! allowedSuffix(term.image)) {- {if (true) throw new ParseException(TRUNCATION_ERROR_MESSAGE + term.image);}- }- {if ("" != null) return getPrefixQuery(term.image.substring(0, term.image.length()-1), false /* not quoted */);}- break;- }- case TRUNCTERM:{- term = jj_consume_token(TRUNCTERM);-/* with at least one * or ? */- if (! allowedTruncation(term.image)) {- {if (true) throw new ParseException(TRUNCATION_ERROR_MESSAGE + term.image);}- }- {if ("" != null) return getTruncQuery(term.image);}- break;- }- case TRUNCQUOTED:{- term = jj_consume_token(TRUNCQUOTED);-/* eg. "9b-b,m"* */- if ((term.image.length() - 3) < MINIMUM_PREFIX_LENGTH) {- {if (true) throw new ParseException(TRUNCATION_ERROR_MESSAGE + term.image);}- }- {if ("" != null) return getPrefixQuery(term.image.substring(1, term.image.length()-2), true /* quoted */);}- break;- }- default:- jj_la1[8] = jj_gen;- jj_consume_token(-1);- throw new ParseException();+ public final SrndQuery SimpleTerm() throws ParseException {+ Token term;+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case TERM:+ {+ term = jj_consume_token(TERM);+ {+ if ("" != null) return getTermQuery(term.image, false /* not quoted */);+ }+ break;+ }+ case QUOTED:+ {+ term = jj_consume_token(QUOTED);+ {+ if ("" != null)+ return getTermQuery(+ term.image.substring(1, term.image.length() - 1), true /* quoted */);+ }+ break;+ }+ case SUFFIXTERM:+ {+ term = jj_consume_token(SUFFIXTERM);+ /* ending in * */+ if (!allowedSuffix(term.image)) {+ {+ if (true) throw new ParseException(TRUNCATION_ERROR_MESSAGE + term.image);+ }+ }+ {+ if ("" != null)+ return getPrefixQuery(+ term.image.substring(0, term.image.length() - 1), false /* not quoted */);+ }+ break;+ }+ case TRUNCTERM:+ {+ term = jj_consume_token(TRUNCTERM);+ /* with at least one * or ? */+ if (!allowedTruncation(term.image)) {+ {+ if (true) throw new ParseException(TRUNCATION_ERROR_MESSAGE + term.image);+ }+ }+ {+ if ("" != null) return getTruncQuery(term.image);+ }+ break;+ }+ case TRUNCQUOTED:+ {+ term = jj_consume_token(TRUNCQUOTED);+ /* eg. "9b-b,m"* */+ if ((term.image.length() - 3) < MINIMUM_PREFIX_LENGTH) {+ {+ if (true) throw new ParseException(TRUNCATION_ERROR_MESSAGE + term.image);+ }+ }+ {+ if ("" != null)+ return getPrefixQuery(+ term.image.substring(1, term.image.length() - 2), true /* quoted */);+ }+ break;+ }+ default:+ jj_la1[8] = jj_gen;+ jj_consume_token(-1);+ throw new ParseException();}throw new Error("Missing return statement in function");-}+ }- final public void OptionalWeights(SrndQuery q) throws ParseException {Token weight=null;+ public final void OptionalWeights(SrndQuery q) throws ParseException {+ Token weight = null;label_8:while (true) {- switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {- case CARAT:{- ;- break;- }- default:- jj_la1[9] = jj_gen;- break label_8;+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {+ case CARAT:+ {+ ;+ break;+ }+ default:+ jj_la1[9] = jj_gen;+ break label_8;}jj_consume_token(CARAT);weight = jj_consume_token(NUMBER);-float f;+ float f;try {f = Float.parseFloat(weight.image);} catch (Exception floatExc) {- {if (true) throw new ParseException(BOOST_ERROR_MESSAGE + weight.image + " (" + floatExc + ")");}+ {+ if (true)+ throw new ParseException(BOOST_ERROR_MESSAGE + weight.image + " (" + floatExc + ")");+ }}if (f <= 0.0) {- {if (true) throw new ParseException(BOOST_ERROR_MESSAGE + weight.image);}+ {+ if (true) throw new ParseException(BOOST_ERROR_MESSAGE + weight.image);+ }}q.setWeight(f * q.getWeight()); /* left associative, fwiw */-}-}+ }- private boolean jj_2_1(int xla)- {- jj_la = xla; jj_lastpos = jj_scanpos = token;- try { return (!jj_3_1()); }- catch(LookaheadSuccess ls) { return true; }- finally { jj_save(0, xla); }+ private boolean jj_2_1(int xla) {+ jj_la = xla;+ jj_lastpos = jj_scanpos = token;+ try {+ return (!jj_3_1());+ } catch (LookaheadSuccess ls) {+ return true;+ } finally {+ jj_save(0, xla);+ }}- private boolean jj_3_1()- {+ private boolean jj_3_1() {if (jj_scan_token(TERM)) return true;if (jj_scan_token(COLON)) return true;return false;@@ -518,144 +594,157 @@ float f;/** Generated Token Manager. */public QueryParserTokenManager token_source;+/** Current token. */public Token token;+/** Next token. */public Token jj_nt;+private int jj_ntk;private Token jj_scanpos, jj_lastpos;private int jj_la;private int jj_gen;- final private int[] jj_la1 = new int[10];- static private int[] jj_la1_0;+ private final int[] jj_la1 = new int[10];+ private static int[] jj_la1_0;+static {- jj_la1_init_0();- }- private static void jj_la1_init_0() {- jj_la1_0 = new int[] {0x100,0x200,0x400,0x1000,0x800,0x7c3b00,0x1b00,0x8000,0x7c0000,0x20000,};- }- final private JJCalls[] jj_2_rtns = new JJCalls[1];+ jj_la1_init_0();+ }++ private static void jj_la1_init_0() {+ jj_la1_0 =+ new int[] {+ 0x100, 0x200, 0x400, 0x1000, 0x800, 0x7c3b00, 0x1b00, 0x8000, 0x7c0000, 0x20000,+ };+ }++ private final JJCalls[] jj_2_rtns = new JJCalls[1];private boolean jj_rescan = false;private int jj_gc = 0;/** Constructor with user supplied CharStream. */public QueryParser(CharStream stream) {- token_source = new QueryParserTokenManager(stream);- token = new Token();- jj_ntk = -1;- jj_gen = 0;- for (int i = 0; i < 10; i++) jj_la1[i] = -1;- for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();+ token_source = new QueryParserTokenManager(stream);+ token = new Token();+ jj_ntk = -1;+ jj_gen = 0;+ for (int i = 0; i < 10; i++) jj_la1[i] = -1;+ for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();}/** Reinitialise. */public void ReInit(CharStream stream) {- token_source.ReInit(stream);- token = new Token();- jj_ntk = -1;- jj_gen = 0;- for (int i = 0; i < 10; i++) jj_la1[i] = -1;- for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();+ token_source.ReInit(stream);+ token = new Token();+ jj_ntk = -1;+ jj_gen = 0;+ for (int i = 0; i < 10; i++) jj_la1[i] = -1;+ for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();}/** Constructor with generated Token Manager. */public QueryParser(QueryParserTokenManager tm) {- token_source = tm;- token = new Token();- jj_ntk = -1;- jj_gen = 0;- for (int i = 0; i < 10; i++) jj_la1[i] = -1;- for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();+ token_source = tm;+ token = new Token();+ jj_ntk = -1;+ jj_gen = 0;+ for (int i = 0; i < 10; i++) jj_la1[i] = -1;+ for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();}/** Reinitialise. */public void ReInit(QueryParserTokenManager tm) {- token_source = tm;- token = new Token();- jj_ntk = -1;- jj_gen = 0;- for (int i = 0; i < 10; i++) jj_la1[i] = -1;- for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();+ token_source = tm;+ token = new Token();+ jj_ntk = -1;+ jj_gen = 0;+ for (int i = 0; i < 10; i++) jj_la1[i] = -1;+ for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();}private Token jj_consume_token(int kind) throws ParseException {- Token oldToken;- if ((oldToken = token).next != null) token = token.next;- else token = token.next = token_source.getNextToken();- jj_ntk = -1;- if (token.kind == kind) {- jj_gen++;- if (++jj_gc > 100) {- jj_gc = 0;- for (int i = 0; i < jj_2_rtns.length; i++) {- JJCalls c = jj_2_rtns[i];- while (c != null) {- if (c.gen < jj_gen) c.first = null;- c = c.next;- }- }- }- return token;- }- token = oldToken;- jj_kind = kind;- throw generateParseException();+ Token oldToken;+ if ((oldToken = token).next != null) token = token.next;+ else token = token.next = token_source.getNextToken();+ jj_ntk = -1;+ if (token.kind == kind) {+ jj_gen++;+ if (++jj_gc > 100) {+ jj_gc = 0;+ for (int i = 0; i < jj_2_rtns.length; i++) {+ JJCalls c = jj_2_rtns[i];+ while (c != null) {+ if (c.gen < jj_gen) c.first = null;+ c = c.next;+ }+ }+ }+ return token;+ }+ token = oldToken;+ jj_kind = kind;+ throw generateParseException();}@SuppressWarnings("serial")- static private final class LookaheadSuccess extends java.lang.Error {+ private static final class LookaheadSuccess extends java.lang.Error {@Overridepublic Throwable fillInStackTrace() {return this;}}- static private final LookaheadSuccess jj_ls = new LookaheadSuccess();++ private static final LookaheadSuccess jj_ls = new LookaheadSuccess();+private boolean jj_scan_token(int kind) {- if (jj_scanpos == jj_lastpos) {- jj_la--;- if (jj_scanpos.next == null) {- jj_lastpos = jj_scanpos = jj_scanpos.next = token_source.getNextToken();- } else {- jj_lastpos = jj_scanpos = jj_scanpos.next;- }- } else {- jj_scanpos = jj_scanpos.next;- }- if (jj_rescan) {- int i = 0; Token tok = token;- while (tok != null && tok != jj_scanpos) { i++; tok = tok.next; }- if (tok != null) jj_add_error_token(kind, i);- }- if (jj_scanpos.kind != kind) return true;- if (jj_la == 0 && jj_scanpos == jj_lastpos) throw jj_ls;- return false;- }---/** Get the next Token. */- final public Token getNextToken() {- if (token.next != null) token = token.next;- else token = token.next = token_source.getNextToken();- jj_ntk = -1;- jj_gen++;- return token;- }--/** Get the specific Token. */- final public Token getToken(int index) {- Token t = token;- for (int i = 0; i < index; i++) {- if (t.next != null) t = t.next;- else t = t.next = token_source.getNextToken();- }- return t;+ if (jj_scanpos == jj_lastpos) {+ jj_la--;+ if (jj_scanpos.next == null) {+ jj_lastpos = jj_scanpos = jj_scanpos.next = token_source.getNextToken();+ } else {+ jj_lastpos = jj_scanpos = jj_scanpos.next;+ }+ } else {+ jj_scanpos = jj_scanpos.next;+ }+ if (jj_rescan) {+ int i = 0;+ Token tok = token;+ while (tok != null && tok != jj_scanpos) {+ i++;+ tok = tok.next;+ }+ if (tok != null) jj_add_error_token(kind, i);+ }+ if (jj_scanpos.kind != kind) return true;+ if (jj_la == 0 && jj_scanpos == jj_lastpos) throw jj_ls;+ return false;+ }++ /** Get the next Token. */+ public final Token getNextToken() {+ if (token.next != null) token = token.next;+ else token = token.next = token_source.getNextToken();+ jj_ntk = -1;+ jj_gen++;+ return token;+ }++ /** Get the specific Token. */+ public final Token getToken(int index) {+ Token t = token;+ for (int i = 0; i < index; i++) {+ if (t.next != null) t = t.next;+ else t = t.next = token_source.getNextToken();+ }+ return t;}private int jj_ntk_f() {- if ((jj_nt=token.next) == null)- return (jj_ntk = (token.next=token_source.getNextToken()).kind);- else- return (jj_ntk = jj_nt.kind);+ if ((jj_nt = token.next) == null)+ return (jj_ntk = (token.next = token_source.getNextToken()).kind);+ else return (jj_ntk = jj_nt.kind);}private java.util.List<int[]> jj_expentries = new java.util.ArrayList<>();@@ -665,130 +754,133 @@ float f;private int jj_endpos;private void jj_add_error_token(int kind, int pos) {- if (pos >= 100) {- return;- }-- if (pos == jj_endpos + 1) {- jj_lasttokens[jj_endpos++] = kind;- } else if (jj_endpos != 0) {- jj_expentry = new int[jj_endpos];-- for (int i = 0; i < jj_endpos; i++) {- jj_expentry[i] = jj_lasttokens[i];- }-- for (int[] oldentry : jj_expentries) {- if (oldentry.length == jj_expentry.length) {- boolean isMatched = true;-- for (int i = 0; i < jj_expentry.length; i++) {- if (oldentry[i] != jj_expentry[i]) {- isMatched = false;- break;- }-- }- if (isMatched) {- jj_expentries.add(jj_expentry);- break;- }- }- }-- if (pos != 0) {- jj_lasttokens[(jj_endpos = pos) - 1] = kind;- }- }+ if (pos >= 100) {+ return;+ }++ if (pos == jj_endpos + 1) {+ jj_lasttokens[jj_endpos++] = kind;+ } else if (jj_endpos != 0) {+ jj_expentry = new int[jj_endpos];++ for (int i = 0; i < jj_endpos; i++) {+ jj_expentry[i] = jj_lasttokens[i];+ }++ for (int[] oldentry : jj_expentries) {+ if (oldentry.length == jj_expentry.length) {+ boolean isMatched = true;++ for (int i = 0; i < jj_expentry.length; i++) {+ if (oldentry[i] != jj_expentry[i]) {+ isMatched = false;+ break;+ }+ }+ if (isMatched) {+ jj_expentries.add(jj_expentry);+ break;+ }+ }+ }++ if (pos != 0) {+ jj_lasttokens[(jj_endpos = pos) - 1] = kind;+ }+ }}/** Generate ParseException. */public ParseException generateParseException() {- jj_expentries.clear();- boolean[] la1tokens = new boolean[24];- if (jj_kind >= 0) {- la1tokens[jj_kind] = true;- jj_kind = -1;- }- for (int i = 0; i < 10; i++) {- if (jj_la1[i] == jj_gen) {- for (int j = 0; j < 32; j++) {- if ((jj_la1_0[i] & (1<<j)) != 0) {- la1tokens[j] = true;- }- }- }- }- for (int i = 0; i < 24; i++) {- if (la1tokens[i]) {- jj_expentry = new int[1];- jj_expentry[0] = i;- jj_expentries.add(jj_expentry);- }- }- jj_endpos = 0;- jj_rescan_token();- jj_add_error_token(0, 0);- int[][] exptokseq = new int[jj_expentries.size()][];- for (int i = 0; i < jj_expentries.size(); i++) {- exptokseq[i] = jj_expentries.get(i);- }- return new ParseException(token, exptokseq, tokenImage);+ jj_expentries.clear();+ boolean[] la1tokens = new boolean[24];+ if (jj_kind >= 0) {+ la1tokens[jj_kind] = true;+ jj_kind = -1;+ }+ for (int i = 0; i < 10; i++) {+ if (jj_la1[i] == jj_gen) {+ for (int j = 0; j < 32; j++) {+ if ((jj_la1_0[i] & (1 << j)) != 0) {+ la1tokens[j] = true;+ }+ }+ }+ }+ for (int i = 0; i < 24; i++) {+ if (la1tokens[i]) {+ jj_expentry = new int[1];+ jj_expentry[0] = i;+ jj_expentries.add(jj_expentry);+ }+ }+ jj_endpos = 0;+ jj_rescan_token();+ jj_add_error_token(0, 0);+ int[][] exptokseq = new int[jj_expentries.size()][];+ for (int i = 0; i < jj_expentries.size(); i++) {+ exptokseq[i] = jj_expentries.get(i);+ }+ return new ParseException(token, exptokseq, tokenImage);}private boolean trace_enabled;-/** Trace enabled. */- final public boolean trace_enabled() {- return trace_enabled;+ /** Trace enabled. */+ public final boolean trace_enabled() {+ return trace_enabled;}/** Enable tracing. */- final public void enable_tracing() {- }+ public final void enable_tracing() {}/** Disable tracing. */- final public void disable_tracing() {- }+ public final void disable_tracing() {}private void jj_rescan_token() {- jj_rescan = true;- for (int i = 0; i < 1; i++) {- try {- JJCalls p = jj_2_rtns[i];-- do {- if (p.gen > jj_gen) {- jj_la = p.arg; jj_lastpos = jj_scanpos = p.first;- switch (i) {- case 0: jj_3_1(); break;- }- }- p = p.next;- } while (p != null);-- } catch(LookaheadSuccess ls) { }- }- jj_rescan = false;+ jj_rescan = true;+ for (int i = 0; i < 1; i++) {+ try {+ JJCalls p = jj_2_rtns[i];++ do {+ if (p.gen > jj_gen) {+ jj_la = p.arg;+ jj_lastpos = jj_scanpos = p.first;+ switch (i) {+ case 0:+ jj_3_1();+ break;+ }+ }+ p = p.next;+ } while (p != null);++ } catch (LookaheadSuccess ls) {+ }+ }+ jj_rescan = false;}private void jj_save(int index, int xla) {- JJCalls p = jj_2_rtns[index];- while (p.gen > jj_gen) {- if (p.next == null) { p = p.next = new JJCalls(); break; }- p = p.next;- }+ JJCalls p = jj_2_rtns[index];+ while (p.gen > jj_gen) {+ if (p.next == null) {+ p = p.next = new JJCalls();+ break;+ }+ p = p.next;+ }- p.gen = jj_gen + xla - jj_la;- p.first = token;- p.arg = xla;+ p.gen = jj_gen + xla - jj_la;+ p.first = token;+ p.arg = xla;}static final class JJCalls {- int gen;- Token first;- int arg;- JJCalls next;+ int gen;+ Token first;+ int arg;+ JJCalls next;}-}diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParserConstants.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParserConstants.javaindex bba63f297f7..41e8c2e23ab 100644--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParserConstants.java+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParserConstants.java@@ -1,62 +1,81 @@/* Generated By:JavaCC: Do not edit this line. QueryParserConstants.java */package org.apache.lucene.queryparser.surround.parser;--/**- * Token literal values and constants.- * Generated by org.javacc.parser.OtherFilesGen#start()- */+/** Token literal values and constants. Generated by org.javacc.parser.OtherFilesGen#start() */public interface QueryParserConstants {/** End of File. */int EOF = 0;+/** RegularExpression Id. */int _NUM_CHAR = 1;+/** RegularExpression Id. */int _TERM_CHAR = 2;+/** RegularExpression Id. */int _WHITESPACE = 3;+/** RegularExpression Id. */int _STAR = 4;+/** RegularExpression Id. */int _ONE_CHAR = 5;+/** RegularExpression Id. */int _DISTOP_NUM = 6;+/** RegularExpression Id. */int OR = 8;+/** RegularExpression Id. */int AND = 9;+/** RegularExpression Id. */int NOT = 10;+/** RegularExpression Id. */int W = 11;+/** RegularExpression Id. */int N = 12;+/** RegularExpression Id. */int LPAREN = 13;+/** RegularExpression Id. */int RPAREN = 14;+/** RegularExpression Id. */int COMMA = 15;+/** RegularExpression Id. */int COLON = 16;+/** RegularExpression Id. */int CARAT = 17;+/** RegularExpression Id. */int TRUNCQUOTED = 18;+/** RegularExpression Id. */int QUOTED = 19;+/** RegularExpression Id. */int SUFFIXTERM = 20;+/** RegularExpression Id. */int TRUNCTERM = 21;+/** RegularExpression Id. */int TERM = 22;+/** RegularExpression Id. */int NUMBER = 23;/** Lexical state. */int Boost = 0;+/** Lexical state. */int DEFAULT = 1;@@ -87,5 +106,4 @@ public interface QueryParserConstants {"<TERM>","<NUMBER>",};-}diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParserTokenManager.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParserTokenManager.javaindex da81a994d56..176bd0d220e 100644--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParserTokenManager.java+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParserTokenManager.java@@ -1,761 +1,687 @@/* QueryParserTokenManager.java *//* Generated By:JavaCC: Do not edit this line. QueryParserTokenManager.java */package org.apache.lucene.queryparser.surround.parser;- import org.apache.lucene.queryparser.charstream.CharStream;--------------+import org.apache.lucene.queryparser.charstream.CharStream;/** Token Manager. */-@SuppressWarnings ("unused")+@SuppressWarnings("unused")public class QueryParserTokenManager implements QueryParserConstants {// Debug output.// (debugStream omitted).// Set debug output.// (setDebugStream omitted).-private final int jjStopStringLiteralDfa_1(int pos, long active0){- switch (pos)- {- default :- return -1;- }-}-private final int jjStartNfa_1(int pos, long active0){- return jjMoveNfa_1(jjStopStringLiteralDfa_1(pos, active0), pos + 1);-}-private int jjStopAtPos(int pos, int kind)-{- jjmatchedKind = kind;- jjmatchedPos = pos;- return pos + 1;-}-private int jjMoveStringLiteralDfa0_1(){- switch(curChar)- {+ private final int jjStopStringLiteralDfa_1(int pos, long active0) {+ switch (pos) {+ default:+ return -1;+ }+ }++ private final int jjStartNfa_1(int pos, long active0) {+ return jjMoveNfa_1(jjStopStringLiteralDfa_1(pos, active0), pos + 1);+ }++ private int jjStopAtPos(int pos, int kind) {+ jjmatchedKind = kind;+ jjmatchedPos = pos;+ return pos + 1;+ }++ private int jjMoveStringLiteralDfa0_1() {+ switch (curChar) {case 40:- return jjStopAtPos(0, 13);+ return jjStopAtPos(0, 13);case 41:- return jjStopAtPos(0, 14);+ return jjStopAtPos(0, 14);case 44:- return jjStopAtPos(0, 15);+ return jjStopAtPos(0, 15);case 58:- return jjStopAtPos(0, 16);+ return jjStopAtPos(0, 16);case 94:- return jjStopAtPos(0, 17);- default :- return jjMoveNfa_1(0, 0);- }-}-static final long[] jjbitVec0 = {- 0xfffffffffffffffeL, 0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffffffffffffL-};-static final long[] jjbitVec2 = {- 0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL-};-private int jjMoveNfa_1(int startState, int curPos)-{- int startsAt = 0;- jjnewStateCnt = 38;- int i = 1;- jjstateSet[0] = startState;- int kind = 0x7fffffff;- for (;;)- {- if (++jjround == 0x7fffffff)- ReInitRounds();- if (curChar < 64)- {- long l = 1L << curChar;- do- {- switch(jjstateSet[--i])- {- case 0:- if ((0x7bffe8faffffd9ffL & l) != 0L)- {- if (kind > 22)- kind = 22;- { jjCheckNAddStates(0, 4); }- }- else if ((0x100002600L & l) != 0L)- {- if (kind > 7)- kind = 7;- }- else if (curChar == 34)- { jjCheckNAddStates(5, 7); }- if ((0x3fc000000000000L & l) != 0L)- { jjCheckNAddStates(8, 11); }- else if (curChar == 49)- { jjCheckNAddTwoStates(20, 21); }- break;- case 19:- if ((0x3fc000000000000L & l) != 0L)- { jjCheckNAddStates(8, 11); }- break;- case 20:- if ((0x3ff000000000000L & l) != 0L)- { jjCheckNAdd(17); }- break;- case 21:- if ((0x3ff000000000000L & l) != 0L)- { jjCheckNAdd(18); }- break;- case 22:- if (curChar == 49)- { jjCheckNAddTwoStates(20, 21); }- break;- case 23:- if (curChar == 34)- { jjCheckNAddStates(5, 7); }- break;- case 24:- if ((0xfffffffbffffffffL & l) != 0L)- { jjCheckNAddTwoStates(24, 25); }- break;- case 25:- if (curChar == 34)- jjstateSet[jjnewStateCnt++] = 26;- break;- case 26:- if (curChar == 42 && kind > 18)- kind = 18;- break;- case 27:- if ((0xfffffffbffffffffL & l) != 0L)- { jjCheckNAddStates(12, 14); }- break;- case 29:- if (curChar == 34)- { jjCheckNAddStates(12, 14); }- break;- case 30:- if (curChar == 34 && kind > 19)- kind = 19;- break;- case 31:- if ((0x7bffe8faffffd9ffL & l) == 0L)- break;- if (kind > 22)- kind = 22;- { jjCheckNAddStates(0, 4); }- break;- case 32:- if ((0x7bffe8faffffd9ffL & l) != 0L)- { jjCheckNAddTwoStates(32, 33); }- break;- case 33:- if (curChar == 42 && kind > 20)- kind = 20;- break;- case 34:- if ((0x7bffe8faffffd9ffL & l) != 0L)- { jjCheckNAddTwoStates(34, 35); }- break;- case 35:- if ((0x8000040000000000L & l) == 0L)- break;- if (kind > 21)- kind = 21;- { jjCheckNAddTwoStates(35, 36); }- break;- case 36:- if ((0xfbffecfaffffd9ffL & l) == 0L)- break;- if (kind > 21)- kind = 21;- { jjCheckNAdd(36); }- break;- case 37:- if ((0x7bffe8faffffd9ffL & l) == 0L)- break;- if (kind > 22)- kind = 22;- { jjCheckNAdd(37); }- break;- default : break;- }- } while(i != startsAt);- }- else if (curChar < 128)- {- long l = 1L << (curChar & 077);- do- {- switch(jjstateSet[--i])- {- case 0:- if ((0xffffffffbfffffffL & l) != 0L)- {- if (kind > 22)- kind = 22;- { jjCheckNAddStates(0, 4); }- }- if ((0x400000004000L & l) != 0L)- {- if (kind > 12)- kind = 12;- }- else if ((0x80000000800000L & l) != 0L)- {- if (kind > 11)- kind = 11;- }- else if (curChar == 97)- jjstateSet[jjnewStateCnt++] = 9;- else if (curChar == 65)- jjstateSet[jjnewStateCnt++] = 6;- else if (curChar == 111)- jjstateSet[jjnewStateCnt++] = 3;- else if (curChar == 79)- jjstateSet[jjnewStateCnt++] = 1;- if (curChar == 110)- jjstateSet[jjnewStateCnt++] = 15;- else if (curChar == 78)- jjstateSet[jjnewStateCnt++] = 12;- break;- case 1:- if (curChar == 82 && kind > 8)- kind = 8;- break;- case 2:- if (curChar == 79)- jjstateSet[jjnewStateCnt++] = 1;- break;- case 3:- if (curChar == 114 && kind > 8)- kind = 8;- break;- case 4:- if (curChar == 111)- jjstateSet[jjnewStateCnt++] = 3;- break;- case 5:- if (curChar == 68 && kind > 9)- kind = 9;- break;- case 6:- if (curChar == 78)- jjstateSet[jjnewStateCnt++] = 5;- break;- case 7:- if (curChar == 65)- jjstateSet[jjnewStateCnt++] = 6;- break;- case 8:- if (curChar == 100 && kind > 9)- kind = 9;- break;- case 9:- if (curChar == 110)- jjstateSet[jjnewStateCnt++] = 8;- break;- case 10:- if (curChar == 97)- jjstateSet[jjnewStateCnt++] = 9;- break;- case 11:- if (curChar == 84 && kind > 10)- kind = 10;- break;- case 12:- if (curChar == 79)- jjstateSet[jjnewStateCnt++] = 11;- break;- case 13:- if (curChar == 78)- jjstateSet[jjnewStateCnt++] = 12;- break;- case 14:- if (curChar == 116 && kind > 10)- kind = 10;- break;- case 15:- if (curChar == 111)- jjstateSet[jjnewStateCnt++] = 14;- break;- case 16:- if (curChar == 110)- jjstateSet[jjnewStateCnt++] = 15;- break;- case 17:- if ((0x80000000800000L & l) != 0L && kind > 11)- kind = 11;- break;- case 18:- if ((0x400000004000L & l) != 0L && kind > 12)- kind = 12;- break;- case 24:- { jjAddStates(15, 16); }- break;- case 27:- if ((0xffffffffefffffffL & l) != 0L)- { jjCheckNAddStates(12, 14); }- break;- case 28:- if (curChar == 92)- jjstateSet[jjnewStateCnt++] = 29;- break;- case 29:- if (curChar == 92)- { jjCheckNAddStates(12, 14); }- break;- case 31:- if ((0xffffffffbfffffffL & l) == 0L)- break;- if (kind > 22)- kind = 22;- { jjCheckNAddStates(0, 4); }- break;- case 32:- if ((0xffffffffbfffffffL & l) != 0L)- { jjCheckNAddTwoStates(32, 33); }- break;- case 34:- if ((0xffffffffbfffffffL & l) != 0L)- { jjCheckNAddTwoStates(34, 35); }- break;- case 36:- if ((0xffffffffbfffffffL & l) == 0L)- break;- if (kind > 21)- kind = 21;- jjstateSet[jjnewStateCnt++] = 36;- break;- case 37:- if ((0xffffffffbfffffffL & l) == 0L)- break;- if (kind > 22)- kind = 22;- { jjCheckNAdd(37); }- break;- default : break;- }- } while(i != startsAt);- }- else- {- int hiByte = (curChar >> 8);- int i1 = hiByte >> 6;- long l1 = 1L << (hiByte & 077);- int i2 = (curChar & 0xff) >> 6;- long l2 = 1L << (curChar & 077);- do- {- switch(jjstateSet[--i])- {- case 0:- if (!jjCanMove_0(hiByte, i1, i2, l1, l2))- break;- if (kind > 22)- kind = 22;- { jjCheckNAddStates(0, 4); }- break;- case 24:- if (jjCanMove_0(hiByte, i1, i2, l1, l2))- { jjAddStates(15, 16); }- break;- case 27:- if (jjCanMove_0(hiByte, i1, i2, l1, l2))- { jjAddStates(12, 14); }- break;- case 32:- if (jjCanMove_0(hiByte, i1, i2, l1, l2))- { jjCheckNAddTwoStates(32, 33); }- break;- case 34:- if (jjCanMove_0(hiByte, i1, i2, l1, l2))- { jjCheckNAddTwoStates(34, 35); }- break;- case 36:- if (!jjCanMove_0(hiByte, i1, i2, l1, l2))- break;- if (kind > 21)- kind = 21;- jjstateSet[jjnewStateCnt++] = 36;- break;- case 37:- if (!jjCanMove_0(hiByte, i1, i2, l1, l2))- break;- if (kind > 22)- kind = 22;- { jjCheckNAdd(37); }- break;- default : if (i1 == 0 || l1 == 0 || i2 == 0 || l2 == 0) break; else break;- }- } while(i != startsAt);+ return jjStopAtPos(0, 17);+ default:+ return jjMoveNfa_1(0, 0);+ }+ }++ static final long[] jjbitVec0 = {+ 0xfffffffffffffffeL, 0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffffffffffffL+ };+ static final long[] jjbitVec2 = {0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL};++ private int jjMoveNfa_1(int startState, int curPos) {+ int startsAt = 0;+ jjnewStateCnt = 38;+ int i = 1;+ jjstateSet[0] = startState;+ int kind = 0x7fffffff;+ for (; ; ) {+ if (++jjround == 0x7fffffff) ReInitRounds();+ if (curChar < 64) {+ long l = 1L << curChar;+ do {+ switch (jjstateSet[--i]) {+ case 0:+ if ((0x7bffe8faffffd9ffL & l) != 0L) {+ if (kind > 22) kind = 22;+ {+ jjCheckNAddStates(0, 4);+ }+ } else if ((0x100002600L & l) != 0L) {+ if (kind > 7) kind = 7;+ } else if (curChar == 34) {+ jjCheckNAddStates(5, 7);+ }+ if ((0x3fc000000000000L & l) != 0L) {+ jjCheckNAddStates(8, 11);+ } else if (curChar == 49) {+ jjCheckNAddTwoStates(20, 21);+ }+ break;+ case 19:+ if ((0x3fc000000000000L & l) != 0L) {+ jjCheckNAddStates(8, 11);+ }+ break;+ case 20:+ if ((0x3ff000000000000L & l) != 0L) {+ jjCheckNAdd(17);+ }+ break;+ case 21:+ if ((0x3ff000000000000L & l) != 0L) {+ jjCheckNAdd(18);+ }+ break;+ case 22:+ if (curChar == 49) {+ jjCheckNAddTwoStates(20, 21);+ }+ break;+ case 23:+ if (curChar == 34) {+ jjCheckNAddStates(5, 7);+ }+ break;+ case 24:+ if ((0xfffffffbffffffffL & l) != 0L) {+ jjCheckNAddTwoStates(24, 25);+ }+ break;+ case 25:+ if (curChar == 34) jjstateSet[jjnewStateCnt++] = 26;+ break;+ case 26:+ if (curChar == 42 && kind > 18) kind = 18;+ break;+ case 27:+ if ((0xfffffffbffffffffL & l) != 0L) {+ jjCheckNAddStates(12, 14);+ }+ break;+ case 29:+ if (curChar == 34) {+ jjCheckNAddStates(12, 14);+ }+ break;+ case 30:+ if (curChar == 34 && kind > 19) kind = 19;+ break;+ case 31:+ if ((0x7bffe8faffffd9ffL & l) == 0L) break;+ if (kind > 22) kind = 22;+ {+ jjCheckNAddStates(0, 4);+ }+ break;+ case 32:+ if ((0x7bffe8faffffd9ffL & l) != 0L) {+ jjCheckNAddTwoStates(32, 33);+ }+ break;+ case 33:+ if (curChar == 42 && kind > 20) kind = 20;+ break;+ case 34:+ if ((0x7bffe8faffffd9ffL & l) != 0L) {+ jjCheckNAddTwoStates(34, 35);+ }+ break;+ case 35:+ if ((0x8000040000000000L & l) == 0L) break;+ if (kind > 21) kind = 21;+ {+ jjCheckNAddTwoStates(35, 36);+ }+ break;+ case 36:+ if ((0xfbffecfaffffd9ffL & l) == 0L) break;+ if (kind > 21) kind = 21;+ {+ jjCheckNAdd(36);+ }+ break;+ case 37:+ if ((0x7bffe8faffffd9ffL & l) == 0L) break;+ if (kind > 22) kind = 22;+ {+ jjCheckNAdd(37);+ }+ break;+ default:+ break;+ }+ } while (i != startsAt);+ } else if (curChar < 128) {+ long l = 1L << (curChar & 077);+ do {+ switch (jjstateSet[--i]) {+ case 0:+ if ((0xffffffffbfffffffL & l) != 0L) {+ if (kind > 22) kind = 22;+ {+ jjCheckNAddStates(0, 4);+ }+ }+ if ((0x400000004000L & l) != 0L) {+ if (kind > 12) kind = 12;+ } else if ((0x80000000800000L & l) != 0L) {+ if (kind > 11) kind = 11;+ } else if (curChar == 97) jjstateSet[jjnewStateCnt++] = 9;+ else if (curChar == 65) jjstateSet[jjnewStateCnt++] = 6;+ else if (curChar == 111) jjstateSet[jjnewStateCnt++] = 3;+ else if (curChar == 79) jjstateSet[jjnewStateCnt++] = 1;+ if (curChar == 110) jjstateSet[jjnewStateCnt++] = 15;+ else if (curChar == 78) jjstateSet[jjnewStateCnt++] = 12;+ break;+ case 1:+ if (curChar == 82 && kind > 8) kind = 8;+ break;+ case 2:+ if (curChar == 79) jjstateSet[jjnewStateCnt++] = 1;+ break;+ case 3:+ if (curChar == 114 && kind > 8) kind = 8;+ break;+ case 4:+ if (curChar == 111) jjstateSet[jjnewStateCnt++] = 3;+ break;+ case 5:+ if (curChar == 68 && kind > 9) kind = 9;+ break;+ case 6:+ if (curChar == 78) jjstateSet[jjnewStateCnt++] = 5;+ break;+ case 7:+ if (curChar == 65) jjstateSet[jjnewStateCnt++] = 6;+ break;+ case 8:+ if (curChar == 100 && kind > 9) kind = 9;+ break;+ case 9:+ if (curChar == 110) jjstateSet[jjnewStateCnt++] = 8;+ break;+ case 10:+ if (curChar == 97) jjstateSet[jjnewStateCnt++] = 9;+ break;+ case 11:+ if (curChar == 84 && kind > 10) kind = 10;+ break;+ case 12:+ if (curChar == 79) jjstateSet[jjnewStateCnt++] = 11;+ break;+ case 13:+ if (curChar == 78) jjstateSet[jjnewStateCnt++] = 12;+ break;+ case 14:+ if (curChar == 116 && kind > 10) kind = 10;+ break;+ case 15:+ if (curChar == 111) jjstateSet[jjnewStateCnt++] = 14;+ break;+ case 16:+ if (curChar == 110) jjstateSet[jjnewStateCnt++] = 15;+ break;+ case 17:+ if ((0x80000000800000L & l) != 0L && kind > 11) kind = 11;+ break;+ case 18:+ if ((0x400000004000L & l) != 0L && kind > 12) kind = 12;+ break;+ case 24:+ {+ jjAddStates(15, 16);+ }+ break;+ case 27:+ if ((0xffffffffefffffffL & l) != 0L) {+ jjCheckNAddStates(12, 14);+ }+ break;+ case 28:+ if (curChar == 92) jjstateSet[jjnewStateCnt++] = 29;+ break;+ case 29:+ if (curChar == 92) {+ jjCheckNAddStates(12, 14);+ }+ break;+ case 31:+ if ((0xffffffffbfffffffL & l) == 0L) break;+ if (kind > 22) kind = 22;+ {+ jjCheckNAddStates(0, 4);+ }+ break;+ case 32:+ if ((0xffffffffbfffffffL & l) != 0L) {+ jjCheckNAddTwoStates(32, 33);+ }+ break;+ case 34:+ if ((0xffffffffbfffffffL & l) != 0L) {+ jjCheckNAddTwoStates(34, 35);+ }+ break;+ case 36:+ if ((0xffffffffbfffffffL & l) == 0L) break;+ if (kind > 21) kind = 21;+ jjstateSet[jjnewStateCnt++] = 36;+ break;+ case 37:+ if ((0xffffffffbfffffffL & l) == 0L) break;+ if (kind > 22) kind = 22;+ {+ jjCheckNAdd(37);+ }+ break;+ default:+ break;+ }+ } while (i != startsAt);+ } else {+ int hiByte = (curChar >> 8);+ int i1 = hiByte >> 6;+ long l1 = 1L << (hiByte & 077);+ int i2 = (curChar & 0xff) >> 6;+ long l2 = 1L << (curChar & 077);+ do {+ switch (jjstateSet[--i]) {+ case 0:+ if (!jjCanMove_0(hiByte, i1, i2, l1, l2)) break;+ if (kind > 22) kind = 22;+ {+ jjCheckNAddStates(0, 4);+ }+ break;+ case 24:+ if (jjCanMove_0(hiByte, i1, i2, l1, l2)) {+ jjAddStates(15, 16);+ }+ break;+ case 27:+ if (jjCanMove_0(hiByte, i1, i2, l1, l2)) {+ jjAddStates(12, 14);+ }+ break;+ case 32:+ if (jjCanMove_0(hiByte, i1, i2, l1, l2)) {+ jjCheckNAddTwoStates(32, 33);+ }+ break;+ case 34:+ if (jjCanMove_0(hiByte, i1, i2, l1, l2)) {+ jjCheckNAddTwoStates(34, 35);+ }+ break;+ case 36:+ if (!jjCanMove_0(hiByte, i1, i2, l1, l2)) break;+ if (kind > 21) kind = 21;+ jjstateSet[jjnewStateCnt++] = 36;+ break;+ case 37:+ if (!jjCanMove_0(hiByte, i1, i2, l1, l2)) break;+ if (kind > 22) kind = 22;+ {+ jjCheckNAdd(37);+ }+ break;+ default:+ if (i1 == 0 || l1 == 0 || i2 == 0 || l2 == 0) break;+ else break;+ }+ } while (i != startsAt);}- if (kind != 0x7fffffff)- {- jjmatchedKind = kind;- jjmatchedPos = curPos;- kind = 0x7fffffff;+ if (kind != 0x7fffffff) {+ jjmatchedKind = kind;+ jjmatchedPos = curPos;+ kind = 0x7fffffff;}++curPos;- if ((i = jjnewStateCnt) == (startsAt = 38 - (jjnewStateCnt = startsAt)))- return curPos;- try { curChar = input_stream.readChar(); }- catch(java.io.IOException e) { return curPos; }- }-}-private int jjMoveStringLiteralDfa0_0()-{- return jjMoveNfa_0(0, 0);-}-private int jjMoveNfa_0(int startState, int curPos)-{- int startsAt = 0;- jjnewStateCnt = 3;- int i = 1;- jjstateSet[0] = startState;- int kind = 0x7fffffff;- for (;;)- {- if (++jjround == 0x7fffffff)- ReInitRounds();- if (curChar < 64)- {- long l = 1L << curChar;- do- {- switch(jjstateSet[--i])- {- case 0:- if ((0x3ff000000000000L & l) == 0L)- break;- if (kind > 23)- kind = 23;- { jjAddStates(17, 18); }- break;- case 1:- if (curChar == 46)- { jjCheckNAdd(2); }- break;- case 2:- if ((0x3ff000000000000L & l) == 0L)- break;- if (kind > 23)- kind = 23;- { jjCheckNAdd(2); }- break;- default : break;- }- } while(i != startsAt);+ if ((i = jjnewStateCnt) == (startsAt = 38 - (jjnewStateCnt = startsAt))) return curPos;+ try {+ curChar = input_stream.readChar();+ } catch (java.io.IOException e) {+ return curPos;}- else if (curChar < 128)- {- long l = 1L << (curChar & 077);- do- {- switch(jjstateSet[--i])- {- default : break;- }- } while(i != startsAt);- }- else- {- int hiByte = (curChar >> 8);- int i1 = hiByte >> 6;- long l1 = 1L << (hiByte & 077);- int i2 = (curChar & 0xff) >> 6;- long l2 = 1L << (curChar & 077);- do- {- switch(jjstateSet[--i])- {- default : if (i1 == 0 || l1 == 0 || i2 == 0 || l2 == 0) break; else break;- }- } while(i != startsAt);+ }+ }++ private int jjMoveStringLiteralDfa0_0() {+ return jjMoveNfa_0(0, 0);+ }++ private int jjMoveNfa_0(int startState, int curPos) {+ int startsAt = 0;+ jjnewStateCnt = 3;+ int i = 1;+ jjstateSet[0] = startState;+ int kind = 0x7fffffff;+ for (; ; ) {+ if (++jjround == 0x7fffffff) ReInitRounds();+ if (curChar < 64) {+ long l = 1L << curChar;+ do {+ switch (jjstateSet[--i]) {+ case 0:+ if ((0x3ff000000000000L & l) == 0L) break;+ if (kind > 23) kind = 23;+ {+ jjAddStates(17, 18);+ }+ break;+ case 1:+ if (curChar == 46) {+ jjCheckNAdd(2);+ }+ break;+ case 2:+ if ((0x3ff000000000000L & l) == 0L) break;+ if (kind > 23) kind = 23;+ {+ jjCheckNAdd(2);+ }+ break;+ default:+ break;+ }+ } while (i != startsAt);+ } else if (curChar < 128) {+ long l = 1L << (curChar & 077);+ do {+ switch (jjstateSet[--i]) {+ default:+ break;+ }+ } while (i != startsAt);+ } else {+ int hiByte = (curChar >> 8);+ int i1 = hiByte >> 6;+ long l1 = 1L << (hiByte & 077);+ int i2 = (curChar & 0xff) >> 6;+ long l2 = 1L << (curChar & 077);+ do {+ switch (jjstateSet[--i]) {+ default:+ if (i1 == 0 || l1 == 0 || i2 == 0 || l2 == 0) break;+ else break;+ }+ } while (i != startsAt);}- if (kind != 0x7fffffff)- {- jjmatchedKind = kind;- jjmatchedPos = curPos;- kind = 0x7fffffff;+ if (kind != 0x7fffffff) {+ jjmatchedKind = kind;+ jjmatchedPos = curPos;+ kind = 0x7fffffff;}++curPos;- if ((i = jjnewStateCnt) == (startsAt = 3 - (jjnewStateCnt = startsAt)))- return curPos;- try { curChar = input_stream.readChar(); }- catch(java.io.IOException e) { return curPos; }- }-}+ if ((i = jjnewStateCnt) == (startsAt = 3 - (jjnewStateCnt = startsAt))) return curPos;+ try {+ curChar = input_stream.readChar();+ } catch (java.io.IOException e) {+ return curPos;+ }+ }+ }-/** Token literal values. */-public static final String[] jjstrLiteralImages = {-"", null, null, null, null, null, null, null, null, null, null, null, null,-"\50", "\51", "\54", "\72", "\136", null, null, null, null, null, null, };-protected Token jjFillToken()-{- final Token t;- final String curTokenImage;- final int beginLine;- final int endLine;- final int beginColumn;- final int endColumn;- String im = jjstrLiteralImages[jjmatchedKind];- curTokenImage = (im == null) ? input_stream.GetImage() : im;- beginLine = input_stream.getBeginLine();- beginColumn = input_stream.getBeginColumn();- endLine = input_stream.getEndLine();- endColumn = input_stream.getEndColumn();- t = Token.newToken(jjmatchedKind, curTokenImage);-- t.beginLine = beginLine;- t.endLine = endLine;- t.beginColumn = beginColumn;- t.endColumn = endColumn;-- return t;-}-static final int[] jjnextStates = {- 32, 33, 34, 35, 37, 24, 27, 28, 20, 17, 21, 18, 27, 28, 30, 24,- 25, 0, 1,-};-private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2)-{- switch(hiByte)- {+ /** Token literal values. */+ public static final String[] jjstrLiteralImages = {+ "", null, null, null, null, null, null, null, null, null, null, null, null, "\50", "\51", "\54",+ "\72", "\136", null, null, null, null, null, null,+ };++ protected Token jjFillToken() {+ final Token t;+ final String curTokenImage;+ final int beginLine;+ final int endLine;+ final int beginColumn;+ final int endColumn;+ String im = jjstrLiteralImages[jjmatchedKind];+ curTokenImage = (im == null) ? input_stream.GetImage() : im;+ beginLine = input_stream.getBeginLine();+ beginColumn = input_stream.getBeginColumn();+ endLine = input_stream.getEndLine();+ endColumn = input_stream.getEndColumn();+ t = Token.newToken(jjmatchedKind, curTokenImage);++ t.beginLine = beginLine;+ t.endLine = endLine;+ t.beginColumn = beginColumn;+ t.endColumn = endColumn;++ return t;+ }++ static final int[] jjnextStates = {+ 32, 33, 34, 35, 37, 24, 27, 28, 20, 17, 21, 18, 27, 28, 30, 24, 25, 0, 1,+ };++ private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2) {+ switch (hiByte) {case 0:- return ((jjbitVec2[i2] & l2) != 0L);- default :- if ((jjbitVec0[i1] & l1) != 0L)- return true;- return false;- }-}+ return ((jjbitVec2[i2] & l2) != 0L);+ default:+ if ((jjbitVec0[i1] & l1) != 0L) return true;+ return false;+ }+ }-int curLexState = 1;-int defaultLexState = 1;-int jjnewStateCnt;-int jjround;-int jjmatchedPos;-int jjmatchedKind;--/** Get the next Token. */-public Token getNextToken()-{- Token matchedToken;- int curPos = 0;-- EOFLoop :- for (;;)- {- try- {- curChar = input_stream.BeginToken();- }- catch(Exception e)- {- jjmatchedKind = 0;- jjmatchedPos = -1;- matchedToken = jjFillToken();- return matchedToken;- }-- switch(curLexState)- {- case 0:- jjmatchedKind = 0x7fffffff;- jjmatchedPos = 0;- curPos = jjMoveStringLiteralDfa0_0();- break;- case 1:- jjmatchedKind = 0x7fffffff;- jjmatchedPos = 0;- curPos = jjMoveStringLiteralDfa0_1();- break;- }- if (jjmatchedKind != 0x7fffffff)- {- if (jjmatchedPos + 1 < curPos)- input_stream.backup(curPos - jjmatchedPos - 1);- if ((jjtoToken[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L)- {- matchedToken = jjFillToken();- if (jjnewLexState[jjmatchedKind] != -1)- curLexState = jjnewLexState[jjmatchedKind];- return matchedToken;- }- else- {- if (jjnewLexState[jjmatchedKind] != -1)- curLexState = jjnewLexState[jjmatchedKind];- continue EOFLoop;+ int curLexState = 1;+ int defaultLexState = 1;+ int jjnewStateCnt;+ int jjround;+ int jjmatchedPos;+ int jjmatchedKind;++ /** Get the next Token. */+ public Token getNextToken() {+ Token matchedToken;+ int curPos = 0;++ EOFLoop:+ for (; ; ) {+ try {+ curChar = input_stream.BeginToken();+ } catch (Exception e) {+ jjmatchedKind = 0;+ jjmatchedPos = -1;+ matchedToken = jjFillToken();+ return matchedToken;+ }++ switch (curLexState) {+ case 0:+ jjmatchedKind = 0x7fffffff;+ jjmatchedPos = 0;+ curPos = jjMoveStringLiteralDfa0_0();+ break;+ case 1:+ jjmatchedKind = 0x7fffffff;+ jjmatchedPos = 0;+ curPos = jjMoveStringLiteralDfa0_1();+ break;+ }+ if (jjmatchedKind != 0x7fffffff) {+ if (jjmatchedPos + 1 < curPos) input_stream.backup(curPos - jjmatchedPos - 1);+ if ((jjtoToken[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L) {+ matchedToken = jjFillToken();+ if (jjnewLexState[jjmatchedKind] != -1) curLexState = jjnewLexState[jjmatchedKind];+ return matchedToken;+ } else {+ if (jjnewLexState[jjmatchedKind] != -1) curLexState = jjnewLexState[jjmatchedKind];+ continue EOFLoop;}- }- int error_line = input_stream.getEndLine();- int error_column = input_stream.getEndColumn();- String error_after = null;- boolean EOFSeen = false;- try { input_stream.readChar(); input_stream.backup(1); }- catch (java.io.IOException e1) {+ }+ int error_line = input_stream.getEndLine();+ int error_column = input_stream.getEndColumn();+ String error_after = null;+ boolean EOFSeen = false;+ try {+ input_stream.readChar();+ input_stream.backup(1);+ } catch (java.io.IOException e1) {EOFSeen = true;error_after = curPos <= 1 ? "" : input_stream.GetImage();if (curChar == '\n' || curChar == '\r') {- error_line++;- error_column = 0;- }- else- error_column++;- }- if (!EOFSeen) {+ error_line++;+ error_column = 0;+ } else error_column++;+ }+ if (!EOFSeen) {input_stream.backup(1);error_after = curPos <= 1 ? "" : input_stream.GetImage();- }- throw new TokenMgrError(EOFSeen, curLexState, error_line, error_column, error_after, curChar, TokenMgrError.LEXICAL_ERROR);+ }+ throw new TokenMgrError(+ EOFSeen,+ curLexState,+ error_line,+ error_column,+ error_after,+ curChar,+ TokenMgrError.LEXICAL_ERROR);+ }}-}-void SkipLexicalActions(Token matchedToken)-{- switch(jjmatchedKind)- {- default :- break;- }-}-void MoreLexicalActions()-{- jjimageLen += (lengthOfMatch = jjmatchedPos + 1);- switch(jjmatchedKind)- {- default :- break;- }-}-void TokenLexicalActions(Token matchedToken)-{- switch(jjmatchedKind)- {- default :- break;- }-}-private void jjCheckNAdd(int state)-{- if (jjrounds[state] != jjround)- {+ void SkipLexicalActions(Token matchedToken) {+ switch (jjmatchedKind) {+ default:+ break;+ }+ }++ void MoreLexicalActions() {+ jjimageLen += (lengthOfMatch = jjmatchedPos + 1);+ switch (jjmatchedKind) {+ default:+ break;+ }+ }++ void TokenLexicalActions(Token matchedToken) {+ switch (jjmatchedKind) {+ default:+ break;+ }+ }++ private void jjCheckNAdd(int state) {+ if (jjrounds[state] != jjround) {jjstateSet[jjnewStateCnt++] = state;jjrounds[state] = jjround;- }-}-private void jjAddStates(int start, int end)-{- do {+ }+ }++ private void jjAddStates(int start, int end) {+ do {jjstateSet[jjnewStateCnt++] = jjnextStates[start];- } while (start++ != end);-}-private void jjCheckNAddTwoStates(int state1, int state2)-{- jjCheckNAdd(state1);- jjCheckNAdd(state2);-}+ } while (start++ != end);+ }-private void jjCheckNAddStates(int start, int end)-{- do {- jjCheckNAdd(jjnextStates[start]);- } while (start++ != end);-}+ private void jjCheckNAddTwoStates(int state1, int state2) {+ jjCheckNAdd(state1);+ jjCheckNAdd(state2);+ }- /** Constructor. */- public QueryParserTokenManager(CharStream stream){+ private void jjCheckNAddStates(int start, int end) {+ do {+ jjCheckNAdd(jjnextStates[start]);+ } while (start++ != end);+ }+ /** Constructor. */+ public QueryParserTokenManager(CharStream stream) {input_stream = stream;}/** Constructor. */- public QueryParserTokenManager (CharStream stream, int lexState){+ public QueryParserTokenManager(CharStream stream, int lexState) {ReInit(stream);SwitchTo(lexState);}/** Reinitialise parser. */-- public void ReInit(CharStream stream)- {-+ public void ReInit(CharStream stream) {- jjmatchedPos =- jjnewStateCnt =- 0;+ jjmatchedPos = jjnewStateCnt = 0;curLexState = defaultLexState;input_stream = stream;ReInitRounds();}- private void ReInitRounds()- {+ private void ReInitRounds() {int i;jjround = 0x80000001;- for (i = 38; i-- > 0;)- jjrounds[i] = 0x80000000;+ for (i = 38; i-- > 0; ) jjrounds[i] = 0x80000000;}/** Reinitialise parser. */- public void ReInit(CharStream stream, int lexState)-- {+ public void ReInit(CharStream stream, int lexState) {+ReInit(stream);SwitchTo(lexState);}/** Switch to specified lex state. */- public void SwitchTo(int lexState)- {+ public void SwitchTo(int lexState) {if (lexState >= 2 || lexState < 0)- throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE);- else- curLexState = lexState;+ throw new TokenMgrError(+ "Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.",+ TokenMgrError.INVALID_LEXICAL_STATE);+ else curLexState = lexState;}--/** Lexer state names. */-public static final String[] lexStateNames = {- "Boost",- "DEFAULT",-};--/** Lex State array. */-public static final int[] jjnewLexState = {- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, -1, -1, -1, -1, 1,-};-static final long[] jjtoToken = {- 0xffff01L,-};-static final long[] jjtoSkip = {- 0x80L,-};-static final long[] jjtoSpecial = {- 0x0L,-};-static final long[] jjtoMore = {- 0x0L,-};- protected CharStream input_stream;-- private final int[] jjrounds = new int[38];- private final int[] jjstateSet = new int[2 * 38];- private final StringBuilder jjimage = new StringBuilder();- private StringBuilder image = jjimage;- private int jjimageLen;- private int lengthOfMatch;- protected int curChar;+ /** Lexer state names. */+ public static final String[] lexStateNames = {+ "Boost", "DEFAULT",+ };++ /** Lex State array. */+ public static final int[] jjnewLexState = {+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, -1, -1, -1, -1, 1,+ };++ static final long[] jjtoToken = {+ 0xffff01L,+ };+ static final long[] jjtoSkip = {+ 0x80L,+ };+ static final long[] jjtoSpecial = {+ 0x0L,+ };+ static final long[] jjtoMore = {+ 0x0L,+ };+ protected CharStream input_stream;++ private final int[] jjrounds = new int[38];+ private final int[] jjstateSet = new int[2 * 38];+ private final StringBuilder jjimage = new StringBuilder();+ private StringBuilder image = jjimage;+ private int jjimageLen;+ private int lengthOfMatch;+ protected int curChar;}diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/Token.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/Token.javaindex f92493822a5..916a417605d 100644--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/Token.java+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/Token.java@@ -2,131 +2,105 @@/* JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COLUMN=true,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */package org.apache.lucene.queryparser.surround.parser;-/**- * Describes the input token stream.- */-+/** Describes the input token stream. */public class Token implements java.io.Serializable {/**- * The version identifier for this Serializable class.- * Increment only if the <i>serialized</i> form of the- * class changes.+ * The version identifier for this Serializable class. Increment only if the <i>serialized</i>+ * form of the class changes.*/private static final long serialVersionUID = 1L;/**- * An integer that describes the kind of this token. This numbering- * system is determined by JavaCCParser, and a table of these numbers is- * stored in the file ...Constants.java.+ * An integer that describes the kind of this token. This numbering system is determined by+ * JavaCCParser, and a table of these numbers is stored in the file ...Constants.java.*/public int kind;/** The line number of the first character of this Token. */public int beginLine;+/** The column number of the first character of this Token. */public int beginColumn;+/** The line number of the last character of this Token. */public int endLine;+/** The column number of the last character of this Token. */public int endColumn;- /**- * The string image of the token.- */+ /** The string image of the token. */public String image;/**- * A reference to the next regular (non-special) token from the input- * stream. If this is the last token from the input stream, or if the- * token manager has not read tokens beyond this one, this field is- * set to null. This is true only if this token is also a regular- * token. Otherwise, see below for a description of the contents of- * this field.+ * A reference to the next regular (non-special) token from the input stream. If this is the last+ * token from the input stream, or if the token manager has not read tokens beyond this one, this+ * field is set to null. This is true only if this token is also a regular token. Otherwise, see+ * below for a description of the contents of this field.*/public Token next;/**- * This field is used to access special tokens that occur prior to this- * token, but after the immediately preceding regular (non-special) token.- * If there are no such special tokens, this field is set to null.- * When there are more than one such special token, this field refers- * to the last of these special tokens, which in turn refers to the next- * previous special token through its specialToken field, and so on- * until the first special token (whose specialToken field is null).- * The next fields of special tokens refer to other special tokens that- * immediately follow it (without an intervening regular token). If there- * is no such token, this field is null.+ * This field is used to access special tokens that occur prior to this token, but after the+ * immediately preceding regular (non-special) token. If there are no such special tokens, this+ * field is set to null. When there are more than one such special token, this field refers to the+ * last of these special tokens, which in turn refers to the next previous special token through+ * its specialToken field, and so on until the first special token (whose specialToken field is+ * null). The next fields of special tokens refer to other special tokens that immediately follow+ * it (without an intervening regular token). If there is no such token, this field is null.*/public Token specialToken;/**- * An optional attribute value of the Token.- * Tokens which are not used as syntactic sugar will often contain- * meaningful values that will be used later on by the compiler or- * interpreter. This attribute value is often different from the image.- * Any subclass of Token that actually wants to return a non-null value can- * override this method as appropriate.+ * An optional attribute value of the Token. Tokens which are not used as syntactic sugar will+ * often contain meaningful values that will be used later on by the compiler or interpreter. This+ * attribute value is often different from the image. Any subclass of Token that actually wants to+ * return a non-null value can override this method as appropriate.*/public Object getValue() {return null;}- /**- * No-argument constructor- */+ /** No-argument constructor */public Token() {}- /**- * Constructs a new token for the specified Image.- */- public Token(int kind)- {+ /** Constructs a new token for the specified Image. */+ public Token(int kind) {this(kind, null);}- /**- * Constructs a new token for the specified Image and Kind.- */- public Token(int kind, String image)- {+ /** Constructs a new token for the specified Image and Kind. */+ public Token(int kind, String image) {this.kind = kind;this.image = image;}- /**- * Returns the image.- */+ /** Returns the image. */@Override- public String toString()- {+ public String toString() {return image;}/**- * Returns a new Token object, by default. However, if you want, you- * can create and return subclass objects based on the value of ofKind.- * Simply add the cases to the switch for all those special cases.- * For example, if you have a subclass of Token called IDToken that- * you want to create if ofKind is ID, simply add something like :+ * Returns a new Token object, by default. However, if you want, you can create and return+ * subclass objects based on the value of ofKind. Simply add the cases to the switch for all those+ * special cases. For example, if you have a subclass of Token called IDToken that you want to+ * create if ofKind is ID, simply add something like :*- * case MyParserConstants.ID : return new IDToken(ofKind, image);+ * <p>case MyParserConstants.ID : return new IDToken(ofKind, image);*- * to the following switch statement. Then you can cast matchedToken- * variable to the appropriate type and use sit in your lexical actions.+ * <p>to the following switch statement. Then you can cast matchedToken variable to the+ * appropriate type and use sit in your lexical actions.*/- public static Token newToken(int ofKind, String image)- {- switch(ofKind)- {- default : return new Token(ofKind, image);+ public static Token newToken(int ofKind, String image) {+ switch (ofKind) {+ default:+ return new Token(ofKind, image);}}- public static Token newToken(int ofKind)- {+ public static Token newToken(int ofKind) {return newToken(ofKind, null);}-}/* (filtered)*/diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/TokenMgrError.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/TokenMgrError.javaindex 6fe8363fab0..ac68828f987 100644--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/TokenMgrError.java+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/TokenMgrError.java@@ -3,14 +3,12 @@package org.apache.lucene.queryparser.surround.parser;/** Token Manager Error. */-@SuppressWarnings("all")-public class TokenMgrError extends Error-{+@SuppressWarnings("all")+public class TokenMgrError extends Error {/**- * The version identifier for this Serializable class.- * Increment only if the <i>serialized</i> form of the- * class changes.+ * The version identifier for this Serializable class. Increment only if the <i>serialized</i>+ * form of the class changes.*/private static final long serialVersionUID = 1L;@@ -18,42 +16,30 @@ public class TokenMgrError extends Error* Ordinals for various reasons why an Error of this type can be thrown.*/- /**- * Lexical error occurred.- */+ /** Lexical error occurred. */public static final int LEXICAL_ERROR = 0;- /**- * An attempt was made to create a second instance of a static token manager.- */+ /** An attempt was made to create a second instance of a static token manager. */public static final int STATIC_LEXER_ERROR = 1;- /**- * Tried to change to an invalid lexical state.- */+ /** Tried to change to an invalid lexical state. */public static final int INVALID_LEXICAL_STATE = 2;- /**- * Detected (and bailed out of) an infinite loop in the token manager.- */+ /** Detected (and bailed out of) an infinite loop in the token manager. */public static final int LOOP_DETECTED = 3;- /**- * Indicates the reason why the exception is thrown. It will have- * one of the above 4 values.- */+ /** Indicates the reason why the exception is thrown. It will have one of the above 4 values. */int errorCode;/**- * Replaces unprintable characters by their escaped (or unicode escaped)- * equivalents in the given string+ * Replaces unprintable characters by their escaped (or unicode escaped) equivalents in the given+ * string*/protected static final String addEscapes(String str) {StringBuilder retval = new StringBuilder();char ch;for (int i = 0; i < str.length(); i++) {- switch (str.charAt(i))- {+ switch (str.charAt(i)) {case '\b':retval.append("\\b");continue;@@ -92,34 +78,47 @@ public class TokenMgrError extends Error}/**- * Returns a detailed message for the Error when it is thrown by the- * token manager to indicate a lexical error.- * Parameters :- * EOFSeen : indicates if EOF caused the lexical error- * lexState : lexical state in which this error occurred- * errorLine : line number when the error occurred- * errorColumn : column number when the error occurred- * errorAfter : prefix that was seen before this error occurred- * curchar : the offending character- * Note: You can customize the lexical error message by modifying this method.+ * Returns a detailed message for the Error when it is thrown by the token manager to indicate a+ * lexical error. Parameters : EOFSeen : indicates if EOF caused the lexical error lexState :+ * lexical state in which this error occurred errorLine : line number when the error occurred+ * errorColumn : column number when the error occurred errorAfter : prefix that was seen before+ * this error occurred curchar : the offending character Note: You can customize the lexical error+ * message by modifying this method.*/- protected static String LexicalErr(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, int curChar) {- return("Lexical error at line " + //- errorLine + ", column " + //- errorColumn + ". Encountered: " + //- (EOFSeen ? "<EOF>" : ("'" + addEscapes(String.valueOf((char) curChar)) + "' (" + curChar + "),")) + //- (errorAfter == null || errorAfter.length() == 0 ? "" : " after prefix \"" + addEscapes(errorAfter) + "\"")) + //- (lexState == 0 ? "" : " (in lexical state " + lexState + ")");+ protected static String LexicalErr(+ boolean EOFSeen,+ int lexState,+ int errorLine,+ int errorColumn,+ String errorAfter,+ int curChar) {+ return ("Lexical error at line "+ + //+ errorLine+ + ", column "+ + //+ errorColumn+ + ". Encountered: "+ + //+ (EOFSeen+ ? "<EOF>"+ : ("'" + addEscapes(String.valueOf((char) curChar)) + "' (" + curChar + "),"))+ + //+ (errorAfter == null || errorAfter.length() == 0+ ? ""+ : " after prefix \"" + addEscapes(errorAfter) + "\""))+ + //+ (lexState == 0 ? "" : " (in lexical state " + lexState + ")");}/**- * You can also modify the body of this method to customize your error messages.- * For example, cases like LOOP_DETECTED and INVALID_LEXICAL_STATE are not- * of end-users concern, so you can return something like :+ * You can also modify the body of this method to customize your error messages. For example,+ * cases like LOOP_DETECTED and INVALID_LEXICAL_STATE are not of end-users concern, so you can+ * return something like :*- * "Internal Error : Please file a bug report .... "+ * <p>"Internal Error : Please file a bug report .... "*- * from this method for such cases in the release version of your parser.+ * <p>from this method for such cases in the release version of your parser.*/@Overridepublic String getMessage() {@@ -131,8 +130,7 @@ public class TokenMgrError extends Error*//** No arg constructor. */- public TokenMgrError() {- }+ public TokenMgrError() {}/** Constructor with message and reason. */public TokenMgrError(String message, int reason) {@@ -141,7 +139,14 @@ public class TokenMgrError extends Error}/** Full Constructor. */- public TokenMgrError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, int curChar, int reason) {+ public TokenMgrError(+ boolean EOFSeen,+ int lexState,+ int errorLine,+ int errorColumn,+ String errorAfter,+ int curChar,+ int reason) {this(LexicalErr(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);}}