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 b49862c3a2f97173bfb9068a525a08b87a2b52f9 Author: Andy Seaborne <[email protected]> AuthorDate: Sun Dec 14 11:15:11 2025 +0000 GH-3659: Changes SPARQL grammar to align with WG changes --- jena-arq/Grammar/arq.jj | 16 +- jena-arq/Grammar/main.jj | 19 +- jena-arq/Grammar/sparql_12.jj | 16 +- .../jena/sparql/lang/arq/javacc/ARQParser.java | 229 ++++++++------------- .../lang/sparql_12/javacc/SPARQLParser12.java | 189 ++++++----------- 5 files changed, 166 insertions(+), 303 deletions(-) diff --git a/jena-arq/Grammar/arq.jj b/jena-arq/Grammar/arq.jj index 0529efc2af..698494ed4c 100644 --- a/jena-arq/Grammar/arq.jj +++ b/jena-arq/Grammar/arq.jj @@ -1610,10 +1610,10 @@ Node TripleTermData() : { Node n = null ; Token openToken ; String iri ; Node s Node TripleTermDataSubject() : { Node n = null; String iri; } { ( iri = iri() { n = createNode(iri) ; } - | n = RDFLiteral() - | n = NumericLiteral() - | n = BooleanLiteral() - | n = TripleTermData() +// | n = RDFLiteral() +// | n = NumericLiteral() +// | n = BooleanLiteral() +// | n = TripleTermData() ) { return n; } } @@ -1810,11 +1810,11 @@ Node ExprTripleTerm() : { Token t ; Node s,p,o,n; } Node ExprTripleTermSubject() : { Node n; String iri; } { ( iri = iri() { n = createNode(iri); } - | n = RDFLiteral() - | n = NumericLiteral() - | n = BooleanLiteral() | n = Var() - | n = ExprTripleTerm() +// | n = RDFLiteral() +// | n = NumericLiteral() +// | n = BooleanLiteral() +// | n = ExprTripleTerm() ) { return n; } } diff --git a/jena-arq/Grammar/main.jj b/jena-arq/Grammar/main.jj index 7c89ebbbfa..4cdfa8a727 100644 --- a/jena-arq/Grammar/main.jj +++ b/jena-arq/Grammar/main.jj @@ -1894,10 +1894,10 @@ Node TripleTermData() : { Node n = null ; Token openToken ; String iri ; Node s Node TripleTermDataSubject() : { Node n = null; String iri; } { ( iri = iri() { n = createNode(iri) ; } - | n = RDFLiteral() - | n = NumericLiteral() - | n = BooleanLiteral() - | n = TripleTermData() +// | n = RDFLiteral() +// | n = NumericLiteral() +// | n = BooleanLiteral() +// | n = TripleTermData() ) { return n; } } @@ -2120,11 +2120,11 @@ Node ExprTripleTerm() : { Token t ; Node s,p,o,n; } Node ExprTripleTermSubject() : { Node n; String iri; } { ( iri = iri() { n = createNode(iri); } - | n = RDFLiteral() - | n = NumericLiteral() - | n = BooleanLiteral() | n = Var() - | n = ExprTripleTerm() +// | n = RDFLiteral() +// | n = NumericLiteral() +// | n = BooleanLiteral() +// | n = ExprTripleTerm() ) { return n; } } @@ -2141,9 +2141,6 @@ Node ExprTripleTermObject() : { Node n; String iri; } { return n; } } - - - Expr BrackettedExpression() : { Expr expr ; } { <LPAREN> expr = Expression() <RPAREN> { return expr ; } diff --git a/jena-arq/Grammar/sparql_12.jj b/jena-arq/Grammar/sparql_12.jj index ca01c61fbc..219dfec1d0 100644 --- a/jena-arq/Grammar/sparql_12.jj +++ b/jena-arq/Grammar/sparql_12.jj @@ -1389,10 +1389,10 @@ Node TripleTermData() : { Node n = null ; Token openToken ; String iri ; Node s Node TripleTermDataSubject() : { Node n = null; String iri; } { ( iri = iri() { n = createNode(iri) ; } - | n = RDFLiteral() - | n = NumericLiteral() - | n = BooleanLiteral() - | n = TripleTermData() +// | n = RDFLiteral() +// | n = NumericLiteral() +// | n = BooleanLiteral() +// | n = TripleTermData() ) { return n; } } @@ -1580,11 +1580,11 @@ Node ExprTripleTerm() : { Token t ; Node s,p,o,n; } Node ExprTripleTermSubject() : { Node n; String iri; } { ( iri = iri() { n = createNode(iri); } - | n = RDFLiteral() - | n = NumericLiteral() - | n = BooleanLiteral() | n = Var() - | n = ExprTripleTerm() +// | n = RDFLiteral() +// | n = NumericLiteral() +// | n = BooleanLiteral() +// | n = ExprTripleTerm() ) { return n; } } 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 7ba5aacea7..e8d35d3374 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 @@ -5217,47 +5217,8 @@ n = createTripleTerm(s, p, o, openToken.beginLine, openToken.beginColumn); } final public Node TripleTermDataSubject() throws ParseException {Node n = null; String iri; - switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { - case IRIref: - case PNAME_NS: - case PNAME_LN:{ - iri = iri(); + iri = iri(); n = createNode(iri) ; - break; - } - case STRING_LITERAL1: - case STRING_LITERAL2: - case STRING_LITERAL_LONG1: - case STRING_LITERAL_LONG2:{ - n = RDFLiteral(); - break; - } - case INTEGER: - case DECIMAL: - case DOUBLE: - case INTEGER_POSITIVE: - case DECIMAL_POSITIVE: - case DOUBLE_POSITIVE: - case INTEGER_NEGATIVE: - case DECIMAL_NEGATIVE: - case DOUBLE_NEGATIVE:{ - n = NumericLiteral(); - break; - } - case TRUE: - case FALSE:{ - n = BooleanLiteral(); - break; - } - case L_TRIPLE:{ - n = TripleTermData(); - break; - } - default: - jj_la1[149] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } {if ("" != null) return n;} throw new Error("Missing return statement in function"); } @@ -5300,7 +5261,7 @@ n = createNode(iri) ; break; } default: - jj_la1[150] = jj_gen; + jj_la1[149] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5334,7 +5295,7 @@ n = createNode(iri) ; break; } default: - jj_la1[151] = jj_gen; + jj_la1[150] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5363,7 +5324,7 @@ n = createNode(iri) ; break; } default: - jj_la1[152] = jj_gen; + jj_la1[151] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5382,7 +5343,7 @@ n = createNode(iri) ; break; } default: - jj_la1[153] = jj_gen; + jj_la1[152] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5407,7 +5368,7 @@ n = createNode(iri) ; break; } default: - jj_la1[154] = jj_gen; + jj_la1[153] = jj_gen; break label_39; } jj_consume_token(SC_OR); @@ -5428,7 +5389,7 @@ expr1 = new E_LogicalOr(expr1, expr2) ; break; } default: - jj_la1[155] = jj_gen; + jj_la1[154] = jj_gen; break label_40; } jj_consume_token(SC_AND); @@ -5507,14 +5468,14 @@ expr1 = new E_NotOneOf(expr1, a) ; break; } default: - jj_la1[156] = jj_gen; + jj_la1[155] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; } default: - jj_la1[157] = jj_gen; + jj_la1[156] = jj_gen; ; } {if ("" != null) return expr1 ;} @@ -5544,7 +5505,7 @@ expr1 = new E_NotOneOf(expr1, a) ; break; } default: - jj_la1[158] = jj_gen; + jj_la1[157] = jj_gen; break label_41; } switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { @@ -5586,7 +5547,7 @@ n = stripSign(n) ; break; } default: - jj_la1[159] = jj_gen; + jj_la1[158] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5599,7 +5560,7 @@ n = stripSign(n) ; break; } default: - jj_la1[160] = jj_gen; + jj_la1[159] = jj_gen; break label_42; } switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { @@ -5616,7 +5577,7 @@ expr2 = new E_Divide(expr2, expr3) ; break; } default: - jj_la1[161] = jj_gen; + jj_la1[160] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5628,7 +5589,7 @@ if ( addition ) break; } default: - jj_la1[162] = jj_gen; + jj_la1[161] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5650,7 +5611,7 @@ if ( addition ) break; } default: - jj_la1[163] = jj_gen; + jj_la1[162] = jj_gen; break label_43; } switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { @@ -5679,7 +5640,7 @@ expr1 = new E_OpNumericIntegerDivide(expr1, expr2) ; break; } default: - jj_la1[164] = jj_gen; + jj_la1[163] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5822,7 +5783,7 @@ expr1 = new E_OpNumericIntegerDivide(expr1, expr2) ; break; } default: - jj_la1[165] = jj_gen; + jj_la1[164] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5973,7 +5934,7 @@ expr1 = new E_OpNumericIntegerDivide(expr1, expr2) ; break; } default: - jj_la1[166] = jj_gen; + jj_la1[165] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6011,41 +5972,13 @@ n = createTripleTerm(s, p, o, t.beginLine, t.beginColumn); n = createNode(iri); break; } - case STRING_LITERAL1: - case STRING_LITERAL2: - case STRING_LITERAL_LONG1: - case STRING_LITERAL_LONG2:{ - n = RDFLiteral(); - break; - } - case INTEGER: - case DECIMAL: - case DOUBLE: - case INTEGER_POSITIVE: - case DECIMAL_POSITIVE: - case DOUBLE_POSITIVE: - case INTEGER_NEGATIVE: - case DECIMAL_NEGATIVE: - case DOUBLE_NEGATIVE:{ - n = NumericLiteral(); - break; - } - case TRUE: - case FALSE:{ - n = BooleanLiteral(); - break; - } case VAR1: case VAR2:{ n = Var(); break; } - case L_TRIPLE:{ - n = ExprTripleTerm(); - break; - } default: - jj_la1[167] = jj_gen; + jj_la1[166] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6096,7 +6029,7 @@ n = createNode(iri); break; } default: - jj_la1[168] = jj_gen; + jj_la1[167] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6198,7 +6131,7 @@ n = createNode(iri); break; } default: - jj_la1[169] = jj_gen; + jj_la1[168] = jj_gen; ; } jj_consume_token(RPAREN); @@ -6216,7 +6149,7 @@ n = createNode(iri); break; } default: - jj_la1[170] = jj_gen; + jj_la1[169] = jj_gen; ; } jj_consume_token(RPAREN); @@ -6239,7 +6172,7 @@ n = createNode(iri); break; } default: - jj_la1[171] = jj_gen; + jj_la1[170] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6476,7 +6409,7 @@ n = createNode(iri); break; } default: - jj_la1[172] = jj_gen; + jj_la1[171] = jj_gen; ; } jj_consume_token(RPAREN); @@ -6575,7 +6508,7 @@ a.add(expr) ; break; } default: - jj_la1[173] = jj_gen; + jj_la1[172] = jj_gen; break label_44; } jj_consume_token(COMMA); @@ -6767,7 +6700,7 @@ a.add(expr) ; break; } default: - jj_la1[174] = jj_gen; + jj_la1[173] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6787,7 +6720,7 @@ a.add(expr) ; break; } default: - jj_la1[175] = jj_gen; + jj_la1[174] = jj_gen; ; } jj_consume_token(RPAREN); @@ -6808,7 +6741,7 @@ a.add(expr) ; break; } default: - jj_la1[176] = jj_gen; + jj_la1[175] = jj_gen; ; } jj_consume_token(RPAREN); @@ -6831,7 +6764,7 @@ a.add(expr) ; break; } default: - jj_la1[177] = jj_gen; + jj_la1[176] = jj_gen; ; } jj_consume_token(RPAREN); @@ -6871,7 +6804,7 @@ distinct = true ; break; } default: - jj_la1[178] = jj_gen; + jj_la1[177] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { @@ -6995,7 +6928,7 @@ distinct = true ; break; } default: - jj_la1[179] = jj_gen; + jj_la1[178] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7014,7 +6947,7 @@ distinct = true ; break; } default: - jj_la1[180] = jj_gen; + jj_la1[179] = jj_gen; ; } expr = Expression(); @@ -7032,7 +6965,7 @@ distinct = true ; break; } default: - jj_la1[181] = jj_gen; + jj_la1[180] = jj_gen; ; } expr = Expression(); @@ -7050,7 +6983,7 @@ distinct = true ; break; } default: - jj_la1[182] = jj_gen; + jj_la1[181] = jj_gen; ; } expr = Expression(); @@ -7068,7 +7001,7 @@ distinct = true ; break; } default: - jj_la1[183] = jj_gen; + jj_la1[182] = jj_gen; ; } expr = Expression(); @@ -7086,7 +7019,7 @@ distinct = true ; break; } default: - jj_la1[184] = jj_gen; + jj_la1[183] = jj_gen; ; } expr = Expression(); @@ -7104,7 +7037,7 @@ distinct = true ; break; } default: - jj_la1[185] = jj_gen; + jj_la1[184] = jj_gen; ; } expr = Expression(); @@ -7122,7 +7055,7 @@ distinct = true ; break; } default: - jj_la1[186] = jj_gen; + jj_la1[185] = jj_gen; ; } expr = Expression(); @@ -7140,7 +7073,7 @@ distinct = true ; break; } default: - jj_la1[187] = jj_gen; + jj_la1[186] = jj_gen; ; } expr = Expression(); @@ -7161,7 +7094,7 @@ ordered.add(expr2) ; break; } default: - jj_la1[188] = jj_gen; + jj_la1[187] = jj_gen; ; } } else { @@ -7175,7 +7108,7 @@ ordered.add(expr2) ; break; } default: - jj_la1[189] = jj_gen; + jj_la1[188] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7183,7 +7116,7 @@ ordered.add(expr2) ; break; } default: - jj_la1[190] = jj_gen; + jj_la1[189] = jj_gen; ; } jj_consume_token(RPAREN); @@ -7200,7 +7133,7 @@ distinct = true ; break; } default: - jj_la1[191] = jj_gen; + jj_la1[190] = jj_gen; ; } expr = Expression(); @@ -7218,7 +7151,7 @@ distinct = true ; break; } default: - jj_la1[192] = jj_gen; + jj_la1[191] = jj_gen; ; } expr = Expression(); @@ -7236,7 +7169,7 @@ distinct = true ; break; } default: - jj_la1[193] = jj_gen; + jj_la1[192] = jj_gen; ; } expr = Expression(); @@ -7254,7 +7187,7 @@ distinct = true ; break; } default: - jj_la1[194] = jj_gen; + jj_la1[193] = jj_gen; ; } expr = Expression(); @@ -7272,7 +7205,7 @@ distinct = true ; break; } default: - jj_la1[195] = jj_gen; + jj_la1[194] = jj_gen; ; } expr = Expression(); @@ -7290,7 +7223,7 @@ distinct = true ; break; } default: - jj_la1[196] = jj_gen; + jj_la1[195] = jj_gen; ; } expr = Expression(); @@ -7310,7 +7243,7 @@ distinct = true ; break; } default: - jj_la1[197] = jj_gen; + jj_la1[196] = jj_gen; ; } expr = Expression(); @@ -7321,7 +7254,7 @@ distinct = true ; break; } default: - jj_la1[198] = jj_gen; + jj_la1[197] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { @@ -7434,14 +7367,14 @@ if ( scs == null ) break; } default: - jj_la1[199] = jj_gen; + jj_la1[198] = jj_gen; break label_45; } } break; } default: - jj_la1[200] = jj_gen; + jj_la1[199] = jj_gen; ; } jj_consume_token(RPAREN); @@ -7458,7 +7391,7 @@ agg = AggregatorFactory.createCustom(iri, a) ; break; } default: - jj_la1[201] = jj_gen; + jj_la1[200] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7485,7 +7418,7 @@ Expr exprAgg = getQuery().allocAggregate(agg) ; break; } default: - jj_la1[202] = jj_gen; + jj_la1[201] = jj_gen; ; } if ( a == null ) @@ -7520,14 +7453,14 @@ if ( a == null ) break; } default: - jj_la1[203] = jj_gen; + jj_la1[202] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; } default: - jj_la1[204] = jj_gen; + jj_la1[203] = jj_gen; ; } {if ("" != null) return createLiteralString(lex, token.beginLine, token.beginColumn) ;} @@ -7555,7 +7488,7 @@ if ( a == null ) break; } default: - jj_la1[205] = jj_gen; + jj_la1[204] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7581,7 +7514,7 @@ if ( a == null ) break; } default: - jj_la1[206] = jj_gen; + jj_la1[205] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7606,7 +7539,7 @@ if ( a == null ) break; } default: - jj_la1[207] = jj_gen; + jj_la1[206] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7631,7 +7564,7 @@ if ( a == null ) break; } default: - jj_la1[208] = jj_gen; + jj_la1[207] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7651,7 +7584,7 @@ if ( a == null ) break; } default: - jj_la1[209] = jj_gen; + jj_la1[208] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7681,7 +7614,7 @@ lex = stripQuotes3(t.image) ; break; } default: - jj_la1[210] = jj_gen; + jj_la1[209] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7705,7 +7638,7 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ; break; } default: - jj_la1[211] = jj_gen; + jj_la1[210] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7725,7 +7658,7 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ; break; } default: - jj_la1[212] = jj_gen; + jj_la1[211] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7746,7 +7679,7 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ; break; } default: - jj_la1[213] = jj_gen; + jj_la1[212] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -9378,7 +9311,7 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ; private Token jj_scanpos, jj_lastpos; private int jj_la; private int jj_gen; - final private int[] jj_la1 = new int[214]; + final private int[] jj_la1 = new int[213]; static private int[] jj_la1_0; static private int[] jj_la1_1; static private int[] jj_la1_2; @@ -9398,28 +9331,28 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ; jj_la1_init_7(); } private static void jj_la1_init_0() { - jj_la1_0 = new int[] {0x3c800000,0x200,0x700000,0x700000,0x0,0x0,0x3000000,0x3000000,0x1c00,0x0,0x40dc00,0x40dc00,0x40dc00,0x0,0x0,0x0,0xdc00,0xdc00,0x0,0x0,0x0,0x0,0x0,0xc000,0x1c00,0x0,0x0,0x0,0x0,0xc0000000,0x40dc00,0x0,0x40dc00,0x401c00,0x40dc00,0x0,0x40dc00,0x40dc00,0x0,0x40dc00,0x40dc00,0x80000000,0x40000000,0xc0000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c00,0x0,0x1c00,0x0,0xfc00,0x0,0x0,0xfc00,0xfc00,0xfc00,0x0,0x0,0xfc00,0x0,0xfc00,0x0,0x800000, [...] + jj_la1_0 = new int[] {0x3c800000,0x200,0x700000,0x700000,0x0,0x0,0x3000000,0x3000000,0x1c00,0x0,0x40dc00,0x40dc00,0x40dc00,0x0,0x0,0x0,0xdc00,0xdc00,0x0,0x0,0x0,0x0,0x0,0xc000,0x1c00,0x0,0x0,0x0,0x0,0xc0000000,0x40dc00,0x0,0x40dc00,0x401c00,0x40dc00,0x0,0x40dc00,0x40dc00,0x0,0x40dc00,0x40dc00,0x80000000,0x40000000,0xc0000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c00,0x0,0x1c00,0x0,0xfc00,0x0,0x0,0xfc00,0xfc00,0xfc00,0x0,0x0,0xfc00,0x0,0xfc00,0x0,0x800000, [...] } private static void jj_la1_init_1() { - jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x10000000,0xfe00000,0xfe00000,0xfe00000,0x80,0x80,0x180,0x0,0x0,0x80,0x100,0x80,0x80,0x0,0x0,0x40,0x100,0x20000000,0x40000000,0x1,0x0,0xfe00000,0x10000000,0xfe00000,0xfe00000,0xfe00030,0x30,0xfe00000,0xfe00030,0x30,0xfe00000,0xfe00030,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x400,0x400,0x440,0x0,0x400,0x0,0x0,0x0,0x0,0x400,0x0,0x0,0x400,0x0,0x0,0x0,0x0,0xc1fec04,0x0,0x0,0x0,0x0,0xc1fe [...] + jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x10000000,0xfe00000,0xfe00000,0xfe00000,0x80,0x80,0x180,0x0,0x0,0x80,0x100,0x80,0x80,0x0,0x0,0x40,0x100,0x20000000,0x40000000,0x1,0x0,0xfe00000,0x10000000,0xfe00000,0xfe00000,0xfe00030,0x30,0xfe00000,0xfe00030,0x30,0xfe00000,0xfe00030,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x400,0x400,0x440,0x0,0x400,0x0,0x0,0x0,0x0,0x400,0x0,0x0,0x400,0x0,0x0,0x0,0x0,0xc1fec04,0x0,0x0,0x0,0x0,0xc1fe [...] } private static void jj_la1_init_2() { - jj_la1_2 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xcbedffff,0xcbedffff,0xcbedffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xcbedffff,0x0,0xcbedffff,0xcbedffff,0xcbedffff,0x0,0xcbedffff,0xcbedffff,0x0,0xcbedffff,0xcbedffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x0,0x0,0x0,0x0,0x20000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0 [...] + jj_la1_2 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xcbedffff,0xcbedffff,0xcbedffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xcbedffff,0x0,0xcbedffff,0xcbedffff,0xcbedffff,0x0,0xcbedffff,0xcbedffff,0x0,0xcbedffff,0xcbedffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x0,0x0,0x0,0x0,0x20000,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,0xffffffff,0xffffffff,0xffffffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffffffff,0x0,0xffffffff,0xffffffff,0xffffffff,0x0,0xffffffff,0xffffffff,0x0,0xffffffff,0xffffffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,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,0xffffffff,0xffffffff,0xffffffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffffffff,0x0,0xffffffff,0xffffffff,0xffffffff,0x0,0xffffffff,0xffffffff,0x0,0xffffffff,0xffffffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,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_4() { - 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,0x [...] + 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,0x [...] } private static void jj_la1_init_5() { - 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, [...] + 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, [...] } private static void jj_la1_init_6() { - 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,0x10 [...] + 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,0x10 [...] } 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,0x20,0x20,0x0,0x20,0x2 [...] + 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,0x2 [...] } final private JJCalls[] jj_2_rtns = new JJCalls[5]; private boolean jj_rescan = false; @@ -9436,7 +9369,7 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 214; i++) jj_la1[i] = -1; + for (int i = 0; i < 213; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -9451,7 +9384,7 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 214; i++) jj_la1[i] = -1; + for (int i = 0; i < 213; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -9462,7 +9395,7 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 214; i++) jj_la1[i] = -1; + for (int i = 0; i < 213; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -9481,7 +9414,7 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 214; i++) jj_la1[i] = -1; + for (int i = 0; i < 213; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -9491,7 +9424,7 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 214; i++) jj_la1[i] = -1; + for (int i = 0; i < 213; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -9501,7 +9434,7 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 214; i++) jj_la1[i] = -1; + for (int i = 0; i < 213; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -9637,7 +9570,7 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ; la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 214; i++) { + for (int i = 0; i < 213; i++) { if (jj_la1[i] == jj_gen) { for (int j = 0; j < 32; j++) { if ((jj_la1_0[i] & (1<<j)) != 0) { 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 24e139cf0c..dd0221df0e 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 @@ -4099,47 +4099,8 @@ n = createTripleTerm(s, p, o, openToken.beginLine, openToken.beginColumn); } final public Node TripleTermDataSubject() throws ParseException {Node n = null; String iri; - switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { - case IRIref: - case PNAME_NS: - case PNAME_LN:{ - iri = iri(); + iri = iri(); n = createNode(iri) ; - break; - } - case STRING_LITERAL1: - case STRING_LITERAL2: - case STRING_LITERAL_LONG1: - case STRING_LITERAL_LONG2:{ - n = RDFLiteral(); - break; - } - case INTEGER: - case DECIMAL: - case DOUBLE: - case INTEGER_POSITIVE: - case DECIMAL_POSITIVE: - case DOUBLE_POSITIVE: - case INTEGER_NEGATIVE: - case DECIMAL_NEGATIVE: - case DOUBLE_NEGATIVE:{ - n = NumericLiteral(); - break; - } - case TRUE: - case FALSE:{ - n = BooleanLiteral(); - break; - } - case L_TRIPLE:{ - n = TripleTermData(); - break; - } - default: - jj_la1[133] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } {if ("" != null) return n;} throw new Error("Missing return statement in function"); } @@ -4182,7 +4143,7 @@ n = createNode(iri) ; break; } default: - jj_la1[134] = jj_gen; + jj_la1[133] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4216,7 +4177,7 @@ n = createNode(iri) ; break; } default: - jj_la1[135] = jj_gen; + jj_la1[134] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4236,7 +4197,7 @@ n = createNode(iri) ; break; } default: - jj_la1[136] = jj_gen; + jj_la1[135] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4261,7 +4222,7 @@ n = createNode(iri) ; break; } default: - jj_la1[137] = jj_gen; + jj_la1[136] = jj_gen; break label_33; } jj_consume_token(SC_OR); @@ -4282,7 +4243,7 @@ expr1 = new E_LogicalOr(expr1, expr2) ; break; } default: - jj_la1[138] = jj_gen; + jj_la1[137] = jj_gen; break label_34; } jj_consume_token(SC_AND); @@ -4361,14 +4322,14 @@ expr1 = new E_NotOneOf(expr1, a) ; break; } default: - jj_la1[139] = jj_gen; + jj_la1[138] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; } default: - jj_la1[140] = jj_gen; + jj_la1[139] = jj_gen; ; } {if ("" != null) return expr1 ;} @@ -4398,7 +4359,7 @@ expr1 = new E_NotOneOf(expr1, a) ; break; } default: - jj_la1[141] = jj_gen; + jj_la1[140] = jj_gen; break label_35; } switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { @@ -4440,7 +4401,7 @@ n = stripSign(n) ; break; } default: - jj_la1[142] = jj_gen; + jj_la1[141] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4453,7 +4414,7 @@ n = stripSign(n) ; break; } default: - jj_la1[143] = jj_gen; + jj_la1[142] = jj_gen; break label_36; } switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { @@ -4470,7 +4431,7 @@ expr2 = new E_Divide(expr2, expr3) ; break; } default: - jj_la1[144] = jj_gen; + jj_la1[143] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4482,7 +4443,7 @@ if ( addition ) break; } default: - jj_la1[145] = jj_gen; + jj_la1[144] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4502,7 +4463,7 @@ if ( addition ) break; } default: - jj_la1[146] = jj_gen; + jj_la1[145] = jj_gen; break label_37; } switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { @@ -4519,7 +4480,7 @@ expr1 = new E_Divide(expr1, expr2) ; break; } default: - jj_la1[147] = jj_gen; + jj_la1[146] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4645,7 +4606,7 @@ expr1 = new E_Divide(expr1, expr2) ; break; } default: - jj_la1[148] = jj_gen; + jj_la1[147] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4779,7 +4740,7 @@ expr1 = new E_Divide(expr1, expr2) ; break; } default: - jj_la1[149] = jj_gen; + jj_la1[148] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4817,41 +4778,13 @@ n = createTripleTerm(s, p, o, t.beginLine, t.beginColumn); n = createNode(iri); break; } - case STRING_LITERAL1: - case STRING_LITERAL2: - case STRING_LITERAL_LONG1: - case STRING_LITERAL_LONG2:{ - n = RDFLiteral(); - break; - } - case INTEGER: - case DECIMAL: - case DOUBLE: - case INTEGER_POSITIVE: - case DECIMAL_POSITIVE: - case DOUBLE_POSITIVE: - case INTEGER_NEGATIVE: - case DECIMAL_NEGATIVE: - case DOUBLE_NEGATIVE:{ - n = NumericLiteral(); - break; - } - case TRUE: - case FALSE:{ - n = BooleanLiteral(); - break; - } case VAR1: case VAR2:{ n = Var(); break; } - case L_TRIPLE:{ - n = ExprTripleTerm(); - break; - } default: - jj_la1[150] = jj_gen; + jj_la1[149] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4902,7 +4835,7 @@ n = createNode(iri); break; } default: - jj_la1[151] = jj_gen; + jj_la1[150] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5015,7 +4948,7 @@ n = createNode(iri); break; } default: - jj_la1[152] = jj_gen; + jj_la1[151] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5456,7 +5389,7 @@ n = createNode(iri); break; } default: - jj_la1[153] = jj_gen; + jj_la1[152] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5476,7 +5409,7 @@ n = createNode(iri); break; } default: - jj_la1[154] = jj_gen; + jj_la1[153] = jj_gen; ; } jj_consume_token(RPAREN); @@ -5497,7 +5430,7 @@ n = createNode(iri); break; } default: - jj_la1[155] = jj_gen; + jj_la1[154] = jj_gen; ; } jj_consume_token(RPAREN); @@ -5520,7 +5453,7 @@ n = createNode(iri); break; } default: - jj_la1[156] = jj_gen; + jj_la1[155] = jj_gen; ; } jj_consume_token(RPAREN); @@ -5560,7 +5493,7 @@ distinct = true ; break; } default: - jj_la1[157] = jj_gen; + jj_la1[156] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { @@ -5667,7 +5600,7 @@ distinct = true ; break; } default: - jj_la1[158] = jj_gen; + jj_la1[157] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5686,7 +5619,7 @@ distinct = true ; break; } default: - jj_la1[159] = jj_gen; + jj_la1[158] = jj_gen; ; } expr = Expression(); @@ -5704,7 +5637,7 @@ distinct = true ; break; } default: - jj_la1[160] = jj_gen; + jj_la1[159] = jj_gen; ; } expr = Expression(); @@ -5722,7 +5655,7 @@ distinct = true ; break; } default: - jj_la1[161] = jj_gen; + jj_la1[160] = jj_gen; ; } expr = Expression(); @@ -5740,7 +5673,7 @@ distinct = true ; break; } default: - jj_la1[162] = jj_gen; + jj_la1[161] = jj_gen; ; } expr = Expression(); @@ -5758,7 +5691,7 @@ distinct = true ; break; } default: - jj_la1[163] = jj_gen; + jj_la1[162] = jj_gen; ; } expr = Expression(); @@ -5776,7 +5709,7 @@ distinct = true ; break; } default: - jj_la1[164] = jj_gen; + jj_la1[163] = jj_gen; ; } expr = Expression(); @@ -5789,7 +5722,7 @@ distinct = true ; break; } default: - jj_la1[165] = jj_gen; + jj_la1[164] = jj_gen; ; } jj_consume_token(RPAREN); @@ -5797,7 +5730,7 @@ agg = AggregatorFactory.createGroupConcat(distinct, expr, sep, ordered) ; break; } default: - jj_la1[166] = jj_gen; + jj_la1[165] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5824,7 +5757,7 @@ Expr exprAgg = getQuery().allocAggregate(agg) ; break; } default: - jj_la1[167] = jj_gen; + jj_la1[166] = jj_gen; ; } if ( a == null ) @@ -5859,14 +5792,14 @@ if ( a == null ) break; } default: - jj_la1[168] = jj_gen; + jj_la1[167] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; } default: - jj_la1[169] = jj_gen; + jj_la1[168] = jj_gen; ; } {if ("" != null) return createLiteralString(lex, token.beginLine, token.beginColumn) ;} @@ -5894,7 +5827,7 @@ if ( a == null ) break; } default: - jj_la1[170] = jj_gen; + jj_la1[169] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5920,7 +5853,7 @@ if ( a == null ) break; } default: - jj_la1[171] = jj_gen; + jj_la1[170] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5945,7 +5878,7 @@ if ( a == null ) break; } default: - jj_la1[172] = jj_gen; + jj_la1[171] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5970,7 +5903,7 @@ if ( a == null ) break; } default: - jj_la1[173] = jj_gen; + jj_la1[172] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5990,7 +5923,7 @@ if ( a == null ) break; } default: - jj_la1[174] = jj_gen; + jj_la1[173] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6020,7 +5953,7 @@ lex = stripQuotes3(t.image) ; break; } default: - jj_la1[175] = jj_gen; + jj_la1[174] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6044,7 +5977,7 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ; break; } default: - jj_la1[176] = jj_gen; + jj_la1[175] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6064,7 +5997,7 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ; break; } default: - jj_la1[177] = jj_gen; + jj_la1[176] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6085,7 +6018,7 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ; break; } default: - jj_la1[178] = jj_gen; + jj_la1[177] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6107,7 +6040,7 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ; public Token jj_nt; private int jj_ntk; private int jj_gen; - final private int[] jj_la1 = new int[179]; + final private int[] jj_la1 = new int[178]; static private int[] jj_la1_0; static private int[] jj_la1_1; static private int[] jj_la1_2; @@ -6125,25 +6058,25 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ; jj_la1_init_6(); } 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 [...] + 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,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, [...] + 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,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 [...] + 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,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, [...] + 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,0x7ee00000,0x0,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,0x7ee00000,0x0,0x0,0x7ee00000,0x7ee00000,0x7ee00000,0x0,0x0,0x7ee00000,0x0,0x0,0x7ee00000,0x7ee00000,0x0,0x0,0x1000,0x0,0x7ee00000,0x0,0x0,0x0,0x7ee00000,0x0,0x7ee00000,0x0,0x0,0x0,0x0,0x [...] + jj_la1_4 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7ee00000,0x0,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,0x7ee00000,0x0,0x0,0x7ee00000,0x7ee00000,0x7ee00000,0x0,0x0,0x7ee00000,0x0,0x0,0x7ee00000,0x7ee00000,0x0,0x0,0x1000,0x0,0x7ee00000,0x0,0x0,0x0,0x7ee00000,0x0,0x7ee00000,0x0,0x0,0x0,0x0,0x [...] } private static void jj_la1_init_5() { - 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 [...] + 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,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 [...] + 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. */ @@ -6157,7 +6090,7 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 179; i++) jj_la1[i] = -1; + for (int i = 0; i < 178; i++) jj_la1[i] = -1; } /** Reinitialise. */ @@ -6171,7 +6104,7 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 179; i++) jj_la1[i] = -1; + for (int i = 0; i < 178; i++) jj_la1[i] = -1; } /** Constructor. */ @@ -6181,7 +6114,7 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 179; i++) jj_la1[i] = -1; + for (int i = 0; i < 178; i++) jj_la1[i] = -1; } /** Reinitialise. */ @@ -6199,7 +6132,7 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 179; i++) jj_la1[i] = -1; + for (int i = 0; i < 178; i++) jj_la1[i] = -1; } /** Constructor with generated Token Manager. */ @@ -6208,7 +6141,7 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 179; i++) jj_la1[i] = -1; + for (int i = 0; i < 178; i++) jj_la1[i] = -1; } /** Reinitialise. */ @@ -6217,7 +6150,7 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 179; i++) jj_la1[i] = -1; + for (int i = 0; i < 178; i++) jj_la1[i] = -1; } private Token jj_consume_token(int kind) throws ParseException { @@ -6273,7 +6206,7 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ; la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 179; i++) { + for (int i = 0; i < 178; i++) { if (jj_la1[i] == jj_gen) { for (int j = 0; j < 32; j++) { if ((jj_la1_0[i] & (1<<j)) != 0) {
