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/26 13:46:10 UTC

svn commit: r1305317 [2/6] - in /incubator/jena/Jena2/ARQ/trunk: Grammar/ src/main/java/com/hp/hpl/jena/query/ src/main/java/com/hp/hpl/jena/sparql/algebra/ src/main/java/com/hp/hpl/jena/sparql/algebra/table/ src/main/java/com/hp/hpl/jena/sparql/core/ ...

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=1305317&r1=1305316&r2=1305317&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 Mon Mar 26 11:46:09 2012
@@ -64,6 +64,7 @@ public class ARQParser extends ARQParser
       throw new ParseException();
     }
     BindingsClause();
+    ValuesClause();
   }
 
   final public void UpdateUnit() throws ParseException {
@@ -1358,98 +1359,102 @@ public class ARQParser extends ARQParser
   }
 
   final public void BindingsClause() throws ParseException {
-                          Var v ; Node n ; Token t ;
+                          Token t ;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case BINDINGS:
-      // @@ Zero allowed?
-          t = jj_consume_token(BINDINGS);
+      t = jj_consume_token(BINDINGS);
       startBinding(t.beginLine, t.beginColumn) ;
-      label_12:
-      while (true) {
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-        case VAR1:
-        case VAR2:
-          ;
-          break;
-        default:
-          jj_la1[37] = jj_gen;
-          break label_12;
-        }
-        v = Var();
-                  emitBindingVariable(v, t.beginLine, t.beginColumn) ;
-      }
-      t = jj_consume_token(LBRACE);
-      label_13:
-      while (true) {
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-        case LPAREN:
-        case NIL:
-          ;
-          break;
-        default:
-          jj_la1[38] = jj_gen;
-          break label_13;
-        }
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-        case LPAREN:
-          t = jj_consume_token(LPAREN);
-          startBindingValueRow(t.beginLine, t.beginColumn) ;
-          label_14:
-          while (true) {
-            switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-            case IRIref:
-            case PNAME_NS:
-            case PNAME_LN:
-            case UNDEF:
-            case TRUE:
-            case FALSE:
-            case INTEGER:
-            case DECIMAL:
-            case DOUBLE:
-            case INTEGER_POSITIVE:
-            case DECIMAL_POSITIVE:
-            case DOUBLE_POSITIVE:
-            case INTEGER_NEGATIVE:
-            case DECIMAL_NEGATIVE:
-            case DOUBLE_NEGATIVE:
-            case STRING_LITERAL1:
-            case STRING_LITERAL2:
-            case STRING_LITERAL_LONG1:
-            case STRING_LITERAL_LONG2:
-              ;
-              break;
-            default:
-              jj_la1[39] = jj_gen;
-              break label_14;
-            }
-            n = BindingValue();
-                            emitBindingValue(n, t.beginLine, t.beginColumn) ;
-          }
-          t = jj_consume_token(RPAREN);
-          finishBindingValueRow(t.beginLine, t.beginColumn) ;
-          break;
-        case NIL:
-          t = jj_consume_token(NIL);
-        startBindingValueRow(t.beginLine, t.beginColumn) ;
-        finishBindingValueRow(t.beginLine, t.beginColumn) ;
-          break;
-        default:
-          jj_la1[40] = jj_gen;
-          jj_consume_token(-1);
-          throw new ParseException();
-        }
-      }
-      t = jj_consume_token(RBRACE);
+      DataBlock();
       finishBinding(t.beginLine, t.beginColumn) ;
       break;
     default:
-      jj_la1[41] = jj_gen;
+      jj_la1[37] = jj_gen;
       ;
     }
   }
 
-  final public Node BindingValue() throws ParseException {
-                        Node n ; String iri ;
+  final public void DataBlock() throws ParseException {
+                     Var v ; Node n ; Token t ;
+    label_12:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case VAR1:
+      case VAR2:
+        ;
+        break;
+      default:
+        jj_la1[38] = jj_gen;
+        break label_12;
+      }
+      v = Var();
+                emitDataBlockVariable(v) ;
+    }
+    t = jj_consume_token(LBRACE);
+    label_13:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case LPAREN:
+      case NIL:
+        ;
+        break;
+      default:
+        jj_la1[39] = jj_gen;
+        break label_13;
+      }
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case LPAREN:
+        t = jj_consume_token(LPAREN);
+        startDataBlockValueRow(t.beginLine, t.beginColumn) ;
+        label_14:
+        while (true) {
+          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+          case IRIref:
+          case PNAME_NS:
+          case PNAME_LN:
+          case UNDEF:
+          case TRUE:
+          case FALSE:
+          case INTEGER:
+          case DECIMAL:
+          case DOUBLE:
+          case INTEGER_POSITIVE:
+          case DECIMAL_POSITIVE:
+          case DOUBLE_POSITIVE:
+          case INTEGER_NEGATIVE:
+          case DECIMAL_NEGATIVE:
+          case DOUBLE_NEGATIVE:
+          case STRING_LITERAL1:
+          case STRING_LITERAL2:
+          case STRING_LITERAL_LONG1:
+          case STRING_LITERAL_LONG2:
+            ;
+            break;
+          default:
+            jj_la1[40] = jj_gen;
+            break label_14;
+          }
+          n = DataBlockValue();
+                            emitDataBlockValue(n, t.beginLine, t.beginColumn) ;
+        }
+        t = jj_consume_token(RPAREN);
+        finishDataBlockValueRow(t.beginLine, t.beginColumn) ;
+        break;
+      case NIL:
+        t = jj_consume_token(NIL);
+      startDataBlockValueRow(t.beginLine, t.beginColumn) ;
+      finishDataBlockValueRow(t.beginLine, t.beginColumn) ;
+        break;
+      default:
+        jj_la1[41] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+    }
+    t = jj_consume_token(RBRACE);
+  }
+
+  final public Node DataBlockValue() throws ParseException {
+                          Node n ; String iri ;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case IRIref:
     case PNAME_NS:
@@ -1493,6 +1498,22 @@ public class ARQParser extends ARQParser
     throw new Error("Missing return statement in function");
   }
 
+// Like BINDINGS, only with the work VALUES
+  final public void ValuesClause() throws ParseException {
+                        Token t ;
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case VALUES:
+      t = jj_consume_token(VALUES);
+      startValuesBlock(t.beginLine, t.beginColumn) ;
+      DataBlock();
+      finishValuesBlock(t.beginLine, t.beginColumn) ;
+      break;
+    default:
+      jj_la1[43] = jj_gen;
+      ;
+    }
+  }
+
 // SPARQL Update + transitional extensions for SPARQL/Update (the W3C submission)
 // Update only entry point
 // Optional SEMICOLON
@@ -1521,7 +1542,7 @@ public class ARQParser extends ARQParser
           ;
           break;
         default:
-          jj_la1[43] = jj_gen;
+          jj_la1[44] = jj_gen;
           break label_15;
         }
         jj_consume_token(SEMICOLON);
@@ -1529,7 +1550,7 @@ public class ARQParser extends ARQParser
       Update();
       break;
     default:
-      jj_la1[44] = jj_gen;
+      jj_la1[45] = jj_gen;
       ;
     }
   }
@@ -1577,7 +1598,7 @@ public class ARQParser extends ARQParser
       up = ModifyOld();
       break;
     default:
-      jj_la1[45] = jj_gen;
+      jj_la1[46] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -1594,7 +1615,7 @@ public class ARQParser extends ARQParser
                        silent = true ;
       break;
     default:
-      jj_la1[46] = jj_gen;
+      jj_la1[47] = jj_gen;
       ;
     }
     url = iri();
@@ -1607,14 +1628,14 @@ public class ARQParser extends ARQParser
         jj_consume_token(GRAPH);
         break;
       default:
-        jj_la1[47] = jj_gen;
+        jj_la1[48] = jj_gen;
         ;
       }
       iri = iri();
                                      dest = createNode(iri) ;
       break;
     default:
-      jj_la1[48] = jj_gen;
+      jj_la1[49] = jj_gen;
       ;
     }
       {if (true) return new UpdateLoad(url, dest, silent) ;}
@@ -1630,7 +1651,7 @@ public class ARQParser extends ARQParser
                        silent = true ;
       break;
     default:
-      jj_la1[49] = jj_gen;
+      jj_la1[50] = jj_gen;
       ;
     }
     target = GraphRefAll();
@@ -1647,7 +1668,7 @@ public class ARQParser extends ARQParser
                       silent = true ;
       break;
     default:
-      jj_la1[50] = jj_gen;
+      jj_la1[51] = jj_gen;
       ;
     }
     target = GraphRefAll();
@@ -1664,7 +1685,7 @@ public class ARQParser extends ARQParser
                         silent=true ;
       break;
     default:
-      jj_la1[51] = jj_gen;
+      jj_la1[52] = jj_gen;
       ;
     }
     iri = GraphRef();
@@ -1681,7 +1702,7 @@ public class ARQParser extends ARQParser
                     silent=true ;
       break;
     default:
-      jj_la1[52] = jj_gen;
+      jj_la1[53] = jj_gen;
       ;
     }
     src = GraphOrDefault();
@@ -1700,7 +1721,7 @@ public class ARQParser extends ARQParser
                      silent=true ;
       break;
     default:
-      jj_la1[53] = jj_gen;
+      jj_la1[54] = jj_gen;
       ;
     }
     src = GraphOrDefault();
@@ -1719,7 +1740,7 @@ public class ARQParser extends ARQParser
                      silent=true ;
       break;
     default:
-      jj_la1[54] = jj_gen;
+      jj_la1[55] = jj_gen;
       ;
     }
     src = GraphOrDefault();
@@ -1778,7 +1799,7 @@ public class ARQParser extends ARQParser
                          Node n = createNode(iri) ; up.setWithIRI(n) ;
       break;
     default:
-      jj_la1[55] = jj_gen;
+      jj_la1[56] = jj_gen;
       ;
     }
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1789,7 +1810,7 @@ public class ARQParser extends ARQParser
         InsertClause(up);
         break;
       default:
-        jj_la1[56] = jj_gen;
+        jj_la1[57] = jj_gen;
         ;
       }
       break;
@@ -1797,7 +1818,7 @@ public class ARQParser extends ARQParser
       InsertClause(up);
       break;
     default:
-      jj_la1[57] = jj_gen;
+      jj_la1[58] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -1808,7 +1829,7 @@ public class ARQParser extends ARQParser
         ;
         break;
       default:
-        jj_la1[58] = jj_gen;
+        jj_la1[59] = jj_gen;
         break label_16;
       }
       UsingClause(up);
@@ -1831,7 +1852,7 @@ public class ARQParser extends ARQParser
                     Node n = createNode(iri) ; up.setWithIRI(n) ;
       break;
     default:
-      jj_la1[59] = jj_gen;
+      jj_la1[60] = jj_gen;
       ;
     }
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1839,7 +1860,7 @@ public class ARQParser extends ARQParser
       DeleteClause(up);
       break;
     default:
-      jj_la1[60] = jj_gen;
+      jj_la1[61] = jj_gen;
       ;
     }
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1847,7 +1868,7 @@ public class ARQParser extends ARQParser
       InsertClause(up);
       break;
     default:
-      jj_la1[61] = jj_gen;
+      jj_la1[62] = jj_gen;
       ;
     }
     jj_consume_token(WHERE);
@@ -1889,14 +1910,14 @@ public class ARQParser extends ARQParser
         jj_consume_token(INTO);
         break;
       default:
-        jj_la1[62] = jj_gen;
+        jj_la1[63] = jj_gen;
         ;
       }
       iri = iri();
        Node gn = createNode(iri) ; setAccGraph(qp, gn) ;
       break;
     default:
-      jj_la1[63] = jj_gen;
+      jj_la1[64] = jj_gen;
       ;
     }
   }
@@ -1913,14 +1934,14 @@ public class ARQParser extends ARQParser
         jj_consume_token(FROM);
         break;
       default:
-        jj_la1[64] = jj_gen;
+        jj_la1[65] = jj_gen;
         ;
       }
       iri = iri();
        Node gn = createNode(iri) ; setAccGraph(qp, gn) ;
       break;
     default:
-      jj_la1[65] = jj_gen;
+      jj_la1[66] = jj_gen;
       ;
     }
   }
@@ -1941,7 +1962,7 @@ public class ARQParser extends ARQParser
       n = createNode(iri) ; update.addUsingNamed(n) ;
       break;
     default:
-      jj_la1[66] = jj_gen;
+      jj_la1[67] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -1963,14 +1984,14 @@ public class ARQParser extends ARQParser
         jj_consume_token(GRAPH);
         break;
       default:
-        jj_la1[67] = jj_gen;
+        jj_la1[68] = jj_gen;
         ;
       }
       iri = iri();
        {if (true) return Target.create(createNode(iri)) ;}
       break;
     default:
-      jj_la1[68] = jj_gen;
+      jj_la1[69] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2010,13 +2031,13 @@ public class ARQParser extends ARQParser
              {if (true) return Target.ALL ;}
         break;
       default:
-        jj_la1[69] = jj_gen;
+        jj_la1[70] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
       break;
     default:
-      jj_la1[70] = jj_gen;
+      jj_la1[71] = jj_gen;
       ;
     }
      {if (true) return Target.DEFAULT ;}
@@ -2066,7 +2087,7 @@ public class ARQParser extends ARQParser
       TriplesTemplate(acc);
       break;
     default:
-      jj_la1[71] = jj_gen;
+      jj_la1[72] = jj_gen;
       ;
     }
     label_17:
@@ -2076,7 +2097,7 @@ public class ARQParser extends ARQParser
         ;
         break;
       default:
-        jj_la1[72] = jj_gen;
+        jj_la1[73] = jj_gen;
         break label_17;
       }
       QuadsNotTriples(acc);
@@ -2085,7 +2106,7 @@ public class ARQParser extends ARQParser
         jj_consume_token(DOT);
         break;
       default:
-        jj_la1[73] = jj_gen;
+        jj_la1[74] = jj_gen;
         ;
       }
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -2117,7 +2138,7 @@ public class ARQParser extends ARQParser
         TriplesTemplate(acc);
         break;
       default:
-        jj_la1[74] = jj_gen;
+        jj_la1[75] = jj_gen;
         ;
       }
     }
@@ -2158,7 +2179,7 @@ public class ARQParser extends ARQParser
       TriplesTemplate(acc);
       break;
     default:
-      jj_la1[75] = jj_gen;
+      jj_la1[76] = jj_gen;
       ;
     }
     jj_consume_token(RBRACE);
@@ -2182,7 +2203,7 @@ public class ARQParser extends ARQParser
       jj_consume_token(DOT);
       break;
     default:
-      jj_la1[76] = jj_gen;
+      jj_la1[77] = jj_gen;
       ;
     }
   }
@@ -2199,7 +2220,7 @@ public class ARQParser extends ARQParser
       el = new ElementSubQuery(q) ;
       break;
     default:
-      jj_la1[77] = jj_gen;
+      jj_la1[78] = jj_gen;
       el = GroupGraphPatternSub();
     }
     jj_consume_token(RBRACE);
@@ -2243,7 +2264,7 @@ public class ARQParser extends ARQParser
       elg.addElement(el) ;
       break;
     default:
-      jj_la1[78] = jj_gen;
+      jj_la1[79] = jj_gen;
       ;
     }
     label_19:
@@ -2262,7 +2283,7 @@ public class ARQParser extends ARQParser
         ;
         break;
       default:
-        jj_la1[79] = jj_gen;
+        jj_la1[80] = jj_gen;
         break label_19;
       }
       el = GraphPatternNotTriples();
@@ -2272,7 +2293,7 @@ public class ARQParser extends ARQParser
         jj_consume_token(DOT);
         break;
       default:
-        jj_la1[80] = jj_gen;
+        jj_la1[81] = jj_gen;
         ;
       }
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -2307,7 +2328,7 @@ public class ARQParser extends ARQParser
         elg.addElement(el) ;
         break;
       default:
-        jj_la1[81] = jj_gen;
+        jj_la1[82] = jj_gen;
         ;
       }
     }
@@ -2352,12 +2373,12 @@ public class ARQParser extends ARQParser
         TriplesBlock(acc);
         break;
       default:
-        jj_la1[82] = jj_gen;
+        jj_la1[83] = jj_gen;
         ;
       }
       break;
     default:
-      jj_la1[83] = jj_gen;
+      jj_la1[84] = jj_gen;
       ;
     }
       {if (true) return acc ;}
@@ -2403,7 +2424,7 @@ public class ARQParser extends ARQParser
       el = NotExistsElt();
       break;
     default:
-      jj_la1[84] = jj_gen;
+      jj_la1[85] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2438,7 +2459,7 @@ public class ARQParser extends ARQParser
      silent=true;
       break;
     default:
-      jj_la1[85] = jj_gen;
+      jj_la1[86] = jj_gen;
       ;
     }
     n = VarOrIri();
@@ -2516,7 +2537,7 @@ public class ARQParser extends ARQParser
         ;
         break;
       default:
-        jj_la1[86] = jj_gen;
+        jj_la1[87] = jj_gen;
         break label_20;
       }
       jj_consume_token(UNION);
@@ -2616,7 +2637,7 @@ public class ARQParser extends ARQParser
       c = FunctionCall();
       break;
     default:
-      jj_la1[87] = jj_gen;
+      jj_la1[88] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2650,7 +2671,7 @@ public class ARQParser extends ARQParser
                                  t.beginLine, t.beginColumn) ;
         break;
       default:
-        jj_la1[88] = jj_gen;
+        jj_la1[89] = jj_gen;
         ;
       }
       expr = Expression();
@@ -2662,7 +2683,7 @@ public class ARQParser extends ARQParser
           ;
           break;
         default:
-          jj_la1[89] = jj_gen;
+          jj_la1[90] = jj_gen;
           break label_21;
         }
         jj_consume_token(COMMA);
@@ -2672,7 +2693,7 @@ public class ARQParser extends ARQParser
       jj_consume_token(RPAREN);
       break;
     default:
-      jj_la1[90] = jj_gen;
+      jj_la1[91] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2697,7 +2718,7 @@ public class ARQParser extends ARQParser
           ;
           break;
         default:
-          jj_la1[91] = jj_gen;
+          jj_la1[92] = jj_gen;
           break label_22;
         }
         jj_consume_token(COMMA);
@@ -2707,7 +2728,7 @@ public class ARQParser extends ARQParser
       jj_consume_token(RPAREN);
       break;
     default:
-      jj_la1[92] = jj_gen;
+      jj_la1[93] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2750,7 +2771,7 @@ public class ARQParser extends ARQParser
       ConstructTriples(acc);
       break;
     default:
-      jj_la1[93] = jj_gen;
+      jj_la1[94] = jj_gen;
       ;
     }
     jj_consume_token(RBRACE);
@@ -2776,7 +2797,7 @@ public class ARQParser extends ARQParser
       jj_consume_token(DOT);
       break;
     default:
-      jj_la1[94] = jj_gen;
+      jj_la1[95] = jj_gen;
       ;
     }
   }
@@ -2819,7 +2840,7 @@ public class ARQParser extends ARQParser
       PropertyList(s, acc);
       break;
     default:
-      jj_la1[95] = jj_gen;
+      jj_la1[96] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2836,7 +2857,7 @@ public class ARQParser extends ARQParser
         ;
         break;
       default:
-        jj_la1[96] = jj_gen;
+        jj_la1[97] = jj_gen;
         break label_24;
       }
       jj_consume_token(SEMICOLON);
@@ -2851,7 +2872,7 @@ public class ARQParser extends ARQParser
         ObjectList(s, p, null, acc);
         break;
       default:
-        jj_la1[97] = jj_gen;
+        jj_la1[98] = jj_gen;
         ;
       }
     }
@@ -2868,7 +2889,7 @@ public class ARQParser extends ARQParser
       PropertyListNotEmpty(s, acc);
       break;
     default:
-      jj_la1[98] = jj_gen;
+      jj_la1[99] = jj_gen;
       ;
     }
   }
@@ -2883,7 +2904,7 @@ public class ARQParser extends ARQParser
         ;
         break;
       default:
-        jj_la1[99] = jj_gen;
+        jj_la1[100] = jj_gen;
         break label_25;
       }
       jj_consume_token(COMMA);
@@ -2913,7 +2934,7 @@ public class ARQParser extends ARQParser
                               p = nRDFtype ;
       break;
     default:
-      jj_la1[100] = jj_gen;
+      jj_la1[101] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2959,7 +2980,7 @@ public class ARQParser extends ARQParser
       PropertyListPath(s, acc);
       break;
     default:
-      jj_la1[101] = jj_gen;
+      jj_la1[102] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2985,7 +3006,7 @@ public class ARQParser extends ARQParser
       p = VerbSimple();
       break;
     default:
-      jj_la1[102] = jj_gen;
+      jj_la1[103] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2997,7 +3018,7 @@ public class ARQParser extends ARQParser
         ;
         break;
       default:
-        jj_la1[103] = jj_gen;
+        jj_la1[104] = jj_gen;
         break label_26;
       }
       jj_consume_token(SEMICOLON);
@@ -3033,14 +3054,14 @@ public class ARQParser extends ARQParser
           p = VerbSimple();
           break;
         default:
-          jj_la1[104] = jj_gen;
+          jj_la1[105] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
         ObjectList(s, p, path, acc);
         break;
       default:
-        jj_la1[105] = jj_gen;
+        jj_la1[106] = jj_gen;
         ;
       }
     }
@@ -3063,7 +3084,7 @@ public class ARQParser extends ARQParser
       PropertyListPathNotEmpty(s, acc);
       break;
     default:
-      jj_la1[106] = jj_gen;
+      jj_la1[107] = jj_gen;
       ;
     }
   }
@@ -3112,7 +3133,7 @@ public class ARQParser extends ARQParser
         ;
         break;
       default:
-        jj_la1[107] = jj_gen;
+        jj_la1[108] = jj_gen;
         break label_27;
       }
       jj_consume_token(VBAR);
@@ -3134,7 +3155,7 @@ public class ARQParser extends ARQParser
         ;
         break;
       default:
-        jj_la1[108] = jj_gen;
+        jj_la1[109] = jj_gen;
         break label_28;
       }
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -3149,7 +3170,7 @@ public class ARQParser extends ARQParser
         p1 = PathFactory.pathSeq(p1, new P_Inverse(p2)) ;
         break;
       default:
-        jj_la1[109] = jj_gen;
+        jj_la1[110] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -3170,7 +3191,7 @@ public class ARQParser extends ARQParser
       p = PathMod(p);
       break;
     default:
-      jj_la1[110] = jj_gen;
+      jj_la1[111] = jj_gen;
       ;
     }
      {if (true) return p ;}
@@ -3198,7 +3219,7 @@ public class ARQParser extends ARQParser
        p = PathFactory.pathInverse(p) ;
       break;
     default:
-      jj_la1[111] = jj_gen;
+      jj_la1[112] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3252,7 +3273,7 @@ public class ARQParser extends ARQParser
                 {if (true) return PathFactory.pathMod(p, i1, i2) ;}
             break;
           default:
-            jj_la1[112] = jj_gen;
+            jj_la1[113] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
@@ -3262,7 +3283,7 @@ public class ARQParser extends ARQParser
                        {if (true) return PathFactory.pathFixedLength(p, i1) ;}
           break;
         default:
-          jj_la1[113] = jj_gen;
+          jj_la1[114] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -3274,13 +3295,13 @@ public class ARQParser extends ARQParser
              {if (true) return PathFactory.pathMod(p, PathFactory.UNSET, i2) ;}
         break;
       default:
-        jj_la1[114] = jj_gen;
+        jj_la1[115] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
       break;
     default:
-      jj_la1[115] = jj_gen;
+      jj_la1[116] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3331,7 +3352,7 @@ public class ARQParser extends ARQParser
       jj_consume_token(RPAREN);
       break;
     default:
-      jj_la1[116] = jj_gen;
+      jj_la1[117] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3368,7 +3389,7 @@ public class ARQParser extends ARQParser
             ;
             break;
           default:
-            jj_la1[117] = jj_gen;
+            jj_la1[118] = jj_gen;
             break label_29;
           }
           jj_consume_token(VBAR);
@@ -3377,13 +3398,13 @@ public class ARQParser extends ARQParser
         }
         break;
       default:
-        jj_la1[118] = jj_gen;
+        jj_la1[119] = jj_gen;
         ;
       }
       jj_consume_token(RPAREN);
       break;
     default:
-      jj_la1[119] = jj_gen;
+      jj_la1[120] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3418,13 +3439,13 @@ public class ARQParser extends ARQParser
                {if (true) return new P_ReverseLink(nRDFtype) ;}
         break;
       default:
-        jj_la1[120] = jj_gen;
+        jj_la1[121] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
       break;
     default:
-      jj_la1[121] = jj_gen;
+      jj_la1[122] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3453,7 +3474,7 @@ public class ARQParser extends ARQParser
                                    {if (true) return n ;}
       break;
     default:
-      jj_la1[122] = jj_gen;
+      jj_la1[123] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3482,7 +3503,7 @@ public class ARQParser extends ARQParser
                                        {if (true) return n ;}
       break;
     default:
-      jj_la1[123] = jj_gen;
+      jj_la1[124] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3543,7 +3564,7 @@ public class ARQParser extends ARQParser
         ;
         break;
       default:
-        jj_la1[124] = jj_gen;
+        jj_la1[125] = jj_gen;
         break label_30;
       }
     }
@@ -3590,7 +3611,7 @@ public class ARQParser extends ARQParser
                          {if (true) return n ;}
       break;
     default:
-      jj_la1[125] = jj_gen;
+      jj_la1[126] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3628,7 +3649,7 @@ public class ARQParser extends ARQParser
       n = GraphTerm();
       break;
     default:
-      jj_la1[126] = jj_gen;
+      jj_la1[127] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3651,7 +3672,7 @@ public class ARQParser extends ARQParser
                               n = createNode(iri) ;
       break;
     default:
-      jj_la1[127] = jj_gen;
+      jj_la1[128] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3669,7 +3690,7 @@ public class ARQParser extends ARQParser
       t = jj_consume_token(VAR2);
       break;
     default:
-      jj_la1[128] = jj_gen;
+      jj_la1[129] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3720,7 +3741,7 @@ public class ARQParser extends ARQParser
           {if (true) return nRDFnil ;}
       break;
     default:
-      jj_la1[129] = jj_gen;
+      jj_la1[130] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3745,7 +3766,7 @@ public class ARQParser extends ARQParser
         ;
         break;
       default:
-        jj_la1[130] = jj_gen;
+        jj_la1[131] = jj_gen;
         break label_31;
       }
       jj_consume_token(SC_OR);
@@ -3766,7 +3787,7 @@ public class ARQParser extends ARQParser
         ;
         break;
       default:
-        jj_la1[131] = jj_gen;
+        jj_la1[132] = jj_gen;
         break label_32;
       }
       jj_consume_token(SC_AND);
@@ -3839,13 +3860,13 @@ public class ARQParser extends ARQParser
         expr1 = new E_NotOneOf(expr1, a) ;
         break;
       default:
-        jj_la1[132] = jj_gen;
+        jj_la1[133] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
       break;
     default:
-      jj_la1[133] = jj_gen;
+      jj_la1[134] = jj_gen;
       ;
     }
       {if (true) return expr1 ;}
@@ -3876,7 +3897,7 @@ public class ARQParser extends ARQParser
         ;
         break;
       default:
-        jj_la1[134] = jj_gen;
+        jj_la1[135] = jj_gen;
         break label_33;
       }
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -3914,7 +3935,7 @@ public class ARQParser extends ARQParser
          addition = false ;
           break;
         default:
-          jj_la1[135] = jj_gen;
+          jj_la1[136] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -3926,7 +3947,7 @@ public class ARQParser extends ARQParser
             ;
             break;
           default:
-            jj_la1[136] = jj_gen;
+            jj_la1[137] = jj_gen;
             break label_34;
           }
           switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -3941,7 +3962,7 @@ public class ARQParser extends ARQParser
                                             expr2 = new E_Divide(expr2, expr3) ;
             break;
           default:
-            jj_la1[137] = jj_gen;
+            jj_la1[138] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
@@ -3952,7 +3973,7 @@ public class ARQParser extends ARQParser
          expr1 = new E_Subtract(expr1, expr2) ;
         break;
       default:
-        jj_la1[138] = jj_gen;
+        jj_la1[139] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -3972,7 +3993,7 @@ public class ARQParser extends ARQParser
         ;
         break;
       default:
-        jj_la1[139] = jj_gen;
+        jj_la1[140] = jj_gen;
         break label_35;
       }
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -3987,7 +4008,7 @@ public class ARQParser extends ARQParser
       expr1 = new E_Divide(expr1, expr2) ;
         break;
       default:
-        jj_la1[140] = jj_gen;
+        jj_la1[141] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -4101,7 +4122,7 @@ public class ARQParser extends ARQParser
                                  {if (true) return expr ;}
       break;
     default:
-      jj_la1[141] = jj_gen;
+      jj_la1[142] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -4216,7 +4237,7 @@ public class ARQParser extends ARQParser
                  {if (true) return asExpr(gn) ;}
       break;
     default:
-      jj_la1[142] = jj_gen;
+      jj_la1[143] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -4311,7 +4332,7 @@ public class ARQParser extends ARQParser
               {if (true) return new E_BNode() ;}
         break;
       default:
-        jj_la1[143] = jj_gen;
+        jj_la1[144] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -4638,7 +4659,7 @@ public class ARQParser extends ARQParser
                              {if (true) return expr ;}
       break;
     default:
-      jj_la1[144] = jj_gen;
+      jj_la1[145] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -4658,7 +4679,7 @@ public class ARQParser extends ARQParser
       flagsExpr = Expression();
       break;
     default:
-      jj_la1[145] = jj_gen;
+      jj_la1[146] = jj_gen;
       ;
     }
     jj_consume_token(RPAREN);
@@ -4679,7 +4700,7 @@ public class ARQParser extends ARQParser
       expr3 = Expression();
       break;
     default:
-      jj_la1[146] = jj_gen;
+      jj_la1[147] = jj_gen;
       ;
     }
     jj_consume_token(RPAREN);
@@ -4702,7 +4723,7 @@ public class ARQParser extends ARQParser
       expr4 = Expression();
       break;
     default:
-      jj_la1[147] = jj_gen;
+      jj_la1[148] = jj_gen;
       ;
     }
     jj_consume_token(RPAREN);
@@ -4744,7 +4765,7 @@ public class ARQParser extends ARQParser
                    distinct = true ;
         break;
       default:
-        jj_la1[148] = jj_gen;
+        jj_la1[149] = jj_gen;
         ;
       }
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -4840,7 +4861,7 @@ public class ARQParser extends ARQParser
         expr = Expression();
         break;
       default:
-        jj_la1[149] = jj_gen;
+        jj_la1[150] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -4857,7 +4878,7 @@ public class ARQParser extends ARQParser
                                       distinct = true ;
         break;
       default:
-        jj_la1[150] = jj_gen;
+        jj_la1[151] = jj_gen;
         ;
       }
       expr = Expression();
@@ -4873,7 +4894,7 @@ public class ARQParser extends ARQParser
                                       distinct = true ;
         break;
       default:
-        jj_la1[151] = jj_gen;
+        jj_la1[152] = jj_gen;
         ;
       }
       expr = Expression();
@@ -4889,7 +4910,7 @@ public class ARQParser extends ARQParser
                                       distinct = true ;
         break;
       default:
-        jj_la1[152] = jj_gen;
+        jj_la1[153] = jj_gen;
         ;
       }
       expr = Expression();
@@ -4905,7 +4926,7 @@ public class ARQParser extends ARQParser
                                       distinct = true ;
         break;
       default:
-        jj_la1[153] = jj_gen;
+        jj_la1[154] = jj_gen;
         ;
       }
       expr = Expression();
@@ -4921,7 +4942,7 @@ public class ARQParser extends ARQParser
                                          distinct = true ;
         break;
       default:
-        jj_la1[154] = jj_gen;
+        jj_la1[155] = jj_gen;
         ;
       }
       expr = Expression();
@@ -4937,7 +4958,7 @@ public class ARQParser extends ARQParser
                       distinct = true ;
         break;
       default:
-        jj_la1[155] = jj_gen;
+        jj_la1[156] = jj_gen;
         ;
       }
       expr = Expression();
@@ -4958,7 +4979,7 @@ public class ARQParser extends ARQParser
                                                            ordered.add(expr2) ;
             break;
           default:
-            jj_la1[156] = jj_gen;
+            jj_la1[157] = jj_gen;
             ;
           }
         } else {
@@ -4971,21 +4992,21 @@ public class ARQParser extends ARQParser
                                                        ordered.add(expr2) ;
             break;
           default:
-            jj_la1[157] = jj_gen;
+            jj_la1[158] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
         }
         break;
       default:
-        jj_la1[158] = jj_gen;
+        jj_la1[159] = jj_gen;
         ;
       }
       jj_consume_token(RPAREN);
       agg = AggregatorFactory.createGroupConcat(distinct, expr, sep, ordered) ;
       break;
     default:
-      jj_la1[159] = jj_gen;
+      jj_la1[160] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -5011,7 +5032,7 @@ public class ARQParser extends ARQParser
       a = ArgList();
       break;
     default:
-      jj_la1[160] = jj_gen;
+      jj_la1[161] = jj_gen;
       ;
     }
     if ( a == null )
@@ -5037,13 +5058,13 @@ public class ARQParser extends ARQParser
         uri = iri();
         break;
       default:
-        jj_la1[161] = jj_gen;
+        jj_la1[162] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
       break;
     default:
-      jj_la1[162] = jj_gen;
+      jj_la1[163] = jj_gen;
       ;
     }
       {if (true) return createLiteral(lex, lang, uri) ;}
@@ -5069,7 +5090,7 @@ public class ARQParser extends ARQParser
       n = NumericLiteralNegative();
       break;
     default:
-      jj_la1[163] = jj_gen;
+      jj_la1[164] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -5093,7 +5114,7 @@ public class ARQParser extends ARQParser
                  {if (true) return createLiteralDouble(t.image) ;}
       break;
     default:
-      jj_la1[164] = jj_gen;
+      jj_la1[165] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -5116,7 +5137,7 @@ public class ARQParser extends ARQParser
                           {if (true) return createLiteralDouble(t.image) ;}
       break;
     default:
-      jj_la1[165] = jj_gen;
+      jj_la1[166] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -5139,7 +5160,7 @@ public class ARQParser extends ARQParser
                           {if (true) return createLiteralDouble(t.image) ;}
       break;
     default:
-      jj_la1[166] = jj_gen;
+      jj_la1[167] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -5157,7 +5178,7 @@ public class ARQParser extends ARQParser
             {if (true) return XSD_FALSE ;}
       break;
     default:
-      jj_la1[167] = jj_gen;
+      jj_la1[168] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -5184,7 +5205,7 @@ public class ARQParser extends ARQParser
                                  lex = stripQuotes3(t.image) ;
       break;
     default:
-      jj_la1[168] = jj_gen;
+      jj_la1[169] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -5206,7 +5227,7 @@ public class ARQParser extends ARQParser
                          {if (true) return iri ;}
       break;
     default:
-      jj_la1[169] = jj_gen;
+      jj_la1[170] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -5225,7 +5246,7 @@ public class ARQParser extends ARQParser
       {if (true) return resolvePName(t.image, t.beginLine, t.beginColumn) ;}
       break;
     default:
-      jj_la1[170] = jj_gen;
+      jj_la1[171] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -5245,7 +5266,7 @@ public class ARQParser extends ARQParser
                {if (true) return createBNode(t.beginLine, t.beginColumn) ;}
       break;
     default:
-      jj_la1[171] = jj_gen;
+      jj_la1[172] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -5287,141 +5308,6 @@ public class ARQParser extends ARQParser
     finally { jj_save(3, xla); }
   }
 
-  private boolean jj_3R_62() {
-    if (jj_scan_token(STRBEFORE)) return true;
-    if (jj_scan_token(LPAREN)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_61() {
-    if (jj_scan_token(STRENDS)) return true;
-    if (jj_scan_token(LPAREN)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_161() {
-    if (jj_scan_token(DOUBLE_POSITIVE)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_160() {
-    if (jj_scan_token(DECIMAL_POSITIVE)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_60() {
-    if (jj_scan_token(STRSTARTS)) return true;
-    if (jj_scan_token(LPAREN)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_159() {
-    if (jj_scan_token(INTEGER_POSITIVE)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_152() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_159()) {
-    jj_scanpos = xsp;
-    if (jj_3R_160()) {
-    jj_scanpos = xsp;
-    if (jj_3R_161()) return true;
-    }
-    }
-    return false;
-  }
-
-  private boolean jj_3R_116() {
-    if (jj_3R_120()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_59() {
-    if (jj_scan_token(CONTAINS)) return true;
-    if (jj_scan_token(LPAREN)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_105() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_116()) {
-    jj_scanpos = xsp;
-    if (jj_3R_117()) return true;
-    }
-    return false;
-  }
-
-  private boolean jj_3R_58() {
-    if (jj_scan_token(ENCODE_FOR_URI)) return true;
-    if (jj_scan_token(LPAREN)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_57() {
-    if (jj_scan_token(LCASE)) return true;
-    if (jj_scan_token(LPAREN)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_158() {
-    if (jj_scan_token(DOUBLE)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_56() {
-    if (jj_scan_token(UCASE)) return true;
-    if (jj_scan_token(LPAREN)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_157() {
-    if (jj_scan_token(DECIMAL)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_55() {
-    if (jj_3R_101()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_156() {
-    if (jj_scan_token(INTEGER)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_151() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_156()) {
-    jj_scanpos = xsp;
-    if (jj_3R_157()) {
-    jj_scanpos = xsp;
-    if (jj_3R_158()) return true;
-    }
-    }
-    return false;
-  }
-
-  private boolean jj_3R_54() {
-    if (jj_scan_token(STRLEN)) return true;
-    if (jj_scan_token(LPAREN)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_53() {
-    if (jj_3R_100()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_52() {
-    if (jj_scan_token(CONCAT)) return true;
-    if (jj_3R_99()) return true;
-    return false;
-  }
-
   private boolean jj_3R_51() {
     if (jj_scan_token(ROUND)) return true;
     if (jj_scan_token(LPAREN)) return true;
@@ -5553,11 +5439,6 @@ public class ARQParser extends ARQParser
     return false;
   }
 
-  private boolean jj_3_1() {
-    if (jj_3R_36()) return true;
-    return false;
-  }
-
   private boolean jj_3R_38() {
     if (jj_3R_96()) return true;
     return false;
@@ -5735,6 +5616,11 @@ public class ARQParser extends ARQParser
     return false;
   }
 
+  private boolean jj_3_1() {
+    if (jj_3R_36()) return true;
+    return false;
+  }
+
   private boolean jj_3R_123() {
     if (jj_scan_token(LBRACKET)) return true;
     return false;
@@ -5891,7 +5777,7 @@ public class ARQParser extends ARQParser
   private boolean jj_3R_99() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(166)) {
+    if (jj_scan_token(167)) {
     jj_scanpos = xsp;
     if (jj_3R_114()) return true;
     }
@@ -6314,6 +6200,141 @@ public class ARQParser extends ARQParser
     return false;
   }
 
+  private boolean jj_3R_62() {
+    if (jj_scan_token(STRBEFORE)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_61() {
+    if (jj_scan_token(STRENDS)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_161() {
+    if (jj_scan_token(DOUBLE_POSITIVE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_160() {
+    if (jj_scan_token(DECIMAL_POSITIVE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_60() {
+    if (jj_scan_token(STRSTARTS)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_159() {
+    if (jj_scan_token(INTEGER_POSITIVE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_152() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_159()) {
+    jj_scanpos = xsp;
+    if (jj_3R_160()) {
+    jj_scanpos = xsp;
+    if (jj_3R_161()) return true;
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_116() {
+    if (jj_3R_120()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_59() {
+    if (jj_scan_token(CONTAINS)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_105() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_116()) {
+    jj_scanpos = xsp;
+    if (jj_3R_117()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_58() {
+    if (jj_scan_token(ENCODE_FOR_URI)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_57() {
+    if (jj_scan_token(LCASE)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_158() {
+    if (jj_scan_token(DOUBLE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_56() {
+    if (jj_scan_token(UCASE)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_157() {
+    if (jj_scan_token(DECIMAL)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_55() {
+    if (jj_3R_101()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_156() {
+    if (jj_scan_token(INTEGER)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_151() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_156()) {
+    jj_scanpos = xsp;
+    if (jj_3R_157()) {
+    jj_scanpos = xsp;
+    if (jj_3R_158()) return true;
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_54() {
+    if (jj_scan_token(STRLEN)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_53() {
+    if (jj_3R_100()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_52() {
+    if (jj_scan_token(CONCAT)) return true;
+    if (jj_3R_99()) return true;
+    return false;
+  }
+
   /** Generated Token Manager. */
   public ARQParserTokenManager token_source;
   JavaCharStream jj_input_stream;
@@ -6325,7 +6346,7 @@ public class ARQParser extends ARQParser
   private Token jj_scanpos, jj_lastpos;
   private int jj_la;
   private int jj_gen;
-  final private int[] jj_la1 = new int[172];
+  final private int[] jj_la1 = new int[173];
   static private int[] jj_la1_0;
   static private int[] jj_la1_1;
   static private int[] jj_la1_2;
@@ -6343,25 +6364,25 @@ public class ARQParser extends ARQParser
       jj_la1_init_6();
    }
    private static void jj_la1_init_0() {
-      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,0x6000,0x0,0xe00,0x0,0x80000000,0xe00,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,0x8000,0x8000,0x0,0x0,0x0,0x0,0x0,0
 x0,0xe00,0xc00,0x1000,};
+      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,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,0x8000,0x8000,0x0,0x0,0x0,0x0,0
 x0,0x0,0xe00,0xc00,0x1000,};
    }
    private static void jj_la1_init_1() {
-      jj_la1_1 = new int[] {0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x20000,0xb7c18000,0xb7c18000,0xb7c18000,0x10,0x10,0x0,0x30,0x0,0x0,0x10,0x20,0x10,0x8,0x20,0x40000,0x80000,0x0,0x0,0xb7c18000,0x20000,0xb7c18000,0xb7c18000,0xb7c18006,0x6,0xb7c18000,0xb7c18006,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x10,0x8,0x80,0x80,0x88,0x88,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x4001bd80,0x0,0x0,0x0,0x0,0x4001bd80,0x0,0x200,0xb7c18000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000,0x10000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xb7c18000,0xb7c18000,0x0,0xb7c18000,0x0,0x0,0x0,0x0,0xb7c18000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x37c00000,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,0x1,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,};
    }
    private static void jj_la1_init_2() {
-      jj_la1_2 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffffc3d,0xfffffc3d,0xfffffc3d,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffffc3d,0x0,0xfffffc3d,0xfffffc3d,0xfffffc3d,0x0,0xfffffc3d,0xfffffc3d,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffffc3d,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x300,0x0,0x300,0x300,0x300,0x0,0x0,0x0,0x0,0x300,0x0,0x0,0x0,0x0,0x300,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffffc3d,0xfffffc3d,0x0,0xfffffc3d,0x0,0x0,0x0,0x0,0xfffffc3d,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+      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,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,0xc000000,0x0,0xfbfffff,0xfbfffff,0xfbfffff,0x0,0x0,0xc000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3bfffff,0x0,0x3bfffff,0x3bfffff,0x3bfffff,0x0,0x3bfffff,0x3bfffff,0x0,0x0,0x0,0x0,0x0,0xc000000,0x0,0x0,0xc000000,0x0,0xe0000000,0xe0000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000000,0x60000000,0x0,0x0,0x40000000,0x20000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc000000,0x0,0x0,0xc000000,0xc000000,0x0,0x0,0xc000000,0x0,0x0,0xc000000,0xc000000,0x0,0x0,0x0,0x0,0x3bfffff,0x0,0x0,0x0,0x0,0x0,0xc000000,0x0,0xc000000,0x0,0x0,0x0,0x0,0x0,0xc000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc000000,0xc000000,0xc000000,0x0,0x0,0xc000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfbfffff,0xfbfffff,0x0,0x3bfffff,0x0,0x0,0x0,0x0,0xfbfffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc000000,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,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,0x18000000,0x0,0x0,0x0,0x0,};
    }
    private static void jj_la1_init_4() {
-      jj_la1_4 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0xff80000,0x0,0xff80000,0xff80000,0xff80000,0x0,0x0,0xff80000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xff80000,0x0,0x0,0xff80000,0x0,0x109ff,0x109ff,0x400,0x0,0x1000,0x400,0x400,0x400,0x400,0x400,0x400,0x10000,0x0,0x0,0x20000,0x0,0x0,0x0,0x1000,0x1000,0x0,0x0,0x0,0x0,0x4000,0xc000,0xc000,0xff80000,0x0,0x0,0xff80000,0xff80000,0x0,0x0,0xff80000,0x0,0x0,0xff80000,0xff80000,0x0,0x0,0x400,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xff80000,0x0,0xff80000,0x0,0x0,0x0,0x0,0x0,0xff80000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80000,0x0,0x80000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xff80000,0xff80000,0xff80000,0x0,0x0,0xff80000,0x0,0x0,0x0,0x0,0xfc00000,0xfc00000,0x0,0x0,0xfc00000,0x0,0x0,0xff80000,0xff80000,0x0,0x0,0x0,0x0,0x0,0x0,0xff80000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xff80000,0x380000,0x1c00000,0xe000000,0x0,0x0,0x0,0x0,0x0,};
+      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,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,0x3800000,0x1c000000,0x0,0x0,0x0,0x0,0x0,
 };
    }
    private static void jj_la1_init_5() {
-      jj_la1_5 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0xf,0x0,0x1f,0x1f,0x1000001f,0x0,0x0,0xa5f,0x80,0x0,0x10000000,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x10,0x10,0x10,0x0,0x10,0x10,0x0,0x0,0x0,0x0,0x50,0xf,0x50,0x0,0xf,0x1000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa5f,0x0,0x4000,0xa5f,0xa5f,0x4000,0x0,0xa5f,0x80,0x4000,0xa5f,0xa5f,0x4000,0x80,0x0,0x0,0x10,0x0,0x2000,0x50,0x2000,0x50,0xa5f,0x4000,0xa5f,0x1000,0x0,0x0,0x2000,0x0,0xa5f,0x200010,0x1000,0x200010,0x200010,0x200010,0x0,0x20000000,0x20000000,0x14000080,0x200010,0x100,0x2100,0x14002000,0x14000080,0x200010,0x0,0x0,0x10,0x0,0x0,0x210,0x210,0xa5f,0xa5f,0x84f,0x0,0x0,0x84f,0x1000000,0x2000000,0x1f8000,0x1f8000,0xc000000,0x0,0x30000000,0x30000000,0xc000000,0x30000000,0x30000000,0xc20001f,0x1f,0x50,0x0,0x2000,0x2000,0x2000,0x0,0x1c20001f,0x0,0x0,0x0,0x0,0x0,0x0,0x1000,0x1000,0x1000,0x0,0x50,0x40000000,0x40000000,0x0,0x0,0x0,0x0,0x0,0xf,0x0,0x0,
 0x800,};
+      jj_la1_5 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x1e,0x0,0x3e,0x3e,0x2000003e,0x0,0x0,0x14be,0x100,0x0,0x20000000,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20,0x0,0x20,0x20,0x20,0x0,0x20,0x20,0x0,0x0,0x0,0x0,0x0,0xa0,0x1e,0xa0,0x1e,0x0,0x2000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x14be,0x0,0x8000,0x14be,0x14be,0x8000,0x0,0x14be,0x100,0x8000,0x14be,0x14be,0x8000,0x100,0x0,0x0,0x20,0x0,0x4000,0xa0,0x4000,0xa0,0x14be,0x8000,0x14be,0x2000,0x0,0x0,0x4000,0x0,0x14be,0x400020,0x2000,0x400020,0x400020,0x400020,0x0,0x40000000,0x40000000,0x28000100,0x400020,0x200,0x4200,0x28004000,0x28000100,0x400020,0x0,0x0,0x20,0x0,0x0,0x420,0x420,0x14be,0x14be,0x109e,0x0,0x0,0x109e,0x2000000,0x4000000,0x3f0000,0x3f0000,0x18000000,0x0,0x60000000,0x60000000,0x18000000,0x60000000,0x60000000,0x1840003e,0x3e,0xa0,0x0,0x4000,0x4000,0x4000,0x0,0x3840003e,0x0,0x0,0x0,0x0,0x0,0x0,0x2000,0x2000,0x2000,0x0,0xa0,0x80000000,0x80000000,0x0,
 0x0,0x0,0x0,0x0,0x1e,0x0,0x0,0x1000,};
    }
    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,0x4,0x0,0x4,0x4,0x4,0x2,0x4,0x4,0x20,0x4,0x0,0x0,0x0,0x20,0x0,0x2,0x4,0x4,0x0,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+      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,0x8,0x0,0x8,0x8,0x8,0x4,0x8,0x8,0x40,0x8,0x0,0x0,0x0,0x40,0x0,0x4,0x8,0x8,0x0,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
    }
   final private JJCalls[] jj_2_rtns = new JJCalls[4];
   private boolean jj_rescan = false;
@@ -6378,7 +6399,7 @@ public class ARQParser extends ARQParser
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 172; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 173; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -6393,7 +6414,7 @@ public class ARQParser extends ARQParser
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 172; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 173; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -6404,7 +6425,7 @@ public class ARQParser extends ARQParser
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 172; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 173; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -6415,7 +6436,7 @@ public class ARQParser extends ARQParser
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 172; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 173; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -6425,7 +6446,7 @@ public class ARQParser extends ARQParser
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 172; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 173; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -6435,7 +6456,7 @@ public class ARQParser extends ARQParser
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 172; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 173; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -6547,12 +6568,12 @@ public class ARQParser extends ARQParser
   /** Generate ParseException. */
   public ParseException generateParseException() {
     jj_expentries.clear();
-    boolean[] la1tokens = new boolean[209];
+    boolean[] la1tokens = new boolean[210];
     if (jj_kind >= 0) {
       la1tokens[jj_kind] = true;
       jj_kind = -1;
     }
-    for (int i = 0; i < 172; i++) {
+    for (int i = 0; i < 173; i++) {
       if (jj_la1[i] == jj_gen) {
         for (int j = 0; j < 32; j++) {
           if ((jj_la1_0[i] & (1<<j)) != 0) {
@@ -6579,7 +6600,7 @@ public class ARQParser extends ARQParser
         }
       }
     }
-    for (int i = 0; i < 209; i++) {
+    for (int i = 0; i < 210; i++) {
       if (la1tokens[i]) {
         jj_expentry = new int[1];
         jj_expentry[0] = i;

Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParserConstants.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParserConstants.java?rev=1305317&r1=1305316&r2=1305317&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParserConstants.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParserConstants.java Mon Mar 26 11:46:09 2012
@@ -80,359 +80,361 @@ public interface ARQParserConstants {
   /** RegularExpression Id. */
   int BINDINGS = 31;
   /** RegularExpression Id. */
-  int UNDEF = 32;
+  int VALUES = 32;
   /** RegularExpression Id. */
-  int ASC = 33;
+  int UNDEF = 33;
   /** RegularExpression Id. */
-  int DESC = 34;
+  int ASC = 34;
   /** RegularExpression Id. */
-  int NAMED = 35;
+  int DESC = 35;
   /** RegularExpression Id. */
-  int FROM = 36;
+  int NAMED = 36;
   /** RegularExpression Id. */
-  int WHERE = 37;
+  int FROM = 37;
   /** RegularExpression Id. */
-  int AND = 38;
+  int WHERE = 38;
   /** RegularExpression Id. */
-  int GRAPH = 39;
+  int AND = 39;
   /** RegularExpression Id. */
-  int OPTIONAL = 40;
+  int GRAPH = 40;
   /** RegularExpression Id. */
-  int UNION = 41;
+  int OPTIONAL = 41;
   /** RegularExpression Id. */
-  int MINUS_P = 42;
+  int UNION = 42;
   /** RegularExpression Id. */
-  int BIND = 43;
+  int MINUS_P = 43;
   /** RegularExpression Id. */
-  int SERVICE = 44;
+  int BIND = 44;
   /** RegularExpression Id. */
-  int LET = 45;
+  int SERVICE = 45;
   /** RegularExpression Id. */
-  int FETCH = 46;
+  int LET = 46;
   /** RegularExpression Id. */
-  int EXISTS = 47;
+  int FETCH = 47;
   /** RegularExpression Id. */
-  int NOT = 48;
+  int EXISTS = 48;
   /** RegularExpression Id. */
-  int AS = 49;
+  int NOT = 49;
   /** RegularExpression Id. */
-  int GROUP = 50;
+  int AS = 50;
   /** RegularExpression Id. */
-  int HAVING = 51;
+  int GROUP = 51;
   /** RegularExpression Id. */
-  int SEPARATOR = 52;
+  int HAVING = 52;
   /** RegularExpression Id. */
-  int AGG = 53;
+  int SEPARATOR = 53;
   /** RegularExpression Id. */
-  int COUNT = 54;
+  int AGG = 54;
   /** RegularExpression Id. */
-  int MIN = 55;
+  int COUNT = 55;
   /** RegularExpression Id. */
-  int MAX = 56;
+  int MIN = 56;
   /** RegularExpression Id. */
-  int SUM = 57;
+  int MAX = 57;
   /** RegularExpression Id. */
-  int AVG = 58;
+  int SUM = 58;
   /** RegularExpression Id. */
-  int STDDEV = 59;
+  int AVG = 59;
   /** RegularExpression Id. */
-  int SAMPLE = 60;
+  int STDDEV = 60;
   /** RegularExpression Id. */
-  int GROUP_CONCAT = 61;
+  int SAMPLE = 61;
   /** RegularExpression Id. */
-  int FILTER = 62;
+  int GROUP_CONCAT = 62;
   /** RegularExpression Id. */
-  int BOUND = 63;
+  int FILTER = 63;
   /** RegularExpression Id. */
-  int COALESCE = 64;
+  int BOUND = 64;
   /** RegularExpression Id. */
-  int IN = 65;
+  int COALESCE = 65;
   /** RegularExpression Id. */
-  int IF = 66;
+  int IN = 66;
   /** RegularExpression Id. */
-  int BNODE = 67;
+  int IF = 67;
   /** RegularExpression Id. */
-  int IRI = 68;
+  int BNODE = 68;
   /** RegularExpression Id. */
-  int URI = 69;
+  int IRI = 69;
   /** RegularExpression Id. */
-  int CAST = 70;
+  int URI = 70;
   /** RegularExpression Id. */
-  int CALL = 71;
+  int CAST = 71;
   /** RegularExpression Id. */
-  int MULTI = 72;
+  int CALL = 72;
   /** RegularExpression Id. */
-  int SHORTEST = 73;
+  int MULTI = 73;
   /** RegularExpression Id. */
-  int STR = 74;
+  int SHORTEST = 74;
   /** RegularExpression Id. */
-  int STRLANG = 75;
+  int STR = 75;
   /** RegularExpression Id. */
-  int STRDT = 76;
+  int STRLANG = 76;
   /** RegularExpression Id. */
-  int DTYPE = 77;
+  int STRDT = 77;
   /** RegularExpression Id. */
-  int LANG = 78;
+  int DTYPE = 78;
   /** RegularExpression Id. */
-  int LANGMATCHES = 79;
+  int LANG = 79;
   /** RegularExpression Id. */
-  int IS_URI = 80;
+  int LANGMATCHES = 80;
   /** RegularExpression Id. */
-  int IS_IRI = 81;
+  int IS_URI = 81;
   /** RegularExpression Id. */
-  int IS_BLANK = 82;
+  int IS_IRI = 82;
   /** RegularExpression Id. */
-  int IS_LITERAL = 83;
+  int IS_BLANK = 83;
   /** RegularExpression Id. */
-  int IS_NUMERIC = 84;
+  int IS_LITERAL = 84;
   /** RegularExpression Id. */
-  int REGEX = 85;
+  int IS_NUMERIC = 85;
   /** RegularExpression Id. */
-  int SAME_TERM = 86;
+  int REGEX = 86;
   /** RegularExpression Id. */
-  int RAND = 87;
+  int SAME_TERM = 87;
   /** RegularExpression Id. */
-  int ABS = 88;
+  int RAND = 88;
   /** RegularExpression Id. */
-  int CEIL = 89;
+  int ABS = 89;
   /** RegularExpression Id. */
-  int FLOOR = 90;
+  int CEIL = 90;
   /** RegularExpression Id. */
-  int ROUND = 91;
+  int FLOOR = 91;
   /** RegularExpression Id. */
-  int CONCAT = 92;
+  int ROUND = 92;
   /** RegularExpression Id. */
-  int SUBSTR = 93;
+  int CONCAT = 93;
   /** RegularExpression Id. */
-  int STRLEN = 94;
+  int SUBSTR = 94;
   /** RegularExpression Id. */
-  int REPLACE = 95;
+  int STRLEN = 95;
   /** RegularExpression Id. */
-  int UCASE = 96;
+  int REPLACE = 96;
   /** RegularExpression Id. */
-  int LCASE = 97;
+  int UCASE = 97;
   /** RegularExpression Id. */
-  int ENCODE_FOR_URI = 98;
+  int LCASE = 98;
   /** RegularExpression Id. */
-  int CONTAINS = 99;
+  int ENCODE_FOR_URI = 99;
   /** RegularExpression Id. */
-  int STRSTARTS = 100;
+  int CONTAINS = 100;
   /** RegularExpression Id. */
-  int STRENDS = 101;
+  int STRSTARTS = 101;
   /** RegularExpression Id. */
-  int STRBEFORE = 102;
+  int STRENDS = 102;
   /** RegularExpression Id. */
-  int STRAFTER = 103;
+  int STRBEFORE = 103;
   /** RegularExpression Id. */
-  int YEAR = 104;
+  int STRAFTER = 104;
   /** RegularExpression Id. */
-  int MONTH = 105;
+  int YEAR = 105;
   /** RegularExpression Id. */
-  int DAY = 106;
+  int MONTH = 106;
   /** RegularExpression Id. */
-  int HOURS = 107;
+  int DAY = 107;
   /** RegularExpression Id. */
-  int MINUTES = 108;
+  int HOURS = 108;
   /** RegularExpression Id. */
-  int SECONDS = 109;
+  int MINUTES = 109;
   /** RegularExpression Id. */
-  int TIMEZONE = 110;
+  int SECONDS = 110;
   /** RegularExpression Id. */
-  int TZ = 111;
+  int TIMEZONE = 111;
   /** RegularExpression Id. */
-  int NOW = 112;
+  int TZ = 112;
   /** RegularExpression Id. */
-  int UUID = 113;
+  int NOW = 113;
   /** RegularExpression Id. */
-  int STRUUID = 114;
+  int UUID = 114;
   /** RegularExpression Id. */
-  int VERSION = 115;
+  int STRUUID = 115;
   /** RegularExpression Id. */
-  int MD5 = 116;
+  int VERSION = 116;
   /** RegularExpression Id. */
-  int SHA1 = 117;
+  int MD5 = 117;
   /** RegularExpression Id. */
-  int SHA224 = 118;
+  int SHA1 = 118;
   /** RegularExpression Id. */
-  int SHA256 = 119;
+  int SHA224 = 119;
   /** RegularExpression Id. */
-  int SHA384 = 120;
+  int SHA256 = 120;
   /** RegularExpression Id. */
-  int SHA512 = 121;
+  int SHA384 = 121;
   /** RegularExpression Id. */
-  int TRUE = 122;
+  int SHA512 = 122;
   /** RegularExpression Id. */
-  int FALSE = 123;
+  int TRUE = 123;
   /** RegularExpression Id. */
-  int DATA = 124;
+  int FALSE = 124;
   /** RegularExpression Id. */
-  int INSERT = 125;
+  int DATA = 125;
   /** RegularExpression Id. */
-  int DELETE = 126;
+  int INSERT = 126;
   /** RegularExpression Id. */
-  int INSERT_DATA = 127;
+  int DELETE = 127;
   /** RegularExpression Id. */
-  int DELETE_DATA = 128;
+  int INSERT_DATA = 128;
   /** RegularExpression Id. */
-  int DELETE_WHERE = 129;
+  int DELETE_DATA = 129;
   /** RegularExpression Id. */
-  int MODIFY = 130;
+  int DELETE_WHERE = 130;
   /** RegularExpression Id. */
-  int LOAD = 131;
+  int MODIFY = 131;
   /** RegularExpression Id. */
-  int CLEAR = 132;
+  int LOAD = 132;
   /** RegularExpression Id. */
-  int CREATE = 133;
+  int CLEAR = 133;
   /** RegularExpression Id. */
-  int ADD = 134;
+  int CREATE = 134;
   /** RegularExpression Id. */
-  int MOVE = 135;
+  int ADD = 135;
   /** RegularExpression Id. */
-  int COPY = 136;
+  int MOVE = 136;
   /** RegularExpression Id. */
-  int META = 137;
+  int COPY = 137;
   /** RegularExpression Id. */
-  int SILENT = 138;
+  int META = 138;
   /** RegularExpression Id. */
-  int DROP = 139;
+  int SILENT = 139;
   /** RegularExpression Id. */
-  int INTO = 140;
+  int DROP = 140;
   /** RegularExpression Id. */
-  int TO = 141;
+  int INTO = 141;
   /** RegularExpression Id. */
-  int DFT = 142;
+  int TO = 142;
   /** RegularExpression Id. */
-  int ALL = 143;
+  int DFT = 143;
   /** RegularExpression Id. */
-  int WITH = 144;
+  int ALL = 144;
   /** RegularExpression Id. */
-  int USING = 145;
+  int WITH = 145;
   /** RegularExpression Id. */
-  int DIGITS = 146;
+  int USING = 146;
   /** RegularExpression Id. */
-  int INTEGER = 147;
+  int DIGITS = 147;
   /** RegularExpression Id. */
-  int DECIMAL = 148;
+  int INTEGER = 148;
   /** RegularExpression Id. */
-  int DOUBLE = 149;
+  int DECIMAL = 149;
   /** RegularExpression Id. */
-  int INTEGER_POSITIVE = 150;
+  int DOUBLE = 150;
   /** RegularExpression Id. */
-  int DECIMAL_POSITIVE = 151;
+  int INTEGER_POSITIVE = 151;
   /** RegularExpression Id. */
-  int DOUBLE_POSITIVE = 152;
+  int DECIMAL_POSITIVE = 152;
   /** RegularExpression Id. */
-  int INTEGER_NEGATIVE = 153;
+  int DOUBLE_POSITIVE = 153;
   /** RegularExpression Id. */
-  int DECIMAL_NEGATIVE = 154;
+  int INTEGER_NEGATIVE = 154;
   /** RegularExpression Id. */
-  int DOUBLE_NEGATIVE = 155;
+  int DECIMAL_NEGATIVE = 155;
   /** RegularExpression Id. */
-  int EXPONENT = 156;
+  int DOUBLE_NEGATIVE = 156;
   /** RegularExpression Id. */
-  int QUOTE_3D = 157;
+  int EXPONENT = 157;
   /** RegularExpression Id. */
-  int QUOTE_3S = 158;
+  int QUOTE_3D = 158;
   /** RegularExpression Id. */
-  int ECHAR = 159;
+  int QUOTE_3S = 159;
   /** RegularExpression Id. */
-  int STRING_LITERAL1 = 160;
+  int ECHAR = 160;
   /** RegularExpression Id. */
-  int STRING_LITERAL2 = 161;
+  int STRING_LITERAL1 = 161;
   /** RegularExpression Id. */
-  int STRING_LITERAL_LONG1 = 162;
+  int STRING_LITERAL2 = 162;
   /** RegularExpression Id. */
-  int STRING_LITERAL_LONG2 = 163;
+  int STRING_LITERAL_LONG1 = 163;
   /** RegularExpression Id. */
-  int LPAREN = 164;
+  int STRING_LITERAL_LONG2 = 164;
   /** RegularExpression Id. */
-  int RPAREN = 165;
+  int LPAREN = 165;
   /** RegularExpression Id. */
-  int NIL = 166;
+  int RPAREN = 166;
   /** RegularExpression Id. */
-  int LBRACE = 167;
+  int NIL = 167;
   /** RegularExpression Id. */
-  int RBRACE = 168;
+  int LBRACE = 168;
   /** RegularExpression Id. */
-  int LBRACKET = 169;
+  int RBRACE = 169;
   /** RegularExpression Id. */
-  int RBRACKET = 170;
+  int LBRACKET = 170;
   /** RegularExpression Id. */
-  int ANON = 171;
+  int RBRACKET = 171;
   /** RegularExpression Id. */
-  int SEMICOLON = 172;
+  int ANON = 172;
   /** RegularExpression Id. */
-  int COMMA = 173;
+  int SEMICOLON = 173;
   /** RegularExpression Id. */
-  int DOT = 174;
+  int COMMA = 174;
   /** RegularExpression Id. */
-  int EQ = 175;
+  int DOT = 175;
   /** RegularExpression Id. */
-  int NE = 176;
+  int EQ = 176;
   /** RegularExpression Id. */
-  int GT = 177;
+  int NE = 177;
   /** RegularExpression Id. */
-  int LT = 178;
+  int GT = 178;
   /** RegularExpression Id. */
-  int LE = 179;
+  int LT = 179;
   /** RegularExpression Id. */
-  int GE = 180;
+  int LE = 180;
   /** RegularExpression Id. */
-  int BANG = 181;
+  int GE = 181;
   /** RegularExpression Id. */
-  int TILDE = 182;
+  int BANG = 182;
   /** RegularExpression Id. */
-  int COLON = 183;
+  int TILDE = 183;
   /** RegularExpression Id. */
-  int SC_OR = 184;
+  int COLON = 184;
   /** RegularExpression Id. */
-  int SC_AND = 185;
+  int SC_OR = 185;
   /** RegularExpression Id. */
-  int PLUS = 186;
+  int SC_AND = 186;
   /** RegularExpression Id. */
-  int MINUS = 187;
+  int PLUS = 187;
   /** RegularExpression Id. */
-  int STAR = 188;
+  int MINUS = 188;
   /** RegularExpression Id. */
-  int SLASH = 189;
+  int STAR = 189;
   /** RegularExpression Id. */
-  int DATATYPE = 190;
+  int SLASH = 190;
   /** RegularExpression Id. */
-  int AT = 191;
+  int DATATYPE = 191;
   /** RegularExpression Id. */
-  int ASSIGN = 192;
+  int AT = 192;
   /** RegularExpression Id. */
-  int VBAR = 193;
+  int ASSIGN = 193;
   /** RegularExpression Id. */
-  int CARAT = 194;
+  int VBAR = 194;
   /** RegularExpression Id. */
-  int FPATH = 195;
+  int CARAT = 195;
   /** RegularExpression Id. */
-  int RPATH = 196;
+  int FPATH = 196;
   /** RegularExpression Id. */
-  int QMARK = 197;
+  int RPATH = 197;
   /** RegularExpression Id. */
-  int HEX = 198;
+  int QMARK = 198;
   /** RegularExpression Id. */
-  int PERCENT = 199;
+  int HEX = 199;
   /** RegularExpression Id. */
-  int PN_LOCAL_ESC = 200;
+  int PERCENT = 200;
   /** RegularExpression Id. */
-  int PN_CHARS_BASE = 201;
+  int PN_LOCAL_ESC = 201;
   /** RegularExpression Id. */
-  int PN_CHARS_U = 202;
+  int PN_CHARS_BASE = 202;
   /** RegularExpression Id. */
-  int PN_CHARS = 203;
+  int PN_CHARS_U = 203;
   /** RegularExpression Id. */
-  int PN_PREFIX = 204;
+  int PN_CHARS = 204;
   /** RegularExpression Id. */
-  int PLX = 205;
+  int PN_PREFIX = 205;
   /** RegularExpression Id. */
-  int PN_LOCAL = 206;
+  int PLX = 206;
   /** RegularExpression Id. */
-  int VARNAME = 207;
+  int PN_LOCAL = 207;
   /** RegularExpression Id. */
-  int UNKNOWN = 208;
+  int VARNAME = 208;
+  /** RegularExpression Id. */
+  int UNKNOWN = 209;
 
   /** Lexical state. */
   int DEFAULT = 0;
@@ -471,6 +473,7 @@ public interface ARQParserConstants {
     "\"order\"",
     "\"by\"",
     "\"bindings\"",
+    "\"values\"",
     "\"undef\"",
     "\"asc\"",
     "\"desc\"",