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

[jvanzyl]

jvanzyl     00/11/05 17:20:03

  Modified:    src/java/org/apache/velocity/runtime/parser Parser.jjt
  Log:
  - allow integers to be arguments to methods. will have to change
    the introspection engine to match.
  
  Revision  Changes    Path
  1.23      +11 -6     
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.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- Parser.jjt        2000/11/05 19:20:19     1.22
  +++ Parser.jjt        2000/11/06 01:20:02     1.23
  @@ -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.22 2000/11/05 19:20:19 geirm Exp $ 
  + * @version $Id: Parser.jjt,v 1.23 2000/11/06 01:20:02 jvanzyl Exp $ 
   */
   public class Parser
   {
  @@ -818,7 +818,7 @@
       }
   }
   
  -<PRE_DIRECTIVE,DIRECTIVE>
  +<PRE_DIRECTIVE,DIRECTIVE,REFMOD2>
   TOKEN:
   {
      <#DIGIT: [ "0"-"9" ] >
  @@ -831,11 +831,15 @@
            *  because we want to handle the \n after
            */
   
  -        if ( lparen == 0 && !inSet )
  +        if ( lparen == 0 && !inSet && curLexState != REFMOD2)
               stateStackPop();
       }
  +}
   
  -|   <#LETTER: [ "a"-"z", "A" - "Z" ] >
  +<PRE_DIRECTIVE,DIRECTIVE>
  +TOKEN:
  +{
  +    <#LETTER: [ "a"-"z", "A" - "Z" ] >
   |   <WORD: (<LETTER>)+ >
   }
   
  @@ -1087,7 +1091,8 @@
   |   ObjectArray()
   |   True()
   |   False()
  -|   Reference() 
  +|   Reference()
  +|   NumberLiteral()
   }
   
   /**
  @@ -1382,4 +1387,4 @@
           ------
   
   */
  - 
  \ No newline at end of file
  +