jvanzyl 00/10/20 12:16:30
Modified: src/java/org/apache/velocity/runtime/parser
JJTParserState.java Parser.java Parser.jj
Parser.jjt ParserTokenManager.java
ParserVisitor.java build
Removed: src/java/org/apache/velocity/runtime/parser ASTAddNode.java
ASTAndNode.java ASTAssignment.java ASTBlock.java
ASTComment.java ASTDirective.java ASTDivNode.java
ASTEQNode.java ASTElseIfStatement.java
ASTElseStatement.java ASTExpression.java
ASTFalse.java ASTGENode.java ASTGTNode.java
ASTIdentifier.java ASTIfStatement.java
ASTIncludeStatement.java ASTLENode.java
ASTLTNode.java ASTMethod.java ASTModNode.java
ASTMulNode.java ASTNENode.java ASTNotNode.java
ASTNumberLiteral.java ASTObjectArray.java
ASTOrNode.java ASTParameters.java ASTReference.java
ASTSetDirective.java ASTStringLiteral.java
ASTSubtractNode.java ASTText.java ASTTrue.java
ASTVariable.java ASTWord.java ASTprocess.java
AbstractExecutor.java MapExecutor.java Node.java
NodeUtils.java PropertyExecutor.java
SimpleNode.java
Log:
- moved all the nodes into a package of their own, and made changes
to the grammar file to reflect this change.
Revision Changes Path
1.2 +2 -0
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/JJTParserState.java
Index: JJTParserState.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/JJTParserState.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JJTParserState.java 2000/09/30 17:04:25 1.1
+++ JJTParserState.java 2000/10/20 19:16:23 1.2
@@ -2,6 +2,8 @@
package org.apache.velocity.runtime.parser;
+import org.apache.velocity.runtime.parser.node.*;
+
class JJTParserState {
private java.util.Stack nodes;
private java.util.Stack marks;
1.6 +6 -5
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Parser.java 2000/10/11 14:46:24 1.5
+++ Parser.java 2000/10/20 19:16:24 1.6
@@ -4,6 +4,7 @@
import java.io.*;
import java.util.*;
+import org.apache.velocity.runtime.parser.node.*;
import org.apache.velocity.runtime.directive.Directive;
/**
@@ -17,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.5 2000/10/11 14:46:24 jvanzyl Exp $
+ * @version $Id: Parser.java,v 1.6 2000/10/20 19:16:24 jvanzyl Exp $
*/
public class Parser/*@bgen(jjtree)*/implements ParserTreeConstants, ParserConstants
{/*@bgen(jjtree)*/
protected JJTParserState jjtree = new JJTParserState();
@@ -1993,14 +1994,14 @@
return false;
}
- final private boolean jj_3R_20() {
- if (jj_scan_token(IDENTIFIER)) return true;
+ final private boolean jj_3R_35() {
+ if (jj_scan_token(FALSE)) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
- final private boolean jj_3R_35() {
- if (jj_scan_token(FALSE)) return true;
+ final private boolean jj_3R_20() {
+ if (jj_scan_token(IDENTIFIER)) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
return false;
}
1.6 +2 -1
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Parser.jj 2000/10/11 14:46:25 1.5
+++ Parser.jj 2000/10/20 19:16:25 1.6
@@ -84,6 +84,7 @@
import java.io.*;
import java.util.*;
+import org.apache.velocity.runtime.parser.node.*;
import org.apache.velocity.runtime.directive.Directive;
/**
@@ -97,7 +98,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.5 2000/10/11 14:46:25 jvanzyl Exp $
+ * @version $Id: Parser.jj,v 1.6 2000/10/20 19:16:25 jvanzyl Exp $
*/
public class Parser/*@bgen(jjtree)*/implements ParserTreeConstants/*@egen*/
{/*@bgen(jjtree)*/
1.6 +2 -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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Parser.jjt 2000/10/11 14:46:26 1.5
+++ Parser.jjt 2000/10/20 19:16:25 1.6
@@ -108,6 +108,7 @@
import java.io.*;
import java.util.*;
+import org.apache.velocity.runtime.parser.node.*;
import org.apache.velocity.runtime.directive.Directive;
/**
@@ -121,7 +122,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.5 2000/10/11 14:46:26 jvanzyl Exp $
+ * @version $Id: Parser.jjt,v 1.6 2000/10/20 19:16:25 jvanzyl Exp $
*/
public class Parser
{
1.5 +1 -0
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ParserTokenManager.java 2000/10/11 14:46:26 1.4
+++ ParserTokenManager.java 2000/10/20 19:16:26 1.5
@@ -2,6 +2,7 @@
package org.apache.velocity.runtime.parser;
import java.io.*;
import java.util.*;
+import org.apache.velocity.runtime.parser.node.*;
import org.apache.velocity.runtime.directive.Directive;
public class ParserTokenManager implements ParserConstants
1.3 +2 -0
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/ParserVisitor.java
Index: ParserVisitor.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/ParserVisitor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ParserVisitor.java 2000/10/03 17:03:17 1.2
+++ ParserVisitor.java 2000/10/20 19:16:26 1.3
@@ -2,6 +2,8 @@
package org.apache.velocity.runtime.parser;
+import org.apache.velocity.runtime.parser.node.*;
+
public interface ParserVisitor
{
public Object visit(SimpleNode node, Object data);
1.2 +6 -0
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/build
Index: build
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/build,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build 2000/09/30 17:04:24 1.1
+++ build 2000/10/20 19:16:27 1.2
@@ -5,3 +5,9 @@
echo "Running JavaCC ..."
javacc Parser.jj
+
+# Remove the generated nodes as they are now
+# in a package of their own.
+rm -f AST*
+rm -f Node.java
+rm -f SimpleNode.java
