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 2012/03/09 15:47:41 UTC
svn commit: r1298860 -
/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11.java
Author: andy
Date: Fri Mar 9 14:47:40 2012
New Revision: 1298860
URL: http://svn.apache.org/viewvc?rev=1298860&view=rev
Log:
Changes to SPARQL 1.1
Property paths: New operators {*}, {+}, DISTINCT(path)
Modified:
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11.java
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11.java?rev=1298860&r1=1298859&r2=1298860&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11.java Fri Mar 9 14:47:40 2012
@@ -2547,6 +2547,7 @@ public class SPARQLParser11 extends SPAR
case PNAME_NS:
case PNAME_LN:
case KW_A:
+ case DISTINCT:
case LPAREN:
case BANG:
case CARAT:
@@ -2581,6 +2582,7 @@ public class SPARQLParser11 extends SPAR
case VAR1:
case VAR2:
case KW_A:
+ case DISTINCT:
case LPAREN:
case BANG:
case CARAT:
@@ -2589,6 +2591,7 @@ public class SPARQLParser11 extends SPAR
case PNAME_NS:
case PNAME_LN:
case KW_A:
+ case DISTINCT:
case LPAREN:
case BANG:
case CARAT:
@@ -2620,6 +2623,7 @@ public class SPARQLParser11 extends SPAR
case VAR1:
case VAR2:
case KW_A:
+ case DISTINCT:
case LPAREN:
case BANG:
case CARAT:
@@ -2726,6 +2730,7 @@ public class SPARQLParser11 extends SPAR
case PNAME_NS:
case PNAME_LN:
case KW_A:
+ case DISTINCT:
case LPAREN:
case BANG:
p = PathElt();
@@ -2747,21 +2752,31 @@ public class SPARQLParser11 extends SPAR
final public Path PathMod(Path p) throws ParseException {
long i1 ; long i2 ;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case STAR:
- jj_consume_token(STAR);
- {if (true) return PathFactory.pathZeroOrMore(p) ;}
- break;
case QMARK:
jj_consume_token(QMARK);
{if (true) return PathFactory.pathZeroOrOne(p) ;}
break;
+ case STAR:
+ jj_consume_token(STAR);
+ {if (true) return PathFactory.pathZeroOrMore1(p) ;}
+ break;
case PLUS:
jj_consume_token(PLUS);
- {if (true) return PathFactory.pathOneOrMore(p) ;}
+ {if (true) return PathFactory.pathOneOrMore1(p) ;}
break;
case LBRACE:
jj_consume_token(LBRACE);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case STAR:
+ jj_consume_token(STAR);
+ jj_consume_token(RBRACE);
+ {if (true) return PathFactory.pathZeroOrMoreN(p) ;}
+ break;
+ case PLUS:
+ jj_consume_token(PLUS);
+ jj_consume_token(RBRACE);
+ {if (true) return PathFactory.pathOneOrMoreN(p) ;}
+ break;
case INTEGER:
// {N} {N,M} {N,}
i1 = Integer();
@@ -2837,6 +2852,13 @@ public class SPARQLParser11 extends SPAR
p = Path();
jj_consume_token(RPAREN);
break;
+ case DISTINCT:
+ jj_consume_token(DISTINCT);
+ jj_consume_token(LPAREN);
+ p = Path();
+ p = PathFactory.pathDistinct(p) ;
+ jj_consume_token(RPAREN);
+ break;
default:
jj_la1[106] = jj_gen;
jj_consume_token(-1);
@@ -4737,7 +4759,7 @@ public class SPARQLParser11 extends SPAR
jj_la1_init_6();
}
private static void jj_la1_init_0() {
- jj_la1_0 = new int[] {0x7200000,0x180000,0x180000,0x0,0xc00000,0xc00000,0x6000,0x6000,0x6000,0x0,0x0,0x7e00,0x0,0x6e00,0x6e00,0x0,0x0,0x0,0xe00,0x0,0x0,0x0,0x20000000,0x18000000,0x6e00,0x0,0x6e00,0xe00,0x6e00,0x0,0x6e00,0x6e00,0x10000000,0x8000000,0x18000000,0x6000,0x0,0xe00,0x0,0x80000000,0xe00,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,0x200000,0x7e00,0x0,0x0,0x7e00,0x7e00,0x0,0x0,0x0,0x0,0xe00,0x400000,0x0,0x0,0x0,0x0,0x7e00,0x7e00,0x0,0x7e00,0x0,0x46e00,0x46e00,0x0,0x46e00,0x7e00,0x46e00,0x0,0x46e00,0x46e00,0x46e00,0x0,0x0,0x0,0x40e00,0x0,0x0,0x0,0x0,0x40e00,0x0,0x40e00,0x40e00,0x40e00,0x40e00,0x0,0x0,0x7e00,0x7e00,0x7e00,0x6e00,0x6000,0x1e00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6e00,0x6e00,0x0,0x0,0x0,0x0,0x0,0x400000,0x6e00,0x400000,0x400000,0x400000,0x400000,0x400000,0x400000,0x0,0x0,0x0,0x8000,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0xe00,0xc00,0x1000,};
+ jj_la1_0 = new int[] {0x7200000,0x180000,0x180000,0x0,0xc00000,0xc00000,0x6000,0x6000,0x6000,0x0,0x0,0x7e00,0x0,0x6e00,0x6e00,0x0,0x0,0x0,0xe00,0x0,0x0,0x0,0x20000000,0x18000000,0x6e00,0x0,0x6e00,0xe00,0x6e00,0x0,0x6e00,0x6e00,0x10000000,0x8000000,0x18000000,0x6000,0x0,0xe00,0x0,0x80000000,0xe00,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,0x200000,0x7e00,0x0,0x0,0x7e00,0x7e00,0x0,0x0,0x0,0x0,0xe00,0x400000,0x0,0x0,0x0,0x0,0x7e00,0x7e00,0x0,0x7e00,0x0,0x46e00,0x46e00,0x0,0x46e00,0x7e00,0x446e00,0x0,0x446e00,0x446e00,0x446e00,0x0,0x0,0x0,0x440e00,0x0,0x0,0x0,0x0,0x440e00,0x0,0x40e00,0x40e00,0x40e00,0x40e00,0x0,0x0,0x7e00,0x7e00,0x7e00,0x6e00,0x6000,0x1e00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6e00,0x6e00,0x0,0x0,0x0,0x0,0x0,0x400000,0x6e00,0x400000,0x400000,0x400000,0x400000,0x400000,0x400000,0x0,0x0,0x0,0x8000,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0xe00,0xc00,0x1000,};
}
private static void jj_la1_init_1() {
jj_la1_1 = new int[] {0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x0,0x0,0x10,0x10,0x0,0x30,0x0,0x0,0x10,0x20,0x10,0x8,0x20,0x10000,0x20000,0x0,0x0,0x6df06000,0x8000,0x6df06000,0x6df06000,0x6df06006,0x6,0x6df06000,0x6df06006,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x80,0x80,0x88,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10001d80,0x0,0x0,0x0,0x0,0x10001d80,0x0,0x200,0x6df06000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80004000,0x80004000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6df06000,0x6df06000,0x0,0x6df06000,0x0,0x0,0x0,0x0,0x6df06000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xdf00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
@@ -4752,7 +4774,7 @@ public class SPARQLParser11 extends SPAR
jj_la1_4 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0x4000000,0x4000000,0x0,0x0,0x97c3fe00,0x20000000,0x0,0x0,0x0,0x20000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0x0,0x4000000,0x4000000,0x4000000,0x0,0x4000000,0x4000000,0x0,0x0,0x0,0x0,0x14000000,0x3c3fe00,0x14000000,0x0,0x3c3fe00,0x0,0x42,0x42,0x1,0x4,0x1,0x1,0x1,0x1,0x1,0x1,0x40,0x0,0x0,0x80,0x0,0x0,0x10,0x30,0x97c3fe00,0x0,0x0,0x97c3fe00,0x97c3fe00,0x97c3fe00,0x0,0x0,0x97c3fe00,0x20000000,0x0,0x97c3fe00,0x97c3fe00,0x0,0x20000000,0x1,0x0,0x4000000,0x0,0x0,0x14000000,0x0,0x14000000,0x97c3fe00,0x97c3fe00,0x0,0x97c3fe00,0x0,0x0,0x0,0x0,0x0,0x97c3fe00,0x4000000,0x0,0x4000000,0x4000000,0x4000000,0x0,0x0,0x20000000,0x4000000,0x40000200,0x40000000,0x200,0x20000000,0x4000000,0x0,0x0,0x4000000,0x0,0x0,0x84000000,0x84000000,0x97c3fe00,0x97c3fe00,0x13c3fe00,0x0,0x0,0x13c3fe00,0x0,0x0,0x0,0x0,0x3f000,0x3f000,0x0,0x0,0x3f000,0x0,0x0,0x7c3fe00,0x7c3fe00,0x14000000,0x0,0x0,0x0,0x0,0x0,0x7c3fe00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
0x14000000,0x0,0x0,0x3fe00,0xe00,0x7000,0x38000,0x0,0x3c00000,0x0,0x0,0x0,};
}
private static void jj_la1_init_5() {
- jj_la1_5 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x0,0x0,0x2,0x0,0x0,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x10,0x2,0x2,0x2,0x10,0x0,0x2,0x0,0x10,0x2,0x2,0x10,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x8,0x0,0x2,0x2,0x10,0x2,0x4,0x0,0x0,0x8,0x0,0x2,0x800800,0x4,0x800800,0x800800,0x800800,0x400000,0x80000,0x4050000,0x800800,0x0,0x8,0x8,0x4050000,0x800,0x400000,0x800000,0x800000,0x0,0x800000,0x0,0x0,0x2,0x2,0x2,0x0,0x0,0x2,0x4000,0x8000,0x7e0,0x7e0,0x30000,0x0,0xc0000,0xc0000,0x30000,0xc0000,0xc0000,0x30800,0x0,0x0,0x0,0x8,0x8,0x8,0x0,0x70800,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x0,0x0,0x100000,0x100000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,};
+ jj_la1_5 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x0,0x0,0x2,0x0,0x0,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x10,0x2,0x2,0x2,0x10,0x0,0x2,0x0,0x10,0x2,0x2,0x10,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x8,0x0,0x2,0x2,0x10,0x2,0x4,0x0,0x0,0x8,0x0,0x2,0x800800,0x4,0x800800,0x800800,0x800800,0x400000,0x80000,0x4050000,0x800800,0x0,0x8,0x50008,0x4050000,0x800,0x400000,0x800000,0x800000,0x0,0x800000,0x0,0x0,0x2,0x2,0x2,0x0,0x0,0x2,0x4000,0x8000,0x7e0,0x7e0,0x30000,0x0,0xc0000,0xc0000,0x30000,0xc0000,0xc0000,0x30800,0x0,0x0,0x0,0x8,0x8,0x8,0x0,0x70800,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x0,0x0,0x100000,0x100000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,};
}
private static void jj_la1_init_6() {
jj_la1_6 = 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,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};