Update SPARQL 1.2 to symmetric RDF triple patterns

Author: afs

jena-arq/Grammar/arq.jj

@@ -1341,6 +1341,7 @@ Node ReifiedTripleSubject(TripleCollector acc) : { Node s; String iri; }
   | s = BooleanLiteral()
   | s = BlankNode()
   | s = ReifiedTriple(acc)
+  | s = TripleTerm()
   )
   { return s; }
 }
@@ -1375,6 +1376,7 @@ Node TripleTermSubject() : { Node n; String iri; }
   | n = NumericLiteral()
   | n = BooleanLiteral()
   | n = BlankNode()
+  | n = TripleTerm() { return n; }
   )
   { return n; }
 }
@@ -1406,6 +1408,7 @@ Node TripleTermDataSubject() : { Node n = null; String iri; }
  | n = RDFLiteral()
  | n = NumericLiteral()
  | n = BooleanLiteral()
+ | n = TripleTermData()
  )
  { return n; }
 }
@@ -1575,6 +1578,7 @@ Node ExprTripleTermSubject() : { Node n; String iri; }
   | n = NumericLiteral()
   | n = BooleanLiteral()
   | n = Var()
+  | n = ExprTripleTerm()
   )
   { return n; }
 }

jena-arq/Grammar/main.jj

@@ -1812,6 +1812,7 @@ Node ReifiedTripleSubject(TripleCollector acc) : { Node s; String iri; }
   | s = ReifiedTriple(acc)
   //  <LPAREN> <RPAREN>     { s = RDFnil ; }
   //| <NIL>  { s = nRDFnil ; }
+  | s = TripleTerm()
   )
   { return s; }
 }
@@ -1854,7 +1855,7 @@ Node TripleTermSubject() : { Node n; String iri; }
   | n = BlankNode()
   //  <LPAREN> <RPAREN>     { return nRDFnil ; }
   //| <NIL>  { return nRDFnil ; }
-  //| n = TripleTerm()      { return n; }
+  | n = TripleTerm()      { return n; }
   )
   { return n; }
 }
@@ -1892,7 +1893,7 @@ Node TripleTermDataSubject() : { Node n = null; String iri; }
  | n = RDFLiteral()
  | n = NumericLiteral()
  | n = BooleanLiteral()
- //| n = TripleTermData()
+ | n = TripleTermData()
  )
  { return n; }
 }
@@ -2119,7 +2120,7 @@ Node ExprTripleTermSubject() : { Node n; String iri; }
   | n = NumericLiteral()
   | n = BooleanLiteral()
   | n = Var()
-  //| n = ExprTripleTerm()
+  | n = ExprTripleTerm()
   )
   { return n; }
 }

jena-arq/Grammar/sparql_12.jj

@@ -1126,6 +1126,7 @@ Node ReifiedTripleSubject(TripleCollector acc) : { Node s; String iri; }
   | s = BooleanLiteral()
   | s = BlankNode()
   | s = ReifiedTriple(acc)
+  | s = TripleTerm()
   )
   { return s; }
 }
@@ -1160,6 +1161,7 @@ Node TripleTermSubject() : { Node n; String iri; }
   | n = NumericLiteral()
   | n = BooleanLiteral()
   | n = BlankNode()
+  | n = TripleTerm() { return n; }
   )
   { return n; }
 }
@@ -1191,6 +1193,7 @@ Node TripleTermDataSubject() : { Node n = null; String iri; }
  | n = RDFLiteral()
  | n = NumericLiteral()
  | n = BooleanLiteral()
+ | n = TripleTermData()
  )
  { return n; }
 }
@@ -1351,6 +1354,7 @@ Node ExprTripleTermSubject() : { Node n; String iri; }
   | n = NumericLiteral()
   | n = BooleanLiteral()
   | n = Var()
+  | n = ExprTripleTerm()
   )
   { return n; }
 }