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


The following commit(s) were added to refs/heads/main by this push:
     new 45ebc58a94 Update SPARQL 1.2 to symmetric RDF triple patterns
45ebc58a94 is described below

commit 45ebc58a941c371beadf4d04dfae2b632337ae56
Author: Andy Seaborne <[email protected]>
AuthorDate: Wed Jun 18 20:33:18 2025 +0100

    Update SPARQL 1.2 to symmetric RDF triple patterns
---
 jena-arq/Grammar/arq.jj                            |   4 +
 jena-arq/Grammar/main.jj                           |   7 +-
 jena-arq/Grammar/sparql_12.jj                      |   4 +
 .../jena/sparql/lang/arq/javacc/ARQParser.java     | 821 +++++++++++----------
 .../lang/sparql_12/javacc/SPARQLParser12.java      |  19 +-
 5 files changed, 449 insertions(+), 406 deletions(-)

diff --git a/jena-arq/Grammar/arq.jj b/jena-arq/Grammar/arq.jj
index 93f6897e4f..50d0d3c5cb 100644
--- a/jena-arq/Grammar/arq.jj
+++ b/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; }
 }
diff --git a/jena-arq/Grammar/main.jj b/jena-arq/Grammar/main.jj
index 8e1ac25c6d..52448abe4a 100644
--- a/jena-arq/Grammar/main.jj
+++ b/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; }
 }
diff --git a/jena-arq/Grammar/sparql_12.jj b/jena-arq/Grammar/sparql_12.jj
index 48c41e861e..8404acc9c9 100644
--- a/jena-arq/Grammar/sparql_12.jj
+++ b/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; }
 }
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 abf23da2d9..7b7b044f61 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
@@ -4866,6 +4866,10 @@ s = createNode(iri) ;
       s = ReifiedTriple(acc);
       break;
       }
+    case L_TRIPLE:{
+      s = TripleTerm();
+      break;
+      }
     default:
       jj_la1[144] = jj_gen;
       jj_consume_token(-1);
@@ -4989,6 +4993,11 @@ n = createNode(iri) ;
       n = BlankNode();
       break;
       }
+    case L_TRIPLE:{
+      n = TripleTerm();
+{if ("" != null) return n;}
+      break;
+      }
     default:
       jj_la1[146] = jj_gen;
       jj_consume_token(-1);
@@ -5116,6 +5125,10 @@ n = createNode(iri) ;
       n = BooleanLiteral();
       break;
       }
+    case L_TRIPLE:{
+      n = TripleTermData();
+      break;
+      }
     default:
       jj_la1[149] = jj_gen;
       jj_consume_token(-1);
@@ -5877,6 +5890,10 @@ n = createNode(iri);
       n = Var();
       break;
       }
+    case L_TRIPLE:{
+      n = ExprTripleTerm();
+      break;
+      }
     default:
       jj_la1[167] = jj_gen;
       jj_consume_token(-1);
@@ -7615,151 +7632,119 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ;
     finally { jj_save(4, xla); }
   }
 
-  private boolean jj_3R_NumericLiteralPositive_1910_3_209()
- {
-    if (jj_scan_token(DOUBLE_POSITIVE)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_NumericLiteralPositive_1909_3_208()
- {
-    if (jj_scan_token(DECIMAL_POSITIVE)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_NumericLiteralPositive_1908_3_207()
- {
-    if (jj_scan_token(INTEGER_POSITIVE)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_NumericLiteralPositive_1908_3_200()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_NumericLiteralPositive_1908_3_207()) {
-    jj_scanpos = xsp;
-    if (jj_3R_NumericLiteralPositive_1909_3_208()) {
-    jj_scanpos = xsp;
-    if (jj_3R_NumericLiteralPositive_1910_3_209()) return true;
-    }
-    }
-    return false;
-  }
-
-  private boolean jj_3R_NumericLiteralUnsigned_1904_3_206()
+  private boolean jj_3R_NumericLiteralUnsigned_1908_3_206()
  {
     if (jj_scan_token(DOUBLE)) return true;
     return false;
   }
 
-  private boolean jj_3R_NumericLiteralUnsigned_1903_3_205()
+  private boolean jj_3R_NumericLiteralUnsigned_1907_3_205()
  {
     if (jj_scan_token(DECIMAL)) return true;
     return false;
   }
 
-  private boolean jj_3R_NumericLiteralUnsigned_1902_3_204()
+  private boolean jj_3R_NumericLiteralUnsigned_1906_3_204()
  {
     if (jj_scan_token(INTEGER)) return true;
     return false;
   }
 
-  private boolean jj_3R_NumericLiteralUnsigned_1902_3_199()
+  private boolean jj_3R_NumericLiteralUnsigned_1906_3_199()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_NumericLiteralUnsigned_1902_3_204()) {
+    if (jj_3R_NumericLiteralUnsigned_1906_3_204()) {
     jj_scanpos = xsp;
-    if (jj_3R_NumericLiteralUnsigned_1903_3_205()) {
+    if (jj_3R_NumericLiteralUnsigned_1907_3_205()) {
     jj_scanpos = xsp;
-    if (jj_3R_NumericLiteralUnsigned_1904_3_206()) return true;
+    if (jj_3R_NumericLiteralUnsigned_1908_3_206()) return true;
     }
     }
     return false;
   }
 
-  private boolean jj_3R_NumericLiteral_1896_5_189()
+  private boolean jj_3R_NumericLiteral_1900_5_189()
  {
-    if (jj_3R_NumericLiteralNegative_1914_3_201()) return true;
+    if (jj_3R_NumericLiteralNegative_1918_3_201()) return true;
     return false;
   }
 
-  private boolean jj_3R_NumericLiteral_1895_5_188()
+  private boolean jj_3R_NumericLiteral_1899_5_188()
  {
-    if (jj_3R_NumericLiteralPositive_1908_3_200()) return true;
+    if (jj_3R_NumericLiteralPositive_1912_3_200()) return true;
     return false;
   }
 
-  private boolean jj_3R_NumericLiteral_1894_5_187()
+  private boolean jj_3R_NumericLiteral_1898_5_187()
  {
-    if (jj_3R_NumericLiteralUnsigned_1902_3_199()) return true;
+    if (jj_3R_NumericLiteralUnsigned_1906_3_199()) return true;
     return false;
   }
 
-  private boolean jj_3R_NumericLiteral_1893_3_176()
+  private boolean jj_3R_NumericLiteral_1897_3_176()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_NumericLiteral_1894_5_187()) {
+    if (jj_3R_NumericLiteral_1898_5_187()) {
     jj_scanpos = xsp;
-    if (jj_3R_NumericLiteral_1895_5_188()) {
+    if (jj_3R_NumericLiteral_1899_5_188()) {
     jj_scanpos = xsp;
-    if (jj_3R_NumericLiteral_1896_5_189()) return true;
+    if (jj_3R_NumericLiteral_1900_5_189()) return true;
     }
     }
     return false;
   }
 
-  private boolean jj_3R_RDFLiteral_1881_3_175()
+  private boolean jj_3R_RDFLiteral_1885_3_175()
  {
-    if (jj_3R_String_1926_3_186()) return true;
+    if (jj_3R_String_1930_3_186()) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1846_5_154()
+  private boolean jj_3R_Aggregate_1850_5_154()
  {
     if (jj_scan_token(AGG)) return true;
-    if (jj_3R_iri_1938_3_171()) return true;
+    if (jj_3R_iri_1942_3_171()) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1826_5_153()
+  private boolean jj_3R_Aggregate_1830_5_153()
  {
     if (jj_scan_token(FOLD)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1824_5_152()
+  private boolean jj_3R_Aggregate_1828_5_152()
  {
     if (jj_scan_token(VAR_POP)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1822_5_151()
+  private boolean jj_3R_Aggregate_1826_5_151()
  {
     if (jj_scan_token(VAR_SAMP)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1820_5_150()
+  private boolean jj_3R_Aggregate_1824_5_150()
  {
     if (jj_scan_token(VARIANCE)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1818_5_149()
+  private boolean jj_3R_Aggregate_1822_5_149()
  {
     if (jj_scan_token(STDEV_POP)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Var_1434_5_174()
+  private boolean jj_3R_Var_1437_5_174()
  {
     Token xsp;
     xsp = jj_scanpos;
@@ -7770,14 +7755,14 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1816_5_148()
+  private boolean jj_3R_Aggregate_1820_5_148()
  {
     if (jj_scan_token(STDEV_SAMP)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1814_5_147()
+  private boolean jj_3R_Aggregate_1818_5_147()
  {
     if (jj_scan_token(STDEV)) return true;
     if (jj_scan_token(LPAREN)) return true;
@@ -7791,112 +7776,112 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1801_5_146()
+  private boolean jj_3R_Aggregate_1805_5_146()
  {
     if (jj_scan_token(GROUP_CONCAT)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1799_5_145()
+  private boolean jj_3R_Aggregate_1803_5_145()
  {
     if (jj_scan_token(SAMPLE)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1797_5_144()
+  private boolean jj_3R_Aggregate_1801_5_144()
  {
     if (jj_scan_token(MODE)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_ReifiedTripleBlock_649_3_137()
+  private boolean jj_3R_Aggregate_1799_5_143()
  {
-    if (jj_3R_ReifiedTriple_1326_3_170()) return true;
+    if (jj_scan_token(MEDIAN)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1795_5_143()
+  private boolean jj_3R_Aggregate_1797_5_142()
  {
-    if (jj_scan_token(MEDIAN)) return true;
+    if (jj_scan_token(AVG)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1793_5_142()
+  private boolean jj_3R_ReifiedTripleBlock_649_3_137()
  {
-    if (jj_scan_token(AVG)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_ReifiedTriple_1326_3_170()) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1791_5_141()
+  private boolean jj_3R_Aggregate_1795_5_141()
  {
     if (jj_scan_token(MAX)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1789_5_140()
+  private boolean jj_3R_Aggregate_1793_5_140()
  {
     if (jj_scan_token(MIN)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1787_5_139()
+  private boolean jj_3R_Aggregate_1791_5_139()
  {
     if (jj_scan_token(SUM)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1780_5_138()
+  private boolean jj_3R_Aggregate_1784_5_138()
  {
     if (jj_scan_token(COUNT)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1779_3_123()
+  private boolean jj_3R_Aggregate_1783_3_123()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_Aggregate_1780_5_138()) {
+    if (jj_3R_Aggregate_1784_5_138()) {
     jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1787_5_139()) {
+    if (jj_3R_Aggregate_1791_5_139()) {
     jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1789_5_140()) {
+    if (jj_3R_Aggregate_1793_5_140()) {
     jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1791_5_141()) {
+    if (jj_3R_Aggregate_1795_5_141()) {
     jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1793_5_142()) {
+    if (jj_3R_Aggregate_1797_5_142()) {
     jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1795_5_143()) {
+    if (jj_3R_Aggregate_1799_5_143()) {
     jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1797_5_144()) {
+    if (jj_3R_Aggregate_1801_5_144()) {
     jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1799_5_145()) {
+    if (jj_3R_Aggregate_1803_5_145()) {
     jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1801_5_146()) {
+    if (jj_3R_Aggregate_1805_5_146()) {
     jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1814_5_147()) {
+    if (jj_3R_Aggregate_1818_5_147()) {
     jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1816_5_148()) {
+    if (jj_3R_Aggregate_1820_5_148()) {
     jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1818_5_149()) {
+    if (jj_3R_Aggregate_1822_5_149()) {
     jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1820_5_150()) {
+    if (jj_3R_Aggregate_1824_5_150()) {
     jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1822_5_151()) {
+    if (jj_3R_Aggregate_1826_5_151()) {
     jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1824_5_152()) {
+    if (jj_3R_Aggregate_1828_5_152()) {
     jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1826_5_153()) {
+    if (jj_3R_Aggregate_1830_5_153()) {
     jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1846_5_154()) return true;
+    if (jj_3R_Aggregate_1850_5_154()) return true;
     }
     }
     }
@@ -7916,21 +7901,21 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ;
     return false;
   }
 
-  private boolean jj_3R_NotExistsFunc_1769_4_131()
+  private boolean jj_3R_NotExistsFunc_1773_4_131()
  {
     if (jj_scan_token(NOT)) return true;
     if (jj_scan_token(EXISTS)) return true;
     return false;
   }
 
-  private boolean jj_3R_ExistsFunc_1763_4_130()
+  private boolean jj_3R_ExistsFunc_1767_4_130()
  {
     if (jj_scan_token(EXISTS)) return true;
     if (jj_3R_GroupGraphPattern_600_3_156()) return true;
     return false;
   }
 
-  private boolean jj_3R_StrReplaceExpression_1752_3_128()
+  private boolean jj_3R_StrReplaceExpression_1756_3_128()
  {
     if (jj_scan_token(REPLACE)) return true;
     if (jj_scan_token(LPAREN)) return true;
@@ -7943,77 +7928,95 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ;
     return false;
   }
 
-  private boolean jj_3_3()
+  private boolean jj_3R_TripleTerm_1363_5_179()
  {
-    if (jj_scan_token(DOT)) return true;
-    if (jj_3R_TriplesSameSubject_947_3_48()) return true;
+    if (jj_scan_token(L_TRIPLE)) return true;
     return false;
   }
 
-  private boolean jj_3R_TripleTerm_1362_5_179()
+  private boolean jj_3_3()
  {
-    if (jj_scan_token(L_TRIPLE)) return true;
+    if (jj_scan_token(DOT)) return true;
+    if (jj_3R_TriplesSameSubject_947_3_48()) return true;
     return false;
   }
 
-  private boolean jj_3R_SubstringExpression_1740_5_127()
+  private boolean jj_3R_SubstringExpression_1744_5_127()
  {
     if (jj_scan_token(SUBSTR)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_RegexExpression_1728_5_129()
+  private boolean jj_3R_RegexExpression_1732_5_129()
  {
     if (jj_scan_token(REGEX)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1722_5_118()
+  private boolean jj_3R_BuiltInCall_1726_5_118()
  {
     if (jj_scan_token(OBJECT)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1720_5_117()
+  private boolean jj_3R_BuiltInCall_1724_5_117()
  {
     if (jj_scan_token(PREDICATE)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
+  private boolean jj_3R_BuiltInCall_1722_5_116()
+ {
+    if (jj_scan_token(SUBJECT)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
   private boolean jj_3R_TriplesSameSubject_955_3_122()
  {
     if (jj_3R_ReifiedTripleBlock_649_3_137()) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1718_5_116()
+  private boolean jj_3R_BuiltInCall_1718_5_115()
  {
-    if (jj_scan_token(SUBJECT)) return true;
+    if (jj_scan_token(TRIPLE)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1714_5_115()
+  private boolean jj_3R_BuiltInCall_1716_5_114()
  {
-    if (jj_scan_token(TRIPLE)) return true;
+    if (jj_scan_token(IS_TRIPLE)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
+  private boolean jj_3R_BuiltInCall_1715_5_113()
+ {
+    if (jj_3R_NotExistsFunc_1773_4_131()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_BuiltInCall_1714_5_112()
+ {
+    if (jj_3R_ExistsFunc_1767_4_130()) return true;
+    return false;
+  }
+
   private boolean jj_3R_TriplesSameSubject_950_3_121()
  {
     if (jj_3R_TriplesNode_1176_4_136()) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1712_5_114()
+  private boolean jj_3R_BuiltInCall_1713_5_111()
  {
-    if (jj_scan_token(IS_TRIPLE)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_RegexExpression_1732_5_129()) return true;
     return false;
   }
 
@@ -8037,15 +8040,10 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1711_5_113()
+  private boolean jj_3R_BuiltInCall_1710_5_110()
  {
-    if (jj_3R_NotExistsFunc_1769_4_131()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_BuiltInCall_1710_5_112()
- {
-    if (jj_3R_ExistsFunc_1763_4_130()) return true;
+    if (jj_scan_token(HAS_LANGDIR)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
@@ -8056,9 +8054,10 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1709_5_111()
+  private boolean jj_3R_BuiltInCall_1708_5_109()
  {
-    if (jj_3R_RegexExpression_1728_5_129()) return true;
+    if (jj_scan_token(HAS_LANG)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
@@ -8068,23 +8067,23 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1706_5_110()
+  private boolean jj_3R_BuiltInCall_1706_5_108()
  {
-    if (jj_scan_token(HAS_LANGDIR)) return true;
+    if (jj_scan_token(IS_NUMERIC)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1704_5_109()
+  private boolean jj_3R_BuiltInCall_1704_5_107()
  {
-    if (jj_scan_token(HAS_LANG)) return true;
+    if (jj_scan_token(IS_LITERAL)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
   private boolean jj_3R_VarOrTerm_1320_5_167()
  {
-    if (jj_3R_TripleTerm_1362_5_179()) return true;
+    if (jj_3R_TripleTerm_1363_5_179()) return true;
     return false;
   }
 
@@ -8094,66 +8093,66 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1702_5_108()
+  private boolean jj_3R_BuiltInCall_1702_5_106()
  {
-    if (jj_scan_token(IS_NUMERIC)) return true;
+    if (jj_scan_token(IS_BLANK)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
   private boolean jj_3R_VarOrTerm_1318_5_165()
  {
-    if (jj_3R_BlankNode_1953_3_178()) return true;
+    if (jj_3R_BlankNode_1957_3_178()) return true;
     return false;
   }
 
   private boolean jj_3R_VarOrTerm_1317_5_164()
  {
-    if (jj_3R_BooleanLiteral_1920_3_177()) return true;
+    if (jj_3R_BooleanLiteral_1924_3_177()) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1700_5_107()
+  private boolean jj_3R_BuiltInCall_1700_5_105()
  {
-    if (jj_scan_token(IS_LITERAL)) return true;
+    if (jj_scan_token(IS_URI)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
   private boolean jj_3R_VarOrTerm_1316_5_163()
  {
-    if (jj_3R_NumericLiteral_1893_3_176()) return true;
+    if (jj_3R_NumericLiteral_1897_3_176()) return true;
     return false;
   }
 
   private boolean jj_3R_VarOrTerm_1315_5_162()
  {
-    if (jj_3R_RDFLiteral_1881_3_175()) return true;
+    if (jj_3R_RDFLiteral_1885_3_175()) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1698_5_106()
+  private boolean jj_3R_BuiltInCall_1698_5_104()
  {
-    if (jj_scan_token(IS_BLANK)) return true;
+    if (jj_scan_token(IS_IRI)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
   private boolean jj_3R_VarOrTerm_1314_5_161()
  {
-    if (jj_3R_iri_1938_3_171()) return true;
+    if (jj_3R_iri_1942_3_171()) return true;
     return false;
   }
 
   private boolean jj_3R_VarOrTerm_1313_5_160()
  {
-    if (jj_3R_Var_1434_5_174()) return true;
+    if (jj_3R_Var_1437_5_174()) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1696_5_105()
+  private boolean jj_3R_BuiltInCall_1696_5_103()
  {
-    if (jj_scan_token(IS_URI)) return true;
+    if (jj_scan_token(SAME_VALUE)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
@@ -8187,23 +8186,16 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1694_5_104()
- {
-    if (jj_scan_token(IS_IRI)) return true;
-    if (jj_scan_token(LPAREN)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_BuiltInCall_1692_5_103()
+  private boolean jj_3R_BuiltInCall_1694_5_102()
  {
-    if (jj_scan_token(SAME_VALUE)) return true;
+    if (jj_scan_token(SAME_TERM)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1690_5_102()
+  private boolean jj_3R_BuiltInCall_1692_5_101()
  {
-    if (jj_scan_token(SAME_TERM)) return true;
+    if (jj_scan_token(STRDT)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
@@ -8214,16 +8206,16 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1688_5_101()
+  private boolean jj_3R_BuiltInCall_1688_5_100()
  {
-    if (jj_scan_token(STRDT)) return true;
+    if (jj_scan_token(STRLANGDIR)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1684_5_100()
+  private boolean jj_3R_BuiltInCall_1686_5_99()
  {
-    if (jj_scan_token(STRLANGDIR)) return true;
+    if (jj_scan_token(STRLANG)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
@@ -8239,321 +8231,320 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1682_5_99()
- {
-    if (jj_scan_token(STRLANG)) return true;
-    if (jj_scan_token(LPAREN)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_BuiltInCall_1678_5_98()
+  private boolean jj_3R_BuiltInCall_1682_5_98()
  {
     if (jj_scan_token(IF)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1671_5_97()
+  private boolean jj_3R_BuiltInCall_1675_5_97()
  {
     if (jj_scan_token(CALL)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1669_5_96()
+  private boolean jj_3R_BuiltInCall_1673_5_96()
  {
     if (jj_scan_token(COALESCE)) return true;
     if (jj_3R_ExpressionList_919_3_126()) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1668_5_95()
+  private boolean jj_3R_BuiltInCall_1672_5_95()
  {
     if (jj_scan_token(VERSION)) return true;
     if (jj_scan_token(NIL)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1667_5_94()
+  private boolean jj_3R_BuiltInCall_1671_5_94()
  {
     if (jj_scan_token(SHA512)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1666_5_93()
+  private boolean jj_3R_BuiltInCall_1670_5_93()
  {
     if (jj_scan_token(SHA384)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1665_5_92()
+  private boolean jj_3R_BuiltInCall_1669_5_92()
  {
     if (jj_scan_token(SHA256)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1664_5_91()
+  private boolean jj_3R_BuiltInCall_1668_5_91()
  {
     if (jj_scan_token(SHA1)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3_1()
- {
-    if (jj_3R_BuiltInCall_1600_5_46()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_BuiltInCall_1663_5_90()
+  private boolean jj_3R_BuiltInCall_1667_5_90()
  {
     if (jj_scan_token(MD5)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1662_5_89()
+  private boolean jj_3R_BuiltInCall_1666_5_89()
  {
     if (jj_scan_token(STRUUID)) return true;
     if (jj_scan_token(NIL)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1661_5_88()
+  private boolean jj_3R_BuiltInCall_1665_5_88()
  {
     if (jj_scan_token(UUID)) return true;
     if (jj_scan_token(NIL)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1660_5_87()
+  private boolean jj_3R_BuiltInCall_1664_5_87()
  {
     if (jj_scan_token(NOW)) return true;
     if (jj_scan_token(NIL)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1657_5_86()
+  private boolean jj_3_1()
+ {
+    if (jj_3R_BuiltInCall_1604_5_46()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_BuiltInCall_1661_5_86()
  {
     if (jj_scan_token(ADJUST)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1656_5_85()
+  private boolean jj_3R_BuiltInCall_1660_5_85()
  {
     if (jj_scan_token(TZ)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1655_5_84()
+  private boolean jj_3R_BuiltInCall_1659_5_84()
  {
     if (jj_scan_token(TIMEZONE)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1654_5_83()
+  private boolean jj_3R_BuiltInCall_1658_5_83()
  {
     if (jj_scan_token(SECONDS)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1653_5_82()
+  private boolean jj_3R_BuiltInCall_1657_5_82()
  {
     if (jj_scan_token(MINUTES)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1652_5_81()
+  private boolean jj_3R_BuiltInCall_1656_5_81()
  {
     if (jj_scan_token(HOURS)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1651_5_80()
+  private boolean jj_3R_BuiltInCall_1655_5_80()
  {
     if (jj_scan_token(DAY)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1650_5_79()
+  private boolean jj_3R_BuiltInCall_1654_5_79()
  {
     if (jj_scan_token(MONTH)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1649_5_78()
+  private boolean jj_3R_BuiltInCall_1653_5_78()
  {
     if (jj_scan_token(YEAR)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1647_5_77()
+  private boolean jj_3R_BuiltInCall_1651_5_77()
  {
     if (jj_scan_token(STRAFTER)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1645_5_76()
+  private boolean jj_3R_BuiltInCall_1649_5_76()
  {
     if (jj_scan_token(STRBEFORE)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1643_5_75()
+  private boolean jj_3R_BuiltInCall_1647_5_75()
  {
     if (jj_scan_token(STRENDS)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1641_5_74()
+  private boolean jj_3R_BuiltInCall_1645_5_74()
  {
     if (jj_scan_token(STRSTARTS)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1639_5_73()
+  private boolean jj_3R_BuiltInCall_1643_5_73()
  {
     if (jj_scan_token(CONTAINS)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1638_5_72()
+  private boolean jj_3R_BuiltInCall_1642_5_72()
  {
     if (jj_scan_token(ENCODE_FOR_URI)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1637_5_71()
+  private boolean jj_3R_BuiltInCall_1641_5_71()
  {
     if (jj_scan_token(LCASE)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1636_5_70()
+  private boolean jj_3R_BuiltInCall_1640_5_70()
  {
     if (jj_scan_token(UCASE)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1635_5_69()
+  private boolean jj_3R_BuiltInCall_1639_5_69()
  {
-    if (jj_3R_StrReplaceExpression_1752_3_128()) return true;
+    if (jj_3R_StrReplaceExpression_1756_3_128()) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1634_5_68()
+  private boolean jj_3R_BuiltInCall_1638_5_68()
  {
     if (jj_scan_token(STRLEN)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1633_5_67()
+  private boolean jj_3R_BuiltInCall_1637_5_67()
  {
-    if (jj_3R_SubstringExpression_1740_5_127()) return true;
+    if (jj_3R_SubstringExpression_1744_5_127()) return true;
     return false;
   }
 
-  private boolean jj_3R_Prologue_72_33_134()
- {
-    if (jj_3R_VersionDecl_87_5_159()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_BuiltInCall_1632_5_66()
+  private boolean jj_3R_BuiltInCall_1636_5_66()
  {
     if (jj_scan_token(CONCAT)) return true;
     if (jj_3R_ExpressionList_919_3_126()) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1631_5_65()
+  private boolean jj_3R_BuiltInCall_1635_5_65()
  {
     if (jj_scan_token(IDIV)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1630_5_64()
+  private boolean jj_3R_BuiltInCall_1634_5_64()
  {
     if (jj_scan_token(MOD)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1629_5_63()
+  private boolean jj_3R_BuiltInCall_1633_5_63()
  {
     if (jj_scan_token(ROUND)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1628_5_62()
+  private boolean jj_3R_Prologue_72_33_134()
  {
-    if (jj_scan_token(FLOOR)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_VersionDecl_87_5_159()) return true;
     return false;
   }
 
-  private boolean jj_3R_VersionSpecifier_93_7_185()
+  private boolean jj_3R_BuiltInCall_1632_5_62()
  {
-    if (jj_scan_token(STRING_LITERAL2)) return true;
+    if (jj_scan_token(FLOOR)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1627_5_61()
+  private boolean jj_3R_BuiltInCall_1631_5_61()
  {
     if (jj_scan_token(CEIL)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_VersionSpecifier_92_7_184()
- {
-    if (jj_scan_token(STRING_LITERAL1)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_BuiltInCall_1626_5_60()
+  private boolean jj_3R_BuiltInCall_1630_5_60()
  {
     if (jj_scan_token(ABS)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1625_5_59()
+  private boolean jj_3R_BuiltInCall_1629_5_59()
  {
     if (jj_scan_token(RAND)) return true;
     if (jj_scan_token(NIL)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1623_7_125()
+  private boolean jj_3R_BuiltInCall_1627_7_125()
  {
     if (jj_scan_token(NIL)) return true;
     return false;
   }
 
+  private boolean jj_3R_VersionSpecifier_93_7_185()
+ {
+    if (jj_scan_token(STRING_LITERAL2)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_VersionSpecifier_92_7_184()
+ {
+    if (jj_scan_token(STRING_LITERAL1)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_BuiltInCall_1624_7_124()
+ {
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
   private boolean jj_3R_VersionSpecifier_92_5_173()
  {
     Token xsp;
@@ -8565,8 +8556,21 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1620_7_124()
+  private boolean jj_3R_BuiltInCall_1623_5_58()
+ {
+    if (jj_scan_token(BNODE)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_BuiltInCall_1624_7_124()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1627_7_125()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_BuiltInCall_1621_5_57()
  {
+    if (jj_scan_token(URI)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
@@ -8578,15 +8582,10 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1619_5_58()
+  private boolean jj_3R_BuiltInCall_1619_5_56()
  {
-    if (jj_scan_token(BNODE)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_BuiltInCall_1620_7_124()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1623_7_125()) return true;
-    }
+    if (jj_scan_token(IRI)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
@@ -8596,16 +8595,16 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1617_5_57()
+  private boolean jj_3R_BuiltInCall_1617_5_55()
  {
-    if (jj_scan_token(URI)) return true;
+    if (jj_scan_token(BOUND)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1615_5_56()
+  private boolean jj_3R_BuiltInCall_1615_5_54()
  {
-    if (jj_scan_token(IRI)) return true;
+    if (jj_scan_token(DTYPE)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
@@ -8614,27 +8613,27 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ;
  {
     if (jj_scan_token(PREFIX)) return true;
     if (jj_scan_token(PNAME_NS)) return true;
-    if (jj_3R_IRIREF_1960_3_172()) return true;
+    if (jj_3R_IRIREF_1964_3_172()) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1613_5_55()
+  private boolean jj_3R_BuiltInCall_1613_5_53()
  {
-    if (jj_scan_token(BOUND)) return true;
+    if (jj_scan_token(LANGDIR)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1611_5_54()
+  private boolean jj_3R_BuiltInCall_1610_5_52()
  {
-    if (jj_scan_token(DTYPE)) return true;
+    if (jj_scan_token(LANGMATCHES)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1609_5_53()
+  private boolean jj_3R_BuiltInCall_1608_5_51()
  {
-    if (jj_scan_token(LANGDIR)) return true;
+    if (jj_scan_token(LANG)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
@@ -8642,13 +8641,13 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ;
   private boolean jj_3R_BaseDecl_76_3_157()
  {
     if (jj_scan_token(BASE)) return true;
-    if (jj_3R_IRIREF_1960_3_172()) return true;
+    if (jj_3R_IRIREF_1964_3_172()) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1606_5_52()
+  private boolean jj_3R_BuiltInCall_1606_5_50()
  {
-    if (jj_scan_token(LANGMATCHES)) return true;
+    if (jj_scan_token(STR)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
@@ -8673,179 +8672,155 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1604_5_51()
- {
-    if (jj_scan_token(LANG)) return true;
-    if (jj_scan_token(LPAREN)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_Prologue_72_3_47()
- {
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_Prologue_72_5_119()) { jj_scanpos = xsp; break; }
-    }
-    return false;
-  }
-
-  private boolean jj_3R_BuiltInCall_1602_5_50()
+  private boolean jj_3R_BuiltInCall_1604_5_49()
  {
-    if (jj_scan_token(STR)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_Aggregate_1783_3_123()) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1600_5_49()
- {
-    if (jj_3R_Aggregate_1779_3_123()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_BuiltInCall_1600_5_46()
+  private boolean jj_3R_BuiltInCall_1604_5_46()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_BuiltInCall_1600_5_49()) {
+    if (jj_3R_BuiltInCall_1604_5_49()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1602_5_50()) {
+    if (jj_3R_BuiltInCall_1606_5_50()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1604_5_51()) {
+    if (jj_3R_BuiltInCall_1608_5_51()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1606_5_52()) {
+    if (jj_3R_BuiltInCall_1610_5_52()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1609_5_53()) {
+    if (jj_3R_BuiltInCall_1613_5_53()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1611_5_54()) {
+    if (jj_3R_BuiltInCall_1615_5_54()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1613_5_55()) {
+    if (jj_3R_BuiltInCall_1617_5_55()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1615_5_56()) {
+    if (jj_3R_BuiltInCall_1619_5_56()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1617_5_57()) {
+    if (jj_3R_BuiltInCall_1621_5_57()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1619_5_58()) {
+    if (jj_3R_BuiltInCall_1623_5_58()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1625_5_59()) {
+    if (jj_3R_BuiltInCall_1629_5_59()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1626_5_60()) {
+    if (jj_3R_BuiltInCall_1630_5_60()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1627_5_61()) {
+    if (jj_3R_BuiltInCall_1631_5_61()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1628_5_62()) {
+    if (jj_3R_BuiltInCall_1632_5_62()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1629_5_63()) {
+    if (jj_3R_BuiltInCall_1633_5_63()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1630_5_64()) {
+    if (jj_3R_BuiltInCall_1634_5_64()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1631_5_65()) {
+    if (jj_3R_BuiltInCall_1635_5_65()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1632_5_66()) {
+    if (jj_3R_BuiltInCall_1636_5_66()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1633_5_67()) {
+    if (jj_3R_BuiltInCall_1637_5_67()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1634_5_68()) {
+    if (jj_3R_BuiltInCall_1638_5_68()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1635_5_69()) {
+    if (jj_3R_BuiltInCall_1639_5_69()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1636_5_70()) {
+    if (jj_3R_BuiltInCall_1640_5_70()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1637_5_71()) {
+    if (jj_3R_BuiltInCall_1641_5_71()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1638_5_72()) {
+    if (jj_3R_BuiltInCall_1642_5_72()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1639_5_73()) {
+    if (jj_3R_BuiltInCall_1643_5_73()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1641_5_74()) {
+    if (jj_3R_BuiltInCall_1645_5_74()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1643_5_75()) {
+    if (jj_3R_BuiltInCall_1647_5_75()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1645_5_76()) {
+    if (jj_3R_BuiltInCall_1649_5_76()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1647_5_77()) {
+    if (jj_3R_BuiltInCall_1651_5_77()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1649_5_78()) {
+    if (jj_3R_BuiltInCall_1653_5_78()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1650_5_79()) {
+    if (jj_3R_BuiltInCall_1654_5_79()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1651_5_80()) {
+    if (jj_3R_BuiltInCall_1655_5_80()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1652_5_81()) {
+    if (jj_3R_BuiltInCall_1656_5_81()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1653_5_82()) {
+    if (jj_3R_BuiltInCall_1657_5_82()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1654_5_83()) {
+    if (jj_3R_BuiltInCall_1658_5_83()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1655_5_84()) {
+    if (jj_3R_BuiltInCall_1659_5_84()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1656_5_85()) {
+    if (jj_3R_BuiltInCall_1660_5_85()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1657_5_86()) {
+    if (jj_3R_BuiltInCall_1661_5_86()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1660_5_87()) {
+    if (jj_3R_BuiltInCall_1664_5_87()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1661_5_88()) {
+    if (jj_3R_BuiltInCall_1665_5_88()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1662_5_89()) {
+    if (jj_3R_BuiltInCall_1666_5_89()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1663_5_90()) {
+    if (jj_3R_BuiltInCall_1667_5_90()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1664_5_91()) {
+    if (jj_3R_BuiltInCall_1668_5_91()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1665_5_92()) {
+    if (jj_3R_BuiltInCall_1669_5_92()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1666_5_93()) {
+    if (jj_3R_BuiltInCall_1670_5_93()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1667_5_94()) {
+    if (jj_3R_BuiltInCall_1671_5_94()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1668_5_95()) {
+    if (jj_3R_BuiltInCall_1672_5_95()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1669_5_96()) {
+    if (jj_3R_BuiltInCall_1673_5_96()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1671_5_97()) {
+    if (jj_3R_BuiltInCall_1675_5_97()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1678_5_98()) {
+    if (jj_3R_BuiltInCall_1682_5_98()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1682_5_99()) {
+    if (jj_3R_BuiltInCall_1686_5_99()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1684_5_100()) {
+    if (jj_3R_BuiltInCall_1688_5_100()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1688_5_101()) {
+    if (jj_3R_BuiltInCall_1692_5_101()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1690_5_102()) {
+    if (jj_3R_BuiltInCall_1694_5_102()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1692_5_103()) {
+    if (jj_3R_BuiltInCall_1696_5_103()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1694_5_104()) {
+    if (jj_3R_BuiltInCall_1698_5_104()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1696_5_105()) {
+    if (jj_3R_BuiltInCall_1700_5_105()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1698_5_106()) {
+    if (jj_3R_BuiltInCall_1702_5_106()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1700_5_107()) {
+    if (jj_3R_BuiltInCall_1704_5_107()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1702_5_108()) {
+    if (jj_3R_BuiltInCall_1706_5_108()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1704_5_109()) {
+    if (jj_3R_BuiltInCall_1708_5_109()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1706_5_110()) {
+    if (jj_3R_BuiltInCall_1710_5_110()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1709_5_111()) {
+    if (jj_3R_BuiltInCall_1713_5_111()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1710_5_112()) {
+    if (jj_3R_BuiltInCall_1714_5_112()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1711_5_113()) {
+    if (jj_3R_BuiltInCall_1715_5_113()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1712_5_114()) {
+    if (jj_3R_BuiltInCall_1716_5_114()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1714_5_115()) {
+    if (jj_3R_BuiltInCall_1718_5_115()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1718_5_116()) {
+    if (jj_3R_BuiltInCall_1722_5_116()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1720_5_117()) {
+    if (jj_3R_BuiltInCall_1724_5_117()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1722_5_118()) return true;
+    if (jj_3R_BuiltInCall_1726_5_118()) return true;
     }
     }
     }
@@ -8918,56 +8893,77 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ;
     return false;
   }
 
+  private boolean jj_3R_Prologue_72_3_47()
+ {
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_Prologue_72_5_119()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
   private boolean jj_3R_Collection_1205_3_180()
  {
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_IRIREF_1960_3_172()
+  private boolean jj_3R_IRIREF_1964_3_172()
  {
     if (jj_scan_token(IRIref)) return true;
     return false;
   }
 
-  private boolean jj_3R_BlankNode_1956_3_193()
+  private boolean jj_3R_BlankNode_1960_3_193()
  {
     if (jj_scan_token(ANON)) return true;
     return false;
   }
 
-  private boolean jj_3R_BlankNode_1953_3_192()
+  private boolean jj_3R_BlankNode_1957_3_192()
  {
     if (jj_scan_token(BLANK_NODE_LABEL)) return true;
     return false;
   }
 
-  private boolean jj_3R_BlankNode_1953_3_178()
+  private boolean jj_3R_BlankNode_1957_3_178()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_BlankNode_1953_3_192()) {
+    if (jj_3R_BlankNode_1957_3_192()) {
     jj_scanpos = xsp;
-    if (jj_3R_BlankNode_1956_3_193()) return true;
+    if (jj_3R_BlankNode_1960_3_193()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_PrefixedName_1947_5_203()
+  private boolean jj_3R_PrefixedName_1951_5_203()
  {
     if (jj_scan_token(PNAME_NS)) return true;
     return false;
   }
 
-  private boolean jj_3R_BlankNodePropertyList_1182_3_181()
+  private boolean jj_3R_PrefixedName_1948_5_202()
  {
-    if (jj_scan_token(LBRACKET)) return true;
+    if (jj_scan_token(PNAME_LN)) return true;
     return false;
   }
 
-  private boolean jj_3R_PrefixedName_1944_5_202()
+  private boolean jj_3R_PrefixedName_1948_3_194()
  {
-    if (jj_scan_token(PNAME_LN)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_PrefixedName_1948_5_202()) {
+    jj_scanpos = xsp;
+    if (jj_3R_PrefixedName_1951_5_203()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_BlankNodePropertyList_1182_3_181()
+ {
+    if (jj_scan_token(LBRACKET)) return true;
     return false;
   }
 
@@ -8977,14 +8973,9 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ;
     return false;
   }
 
-  private boolean jj_3R_PrefixedName_1944_3_194()
+  private boolean jj_3R_iri_1944_3_183()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_PrefixedName_1944_5_202()) {
-    jj_scanpos = xsp;
-    if (jj_3R_PrefixedName_1947_5_203()) return true;
-    }
+    if (jj_3R_PrefixedName_1948_3_194()) return true;
     return false;
   }
 
@@ -9005,93 +8996,99 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ;
     return false;
   }
 
-  private boolean jj_3R_iri_1940_3_183()
- {
-    if (jj_3R_PrefixedName_1944_3_194()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_iri_1938_3_171()
+  private boolean jj_3R_iri_1942_3_171()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_iri_1938_3_182()) {
+    if (jj_3R_iri_1942_3_182()) {
     jj_scanpos = xsp;
-    if (jj_3R_iri_1940_3_183()) return true;
+    if (jj_3R_iri_1944_3_183()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_iri_1938_3_182()
+  private boolean jj_3R_iri_1942_3_182()
  {
-    if (jj_3R_IRIREF_1960_3_172()) return true;
+    if (jj_3R_IRIREF_1964_3_172()) return true;
     return false;
   }
 
-  private boolean jj_3R_String_1929_5_198()
+  private boolean jj_3R_String_1933_5_198()
  {
     if (jj_scan_token(STRING_LITERAL_LONG2)) return true;
     return false;
   }
 
-  private boolean jj_3R_String_1928_5_197()
+  private boolean jj_3R_String_1932_5_197()
  {
     if (jj_scan_token(STRING_LITERAL_LONG1)) return true;
     return false;
   }
 
-  private boolean jj_3R_String_1927_5_196()
+  private boolean jj_3R_String_1931_5_196()
  {
     if (jj_scan_token(STRING_LITERAL2)) return true;
     return false;
   }
 
-  private boolean jj_3R_String_1926_5_195()
+  private boolean jj_3R_String_1930_5_195()
  {
     if (jj_scan_token(STRING_LITERAL1)) return true;
     return false;
   }
 
-  private boolean jj_3R_String_1926_3_186()
+  private boolean jj_3R_String_1930_3_186()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_String_1926_5_195()) {
+    if (jj_3R_String_1930_5_195()) {
     jj_scanpos = xsp;
-    if (jj_3R_String_1927_5_196()) {
+    if (jj_3R_String_1931_5_196()) {
     jj_scanpos = xsp;
-    if (jj_3R_String_1928_5_197()) {
+    if (jj_3R_String_1932_5_197()) {
     jj_scanpos = xsp;
-    if (jj_3R_String_1929_5_198()) return true;
+    if (jj_3R_String_1933_5_198()) return true;
     }
     }
     }
     return false;
   }
 
-  private boolean jj_3R_BooleanLiteral_1922_3_191()
+  private boolean jj_3R_BooleanLiteral_1926_3_191()
  {
     if (jj_scan_token(FALSE)) return true;
     return false;
   }
 
-  private boolean jj_3R_BooleanLiteral_1920_3_190()
+  private boolean jj_3R_BooleanLiteral_1924_3_190()
  {
     if (jj_scan_token(TRUE)) return true;
     return false;
   }
 
-  private boolean jj_3R_BooleanLiteral_1920_3_177()
+  private boolean jj_3R_BooleanLiteral_1924_3_177()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_BooleanLiteral_1920_3_190()) {
+    if (jj_3R_BooleanLiteral_1924_3_190()) {
     jj_scanpos = xsp;
-    if (jj_3R_BooleanLiteral_1922_3_191()) return true;
+    if (jj_3R_BooleanLiteral_1926_3_191()) return true;
     }
     return false;
   }
 
+  private boolean jj_3R_NumericLiteralNegative_1920_3_212()
+ {
+    if (jj_scan_token(DOUBLE_NEGATIVE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_NumericLiteralNegative_1919_3_211()
+ {
+    if (jj_scan_token(DECIMAL_NEGATIVE)) return true;
+    return false;
+  }
+
   private boolean jj_3_2()
  {
     if (jj_scan_token(SEMICOLON)) return true;
@@ -9141,33 +9138,53 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ;
     return false;
   }
 
-  private boolean jj_3R_NumericLiteralNegative_1916_3_212()
+  private boolean jj_3R_NumericLiteralNegative_1918_3_210()
  {
-    if (jj_scan_token(DOUBLE_NEGATIVE)) return true;
+    if (jj_scan_token(INTEGER_NEGATIVE)) return true;
     return false;
   }
 
-  private boolean jj_3R_NumericLiteralNegative_1915_3_211()
+  private boolean jj_3R_NumericLiteralNegative_1918_3_201()
  {
-    if (jj_scan_token(DECIMAL_NEGATIVE)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_NumericLiteralNegative_1918_3_210()) {
+    jj_scanpos = xsp;
+    if (jj_3R_NumericLiteralNegative_1919_3_211()) {
+    jj_scanpos = xsp;
+    if (jj_3R_NumericLiteralNegative_1920_3_212()) return true;
+    }
+    }
     return false;
   }
 
-  private boolean jj_3R_NumericLiteralNegative_1914_3_210()
+  private boolean jj_3R_NumericLiteralPositive_1914_3_209()
  {
-    if (jj_scan_token(INTEGER_NEGATIVE)) return true;
+    if (jj_scan_token(DOUBLE_POSITIVE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_NumericLiteralPositive_1913_3_208()
+ {
+    if (jj_scan_token(DECIMAL_POSITIVE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_NumericLiteralPositive_1912_3_207()
+ {
+    if (jj_scan_token(INTEGER_POSITIVE)) return true;
     return false;
   }
 
-  private boolean jj_3R_NumericLiteralNegative_1914_3_201()
+  private boolean jj_3R_NumericLiteralPositive_1912_3_200()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_NumericLiteralNegative_1914_3_210()) {
+    if (jj_3R_NumericLiteralPositive_1912_3_207()) {
     jj_scanpos = xsp;
-    if (jj_3R_NumericLiteralNegative_1915_3_211()) {
+    if (jj_3R_NumericLiteralPositive_1913_3_208()) {
     jj_scanpos = xsp;
-    if (jj_3R_NumericLiteralNegative_1916_3_212()) return true;
+    if (jj_3R_NumericLiteralPositive_1914_3_209()) return true;
     }
     }
     return false;
@@ -9222,7 +9239,7 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ;
           jj_la1_5 = new int[] 
{0x0,0x0,0x0,0x0,0x30000000,0x0,0x0,0x0,0xf01ff000,0x0,0xf01ff000,0xf01ff000,0xf01ff000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xf01ff000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x213,0x213,0x8,0x20,0x8,0x8,0x8,0x8,0x8,0x8,0x200,0x0,0x0,0x400,0x0,0x0,0x80,0x180,0xf01ff000,0x0,0x0,0xf01ff000,0xf01ff000,0xf01ff000,0x0,0x0,0xf01ff000,0x0,0xf01ff000,0x0,0x0,0xf01ff000,0x0,0x0,0xf01ff000,0xf01ff000,0x0,0x0,0x8,0x0,0xf01
 [...]
        }
        private static void jj_la1_init_6() {
-          jj_la1_6 = new int[] 
{0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x40000001,0x0,0x0,0x8,0x0,0x40000000,0x0,0x8,0x0,0x0,0x200,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1,0x1,0x1,0x0,0x1,0x1,0x0,0x1,0x1,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa00a5,0x0,0x400,0xa00a5,0xa00a5,0xa00a5,0x8,0x400,0xa00a5,0x0,0xa00a5,0x400,0x0,0xa00a5,0x8,0x400,0xa00a5,0xa00a5,0x400,0x8,0x0,0x5,0x20000,0x0,0x5,0x5,0x20000,0x5,0x20000,0x80,0x80,0x200,0x
 [...]
+          jj_la1_6 = new int[] 
{0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x40000001,0x0,0x0,0x8,0x0,0x40000000,0x0,0x8,0x0,0x0,0x200,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1,0x1,0x1,0x0,0x1,0x1,0x0,0x1,0x1,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa00a5,0x0,0x400,0xa00a5,0xa00a5,0xa00a5,0x8,0x400,0xa00a5,0x0,0xa00a5,0x400,0x0,0xa00a5,0x8,0x400,0xa00a5,0xa00a5,0x400,0x8,0x0,0x5,0x20000,0x0,0x5,0x5,0x20000,0x5,0x20000,0x80,0x80,0x200,0x
 [...]
        }
        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,0x10,0x10,0x0,0x10,0x1
 [...]
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 d9a9f0d6fc..77876c05e2 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
@@ -3766,6 +3766,10 @@ s = createNode(iri) ;
       s = ReifiedTriple(acc);
       break;
       }
+    case L_TRIPLE:{
+      s = TripleTerm();
+      break;
+      }
     default:
       jj_la1[128] = jj_gen;
       jj_consume_token(-1);
@@ -3889,6 +3893,11 @@ n = createNode(iri) ;
       n = BlankNode();
       break;
       }
+    case L_TRIPLE:{
+      n = TripleTerm();
+{if ("" != null) return n;}
+      break;
+      }
     default:
       jj_la1[130] = jj_gen;
       jj_consume_token(-1);
@@ -4016,6 +4025,10 @@ n = createNode(iri) ;
       n = BooleanLiteral();
       break;
       }
+    case L_TRIPLE:{
+      n = TripleTermData();
+      break;
+      }
     default:
       jj_la1[133] = jj_gen;
       jj_consume_token(-1);
@@ -4703,6 +4716,10 @@ n = createNode(iri);
       n = Var();
       break;
       }
+    case L_TRIPLE:{
+      n = ExprTripleTerm();
+      break;
+      }
     default:
       jj_la1[150] = jj_gen;
       jj_consume_token(-1);
@@ -5986,7 +6003,7 @@ lex = unescapeStr(lex, t.beginLine, t.beginColumn) ;
           jj_la1_4 = new int[] 
{0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3fe00000,0x0,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,0x3fe00000,0x0,0x0,0x3fe00000,0x3fe00000,0x3fe00000,0x0,0x0,0x3fe00000,0x0,0x0,0x3fe00000,0x3fe00000,0x0,0x0,0x1000,0x0,0x3fe00000,0x0,0x0,0x0,0x3fe00000,0x0,0x3fe00000,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
 [...]

Reply via email to