You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2025/05/29 11:55:40 UTC
(jena) 02/08: Don't put tokens for extension aggregates in SPARQL 1.2
This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
commit f5cb01b0c269728b865dedb879c2a71af67df6d4
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Sun May 18 18:13:29 2025 +0100
Don't put tokens for extension aggregates in SPARQL 1.2
---
jena-arq/Grammar/arq.jj | 2 -
jena-arq/Grammar/main.jj | 5 +-
jena-arq/Grammar/sparql_12.jj | 8 -
.../jena/sparql/lang/arq/javacc/ARQParser.java | 6 +-
.../sparql/lang/arq/javacc/ARQParserConstants.java | 32 +-
.../lang/arq/javacc/ARQParserTokenManager.java | 26 +-
.../lang/sparql_12/javacc/SPARQLParser12.java | 24 +-
.../sparql_12/javacc/SPARQLParser12Constants.java | 332 ++---
.../javacc/SPARQLParser12TokenManager.java | 1481 +++++++++-----------
9 files changed, 880 insertions(+), 1036 deletions(-)
diff --git a/jena-arq/Grammar/arq.jj b/jena-arq/Grammar/arq.jj
index 3448829d37..93f6897e4f 100644
--- a/jena-arq/Grammar/arq.jj
+++ b/jena-arq/Grammar/arq.jj
@@ -2221,8 +2221,6 @@ TOKEN :
| < ASSIGN: ":=">
| < VBAR: "|" >
| < CARAT: "^" >
-| < FPATH: "->" >
-| < RPATH: "<-" >
| < QMARK: "?" >
}
TOKEN:
diff --git a/jena-arq/Grammar/main.jj b/jena-arq/Grammar/main.jj
index b49208c25a..41618bd846 100644
--- a/jena-arq/Grammar/main.jj
+++ b/jena-arq/Grammar/main.jj
@@ -2807,6 +2807,7 @@ TOKEN [IGNORE_CASE] :
| < GROUP: "group" >
| < HAVING: "having" >
| < SEPARATOR: "separator" >
+
| < AGG: "agg" >
| < COUNT: "count" >
| < MIN: "min" >
@@ -2816,13 +2817,13 @@ TOKEN [IGNORE_CASE] :
#ifdef ARQ
| < MEDIAN: "median" >
| < MODE: "mode" >
-#endif
| < STDEV: "stdev" >
| < STDEV_SAMP: "stdev_samp" >
| < STDEV_POP: "stdev_pop" >
| < VARIANCE: "variance" >
| < VAR_SAMP: "var_samp" >
| < VAR_POP: "var_pop" >
+#endif
#ifdef ARQ
| < FOLD: "fold" >
#endif
@@ -3064,8 +3065,6 @@ TOKEN :
// Path related
| < VBAR: "|" >
| < CARAT: "^" >
-| < FPATH: "->" >
-| < RPATH: "<-" >
| < QMARK: "?" >
}
diff --git a/jena-arq/Grammar/sparql_12.jj b/jena-arq/Grammar/sparql_12.jj
index 0bfbba104c..48c41e861e 100644
--- a/jena-arq/Grammar/sparql_12.jj
+++ b/jena-arq/Grammar/sparql_12.jj
@@ -1744,12 +1744,6 @@ TOKEN [IGNORE_CASE] :
| < MAX: "max" >
| < SUM: "sum" >
| < AVG: "avg" >
-| < STDEV: "stdev" >
-| < STDEV_SAMP: "stdev_samp" >
-| < STDEV_POP: "stdev_pop" >
-| < VARIANCE: "variance" >
-| < VAR_SAMP: "var_samp" >
-| < VAR_POP: "var_pop" >
| < SAMPLE: "sample" >
| < GROUP_CONCAT: "group_concat" >
| < FILTER: "filter" >
@@ -1915,8 +1909,6 @@ TOKEN :
| < AT: "@">
| < VBAR: "|" >
| < CARAT: "^" >
-| < FPATH: "->" >
-| < RPATH: "<-" >
| < QMARK: "?" >
}
TOKEN:
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ARQParser.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ARQParser.java
index 8ccb3892f4..abf23da2d9 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ARQParser.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ARQParser.java
@@ -9225,7 +9225,7 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ;
jj_la1_6 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x40000001,0x0,0x0,0x8,0x0,0x40000000,0x0,0x8,0x0,0x0,0x200,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1,0x1,0x1,0x0,0x1,0x1,0x0,0x1,0x1,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa00a5,0x0,0x400,0xa00a5,0xa00a5,0xa00a5,0x8,0x400,0xa00a5,0x0,0xa00a5,0x400,0x0,0xa00a5,0x8,0x400,0xa00a5,0xa00a5,0x400,0x8,0x0,0x5,0x20000,0x0,0x5,0x5,0x20000,0x5,0x20000,0x80,0x80,0x200,0x [...]
}
private static void jj_la1_init_7() {
- jj_la1_7 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x10,0x0,0x10,0x1 [...]
+ jj_la1_7 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x10,0x0,0x10,0x1 [...]
}
final private JJCalls[] jj_2_rtns = new JJCalls[5];
private boolean jj_rescan = false;
@@ -9438,7 +9438,7 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ;
/** Generate ParseException. */
public ParseException generateParseException() {
jj_expentries.clear();
- boolean[] la1tokens = new boolean[244];
+ boolean[] la1tokens = new boolean[242];
if (jj_kind >= 0) {
la1tokens[jj_kind] = true;
jj_kind = -1;
@@ -9473,7 +9473,7 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ;
}
}
}
- for (int i = 0; i < 244; i++) {
+ for (int i = 0; i < 242; i++) {
if (la1tokens[i]) {
jj_expentry = new int[1];
jj_expentry[0] = i;
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ARQParserConstants.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ARQParserConstants.java
index 6766a1491e..770f4119a1 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ARQParserConstants.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ARQParserConstants.java
@@ -457,35 +457,31 @@ public interface ARQParserConstants {
/** RegularExpression Id. */
int CARAT = 228;
/** RegularExpression Id. */
- int FPATH = 229;
+ int QMARK = 229;
/** RegularExpression Id. */
- int RPATH = 230;
+ int SURROGATE_PAIR = 230;
/** RegularExpression Id. */
- int QMARK = 231;
+ int PN_CHARS_BASE = 231;
/** RegularExpression Id. */
- int SURROGATE_PAIR = 232;
+ int PN_CHARS_U = 232;
/** RegularExpression Id. */
- int PN_CHARS_BASE = 233;
+ int PN_CHARS = 233;
/** RegularExpression Id. */
- int PN_CHARS_U = 234;
+ int PN_PREFIX = 234;
/** RegularExpression Id. */
- int PN_CHARS = 235;
+ int PN_LOCAL = 235;
/** RegularExpression Id. */
- int PN_PREFIX = 236;
+ int VARNAME = 236;
/** RegularExpression Id. */
- int PN_LOCAL = 237;
+ int PN_LOCAL_ESC = 237;
/** RegularExpression Id. */
- int VARNAME = 238;
+ int PLX = 238;
/** RegularExpression Id. */
- int PN_LOCAL_ESC = 239;
+ int HEX = 239;
/** RegularExpression Id. */
- int PLX = 240;
+ int PERCENT = 240;
/** RegularExpression Id. */
- int HEX = 241;
- /** RegularExpression Id. */
- int PERCENT = 242;
- /** RegularExpression Id. */
- int UNKNOWN = 243;
+ int UNKNOWN = 241;
/** Lexical state. */
int DEFAULT = 0;
@@ -721,8 +717,6 @@ public interface ARQParserConstants {
"\":=\"",
"\"|\"",
"\"^\"",
- "\"->\"",
- "\"<-\"",
"\"?\"",
"<SURROGATE_PAIR>",
"<PN_CHARS_BASE>",
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ARQParserTokenManager.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ARQParserTokenManager.java
index 5604610206..7bbdd990a8 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ARQParserTokenManager.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ARQParserTokenManager.java
@@ -69,7 +69,7 @@ private int jjMoveStringLiteralDfa0_0(){
return jjMoveNfa_0(0, 0);
case 45:
jjmatchedKind = 221;
- return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x2000000000L);
+ return jjMoveNfa_0(0, 0);
case 46:
jjmatchedKind = 202;
return jjMoveNfa_0(0, 0);
@@ -84,7 +84,7 @@ private int jjMoveStringLiteralDfa0_0(){
return jjMoveNfa_0(0, 0);
case 60:
jjmatchedKind = 206;
- return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x40000a8000L);
+ return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0xa8000L);
case 61:
jjmatchedKind = 203;
return jjMoveNfa_0(0, 0);
@@ -92,7 +92,7 @@ private int jjMoveStringLiteralDfa0_0(){
jjmatchedKind = 205;
return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x110000L);
case 63:
- jjmatchedKind = 231;
+ jjmatchedKind = 229;
return jjMoveNfa_0(0, 0);
case 64:
jjmatchedKind = 225;
@@ -228,13 +228,6 @@ private int jjMoveStringLiteralDfa1_0(long active0, long active1, long active2,
jjmatchedPos = 1;
}
break;
- case 45:
- if ((active3 & 0x4000000000L) != 0L)
- {
- jjmatchedKind = 230;
- jjmatchedPos = 1;
- }
- break;
case 60:
if ((active3 & 0x80000L) != 0L)
{
@@ -270,11 +263,6 @@ private int jjMoveStringLiteralDfa1_0(long active0, long active1, long active2,
jjmatchedKind = 212;
jjmatchedPos = 1;
}
- else if ((active3 & 0x2000000000L) != 0L)
- {
- jjmatchedKind = 229;
- jjmatchedPos = 1;
- }
return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0L, active2, 0L, active3, 0x40000L);
case 65:
return jjMoveStringLiteralDfa2_0(active0, 0x4002004400100000L, active1, 0xec1e0600b808L, active2, 0x600010L, active3, 0L);
@@ -4578,8 +4566,8 @@ null, null, null, null, null, null, null, null, null, null, null, "\50", "\51",
"\173", "\175", "\133", "\135", null, "\73", "\54", "\56", "\75", "\41\75", "\76",
"\74", "\74\75", "\76\75", "\74\74\50", "\51\76\76", "\74\74", "\76\76", "\173\174",
"\174\175", "\176", "\41", "\72", "\174\174", "\46\46", "\53", "\55", "\52", "\57",
-"\136\136", "\100", "\72\75", "\174", "\136", "\55\76", "\74\55", "\77", null, null, null,
-null, null, null, null, null, null, null, null, null, };
+"\136\136", "\100", "\72\75", "\174", "\136", "\77", null, null, null, null, null, null,
+null, null, null, null, null, null, };
protected Token jjFillToken()
{
final Token t;
@@ -5133,10 +5121,10 @@ public static final int[] jjnewLexState = {
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
};
static final long[] jjtoToken = {
- 0xfffffffffff9fe01L, 0xffffffffffffffffL, 0xf11ff7ffffffffffL, 0xffffffffffL,
+ 0xfffffffffff9fe01L, 0xffffffffffffffffL, 0xf11ff7ffffffffffL, 0x3fffffffffL,
};
static final long[] jjtoSkip = {
0x7eL, 0x0L, 0x0L, 0x0L,
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/SPARQLParser12.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/SPARQLParser12.java
index 858a565f3d..d9a9f0d6fc 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/SPARQLParser12.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/SPARQLParser12.java
@@ -5961,7 +5961,6 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ;
static private int[] jj_la1_4;
static private int[] jj_la1_5;
static private int[] jj_la1_6;
- static private int[] jj_la1_7;
static {
jj_la1_init_0();
jj_la1_init_1();
@@ -5970,31 +5969,27 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ;
jj_la1_init_4();
jj_la1_init_5();
jj_la1_init_6();
- jj_la1_init_7();
}
private static void jj_la1_init_0() {
jj_la1_0 = new int[] {0xe400000,0x380000,0x380000,0x0,0x0,0x1800000,0x1800000,0x6000,0x6000,0x6000,0x0,0x0,0x7e00,0x0,0x6e00,0x6e00,0x0,0x0,0x0,0xe00,0x0,0x0,0x0,0x40000000,0x30000000,0x6e00,0x0,0x6e00,0xe00,0x6e00,0x0,0x6e00,0x6e00,0x20000000,0x10000000,0x30000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xe00,0x0,0xe00,0x0,0x7e00,0x0,0x0,0x7e00,0x7e00,0x7e00,0x0,0x400000,0x7e00,0x0,0x0,0x7e00,0x7e00,0x0,0x0,0x0,0x6000,0xe00,0x6000,0x0,0x0,0xe00,0x0,0xe00,0x7e [...]
}
private static void jj_la1_init_1() {
- jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x0,0x0,0x20,0x20,0x0,0x60,0x0,0x0,0x20,0x40,0x20,0x10,0x40,0x400000,0x800000,0x0,0x0,0x7c1fc000,0x200000,0x7c1fc000,0x7c1fc000,0x7c1fc00c,0xc,0x7c1fc000,0x7c1fc00c,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x100,0x100,0x110,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3b01,0x0,0x0,0x0,0x0,0x3b01,0x0,0x0,0x2,0x0,0x0,0x0,0x2,0x0,0x2,0x0,0x0,0x400,0x7c1fc000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, [...]
+ jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x0,0x0,0x20,0x20,0x0,0x60,0x0,0x0,0x20,0x40,0x20,0x10,0x40,0x400000,0x800000,0x0,0x0,0xfc1fc000,0x200000,0xfc1fc000,0xfc1fc000,0xfc1fc00c,0xc,0xfc1fc000,0xfc1fc00c,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x100,0x100,0x110,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3b01,0x0,0x0,0x0,0x0,0x3b01,0x0,0x0,0x2,0x0,0x0,0x0,0x2,0x0,0x2,0x0,0x0,0x400,0xfc1fc000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, [...]
}
private static void jj_la1_init_2() {
- jj_la1_2 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffffb60,0x0,0xfffffb60,0xfffffb60,0xfffffb60,0x0,0xfffffb60,0xfffffb60,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffffb60,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0 [...]
+ jj_la1_2 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfbffffed,0x0,0xfbffffed,0xfbffffed,0xfbffffed,0x0,0xfbffffed,0xfbffffed,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfbffffed,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0 [...]
}
private static void jj_la1_init_3() {
- jj_la1_3 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7ffffffe,0x0,0x7ffffffe,0x7ffffffe,0x7ffffffe,0x0,0x7ffffffe,0x7ffffffe,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7ffffffe,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0 [...]
+ jj_la1_3 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x60000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1dffffff,0x0,0x1dffffff,0x1dffffff,0x1dffffff,0x0,0x1dffffff,0x1dffffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x60000000,0x0,0x0,0x60000000,0x60000000,0x60000000,0x0,0x0,0x60000000,0x0,0x0,0x60000000,0x60000000,0x0,0x0,0x0,0x0,0x60000000,0x0,0x0,0x0,0x60000000,0x0,0x60000000,0x0,0x0,0x0,0x1dffffff,0x0, [...]
}
private static void jj_la1_init_4() {
- jj_la1_4 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xf8000018,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7,0x0,0x7,0x7,0x7,0x0,0x7,0x7,0x0,0x0,0x0,0x0,0x0,0x109ffc0,0x109ffc0,0x40000,0x100000,0x40000,0x40000,0x40000,0x40000,0x40000,0x40000,0x1000000,0x40,0xc0,0x2000000,0x0,0x0,0x400000,0xc00000,0xf8000018,0x0,0x0,0xf8000018,0xf8000018,0xf8000018,0x0,0x0,0xf8000018,0x0,0x0,0xf8000018,0xf8000018,0x0,0x0,0x40000,0x0,0xf8000018,0x0,0x0,0x0,0xf8000018,0x0,0xf8000 [...]
+ jj_la1_4 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3fe00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x427ff,0x427ff,0x1000,0x4000,0x1000,0x1000,0x1000,0x1000,0x1000,0x1000,0x40000,0x1,0x3,0x80000,0x0,0x0,0x10000,0x30000,0x3fe00000,0x0,0x0,0x3fe00000,0x3fe00000,0x3fe00000,0x0,0x0,0x3fe00000,0x0,0x0,0x3fe00000,0x3fe00000,0x0,0x0,0x1000,0x0,0x3fe00000,0x0,0x0,0x0,0x3fe00000,0x0,0x3fe00000,0x0,0x0,0x0,0x0,0x [...]
}
private static void jj_la1_init_5() {
- jj_la1_5 = new int[] {0x0,0x0,0x0,0x1800,0x0,0x0,0x0,0x8000,0x8000,0x8000,0x0,0x0,0x52f80f,0x40000,0x0,0x0,0x0,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000,0x0,0x8000,0x8000,0x8000,0x0,0x8000,0x8000,0x0,0x0,0x0,0x0,0x800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x52f80f,0x0,0x2000000,0x52f80f,0x52f80f,0x52f80f,0x2000000,0x0,0x52f80f,0x40000,0x2000000,0x52f80f,0x52f80f,0x2000000,0x40000,0x0,0x28000,0x780f,0x0,0x28000,0x28000,0x780f,0x28000,0x780f,0x4000 [...]
+ jj_la1_5 = new int[] {0x0,0x0,0x0,0x60,0x0,0x0,0x0,0x200,0x200,0x200,0x0,0x0,0x14014be0,0x1000,0x0,0x0,0x0,0x1000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200,0x0,0x200,0x200,0x200,0x0,0x200,0x200,0x0,0x0,0x0,0x0,0x20000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x14014be0,0x0,0x80000,0x14014be0,0x14014be0,0x14014be0,0x80000,0x0,0x14014be0,0x1000,0x80000,0x14014be0,0x14014be0,0x80000,0x1000,0x0,0xa00,0x40001e0,0x0,0xa00,0xa00,0x40001e0,0xa00,0x40001e0,0x10000,0x100 [...]
}
private static void jj_la1_init_6() {
- jj_la1_6 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000,0x0,0x0,0x5,0x0,0x0,0x2000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x5,0x0,0x0,0x5,0x5,0x5,0x0,0x0,0x5,0x0,0x0,0x5,0x5,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x5,0x5,0x0,0x5,0x0,0x0,0x0,0x0,0x0,0x5,0x40080,0x40080,0x0,0x40080,0x40080,0x0,0x20000,0x4000,0x202800, [...]
- }
- private static void jj_la1_init_7() {
- jj_la1_7 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x [...]
+ jj_la1_6 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1002,0x1002,0x0,0x1002,0x1002,0x0,0x800,0x100,0x20a0,0x1002,0x20a0 [...]
}
/** Constructor with InputStream. */
@@ -6119,7 +6114,7 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ;
/** Generate ParseException. */
public ParseException generateParseException() {
jj_expentries.clear();
- boolean[] la1tokens = new boolean[225];
+ boolean[] la1tokens = new boolean[217];
if (jj_kind >= 0) {
la1tokens[jj_kind] = true;
jj_kind = -1;
@@ -6148,13 +6143,10 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ;
if ((jj_la1_6[i] & (1<<j)) != 0) {
la1tokens[192+j] = true;
}
- if ((jj_la1_7[i] & (1<<j)) != 0) {
- la1tokens[224+j] = true;
- }
}
}
}
- for (int i = 0; i < 225; i++) {
+ for (int i = 0; i < 217; i++) {
if (la1tokens[i]) {
jj_expentry = new int[1];
jj_expentry[0] = i;
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/SPARQLParser12Constants.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/SPARQLParser12Constants.java
index fe163eecf2..86d797eb91 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/SPARQLParser12Constants.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/SPARQLParser12Constants.java
@@ -125,329 +125,313 @@ public interface SPARQLParser12Constants {
/** RegularExpression Id. */
int AVG = 62;
/** RegularExpression Id. */
- int STDEV = 63;
+ int SAMPLE = 63;
/** RegularExpression Id. */
- int STDEV_SAMP = 64;
+ int GROUP_CONCAT = 64;
/** RegularExpression Id. */
- int STDEV_POP = 65;
+ int FILTER = 65;
/** RegularExpression Id. */
- int VARIANCE = 66;
+ int BOUND = 66;
/** RegularExpression Id. */
- int VAR_SAMP = 67;
+ int COALESCE = 67;
/** RegularExpression Id. */
- int VAR_POP = 68;
+ int IN = 68;
/** RegularExpression Id. */
- int SAMPLE = 69;
+ int IF = 69;
/** RegularExpression Id. */
- int GROUP_CONCAT = 70;
+ int BNODE = 70;
/** RegularExpression Id. */
- int FILTER = 71;
+ int IRI = 71;
/** RegularExpression Id. */
- int BOUND = 72;
+ int URI = 72;
/** RegularExpression Id. */
- int COALESCE = 73;
+ int STR = 73;
/** RegularExpression Id. */
- int IN = 74;
+ int STRLANG = 74;
/** RegularExpression Id. */
- int IF = 75;
+ int STRLANGDIR = 75;
/** RegularExpression Id. */
- int BNODE = 76;
+ int STRDT = 76;
/** RegularExpression Id. */
- int IRI = 77;
+ int DTYPE = 77;
/** RegularExpression Id. */
- int URI = 78;
+ int LANG = 78;
/** RegularExpression Id. */
- int STR = 79;
+ int LANGMATCHES = 79;
/** RegularExpression Id. */
- int STRLANG = 80;
+ int LANGDIR = 80;
/** RegularExpression Id. */
- int STRLANGDIR = 81;
+ int IS_URI = 81;
/** RegularExpression Id. */
- int STRDT = 82;
+ int IS_IRI = 82;
/** RegularExpression Id. */
- int DTYPE = 83;
+ int IS_BLANK = 83;
/** RegularExpression Id. */
- int LANG = 84;
+ int IS_LITERAL = 84;
/** RegularExpression Id. */
- int LANGMATCHES = 85;
+ int IS_NUMERIC = 85;
/** RegularExpression Id. */
- int LANGDIR = 86;
+ int HAS_LANG = 86;
/** RegularExpression Id. */
- int IS_URI = 87;
+ int HAS_LANGDIR = 87;
/** RegularExpression Id. */
- int IS_IRI = 88;
+ int REGEX = 88;
/** RegularExpression Id. */
- int IS_BLANK = 89;
+ int SAME_TERM = 89;
/** RegularExpression Id. */
- int IS_LITERAL = 90;
+ int SAME_VALUE = 90;
/** RegularExpression Id. */
- int IS_NUMERIC = 91;
+ int RAND = 91;
/** RegularExpression Id. */
- int HAS_LANG = 92;
+ int ABS = 92;
/** RegularExpression Id. */
- int HAS_LANGDIR = 93;
+ int CEIL = 93;
/** RegularExpression Id. */
- int REGEX = 94;
+ int FLOOR = 94;
/** RegularExpression Id. */
- int SAME_TERM = 95;
+ int ROUND = 95;
/** RegularExpression Id. */
- int SAME_VALUE = 96;
+ int CONCAT = 96;
/** RegularExpression Id. */
- int RAND = 97;
+ int SUBSTR = 97;
/** RegularExpression Id. */
- int ABS = 98;
+ int STRLEN = 98;
/** RegularExpression Id. */
- int CEIL = 99;
+ int REPLACE = 99;
/** RegularExpression Id. */
- int FLOOR = 100;
+ int UCASE = 100;
/** RegularExpression Id. */
- int ROUND = 101;
+ int LCASE = 101;
/** RegularExpression Id. */
- int CONCAT = 102;
+ int ENCODE_FOR_URI = 102;
/** RegularExpression Id. */
- int SUBSTR = 103;
+ int CONTAINS = 103;
/** RegularExpression Id. */
- int STRLEN = 104;
+ int STRSTARTS = 104;
/** RegularExpression Id. */
- int REPLACE = 105;
+ int STRENDS = 105;
/** RegularExpression Id. */
- int UCASE = 106;
+ int STRBEFORE = 106;
/** RegularExpression Id. */
- int LCASE = 107;
+ int STRAFTER = 107;
/** RegularExpression Id. */
- int ENCODE_FOR_URI = 108;
+ int YEAR = 108;
/** RegularExpression Id. */
- int CONTAINS = 109;
+ int MONTH = 109;
/** RegularExpression Id. */
- int STRSTARTS = 110;
+ int DAY = 110;
/** RegularExpression Id. */
- int STRENDS = 111;
+ int HOURS = 111;
/** RegularExpression Id. */
- int STRBEFORE = 112;
+ int MINUTES = 112;
/** RegularExpression Id. */
- int STRAFTER = 113;
+ int SECONDS = 113;
/** RegularExpression Id. */
- int YEAR = 114;
+ int TIMEZONE = 114;
/** RegularExpression Id. */
- int MONTH = 115;
+ int TZ = 115;
/** RegularExpression Id. */
- int DAY = 116;
+ int NOW = 116;
/** RegularExpression Id. */
- int HOURS = 117;
+ int UUID = 117;
/** RegularExpression Id. */
- int MINUTES = 118;
+ int STRUUID = 118;
/** RegularExpression Id. */
- int SECONDS = 119;
+ int MD5 = 119;
/** RegularExpression Id. */
- int TIMEZONE = 120;
+ int SHA1 = 120;
/** RegularExpression Id. */
- int TZ = 121;
+ int SHA224 = 121;
/** RegularExpression Id. */
- int NOW = 122;
+ int SHA256 = 122;
/** RegularExpression Id. */
- int UUID = 123;
+ int SHA384 = 123;
/** RegularExpression Id. */
- int STRUUID = 124;
+ int SHA512 = 124;
/** RegularExpression Id. */
- int MD5 = 125;
+ int TRUE = 125;
/** RegularExpression Id. */
- int SHA1 = 126;
+ int FALSE = 126;
/** RegularExpression Id. */
- int SHA224 = 127;
+ int DATA = 127;
/** RegularExpression Id. */
- int SHA256 = 128;
+ int INSERT = 128;
/** RegularExpression Id. */
- int SHA384 = 129;
+ int DELETE = 129;
/** RegularExpression Id. */
- int SHA512 = 130;
+ int INSERT_DATA = 130;
/** RegularExpression Id. */
- int TRUE = 131;
+ int DELETE_DATA = 131;
/** RegularExpression Id. */
- int FALSE = 132;
+ int DELETE_WHERE = 132;
/** RegularExpression Id. */
- int DATA = 133;
+ int LOAD = 133;
/** RegularExpression Id. */
- int INSERT = 134;
+ int CLEAR = 134;
/** RegularExpression Id. */
- int DELETE = 135;
+ int CREATE = 135;
/** RegularExpression Id. */
- int INSERT_DATA = 136;
+ int ADD = 136;
/** RegularExpression Id. */
- int DELETE_DATA = 137;
+ int MOVE = 137;
/** RegularExpression Id. */
- int DELETE_WHERE = 138;
+ int COPY = 138;
/** RegularExpression Id. */
- int LOAD = 139;
+ int META = 139;
/** RegularExpression Id. */
- int CLEAR = 140;
+ int SILENT = 140;
/** RegularExpression Id. */
- int CREATE = 141;
+ int DROP = 141;
/** RegularExpression Id. */
- int ADD = 142;
+ int INTO = 142;
/** RegularExpression Id. */
- int MOVE = 143;
+ int TO = 143;
/** RegularExpression Id. */
- int COPY = 144;
+ int DFT = 144;
/** RegularExpression Id. */
- int META = 145;
+ int ALL = 145;
/** RegularExpression Id. */
- int SILENT = 146;
+ int WITH = 146;
/** RegularExpression Id. */
- int DROP = 147;
+ int USING = 147;
/** RegularExpression Id. */
- int INTO = 148;
+ int DIGITS = 148;
/** RegularExpression Id. */
- int TO = 149;
+ int INTEGER = 149;
/** RegularExpression Id. */
- int DFT = 150;
+ int DECIMAL = 150;
/** RegularExpression Id. */
- int ALL = 151;
+ int DOUBLE = 151;
/** RegularExpression Id. */
- int WITH = 152;
+ int INTEGER_POSITIVE = 152;
/** RegularExpression Id. */
- int USING = 153;
+ int DECIMAL_POSITIVE = 153;
/** RegularExpression Id. */
- int DIGITS = 154;
+ int DOUBLE_POSITIVE = 154;
/** RegularExpression Id. */
- int INTEGER = 155;
+ int INTEGER_NEGATIVE = 155;
/** RegularExpression Id. */
- int DECIMAL = 156;
+ int DECIMAL_NEGATIVE = 156;
/** RegularExpression Id. */
- int DOUBLE = 157;
+ int DOUBLE_NEGATIVE = 157;
/** RegularExpression Id. */
- int INTEGER_POSITIVE = 158;
+ int EXPONENT = 158;
/** RegularExpression Id. */
- int DECIMAL_POSITIVE = 159;
+ int QUOTE_3D = 159;
/** RegularExpression Id. */
- int DOUBLE_POSITIVE = 160;
+ int QUOTE_3S = 160;
/** RegularExpression Id. */
- int INTEGER_NEGATIVE = 161;
+ int ECHAR = 161;
/** RegularExpression Id. */
- int DECIMAL_NEGATIVE = 162;
+ int UCHAR = 162;
/** RegularExpression Id. */
- int DOUBLE_NEGATIVE = 163;
+ int UCHAR4 = 163;
/** RegularExpression Id. */
- int EXPONENT = 164;
+ int UCHAR8 = 164;
/** RegularExpression Id. */
- int QUOTE_3D = 165;
+ int STRING_LITERAL1 = 165;
/** RegularExpression Id. */
- int QUOTE_3S = 166;
+ int STRING_LITERAL2 = 166;
/** RegularExpression Id. */
- int ECHAR = 167;
+ int STRING_LITERAL_LONG1 = 167;
/** RegularExpression Id. */
- int UCHAR = 168;
+ int STRING_LITERAL_LONG2 = 168;
/** RegularExpression Id. */
- int UCHAR4 = 169;
+ int LPAREN = 169;
/** RegularExpression Id. */
- int UCHAR8 = 170;
+ int RPAREN = 170;
/** RegularExpression Id. */
- int STRING_LITERAL1 = 171;
+ int NIL = 171;
/** RegularExpression Id. */
- int STRING_LITERAL2 = 172;
+ int LBRACE = 172;
/** RegularExpression Id. */
- int STRING_LITERAL_LONG1 = 173;
+ int RBRACE = 173;
/** RegularExpression Id. */
- int STRING_LITERAL_LONG2 = 174;
+ int LBRACKET = 174;
/** RegularExpression Id. */
- int LPAREN = 175;
+ int RBRACKET = 175;
/** RegularExpression Id. */
- int RPAREN = 176;
+ int ANON = 176;
/** RegularExpression Id. */
- int NIL = 177;
+ int SEMICOLON = 177;
/** RegularExpression Id. */
- int LBRACE = 178;
+ int COMMA = 178;
/** RegularExpression Id. */
- int RBRACE = 179;
+ int DOT = 179;
/** RegularExpression Id. */
- int LBRACKET = 180;
+ int EQ = 180;
/** RegularExpression Id. */
- int RBRACKET = 181;
+ int NE = 181;
/** RegularExpression Id. */
- int ANON = 182;
+ int GT = 182;
/** RegularExpression Id. */
- int SEMICOLON = 183;
+ int LT = 183;
/** RegularExpression Id. */
- int COMMA = 184;
+ int LE = 184;
/** RegularExpression Id. */
- int DOT = 185;
+ int GE = 185;
/** RegularExpression Id. */
- int EQ = 186;
+ int L_TRIPLE = 186;
/** RegularExpression Id. */
- int NE = 187;
+ int R_TRIPLE = 187;
/** RegularExpression Id. */
- int GT = 188;
+ int LT2 = 188;
/** RegularExpression Id. */
- int LT = 189;
+ int GT2 = 189;
/** RegularExpression Id. */
- int LE = 190;
+ int L_ANN = 190;
/** RegularExpression Id. */
- int GE = 191;
+ int R_ANN = 191;
/** RegularExpression Id. */
- int L_TRIPLE = 192;
+ int TILDE = 192;
/** RegularExpression Id. */
- int R_TRIPLE = 193;
+ int BANG = 193;
/** RegularExpression Id. */
- int LT2 = 194;
+ int COLON = 194;
/** RegularExpression Id. */
- int GT2 = 195;
+ int SC_OR = 195;
/** RegularExpression Id. */
- int L_ANN = 196;
+ int SC_AND = 196;
/** RegularExpression Id. */
- int R_ANN = 197;
+ int PLUS = 197;
/** RegularExpression Id. */
- int TILDE = 198;
+ int MINUS = 198;
/** RegularExpression Id. */
- int BANG = 199;
+ int STAR = 199;
/** RegularExpression Id. */
- int COLON = 200;
+ int SLASH = 200;
/** RegularExpression Id. */
- int SC_OR = 201;
+ int DATATYPE = 201;
/** RegularExpression Id. */
- int SC_AND = 202;
+ int AT = 202;
/** RegularExpression Id. */
- int PLUS = 203;
+ int VBAR = 203;
/** RegularExpression Id. */
- int MINUS = 204;
+ int CARAT = 204;
/** RegularExpression Id. */
- int STAR = 205;
+ int QMARK = 205;
/** RegularExpression Id. */
- int SLASH = 206;
+ int PN_CHARS_BASE = 206;
/** RegularExpression Id. */
- int DATATYPE = 207;
+ int PN_CHARS_U = 207;
/** RegularExpression Id. */
- int AT = 208;
+ int PN_CHARS = 208;
/** RegularExpression Id. */
- int VBAR = 209;
+ int PN_PREFIX = 209;
/** RegularExpression Id. */
- int CARAT = 210;
+ int PN_LOCAL = 210;
/** RegularExpression Id. */
- int FPATH = 211;
+ int VARNAME = 211;
/** RegularExpression Id. */
- int RPATH = 212;
+ int PN_LOCAL_ESC = 212;
/** RegularExpression Id. */
- int QMARK = 213;
+ int PLX = 213;
/** RegularExpression Id. */
- int PN_CHARS_BASE = 214;
+ int HEX = 214;
/** RegularExpression Id. */
- int PN_CHARS_U = 215;
+ int PERCENT = 215;
/** RegularExpression Id. */
- int PN_CHARS = 216;
- /** RegularExpression Id. */
- int PN_PREFIX = 217;
- /** RegularExpression Id. */
- int PN_LOCAL = 218;
- /** RegularExpression Id. */
- int VARNAME = 219;
- /** RegularExpression Id. */
- int PN_LOCAL_ESC = 220;
- /** RegularExpression Id. */
- int PLX = 221;
- /** RegularExpression Id. */
- int HEX = 222;
- /** RegularExpression Id. */
- int PERCENT = 223;
- /** RegularExpression Id. */
- int UNKNOWN = 224;
+ int UNKNOWN = 216;
/** Lexical state. */
int DEFAULT = 0;
@@ -517,12 +501,6 @@ public interface SPARQLParser12Constants {
"\"max\"",
"\"sum\"",
"\"avg\"",
- "\"stdev\"",
- "\"stdev_samp\"",
- "\"stdev_pop\"",
- "\"variance\"",
- "\"var_samp\"",
- "\"var_pop\"",
"\"sample\"",
"\"group_concat\"",
"\"filter\"",
@@ -665,8 +643,6 @@ public interface SPARQLParser12Constants {
"\"@\"",
"\"|\"",
"\"^\"",
- "\"->\"",
- "\"<-\"",
"\"?\"",
"<PN_CHARS_BASE>",
"<PN_CHARS_U>",
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/SPARQLParser12TokenManager.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/SPARQLParser12TokenManager.java
index a3db6a4dee..ca82853c70 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/SPARQLParser12TokenManager.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/javacc/SPARQLParser12TokenManager.java
@@ -45,160 +45,160 @@ private int jjMoveStringLiteralDfa0_0(){
jjmatchedKind = 1;
return jjMoveNfa_0(0, 0);
case 33:
- jjmatchedKind = 199;
- return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x800000000000000L, 0x0L);
+ jjmatchedKind = 193;
+ return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x20000000000000L, 0x0L);
case 38:
- return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x400L);
+ return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x10L);
case 40:
- jjmatchedKind = 175;
+ jjmatchedKind = 169;
return jjMoveNfa_0(0, 0);
case 41:
- jjmatchedKind = 176;
- return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x2L);
+ jjmatchedKind = 170;
+ return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x800000000000000L, 0x0L);
case 42:
- jjmatchedKind = 205;
+ jjmatchedKind = 199;
return jjMoveNfa_0(0, 0);
case 43:
- jjmatchedKind = 203;
+ jjmatchedKind = 197;
return jjMoveNfa_0(0, 0);
case 44:
- jjmatchedKind = 184;
+ jjmatchedKind = 178;
return jjMoveNfa_0(0, 0);
case 45:
- jjmatchedKind = 204;
- return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x80000L);
+ jjmatchedKind = 198;
+ return jjMoveNfa_0(0, 0);
case 46:
- jjmatchedKind = 185;
+ jjmatchedKind = 179;
return jjMoveNfa_0(0, 0);
case 47:
- jjmatchedKind = 206;
+ jjmatchedKind = 200;
return jjMoveNfa_0(0, 0);
case 58:
- jjmatchedKind = 200;
+ jjmatchedKind = 194;
return jjMoveNfa_0(0, 0);
case 59:
- jjmatchedKind = 183;
+ jjmatchedKind = 177;
return jjMoveNfa_0(0, 0);
case 60:
- jjmatchedKind = 189;
- return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x4000000000000000L, 0x100005L);
+ jjmatchedKind = 183;
+ return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x1500000000000000L, 0x0L);
case 61:
- jjmatchedKind = 186;
+ jjmatchedKind = 180;
return jjMoveNfa_0(0, 0);
case 62:
- jjmatchedKind = 188;
- return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x8000000000000000L, 0x8L);
+ jjmatchedKind = 182;
+ return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x2200000000000000L, 0x0L);
case 63:
- jjmatchedKind = 213;
+ jjmatchedKind = 205;
return jjMoveNfa_0(0, 0);
case 64:
- jjmatchedKind = 208;
+ jjmatchedKind = 202;
return jjMoveNfa_0(0, 0);
case 65:
- return jjMoveStringLiteralDfa1_0(0x4220008408000000L, 0x400000000L, 0x804000L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x4220008408000000L, 0x10000000L, 0x20100L, 0x0L);
case 66:
- return jjMoveStringLiteralDfa1_0(0x100080080000L, 0x1100L, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x100080080000L, 0x44L, 0x0L, 0x0L);
case 67:
- return jjMoveStringLiteralDfa1_0(0x400000004000000L, 0x204800000200L, 0x13000L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x400000004000000L, 0x8120000008L, 0x4c0L, 0x0L);
case 68:
- return jjMoveStringLiteralDfa1_0(0x802800000L, 0x10000000080000L, 0x4800a0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x802800000L, 0x8000400000002000L, 0x12002L, 0x0L);
case 69:
- return jjMoveStringLiteralDfa1_0(0x8000000000000L, 0x100000000000L, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x8000000000000L, 0x4000000000L, 0x0L, 0x0L);
case 70:
- return jjMoveStringLiteralDfa1_0(0x2000000000L, 0x1000000080L, 0x10L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x2000000000L, 0x4000000040000002L, 0x0L, 0x0L);
case 71:
- return jjMoveStringLiteralDfa1_0(0x40010000000000L, 0x40L, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x40010000000000L, 0x1L, 0x0L, 0x0L);
case 72:
- return jjMoveStringLiteralDfa1_0(0x80000000000000L, 0x20000030000000L, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x80000000000000L, 0x800000c00000L, 0x0L, 0x0L);
case 73:
- return jjMoveStringLiteralDfa1_0(0x800000000000L, 0xf802c00L, 0x100040L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x800000000000L, 0x3e00b0L, 0x4001L, 0x0L);
case 76:
- return jjMoveStringLiteralDfa1_0(0x10000000L, 0x80000700000L, 0x800L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x10000000L, 0x200001c000L, 0x20L, 0x0L);
case 77:
- return jjMoveStringLiteralDfa1_0(0x1800080000000000L, 0x2048000000000000L, 0x28000L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x1800080000000000L, 0x81200000000000L, 0xa00L, 0x0L);
case 78:
- return jjMoveStringLiteralDfa1_0(0x10001000000000L, 0x400000000000000L, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x10001000000000L, 0x10000000000000L, 0x0L, 0x0L);
case 79:
return jjMoveStringLiteralDfa1_0(0x4020060000000L, 0x0L, 0x0L, 0x0L);
case 80:
return jjMoveStringLiteralDfa1_0(0x2000000100000L, 0x0L, 0x0L, 0x0L);
case 82:
- return jjMoveStringLiteralDfa1_0(0x1000000L, 0x22240000000L, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x1000000L, 0x889000000L, 0x0L, 0x0L);
case 83:
- return jjMoveStringLiteralDfa1_0(0xa101200000400000L, 0xd083c18180078023L, 0x40007L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0xa101200000400000L, 0x1f420f0606001e00L, 0x1000L, 0x0L);
case 84:
- return jjMoveStringLiteralDfa1_0(0x400000000000L, 0x300000000000000L, 0x200008L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x400000000000L, 0x200c000000000000L, 0x8000L, 0x0L);
case 85:
- return jjMoveStringLiteralDfa1_0(0x40200000000L, 0x800040000004000L, 0x2000000L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x40200000000L, 0x20001000000100L, 0x80000L, 0x0L);
case 86:
- return jjMoveStringLiteralDfa1_0(0x100200000L, 0x1cL, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x100200000L, 0x0L, 0x0L, 0x0L);
case 87:
- return jjMoveStringLiteralDfa1_0(0x4000000000L, 0x0L, 0x1000000L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x4000000000L, 0x0L, 0x40000L, 0x0L);
case 89:
- return jjMoveStringLiteralDfa1_0(0x0L, 0x4000000000000L, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x0L, 0x100000000000L, 0x0L, 0x0L);
case 91:
- jjmatchedKind = 180;
+ jjmatchedKind = 174;
return jjMoveNfa_0(0, 0);
case 93:
- jjmatchedKind = 181;
+ jjmatchedKind = 175;
return jjMoveNfa_0(0, 0);
case 94:
- jjmatchedKind = 210;
- return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x8000L);
+ jjmatchedKind = 204;
+ return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x200L);
case 97:
jjmatchedKind = 18;
- return jjMoveStringLiteralDfa1_0(0x4220008408000000L, 0x400000000L, 0x804000L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x4220008408000000L, 0x10000000L, 0x20100L, 0x0L);
case 98:
- return jjMoveStringLiteralDfa1_0(0x100080080000L, 0x1100L, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x100080080000L, 0x44L, 0x0L, 0x0L);
case 99:
- return jjMoveStringLiteralDfa1_0(0x400000004000000L, 0x204800000200L, 0x13000L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x400000004000000L, 0x8120000008L, 0x4c0L, 0x0L);
case 100:
- return jjMoveStringLiteralDfa1_0(0x802800000L, 0x10000000080000L, 0x4800a0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x802800000L, 0x8000400000002000L, 0x12002L, 0x0L);
case 101:
- return jjMoveStringLiteralDfa1_0(0x8000000000000L, 0x100000000000L, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x8000000000000L, 0x4000000000L, 0x0L, 0x0L);
case 102:
- return jjMoveStringLiteralDfa1_0(0x2000000000L, 0x1000000080L, 0x10L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x2000000000L, 0x4000000040000002L, 0x0L, 0x0L);
case 103:
- return jjMoveStringLiteralDfa1_0(0x40010000000000L, 0x40L, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x40010000000000L, 0x1L, 0x0L, 0x0L);
case 104:
- return jjMoveStringLiteralDfa1_0(0x80000000000000L, 0x20000030000000L, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x80000000000000L, 0x800000c00000L, 0x0L, 0x0L);
case 105:
- return jjMoveStringLiteralDfa1_0(0x800000000000L, 0xf802c00L, 0x100040L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x800000000000L, 0x3e00b0L, 0x4001L, 0x0L);
case 108:
- return jjMoveStringLiteralDfa1_0(0x10000000L, 0x80000700000L, 0x800L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x10000000L, 0x200001c000L, 0x20L, 0x0L);
case 109:
- return jjMoveStringLiteralDfa1_0(0x1800080000000000L, 0x2048000000000000L, 0x28000L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x1800080000000000L, 0x81200000000000L, 0xa00L, 0x0L);
case 110:
- return jjMoveStringLiteralDfa1_0(0x10001000000000L, 0x400000000000000L, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x10001000000000L, 0x10000000000000L, 0x0L, 0x0L);
case 111:
return jjMoveStringLiteralDfa1_0(0x4020060000000L, 0x0L, 0x0L, 0x0L);
case 112:
return jjMoveStringLiteralDfa1_0(0x2000000100000L, 0x0L, 0x0L, 0x0L);
case 114:
- return jjMoveStringLiteralDfa1_0(0x1000000L, 0x22240000000L, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x1000000L, 0x889000000L, 0x0L, 0x0L);
case 115:
- return jjMoveStringLiteralDfa1_0(0xa101200000400000L, 0xd083c18180078023L, 0x40007L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0xa101200000400000L, 0x1f420f0606001e00L, 0x1000L, 0x0L);
case 116:
- return jjMoveStringLiteralDfa1_0(0x400000000000L, 0x300000000000000L, 0x200008L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x400000000000L, 0x200c000000000000L, 0x8000L, 0x0L);
case 117:
- return jjMoveStringLiteralDfa1_0(0x40200000000L, 0x800040000004000L, 0x2000000L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x40200000000L, 0x20001000000100L, 0x80000L, 0x0L);
case 118:
- return jjMoveStringLiteralDfa1_0(0x100200000L, 0x1cL, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x100200000L, 0x0L, 0x0L, 0x0L);
case 119:
- return jjMoveStringLiteralDfa1_0(0x4000000000L, 0x0L, 0x1000000L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x4000000000L, 0x0L, 0x40000L, 0x0L);
case 121:
- return jjMoveStringLiteralDfa1_0(0x0L, 0x4000000000000L, 0x0L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x0L, 0x100000000000L, 0x0L, 0x0L);
case 123:
- jjmatchedKind = 178;
- return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x10L);
+ jjmatchedKind = 172;
+ return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x4000000000000000L, 0x0L);
case 124:
- jjmatchedKind = 209;
- return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x220L);
+ jjmatchedKind = 203;
+ return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x8000000000000000L, 0x8L);
case 125:
- jjmatchedKind = 179;
+ jjmatchedKind = 173;
return jjMoveNfa_0(0, 0);
case 126:
- jjmatchedKind = 198;
+ jjmatchedKind = 192;
return jjMoveNfa_0(0, 0);
default :
return jjMoveNfa_0(0, 0);
@@ -212,109 +212,97 @@ private int jjMoveStringLiteralDfa1_0(long active0, long active1, long active2,
switch(curChar)
{
case 38:
- if ((active3 & 0x400L) != 0L)
- {
- jjmatchedKind = 202;
- jjmatchedPos = 1;
- }
- break;
- case 45:
- if ((active3 & 0x100000L) != 0L)
+ if ((active3 & 0x10L) != 0L)
{
- jjmatchedKind = 212;
+ jjmatchedKind = 196;
jjmatchedPos = 1;
}
break;
case 60:
- if ((active3 & 0x4L) != 0L)
+ if ((active2 & 0x1000000000000000L) != 0L)
{
- jjmatchedKind = 194;
+ jjmatchedKind = 188;
jjmatchedPos = 1;
}
- return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0L, active2, 0L, active3, 0x1L);
+ return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0L, active2, 0x400000000000000L, active3, 0L);
case 61:
- if ((active2 & 0x800000000000000L) != 0L)
+ if ((active2 & 0x20000000000000L) != 0L)
{
- jjmatchedKind = 187;
+ jjmatchedKind = 181;
jjmatchedPos = 1;
}
- else if ((active2 & 0x4000000000000000L) != 0L)
+ else if ((active2 & 0x100000000000000L) != 0L)
{
- jjmatchedKind = 190;
+ jjmatchedKind = 184;
jjmatchedPos = 1;
}
- else if ((active2 & 0x8000000000000000L) != 0L)
+ else if ((active2 & 0x200000000000000L) != 0L)
{
- jjmatchedKind = 191;
+ jjmatchedKind = 185;
jjmatchedPos = 1;
}
break;
case 62:
- if ((active3 & 0x8L) != 0L)
- {
- jjmatchedKind = 195;
- jjmatchedPos = 1;
- }
- else if ((active3 & 0x80000L) != 0L)
+ if ((active2 & 0x2000000000000000L) != 0L)
{
- jjmatchedKind = 211;
+ jjmatchedKind = 189;
jjmatchedPos = 1;
}
- return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0L, active2, 0L, active3, 0x2L);
+ return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0L, active2, 0x800000000000000L, active3, 0L);
case 65:
- return jjMoveStringLiteralDfa2_0(active0, 0x1080001100080000L, active1, 0x100003b078003cL, active2, 0x30L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x9080001100080000L, active1, 0xc00040000ec1e000L, active2, 0L, active3, 0L);
case 66:
- return jjMoveStringLiteralDfa2_0(active0, 0x4000000000000L, active1, 0x400000000L, active2, 0L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x4000000000000L, active1, 0x10000000L, active2, 0L, active3, 0L);
case 67:
- return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0xc0000000000L, active2, 0L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x3000000000L, active2, 0L, active3, 0L);
case 68:
- return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x2000000000000000L, active2, 0x4000L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x80000000000000L, active2, 0x100L, active3, 0L);
case 69:
- return jjMoveStringLiteralDfa2_0(active0, 0x100200803600000L, active1, 0x84020840000000L, active2, 0x420080L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x100200803600000L, active1, 0x2100821000000L, active2, 0x10802L, active3, 0L);
case 70:
- if ((active1 & 0x800L) != 0L)
+ if ((active1 & 0x20L) != 0L)
{
- jjmatchedKind = 75;
+ jjmatchedKind = 69;
jjmatchedPos = 1;
}
return jjMoveStringLiteralDfa2_0(active0, 0x20000000L, active1, 0L, active2, 0L, active3, 0L);
case 71:
return jjMoveStringLiteralDfa2_0(active0, 0x200000000000000L, active1, 0L, active2, 0L, active3, 0L);
case 72:
- return jjMoveStringLiteralDfa2_0(active0, 0x4000000000L, active1, 0xc000000000000000L, active2, 0x7L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x4000000000L, active1, 0x1f00000000000000L, active2, 0L, active3, 0L);
case 73:
- return jjMoveStringLiteralDfa2_0(active0, 0x800180010800000L, active1, 0x140000000000080L, active2, 0x1040000L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x800180010800000L, active1, 0x5000000000002L, active2, 0x41000L, active3, 0L);
case 76:
- return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x1000000000L, active2, 0x801000L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x40000000L, active2, 0x20040L, active3, 0L);
case 78:
- if ((active1 & 0x400L) != 0L)
+ if ((active1 & 0x10L) != 0L)
{
- jjmatchedKind = 74;
+ jjmatchedKind = 68;
jjmatchedPos = 1;
}
- return jjMoveStringLiteralDfa2_0(active0, 0x48200000000L, active1, 0x100000001000L, active2, 0x100040L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x48200000000L, active1, 0x4000000040L, active2, 0x4001L, active3, 0L);
case 79:
- if ((active2 & 0x200000L) != 0L)
+ if ((active2 & 0x8000L) != 0L)
{
- jjmatchedKind = 149;
+ jjmatchedKind = 143;
jjmatchedPos = 1;
}
- return jjMoveStringLiteralDfa2_0(active0, 0x410000004000000L, active1, 0x428206000000300L, active2, 0x18800L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x410000004000000L, active1, 0x10a0818000000cL, active2, 0x620L, active3, 0L);
case 80:
return jjMoveStringLiteralDfa2_0(active0, 0x20000000000L, active1, 0L, active2, 0L, active3, 0L);
case 82:
- return jjMoveStringLiteralDfa2_0(active0, 0x42412040100000L, active1, 0x6040L, active2, 0x82008L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x42412040100000L, active1, 0x2000000000000181L, active2, 0x2080L, active3, 0L);
case 83:
if ((active0 & 0x20000000000000L) != 0L)
{
jjmatchedKind = 53;
jjmatchedPos = 1;
}
- return jjMoveStringLiteralDfa2_0(active0, 0x800408000000L, active1, 0xf800000L, active2, 0x2000000L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x800408000000L, active1, 0x3e0000L, active2, 0x80000L, active3, 0L);
case 84:
- return jjMoveStringLiteralDfa2_0(active0, 0x8000000000000000L, active1, 0x1003c10000078003L, active2, 0L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x400f0400001e00L, active2, 0L, active3, 0L);
case 85:
- return jjMoveStringLiteralDfa2_0(active0, 0x2001000000000000L, active1, 0x800008000000000L, active2, 0L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x2001000000000000L, active1, 0x20000200000000L, active2, 0L, active3, 0L);
case 86:
return jjMoveStringLiteralDfa2_0(active0, 0x4000000000000000L, active1, 0L, active2, 0L, active3, 0L);
case 88:
@@ -327,73 +315,73 @@ private int jjMoveStringLiteralDfa1_0(long active0, long active1, long active2,
}
break;
case 90:
- if ((active1 & 0x200000000000000L) != 0L)
+ if ((active1 & 0x8000000000000L) != 0L)
{
- jjmatchedKind = 121;
+ jjmatchedKind = 115;
jjmatchedPos = 1;
}
break;
case 94:
- if ((active3 & 0x8000L) != 0L)
+ if ((active3 & 0x200L) != 0L)
{
- jjmatchedKind = 207;
+ jjmatchedKind = 201;
jjmatchedPos = 1;
}
break;
case 97:
- return jjMoveStringLiteralDfa2_0(active0, 0x1080001100080000L, active1, 0x100003b078003cL, active2, 0x30L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x9080001100080000L, active1, 0xc00040000ec1e000L, active2, 0L, active3, 0L);
case 98:
- return jjMoveStringLiteralDfa2_0(active0, 0x4000000000000L, active1, 0x400000000L, active2, 0L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x4000000000000L, active1, 0x10000000L, active2, 0L, active3, 0L);
case 99:
- return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0xc0000000000L, active2, 0L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x3000000000L, active2, 0L, active3, 0L);
case 100:
- return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x2000000000000000L, active2, 0x4000L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x80000000000000L, active2, 0x100L, active3, 0L);
case 101:
- return jjMoveStringLiteralDfa2_0(active0, 0x100200803600000L, active1, 0x84020840000000L, active2, 0x420080L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x100200803600000L, active1, 0x2100821000000L, active2, 0x10802L, active3, 0L);
case 102:
- if ((active1 & 0x800L) != 0L)
+ if ((active1 & 0x20L) != 0L)
{
- jjmatchedKind = 75;
+ jjmatchedKind = 69;
jjmatchedPos = 1;
}
return jjMoveStringLiteralDfa2_0(active0, 0x20000000L, active1, 0L, active2, 0L, active3, 0L);
case 103:
return jjMoveStringLiteralDfa2_0(active0, 0x200000000000000L, active1, 0L, active2, 0L, active3, 0L);
case 104:
- return jjMoveStringLiteralDfa2_0(active0, 0x4000000000L, active1, 0xc000000000000000L, active2, 0x7L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x4000000000L, active1, 0x1f00000000000000L, active2, 0L, active3, 0L);
case 105:
- return jjMoveStringLiteralDfa2_0(active0, 0x800180010800000L, active1, 0x140000000000080L, active2, 0x1040000L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x800180010800000L, active1, 0x5000000000002L, active2, 0x41000L, active3, 0L);
case 108:
- return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x1000000000L, active2, 0x801000L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x40000000L, active2, 0x20040L, active3, 0L);
case 110:
- if ((active1 & 0x400L) != 0L)
+ if ((active1 & 0x10L) != 0L)
{
- jjmatchedKind = 74;
+ jjmatchedKind = 68;
jjmatchedPos = 1;
}
- return jjMoveStringLiteralDfa2_0(active0, 0x48200000000L, active1, 0x100000001000L, active2, 0x100040L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x48200000000L, active1, 0x4000000040L, active2, 0x4001L, active3, 0L);
case 111:
- if ((active2 & 0x200000L) != 0L)
+ if ((active2 & 0x8000L) != 0L)
{
- jjmatchedKind = 149;
+ jjmatchedKind = 143;
jjmatchedPos = 1;
}
- return jjMoveStringLiteralDfa2_0(active0, 0x410000004000000L, active1, 0x428206000000300L, active2, 0x18800L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x410000004000000L, active1, 0x10a0818000000cL, active2, 0x620L, active3, 0L);
case 112:
return jjMoveStringLiteralDfa2_0(active0, 0x20000000000L, active1, 0L, active2, 0L, active3, 0L);
case 114:
- return jjMoveStringLiteralDfa2_0(active0, 0x42412040100000L, active1, 0x6040L, active2, 0x82008L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x42412040100000L, active1, 0x2000000000000181L, active2, 0x2080L, active3, 0L);
case 115:
if ((active0 & 0x20000000000000L) != 0L)
{
jjmatchedKind = 53;
jjmatchedPos = 1;
}
- return jjMoveStringLiteralDfa2_0(active0, 0x800408000000L, active1, 0xf800000L, active2, 0x2000000L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x800408000000L, active1, 0x3e0000L, active2, 0x80000L, active3, 0L);
case 116:
- return jjMoveStringLiteralDfa2_0(active0, 0x8000000000000000L, active1, 0x1003c10000078003L, active2, 0L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x400f0400001e00L, active2, 0L, active3, 0L);
case 117:
- return jjMoveStringLiteralDfa2_0(active0, 0x2001000000000000L, active1, 0x800008000000000L, active2, 0L, active3, 0L);
+ return jjMoveStringLiteralDfa2_0(active0, 0x2001000000000000L, active1, 0x20000200000000L, active2, 0L, active3, 0L);
case 118:
return jjMoveStringLiteralDfa2_0(active0, 0x4000000000000000L, active1, 0L, active2, 0L, active3, 0L);
case 120:
@@ -406,28 +394,28 @@ private int jjMoveStringLiteralDfa1_0(long active0, long active1, long active2,
}
break;
case 122:
- if ((active1 & 0x200000000000000L) != 0L)
+ if ((active1 & 0x8000000000000L) != 0L)
{
- jjmatchedKind = 121;
+ jjmatchedKind = 115;
jjmatchedPos = 1;
}
break;
case 124:
- if ((active3 & 0x10L) != 0L)
+ if ((active2 & 0x4000000000000000L) != 0L)
{
- jjmatchedKind = 196;
+ jjmatchedKind = 190;
jjmatchedPos = 1;
}
- else if ((active3 & 0x200L) != 0L)
+ else if ((active3 & 0x8L) != 0L)
{
- jjmatchedKind = 201;
+ jjmatchedKind = 195;
jjmatchedPos = 1;
}
break;
case 125:
- if ((active3 & 0x20L) != 0L)
+ if ((active2 & 0x8000000000000000L) != 0L)
{
- jjmatchedKind = 197;
+ jjmatchedKind = 191;
jjmatchedPos = 1;
}
break;
@@ -446,53 +434,53 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
switch(curChar)
{
case 40:
- if ((active3 & 0x1L) != 0L)
+ if ((active2 & 0x400000000000000L) != 0L)
{
- jjmatchedKind = 192;
+ jjmatchedKind = 186;
jjmatchedPos = 2;
}
break;
case 53:
- if ((active1 & 0x2000000000000000L) != 0L)
+ if ((active1 & 0x80000000000000L) != 0L)
{
- jjmatchedKind = 125;
+ jjmatchedKind = 119;
jjmatchedPos = 2;
}
break;
case 62:
- if ((active3 & 0x2L) != 0L)
+ if ((active2 & 0x800000000000000L) != 0L)
{
- jjmatchedKind = 193;
+ jjmatchedKind = 187;
jjmatchedPos = 2;
}
break;
case 65:
- return jjMoveStringLiteralDfa3_0(active0, 0x10000000000L, active1, 0xc0040c0000000200L, active2, 0x807L, active3, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x10000000000L, active1, 0x1f00103000000008L, active2, 0x20L);
case 66:
- return jjMoveStringLiteralDfa3_0(active0, 0x1000000000000L, active1, 0x8002000000L, active2, 0L, active3, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x1000000000000L, active1, 0x200080000L, active2, 0L);
case 67:
if ((active0 & 0x400000000L) != 0L)
{
jjmatchedKind = 34;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x80100000000000L, active2, 0L, active3, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x2004000000000L, active2, 0L);
case 68:
if ((active0 & 0x8000000000L) != 0L)
{
jjmatchedKind = 39;
jjmatchedPos = 2;
}
- else if ((active2 & 0x4000L) != 0L)
+ else if ((active2 & 0x100L) != 0L)
{
- jjmatchedKind = 142;
+ jjmatchedKind = 136;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x8000000241000000L, active1, 0x3L, active2, 0L, active3, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x241000000L, active1, 0L, active2, 0L);
case 69:
- return jjMoveStringLiteralDfa3_0(active0, 0x2004000100000L, active1, 0L, active2, 0x3000L, active3, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x2004000100000L, active1, 0L, active2, 0xc0L);
case 70:
- return jjMoveStringLiteralDfa3_0(active0, 0x20000000L, active1, 0L, active2, 0x400000L, active3, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x20000000L, active1, 0L, active2, 0x10000L);
case 71:
if ((active0 & 0x200000000000000L) != 0L)
{
@@ -504,21 +492,21 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
jjmatchedKind = 62;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x40000000L, active2, 0L, active3, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x1000000L, active2, 0L);
case 73:
- if ((active1 & 0x2000L) != 0L)
+ if ((active1 & 0x80L) != 0L)
{
- jjmatchedKind = 77;
+ jjmatchedKind = 71;
jjmatchedPos = 2;
}
- else if ((active1 & 0x4000L) != 0L)
+ else if ((active1 & 0x100L) != 0L)
{
- jjmatchedKind = 78;
+ jjmatchedKind = 72;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x8440000000000L, active1, 0x800000801000000L, active2, 0x2000000L, active3, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x8440000000000L, active1, 0x20000020040000L, active2, 0x80000L);
case 74:
- return jjMoveStringLiteralDfa3_0(active0, 0x4000000000000L, active1, 0L, active2, 0L, active3, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x4000000000000L, active1, 0L, active2, 0L);
case 75:
if ((active0 & 0x8000000L) != 0L)
{
@@ -527,59 +515,59 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
}
break;
case 76:
- if ((active2 & 0x800000L) != 0L)
+ if ((active2 & 0x20000L) != 0L)
{
- jjmatchedKind = 151;
+ jjmatchedKind = 145;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x100400000L, active1, 0x4000080L, active2, 0x40090L, active3, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x100400000L, active1, 0x4000000000100002L, active2, 0x1002L);
case 77:
if ((active0 & 0x2000000000000000L) != 0L)
{
jjmatchedKind = 61;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x1010000000L, active1, 0x100000180000020L, active2, 0L, active3, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x8000001010000000L, active1, 0x4000006000000L, active2, 0L);
case 78:
if ((active0 & 0x800000000000000L) != 0L)
{
jjmatchedKind = 59;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x180004000000L, active1, 0x48204208700000L, active2, 0L, active3, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x180004000000L, active1, 0x120810821c000L, active2, 0L);
case 79:
- return jjMoveStringLiteralDfa3_0(active0, 0x40002000000000L, active1, 0x1000001040L, active2, 0x80000L, active3, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x40002000000000L, active1, 0x40000041L, active2, 0x2000L);
case 80:
- return jjMoveStringLiteralDfa3_0(active0, 0x100000000000000L, active1, 0x20000000000L, active2, 0x10000L, active3, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x100000000000000L, active1, 0x800000000L, active2, 0x400L);
case 82:
- if ((active1 & 0x8000L) != 0L)
+ if ((active1 & 0x200L) != 0L)
{
- jjmatchedKind = 79;
+ jjmatchedKind = 73;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x200000200000L, active1, 0x1003c1000007001cL, active2, 0L, active3, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x200000200000L, active1, 0x400f0400001c00L, active2, 0L);
case 83:
- if ((active1 & 0x400000000L) != 0L)
+ if ((active1 & 0x10000000L) != 0L)
{
- jjmatchedKind = 98;
+ jjmatchedKind = 92;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x802880000L, active1, 0x30000000L, active2, 0x40L, active3, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x802880000L, active1, 0xc00000L, active2, 0x1L);
case 84:
if ((active0 & 0x10000000000000L) != 0L)
{
jjmatchedKind = 52;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x820000000000L, active1, 0x80000L, active2, 0x1120020L, active3, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x820000000000L, active1, 0x8000000000002000L, active2, 0x44800L);
case 85:
- return jjMoveStringLiteralDfa3_0(active0, 0x400000000000000L, active1, 0x20002000800100L, active2, 0x8L, active3, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x400000000000000L, active1, 0x2000800080020004L, active2, 0L);
case 86:
- return jjMoveStringLiteralDfa3_0(active0, 0x80000000000000L, active1, 0L, active2, 0x8000L, active3, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x80000000000000L, active1, 0L, active2, 0x200L);
case 87:
- if ((active1 & 0x400000000000000L) != 0L)
+ if ((active1 & 0x10000000000000L) != 0L)
{
- jjmatchedKind = 122;
+ jjmatchedKind = 116;
jjmatchedPos = 2;
}
break;
@@ -591,39 +579,39 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
}
break;
case 89:
- if ((active1 & 0x10000000000000L) != 0L)
+ if ((active1 & 0x400000000000L) != 0L)
{
- jjmatchedKind = 116;
+ jjmatchedKind = 110;
jjmatchedPos = 2;
}
break;
case 97:
- return jjMoveStringLiteralDfa3_0(active0, 0x10000000000L, active1, 0xc0040c0000000200L, active2, 0x807L, active3, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x10000000000L, active1, 0x1f00103000000008L, active2, 0x20L);
case 98:
- return jjMoveStringLiteralDfa3_0(active0, 0x1000000000000L, active1, 0x8002000000L, active2, 0L, active3, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x1000000000000L, active1, 0x200080000L, active2, 0L);
case 99:
if ((active0 & 0x400000000L) != 0L)
{
jjmatchedKind = 34;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x80100000000000L, active2, 0L, active3, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x2004000000000L, active2, 0L);
case 100:
if ((active0 & 0x8000000000L) != 0L)
{
jjmatchedKind = 39;
jjmatchedPos = 2;
}
- else if ((active2 & 0x4000L) != 0L)
+ else if ((active2 & 0x100L) != 0L)
{
- jjmatchedKind = 142;
+ jjmatchedKind = 136;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x8000000241000000L, active1, 0x3L, active2, 0L, active3, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x241000000L, active1, 0L, active2, 0L);
case 101:
- return jjMoveStringLiteralDfa3_0(active0, 0x2004000100000L, active1, 0L, active2, 0x3000L, active3, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x2004000100000L, active1, 0L, active2, 0xc0L);
case 102:
- return jjMoveStringLiteralDfa3_0(active0, 0x20000000L, active1, 0L, active2, 0x400000L, active3, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x20000000L, active1, 0L, active2, 0x10000L);
case 103:
if ((active0 & 0x200000000000000L) != 0L)
{
@@ -635,21 +623,21 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
jjmatchedKind = 62;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x40000000L, active2, 0L, active3, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x1000000L, active2, 0L);
case 105:
- if ((active1 & 0x2000L) != 0L)
+ if ((active1 & 0x80L) != 0L)
{
- jjmatchedKind = 77;
+ jjmatchedKind = 71;
jjmatchedPos = 2;
}
- else if ((active1 & 0x4000L) != 0L)
+ else if ((active1 & 0x100L) != 0L)
{
- jjmatchedKind = 78;
+ jjmatchedKind = 72;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x8440000000000L, active1, 0x800000801000000L, active2, 0x2000000L, active3, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x8440000000000L, active1, 0x20000020040000L, active2, 0x80000L);
case 106:
- return jjMoveStringLiteralDfa3_0(active0, 0x4000000000000L, active1, 0L, active2, 0L, active3, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x4000000000000L, active1, 0L, active2, 0L);
case 107:
if ((active0 & 0x8000000L) != 0L)
{
@@ -658,59 +646,59 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
}
break;
case 108:
- if ((active2 & 0x800000L) != 0L)
+ if ((active2 & 0x20000L) != 0L)
{
- jjmatchedKind = 151;
+ jjmatchedKind = 145;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x100400000L, active1, 0x4000080L, active2, 0x40090L, active3, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x100400000L, active1, 0x4000000000100002L, active2, 0x1002L);
case 109:
if ((active0 & 0x2000000000000000L) != 0L)
{
jjmatchedKind = 61;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x1010000000L, active1, 0x100000180000020L, active2, 0L, active3, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x8000001010000000L, active1, 0x4000006000000L, active2, 0L);
case 110:
if ((active0 & 0x800000000000000L) != 0L)
{
jjmatchedKind = 59;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x180004000000L, active1, 0x48204208700000L, active2, 0L, active3, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x180004000000L, active1, 0x120810821c000L, active2, 0L);
case 111:
- return jjMoveStringLiteralDfa3_0(active0, 0x40002000000000L, active1, 0x1000001040L, active2, 0x80000L, active3, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x40002000000000L, active1, 0x40000041L, active2, 0x2000L);
case 112:
- return jjMoveStringLiteralDfa3_0(active0, 0x100000000000000L, active1, 0x20000000000L, active2, 0x10000L, active3, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x100000000000000L, active1, 0x800000000L, active2, 0x400L);
case 114:
- if ((active1 & 0x8000L) != 0L)
+ if ((active1 & 0x200L) != 0L)
{
- jjmatchedKind = 79;
+ jjmatchedKind = 73;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x200000200000L, active1, 0x1003c1000007001cL, active2, 0L, active3, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x200000200000L, active1, 0x400f0400001c00L, active2, 0L);
case 115:
- if ((active1 & 0x400000000L) != 0L)
+ if ((active1 & 0x10000000L) != 0L)
{
- jjmatchedKind = 98;
+ jjmatchedKind = 92;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x802880000L, active1, 0x30000000L, active2, 0x40L, active3, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x802880000L, active1, 0xc00000L, active2, 0x1L);
case 116:
if ((active0 & 0x10000000000000L) != 0L)
{
jjmatchedKind = 52;
jjmatchedPos = 2;
}
- return jjMoveStringLiteralDfa3_0(active0, 0x820000000000L, active1, 0x80000L, active2, 0x1120020L, active3, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x820000000000L, active1, 0x8000000000002000L, active2, 0x44800L);
case 117:
- return jjMoveStringLiteralDfa3_0(active0, 0x400000000000000L, active1, 0x20002000800100L, active2, 0x8L, active3, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x400000000000000L, active1, 0x2000800080020004L, active2, 0L);
case 118:
- return jjMoveStringLiteralDfa3_0(active0, 0x80000000000000L, active1, 0L, active2, 0x8000L, active3, 0L);
+ return jjMoveStringLiteralDfa3_0(active0, 0x80000000000000L, active1, 0L, active2, 0x200L);
case 119:
- if ((active1 & 0x400000000000000L) != 0L)
+ if ((active1 & 0x10000000000000L) != 0L)
{
- jjmatchedKind = 122;
+ jjmatchedKind = 116;
jjmatchedPos = 2;
}
break;
@@ -722,9 +710,9 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
}
break;
case 121:
- if ((active1 & 0x10000000000000L) != 0L)
+ if ((active1 & 0x400000000000L) != 0L)
{
- jjmatchedKind = 116;
+ jjmatchedKind = 110;
jjmatchedPos = 2;
}
break;
@@ -733,8 +721,8 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
}
return jjMoveNfa_0(0, 2);
}
-private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long active1, long old2, long active2, long old3, long active3){
- if (((active0 &= old0) | (active1 &= old1) | (active2 &= old2) | (active3 &= old3)) == 0L)
+private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long active1, long old2, long active2){
+ if (((active0 &= old0) | (active1 &= old1) | (active2 &= old2)) == 0L)
return jjMoveNfa_0(0, 2);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
@@ -743,105 +731,105 @@ private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long a
switch(curChar)
{
case 49:
- if ((active1 & 0x4000000000000000L) != 0L)
+ if ((active1 & 0x100000000000000L) != 0L)
{
- jjmatchedKind = 126;
+ jjmatchedKind = 120;
jjmatchedPos = 3;
}
break;
case 50:
- return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x8000000000000000L, active2, 0x1L);
+ return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x600000000000000L, active2, 0L);
case 51:
- return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0L, active2, 0x2L);
+ return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x800000000000000L, active2, 0L);
case 53:
- return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0L, active2, 0x4L);
+ return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x1000000000000000L, active2, 0L);
case 65:
- if ((active2 & 0x20L) != 0L)
+ if ((active1 & 0x8000000000000000L) != 0L)
{
- jjmatchedKind = 133;
+ jjmatchedKind = 127;
jjmatchedPos = 3;
}
- else if ((active2 & 0x20000L) != 0L)
+ else if ((active2 & 0x800L) != 0L)
{
- jjmatchedKind = 145;
+ jjmatchedKind = 139;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x100000000000000L, active1, 0x2000000080000L, active2, 0x403000L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x100000000000000L, active1, 0x80000002000L, active2, 0x100c0L);
case 66:
- return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x1000000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x40000000000L, active2, 0L);
case 67:
if ((active0 & 0x800000000L) != 0L)
{
jjmatchedKind = 35;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x2000000L, active1, 0x4000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x2000000L, active1, 0x100000000L, active2, 0L);
case 68:
if ((active0 & 0x100000000000L) != 0L)
{
jjmatchedKind = 44;
jjmatchedPos = 3;
}
- else if ((active1 & 0x200000000L) != 0L)
+ else if ((active1 & 0x8000000L) != 0L)
{
- jjmatchedKind = 97;
+ jjmatchedKind = 91;
jjmatchedPos = 3;
}
- else if ((active1 & 0x800000000000000L) != 0L)
+ else if ((active1 & 0x20000000000000L) != 0L)
{
- jjmatchedKind = 123;
+ jjmatchedKind = 117;
jjmatchedPos = 3;
}
- else if ((active2 & 0x800L) != 0L)
+ else if ((active2 & 0x20L) != 0L)
{
- jjmatchedKind = 139;
+ jjmatchedKind = 133;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x2000000000000L, active1, 0x41000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x2000000000000L, active1, 0x1040L, active2, 0L);
case 69:
if ((active0 & 0x80000L) != 0L)
{
jjmatchedKind = 19;
jjmatchedPos = 3;
}
- else if ((active2 & 0x8L) != 0L)
+ else if ((active1 & 0x2000000000000000L) != 0L)
{
- jjmatchedKind = 131;
+ jjmatchedKind = 125;
jjmatchedPos = 3;
}
- else if ((active2 & 0x8000L) != 0L)
+ else if ((active2 & 0x200L) != 0L)
{
- jjmatchedKind = 143;
+ jjmatchedKind = 137;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x8004001240400000L, active1, 0x1008001c0000003L, active2, 0x400c0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x4001240400000L, active1, 0x4020007000000L, active2, 0x1003L);
case 70:
return jjMoveStringLiteralDfa4_0(active0, 0x100000L, active1, 0L, active2, 0L);
case 71:
- if ((active1 & 0x100000L) != 0L)
+ if ((active1 & 0x4000L) != 0L)
{
- jjmatchedKind = 84;
+ jjmatchedKind = 78;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x600000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x18000L, active2, 0L);
case 72:
- if ((active2 & 0x1000000L) != 0L)
+ if ((active2 & 0x40000L) != 0L)
{
- jjmatchedKind = 152;
+ jjmatchedKind = 146;
jjmatchedPos = 3;
}
break;
case 73:
- return jjMoveStringLiteralDfa4_0(active0, 0x80020010000000L, active1, 0x4000004L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x80020010000000L, active1, 0x100000L, active2, 0L);
case 74:
return jjMoveStringLiteralDfa4_0(active0, 0x1000000000000L, active1, 0L, active2, 0L);
case 76:
- if ((active1 & 0x800000000L) != 0L)
+ if ((active1 & 0x20000000L) != 0L)
{
- jjmatchedKind = 99;
+ jjmatchedKind = 93;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x30032030200L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0xc00c80c08L, active2, 0L);
case 77:
if ((active0 & 0x2000000000L) != 0L)
{
@@ -850,132 +838,130 @@ private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long a
}
break;
case 78:
- return jjMoveStringLiteralDfa4_0(active0, 0x400000000000000L, active1, 0x2000000100L, active2, 0x2000000L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x400000000000000L, active1, 0x80000004L, active2, 0x80000L);
case 79:
- if ((active2 & 0x100000L) != 0L)
+ if ((active2 & 0x4000L) != 0L)
{
- jjmatchedKind = 148;
+ jjmatchedKind = 142;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x40000000000L, active1, 0x80101000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x40000000000L, active1, 0x2004040000000L, active2, 0L);
case 80:
- if ((active2 & 0x80000L) != 0L)
+ if ((active2 & 0x2000L) != 0L)
{
- jjmatchedKind = 147;
+ jjmatchedKind = 141;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x410000000000L, active1, 0x20L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x8000410000000000L, active1, 0L, active2, 0L);
case 82:
- if ((active1 & 0x4000000000000L) != 0L)
+ if ((active1 & 0x100000000000L) != 0L)
{
- jjmatchedKind = 114;
+ jjmatchedKind = 108;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x804000000000L, active1, 0x20000001800000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x804000000000L, active1, 0x800000060000L, active2, 0L);
case 83:
- return jjMoveStringLiteralDfa4_0(active0, 0x8000024200000L, active1, 0x4c8000000000L, active2, 0x10L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x8000024200000L, active1, 0x4000013200000000L, active2, 0L);
case 84:
- return jjMoveStringLiteralDfa4_0(active0, 0x800000L, active1, 0x8200000000080L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x800000L, active1, 0x208000000002L, active2, 0L);
case 85:
- return jjMoveStringLiteralDfa4_0(active0, 0x40080101000000L, active1, 0x1040000008000040L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x40080101000000L, active1, 0x41000000200001L, active2, 0L);
case 86:
return jjMoveStringLiteralDfa4_0(active0, 0x200000000000L, active1, 0L, active2, 0L);
case 89:
- if ((active2 & 0x10000L) != 0L)
+ if ((active2 & 0x400L) != 0L)
{
- jjmatchedKind = 144;
+ jjmatchedKind = 138;
jjmatchedPos = 3;
}
break;
- case 95:
- return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x18L, active2, 0L);
case 97:
- if ((active2 & 0x20L) != 0L)
+ if ((active1 & 0x8000000000000000L) != 0L)
{
- jjmatchedKind = 133;
+ jjmatchedKind = 127;
jjmatchedPos = 3;
}
- else if ((active2 & 0x20000L) != 0L)
+ else if ((active2 & 0x800L) != 0L)
{
- jjmatchedKind = 145;
+ jjmatchedKind = 139;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x100000000000000L, active1, 0x2000000080000L, active2, 0x403000L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x100000000000000L, active1, 0x80000002000L, active2, 0x100c0L);
case 98:
- return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x1000000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x40000000000L, active2, 0L);
case 99:
if ((active0 & 0x800000000L) != 0L)
{
jjmatchedKind = 35;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x2000000L, active1, 0x4000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x2000000L, active1, 0x100000000L, active2, 0L);
case 100:
if ((active0 & 0x100000000000L) != 0L)
{
jjmatchedKind = 44;
jjmatchedPos = 3;
}
- else if ((active1 & 0x200000000L) != 0L)
+ else if ((active1 & 0x8000000L) != 0L)
{
- jjmatchedKind = 97;
+ jjmatchedKind = 91;
jjmatchedPos = 3;
}
- else if ((active1 & 0x800000000000000L) != 0L)
+ else if ((active1 & 0x20000000000000L) != 0L)
{
- jjmatchedKind = 123;
+ jjmatchedKind = 117;
jjmatchedPos = 3;
}
- else if ((active2 & 0x800L) != 0L)
+ else if ((active2 & 0x20L) != 0L)
{
- jjmatchedKind = 139;
+ jjmatchedKind = 133;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x2000000000000L, active1, 0x41000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x2000000000000L, active1, 0x1040L, active2, 0L);
case 101:
if ((active0 & 0x80000L) != 0L)
{
jjmatchedKind = 19;
jjmatchedPos = 3;
}
- else if ((active2 & 0x8L) != 0L)
+ else if ((active1 & 0x2000000000000000L) != 0L)
{
- jjmatchedKind = 131;
+ jjmatchedKind = 125;
jjmatchedPos = 3;
}
- else if ((active2 & 0x8000L) != 0L)
+ else if ((active2 & 0x200L) != 0L)
{
- jjmatchedKind = 143;
+ jjmatchedKind = 137;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x8004001240400000L, active1, 0x1008001c0000003L, active2, 0x400c0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x4001240400000L, active1, 0x4020007000000L, active2, 0x1003L);
case 102:
return jjMoveStringLiteralDfa4_0(active0, 0x100000L, active1, 0L, active2, 0L);
case 103:
- if ((active1 & 0x100000L) != 0L)
+ if ((active1 & 0x4000L) != 0L)
{
- jjmatchedKind = 84;
+ jjmatchedKind = 78;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x600000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x18000L, active2, 0L);
case 104:
- if ((active2 & 0x1000000L) != 0L)
+ if ((active2 & 0x40000L) != 0L)
{
- jjmatchedKind = 152;
+ jjmatchedKind = 146;
jjmatchedPos = 3;
}
break;
case 105:
- return jjMoveStringLiteralDfa4_0(active0, 0x80020010000000L, active1, 0x4000004L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x80020010000000L, active1, 0x100000L, active2, 0L);
case 106:
return jjMoveStringLiteralDfa4_0(active0, 0x1000000000000L, active1, 0L, active2, 0L);
case 108:
- if ((active1 & 0x800000000L) != 0L)
+ if ((active1 & 0x20000000L) != 0L)
{
- jjmatchedKind = 99;
+ jjmatchedKind = 93;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x30032030200L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0xc00c80c08L, active2, 0L);
case 109:
if ((active0 & 0x2000000000L) != 0L)
{
@@ -984,40 +970,40 @@ private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long a
}
break;
case 110:
- return jjMoveStringLiteralDfa4_0(active0, 0x400000000000000L, active1, 0x2000000100L, active2, 0x2000000L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x400000000000000L, active1, 0x80000004L, active2, 0x80000L);
case 111:
- if ((active2 & 0x100000L) != 0L)
+ if ((active2 & 0x4000L) != 0L)
{
- jjmatchedKind = 148;
+ jjmatchedKind = 142;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x40000000000L, active1, 0x80101000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x40000000000L, active1, 0x2004040000000L, active2, 0L);
case 112:
- if ((active2 & 0x80000L) != 0L)
+ if ((active2 & 0x2000L) != 0L)
{
- jjmatchedKind = 147;
+ jjmatchedKind = 141;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x410000000000L, active1, 0x20L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x8000410000000000L, active1, 0L, active2, 0L);
case 114:
- if ((active1 & 0x4000000000000L) != 0L)
+ if ((active1 & 0x100000000000L) != 0L)
{
- jjmatchedKind = 114;
+ jjmatchedKind = 108;
jjmatchedPos = 3;
}
- return jjMoveStringLiteralDfa4_0(active0, 0x804000000000L, active1, 0x20000001800000L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x804000000000L, active1, 0x800000060000L, active2, 0L);
case 115:
- return jjMoveStringLiteralDfa4_0(active0, 0x8000024200000L, active1, 0x4c8000000000L, active2, 0x10L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x8000024200000L, active1, 0x4000013200000000L, active2, 0L);
case 116:
- return jjMoveStringLiteralDfa4_0(active0, 0x800000L, active1, 0x8200000000080L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x800000L, active1, 0x208000000002L, active2, 0L);
case 117:
- return jjMoveStringLiteralDfa4_0(active0, 0x40080101000000L, active1, 0x1040000008000040L, active2, 0L);
+ return jjMoveStringLiteralDfa4_0(active0, 0x40080101000000L, active1, 0x41000000200001L, active2, 0L);
case 118:
return jjMoveStringLiteralDfa4_0(active0, 0x200000000000L, active1, 0L, active2, 0L);
case 121:
- if ((active2 & 0x10000L) != 0L)
+ if ((active2 & 0x400L) != 0L)
{
- jjmatchedKind = 144;
+ jjmatchedKind = 138;
jjmatchedPos = 3;
}
break;
@@ -1036,15 +1022,15 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a
switch(curChar)
{
case 49:
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0L, active2, 0x4L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x1000000000000000L, active2, 0L);
case 50:
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x8000000000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x200000000000000L, active2, 0L);
case 53:
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0L, active2, 0x1L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x400000000000000L, active2, 0L);
case 56:
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0L, active2, 0x2L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x800000000000000L, active2, 0L);
case 65:
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x224032030004L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x8900c80c00L, active2, 0L);
case 67:
return jjMoveStringLiteralDfa5_0(active0, 0x4000001400000L, active1, 0L, active2, 0L);
case 68:
@@ -1053,55 +1039,55 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a
jjmatchedKind = 36;
jjmatchedPos = 4;
}
- else if ((active1 & 0x100L) != 0L)
+ else if ((active1 & 0x4L) != 0L)
{
- jjmatchedKind = 72;
+ jjmatchedKind = 66;
jjmatchedPos = 4;
}
- else if ((active1 & 0x2000000000L) != 0L)
+ else if ((active1 & 0x80000000L) != 0L)
{
- jjmatchedKind = 101;
+ jjmatchedKind = 95;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x100000400000L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x4000010000L, active2, 0L);
case 69:
if ((active0 & 0x4000000000L) != 0L)
{
jjmatchedKind = 38;
jjmatchedPos = 4;
}
- else if ((active1 & 0x1000L) != 0L)
+ else if ((active1 & 0x40L) != 0L)
{
- jjmatchedKind = 76;
+ jjmatchedKind = 70;
jjmatchedPos = 4;
}
- else if ((active1 & 0x40000000000L) != 0L)
+ else if ((active1 & 0x1000000000L) != 0L)
{
- jjmatchedKind = 106;
+ jjmatchedKind = 100;
jjmatchedPos = 4;
}
- else if ((active1 & 0x80000000000L) != 0L)
+ else if ((active1 & 0x2000000000L) != 0L)
{
- jjmatchedKind = 107;
+ jjmatchedKind = 101;
jjmatchedPos = 4;
}
- else if ((active2 & 0x10L) != 0L)
+ else if ((active1 & 0x4000000000000000L) != 0L)
{
- jjmatchedKind = 132;
+ jjmatchedKind = 126;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0x1000120000000L, active1, 0x1010000000280L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x1000120000000L, active1, 0x4040000000aL, active2, 0L);
case 70:
if ((active0 & 0x200000000L) != 0L)
{
jjmatchedKind = 33;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x2000000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x80000000000L, active2, 0L);
case 71:
- if ((active2 & 0x2000000L) != 0L)
+ if ((active2 & 0x80000L) != 0L)
{
- jjmatchedKind = 153;
+ jjmatchedKind = 147;
jjmatchedPos = 4;
}
break;
@@ -1111,35 +1097,35 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a
jjmatchedKind = 40;
jjmatchedPos = 4;
}
- else if ((active1 & 0x8000000000000L) != 0L)
+ else if ((active1 & 0x200000000000L) != 0L)
{
- jjmatchedKind = 115;
+ jjmatchedKind = 109;
jjmatchedPos = 4;
}
break;
case 73:
- if ((active1 & 0x800000L) != 0L)
+ if ((active1 & 0x20000L) != 0L)
{
- jjmatchedKind = 87;
+ jjmatchedKind = 81;
jjmatchedPos = 4;
}
- else if ((active1 & 0x1000000L) != 0L)
+ else if ((active1 & 0x40000L) != 0L)
{
- jjmatchedKind = 88;
+ jjmatchedKind = 82;
jjmatchedPos = 4;
}
return jjMoveStringLiteralDfa5_0(active0, 0x2a00000b00000L, active1, 0L, active2, 0L);
case 76:
- return jjMoveStringLiteralDfa5_0(active0, 0x400000000000L, active1, 0x20L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x8000400000000000L, active1, 0L, active2, 0L);
case 77:
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x8200000L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x208000L, active2, 0L);
case 78:
if ((active0 & 0x40000000000L) != 0L)
{
jjmatchedKind = 42;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0x80000000000000L, active1, 0x80800000000000L, active2, 0x40000L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x80000000000000L, active1, 0x2020000000000L, active2, 0x1000L);
case 79:
return jjMoveStringLiteralDfa5_0(active0, 0x20000000000L, active1, 0L, active2, 0L);
case 80:
@@ -1148,36 +1134,36 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a
jjmatchedKind = 54;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x50L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x1L, active2, 0L);
case 82:
if ((active0 & 0x40000000L) != 0L)
{
jjmatchedKind = 30;
jjmatchedPos = 4;
}
- else if ((active1 & 0x1000000000L) != 0L)
+ else if ((active1 & 0x40000000L) != 0L)
{
- jjmatchedKind = 100;
+ jjmatchedKind = 94;
jjmatchedPos = 4;
}
- else if ((active2 & 0x1000L) != 0L)
+ else if ((active2 & 0x40L) != 0L)
{
- jjmatchedKind = 140;
+ jjmatchedKind = 134;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0x100000002000000L, active1, 0L, active2, 0x40L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x100000002000000L, active1, 0L, active2, 0x1L);
case 83:
if ((active0 & 0x80000000000L) != 0L)
{
jjmatchedKind = 43;
jjmatchedPos = 4;
}
- else if ((active1 & 0x20000000000000L) != 0L)
+ else if ((active1 & 0x800000000000L) != 0L)
{
- jjmatchedKind = 117;
+ jjmatchedKind = 111;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x8L, active2, 0L);
+ break;
case 84:
if ((active0 & 0x10000000L) != 0L)
{
@@ -1189,32 +1175,27 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a
jjmatchedKind = 58;
jjmatchedPos = 4;
}
- else if ((active1 & 0x40000L) != 0L)
+ else if ((active1 & 0x1000L) != 0L)
{
- jjmatchedKind = 82;
+ jjmatchedKind = 76;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0x8000004000000L, active1, 0x40408084080000L, active2, 0x2080L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x8000004000000L, active1, 0x1010202102000L, active2, 0x82L);
case 85:
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x1000000000000000L, active2, 0x400000L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x40000000000000L, active2, 0x10000L);
case 86:
- if ((active0 & 0x8000000000000000L) != 0L)
- {
- jjmatchedKind = 63;
- jjmatchedPos = 4;
- }
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x100000003L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x4000000L, active2, 0L);
case 88:
- if ((active1 & 0x40000000L) != 0L)
+ if ((active1 & 0x1000000L) != 0L)
{
- jjmatchedKind = 94;
+ jjmatchedKind = 88;
jjmatchedPos = 4;
}
break;
case 90:
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x100000000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x4000000000000L, active2, 0L);
case 97:
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x224032030004L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x8900c80c00L, active2, 0L);
case 99:
return jjMoveStringLiteralDfa5_0(active0, 0x4000001400000L, active1, 0L, active2, 0L);
case 100:
@@ -1223,55 +1204,55 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a
jjmatchedKind = 36;
jjmatchedPos = 4;
}
- else if ((active1 & 0x100L) != 0L)
+ else if ((active1 & 0x4L) != 0L)
{
- jjmatchedKind = 72;
+ jjmatchedKind = 66;
jjmatchedPos = 4;
}
- else if ((active1 & 0x2000000000L) != 0L)
+ else if ((active1 & 0x80000000L) != 0L)
{
- jjmatchedKind = 101;
+ jjmatchedKind = 95;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x100000400000L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x4000010000L, active2, 0L);
case 101:
if ((active0 & 0x4000000000L) != 0L)
{
jjmatchedKind = 38;
jjmatchedPos = 4;
}
- else if ((active1 & 0x1000L) != 0L)
+ else if ((active1 & 0x40L) != 0L)
{
- jjmatchedKind = 76;
+ jjmatchedKind = 70;
jjmatchedPos = 4;
}
- else if ((active1 & 0x40000000000L) != 0L)
+ else if ((active1 & 0x1000000000L) != 0L)
{
- jjmatchedKind = 106;
+ jjmatchedKind = 100;
jjmatchedPos = 4;
}
- else if ((active1 & 0x80000000000L) != 0L)
+ else if ((active1 & 0x2000000000L) != 0L)
{
- jjmatchedKind = 107;
+ jjmatchedKind = 101;
jjmatchedPos = 4;
}
- else if ((active2 & 0x10L) != 0L)
+ else if ((active1 & 0x4000000000000000L) != 0L)
{
- jjmatchedKind = 132;
+ jjmatchedKind = 126;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0x1000120000000L, active1, 0x1010000000280L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x1000120000000L, active1, 0x4040000000aL, active2, 0L);
case 102:
if ((active0 & 0x200000000L) != 0L)
{
jjmatchedKind = 33;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x2000000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x80000000000L, active2, 0L);
case 103:
- if ((active2 & 0x2000000L) != 0L)
+ if ((active2 & 0x80000L) != 0L)
{
- jjmatchedKind = 153;
+ jjmatchedKind = 147;
jjmatchedPos = 4;
}
break;
@@ -1281,35 +1262,35 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a
jjmatchedKind = 40;
jjmatchedPos = 4;
}
- else if ((active1 & 0x8000000000000L) != 0L)
+ else if ((active1 & 0x200000000000L) != 0L)
{
- jjmatchedKind = 115;
+ jjmatchedKind = 109;
jjmatchedPos = 4;
}
break;
case 105:
- if ((active1 & 0x800000L) != 0L)
+ if ((active1 & 0x20000L) != 0L)
{
- jjmatchedKind = 87;
+ jjmatchedKind = 81;
jjmatchedPos = 4;
}
- else if ((active1 & 0x1000000L) != 0L)
+ else if ((active1 & 0x40000L) != 0L)
{
- jjmatchedKind = 88;
+ jjmatchedKind = 82;
jjmatchedPos = 4;
}
return jjMoveStringLiteralDfa5_0(active0, 0x2a00000b00000L, active1, 0L, active2, 0L);
case 108:
- return jjMoveStringLiteralDfa5_0(active0, 0x400000000000L, active1, 0x20L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x8000400000000000L, active1, 0L, active2, 0L);
case 109:
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x8200000L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x208000L, active2, 0L);
case 110:
if ((active0 & 0x40000000000L) != 0L)
{
jjmatchedKind = 42;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0x80000000000000L, active1, 0x80800000000000L, active2, 0x40000L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x80000000000000L, active1, 0x2020000000000L, active2, 0x1000L);
case 111:
return jjMoveStringLiteralDfa5_0(active0, 0x20000000000L, active1, 0L, active2, 0L);
case 112:
@@ -1318,36 +1299,36 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a
jjmatchedKind = 54;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x50L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x1L, active2, 0L);
case 114:
if ((active0 & 0x40000000L) != 0L)
{
jjmatchedKind = 30;
jjmatchedPos = 4;
}
- else if ((active1 & 0x1000000000L) != 0L)
+ else if ((active1 & 0x40000000L) != 0L)
{
- jjmatchedKind = 100;
+ jjmatchedKind = 94;
jjmatchedPos = 4;
}
- else if ((active2 & 0x1000L) != 0L)
+ else if ((active2 & 0x40L) != 0L)
{
- jjmatchedKind = 140;
+ jjmatchedKind = 134;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0x100000002000000L, active1, 0L, active2, 0x40L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x100000002000000L, active1, 0L, active2, 0x1L);
case 115:
if ((active0 & 0x80000000000L) != 0L)
{
jjmatchedKind = 43;
jjmatchedPos = 4;
}
- else if ((active1 & 0x20000000000000L) != 0L)
+ else if ((active1 & 0x800000000000L) != 0L)
{
- jjmatchedKind = 117;
+ jjmatchedKind = 111;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x8L, active2, 0L);
+ break;
case 116:
if ((active0 & 0x10000000L) != 0L)
{
@@ -1359,30 +1340,25 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a
jjmatchedKind = 58;
jjmatchedPos = 4;
}
- else if ((active1 & 0x40000L) != 0L)
+ else if ((active1 & 0x1000L) != 0L)
{
- jjmatchedKind = 82;
+ jjmatchedKind = 76;
jjmatchedPos = 4;
}
- return jjMoveStringLiteralDfa5_0(active0, 0x8000004000000L, active1, 0x40408084080000L, active2, 0x2080L);
+ return jjMoveStringLiteralDfa5_0(active0, 0x8000004000000L, active1, 0x1010202102000L, active2, 0x82L);
case 117:
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x1000000000000000L, active2, 0x400000L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x40000000000000L, active2, 0x10000L);
case 118:
- if ((active0 & 0x8000000000000000L) != 0L)
- {
- jjmatchedKind = 63;
- jjmatchedPos = 4;
- }
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x100000003L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x4000000L, active2, 0L);
case 120:
- if ((active1 & 0x40000000L) != 0L)
+ if ((active1 & 0x1000000L) != 0L)
{
- jjmatchedKind = 94;
+ jjmatchedKind = 88;
jjmatchedPos = 4;
}
break;
case 122:
- return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x100000000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x4000000000000L, active2, 0L);
default :
break;
}
@@ -1398,61 +1374,61 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a
switch(curChar)
{
case 50:
- if ((active2 & 0x4L) != 0L)
+ if ((active1 & 0x1000000000000000L) != 0L)
{
- jjmatchedKind = 130;
+ jjmatchedKind = 124;
jjmatchedPos = 5;
}
break;
case 52:
- if ((active1 & 0x8000000000000000L) != 0L)
+ if ((active1 & 0x200000000000000L) != 0L)
{
- jjmatchedKind = 127;
+ jjmatchedKind = 121;
jjmatchedPos = 5;
}
- else if ((active2 & 0x2L) != 0L)
+ else if ((active1 & 0x800000000000000L) != 0L)
{
- jjmatchedKind = 129;
+ jjmatchedKind = 123;
jjmatchedPos = 5;
}
break;
case 54:
- if ((active2 & 0x1L) != 0L)
+ if ((active1 & 0x400000000000000L) != 0L)
{
- jjmatchedKind = 128;
+ jjmatchedKind = 122;
jjmatchedPos = 5;
}
break;
case 65:
- return jjMoveStringLiteralDfa6_0(active0, 0x100000000000000L, active1, 0x400100200008L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x100000000000000L, active1, 0x10004008000L, active2, 0L);
case 67:
- return jjMoveStringLiteralDfa6_0(active0, 0x3200000000000L, active1, 0x20000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x3200000000000L, active1, 0x800000000L, active2, 0L);
case 68:
- return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x80800000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x2020000000000L, active2, 0L);
case 69:
if ((active0 & 0x400000000000L) != 0L)
{
jjmatchedKind = 46;
jjmatchedPos = 5;
}
- else if ((active1 & 0x20L) != 0L)
+ else if ((active0 & 0x8000000000000000L) != 0L)
{
- jjmatchedKind = 69;
+ jjmatchedKind = 63;
jjmatchedPos = 5;
}
- else if ((active2 & 0x80L) != 0L)
+ else if ((active2 & 0x2L) != 0L)
{
- jjmatchedKind = 135;
+ jjmatchedKind = 129;
jjmatchedPos = 5;
}
- else if ((active2 & 0x2000L) != 0L)
+ else if ((active2 & 0x80L) != 0L)
{
- jjmatchedKind = 141;
+ jjmatchedKind = 135;
jjmatchedPos = 5;
}
- return jjMoveStringLiteralDfa6_0(active0, 0x1000000L, active1, 0x4010008c000000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x1000000L, active1, 0x1004002300000L, active2, 0L);
case 70:
- return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x1000000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x40000000000L, active2, 0L);
case 71:
if ((active0 & 0x80000000000000L) != 0L)
{
@@ -1461,29 +1437,29 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a
}
break;
case 73:
- return jjMoveStringLiteralDfa6_0(active0, 0x2000000L, active1, 0x1000200000400000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x2000000L, active1, 0x40008000010000L, active2, 0L);
case 76:
- return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0L, active2, 0x400000L);
+ return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0L, active2, 0x10000L);
case 78:
- if ((active1 & 0x10000000000L) != 0L)
+ if ((active1 & 0x400000000L) != 0L)
{
- jjmatchedKind = 104;
+ jjmatchedKind = 98;
jjmatchedPos = 5;
}
- return jjMoveStringLiteralDfa6_0(active0, 0x20000800000L, active1, 0x32030004L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x20000800000L, active1, 0xc80c00L, active2, 0L);
case 79:
- return jjMoveStringLiteralDfa6_0(active0, 0x200000L, active1, 0x100000000000010L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x200000L, active1, 0x4000000000000L, active2, 0L);
case 80:
return jjMoveStringLiteralDfa6_0(active0, 0x800000000000L, active1, 0L, active2, 0L);
case 82:
- if ((active1 & 0x80L) != 0L)
+ if ((active1 & 0x2L) != 0L)
{
- jjmatchedKind = 71;
+ jjmatchedKind = 65;
jjmatchedPos = 5;
}
- else if ((active1 & 0x8000000000L) != 0L)
+ else if ((active1 & 0x200000000L) != 0L)
{
- jjmatchedKind = 103;
+ jjmatchedKind = 97;
jjmatchedPos = 5;
}
return jjMoveStringLiteralDfa6_0(active0, 0x4000000L, active1, 0L, active2, 0L);
@@ -1498,7 +1474,7 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a
jjmatchedKind = 51;
jjmatchedPos = 5;
}
- return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x200L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x8L, active2, 0L);
case 84:
if ((active0 & 0x400000L) != 0L)
{
@@ -1515,22 +1491,22 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a
jjmatchedKind = 50;
jjmatchedPos = 5;
}
- else if ((active1 & 0x4000000000L) != 0L)
+ else if ((active1 & 0x100000000L) != 0L)
{
- jjmatchedKind = 102;
+ jjmatchedKind = 96;
jjmatchedPos = 5;
}
- else if ((active2 & 0x40L) != 0L)
+ else if ((active2 & 0x1L) != 0L)
{
- jjmatchedKind = 134;
+ jjmatchedKind = 128;
jjmatchedPos = 5;
}
- else if ((active2 & 0x40000L) != 0L)
+ else if ((active2 & 0x1000L) != 0L)
{
- jjmatchedKind = 146;
+ jjmatchedKind = 140;
jjmatchedPos = 5;
}
- return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x2000000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x80000000000L, active2, 0L);
case 88:
if ((active0 & 0x100000L) != 0L)
{
@@ -1539,39 +1515,39 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a
}
break;
case 89:
- return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x80000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x2000L, active2, 0L);
case 95:
- return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x43L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x1L, active2, 0L);
case 97:
- return jjMoveStringLiteralDfa6_0(active0, 0x100000000000000L, active1, 0x400100200008L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x100000000000000L, active1, 0x10004008000L, active2, 0L);
case 99:
- return jjMoveStringLiteralDfa6_0(active0, 0x3200000000000L, active1, 0x20000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x3200000000000L, active1, 0x800000000L, active2, 0L);
case 100:
- return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x80800000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x2020000000000L, active2, 0L);
case 101:
if ((active0 & 0x400000000000L) != 0L)
{
jjmatchedKind = 46;
jjmatchedPos = 5;
}
- else if ((active1 & 0x20L) != 0L)
+ else if ((active0 & 0x8000000000000000L) != 0L)
{
- jjmatchedKind = 69;
+ jjmatchedKind = 63;
jjmatchedPos = 5;
}
- else if ((active2 & 0x80L) != 0L)
+ else if ((active2 & 0x2L) != 0L)
{
- jjmatchedKind = 135;
+ jjmatchedKind = 129;
jjmatchedPos = 5;
}
- else if ((active2 & 0x2000L) != 0L)
+ else if ((active2 & 0x80L) != 0L)
{
- jjmatchedKind = 141;
+ jjmatchedKind = 135;
jjmatchedPos = 5;
}
- return jjMoveStringLiteralDfa6_0(active0, 0x1000000L, active1, 0x4010008c000000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x1000000L, active1, 0x1004002300000L, active2, 0L);
case 102:
- return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x1000000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x40000000000L, active2, 0L);
case 103:
if ((active0 & 0x80000000000000L) != 0L)
{
@@ -1580,29 +1556,29 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a
}
break;
case 105:
- return jjMoveStringLiteralDfa6_0(active0, 0x2000000L, active1, 0x1000200000400000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x2000000L, active1, 0x40008000010000L, active2, 0L);
case 108:
- return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0L, active2, 0x400000L);
+ return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0L, active2, 0x10000L);
case 110:
- if ((active1 & 0x10000000000L) != 0L)
+ if ((active1 & 0x400000000L) != 0L)
{
- jjmatchedKind = 104;
+ jjmatchedKind = 98;
jjmatchedPos = 5;
}
- return jjMoveStringLiteralDfa6_0(active0, 0x20000800000L, active1, 0x32030004L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x20000800000L, active1, 0xc80c00L, active2, 0L);
case 111:
- return jjMoveStringLiteralDfa6_0(active0, 0x200000L, active1, 0x100000000000010L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0x200000L, active1, 0x4000000000000L, active2, 0L);
case 112:
return jjMoveStringLiteralDfa6_0(active0, 0x800000000000L, active1, 0L, active2, 0L);
case 114:
- if ((active1 & 0x80L) != 0L)
+ if ((active1 & 0x2L) != 0L)
{
- jjmatchedKind = 71;
+ jjmatchedKind = 65;
jjmatchedPos = 5;
}
- else if ((active1 & 0x8000000000L) != 0L)
+ else if ((active1 & 0x200000000L) != 0L)
{
- jjmatchedKind = 103;
+ jjmatchedKind = 97;
jjmatchedPos = 5;
}
return jjMoveStringLiteralDfa6_0(active0, 0x4000000L, active1, 0L, active2, 0L);
@@ -1617,7 +1593,7 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a
jjmatchedKind = 51;
jjmatchedPos = 5;
}
- return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x200L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x8L, active2, 0L);
case 116:
if ((active0 & 0x400000L) != 0L)
{
@@ -1634,22 +1610,22 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a
jjmatchedKind = 50;
jjmatchedPos = 5;
}
- else if ((active1 & 0x4000000000L) != 0L)
+ else if ((active1 & 0x100000000L) != 0L)
{
- jjmatchedKind = 102;
+ jjmatchedKind = 96;
jjmatchedPos = 5;
}
- else if ((active2 & 0x40L) != 0L)
+ else if ((active2 & 0x1L) != 0L)
{
- jjmatchedKind = 134;
+ jjmatchedKind = 128;
jjmatchedPos = 5;
}
- else if ((active2 & 0x40000L) != 0L)
+ else if ((active2 & 0x1000L) != 0L)
{
- jjmatchedKind = 146;
+ jjmatchedKind = 140;
jjmatchedPos = 5;
}
- return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x2000000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x80000000000L, active2, 0L);
case 120:
if ((active0 & 0x100000L) != 0L)
{
@@ -1658,7 +1634,7 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a
}
break;
case 121:
- return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x80000L, active2, 0L);
+ return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x2000L, active2, 0L);
default :
break;
}
@@ -1678,16 +1654,16 @@ private int jjMoveStringLiteralDfa6_0(long old0, long active0, long old1, long a
case 66:
return jjMoveStringLiteralDfa7_0(active0, 0x2000000L, active1, 0L, active2, 0L);
case 67:
- return jjMoveStringLiteralDfa7_0(active0, 0x800000L, active1, 0x244L, active2, 0L);
+ return jjMoveStringLiteralDfa7_0(active0, 0x800000L, active1, 0x9L, active2, 0L);
case 68:
if ((active0 & 0x1000000L) != 0L)
{
jjmatchedKind = 24;
jjmatchedPos = 6;
}
- else if ((active1 & 0x1000000000000000L) != 0L)
+ else if ((active1 & 0x40000000000000L) != 0L)
{
- jjmatchedKind = 124;
+ jjmatchedKind = 118;
jjmatchedPos = 6;
}
break;
@@ -1697,106 +1673,99 @@ private int jjMoveStringLiteralDfa6_0(long old0, long active0, long old1, long a
jjmatchedKind = 45;
jjmatchedPos = 6;
}
- else if ((active1 & 0x20000000000L) != 0L)
+ else if ((active1 & 0x800000000L) != 0L)
{
- jjmatchedKind = 105;
+ jjmatchedKind = 99;
jjmatchedPos = 6;
}
- return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x2000000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x80000000000L, active2, 0L);
case 71:
- if ((active1 & 0x10000L) != 0L)
+ if ((active1 & 0x400L) != 0L)
{
- jjmatchedKind = 80;
+ jjmatchedKind = 74;
jjmatchedPos = 6;
}
- else if ((active1 & 0x10000000L) != 0L)
+ else if ((active1 & 0x400000L) != 0L)
{
- jjmatchedKind = 92;
+ jjmatchedKind = 86;
jjmatchedPos = 6;
}
- return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x20020000L, active2, 0L);
+ return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x800800L, active2, 0L);
case 75:
- if ((active1 & 0x2000000L) != 0L)
+ if ((active1 & 0x80000L) != 0L)
{
- jjmatchedKind = 89;
+ jjmatchedKind = 83;
jjmatchedPos = 6;
}
break;
case 76:
- return jjMoveStringLiteralDfa7_0(active0, 0x800000000000L, active1, 0x100000000L, active2, 0L);
- case 77:
- return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x8L, active2, 0L);
+ return jjMoveStringLiteralDfa7_0(active0, 0x800000000000L, active1, 0x4000000L, active2, 0L);
case 78:
if ((active0 & 0x200000L) != 0L)
{
jjmatchedKind = 21;
jjmatchedPos = 6;
}
- return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x100200000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x4008000000000L, active2, 0L);
case 79:
- return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x1000000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x40000000000L, active2, 0L);
case 80:
- if ((active1 & 0x10L) != 0L)
- {
- jjmatchedKind = 68;
- jjmatchedPos = 6;
- }
- return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x80002L, active2, 0L);
+ return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x2000L, active2, 0L);
case 82:
- if ((active1 & 0x400000L) != 0L)
+ if ((active1 & 0x10000L) != 0L)
{
- jjmatchedKind = 86;
+ jjmatchedKind = 80;
jjmatchedPos = 6;
}
- return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x40008c000000L, active2, 0L);
+ return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x10002300000L, active2, 0L);
case 83:
- if ((active1 & 0x800000000000L) != 0L)
+ if ((active1 & 0x20000000000L) != 0L)
{
- jjmatchedKind = 111;
+ jjmatchedKind = 105;
jjmatchedPos = 6;
}
- else if ((active1 & 0x40000000000000L) != 0L)
+ else if ((active1 & 0x1000000000000L) != 0L)
{
- jjmatchedKind = 118;
+ jjmatchedKind = 112;
jjmatchedPos = 6;
}
- else if ((active1 & 0x80000000000000L) != 0L)
+ else if ((active1 & 0x2000000000000L) != 0L)
{
- jjmatchedKind = 119;
+ jjmatchedKind = 113;
jjmatchedPos = 6;
}
- return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x1L, active2, 0L);
+ break;
case 84:
if ((active0 & 0x1000000000000L) != 0L)
{
jjmatchedKind = 48;
jjmatchedPos = 6;
}
- else if ((active2 & 0x400000L) != 0L)
+ else if ((active2 & 0x10000L) != 0L)
{
- jjmatchedKind = 150;
+ jjmatchedKind = 144;
jjmatchedPos = 6;
}
- return jjMoveStringLiteralDfa7_0(active0, 0x100000000000000L, active1, 0x200000L, active2, 0L);
+ return jjMoveStringLiteralDfa7_0(active0, 0x100000000000000L, active1, 0x8000L, active2, 0L);
case 85:
return jjMoveStringLiteralDfa7_0(active0, 0x4000000L, active1, 0L, active2, 0L);
case 95:
- return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x100000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x4000000000L, active2, 0L);
case 97:
return jjMoveStringLiteralDfa7_0(active0, 0x2020000000000L, active1, 0L, active2, 0L);
case 98:
return jjMoveStringLiteralDfa7_0(active0, 0x2000000L, active1, 0L, active2, 0L);
case 99:
- return jjMoveStringLiteralDfa7_0(active0, 0x800000L, active1, 0x244L, active2, 0L);
+ return jjMoveStringLiteralDfa7_0(active0, 0x800000L, active1, 0x9L, active2, 0L);
case 100:
if ((active0 & 0x1000000L) != 0L)
{
jjmatchedKind = 24;
jjmatchedPos = 6;
}
- else if ((active1 & 0x1000000000000000L) != 0L)
+ else if ((active1 & 0x40000000000000L) != 0L)
{
- jjmatchedKind = 124;
+ jjmatchedKind = 118;
jjmatchedPos = 6;
}
break;
@@ -1806,87 +1775,80 @@ private int jjMoveStringLiteralDfa6_0(long old0, long active0, long old1, long a
jjmatchedKind = 45;
jjmatchedPos = 6;
}
- else if ((active1 & 0x20000000000L) != 0L)
+ else if ((active1 & 0x800000000L) != 0L)
{
- jjmatchedKind = 105;
+ jjmatchedKind = 99;
jjmatchedPos = 6;
}
- return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x2000000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x80000000000L, active2, 0L);
case 103:
- if ((active1 & 0x10000L) != 0L)
+ if ((active1 & 0x400L) != 0L)
{
- jjmatchedKind = 80;
+ jjmatchedKind = 74;
jjmatchedPos = 6;
}
- else if ((active1 & 0x10000000L) != 0L)
+ else if ((active1 & 0x400000L) != 0L)
{
- jjmatchedKind = 92;
+ jjmatchedKind = 86;
jjmatchedPos = 6;
}
- return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x20020000L, active2, 0L);
+ return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x800800L, active2, 0L);
case 107:
- if ((active1 & 0x2000000L) != 0L)
+ if ((active1 & 0x80000L) != 0L)
{
- jjmatchedKind = 89;
+ jjmatchedKind = 83;
jjmatchedPos = 6;
}
break;
case 108:
- return jjMoveStringLiteralDfa7_0(active0, 0x800000000000L, active1, 0x100000000L, active2, 0L);
- case 109:
- return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x8L, active2, 0L);
+ return jjMoveStringLiteralDfa7_0(active0, 0x800000000000L, active1, 0x4000000L, active2, 0L);
case 110:
if ((active0 & 0x200000L) != 0L)
{
jjmatchedKind = 21;
jjmatchedPos = 6;
}
- return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x100200000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x4008000000000L, active2, 0L);
case 111:
- return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x1000000000000L, active2, 0L);
+ return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x40000000000L, active2, 0L);
case 112:
- if ((active1 & 0x10L) != 0L)
- {
- jjmatchedKind = 68;
- jjmatchedPos = 6;
- }
- return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x80002L, active2, 0L);
+ return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x2000L, active2, 0L);
case 114:
- if ((active1 & 0x400000L) != 0L)
+ if ((active1 & 0x10000L) != 0L)
{
- jjmatchedKind = 86;
+ jjmatchedKind = 80;
jjmatchedPos = 6;
}
- return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x40008c000000L, active2, 0L);
+ return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x10002300000L, active2, 0L);
case 115:
- if ((active1 & 0x800000000000L) != 0L)
+ if ((active1 & 0x20000000000L) != 0L)
{
- jjmatchedKind = 111;
+ jjmatchedKind = 105;
jjmatchedPos = 6;
}
- else if ((active1 & 0x40000000000000L) != 0L)
+ else if ((active1 & 0x1000000000000L) != 0L)
{
- jjmatchedKind = 118;
+ jjmatchedKind = 112;
jjmatchedPos = 6;
}
- else if ((active1 & 0x80000000000000L) != 0L)
+ else if ((active1 & 0x2000000000000L) != 0L)
{
- jjmatchedKind = 119;
+ jjmatchedKind = 113;
jjmatchedPos = 6;
}
- return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x1L, active2, 0L);
+ break;
case 116:
if ((active0 & 0x1000000000000L) != 0L)
{
jjmatchedKind = 48;
jjmatchedPos = 6;
}
- else if ((active2 & 0x400000L) != 0L)
+ else if ((active2 & 0x10000L) != 0L)
{
- jjmatchedKind = 150;
+ jjmatchedKind = 144;
jjmatchedPos = 6;
}
- return jjMoveStringLiteralDfa7_0(active0, 0x100000000000000L, active1, 0x200000L, active2, 0L);
+ return jjMoveStringLiteralDfa7_0(active0, 0x100000000000000L, active1, 0x8000L, active2, 0L);
case 117:
return jjMoveStringLiteralDfa7_0(active0, 0x4000000L, active1, 0L, active2, 0L);
default :
@@ -1904,11 +1866,11 @@ private int jjMoveStringLiteralDfa7_0(long old0, long active0, long old1, long a
switch(curChar)
{
case 65:
- return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x4000001L);
+ return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x100000L);
case 67:
- return jjMoveStringLiteralDfa8_0(active0, 0x4000000L, active1, 0x200000L);
+ return jjMoveStringLiteralDfa8_0(active0, 0x4000000L, active1, 0x8000L);
case 68:
- return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x20020000L);
+ return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x800800L);
case 69:
if ((active0 & 0x2000000L) != 0L)
{
@@ -1920,31 +1882,26 @@ private int jjMoveStringLiteralDfa7_0(long old0, long active0, long old1, long a
jjmatchedKind = 47;
jjmatchedPos = 7;
}
- else if ((active1 & 0x4L) != 0L)
- {
- jjmatchedKind = 66;
- jjmatchedPos = 7;
- }
- else if ((active1 & 0x200L) != 0L)
+ else if ((active1 & 0x8L) != 0L)
{
- jjmatchedKind = 73;
+ jjmatchedKind = 67;
jjmatchedPos = 7;
}
- else if ((active1 & 0x80000L) != 0L)
+ else if ((active1 & 0x2000L) != 0L)
{
- jjmatchedKind = 83;
+ jjmatchedKind = 77;
jjmatchedPos = 7;
}
- else if ((active1 & 0x100000000000000L) != 0L)
+ else if ((active1 & 0x4000000000000L) != 0L)
{
- jjmatchedKind = 120;
+ jjmatchedKind = 114;
jjmatchedPos = 7;
}
break;
case 70:
- return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x100000000000L);
+ return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x4000000000L);
case 73:
- return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x8000000L);
+ return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x200000L);
case 76:
if ((active0 & 0x20000000000L) != 0L)
{
@@ -1953,32 +1910,25 @@ private int jjMoveStringLiteralDfa7_0(long old0, long active0, long old1, long a
}
break;
case 77:
- if ((active1 & 0x80000000L) != 0L)
+ if ((active1 & 0x2000000L) != 0L)
{
- jjmatchedKind = 95;
+ jjmatchedKind = 89;
jjmatchedPos = 7;
}
break;
case 79:
- return jjMoveStringLiteralDfa8_0(active0, 0x100000000000000L, active1, 0x42L);
- case 80:
- if ((active1 & 0x8L) != 0L)
- {
- jjmatchedKind = 67;
- jjmatchedPos = 7;
- }
- break;
+ return jjMoveStringLiteralDfa8_0(active0, 0x100000000000000L, active1, 0x1L);
case 82:
- if ((active1 & 0x2000000000000L) != 0L)
+ if ((active1 & 0x80000000000L) != 0L)
{
- jjmatchedKind = 113;
+ jjmatchedKind = 107;
jjmatchedPos = 7;
}
- return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x1000000000000L);
+ return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x40000000000L);
case 83:
- if ((active1 & 0x200000000000L) != 0L)
+ if ((active1 & 0x8000000000L) != 0L)
{
- jjmatchedKind = 109;
+ jjmatchedKind = 103;
jjmatchedPos = 7;
}
break;
@@ -1988,15 +1938,15 @@ private int jjMoveStringLiteralDfa7_0(long old0, long active0, long old1, long a
jjmatchedKind = 23;
jjmatchedPos = 7;
}
- return jjMoveStringLiteralDfa8_0(active0, 0x2000000000000L, active1, 0x400000000000L);
+ return jjMoveStringLiteralDfa8_0(active0, 0x2000000000000L, active1, 0x10000000000L);
case 85:
- return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x100000000L);
+ return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x4000000L);
case 97:
- return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x4000001L);
+ return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x100000L);
case 99:
- return jjMoveStringLiteralDfa8_0(active0, 0x4000000L, active1, 0x200000L);
+ return jjMoveStringLiteralDfa8_0(active0, 0x4000000L, active1, 0x8000L);
case 100:
- return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x20020000L);
+ return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x800800L);
case 101:
if ((active0 & 0x2000000L) != 0L)
{
@@ -2008,31 +1958,26 @@ private int jjMoveStringLiteralDfa7_0(long old0, long active0, long old1, long a
jjmatchedKind = 47;
jjmatchedPos = 7;
}
- else if ((active1 & 0x4L) != 0L)
- {
- jjmatchedKind = 66;
- jjmatchedPos = 7;
- }
- else if ((active1 & 0x200L) != 0L)
+ else if ((active1 & 0x8L) != 0L)
{
- jjmatchedKind = 73;
+ jjmatchedKind = 67;
jjmatchedPos = 7;
}
- else if ((active1 & 0x80000L) != 0L)
+ else if ((active1 & 0x2000L) != 0L)
{
- jjmatchedKind = 83;
+ jjmatchedKind = 77;
jjmatchedPos = 7;
}
- else if ((active1 & 0x100000000000000L) != 0L)
+ else if ((active1 & 0x4000000000000L) != 0L)
{
- jjmatchedKind = 120;
+ jjmatchedKind = 114;
jjmatchedPos = 7;
}
break;
case 102:
- return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x100000000000L);
+ return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x4000000000L);
case 105:
- return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x8000000L);
+ return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x200000L);
case 108:
if ((active0 & 0x20000000000L) != 0L)
{
@@ -2041,32 +1986,25 @@ private int jjMoveStringLiteralDfa7_0(long old0, long active0, long old1, long a
}
break;
case 109:
- if ((active1 & 0x80000000L) != 0L)
+ if ((active1 & 0x2000000L) != 0L)
{
- jjmatchedKind = 95;
+ jjmatchedKind = 89;
jjmatchedPos = 7;
}
break;
case 111:
- return jjMoveStringLiteralDfa8_0(active0, 0x100000000000000L, active1, 0x42L);
- case 112:
- if ((active1 & 0x8L) != 0L)
- {
- jjmatchedKind = 67;
- jjmatchedPos = 7;
- }
- break;
+ return jjMoveStringLiteralDfa8_0(active0, 0x100000000000000L, active1, 0x1L);
case 114:
- if ((active1 & 0x2000000000000L) != 0L)
+ if ((active1 & 0x80000000000L) != 0L)
{
- jjmatchedKind = 113;
+ jjmatchedKind = 107;
jjmatchedPos = 7;
}
- return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x1000000000000L);
+ return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x40000000000L);
case 115:
- if ((active1 & 0x200000000000L) != 0L)
+ if ((active1 & 0x8000000000L) != 0L)
{
- jjmatchedKind = 109;
+ jjmatchedKind = 103;
jjmatchedPos = 7;
}
break;
@@ -2076,9 +2014,9 @@ private int jjMoveStringLiteralDfa7_0(long old0, long active0, long old1, long a
jjmatchedKind = 23;
jjmatchedPos = 7;
}
- return jjMoveStringLiteralDfa8_0(active0, 0x2000000000000L, active1, 0x400000000000L);
+ return jjMoveStringLiteralDfa8_0(active0, 0x2000000000000L, active1, 0x10000000000L);
case 117:
- return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x100000000L);
+ return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x4000000L);
default :
break;
}
@@ -2094,9 +2032,9 @@ private int jjMoveStringLiteralDfa8_0(long old0, long active0, long old1, long a
switch(curChar)
{
case 67:
- if ((active1 & 0x8000000L) != 0L)
+ if ((active1 & 0x200000L) != 0L)
{
- jjmatchedKind = 91;
+ jjmatchedKind = 85;
jjmatchedPos = 8;
}
break;
@@ -2106,41 +2044,32 @@ private int jjMoveStringLiteralDfa8_0(long old0, long active0, long old1, long a
jjmatchedKind = 49;
jjmatchedPos = 8;
}
- else if ((active1 & 0x100000000L) != 0L)
+ else if ((active1 & 0x4000000L) != 0L)
{
- jjmatchedKind = 96;
+ jjmatchedKind = 90;
jjmatchedPos = 8;
}
- else if ((active1 & 0x1000000000000L) != 0L)
+ else if ((active1 & 0x40000000000L) != 0L)
{
- jjmatchedKind = 112;
+ jjmatchedKind = 106;
jjmatchedPos = 8;
}
break;
case 72:
- return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x200000L);
+ return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x8000L);
case 73:
- return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x20020000L);
+ return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x800800L);
case 76:
- if ((active1 & 0x4000000L) != 0L)
+ if ((active1 & 0x100000L) != 0L)
{
- jjmatchedKind = 90;
+ jjmatchedKind = 84;
jjmatchedPos = 8;
}
break;
- case 77:
- return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x1L);
case 78:
- return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x40L);
+ return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x1L);
case 79:
- return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x100000000000L);
- case 80:
- if ((active1 & 0x2L) != 0L)
- {
- jjmatchedKind = 65;
- jjmatchedPos = 8;
- }
- break;
+ return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x4000000000L);
case 82:
if ((active0 & 0x100000000000000L) != 0L)
{
@@ -2149,9 +2078,9 @@ private int jjMoveStringLiteralDfa8_0(long old0, long active0, long old1, long a
}
break;
case 83:
- if ((active1 & 0x400000000000L) != 0L)
+ if ((active1 & 0x10000000000L) != 0L)
{
- jjmatchedKind = 110;
+ jjmatchedKind = 104;
jjmatchedPos = 8;
}
break;
@@ -2163,9 +2092,9 @@ private int jjMoveStringLiteralDfa8_0(long old0, long active0, long old1, long a
}
break;
case 99:
- if ((active1 & 0x8000000L) != 0L)
+ if ((active1 & 0x200000L) != 0L)
{
- jjmatchedKind = 91;
+ jjmatchedKind = 85;
jjmatchedPos = 8;
}
break;
@@ -2175,41 +2104,32 @@ private int jjMoveStringLiteralDfa8_0(long old0, long active0, long old1, long a
jjmatchedKind = 49;
jjmatchedPos = 8;
}
- else if ((active1 & 0x100000000L) != 0L)
+ else if ((active1 & 0x4000000L) != 0L)
{
- jjmatchedKind = 96;
+ jjmatchedKind = 90;
jjmatchedPos = 8;
}
- else if ((active1 & 0x1000000000000L) != 0L)
+ else if ((active1 & 0x40000000000L) != 0L)
{
- jjmatchedKind = 112;
+ jjmatchedKind = 106;
jjmatchedPos = 8;
}
break;
case 104:
- return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x200000L);
+ return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x8000L);
case 105:
- return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x20020000L);
+ return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x800800L);
case 108:
- if ((active1 & 0x4000000L) != 0L)
+ if ((active1 & 0x100000L) != 0L)
{
- jjmatchedKind = 90;
+ jjmatchedKind = 84;
jjmatchedPos = 8;
}
break;
- case 109:
- return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x1L);
case 110:
- return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x40L);
+ return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x1L);
case 111:
- return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x100000000000L);
- case 112:
- if ((active1 & 0x2L) != 0L)
- {
- jjmatchedKind = 65;
- jjmatchedPos = 8;
- }
- break;
+ return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x4000000000L);
case 114:
if ((active0 & 0x100000000000000L) != 0L)
{
@@ -2218,9 +2138,9 @@ private int jjMoveStringLiteralDfa8_0(long old0, long active0, long old1, long a
}
break;
case 115:
- if ((active1 & 0x400000000000L) != 0L)
+ if ((active1 & 0x10000000000L) != 0L)
{
- jjmatchedKind = 110;
+ jjmatchedKind = 104;
jjmatchedPos = 8;
}
break;
@@ -2246,51 +2166,37 @@ private int jjMoveStringLiteralDfa9_0(long old0, long active0, long old1, long a
switch(curChar)
{
case 67:
- return jjMoveStringLiteralDfa10_0(active1, 0x40L);
+ return jjMoveStringLiteralDfa10_0(active1, 0x1L);
case 69:
- return jjMoveStringLiteralDfa10_0(active1, 0x200000L);
- case 80:
- if ((active1 & 0x1L) != 0L)
- {
- jjmatchedKind = 64;
- jjmatchedPos = 9;
- }
- break;
+ return jjMoveStringLiteralDfa10_0(active1, 0x8000L);
case 82:
- if ((active1 & 0x20000L) != 0L)
+ if ((active1 & 0x800L) != 0L)
{
- jjmatchedKind = 81;
+ jjmatchedKind = 75;
jjmatchedPos = 9;
}
- else if ((active1 & 0x20000000L) != 0L)
+ else if ((active1 & 0x800000L) != 0L)
{
- jjmatchedKind = 93;
+ jjmatchedKind = 87;
jjmatchedPos = 9;
}
- return jjMoveStringLiteralDfa10_0(active1, 0x100000000000L);
+ return jjMoveStringLiteralDfa10_0(active1, 0x4000000000L);
case 99:
- return jjMoveStringLiteralDfa10_0(active1, 0x40L);
+ return jjMoveStringLiteralDfa10_0(active1, 0x1L);
case 101:
- return jjMoveStringLiteralDfa10_0(active1, 0x200000L);
- case 112:
- if ((active1 & 0x1L) != 0L)
- {
- jjmatchedKind = 64;
- jjmatchedPos = 9;
- }
- break;
+ return jjMoveStringLiteralDfa10_0(active1, 0x8000L);
case 114:
- if ((active1 & 0x20000L) != 0L)
+ if ((active1 & 0x800L) != 0L)
{
- jjmatchedKind = 81;
+ jjmatchedKind = 75;
jjmatchedPos = 9;
}
- else if ((active1 & 0x20000000L) != 0L)
+ else if ((active1 & 0x800000L) != 0L)
{
- jjmatchedKind = 93;
+ jjmatchedKind = 87;
jjmatchedPos = 9;
}
- return jjMoveStringLiteralDfa10_0(active1, 0x100000000000L);
+ return jjMoveStringLiteralDfa10_0(active1, 0x4000000000L);
default :
break;
}
@@ -2306,22 +2212,22 @@ private int jjMoveStringLiteralDfa10_0(long old1, long active1){
switch(curChar)
{
case 65:
- return jjMoveStringLiteralDfa11_0(active1, 0x40L);
+ return jjMoveStringLiteralDfa11_0(active1, 0x1L);
case 83:
- if ((active1 & 0x200000L) != 0L)
+ if ((active1 & 0x8000L) != 0L)
{
- jjmatchedKind = 85;
+ jjmatchedKind = 79;
jjmatchedPos = 10;
}
break;
case 95:
- return jjMoveStringLiteralDfa11_0(active1, 0x100000000000L);
+ return jjMoveStringLiteralDfa11_0(active1, 0x4000000000L);
case 97:
- return jjMoveStringLiteralDfa11_0(active1, 0x40L);
+ return jjMoveStringLiteralDfa11_0(active1, 0x1L);
case 115:
- if ((active1 & 0x200000L) != 0L)
+ if ((active1 & 0x8000L) != 0L)
{
- jjmatchedKind = 85;
+ jjmatchedKind = 79;
jjmatchedPos = 10;
}
break;
@@ -2340,23 +2246,23 @@ private int jjMoveStringLiteralDfa11_0(long old1, long active1){
switch(curChar)
{
case 84:
- if ((active1 & 0x40L) != 0L)
+ if ((active1 & 0x1L) != 0L)
{
- jjmatchedKind = 70;
+ jjmatchedKind = 64;
jjmatchedPos = 11;
}
break;
case 85:
- return jjMoveStringLiteralDfa12_0(active1, 0x100000000000L);
+ return jjMoveStringLiteralDfa12_0(active1, 0x4000000000L);
case 116:
- if ((active1 & 0x40L) != 0L)
+ if ((active1 & 0x1L) != 0L)
{
- jjmatchedKind = 70;
+ jjmatchedKind = 64;
jjmatchedPos = 11;
}
break;
case 117:
- return jjMoveStringLiteralDfa12_0(active1, 0x100000000000L);
+ return jjMoveStringLiteralDfa12_0(active1, 0x4000000000L);
default :
break;
}
@@ -2372,9 +2278,9 @@ private int jjMoveStringLiteralDfa12_0(long old1, long active1){
switch(curChar)
{
case 82:
- return jjMoveStringLiteralDfa13_0(active1, 0x100000000000L);
+ return jjMoveStringLiteralDfa13_0(active1, 0x4000000000L);
case 114:
- return jjMoveStringLiteralDfa13_0(active1, 0x100000000000L);
+ return jjMoveStringLiteralDfa13_0(active1, 0x4000000000L);
default :
break;
}
@@ -2390,16 +2296,16 @@ private int jjMoveStringLiteralDfa13_0(long old1, long active1){
switch(curChar)
{
case 73:
- if ((active1 & 0x100000000000L) != 0L)
+ if ((active1 & 0x4000000000L) != 0L)
{
- jjmatchedKind = 108;
+ jjmatchedKind = 102;
jjmatchedPos = 13;
}
break;
case 105:
- if ((active1 & 0x100000000000L) != 0L)
+ if ((active1 & 0x4000000000L) != 0L)
{
- jjmatchedKind = 108;
+ jjmatchedKind = 102;
jjmatchedPos = 13;
}
break;
@@ -2472,8 +2378,8 @@ private int jjMoveNfa_0(int startState, int curPos)
case 0:
if ((0x3ff000000000000L & l) != 0L)
{
- if (kind > 155)
- kind = 155;
+ if (kind > 149)
+ kind = 149;
{ jjCheckNAddStates(0, 6); }
}
else if (curChar == 45)
@@ -2664,8 +2570,8 @@ private int jjMoveNfa_0(int startState, int curPos)
jjstateSet[jjnewStateCnt++] = 45;
break;
case 53:
- if ((0x8400000000L & l) != 0L && kind > 167)
- kind = 167;
+ if ((0x8400000000L & l) != 0L && kind > 161)
+ kind = 161;
break;
case 54:
if (curChar == 39)
@@ -2676,8 +2582,8 @@ private int jjMoveNfa_0(int startState, int curPos)
{ jjCheckNAddStates(32, 34); }
break;
case 56:
- if (curChar == 39 && kind > 171)
- kind = 171;
+ if (curChar == 39 && kind > 165)
+ kind = 165;
break;
case 58:
if ((0x8400000000L & l) != 0L)
@@ -2724,8 +2630,8 @@ private int jjMoveNfa_0(int startState, int curPos)
{ jjCheckNAddStates(29, 31); }
break;
case 70:
- if (curChar == 34 && kind > 172)
- kind = 172;
+ if (curChar == 34 && kind > 166)
+ kind = 166;
break;
case 72:
if ((0x8400000000L & l) != 0L)
@@ -2817,8 +2723,8 @@ private int jjMoveNfa_0(int startState, int curPos)
{ jjCheckNAddStates(47, 50); }
break;
case 98:
- if (curChar == 39 && kind > 173)
- kind = 173;
+ if (curChar == 39 && kind > 167)
+ kind = 167;
break;
case 99:
if (curChar == 39)
@@ -2886,8 +2792,8 @@ private int jjMoveNfa_0(int startState, int curPos)
{ jjCheckNAddStates(53, 56); }
break;
case 118:
- if (curChar == 34 && kind > 174)
- kind = 174;
+ if (curChar == 34 && kind > 168)
+ kind = 168;
break;
case 119:
if (curChar == 34)
@@ -2922,8 +2828,8 @@ private int jjMoveNfa_0(int startState, int curPos)
{ jjCheckNAddStates(20, 22); }
break;
case 127:
- if (curChar == 41 && kind > 177)
- kind = 177;
+ if (curChar == 41 && kind > 171)
+ kind = 171;
break;
case 128:
if (curChar == 10)
@@ -3104,15 +3010,15 @@ private int jjMoveNfa_0(int startState, int curPos)
case 194:
if ((0x3ff000000000000L & l) == 0L)
break;
- if (kind > 155)
- kind = 155;
+ if (kind > 149)
+ kind = 149;
{ jjCheckNAddStates(0, 6); }
break;
case 195:
if ((0x3ff000000000000L & l) == 0L)
break;
- if (kind > 155)
- kind = 155;
+ if (kind > 149)
+ kind = 149;
{ jjCheckNAdd(195); }
break;
case 196:
@@ -3126,8 +3032,8 @@ private int jjMoveNfa_0(int startState, int curPos)
case 198:
if ((0x3ff000000000000L & l) == 0L)
break;
- if (kind > 156)
- kind = 156;
+ if (kind > 150)
+ kind = 150;
{ jjCheckNAdd(198); }
break;
case 199:
@@ -3149,8 +3055,8 @@ private int jjMoveNfa_0(int startState, int curPos)
case 204:
if ((0x3ff000000000000L & l) == 0L)
break;
- if (kind > 157)
- kind = 157;
+ if (kind > 151)
+ kind = 151;
{ jjCheckNAdd(204); }
break;
case 205:
@@ -3164,8 +3070,8 @@ private int jjMoveNfa_0(int startState, int curPos)
case 208:
if ((0x3ff000000000000L & l) == 0L)
break;
- if (kind > 157)
- kind = 157;
+ if (kind > 151)
+ kind = 151;
{ jjCheckNAdd(208); }
break;
case 209:
@@ -3183,8 +3089,8 @@ private int jjMoveNfa_0(int startState, int curPos)
case 213:
if ((0x3ff000000000000L & l) == 0L)
break;
- if (kind > 157)
- kind = 157;
+ if (kind > 151)
+ kind = 151;
{ jjCheckNAdd(213); }
break;
case 214:
@@ -3194,8 +3100,8 @@ private int jjMoveNfa_0(int startState, int curPos)
case 215:
if ((0x3ff000000000000L & l) == 0L)
break;
- if (kind > 158)
- kind = 158;
+ if (kind > 152)
+ kind = 152;
{ jjCheckNAdd(215); }
break;
case 216:
@@ -3209,8 +3115,8 @@ private int jjMoveNfa_0(int startState, int curPos)
case 218:
if ((0x3ff000000000000L & l) == 0L)
break;
- if (kind > 159)
- kind = 159;
+ if (kind > 153)
+ kind = 153;
{ jjCheckNAdd(218); }
break;
case 219:
@@ -3228,8 +3134,8 @@ private int jjMoveNfa_0(int startState, int curPos)
case 223:
if ((0x3ff000000000000L & l) == 0L)
break;
- if (kind > 160)
- kind = 160;
+ if (kind > 154)
+ kind = 154;
{ jjCheckNAdd(223); }
break;
case 224:
@@ -3255,8 +3161,8 @@ private int jjMoveNfa_0(int startState, int curPos)
case 230:
if ((0x3ff000000000000L & l) == 0L)
break;
- if (kind > 160)
- kind = 160;
+ if (kind > 154)
+ kind = 154;
{ jjCheckNAdd(230); }
break;
case 231:
@@ -3270,8 +3176,8 @@ private int jjMoveNfa_0(int startState, int curPos)
case 234:
if ((0x3ff000000000000L & l) == 0L)
break;
- if (kind > 160)
- kind = 160;
+ if (kind > 154)
+ kind = 154;
{ jjCheckNAdd(234); }
break;
case 235:
@@ -3281,8 +3187,8 @@ private int jjMoveNfa_0(int startState, int curPos)
case 236:
if ((0x3ff000000000000L & l) == 0L)
break;
- if (kind > 161)
- kind = 161;
+ if (kind > 155)
+ kind = 155;
{ jjCheckNAdd(236); }
break;
case 237:
@@ -3296,8 +3202,8 @@ private int jjMoveNfa_0(int startState, int curPos)
case 239:
if ((0x3ff000000000000L & l) == 0L)
break;
- if (kind > 162)
- kind = 162;
+ if (kind > 156)
+ kind = 156;
{ jjCheckNAdd(239); }
break;
case 240:
@@ -3315,8 +3221,8 @@ private int jjMoveNfa_0(int startState, int curPos)
case 244:
if ((0x3ff000000000000L & l) == 0L)
break;
- if (kind > 163)
- kind = 163;
+ if (kind > 157)
+ kind = 157;
{ jjCheckNAdd(244); }
break;
case 245:
@@ -3342,8 +3248,8 @@ private int jjMoveNfa_0(int startState, int curPos)
case 251:
if ((0x3ff000000000000L & l) == 0L)
break;
- if (kind > 163)
- kind = 163;
+ if (kind > 157)
+ kind = 157;
{ jjCheckNAdd(251); }
break;
case 252:
@@ -3357,8 +3263,8 @@ private int jjMoveNfa_0(int startState, int curPos)
case 255:
if ((0x3ff000000000000L & l) == 0L)
break;
- if (kind > 163)
- kind = 163;
+ if (kind > 157)
+ kind = 157;
{ jjCheckNAdd(255); }
break;
default : break;
@@ -3505,8 +3411,8 @@ private int jjMoveNfa_0(int startState, int curPos)
{ jjCheckNAddStates(38, 43); }
break;
case 41:
- if ((0x200000002L & l) != 0L && kind > 136)
- kind = 136;
+ if ((0x200000002L & l) != 0L && kind > 130)
+ kind = 130;
break;
case 42:
if ((0x10000000100000L & l) != 0L)
@@ -3545,8 +3451,8 @@ private int jjMoveNfa_0(int startState, int curPos)
jjstateSet[jjnewStateCnt++] = 53;
break;
case 53:
- if ((0x14404410000000L & l) != 0L && kind > 167)
- kind = 167;
+ if ((0x14404410000000L & l) != 0L && kind > 161)
+ kind = 161;
break;
case 55:
if ((0xffffffffefffffffL & l) != 0L)
@@ -3751,8 +3657,8 @@ private int jjMoveNfa_0(int startState, int curPos)
{ jjCheckNAddStates(65, 70); }
break;
case 135:
- if (curChar == 93 && kind > 182)
- kind = 182;
+ if (curChar == 93 && kind > 176)
+ kind = 176;
break;
case 138:
if ((0x7fffffe07fffffeL & l) != 0L)
@@ -3851,8 +3757,8 @@ private int jjMoveNfa_0(int startState, int curPos)
{ jjCheckNAddStates(84, 89); }
break;
case 168:
- if ((0x200000002L & l) != 0L && kind > 137)
- kind = 137;
+ if ((0x200000002L & l) != 0L && kind > 131)
+ kind = 131;
break;
case 169:
if ((0x10000000100000L & l) != 0L)
@@ -3890,8 +3796,8 @@ private int jjMoveNfa_0(int startState, int curPos)
{ jjCheckNAddStates(93, 98); }
break;
case 183:
- if ((0x2000000020L & l) != 0L && kind > 138)
- kind = 138;
+ if ((0x2000000020L & l) != 0L && kind > 132)
+ kind = 132;
break;
case 184:
if ((0x4000000040000L & l) != 0L)
@@ -4152,12 +4058,11 @@ null, null, null, null, null, null, null, null, null, null, null, null, null, nu
null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null,
-null, null, null, null, null, null, null, null, "\50", "\51", null, "\173", "\175",
-"\133", "\135", null, "\73", "\54", "\56", "\75", "\41\75", "\76", "\74", "\74\75",
-"\76\75", "\74\74\50", "\51\76\76", "\74\74", "\76\76", "\173\174", "\174\175", "\176",
-"\41", "\72", "\174\174", "\46\46", "\53", "\55", "\52", "\57", "\136\136", "\100",
-"\174", "\136", "\55\76", "\74\55", "\77", null, null, null, null, null, null, null,
-null, null, null, null, };
+null, null, "\50", "\51", null, "\173", "\175", "\133", "\135", null, "\73", "\54",
+"\56", "\75", "\41\75", "\76", "\74", "\74\75", "\76\75", "\74\74\50", "\51\76\76",
+"\74\74", "\76\76", "\173\174", "\174\175", "\176", "\41", "\72", "\174\174", "\46\46",
+"\53", "\55", "\52", "\57", "\136\136", "\100", "\174", "\136", "\77", null, null,
+null, null, null, null, null, null, null, null, null, };
protected Token jjFillToken()
{
final Token t;
@@ -4458,10 +4363,10 @@ public static final int[] jjnewLexState = {
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
};
static final long[] jjtoToken = {
- 0xfffffffffffcfe01L, 0xffffffffffffffffL, 0xfffff88ffbffffffL, 0x3fffffL,
+ 0xfffffffffffcfe01L, 0xffffffffffffffffL, 0xffffffe23fefffffL, 0x3fffL,
};
static final long[] jjtoSkip = {
0x7eL, 0x0L, 0x0L, 0x0L,