geirm 2003/06/25 03:48:46
Modified: jexl/src/java/org/apache/commons/jexl/parser Parser.jjt
Log:
patch from Mark Wilkinson to (cleverly) handle the size problem
Revision Changes Path
1.6 +10 -2
jakarta-commons/jexl/src/java/org/apache/commons/jexl/parser/Parser.jjt
Index: Parser.jjt
===================================================================
RCS file:
/home/cvs/jakarta-commons/jexl/src/java/org/apache/commons/jexl/parser/Parser.jjt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Parser.jjt 7 Jun 2002 03:34:42 -0000 1.5
+++ Parser.jjt 25 Jun 2003 10:48:46 -0000 1.6
@@ -56,6 +56,8 @@
* Jexl : Java Expression Language
*
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Mark H. Wilkinson</a>
+ *
* @version $Id$
*/
@@ -448,13 +450,19 @@
Identifier() ("[" ( LOOKAHEAD(3) Expression() | IntegerLiteral() | Reference()
) "]")+
}
+void SizeMethod() : {}
+{
+ "size" "(" ")"
+}
+
void Reference() : {}
{
(LOOKAHEAD(Identifier() "[" ( Expression() | IntegerLiteral() | Reference()) "]")
ArrayAccess() | Identifier())
(LOOKAHEAD(2) "."
(
LOOKAHEAD(Identifier() "[" ( Expression() | IntegerLiteral() | Reference())
"]") ArrayAccess() |
- (LOOKAHEAD(3) Method() | Identifier() | IntegerLiteral() )
+// (LOOKAHEAD(3) Method() | Identifier() | IntegerLiteral() )
+ (LOOKAHEAD(3) Method() | SizeMethod() | Identifier() | IntegerLiteral() )
)
)*
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
