jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r1298858 [1/2] - in /incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq: ARQParser.java ARQParserConstants.java ARQParserTokenManager.java
Date Fri, 09 Mar 2012 14:47:06 GMT
Author: andy
Date: Fri Mar  9 14:47:05 2012
New Revision: 1298858

URL: http://svn.apache.org/viewvc?rev=1298858&view=rev
Log:
Partial implementation of {*} and {+}
Syntax support, no implementation, for SHORTEST.

Modified:
    incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParser.java
    incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParserConstants.java
    incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParserTokenManager.java

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=1298858&r1=1298857&r2=1298858&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
Fri Mar  9 14:47:05 2012
@@ -2974,6 +2974,7 @@ public class ARQParser extends ARQParser
     case KW_A:
     case DISTINCT:
     case MULTI:
+    case SHORTEST:
     case LPAREN:
     case BANG:
     case CARAT:
@@ -3010,6 +3011,7 @@ public class ARQParser extends ARQParser
       case KW_A:
       case DISTINCT:
       case MULTI:
+      case SHORTEST:
       case LPAREN:
       case BANG:
       case CARAT:
@@ -3020,6 +3022,7 @@ public class ARQParser extends ARQParser
         case KW_A:
         case DISTINCT:
         case MULTI:
+        case SHORTEST:
         case LPAREN:
         case BANG:
         case CARAT:
@@ -3053,6 +3056,7 @@ public class ARQParser extends ARQParser
     case KW_A:
     case DISTINCT:
     case MULTI:
+    case SHORTEST:
     case LPAREN:
     case BANG:
     case CARAT:
@@ -3183,6 +3187,7 @@ public class ARQParser extends ARQParser
     case KW_A:
     case DISTINCT:
     case MULTI:
+    case SHORTEST:
     case LPAREN:
     case BANG:
       p = PathElt();
@@ -3204,21 +3209,31 @@ public class ARQParser extends ARQParser
   final public Path PathMod(Path p) throws ParseException {
                          long i1 ; long i2 ;
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case STAR:
-      jj_consume_token(STAR);
-              {if (true) return PathFactory.pathZeroOrMore(p) ;}
-      break;
     case QMARK:
       jj_consume_token(QMARK);
                {if (true) return PathFactory.pathZeroOrOne(p) ;}
       break;
+    case STAR:
+      jj_consume_token(STAR);
+              {if (true) return PathFactory.pathZeroOrMore1(p) ;}
+      break;
     case PLUS:
       jj_consume_token(PLUS);
-              {if (true) return PathFactory.pathOneOrMore(p) ;}
+              {if (true) return PathFactory.pathOneOrMore1(p) ;}
       break;
     case LBRACE:
       jj_consume_token(LBRACE);
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case STAR:
+        jj_consume_token(STAR);
+        jj_consume_token(RBRACE);
+                           {if (true) return PathFactory.pathZeroOrMoreN(p) ;}
+        break;
+      case PLUS:
+        jj_consume_token(PLUS);
+        jj_consume_token(RBRACE);
+                           {if (true) return PathFactory.pathOneOrMoreN(p) ;}
+        break;
       case INTEGER:
         // {N} {N,M} {N,}
                   i1 = Integer();
@@ -3301,6 +3316,13 @@ public class ARQParser extends ARQParser
        p = PathFactory.pathDistinct(p) ;
       jj_consume_token(RPAREN);
       break;
+    case SHORTEST:
+      jj_consume_token(SHORTEST);
+      jj_consume_token(LPAREN);
+      p = Path();
+       p = PathFactory.pathShortest(p) ;
+      jj_consume_token(RPAREN);
+      break;
     case MULTI:
       jj_consume_token(MULTI);
       jj_consume_token(LPAREN);
@@ -5261,138 +5283,6 @@ public class ARQParser extends ARQParser
     finally { jj_save(3, xla); }
   }
 
-  private boolean jj_3R_141() {
-    if (jj_scan_token(FALSE)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_123() {
-    if (jj_3R_129()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_120() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_123()) {
-    jj_scanpos = xsp;
-    if (jj_3R_124()) {
-    jj_scanpos = xsp;
-    if (jj_3R_125()) {
-    jj_scanpos = xsp;
-    if (jj_3R_126()) {
-    jj_scanpos = xsp;
-    if (jj_3R_127()) {
-    jj_scanpos = xsp;
-    if (jj_3R_128()) return true;
-    }
-    }
-    }
-    }
-    }
-    return false;
-  }
-
-  private boolean jj_3R_68() {
-    if (jj_scan_token(SECONDS)) return true;
-    if (jj_scan_token(LPAREN)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_67() {
-    if (jj_scan_token(MINUTES)) return true;
-    if (jj_scan_token(LPAREN)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_140() {
-    if (jj_scan_token(TRUE)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_132() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_140()) {
-    jj_scanpos = xsp;
-    if (jj_3R_141()) return true;
-    }
-    return false;
-  }
-
-  private boolean jj_3R_116() {
-    if (jj_3R_120()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_66() {
-    if (jj_scan_token(HOURS)) return true;
-    if (jj_scan_token(LPAREN)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_119() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(13)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(14)) return true;
-    }
-    return false;
-  }
-
-  private boolean jj_3R_65() {
-    if (jj_scan_token(DAY)) return true;
-    if (jj_scan_token(LPAREN)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_64() {
-    if (jj_scan_token(MONTH)) return true;
-    if (jj_scan_token(LPAREN)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_63() {
-    if (jj_scan_token(YEAR)) return true;
-    if (jj_scan_token(LPAREN)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_163() {
-    if (jj_scan_token(DOUBLE_NEGATIVE)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_162() {
-    if (jj_scan_token(DECIMAL_NEGATIVE)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_62() {
-    if (jj_scan_token(STRAFTER)) return true;
-    if (jj_scan_token(LPAREN)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_161() {
-    if (jj_scan_token(INTEGER_NEGATIVE)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_152() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_161()) {
-    jj_scanpos = xsp;
-    if (jj_3R_162()) {
-    jj_scanpos = xsp;
-    if (jj_3R_163()) return true;
-    }
-    }
-    return false;
-  }
-
   private boolean jj_3R_61() {
     if (jj_scan_token(STRBEFORE)) return true;
     if (jj_scan_token(LPAREN)) return true;
@@ -5625,11 +5515,6 @@ public class ARQParser extends ARQParser
     return false;
   }
 
-  private boolean jj_3_1() {
-    if (jj_3R_35()) return true;
-    return false;
-  }
-
   private boolean jj_3R_130() {
     if (jj_3R_136()) return true;
     return false;
@@ -5664,6 +5549,11 @@ public class ARQParser extends ARQParser
     return false;
   }
 
+  private boolean jj_3_1() {
+    if (jj_3R_35()) return true;
+    return false;
+  }
+
   private boolean jj_3R_37() {
     if (jj_3R_95()) return true;
     return false;
@@ -5944,6 +5834,12 @@ public class ARQParser extends ARQParser
     return false;
   }
 
+  private boolean jj_3R_103() {
+    if (jj_scan_token(NOT)) return true;
+    if (jj_scan_token(EXISTS)) return true;
+    return false;
+  }
+
   private boolean jj_3R_36() {
     Token xsp;
     xsp = jj_scanpos;
@@ -5959,21 +5855,15 @@ public class ARQParser extends ARQParser
     return false;
   }
 
-  private boolean jj_3_3() {
-    if (jj_scan_token(DOT)) return true;
-    if (jj_3R_36()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_103() {
-    if (jj_scan_token(NOT)) return true;
+  private boolean jj_3R_102() {
     if (jj_scan_token(EXISTS)) return true;
+    if (jj_3R_114()) return true;
     return false;
   }
 
-  private boolean jj_3R_102() {
-    if (jj_scan_token(EXISTS)) return true;
-    if (jj_3R_114()) return true;
+  private boolean jj_3_3() {
+    if (jj_scan_token(DOT)) return true;
+    if (jj_3R_36()) return true;
     return false;
   }
 
@@ -5983,6 +5873,12 @@ public class ARQParser extends ARQParser
     return false;
   }
 
+  private boolean jj_3R_99() {
+    if (jj_scan_token(SUBSTR)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
   private boolean jj_3R_113() {
     if (jj_scan_token(LPAREN)) return true;
     return false;
@@ -5991,36 +5887,19 @@ public class ARQParser extends ARQParser
   private boolean jj_3R_98() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(165)) {
+    if (jj_scan_token(166)) {
     jj_scanpos = xsp;
     if (jj_3R_113()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_99() {
-    if (jj_scan_token(SUBSTR)) return true;
-    if (jj_scan_token(LPAREN)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_114() {
-    if (jj_scan_token(LBRACE)) return true;
-    return false;
-  }
-
   private boolean jj_3R_101() {
     if (jj_scan_token(REGEX)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3_2() {
-    if (jj_scan_token(DOT)) return true;
-    if (jj_3R_36()) return true;
-    return false;
-  }
-
   private boolean jj_3R_144() {
     if (jj_scan_token(IRIref)) return true;
     return false;
@@ -6046,6 +5925,11 @@ public class ARQParser extends ARQParser
     return false;
   }
 
+  private boolean jj_3R_114() {
+    if (jj_scan_token(LBRACE)) return true;
+    return false;
+  }
+
   private boolean jj_3R_89() {
     if (jj_scan_token(IS_NUMERIC)) return true;
     if (jj_scan_token(LPAREN)) return true;
@@ -6067,6 +5951,12 @@ public class ARQParser extends ARQParser
     return false;
   }
 
+  private boolean jj_3_2() {
+    if (jj_scan_token(DOT)) return true;
+    if (jj_3R_36()) return true;
+    return false;
+  }
+
   private boolean jj_3R_88() {
     if (jj_scan_token(IS_LITERAL)) return true;
     if (jj_scan_token(LPAREN)) return true;
@@ -6288,6 +6178,138 @@ public class ARQParser extends ARQParser
     return false;
   }
 
+  private boolean jj_3R_141() {
+    if (jj_scan_token(FALSE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_123() {
+    if (jj_3R_129()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_120() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_123()) {
+    jj_scanpos = xsp;
+    if (jj_3R_124()) {
+    jj_scanpos = xsp;
+    if (jj_3R_125()) {
+    jj_scanpos = xsp;
+    if (jj_3R_126()) {
+    jj_scanpos = xsp;
+    if (jj_3R_127()) {
+    jj_scanpos = xsp;
+    if (jj_3R_128()) return true;
+    }
+    }
+    }
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_68() {
+    if (jj_scan_token(SECONDS)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_67() {
+    if (jj_scan_token(MINUTES)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_140() {
+    if (jj_scan_token(TRUE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_132() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_140()) {
+    jj_scanpos = xsp;
+    if (jj_3R_141()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_116() {
+    if (jj_3R_120()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_66() {
+    if (jj_scan_token(HOURS)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_119() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(13)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(14)) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_65() {
+    if (jj_scan_token(DAY)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_64() {
+    if (jj_scan_token(MONTH)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_63() {
+    if (jj_scan_token(YEAR)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_163() {
+    if (jj_scan_token(DOUBLE_NEGATIVE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_162() {
+    if (jj_scan_token(DECIMAL_NEGATIVE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_62() {
+    if (jj_scan_token(STRAFTER)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_161() {
+    if (jj_scan_token(INTEGER_NEGATIVE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_152() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_161()) {
+    jj_scanpos = xsp;
+    if (jj_3R_162()) {
+    jj_scanpos = xsp;
+    if (jj_3R_163()) return true;
+    }
+    }
+    return false;
+  }
+
   /** Generated Token Manager. */
   public ARQParserTokenManager token_source;
   JavaCharStream jj_input_stream;
@@ -6323,19 +6345,19 @@ public class ARQParser extends ARQParser
       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,};
    }
    private static void jj_la1_init_2() {
-      jj_la1_2 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffffe3d,0xfffffe3d,0xfffffe3d,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffffe3d,0x0,0xfffffe3d,0xfffffe3d,0xfffffe3d,0x0,0xfffffe3d,0xfffffe3d,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffffe3d,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x100,0x100,0x100,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffffe3d,0xfffffe3d,0x0,0xfffffe3d,0x0,0x0,0x0,0x0,0xfffffe3d,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,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,};
    }
    private static void jj_la1_init_3() {
-      jj_la1_3 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x6000000,0x0,0x7dfffff,0x7dfffff,0x7dfffff,0x0,0x0,0x6000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1dfffff,0x0,0x1dfffff,0x1dfffff,0x1dfffff,0x0,0x1dfffff,0x1dfffff,0x0,0x0,0x0,0x0,0x0,0x6000000,0x0,0x0,0x6000000,0x0,0xf0000000,0xf0000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000000,0x30000000,0x0,0x0,0x20000000,0x10000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6000000,0x0,0x0,0x6000000,0x6000000,0x0,0x0,0x6000000,0x0,0x0,0x6000000,0x6000000,0x0,0x0,0x0,0x0,0x1dfffff,0x0,0x0,0x0,0x0,0x0,0x6000000,0x0,0x6000000,0x0,0x0,0x0,0x0,0x0,0x6000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6000000,0x6000000,0x6000000,0x0,0x0,0x6000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7dfffff,0x7dfffff,0x0,0x1dfffff,0x0,0x0,0x0,0x0,0x7dfffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6000000,0x0,0x0,0x0,0x0,};
+      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,};
    }
    private static void jj_la1_init_4() {
-      jj_la1_4 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x87fc0000,0x0,0x87fc0000,0x87fc0000,0x87fc0000,0x0,0x0,0x87fc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x87fc0000,0x0,0x0,0x87fc0000,0x0,0x84ff,0x84ff,0x200,0x0,0x800,0x200,0x200,0x200,0x200,0x200,0x200,0x8000,0x0,0x0,0x10000,0x0,0x0,0x0,0x800,0x800,0x0,0x0,0x0,0x0,0x2000,0x6000,0x6000,0x87fc0000,0x0,0x0,0x87fc0000,0x87fc0000,0x0,0x0,0x87fc0000,0x0,0x0,0x87fc0000,0x87fc0000,0x0,0x0,0x200,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x87fc0000,0x0,0x87fc0000,0x0,0x0,0x0,0x0,0x0,0x87fc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x0,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x87fc0000,0x87fc0000,0x87fc0000,0x0,0x0,0x87fc0000,0x0,0x0,0x0,0x0,0x7e00000,0x7e00000,0x0,0x0,0x7e00000,0x0,0x0,0x87fc0000,0x87fc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x87fc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7fc0000,0x1c0000,0xe00000,0x7000000,0x0,0x80000000,0x0,0x0,0x0,};
+      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,};
    }
    private static void jj_la1_init_5() {
-      jj_la1_5 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x7,0x0,0xf,0xf,0x800000f,0x0,0x0,0x52f,0x40,0x0,0x8000000,0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x8,0x8,0x8,0x0,0x8,0x8,0x0,0x0,0x0,0x0,0x28,0x7,0x28,0x0,0x7,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x52f,0x0,0x2000,0x52f,0x52f,0x2000,0x0,0x52f,0x40,0x2000,0x52f,0x52f,0x2000,0x40,0x0,0x0,0x8,0x0,0x1000,0x28,0x1000,0x28,0x52f,0x2000,0x52f,0x800,0x0,0x0,0x1000,0x0,0x52f,0x100008,0x800,0x100008,0x100008,0x100008,0x0,0x10000000,0x10000000,0xa000040,0x100008,0x80,0x1080,0x1000,0xa000040,0x100008,0x0,0x0,0x8,0x0,0x0,0x108,0x108,0x52f,0x52f,0x427,0x0,0x0,0x427,0x800000,0x1000000,0xfc000,0xfc000,0x6000000,0x0,0x18000000,0x18000000,0x6000000,0x18000000,0x18000000,0x610000f,0xf,0x28,0x0,0x1000,0x1000,0x1000,0x0,0xe10000f,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x800,0x800,0x0,0x28,0x20000000,0x20000000,0x0,0x0,0x0,0x0,0x0,0x7,0x0,0x0,0x400,};
+      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,};
    }
    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,0x2,0x0,0x2,0x2,0x2,0x1,0x2,0x2,0x10,0x2,0x0,0x0,0x0,0x10,0x0,0x1,0x2,0x2,0x0,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,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,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,};
    }
   final private JJCalls[] jj_2_rtns = new JJCalls[4];
   private boolean jj_rescan = false;
@@ -6521,7 +6543,7 @@ public class ARQParser extends ARQParser
   /** Generate ParseException. */
   public ParseException generateParseException() {
     jj_expentries.clear();
-    boolean[] la1tokens = new boolean[208];
+    boolean[] la1tokens = new boolean[209];
     if (jj_kind >= 0) {
       la1tokens[jj_kind] = true;
       jj_kind = -1;
@@ -6553,7 +6575,7 @@ public class ARQParser extends ARQParser
         }
       }
     }
-    for (int i = 0; i < 208; i++) {
+    for (int i = 0; i < 209; 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=1298858&r1=1298857&r2=1298858&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
Fri Mar  9 14:47:05 2012
@@ -162,275 +162,277 @@ public interface ARQParserConstants {
   /** RegularExpression Id. */
   int MULTI = 72;
   /** RegularExpression Id. */
-  int STR = 73;
+  int SHORTEST = 73;
   /** RegularExpression Id. */
-  int STRLANG = 74;
+  int STR = 74;
   /** RegularExpression Id. */
-  int STRDT = 75;
+  int STRLANG = 75;
   /** RegularExpression Id. */
-  int DTYPE = 76;
+  int STRDT = 76;
   /** RegularExpression Id. */
-  int LANG = 77;
+  int DTYPE = 77;
   /** RegularExpression Id. */
-  int LANGMATCHES = 78;
+  int LANG = 78;
   /** RegularExpression Id. */
-  int IS_URI = 79;
+  int LANGMATCHES = 79;
   /** RegularExpression Id. */
-  int IS_IRI = 80;
+  int IS_URI = 80;
   /** RegularExpression Id. */
-  int IS_BLANK = 81;
+  int IS_IRI = 81;
   /** RegularExpression Id. */
-  int IS_LITERAL = 82;
+  int IS_BLANK = 82;
   /** RegularExpression Id. */
-  int IS_NUMERIC = 83;
+  int IS_LITERAL = 83;
   /** RegularExpression Id. */
-  int REGEX = 84;
+  int IS_NUMERIC = 84;
   /** RegularExpression Id. */
-  int SAME_TERM = 85;
+  int REGEX = 85;
   /** RegularExpression Id. */
-  int RAND = 86;
+  int SAME_TERM = 86;
   /** RegularExpression Id. */
-  int ABS = 87;
+  int RAND = 87;
   /** RegularExpression Id. */
-  int CEIL = 88;
+  int ABS = 88;
   /** RegularExpression Id. */
-  int FLOOR = 89;
+  int CEIL = 89;
   /** RegularExpression Id. */
-  int ROUND = 90;
+  int FLOOR = 90;
   /** RegularExpression Id. */
-  int CONCAT = 91;
+  int ROUND = 91;
   /** RegularExpression Id. */
-  int SUBSTR = 92;
+  int CONCAT = 92;
   /** RegularExpression Id. */
-  int STRLEN = 93;
+  int SUBSTR = 93;
   /** RegularExpression Id. */
-  int REPLACE = 94;
+  int STRLEN = 94;
   /** RegularExpression Id. */
-  int UCASE = 95;
+  int REPLACE = 95;
   /** RegularExpression Id. */
-  int LCASE = 96;
+  int UCASE = 96;
   /** RegularExpression Id. */
-  int ENCODE_FOR_URI = 97;
+  int LCASE = 97;
   /** RegularExpression Id. */
-  int CONTAINS = 98;
+  int ENCODE_FOR_URI = 98;
   /** RegularExpression Id. */
-  int STRSTARTS = 99;
+  int CONTAINS = 99;
   /** RegularExpression Id. */
-  int STRENDS = 100;
+  int STRSTARTS = 100;
   /** RegularExpression Id. */
-  int STRBEFORE = 101;
+  int STRENDS = 101;
   /** RegularExpression Id. */
-  int STRAFTER = 102;
+  int STRBEFORE = 102;
   /** RegularExpression Id. */
-  int YEAR = 103;
+  int STRAFTER = 103;
   /** RegularExpression Id. */
-  int MONTH = 104;
+  int YEAR = 104;
   /** RegularExpression Id. */
-  int DAY = 105;
+  int MONTH = 105;
   /** RegularExpression Id. */
-  int HOURS = 106;
+  int DAY = 106;
   /** RegularExpression Id. */
-  int MINUTES = 107;
+  int HOURS = 107;
   /** RegularExpression Id. */
-  int SECONDS = 108;
+  int MINUTES = 108;
   /** RegularExpression Id. */
-  int TIMEZONE = 109;
+  int SECONDS = 109;
   /** RegularExpression Id. */
-  int TZ = 110;
+  int TIMEZONE = 110;
   /** RegularExpression Id. */
-  int NOW = 111;
+  int TZ = 111;
   /** RegularExpression Id. */
-  int UUID = 112;
+  int NOW = 112;
   /** RegularExpression Id. */
-  int STRUUID = 113;
+  int UUID = 113;
   /** RegularExpression Id. */
-  int VERSION = 114;
+  int STRUUID = 114;
   /** RegularExpression Id. */
-  int MD5 = 115;
+  int VERSION = 115;
   /** RegularExpression Id. */
-  int SHA1 = 116;
+  int MD5 = 116;
   /** RegularExpression Id. */
-  int SHA224 = 117;
+  int SHA1 = 117;
   /** RegularExpression Id. */
-  int SHA256 = 118;
+  int SHA224 = 118;
   /** RegularExpression Id. */
-  int SHA384 = 119;
+  int SHA256 = 119;
   /** RegularExpression Id. */
-  int SHA512 = 120;
+  int SHA384 = 120;
   /** RegularExpression Id. */
-  int TRUE = 121;
+  int SHA512 = 121;
   /** RegularExpression Id. */
-  int FALSE = 122;
+  int TRUE = 122;
   /** RegularExpression Id. */
-  int DATA = 123;
+  int FALSE = 123;
   /** RegularExpression Id. */
-  int INSERT = 124;
+  int DATA = 124;
   /** RegularExpression Id. */
-  int DELETE = 125;
+  int INSERT = 125;
   /** RegularExpression Id. */
-  int INSERT_DATA = 126;
+  int DELETE = 126;
   /** RegularExpression Id. */
-  int DELETE_DATA = 127;
+  int INSERT_DATA = 127;
   /** RegularExpression Id. */
-  int DELETE_WHERE = 128;
+  int DELETE_DATA = 128;
   /** RegularExpression Id. */
-  int MODIFY = 129;
+  int DELETE_WHERE = 129;
   /** RegularExpression Id. */
-  int LOAD = 130;
+  int MODIFY = 130;
   /** RegularExpression Id. */
-  int CLEAR = 131;
+  int LOAD = 131;
   /** RegularExpression Id. */
-  int CREATE = 132;
+  int CLEAR = 132;
   /** RegularExpression Id. */
-  int ADD = 133;
+  int CREATE = 133;
   /** RegularExpression Id. */
-  int MOVE = 134;
+  int ADD = 134;
   /** RegularExpression Id. */
-  int COPY = 135;
+  int MOVE = 135;
   /** RegularExpression Id. */
-  int META = 136;
+  int COPY = 136;
   /** RegularExpression Id. */
-  int SILENT = 137;
+  int META = 137;
   /** RegularExpression Id. */
-  int DROP = 138;
+  int SILENT = 138;
   /** RegularExpression Id. */
-  int INTO = 139;
+  int DROP = 139;
   /** RegularExpression Id. */
-  int TO = 140;
+  int INTO = 140;
   /** RegularExpression Id. */
-  int DFT = 141;
+  int TO = 141;
   /** RegularExpression Id. */
-  int ALL = 142;
+  int DFT = 142;
   /** RegularExpression Id. */
-  int WITH = 143;
+  int ALL = 143;
   /** RegularExpression Id. */
-  int USING = 144;
+  int WITH = 144;
   /** RegularExpression Id. */
-  int DIGITS = 145;
+  int USING = 145;
   /** RegularExpression Id. */
-  int INTEGER = 146;
+  int DIGITS = 146;
   /** RegularExpression Id. */
-  int DECIMAL = 147;
+  int INTEGER = 147;
   /** RegularExpression Id. */
-  int DOUBLE = 148;
+  int DECIMAL = 148;
   /** RegularExpression Id. */
-  int INTEGER_POSITIVE = 149;
+  int DOUBLE = 149;
   /** RegularExpression Id. */
-  int DECIMAL_POSITIVE = 150;
+  int INTEGER_POSITIVE = 150;
   /** RegularExpression Id. */
-  int DOUBLE_POSITIVE = 151;
+  int DECIMAL_POSITIVE = 151;
   /** RegularExpression Id. */
-  int INTEGER_NEGATIVE = 152;
+  int DOUBLE_POSITIVE = 152;
   /** RegularExpression Id. */
-  int DECIMAL_NEGATIVE = 153;
+  int INTEGER_NEGATIVE = 153;
   /** RegularExpression Id. */
-  int DOUBLE_NEGATIVE = 154;
+  int DECIMAL_NEGATIVE = 154;
   /** RegularExpression Id. */
-  int EXPONENT = 155;
+  int DOUBLE_NEGATIVE = 155;
   /** RegularExpression Id. */
-  int QUOTE_3D = 156;
+  int EXPONENT = 156;
   /** RegularExpression Id. */
-  int QUOTE_3S = 157;
+  int QUOTE_3D = 157;
   /** RegularExpression Id. */
-  int ECHAR = 158;
+  int QUOTE_3S = 158;
   /** RegularExpression Id. */
-  int STRING_LITERAL1 = 159;
+  int ECHAR = 159;
   /** RegularExpression Id. */
-  int STRING_LITERAL2 = 160;
+  int STRING_LITERAL1 = 160;
   /** RegularExpression Id. */
-  int STRING_LITERAL_LONG1 = 161;
+  int STRING_LITERAL2 = 161;
   /** RegularExpression Id. */
-  int STRING_LITERAL_LONG2 = 162;
+  int STRING_LITERAL_LONG1 = 162;
   /** RegularExpression Id. */
-  int LPAREN = 163;
+  int STRING_LITERAL_LONG2 = 163;
   /** RegularExpression Id. */
-  int RPAREN = 164;
+  int LPAREN = 164;
   /** RegularExpression Id. */
-  int NIL = 165;
+  int RPAREN = 165;
   /** RegularExpression Id. */
-  int LBRACE = 166;
+  int NIL = 166;
   /** RegularExpression Id. */
-  int RBRACE = 167;
+  int LBRACE = 167;
   /** RegularExpression Id. */
-  int LBRACKET = 168;
+  int RBRACE = 168;
   /** RegularExpression Id. */
-  int RBRACKET = 169;
+  int LBRACKET = 169;
   /** RegularExpression Id. */
-  int ANON = 170;
+  int RBRACKET = 170;
   /** RegularExpression Id. */
-  int SEMICOLON = 171;
+  int ANON = 171;
   /** RegularExpression Id. */
-  int COMMA = 172;
+  int SEMICOLON = 172;
   /** RegularExpression Id. */
-  int DOT = 173;
+  int COMMA = 173;
   /** RegularExpression Id. */
-  int EQ = 174;
+  int DOT = 174;
   /** RegularExpression Id. */
-  int NE = 175;
+  int EQ = 175;
   /** RegularExpression Id. */
-  int GT = 176;
+  int NE = 176;
   /** RegularExpression Id. */
-  int LT = 177;
+  int GT = 177;
   /** RegularExpression Id. */
-  int LE = 178;
+  int LT = 178;
   /** RegularExpression Id. */
-  int GE = 179;
+  int LE = 179;
   /** RegularExpression Id. */
-  int BANG = 180;
+  int GE = 180;
   /** RegularExpression Id. */
-  int TILDE = 181;
+  int BANG = 181;
   /** RegularExpression Id. */
-  int COLON = 182;
+  int TILDE = 182;
   /** RegularExpression Id. */
-  int SC_OR = 183;
+  int COLON = 183;
   /** RegularExpression Id. */
-  int SC_AND = 184;
+  int SC_OR = 184;
   /** RegularExpression Id. */
-  int PLUS = 185;
+  int SC_AND = 185;
   /** RegularExpression Id. */
-  int MINUS = 186;
+  int PLUS = 186;
   /** RegularExpression Id. */
-  int STAR = 187;
+  int MINUS = 187;
   /** RegularExpression Id. */
-  int SLASH = 188;
+  int STAR = 188;
   /** RegularExpression Id. */
-  int DATATYPE = 189;
+  int SLASH = 189;
   /** RegularExpression Id. */
-  int AT = 190;
+  int DATATYPE = 190;
   /** RegularExpression Id. */
-  int ASSIGN = 191;
+  int AT = 191;
   /** RegularExpression Id. */
-  int VBAR = 192;
+  int ASSIGN = 192;
   /** RegularExpression Id. */
-  int CARAT = 193;
+  int VBAR = 193;
   /** RegularExpression Id. */
-  int FPATH = 194;
+  int CARAT = 194;
   /** RegularExpression Id. */
-  int RPATH = 195;
+  int FPATH = 195;
   /** RegularExpression Id. */
-  int QMARK = 196;
+  int RPATH = 196;
   /** RegularExpression Id. */
-  int HEX = 197;
+  int QMARK = 197;
   /** RegularExpression Id. */
-  int PERCENT = 198;
+  int HEX = 198;
   /** RegularExpression Id. */
-  int PN_LOCAL_ESC = 199;
+  int PERCENT = 199;
   /** RegularExpression Id. */
-  int PN_CHARS_BASE = 200;
+  int PN_LOCAL_ESC = 200;
   /** RegularExpression Id. */
-  int PN_CHARS_U = 201;
+  int PN_CHARS_BASE = 201;
   /** RegularExpression Id. */
-  int PN_CHARS = 202;
+  int PN_CHARS_U = 202;
   /** RegularExpression Id. */
-  int PN_PREFIX = 203;
+  int PN_CHARS = 203;
   /** RegularExpression Id. */
-  int PLX = 204;
+  int PN_PREFIX = 204;
   /** RegularExpression Id. */
-  int PN_LOCAL = 205;
+  int PLX = 205;
   /** RegularExpression Id. */
-  int VARNAME = 206;
+  int PN_LOCAL = 206;
   /** RegularExpression Id. */
-  int UNKNOWN = 207;
+  int VARNAME = 207;
+  /** RegularExpression Id. */
+  int UNKNOWN = 208;
 
   /** Lexical state. */
   int DEFAULT = 0;
@@ -510,6 +512,7 @@ public interface ARQParserConstants {
     "\"cast\"",
     "\"call\"",
     "\"multi\"",
+    "\"shortest\"",
     "\"str\"",
     "\"strlang\"",
     "\"strdt\"",



Mime
View raw message