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

[geirm]

geirm       00/11/05 08:28:46

  Modified:    src/java/org/apache/velocity/runtime/parser Parser.java
                        Parser.jj ParserTokenManager.java
  Log:
  Parser.jjt autogen.
  
  Revision  Changes    Path
  1.22      +1 -1      
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/Parser.java
  
  Index: Parser.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/Parser.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- Parser.java       2000/11/05 05:48:12     1.21
  +++ Parser.java       2000/11/05 16:28:44     1.22
  @@ -18,7 +18,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
    * @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
  - * @version $Id: Parser.java,v 1.21 2000/11/05 05:48:12 geirm Exp $ 
  + * @version $Id: Parser.java,v 1.22 2000/11/05 16:28:44 geirm Exp $ 
   */
   public class Parser/*@bgen(jjtree)*/implements ParserTreeConstants, ParserConstants 
{/*@bgen(jjtree)*/
     protected JJTParserState jjtree = new JJTParserState();
  
  
  
  1.22      +2 -2      
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/Parser.jj
  
  Index: Parser.jj
  ===================================================================
  RCS file: 
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/Parser.jj,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- Parser.jj 2000/11/05 05:48:13     1.21
  +++ Parser.jj 2000/11/05 16:28:44     1.22
  @@ -103,7 +103,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
    * @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
  - * @version $Id: Parser.jj,v 1.21 2000/11/05 05:48:13 geirm Exp $ 
  + * @version $Id: Parser.jj,v 1.22 2000/11/05 16:28:44 geirm Exp $ 
   */
   public class Parser/*@bgen(jjtree)*/implements ParserTreeConstants/*@egen*/
   {/*@bgen(jjtree)*/
  @@ -461,7 +461,7 @@
   <DIRECTIVE>
   TOKEN:
   {
  -   <RPAREN: ")" (" ")* ( "\n" | "\r" | "\r\n" )?>
  +   <RPAREN: ")" ((" ")* ( "\n" | "\r" | "\r\n" ))?>
       {
          RPARENHandler();
       }    
  
  
  
  1.20      +2 -5      
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java
  
  Index: ParserTokenManager.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- ParserTokenManager.java   2000/11/05 05:48:13     1.19
  +++ ParserTokenManager.java   2000/11/05 16:28:44     1.20
  @@ -548,11 +548,8 @@
                        jjstateSet[jjnewStateCnt++] = 8;
                     break;
                  case 1:
  -                  if (curChar != 32)
  -                     break;
  -                  if (kind > 5)
  -                     kind = 5;
  -                  jjCheckNAddStates(0, 2);
  +                  if (curChar == 32)
  +                     jjCheckNAddStates(0, 2);
                     break;
                  case 2:
                     if ((0x2400L & l) != 0L && kind > 5)