geirm 01/01/28 20:27:11
Modified: src/java/org/apache/velocity/runtime/parser Parser.jjt
Log:
Extended the allowed characters for a directive from simply a-z, A-Z to
include the '_' and 0-9.
They are now pretty much compatible with Java identifiers, except that we
don't allow the '$', as that's way taoo VMS ...
The main motivation was for designers and VMs, which use the same
identifier syntax.
Revision Changes Path
1.53 +4 -2
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/Parser.jjt
Index: Parser.jjt
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/Parser.jjt,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- Parser.jjt 2001/01/24 16:05:06 1.52
+++ Parser.jjt 2001/01/29 04:27:11 1.53
@@ -120,7 +120,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: Parser.jjt,v 1.52 2001/01/24 16:05:06 geirm Exp $
+ * @version $Id: Parser.jjt,v 1.53 2001/01/29 04:27:11 geirm Exp $
*/
public class Parser
{
@@ -821,7 +821,9 @@
TOKEN:
{
<#LETTER: [ "a"-"z", "A" - "Z" ] >
-| <WORD: (<LETTER>)+ >
+| <#DIRECTIVE_CHAR: [ "a"-"z", "A"-"Z", "0"-"9", "_" ] >
+| <WORD: ( <LETTER> | ["_"]) (<DIRECTIVE_CHAR>)* >
+
}
/* -----------------------------------------------------------------------
- cvs commit: jakarta-velocity/src/java/org/apache/velocity/runt... geirm
- cvs commit: jakarta-velocity/src/java/org/apache/velocity/runt... geirm
- cvs commit: jakarta-velocity/src/java/org/apache/velocity/runt... geirm
- cvs commit: jakarta-velocity/src/java/org/apache/velocity/runt... geirm
- cvs commit: jakarta-velocity/src/java/org/apache/velocity/runt... geirm
- cvs commit: jakarta-velocity/src/java/org/apache/velocity/runt... geirm
- cvs commit: jakarta-velocity/src/java/org/apache/velocity/runt... geirm
- cvs commit: jakarta-velocity/src/java/org/apache/velocity/runt... geirm
- cvs commit: jakarta-velocity/src/java/org/apache/velocity/runt... geirm
- cvs commit: jakarta-velocity/src/java/org/apache/velocity/runt... geirm
- cvs commit: jakarta-velocity/src/java/org/apache/velocity/runt... geirm
- cvs commit: jakarta-velocity/src/java/org/apache/velocity/runt... geirm
- cvs commit: jakarta-velocity/src/java/org/apache/velocity/runt... geirm
- cvs commit: jakarta-velocity/src/java/org/apache/velocity/runt... geirm
- cvs commit: jakarta-velocity/src/java/org/apache/velocity/runt... geirm
- cvs commit: jakarta-velocity/src/java/org/apache/velocity/runt... geirm
- cvs commit: jakarta-velocity/src/java/org/apache/velocity/runt... geirm
- cvs commit: jakarta-velocity/src/java/org/apache/velocity/runt... geirm
- cvs commit: jakarta-velocity/src/java/org/apache/velocity/runt... geirm
