You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by ge...@apache.org on 2002/02/22 22:40:22 UTC

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

geirm       02/02/22 13:40:22

  Modified:    src/java/org/apache/velocity/runtime/parser Parser.jjt
  Log:
  Fix for the $foo## bug reported by Nathan Bubna (nathan@esha.com) - bug
  # 6633 (Nagoya is down, so will have to update bug report later)
  
  Revision  Changes    Path
  1.71      +7 -1      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.70
  retrieving revision 1.71
  diff -u -r1.70 -r1.71
  --- Parser.jjt	30 Oct 2001 04:28:38 -0000	1.70
  +++ Parser.jjt	22 Feb 2002 21:40:22 -0000	1.71
  @@ -134,7 +134,7 @@
    *
    * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
    * @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
  - * @version $Id: Parser.jjt,v 1.70 2001/10/30 04:28:38 geirm Exp $ 
  + * @version $Id: Parser.jjt,v 1.71 2002/02/22 21:40:22 geirm Exp $ 
   */
   public class Parser
   {
  @@ -658,6 +658,12 @@
      { 
           if (!inComment)
           {
  +            if (curLexState == REFERENCE)
  +            {
  +                inReference = false;
  +                stateStackPop();
  +            }
  +
               inComment = true;
               stateStackPush();
               SwitchTo(IN_SINGLE_LINE_COMMENT);
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>