Skip to content

Commit 647d58b

Browse files
afsafs
committed
GH-3855: Hex \u{} sequence (SPARQL)
1 parent af12b0b commit 647d58b

17 files changed

Lines changed: 1109 additions & 867 deletions

‎jena-arq/Grammar/arq.jj‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2393,7 +2393,13 @@ TOKEN :
23932393
| < #QUOTE_3D: "\"\"\"">
23942394
| < #QUOTE_3S: "'''">
23952395
| <ECHAR: "\\" ( "t"|"b"|"n"|"r"|"f"|"\\"|"\""|"'") >
2396-
| < #UCHAR: <UCHAR4> | <UCHAR8> >
2396+
| < #UCHAR: <UCHAR4> | <UCHAR8> | <UCHAR_DELIM> >
2397+
| < #UCHAR_DELIM: "\\" "u" <LBRACE>
2398+
// W3C EBNF does not have a "{1,6}" syntax.
2399+
// <HEX> (<HEX> (<HEX> (<HEX> (<HEX> (<HEX>)? )? )? )? )?
2400+
// Or be lax here and check the length in escape processing.
2401+
(<HEX>)+
2402+
<RBRACE> >
23972403
| < #UCHAR4: "\\" "u" <HEX> <HEX> <HEX> <HEX> >
23982404
| < #UCHAR8: "\\" "U" <HEX> <HEX> <HEX> <HEX> <HEX> <HEX> <HEX> <HEX> >
23992405
| < STRING_LITERAL1:

‎jena-arq/Grammar/main.jj‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2965,7 +2965,13 @@ TOKEN :
29652965
| < #UCHAR: <UCHAR8> >
29662966
#endif
29672967
#ifdef ARQ
2968-
| < #UCHAR: <UCHAR4> | <UCHAR8> >
2968+
| < #UCHAR: <UCHAR4> | <UCHAR8> | <UCHAR_DELIM> >
2969+
| < #UCHAR_DELIM: "\\" "u" <LBRACE>
2970+
// W3C EBNF does not have a "{1,6}" syntax.
2971+
// <HEX> (<HEX> (<HEX> (<HEX> (<HEX> (<HEX>)? )? )? )? )?
2972+
// Or be lax here and check the length in escape processing.
2973+
(<HEX>)+
2974+
<RBRACE> >
29692975
#endif
29702976
| < #UCHAR4: "\\" "u" <HEX> <HEX> <HEX> <HEX> >
29712977
| < #UCHAR8: "\\" "U" <HEX> <HEX> <HEX> <HEX> <HEX> <HEX> <HEX> <HEX> >

‎jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ARQParser.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8368,7 +8368,7 @@ private boolean jj_3R_ExpressionList_1019_3_127()
83688368
{
83698369
Token xsp;
83708370
xsp = jj_scanpos;
8371-
if (jj_scan_token(195)) {
8371+
if (jj_scan_token(196)) {
83728372
jj_scanpos = xsp;
83738373
if (jj_3R_ExpressionList_1022_5_156()) return true;
83748374
}
@@ -9344,13 +9344,13 @@ private static void jj_la1_init_4() {
93449344
jj_la1_4 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x600000,0x0,0x7dffff,0x7dffff,0x7dffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x600000,0x0,0x0,0x0,0x0,0x0,0x0,0x1dffff,0x0,0x1dffff,0x1dffff,0x1dffff,0x0,0x1dffff,0x1dffff,0x0,0x1dffff,0x1dffff,0x0,0x0,0x0,0x0,0x0,0xff000000,0xff000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x3000000,0x0,0x0,0x0,0x0,0x0,0x600000,0x0,0x0,0x600000,0x600000,0x600000,0x0,0x0,0x600000,0x0,0x600000,0x0,0x0,0x600000,0x0,0x0,0x600000,0x600000,0x0,0x0,0x0,0x0,0x600000,0x0,0x0,0x0,0x600000,0x0,0x600000,0x0,0x0,0x0,0x0,0x1dffff,0x0,0x0,0x0,0x0,0x0,0x0,0x600000,0x0,0x0,0x0,0x0,0x0,0x600000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x600000,0x600000,0x0,0x0,0x0,0x0,0x600000,0x600000,0x600000,0x0,0x600000,0x600000,0x600000,0x600000,0x0,0x600000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7dffff,0x7dffff,0x0,0x600000,0x0,0x0,0x0,0x0,0x0,0x1dffff,0x0,0x0,0x0,0x0,0x7dffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1dffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x600000,0x0,0x0,0x0,0x0,};
93459345
}
93469346
private static void jj_la1_init_5() {
9347-
jj_la1_5 = new int[] {0x0,0x0,0x0,0x0,0x60000000,0x0,0x0,0x0,0xe07ee000,0x0,0xe07ee000,0xe07ee000,0xe07ee000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xe07ee000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x427,0x427,0x10,0x40,0x10,0x10,0x10,0x10,0x10,0x10,0x400,0x0,0x0,0x800,0x0,0x0,0x100,0x300,0xe07ee000,0x0,0x0,0xe07ee000,0xe07ee000,0xe07ee000,0x0,0x0,0xe07ee000,0x0,0xe07ee000,0x0,0x0,0xe07ee000,0x0,0x0,0xe07ee000,0xe07ee000,0x0,0x0,0x10,0x0,0xe07ee000,0x0,0x0,0x0,0xe07ee000,0x0,0xe07ee000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xe07ee000,0x0,0x0,0x0,0x0,0x0,0xe07ee000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000,0x0,0x2000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xe07ee000,0xe07ee000,0x0,0x0,0x0,0x0,0xe07ee000,0xe07ee000,0xe07ee000,0x0,0xe07ee000,0xe07ee000,0xe07ee000,0xe07ee000,0x0,0xe07ee000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7e0000,0x7e0000,0x0,0x0,0x7e0000,0x0,0x0,0xe07ee000,0xe07ee000,0x0,0xe07ee000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xe07ee000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7ee000,0xe000,0xe0000,0x700000,0x0,0xe0000000,0x0,0x0,0x0,};
9347+
jj_la1_5 = new int[] {0x0,0x0,0x0,0x0,0xc0000000,0x0,0x0,0x0,0xc07ee000,0x0,0xc07ee000,0xc07ee000,0xc07ee000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc07ee000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x427,0x427,0x10,0x40,0x10,0x10,0x10,0x10,0x10,0x10,0x400,0x0,0x0,0x800,0x0,0x0,0x100,0x300,0xc07ee000,0x0,0x0,0xc07ee000,0xc07ee000,0xc07ee000,0x0,0x0,0xc07ee000,0x0,0xc07ee000,0x0,0x0,0xc07ee000,0x0,0x0,0xc07ee000,0xc07ee000,0x0,0x0,0x10,0x0,0xc07ee000,0x0,0x0,0x0,0xc07ee000,0x0,0xc07ee000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc07ee000,0x0,0x0,0x0,0x0,0x0,0xc07ee000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000,0x0,0x2000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc07ee000,0xc07ee000,0x0,0x0,0x0,0x0,0xc07ee000,0xc07ee000,0xc07ee000,0x0,0xc07ee000,0xc07ee000,0xc07ee000,0xc07ee000,0x0,0xc07ee000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7e0000,0x7e0000,0x0,0x0,0x7e0000,0x0,0x0,0xc07ee000,0xc07ee000,0x0,0xc07ee000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc07ee000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7ee000,0xe000,0xe0000,0x700000,0x0,0xc0000000,0x0,0x0,0x0,};
93489348
}
93499349
private static void jj_la1_init_6() {
9350-
jj_la1_6 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x3,0x3,0x80000003,0x0,0x0,0x10,0x0,0x80000000,0x0,0x10,0x0,0x0,0x400,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x2,0x2,0x2,0x0,0x2,0x2,0x0,0x2,0x2,0x0,0x0,0x0,0x0,0x200,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x14014b,0x0,0x800,0x14014b,0x14014b,0x14014b,0x10,0x800,0x14014b,0x0,0x14014b,0x800,0x0,0x14014b,0x10,0x800,0x14014b,0x14014b,0x800,0x10,0x0,0xa,0x40001,0x0,0xa,0xa,0x40001,0xa,0x40001,0x100,0x100,0x400,0x0,0x2,0x0,0x400,0xa,0x400,0xa,0x800,0x14014b,0x0,0x200,0x0,0x0,0x400,0x14014b,0x2000002,0x2000002,0x200,0x2000002,0x2000002,0x400,0x0,0x0,0x0,0xa0000010,0x2000002,0x20,0x420,0xa0000400,0xa0000010,0x2000002,0x0,0x0,0x2,0x0,0x0,0x42,0x42,0x14014b,0x14014b,0x1400000,0x1400000,0x1400000,0x1400000,0x14014b,0x14014b,0x40109,0x1000000,0x140101,0x140101,0x40101,0x40101,0x0,0x40001,0x0,0x100,0x0,0x8000000,0x10000000,0x3f000,0x3f000,0x60000000,0x0,0x80000000,0x80000000,0x60000000,0x80000000,0x80000000,0x62040003,0x40003,0x0,0x40001,0x400,0x400,0xa,0x400,0x400,0x0,0x400,0x400,0x400,0x0,0xe2040003,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200,0x200,0x200,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400,0x2,0x0,0x0,0xa,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x100,};
9350+
jj_la1_6 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3,0x0,0x7,0x7,0x7,0x0,0x0,0x20,0x0,0x0,0x0,0x20,0x0,0x0,0x800,0x3,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x0,0x4,0x4,0x4,0x0,0x4,0x4,0x0,0x4,0x4,0x0,0x0,0x0,0x0,0x400,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x280297,0x0,0x1000,0x280297,0x280297,0x280297,0x20,0x1000,0x280297,0x0,0x280297,0x1000,0x0,0x280297,0x20,0x1000,0x280297,0x280297,0x1000,0x20,0x0,0x14,0x80003,0x0,0x14,0x14,0x80003,0x14,0x80003,0x200,0x200,0x800,0x0,0x4,0x0,0x800,0x14,0x800,0x14,0x1000,0x280297,0x0,0x400,0x0,0x0,0x800,0x280297,0x4000004,0x4000004,0x400,0x4000004,0x4000004,0x800,0x0,0x0,0x0,0x40000020,0x4000004,0x40,0x840,0x40000800,0x40000020,0x4000004,0x0,0x0,0x4,0x0,0x0,0x84,0x84,0x280297,0x280297,0x2800000,0x2800000,0x2800000,0x2800000,0x280297,0x280297,0x80213,0x2000000,0x280203,0x280203,0x80203,0x80203,0x0,0x80003,0x0,0x200,0x0,0x10000000,0x20000000,0x7e000,0x7e000,0xc0000000,0x0,0x0,0x0,0xc0000000,0x0,0x0,0xc4080007,0x80007,0x0,0x80003,0x800,0x800,0x14,0x800,0x800,0x0,0x800,0x800,0x800,0x0,0xc4080007,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400,0x400,0x400,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x4,0x0,0x0,0x14,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3,0x0,0x0,0x200,};
93519351
}
93529352
private static void jj_la1_init_7() {
9353-
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,0x20,0x20,0x0,0x20,0x20,0x0,0x10,0x21,0x21,0x40,0x20,0x0,0x0,0x0,0x40,0x0,0x10,0x20,0x20,0x0,0x20,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x0,0x1,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,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,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
9353+
jj_la1_7 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x40,0x0,0x40,0x40,0x0,0x20,0x42,0x42,0x81,0x40,0x0,0x0,0x1,0x81,0x0,0x20,0x40,0x40,0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3,0x3,0x0,0x3,0x3,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
93549354
}
93559355
final private JJCalls[] jj_2_rtns = new JJCalls[5];
93569356
private boolean jj_rescan = false;
@@ -9563,7 +9563,7 @@ private void jj_add_error_token(int kind, int pos) {
95639563
/** Generate ParseException. */
95649564
public ParseException generateParseException() {
95659565
jj_expentries.clear();
9566-
boolean[] la1tokens = new boolean[243];
9566+
boolean[] la1tokens = new boolean[244];
95679567
if (jj_kind >= 0) {
95689568
la1tokens[jj_kind] = true;
95699569
jj_kind = -1;
@@ -9598,7 +9598,7 @@ public ParseException generateParseException() {
95989598
}
95999599
}
96009600
}
9601-
for (int i = 0; i < 243; i++) {
9601+
for (int i = 0; i < 244; i++) {
96029602
if (la1tokens[i]) {
96039603
jj_expentry = new int[1];
96049604
jj_expentry[0] = i;

‎jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/javacc/ARQParserConstants.java‎

Lines changed: 59 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -393,117 +393,119 @@ public interface ARQParserConstants {
393393
/** RegularExpression Id. */
394394
int UCHAR = 186;
395395
/** RegularExpression Id. */
396-
int UCHAR4 = 187;
396+
int UCHAR_DELIM = 187;
397397
/** RegularExpression Id. */
398-
int UCHAR8 = 188;
398+
int UCHAR4 = 188;
399399
/** RegularExpression Id. */
400-
int STRING_LITERAL1 = 189;
400+
int UCHAR8 = 189;
401401
/** RegularExpression Id. */
402-
int STRING_LITERAL2 = 190;
402+
int STRING_LITERAL1 = 190;
403403
/** RegularExpression Id. */
404-
int STRING_LITERAL_LONG1 = 191;
404+
int STRING_LITERAL2 = 191;
405405
/** RegularExpression Id. */
406-
int STRING_LITERAL_LONG2 = 192;
406+
int STRING_LITERAL_LONG1 = 192;
407407
/** RegularExpression Id. */
408-
int LPAREN = 193;
408+
int STRING_LITERAL_LONG2 = 193;
409409
/** RegularExpression Id. */
410-
int RPAREN = 194;
410+
int LPAREN = 194;
411411
/** RegularExpression Id. */
412-
int NIL = 195;
412+
int RPAREN = 195;
413413
/** RegularExpression Id. */
414-
int LBRACE = 196;
414+
int NIL = 196;
415415
/** RegularExpression Id. */
416-
int RBRACE = 197;
416+
int LBRACE = 197;
417417
/** RegularExpression Id. */
418-
int LBRACKET = 198;
418+
int RBRACE = 198;
419419
/** RegularExpression Id. */
420-
int RBRACKET = 199;
420+
int LBRACKET = 199;
421421
/** RegularExpression Id. */
422-
int ANON = 200;
422+
int RBRACKET = 200;
423423
/** RegularExpression Id. */
424-
int SEMICOLON = 201;
424+
int ANON = 201;
425425
/** RegularExpression Id. */
426-
int COMMA = 202;
426+
int SEMICOLON = 202;
427427
/** RegularExpression Id. */
428-
int DOT = 203;
428+
int COMMA = 203;
429429
/** RegularExpression Id. */
430-
int EQ = 204;
430+
int DOT = 204;
431431
/** RegularExpression Id. */
432-
int NE = 205;
432+
int EQ = 205;
433433
/** RegularExpression Id. */
434-
int GT = 206;
434+
int NE = 206;
435435
/** RegularExpression Id. */
436-
int LT = 207;
436+
int GT = 207;
437437
/** RegularExpression Id. */
438-
int LE = 208;
438+
int LT = 208;
439439
/** RegularExpression Id. */
440-
int GE = 209;
440+
int LE = 209;
441441
/** RegularExpression Id. */
442-
int L_TRIPLE = 210;
442+
int GE = 210;
443443
/** RegularExpression Id. */
444-
int R_TRIPLE = 211;
444+
int L_TRIPLE = 211;
445445
/** RegularExpression Id. */
446-
int LT2 = 212;
446+
int R_TRIPLE = 212;
447447
/** RegularExpression Id. */
448-
int GT2 = 213;
448+
int LT2 = 213;
449449
/** RegularExpression Id. */
450-
int L_ANN = 214;
450+
int GT2 = 214;
451451
/** RegularExpression Id. */
452-
int R_ANN = 215;
452+
int L_ANN = 215;
453453
/** RegularExpression Id. */
454-
int TILDE = 216;
454+
int R_ANN = 216;
455455
/** RegularExpression Id. */
456-
int BANG = 217;
456+
int TILDE = 217;
457457
/** RegularExpression Id. */
458-
int COLON = 218;
458+
int BANG = 218;
459459
/** RegularExpression Id. */
460-
int SC_OR = 219;
460+
int COLON = 219;
461461
/** RegularExpression Id. */
462-
int SC_AND = 220;
462+
int SC_OR = 220;
463463
/** RegularExpression Id. */
464-
int PLUS = 221;
464+
int SC_AND = 221;
465465
/** RegularExpression Id. */
466-
int MINUS = 222;
466+
int PLUS = 222;
467467
/** RegularExpression Id. */
468-
int STAR = 223;
468+
int MINUS = 223;
469469
/** RegularExpression Id. */
470-
int SLASH = 224;
470+
int STAR = 224;
471471
/** RegularExpression Id. */
472-
int DATATYPE = 225;
472+
int SLASH = 225;
473473
/** RegularExpression Id. */
474-
int AT = 226;
474+
int DATATYPE = 226;
475475
/** RegularExpression Id. */
476-
int ASSIGN = 227;
476+
int AT = 227;
477477
/** RegularExpression Id. */
478-
int VBAR = 228;
478+
int ASSIGN = 228;
479479
/** RegularExpression Id. */
480-
int CARAT = 229;
480+
int VBAR = 229;
481481
/** RegularExpression Id. */
482-
int QMARK = 230;
482+
int CARAT = 230;
483483
/** RegularExpression Id. */
484-
int SURROGATE_PAIR = 231;
484+
int QMARK = 231;
485485
/** RegularExpression Id. */
486-
int PN_CHARS_BASE = 232;
486+
int SURROGATE_PAIR = 232;
487487
/** RegularExpression Id. */
488-
int PN_CHARS_U = 233;
488+
int PN_CHARS_BASE = 233;
489489
/** RegularExpression Id. */
490-
int PN_CHARS = 234;
490+
int PN_CHARS_U = 234;
491491
/** RegularExpression Id. */
492-
int PN_PREFIX = 235;
492+
int PN_CHARS = 235;
493493
/** RegularExpression Id. */
494-
int PN_LOCAL = 236;
494+
int PN_PREFIX = 236;
495495
/** RegularExpression Id. */
496-
int VARNAME = 237;
496+
int PN_LOCAL = 237;
497497
/** RegularExpression Id. */
498-
int PN_LOCAL_ESC = 238;
498+
int VARNAME = 238;
499499
/** RegularExpression Id. */
500-
int PLX = 239;
500+
int PN_LOCAL_ESC = 239;
501501
/** RegularExpression Id. */
502-
int HEX = 240;
502+
int PLX = 240;
503503
/** RegularExpression Id. */
504-
int PERCENT = 241;
504+
int HEX = 241;
505505
/** RegularExpression Id. */
506-
int UNKNOWN = 242;
506+
int PERCENT = 242;
507+
/** RegularExpression Id. */
508+
int UNKNOWN = 243;
507509

508510
/** Lexical state. */
509511
int DEFAULT = 0;
@@ -697,6 +699,7 @@ public interface ARQParserConstants {
697699
"\"\\\'\\\'\\\'\"",
698700
"<ECHAR>",
699701
"<UCHAR>",
702+
"<UCHAR_DELIM>",
700703
"<UCHAR4>",
701704
"<UCHAR8>",
702705
"<STRING_LITERAL1>",

0 commit comments

Comments
 (0)