Author: henning
Date: Sat Oct 29 09:26:32 2005
New Revision: 329434
URL: http://svn.apache.org/viewcvs?rev=329434&view=rev
Log:
Add missing methods in the ParserVisitor for the current JavaCC/JTree
generated parser.
Modified:
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ParserVisitor.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/visitor/BaseVisitor.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/visitor/NodeViewMode.java
Modified:
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ParserVisitor.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ParserVisitor.java?rev=329434&r1=329433&r2=329434&view=diff
==============================================================================
---
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ParserVisitor.java
(original)
+++
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ParserVisitor.java
Sat Oct 29 09:26:32 2005
@@ -20,6 +20,8 @@
{
public Object visit(SimpleNode node, Object data);
public Object visit(ASTprocess node, Object data);
+ public Object visit(ASTEscapedDirective node, Object data);
+ public Object visit(ASTEscape node, Object data);
public Object visit(ASTComment node, Object data);
public Object visit(ASTFloatingPointLiteral node, Object data);
public Object visit(ASTIntegerLiteral node, Object data);
@@ -28,7 +30,9 @@
public Object visit(ASTWord node, Object data);
public Object visit(ASTDirective node, Object data);
public Object visit(ASTBlock node, Object data);
+ public Object visit(ASTMap node, Object data);
public Object visit(ASTObjectArray node, Object data);
+ public Object visit(ASTIntegerRange node, Object data);
public Object visit(ASTMethod node, Object data);
public Object visit(ASTReference node, Object data);
public Object visit(ASTTrue node, Object data);
@@ -38,6 +42,7 @@
public Object visit(ASTElseStatement node, Object data);
public Object visit(ASTElseIfStatement node, Object data);
public Object visit(ASTSetDirective node, Object data);
+ public Object visit(ASTStop node, Object data);
public Object visit(ASTExpression node, Object data);
public Object visit(ASTAssignment node, Object data);
public Object visit(ASTOrNode node, Object data);
Modified:
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/visitor/BaseVisitor.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/visitor/BaseVisitor.java?rev=329434&r1=329433&r2=329434&view=diff
==============================================================================
---
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/visitor/BaseVisitor.java
(original)
+++
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/visitor/BaseVisitor.java
Sat Oct 29 09:26:32 2005
@@ -19,8 +19,48 @@
import java.io.Writer;
import org.apache.velocity.context.InternalContextAdapter;
-
-import org.apache.velocity.runtime.parser.node.*;
+import org.apache.velocity.runtime.parser.node.ASTAddNode;
+import org.apache.velocity.runtime.parser.node.ASTAndNode;
+import org.apache.velocity.runtime.parser.node.ASTAssignment;
+import org.apache.velocity.runtime.parser.node.ASTBlock;
+import org.apache.velocity.runtime.parser.node.ASTComment;
+import org.apache.velocity.runtime.parser.node.ASTDirective;
+import org.apache.velocity.runtime.parser.node.ASTDivNode;
+import org.apache.velocity.runtime.parser.node.ASTEQNode;
+import org.apache.velocity.runtime.parser.node.ASTElseIfStatement;
+import org.apache.velocity.runtime.parser.node.ASTElseStatement;
+import org.apache.velocity.runtime.parser.node.ASTEscape;
+import org.apache.velocity.runtime.parser.node.ASTEscapedDirective;
+import org.apache.velocity.runtime.parser.node.ASTExpression;
+import org.apache.velocity.runtime.parser.node.ASTFalse;
+import org.apache.velocity.runtime.parser.node.ASTFloatingPointLiteral;
+import org.apache.velocity.runtime.parser.node.ASTGENode;
+import org.apache.velocity.runtime.parser.node.ASTGTNode;
+import org.apache.velocity.runtime.parser.node.ASTIdentifier;
+import org.apache.velocity.runtime.parser.node.ASTIfStatement;
+import org.apache.velocity.runtime.parser.node.ASTIntegerLiteral;
+import org.apache.velocity.runtime.parser.node.ASTIntegerRange;
+import org.apache.velocity.runtime.parser.node.ASTLENode;
+import org.apache.velocity.runtime.parser.node.ASTLTNode;
+import org.apache.velocity.runtime.parser.node.ASTMap;
+import org.apache.velocity.runtime.parser.node.ASTMethod;
+import org.apache.velocity.runtime.parser.node.ASTModNode;
+import org.apache.velocity.runtime.parser.node.ASTMulNode;
+import org.apache.velocity.runtime.parser.node.ASTNENode;
+import org.apache.velocity.runtime.parser.node.ASTNotNode;
+import org.apache.velocity.runtime.parser.node.ASTObjectArray;
+import org.apache.velocity.runtime.parser.node.ASTOrNode;
+import org.apache.velocity.runtime.parser.node.ASTReference;
+import org.apache.velocity.runtime.parser.node.ASTSetDirective;
+import org.apache.velocity.runtime.parser.node.ASTStop;
+import org.apache.velocity.runtime.parser.node.ASTStringLiteral;
+import org.apache.velocity.runtime.parser.node.ASTSubtractNode;
+import org.apache.velocity.runtime.parser.node.ASTText;
+import org.apache.velocity.runtime.parser.node.ASTTrue;
+import org.apache.velocity.runtime.parser.node.ASTWord;
+import org.apache.velocity.runtime.parser.node.ASTprocess;
+import org.apache.velocity.runtime.parser.node.ParserVisitor;
+import org.apache.velocity.runtime.parser.node.SimpleNode;
/**
* This is the base class for all visitors.
@@ -261,6 +301,36 @@
public Object visit(ASTDirective node, Object data)
{
+ data = node.childrenAccept(this, data);
+ return data;
+ }
+
+ public Object visit(ASTEscapedDirective node, Object data)
+ {
+ data = node.childrenAccept(this, data);
+ return data;
+ }
+
+ public Object visit(ASTEscape node, Object data)
+ {
+ data = node.childrenAccept(this, data);
+ return data;
+ }
+
+ public Object visit(ASTMap node, Object data)
+ {
+ data = node.childrenAccept(this, data);
+ return data;
+ }
+
+ public Object visit(ASTIntegerRange node, Object data)
+ {
+ data = node.childrenAccept(this, data);
+ return data;
+ }
+
+ public Object visit(ASTStop node, Object data)
+ {
data = node.childrenAccept(this, data);
return data;
}
Modified:
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/visitor/NodeViewMode.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/visitor/NodeViewMode.java?rev=329434&r1=329433&r2=329434&view=diff
==============================================================================
---
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/visitor/NodeViewMode.java
(original)
+++
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/visitor/NodeViewMode.java
Sat Oct 29 09:26:32 2005
@@ -17,7 +17,47 @@
*/
import org.apache.velocity.runtime.parser.Token;
-import org.apache.velocity.runtime.parser.node.*;
+import org.apache.velocity.runtime.parser.node.ASTAddNode;
+import org.apache.velocity.runtime.parser.node.ASTAndNode;
+import org.apache.velocity.runtime.parser.node.ASTAssignment;
+import org.apache.velocity.runtime.parser.node.ASTBlock;
+import org.apache.velocity.runtime.parser.node.ASTDirective;
+import org.apache.velocity.runtime.parser.node.ASTDivNode;
+import org.apache.velocity.runtime.parser.node.ASTEQNode;
+import org.apache.velocity.runtime.parser.node.ASTElseIfStatement;
+import org.apache.velocity.runtime.parser.node.ASTElseStatement;
+import org.apache.velocity.runtime.parser.node.ASTEscape;
+import org.apache.velocity.runtime.parser.node.ASTEscapedDirective;
+import org.apache.velocity.runtime.parser.node.ASTExpression;
+import org.apache.velocity.runtime.parser.node.ASTFalse;
+import org.apache.velocity.runtime.parser.node.ASTFloatingPointLiteral;
+import org.apache.velocity.runtime.parser.node.ASTGENode;
+import org.apache.velocity.runtime.parser.node.ASTGTNode;
+import org.apache.velocity.runtime.parser.node.ASTIdentifier;
+import org.apache.velocity.runtime.parser.node.ASTIfStatement;
+import org.apache.velocity.runtime.parser.node.ASTIntegerLiteral;
+import org.apache.velocity.runtime.parser.node.ASTIntegerRange;
+import org.apache.velocity.runtime.parser.node.ASTLENode;
+import org.apache.velocity.runtime.parser.node.ASTLTNode;
+import org.apache.velocity.runtime.parser.node.ASTMap;
+import org.apache.velocity.runtime.parser.node.ASTMethod;
+import org.apache.velocity.runtime.parser.node.ASTModNode;
+import org.apache.velocity.runtime.parser.node.ASTMulNode;
+import org.apache.velocity.runtime.parser.node.ASTNENode;
+import org.apache.velocity.runtime.parser.node.ASTNotNode;
+import org.apache.velocity.runtime.parser.node.ASTObjectArray;
+import org.apache.velocity.runtime.parser.node.ASTOrNode;
+import org.apache.velocity.runtime.parser.node.ASTReference;
+import org.apache.velocity.runtime.parser.node.ASTSetDirective;
+import org.apache.velocity.runtime.parser.node.ASTStop;
+import org.apache.velocity.runtime.parser.node.ASTStringLiteral;
+import org.apache.velocity.runtime.parser.node.ASTSubtractNode;
+import org.apache.velocity.runtime.parser.node.ASTText;
+import org.apache.velocity.runtime.parser.node.ASTTrue;
+import org.apache.velocity.runtime.parser.node.ASTWord;
+import org.apache.velocity.runtime.parser.node.ASTprocess;
+import org.apache.velocity.runtime.parser.node.Node;
+import org.apache.velocity.runtime.parser.node.SimpleNode;
/**
* This class is simply a visitor implementation
@@ -278,6 +318,31 @@
public Object visit(ASTSetDirective node, Object data)
{
+ return showNode(node,data);
+ }
+
+ public Object visit(ASTEscapedDirective node, Object data)
+ {
+ return showNode(node,data);
+ }
+
+ public Object visit(ASTEscape node, Object data)
+ {
+ return showNode(node,data);
+ }
+
+ public Object visit(ASTMap node, Object data)
+ {
+ return showNode(node,data);
+ }
+
+ public Object visit(ASTIntegerRange node, Object data)
+ {
+ return showNode(node,data);
+ }
+
+ public Object visit(ASTStop node, Object data)
+ {
return showNode(node,data);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
