[Mulgara-svn] r1842 - branches/distinct_queries/src/jar/querylang/javacc/org/mulgara/sparql/parser

[pag at mulgara.org]

Author: pag
Date: 2009-11-13 11:28:16 -0800 (Fri, 13 Nov 2009)
New Revision: 1842

Modified:
   branches/distinct_queries/src/jar/querylang/javacc/org/mulgara/sparql/parser/SparqlParser.jj
Log:
Alex's fix for ordering priority, plus removing + character when parsing literal integers

Modified: branches/distinct_queries/src/jar/querylang/javacc/org/mulgara/sparql/parser/SparqlParser.jj
===================================================================
--- branches/distinct_queries/src/jar/querylang/javacc/org/mulgara/sparql/parser/SparqlParser.jj	2009-11-13 19:26:41 UTC (rev 1841)
+++ branches/distinct_queries/src/jar/querylang/javacc/org/mulgara/sparql/parser/SparqlParser.jj	2009-11-13 19:28:16 UTC (rev 1842)
@@ -271,9 +271,9 @@
 /* [17]    OrderCondition    ::=     ( ( 'ASC' | 'DESC' ) BrackettedExpression ) | ( Constraint | Var ) */
 void OrderCondition() : { boolean asc = true; Expression e; }
 {
-  ( ( "ASC" | "DESC" { asc = false; } ) e=BrackettedExpression() )
+  ( ( ( "ASC" | "DESC" { asc = false; } ) e=BrackettedExpression() )
   |
-  ( e=Constraint() | e=Var() )
+  ( e=Constraint() | e=Var() ) )
   { queryStructure.addOrdering(e, asc); }
 }
 
@@ -695,9 +695,9 @@
 /* [63]    NumericLiteralPositive    ::=    INTEGER_POSITIVE |  DECIMAL_POSITIVE |  DOUBLE_POSITIVE */
 NumericLiteral NumericLiteralPositive() : { Token t; }
 {
-    t=<INTEGER_POSITIVE> { return new IntegerLiteral(t.image); }
-    | t=<DECIMAL_POSITIVE> { return new DecimalLiteral(t.image); }
-    | t=<DOUBLE_POSITIVE> { return new DoubleLiteral(t.image); }
+    t=<INTEGER_POSITIVE> { return new IntegerLiteral(t.image.substring(1)); }
+    | t=<DECIMAL_POSITIVE> { return new DecimalLiteral(t.image.substring(1)); }
+    | t=<DOUBLE_POSITIVE> { return new DoubleLiteral(t.image.substring(1)); }
 }
 
 /* [64]    NumericLiteralNegative    ::=    INTEGER_NEGATIVE |  DECIMAL_NEGATIVE |  DOUBLE_NEGATIVE */