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/03/27 16:59:21 UTC

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

geirm       02/03/27 07:59:21

  Modified:    src/java/org/apache/velocity/runtime/parser Parser.java
  Log:
  Parser.jjt followers
  
  Revision  Changes    Path
  1.73      +18 -17    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.72
  retrieving revision 1.73
  diff -u -r1.72 -r1.73
  --- Parser.java	25 Mar 2002 00:37:45 -0000	1.72
  +++ Parser.java	27 Mar 2002 15:59:21 -0000	1.73
  @@ -22,7 +22,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.java,v 1.72 2002/03/25 00:37:45 geirm Exp $
  + * @version $Id: Parser.java,v 1.73 2002/03/27 15:59:21 geirm Exp $
   */
   public class Parser/*@bgen(jjtree)*/implements ParserTreeConstants, ParserConstants {/*@bgen(jjtree)*/
     protected JJTParserState jjtree = new JJTParserState();/**
  @@ -545,6 +545,7 @@
         break;
       case NUMBER_LITERAL:
         NumberLiteral();
  +        {if (true) return ParserTreeConstants.JJTNUMBERLITERAL;}
         break;
       default:
         jj_la1[4] = jj_gen;
  @@ -2495,14 +2496,14 @@
       return false;
     }
   
  -  final private boolean jj_3R_35() {
  -    if (jj_scan_token(WHITESPACE)) return true;
  +  final private boolean jj_3R_58() {
  +    if (jj_scan_token(FALSE)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
   
  -  final private boolean jj_3R_58() {
  -    if (jj_scan_token(FALSE)) return true;
  +  final private boolean jj_3R_35() {
  +    if (jj_scan_token(WHITESPACE)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
  @@ -2600,12 +2601,6 @@
       return false;
     }
   
  -  final private boolean jj_3_1() {
  -    if (jj_3R_19()) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    return false;
  -  }
  -
     final private boolean jj_3R_39() {
       if (jj_scan_token(IDENTIFIER)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  @@ -2630,6 +2625,12 @@
       return false;
     }
   
  +  final private boolean jj_3_1() {
  +    if (jj_3R_19()) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    return false;
  +  }
  +
     final private boolean jj_3R_33() {
       if (jj_scan_token(WHITESPACE)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  @@ -3037,12 +3038,6 @@
       return false;
     }
   
  -  final private boolean jj_3R_44() {
  -    if (jj_3R_54()) return true;
  -    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  -    return false;
  -  }
  -
     final private boolean jj_3R_56() {
       if (jj_scan_token(LBRACKET)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  @@ -3051,6 +3046,12 @@
       if (jj_3R_64()) jj_scanpos = xsp;
       else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       if (jj_scan_token(RBRACKET)) return true;
  +    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
  +    return false;
  +  }
  +
  +  final private boolean jj_3R_44() {
  +    if (jj_3R_54()) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
  
  
  

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