Author: sshafroi
Date: 2008-07-17 14:06:46 +0200 (Thu, 17 Jul 2008)
New Revision: 6740
Modified:
trunk/query-api/src/main/javacc/QueryParserImpl.jj
Log:
Issue SKER4937: (Query parsing fails when given (1 (2 3) 4))
Let an or clause include another or clause. ((a b))
Make the left hand side of a hidden or operation accept loosJoinPrecedence and
not just the strong one. ((1 2) 1)
I would like a review of this.
Modified: trunk/query-api/src/main/javacc/QueryParserImpl.jj
===================================================================
--- trunk/query-api/src/main/javacc/QueryParserImpl.jj 2008-07-14 10:28:27 UTC
(rev 6739)
+++ trunk/query-api/src/main/javacc/QueryParserImpl.jj 2008-07-17 12:06:46 UTC
(rev 6740)
@@ -262,6 +262,8 @@
}{
("("(clause = hiddenOrOperation())")") { try{return
clause;}finally{exitMethod();} }
|
+ ("("(clause = orOperation())")") { try{return
clause;}finally{exitMethod();} }
+ |
((left = strongJoinPrecedence())<OR>(right = looseJoinPrecedence()))
{ try{return
context.createOrClause(left,right);}finally{exitMethod();} }
}
@@ -294,7 +296,7 @@
((left = leafPrecedence())(right = hiddenOrOperation()))
{ try{return
context.createOrClause(left,right);}finally{exitMethod();} }
|
- ((left = strongJoinPrecedence())(right = looseJoinPrecedence()))
+ ((left = looseJoinPrecedence())(right = looseJoinPrecedence()))
{ try{return
context.createOrClause(left,right);}finally{exitMethod();} }
|
// Not really an OR clause. Just () wrapped around something else.
Therefore ignore the ()'s
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
