cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime/parser Parser.jjt

[geirm]

geirm       00/12/20 21:50:25

  Modified:    src/java/org/apache/velocity/runtime/parser Parser.jjt
  Log:
  Added support for single-quoted string literals. (They won't be interpolated.)
  
  Revision  Changes    Path
  1.46      +2 -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.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- Parser.jjt        2000/12/21 04:43:45     1.45
  +++ Parser.jjt        2000/12/21 05:50:25     1.46
  @@ -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.45 2000/12/21 04:43:45 geirm Exp $ 
  + * @version $Id: Parser.jjt,v 1.46 2000/12/21 05:50:25 geirm Exp $ 
   */
   public class Parser
   {
  @@ -724,7 +724,7 @@
   <REFERENCE,DIRECTIVE,REFMODIFIER,REFMOD2>
   TOKEN :
   {
  -   <STRING_LITERAL: ( "\"" ( ~["\"","\n","\r"] )* "\"" ) >
  +   <STRING_LITERAL: ( "\"" ( ~["\"","\n","\r"] )* "\"" ) | ( "'" ( ~["'","\n","\r"] 
)* "'" ) >
       {
           /*
            *  - if we are in REFERENCE || REFMODIFIER then " is an ender