Author: sshafroi
Date: 2008-11-11 09:03:33 +0100 (Tue, 11 Nov 2008)
New Revision: 6921
Modified:
trunk/query-api/src/main/javacc/QueryParserImpl.jj
Log:
remove protection against misplaced ( or ), since it was discovered that this
lead to wrongly parsing in some cases. I will open a new Scarab issue to tackle
the () problem.
Modified: trunk/query-api/src/main/javacc/QueryParserImpl.jj
===================================================================
--- trunk/query-api/src/main/javacc/QueryParserImpl.jj 2008-11-10 15:25:04 UTC
(rev 6920)
+++ trunk/query-api/src/main/javacc/QueryParserImpl.jj 2008-11-11 08:03:33 UTC
(rev 6921)
@@ -315,14 +315,14 @@
enterMethod("leaf()", token);
}{
// A real field
- ((<OPENP>|<CLOSEP>)* (field=<WORD>)<FIELD_SUFFIX>)(clause =
fieldedLeaf(field)) {try{return clause;}finally{exitMethod();}}
+ ((field=<WORD>)<FIELD_SUFFIX>)(clause = fieldedLeaf(field)) {try{return
clause;}finally{exitMethod();}}
|
// An accidential field.
// XXX This could cause problems as it destroys the construction of a
right-leaning forests.
- ((<OPENP>|<CLOSEP>)* left = fieldedLeaf(null)<FIELD_SUFFIX>)(right =
fieldedLeaf(null))
+ (left = fieldedLeaf(null)<FIELD_SUFFIX>)(right = fieldedLeaf(null))
{try{return
context.createDefaultOperatorClause(left,right);}finally{exitMethod();}}
|
- ((<OPENP>|<CLOSEP>)* (<FIELD_SUFFIX>)?(clause = fieldedLeaf(null)))
{try{return clause;}finally{exitMethod();}}
+ ((<FIELD_SUFFIX>)?(clause = fieldedLeaf(null))) {try{return
clause;}finally{exitMethod();}}
}
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
