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

[geirm]

geirm       00/11/04 07:29:55

  Modified:    src/java/org/apache/velocity/runtime/parser Parser.jjt
  Log:
  Needed to switch back to REFERENCE from REFMOD2 rather than pop the stack, as we can 
have a series of method calls: $foo.bar().blargh().woogie().doogie()
  My bug... :)
  
  Revision  Changes    Path
  1.18      +8 -3      
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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- Parser.jjt        2000/11/03 11:34:07     1.17
  +++ Parser.jjt        2000/11/04 15:29:54     1.18
  @@ -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.17 2000/11/03 11:34:07 geirm Exp $ 
  + * @version $Id: Parser.jjt,v 1.18 2000/11/04 15:29:54 geirm Exp $ 
   */
   public class Parser
   {
  @@ -476,7 +476,7 @@
       }
   }
   
  -/* $$$ gmj
  +/* 
    *  we never will see a ) in anything but DIRECTIVE and REFMOD2.  Each have their 
own
    */
   <DIRECTIVE>
  @@ -496,7 +496,12 @@
   {
       <REFMOD2_RPAREN: ")">
       {
  -       RPARENHandler();
  +        /*
  +         *  need to simply switch back to REFERENCE, not drop down the stack
  +         *  because we can (infinitely) chain, ala 
$foo.bar().blargh().woogie().doogie()
  +         */
  +
  +        SwitchTo( REFERENCE );
       }    
   }