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

[geirm]

geirm       00/11/03 03:34:10

  Modified:    src/java/org/apache/velocity/runtime/parser Parser.jjt
  Log:
  Fixed jason's $strings.getVillageType($col.Type) bug.
  
  Revision  Changes    Path
  1.17      +9 -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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- Parser.jjt        2000/11/03 03:26:32     1.16
  +++ Parser.jjt        2000/11/03 11:34:07     1.17
  @@ -127,7 +127,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.16 2000/11/03 03:26:32 geirm Exp $ 
  + * @version $Id: Parser.jjt,v 1.17 2000/11/03 11:34:07 geirm Exp $ 
   */
   public class Parser
   {
  @@ -474,8 +474,15 @@
           if (curLexState == REFMODIFIER )
               SwitchTo( REFMOD2 ); 
       }
  +}
   
  -|   <RPAREN: ")" (" ")* ( "\n" | "\r" | "\r\n" )?>
  +/* $$$ gmj
  + *  we never will see a ) in anything but DIRECTIVE and REFMOD2.  Each have their 
own
  + */
  +<DIRECTIVE>
  +TOKEN:
  +{
  +   <RPAREN: ")" (" ")* ( "\n" | "\r" | "\r\n" )?>
       {
          RPARENHandler();
       }