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/04/26 17:24:05 UTC
svn commit: r1330901 [1/3] - in /incubator/jena/Jena2/ARQ/trunk: Grammar/
src/main/java/com/hp/hpl/jena/sparql/lang/arq/
src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/
Author: andy
Date: Thu Apr 26 15:24:05 2012
New Revision: 1330901
URL: http://svn.apache.org/viewvc?rev=1330901&view=rev
Log:
Grammar changes for inline data for queries.
Modified:
incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj
incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj
incubator/jena/Jena2/ARQ/trunk/Grammar/sparql_11.jj
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParser.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParserTokenManager.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11TokenManager.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=1330901&r1=1330900&r2=1330901&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj Thu Apr 26 15:24:05 2012
@@ -378,6 +378,40 @@ Node DataBlockValue() : { Node n ; Strin
| n = BooleanLiteral() { return n ; }
| <UNDEF> { return null ; }
}
+Element InlineData() : {}
+{
+ <DATA>
+ ( InlineDataOneVar() | InlineDataFull() )
+ { return null ; }
+}
+void InlineDataOneVar() : { Var v ; Node n ; Token t ; }
+{
+ v = Var()
+ t = <LBRACE>
+ ( n = DataBlockValue() )*
+ t = <RBRACE>
+}
+void InlineDataFull() : { Var v ; Node n ; Token t ; }
+{
+ t = <LPAREN>
+ (v = Var())*
+ t = <RPAREN>
+ t = <LBRACE>
+ (
+ t = <LPAREN>
+ //{ startDataBlockValueRow(t.beginLine, t.beginColumn) ; }
+ (n = DataBlockValue()
+ //{ emitDataBlockValue(n, t.beginLine, t.beginColumn) ; }
+ ) *
+ t = <RPAREN>
+ //{ finishDataBlockValueRow(t.beginLine, t.beginColumn) ; }
+ |
+ t = <NIL>
+ //{ startDataBlockValueRow(t.beginLine, t.beginColumn) ; }
+ //{ finishDataBlockValueRow(t.beginLine, t.beginColumn) ; }
+ )*
+ t = <RBRACE>
+}
// SPARQL Update + transitional extensions for SPARQL/Update (the W3C submission)
// Update only entry point
// Optional SEMICOLON
@@ -683,6 +717,8 @@ Element GraphPatternNotTriples() : { Ele
|
el = Bind()
|
+ el = InlineData()
+ |
el = Assignment()
|
el = ExistsElt()
@@ -1725,7 +1761,7 @@ TOKEN [IGNORE_CASE] :
// SPARQL/Update parts.
TOKEN [IGNORE_CASE] :
{
- < #DATA: "data" >
+ < DATA: "data" >
| < INSERT: "insert">
| < DELETE: "delete" >
| < INSERT_DATA: <INSERT> (<WSC>)* <DATA> >
Modified: incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj?rev=1330901&r1=1330900&r2=1330901&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj Thu Apr 26 15:24:05 2012
@@ -466,6 +466,46 @@ Node DataBlockValue() : { Node n ; Strin
| <UNDEF> { return null ; }
}
+#ifdef ARQ
+Element InlineData() : {}
+{
+ <DATA>
+ ( InlineDataOneVar() | InlineDataFull() )
+ { return null ; }
+}
+
+void InlineDataOneVar() : { Var v ; Node n ; Token t ; }
+{
+ v = Var()
+ t = <LBRACE>
+ ( n = DataBlockValue() )*
+ t = <RBRACE>
+}
+
+void InlineDataFull() : { Var v ; Node n ; Token t ; }
+{
+ t = <LPAREN>
+ (v = Var())*
+ t = <RPAREN>
+ t = <LBRACE>
+ (
+ t = <LPAREN>
+ //{ startDataBlockValueRow(t.beginLine, t.beginColumn) ; }
+ (n = DataBlockValue()
+ //{ emitDataBlockValue(n, t.beginLine, t.beginColumn) ; }
+ ) *
+ t = <RPAREN>
+ //{ finishDataBlockValueRow(t.beginLine, t.beginColumn) ; }
+ |
+ t = <NIL>
+ //{ startDataBlockValueRow(t.beginLine, t.beginColumn) ; }
+ //{ finishDataBlockValueRow(t.beginLine, t.beginColumn) ; }
+ )*
+ t = <RBRACE>
+}
+#endif
+
+
#ifdef UPDATE
// SPARQL Update + transitional extensions for SPARQL/Update (the W3C submission)
// Update only entry point
@@ -857,6 +897,8 @@ Element GraphPatternNotTriples() : { Ele
el = Bind()
#ifdef ARQ
|
+ el = InlineData()
+ |
el = Assignment()
#ifdef ARQ_FETCH
|
@@ -2210,7 +2252,7 @@ TOKEN [IGNORE_CASE] :
TOKEN [IGNORE_CASE] :
{
- < #DATA: "data" >
+ < DATA: "data" >
| < INSERT: "insert">
| < DELETE: "delete" >
Modified: incubator/jena/Jena2/ARQ/trunk/Grammar/sparql_11.jj
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Grammar/sparql_11.jj?rev=1330901&r1=1330900&r2=1330901&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/sparql_11.jj (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/sparql_11.jj Thu Apr 26 15:24:05 2012
@@ -1591,7 +1591,7 @@ TOKEN [IGNORE_CASE] :
// SPARQL/Update parts.
TOKEN [IGNORE_CASE] :
{
- < #DATA: "data" >
+ < DATA: "data" >
| < INSERT: "insert">
| < DELETE: "delete" >
| < INSERT_DATA: <INSERT> (<WSC>)* <DATA> >