[Mulgara-svn] r1820 - trunk/src/jar/querylang/javacc/org/mulgara/sparql/parser

[alexhall at mulgara.org]

Author: alexhall
Date: 2009-10-16 04:08:08 -0700 (Fri, 16 Oct 2009)
New Revision: 1820

Modified:
   trunk/src/jar/querylang/javacc/org/mulgara/sparql/parser/SparqlParser.jj
Log:
Fix SPARQL parser to correctly handle ASC and DESC modifiers

Modified: trunk/src/jar/querylang/javacc/org/mulgara/sparql/parser/SparqlParser.jj
===================================================================
--- trunk/src/jar/querylang/javacc/org/mulgara/sparql/parser/SparqlParser.jj	2009-10-07 18:38:05 UTC (rev 1819)
+++ trunk/src/jar/querylang/javacc/org/mulgara/sparql/parser/SparqlParser.jj	2009-10-16 11:08:08 UTC (rev 1820)
@@ -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); }
 }