jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r1332709 - in /incubator/jena/Jena2/ARQ/trunk: Grammar/arq.jj Grammar/master.jj Grammar/tokens.txt src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParser.java
Date Tue, 01 May 2012 15:49:19 GMT
Author: andy
Date: Tue May  1 15:49:19 2012
New Revision: 1332709

URL: http://svn.apache.org/viewvc?rev=1332709&view=rev
Log:
Inline data - WG prefers keyword VALUES.  Still "w.i.p."

Modified:
    incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj
    incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj
    incubator/jena/Jena2/ARQ/trunk/Grammar/tokens.txt
    incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParser.java

Modified: incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj?rev=1332709&r1=1332708&r2=1332709&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj Tue May  1 15:49:19 2012
@@ -380,7 +380,7 @@ Node DataBlockValue() : { Node n ; Strin
 }
 Element InlineData() : { ElementData el ; Token t ; }
 {
-  t = <DATA>
+  t = <VALUES>
   { el = new ElementData() ;
     startInlineData(el.getVars(), el.getRows(), t.beginLine, t.beginColumn) ; }
   ( InlineDataOneVar(el) | InlineDataFull(el) )

Modified: incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj?rev=1332709&r1=1332708&r2=1332709&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj Tue May  1 15:49:19 2012
@@ -469,7 +469,7 @@ Node DataBlockValue() : { Node n ; Strin
 #ifdef ARQ
 Element InlineData() : { ElementData el ; Token t ; }
 {
-  t = <DATA>
+  t = <VALUES>
   { el = new ElementData() ;
     startInlineData(el.getVars(), el.getRows(), t.beginLine, t.beginColumn) ; }
   ( InlineDataOneVar(el) |  InlineDataFull(el) )

Modified: incubator/jena/Jena2/ARQ/trunk/Grammar/tokens.txt
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Grammar/tokens.txt?rev=1332709&r1=1332708&r2=1332709&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/tokens.txt (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/tokens.txt Tue May  1 15:49:19 2012
@@ -1,5 +1,9 @@
+// Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
+
 //Tokens in BNF
 // [] means will be inlined.
+// The presense of a token in the file does not mean it is actually used.
+
 [<EOF>]          ::=
 [<IRIref>]   ::= '<' ([^<>"{}|^`\]-[#x00-#x20])* '>'
 <PNAME_NS>   ::= <PN_PREFIX>? ':'
@@ -42,7 +46,7 @@
 [<SELECT>]     ::= 'SELECT'
 [<DESCRIBE>]   ::= 'DESCRIBE'
 [<CONSTRUCT>]  ::= 'CONSTRUCT'
-[<CONSTRUCT_WHERE>]  ::= 'CONSTRUCT WHERE'
+//[<CONSTRUCT_WHERE>]  ::= 'CONSTRUCT WHERE'
 [<ASK>]        ::= 'ASK'
 [<DISTINCT>]   ::= 'DISTINCT'
 [<REDUCED>]    ::= 'REDUCED'
@@ -174,6 +178,7 @@
 [<META>]        ::= 'META'
 
 [<DATA>]        ::= 'DATA'
+[<VALUES>]      ::= 'VALUES'
 [<LOAD>]        ::= 'LOAD' 
 [<INTO>]        ::= 'INTO' 
 [<WITH>]        ::= 'WITH' 
@@ -200,6 +205,14 @@
 [<LBRACKET>]   ::= '['
 [<RBRACKET>]   ::= ']'
 
+// Compound delimiters.
+
+[<BLK1_L>]     ::= '(|'
+[<BLK1_R>]     ::= '|)'
+
+[<BLK2_L>]     ::= '{|'
+[<BLK2_R>]     ::= '|}'
+
 //[<ANON>]       ::= '[' ']'
 <ANON>       ::= '['  <WS>* ']'
 

Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParser.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParser.java?rev=1332709&r1=1332708&r2=1332709&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParser.java
(original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParser.java
Tue May  1 15:49:19 2012
@@ -1499,7 +1499,7 @@ public class ARQParser extends ARQParser
 
   final public Element InlineData() throws ParseException {
                          ElementData el ; Token t ;
-    t = jj_consume_token(DATA);
+    t = jj_consume_token(VALUES);
     el = new ElementData() ;
     startInlineData(el.getVars(), el.getRows(), t.beginLine, t.beginColumn) ;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -2399,6 +2399,7 @@ public class ARQParser extends ARQParser
     label_23:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case VALUES:
       case GRAPH:
       case OPTIONAL:
       case MINUS_P:
@@ -2408,7 +2409,6 @@ public class ARQParser extends ARQParser
       case EXISTS:
       case NOT:
       case FILTER:
-      case DATA:
       case LBRACE:
         ;
         break;
@@ -2544,7 +2544,7 @@ public class ARQParser extends ARQParser
     case BIND:
       el = Bind();
       break;
-    case DATA:
+    case VALUES:
       el = InlineData();
       break;
     case LET:
@@ -6500,13 +6500,13 @@ public class ARQParser extends ARQParser
       jj_la1_0 = new int[] {0x7200000,0x180000,0x180000,0x0,0xc00000,0xc00000,0xe00,0x0,0x6e00,0x6e00,0x6e00,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,0x80000000,0x6000,0x0,0xe00,0x0,0xe00,0x6000,0xe00,0x6000,0x0,0xe00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xe00,0x0,0x0,0x0,0xe00,0x0,0xe00,0xe00,0x0,0xe00,0x0,0x0,0x7e00,0x0,0x0,0x7e00,0x7e00,0x0,0x200000,0x7e00,0x0,0x0,0x7e00,0x7e00,0x0,0x0,0x0,0x0,0xe00,0x400000,0x0,0x0,0x0,0x0,0x7e00,0x0,0x7e00,0x0,0x46e00,0x46e00,0x0,0x46e00,0x7e00,0x446e00,0x0,0x446e00,0x446e00,0x446e00,0x0,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,0x0,0x0,0
 x8000,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,0x20,0x0,0x0,0x0,0x40000,0x6f830000,0x6f830000,0x6f830000,0x20,0x20,0x0,0x60,0x0,0x0,0x20,0x40,0x20,0x10,0x40,0x80000,0x100000,0x0,0x0,0x6f830000,0x40000,0x6f830000,0x6f830000,0x6f83000c,0xc,0x6f830000,0x6f83000c,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x2,0x0,0x2,0x0,0x0,0x2,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20,0x20,0x10,0x100,0x100,0x110,0x110,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x80037b00,0x0,0x0,0x0,0x0,0x80037b00,0x0,0x400,0x6f830000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,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,0x20000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6f830000,0x6f830000,0x0,0x6f830000,0x0,0x0,0x0,0x0,0x6f830000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6f800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+      jj_la1_1 = new int[] {0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x40000,0x6f830000,0x6f830000,0x6f830000,0x20,0x20,0x0,0x60,0x0,0x0,0x20,0x40,0x20,0x10,0x40,0x80000,0x100000,0x0,0x0,0x6f830000,0x40000,0x6f830000,0x6f830000,0x6f83000c,0xc,0x6f830000,0x6f83000c,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x2,0x0,0x2,0x0,0x0,0x2,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20,0x20,0x10,0x100,0x100,0x110,0x110,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x80037b01,0x0,0x0,0x0,0x0,0x80037b01,0x0,0x400,0x6f830000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,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,0x20000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6f830000,0x6f830000,0x0,0x6f830000,0x0,0x0,0x0,0x0,0x6f830000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6f800000,0x0,0x0,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,0xfffff87b,0xfffff87b,0xfffff87b,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffff87b,0x0,0xfffff87b,0xfffff87b,0xfffff87b,0x0,0xfffff87b,0xfffff87b,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffff87b,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x600,0x0,0x600,0x600,0x600,0x0,0x0,0x0,0x0,0x600,0x0,0x0,0x0,0x0,0x600,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffff87b,0xfffff87b,0x0,0xfffff87b,0x0,0x0,0x0,0x0,0xfffff87b,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
    }
    private static void jj_la1_init_3() {
-      jj_la1_3 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x18000000,0x0,0x1f7fffff,0x1f7fffff,0x1f7fffff,0x0,0x0,0x18000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x77fffff,0x0,0x77fffff,0x77fffff,0x77fffff,0x0,0x77fffff,0x77fffff,0x0,0x0,0x0,0x0,0x0,0x0,0x18000000,0x0,0x18000000,0x0,0x18000000,0x0,0x0,0x18000000,0x0,0x0,0xc0000000,0xc0000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000000,0xc0000000,0x0,0x0,0x80000000,0x40000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x18000000,0x0,0x0,0x18000000,0x18000000,0x0,0x0,0x18000000,0x20000000,0x0,0x18000000,0x18000000,0x0,0x20000000,0x0,0x0,0x77fffff,0x0,0x0,0x0,0x0,0x0,0x18000000,0x0,0x18000000,0x0,0x0,0x0,0x0,0x0,0x18000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x18000000,0x18000000,0x18000000,0x0,0x0,0x18000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1f7fffff,0x1f7fffff,0x0,0x77fffff,0x0,0x0,0x0,0x0,0x1f7fffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x
 0,0x0,0x0,0x18000000,0x0,0x0,0x0,0x0,};
+      jj_la1_3 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x18000000,0x0,0x1f7fffff,0x1f7fffff,0x1f7fffff,0x0,0x0,0x18000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x77fffff,0x0,0x77fffff,0x77fffff,0x77fffff,0x0,0x77fffff,0x77fffff,0x0,0x0,0x0,0x0,0x0,0x0,0x18000000,0x0,0x18000000,0x0,0x18000000,0x0,0x0,0x18000000,0x0,0x0,0xc0000000,0xc0000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000000,0xc0000000,0x0,0x0,0x80000000,0x40000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x18000000,0x0,0x0,0x18000000,0x18000000,0x0,0x0,0x18000000,0x0,0x0,0x18000000,0x18000000,0x0,0x0,0x0,0x0,0x77fffff,0x0,0x0,0x0,0x0,0x0,0x18000000,0x0,0x18000000,0x0,0x0,0x0,0x0,0x0,0x18000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x18000000,0x18000000,0x18000000,0x0,0x0,0x18000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1f7fffff,0x1f7fffff,0x0,0x77fffff,0x0,0x0,0x0,0x0,0x1f7fffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x18
 000000,0x0,0x0,0x0,0x0,};
    }
    private static void jj_la1_init_4() {
       jj_la1_4 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x1ff00000,0x0,0x1ff00000,0x1ff00000,0x1ff00000,0x0,0x0,0x1ff00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1ff00000,0x0,0x1ff00000,0x0,0x1ff00000,0x0,0x0,0x1ff00000,0x0,0x0,0x213ff,0x213ff,0x800,0x0,0x2000,0x800,0x800,0x800,0x800,0x800,0x800,0x20000,0x0,0x0,0x40000,0x0,0x0,0x0,0x2000,0x2000,0x0,0x0,0x0,0x0,0x8000,0x18000,0x18000,0x1ff00000,0x0,0x0,0x1ff00000,0x1ff00000,0x0,0x0,0x1ff00000,0x0,0x0,0x1ff00000,0x1ff00000,0x0,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1ff00000,0x0,0x1ff00000,0x0,0x0,0x0,0x0,0x0,0x1ff00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100000,0x0,0x100000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1ff00000,0x1ff00000,0x1ff00000,0x0,0x0,0x1ff00000,0x0,0x0,0x0,0x0,0x1f800000,0x1f800000,0x0,0x0,0x1f800000,0x0,0x0,0x1ff00000,0x1ff00000,0x0,0x0,0x0,0x0,0x0,0x0,0x1ff00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1ff00000,0x700000,0x38000
 00,0x1c000000,0x0,0x0,0x0,0x0,0x0,};



Mime
View raw message