You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by jv...@locus.apache.org on 2000/08/30 12:52:20 UTC
cvs commit: jakarta-velocity/src/java/org/apache/velocity/parser Parser.java Parser.jj Parser.jjt
jvanzyl 00/08/30 03:52:20
Modified: src/java/org/apache/velocity output
src/java/org/apache/velocity/parser Parser.java Parser.jj
Parser.jjt
Log:
- formatting fixes in the parser.
Revision Changes Path
1.7 +0 -159 jakarta-velocity/src/java/org/apache/velocity/output
<<Binary file>>
1.7 +1 -3 jakarta-velocity/src/java/org/apache/velocity/parser/Parser.java
Index: Parser.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/parser/Parser.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Parser.java 2000/08/30 05:40:19 1.6
+++ Parser.java 2000/08/30 10:52:19 1.7
@@ -14,7 +14,7 @@
* what controls the generation of this class.
*
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
- * @version $Id: Parser.java,v 1.6 2000/08/30 05:40:19 jvanzyl Exp $
+ * @version $Id: Parser.java,v 1.7 2000/08/30 10:52:19 jvanzyl Exp $
*/
public class Parser/*@bgen(jjtree)*/implements ParserTreeConstants, ParserConstants {/*@bgen(jjtree)*/
protected JJTParserState jjtree = new JJTParserState();
@@ -40,8 +40,6 @@
public void parse() throws ParseException
{
- // Make sure the parent is always a benign
- // simple node.
root = process();
}
1.8 +2 -12 jakarta-velocity/src/java/org/apache/velocity/parser/Parser.jj
Index: Parser.jj
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/parser/Parser.jj,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Parser.jj 2000/08/30 05:40:20 1.7
+++ Parser.jj 2000/08/30 10:52:19 1.8
@@ -91,7 +91,7 @@
* what controls the generation of this class.
*
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
- * @version $Id: Parser.jj,v 1.7 2000/08/30 05:40:20 jvanzyl Exp $
+ * @version $Id: Parser.jj,v 1.8 2000/08/30 10:52:19 jvanzyl Exp $
*/
public class Parser/*@bgen(jjtree)*/implements ParserTreeConstants/*@egen*/
{/*@bgen(jjtree)*/
@@ -121,8 +121,6 @@
public void parse() throws ParseException
{
- // Make sure the parent is always a benign
- // simple node.
root = process();
}
@@ -212,14 +210,6 @@
//| <COMMA: ",">
}
-// Had to add the "(", ")" to <TEXT> so that
-// #if (true), #if (false) would evaluate
-// correctly. I think I would rather change
-// it to #if (#true), #if (#false). It doesn't
-// look great but is more consistent with the
-// grammar. And it would get rid of some overhead.
-
-
TOKEN :
{
<TEXT: (~["$", "\n", "\r", "\t", " ", "(", ")"])+ >
@@ -263,7 +253,7 @@
*/
/**
- * This gets inserted into the BSDMacroTokenManager
+ * This gets inserted into the ParserMacroTokenManager
* and is being used here strictly for the #parse
* directive: an #include type behaviour. We have
* to save the state the stream currently being
1.10 +2 -2 jakarta-velocity/src/java/org/apache/velocity/parser/Parser.jjt
Index: Parser.jjt
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/parser/Parser.jjt,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Parser.jjt 2000/08/30 06:04:55 1.9
+++ Parser.jjt 2000/08/30 10:52:19 1.10
@@ -115,7 +115,7 @@
* what controls the generation of this class.
*
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
- * @version $Id: Parser.jjt,v 1.9 2000/08/30 06:04:55 jvanzyl Exp $
+ * @version $Id: Parser.jjt,v 1.10 2000/08/30 10:52:19 jvanzyl Exp $
*/
public class Parser
{
@@ -274,7 +274,7 @@
*/
/**
- * This gets inserted into the BSDMacroTokenManager
+ * This gets inserted into the ParserMacroTokenManager
* and is being used here strictly for the #parse
* directive: an #include type behaviour. We have
* to save the state the stream currently being