You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by he...@apache.org on 2005/10/29 19:00:39 UTC
svn commit: r329445 - in /jakarta/velocity/core/trunk: build/
src/java/org/apache/velocity/runtime/directive/
src/java/org/apache/velocity/runtime/parser/
src/java/org/apache/velocity/runtime/parser/node/
Author: henning
Date: Sat Oct 29 10:00:14 2005
New Revision: 329445
URL: http://svn.apache.org/viewcvs?rev=329445&view=rev
Log:
Split the current node.Node into a velocity-specific node.Node which
extends the (almost generic) Node.
This currently looks ugly because both interfaces are called "Node" but is
kept deliberately because else it would break custom directives which use
...parser.node.Node as part of their method signature.
Added:
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Node.java (with props)
Modified:
jakarta/velocity/core/trunk/build/build.xml
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Foreach.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Include.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Literal.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Macro.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Parse.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/VMProxyArg.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAddNode.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAndNode.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTBlock.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTDivNode.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTEQNode.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTElseIfStatement.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTExpression.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTGENode.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTGTNode.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIfStatement.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIntegerRange.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTLENode.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTLTNode.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTMap.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTMethod.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTModNode.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTMulNode.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTNENode.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTNotNode.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTObjectArray.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTOrNode.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTReference.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTSubtractNode.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/Node.java
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/SimpleNode.java
Modified: jakarta/velocity/core/trunk/build/build.xml
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/build/build.xml?rev=329445&r1=329444&r2=329445&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/build/build.xml (original)
+++ jakarta/velocity/core/trunk/build/build.xml Sat Oct 29 10:00:14 2005
@@ -337,7 +337,6 @@
<target name="javacc-cleanup" depends="parser-check">
<delete>
<fileset dir="${build.parser}">
- <include name="Node.java"/>
<include name="ParserVisitor.java"/>
</fileset>
</delete>
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Foreach.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Foreach.java?rev=329445&r1=329444&r2=329445&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Foreach.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Foreach.java Sat Oct 29 10:00:14 2005
@@ -319,7 +319,7 @@
* else is context sensitive
*/
- SimpleNode sn = (SimpleNode) node.jjtGetChild(0);
+ SimpleNode sn = (SimpleNode) node.getChild(0);
if (sn instanceof ASTReference)
{
@@ -354,7 +354,7 @@
* do our introspection to see what our collection is
*/
- Object listObject = node.jjtGetChild(2).value(context);
+ Object listObject = node.getChild(2).value(context);
if (listObject == null)
return false;
@@ -407,11 +407,11 @@
// lazy instantiation
nullHolderContext = new NullHolderContext(elementKey, context);
}
- node.jjtGetChild(3).render(nullHolderContext, writer);
+ node.getChild(3).render(nullHolderContext, writer);
}
else
{
- node.jjtGetChild(3).render(context, writer);
+ node.getChild(3).render(context, writer);
}
counter++;
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Include.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Include.java?rev=329445&r1=329444&r2=329445&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Include.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Include.java Sat Oct 29 10:00:14 2005
@@ -129,7 +129,7 @@
* we only handle StringLiterals and References right now
*/
- Node n = node.jjtGetChild(i);
+ Node n = node.getChild(i);
if ( n.getType() == ParserTreeConstants.JJTSTRINGLITERAL ||
n.getType() == ParserTreeConstants.JJTREFERENCE )
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Literal.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Literal.java?rev=329445&r1=329444&r2=329445&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Literal.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Literal.java Sat Oct 29 10:00:14 2005
@@ -62,7 +62,7 @@
{
super.init( rs, context, node );
- literalText = node.jjtGetChild(0).literal();
+ literalText = node.getChild(0).literal();
}
/**
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Macro.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Macro.java?rev=329445&r1=329444&r2=329445&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Macro.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Macro.java Sat Oct 29 10:00:14 2005
@@ -146,7 +146,7 @@
* lets make sure that the first arg is an ASTWord
*/
- int firstType = node.jjtGetChild(0).getType();
+ int firstType = node.getChild(0).getType();
if(firstType != ParserTreeConstants.JJTWORD)
{
@@ -167,7 +167,7 @@
*/
List macroArray =
- getASTAsStringArray(node.jjtGetChild(numArgs - 1));
+ getASTAsStringArray(node.getChild(numArgs - 1));
/*
* make a big string out of our macro
@@ -227,7 +227,7 @@
while (i < numArgs)
{
- argArray[i] = node.jjtGetChild(i).getFirstToken().image;
+ argArray[i] = node.getChild(i).getFirstToken().image;
/*
* trim off the leading $ for the args after the macro name.
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Parse.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Parse.java?rev=329445&r1=329444&r2=329445&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Parse.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Parse.java Sat Oct 29 10:00:14 2005
@@ -83,7 +83,7 @@
/*
* did we get an argument?
*/
- if ( node.jjtGetChild(0) == null)
+ if ( node.getChild(0) == null)
{
rsvc.getLog().error("#parse() null argument");
return false;
@@ -92,7 +92,7 @@
/*
* does it have a value? If you have a null reference, then no.
*/
- Object value = node.jjtGetChild(0).value( context );
+ Object value = node.getChild(0).value( context );
if ( value == null)
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/VMProxyArg.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/VMProxyArg.java?rev=329445&r1=329444&r2=329445&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/VMProxyArg.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/VMProxyArg.java Sat Oct 29 10:00:14 2005
@@ -398,7 +398,7 @@
* now, our tree really is the first DirectiveArg(), and only one
*/
- nodeTree = (SimpleNode) nodeTree.jjtGetChild(0).jjtGetChild(0);
+ nodeTree = (SimpleNode) nodeTree.getChild(0).getChild(0);
/*
* sanity check
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java?rev=329445&r1=329444&r2=329445&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java Sat Oct 29 10:00:14 2005
@@ -345,20 +345,20 @@
* into macro body. So for each arg in the use-instance, treat the stringlierals specially...
*/
- callingArgTypes[i] = node.jjtGetChild(i).getType();
+ callingArgTypes[i] = node.getChild(i).getType();
- if (false && node.jjtGetChild(i).getType() == ParserTreeConstants.JJTSTRINGLITERAL )
+ if (false && node.getChild(i).getType() == ParserTreeConstants.JJTSTRINGLITERAL )
{
- args[i] += node.jjtGetChild(i).getFirstToken().image.substring(1, node.jjtGetChild(i).getFirstToken().image.length() - 1);
+ args[i] += node.getChild(i).getFirstToken().image.substring(1, node.getChild(i).getFirstToken().image.length() - 1);
}
else
{
/*
* just wander down the token list, concatenating everything together
*/
- t = node.jjtGetChild(i).getFirstToken();
- tLast = node.jjtGetChild(i).getLastToken();
+ t = node.getChild(i).getFirstToken();
+ tLast = node.getChild(i).getLastToken();
while( t != tLast )
{
Added: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Node.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Node.java?rev=329445&view=auto
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Node.java (added)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Node.java Sat Oct 29 10:00:14 2005
@@ -0,0 +1,53 @@
+package org.apache.velocity.runtime.parser;
+
+/*
+ * Copyright 2000-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License")
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.velocity.runtime.parser.node.ParserVisitor;
+
+/**
+ * This is the machine generated Node structure for the Parser.
+ */
+public interface Node
+{
+ /** This method is called after the node has been made the current
+ * node. It indicates that child nodes can now be added to it. */
+ public void jjtOpen();
+
+ /** This method is called after all the child nodes have been
+ added. */
+ public void jjtClose();
+
+ /** This pair of methods are used to inform the node of its
+ parent. */
+ public void jjtSetParent(Node n);
+
+ public Node jjtGetParent();
+
+ /** This method tells the node to add its argument to the node's
+ list of children. */
+ public void jjtAddChild(Node n, int i);
+
+ /** This method returns a child node. The children are numbered
+ from zero, left to right. */
+ public Node jjtGetChild(int i);
+
+ /** Return the number of children the node has. */
+ public int jjtGetNumChildren();
+
+ /** Accept the visitor. **/
+ public Object jjtAccept(ParserVisitor visitor, Object data);
+}
Propchange: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Node.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Node.java
------------------------------------------------------------------------------
svn:keywords = Id Author Date Revision
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAddNode.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAddNode.java?rev=329445&r1=329444&r2=329445&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAddNode.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAddNode.java Sat Oct 29 10:00:14 2005
@@ -65,8 +65,8 @@
* get the two addends
*/
- Object left = jjtGetChild(0).value(context);
- Object right = jjtGetChild(1).value(context);
+ Object left = getChild(0).value(context);
+ Object right = getChild(1).value(context);
/*
* if either is null, lets log and bail
@@ -76,7 +76,7 @@
{
log.error((left == null ? "Left" : "Right")
+ " side ("
- + jjtGetChild( (left == null? 0 : 1) ).literal()
+ + getChild( (left == null? 0 : 1) ).literal()
+ ") of addition operation has null value."
+ " Operation not possible. "
+ context.getCurrentTemplateName() + " [line " + getLine()
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAndNode.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAndNode.java?rev=329445&r1=329444&r2=329445&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAndNode.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAndNode.java Sat Oct 29 10:00:14 2005
@@ -67,8 +67,8 @@
public boolean evaluate( InternalContextAdapter context)
throws MethodInvocationException
{
- Node left = jjtGetChild(0);
- Node right = jjtGetChild(1);
+ Node left = getChild(0);
+ Node right = getChild(1);
/*
* if either is null, lets log and bail
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTBlock.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTBlock.java?rev=329445&r1=329444&r2=329445&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTBlock.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTBlock.java Sat Oct 29 10:00:14 2005
@@ -53,7 +53,7 @@
int i, k = jjtGetNumChildren();
for (i = 0; i < k; i++)
- jjtGetChild(i).render(context, writer);
+ getChild(i).render(context, writer);
return true;
}
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTDivNode.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTDivNode.java?rev=329445&r1=329444&r2=329445&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTDivNode.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTDivNode.java Sat Oct 29 10:00:14 2005
@@ -62,8 +62,8 @@
* get the two args
*/
- Object left = jjtGetChild(0).value( context );
- Object right = jjtGetChild(1).value( context );
+ Object left = getChild(0).value( context );
+ Object right = getChild(1).value( context );
/*
* if either is null, lets log and bail
@@ -73,7 +73,7 @@
{
log.error((left == null ? "Left" : "Right")
+ " side ("
- + jjtGetChild( (left == null? 0 : 1) ).literal()
+ + getChild( (left == null? 0 : 1) ).literal()
+ ") of division operation has null value."
+ " Operation not possible. "
+ context.getCurrentTemplateName()
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTEQNode.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTEQNode.java?rev=329445&r1=329444&r2=329445&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTEQNode.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTEQNode.java Sat Oct 29 10:00:14 2005
@@ -68,8 +68,8 @@
public boolean evaluate(InternalContextAdapter context)
throws MethodInvocationException
{
- Object left = jjtGetChild(0).value(context);
- Object right = jjtGetChild(1).value(context);
+ Object left = getChild(0).value(context);
+ Object right = getChild(1).value(context);
/*
* they could be null if they are references and not in the context
@@ -79,7 +79,7 @@
{
log.error((left == null ? "Left" : "Right")
+ " side ("
- + jjtGetChild( (left == null? 0 : 1) ).literal()
+ + getChild( (left == null? 0 : 1) ).literal()
+ ") of '==' operation "
+ "has null value. "
+ "If a reference, it may not be in the context."
@@ -132,7 +132,7 @@
log.error((left.toString() == null ? "Left" : "Right")
+ " string side "
+ "String representation ("
- + jjtGetChild( (left == null? 0 : 1) ).literal()
+ + getChild( (left == null? 0 : 1) ).literal()
+ ") of '!=' operation has null value."
+ " Operation not possible. "
+ context.getCurrentTemplateName() + " [line " + getLine()
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTElseIfStatement.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTElseIfStatement.java?rev=329445&r1=329444&r2=329445&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTElseIfStatement.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTElseIfStatement.java Sat Oct 29 10:00:14 2005
@@ -67,7 +67,7 @@
public boolean evaluate ( InternalContextAdapter context)
throws MethodInvocationException
{
- return jjtGetChild(0).evaluate(context);
+ return getChild(0).evaluate(context);
}
/**
@@ -77,6 +77,6 @@
throws IOException,MethodInvocationException,
ResourceNotFoundException, ParseErrorException
{
- return jjtGetChild(1).render( context, writer );
+ return getChild(1).render( context, writer );
}
}
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTExpression.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTExpression.java?rev=329445&r1=329444&r2=329445&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTExpression.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTExpression.java Sat Oct 29 10:00:14 2005
@@ -43,12 +43,12 @@
public boolean evaluate( InternalContextAdapter context)
throws MethodInvocationException
{
- return jjtGetChild(0).evaluate(context);
+ return getChild(0).evaluate(context);
}
public Object value( InternalContextAdapter context)
throws MethodInvocationException
{
- return jjtGetChild(0).value(context);
+ return getChild(0).value(context);
}
}
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTGENode.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTGENode.java?rev=329445&r1=329444&r2=329445&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTGENode.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTGENode.java Sat Oct 29 10:00:14 2005
@@ -59,8 +59,8 @@
* get the two args
*/
- Object left = jjtGetChild(0).value( context );
- Object right = jjtGetChild(1).value( context );
+ Object left = getChild(0).value( context );
+ Object right = getChild(1).value( context );
/*
* if either is null, lets log and bail
@@ -70,7 +70,7 @@
{
log.error((left == null ? "Left" : "Right")
+ " side ("
- + jjtGetChild( (left == null? 0 : 1) ).literal()
+ + getChild( (left == null? 0 : 1) ).literal()
+ ") of '>=' operation has null value."
+ " Operation not possible. "
+ context.getCurrentTemplateName() + " [line "
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTGTNode.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTGTNode.java?rev=329445&r1=329444&r2=329445&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTGTNode.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTGTNode.java Sat Oct 29 10:00:14 2005
@@ -58,8 +58,8 @@
* get the two args
*/
- Object left = jjtGetChild(0).value( context );
- Object right = jjtGetChild(1).value( context );
+ Object left = getChild(0).value( context );
+ Object right = getChild(1).value( context );
/*
* if either is null, lets log and bail
@@ -69,7 +69,7 @@
{
log.error((left == null ? "Left" : "Right")
+ " side ("
- + jjtGetChild( (left == null? 0 : 1) ).literal()
+ + getChild( (left == null? 0 : 1) ).literal()
+ ") of '>' operation has null value."
+ " Operation not possible. "
+ context.getCurrentTemplateName() + " [line "
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIfStatement.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIfStatement.java?rev=329445&r1=329444&r2=329445&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIfStatement.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIfStatement.java Sat Oct 29 10:00:14 2005
@@ -66,9 +66,9 @@
* if so render and leave immediately because there
* is nothing left to do!
*/
- if (jjtGetChild(0).evaluate(context))
+ if (getChild(0).evaluate(context))
{
- jjtGetChild(1).render(context, writer);
+ getChild(1).render(context, writer);
return true;
}
@@ -85,9 +85,9 @@
*/
for (int i = 2; i < totalNodes; i++)
{
- if (jjtGetChild(i).evaluate(context))
+ if (getChild(i).evaluate(context))
{
- jjtGetChild(i).render(context, writer);
+ getChild(i).render(context, writer);
return true;
}
}
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIntegerRange.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIntegerRange.java?rev=329445&r1=329444&r2=329445&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIntegerRange.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIntegerRange.java Sat Oct 29 10:00:14 2005
@@ -68,8 +68,8 @@
* get the two range ends
*/
- Object left = jjtGetChild(0).value( context );
- Object right = jjtGetChild(1).value( context );
+ Object left = getChild(0).value( context );
+ Object right = getChild(1).value( context );
/*
* if either is null, lets log and bail
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTLENode.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTLENode.java?rev=329445&r1=329444&r2=329445&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTLENode.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTLENode.java Sat Oct 29 10:00:14 2005
@@ -59,8 +59,8 @@
* get the two args
*/
- Object left = jjtGetChild(0).value( context );
- Object right = jjtGetChild(1).value( context );
+ Object left = getChild(0).value( context );
+ Object right = getChild(1).value( context );
/*
* if either is null, lets log and bail
@@ -70,7 +70,7 @@
{
log.error((left == null ? "Left" : "Right")
+ " side ("
- + jjtGetChild( (left == null? 0 : 1) ).literal()
+ + getChild( (left == null? 0 : 1) ).literal()
+ ") of '<=' operation has null value."
+ " Operation not possible. "
+ context.getCurrentTemplateName() + " [line "
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTLTNode.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTLTNode.java?rev=329445&r1=329444&r2=329445&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTLTNode.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTLTNode.java Sat Oct 29 10:00:14 2005
@@ -59,8 +59,8 @@
* get the two args
*/
- Object left = jjtGetChild(0).value( context );
- Object right = jjtGetChild(1).value( context );
+ Object left = getChild(0).value( context );
+ Object right = getChild(1).value( context );
/*
* if either is null, lets log and bail
@@ -70,7 +70,7 @@
{
log.error((left == null ? "Left" : "Right")
+ " side ("
- + jjtGetChild( (left == null? 0 : 1) ).literal()
+ + getChild( (left == null? 0 : 1) ).literal()
+ ") of '<' operation has null value."
+ " Operation not possible. "
+ context.getCurrentTemplateName() + " [line "
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTMap.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTMap.java?rev=329445&r1=329444&r2=329445&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTMap.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTMap.java Sat Oct 29 10:00:14 2005
@@ -63,8 +63,8 @@
for (int i = 0; i < size; i += 2)
{
- SimpleNode keyNode = (SimpleNode) jjtGetChild(i);
- SimpleNode valueNode = (SimpleNode) jjtGetChild(i+1);
+ SimpleNode keyNode = (SimpleNode) getChild(i);
+ SimpleNode valueNode = (SimpleNode) getChild(i+1);
Object key = (keyNode == null ? null : keyNode.value(context));
Object value = (valueNode == null ? null : valueNode.value(context));
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTMethod.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTMethod.java?rev=329445&r1=329444&r2=329445&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTMethod.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTMethod.java Sat Oct 29 10:00:14 2005
@@ -112,7 +112,7 @@
for (int j = 0; j < paramCount; j++)
{
- params[j] = jjtGetChild(j + 1).value(context);
+ params[j] = getChild(j + 1).value(context);
if (params[j] != null)
{
@@ -150,7 +150,7 @@
*/
for (int j = 0; j < paramCount; j++)
- params[j] = jjtGetChild(j + 1).value(context);
+ params[j] = getChild(j + 1).value(context);
method = rsvc.getUberspect().getMethod(o, methodName, params, new Info(context.getCurrentTemplateName(), getLine(), getColumn()));
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTModNode.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTModNode.java?rev=329445&r1=329444&r2=329445&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTModNode.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTModNode.java Sat Oct 29 10:00:14 2005
@@ -60,8 +60,8 @@
* get the two args
*/
- Object left = jjtGetChild(0).value( context );
- Object right = jjtGetChild(1).value( context );
+ Object left = getChild(0).value( context );
+ Object right = getChild(1).value( context );
/*
* if either is null, lets log and bail
@@ -71,7 +71,7 @@
{
log.error((left == null ? "Left" : "Right")
+ " side ("
- + jjtGetChild( (left == null? 0 : 1) ).literal()
+ + getChild( (left == null? 0 : 1) ).literal()
+ ") of modulus operation has null value."
+ " Operation not possible. "
+ context.getCurrentTemplateName() + " [line " + getLine()
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTMulNode.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTMulNode.java?rev=329445&r1=329444&r2=329445&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTMulNode.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTMulNode.java Sat Oct 29 10:00:14 2005
@@ -63,8 +63,8 @@
* get the two args
*/
- Object left = jjtGetChild(0).value( context );
- Object right = jjtGetChild(1).value( context );
+ Object left = getChild(0).value( context );
+ Object right = getChild(1).value( context );
/*
* if either is null, lets log and bail
@@ -74,7 +74,7 @@
{
log.error((left == null ? "Left" : "Right")
+ " side ("
- + jjtGetChild( (left == null? 0 : 1) ).literal()
+ + getChild( (left == null? 0 : 1) ).literal()
+ ") of multiplication operation has null value."
+ " Operation not possible. "
+ context.getCurrentTemplateName() + " [line " + getLine()
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTNENode.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTNENode.java?rev=329445&r1=329444&r2=329445&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTNENode.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTNENode.java Sat Oct 29 10:00:14 2005
@@ -53,8 +53,8 @@
public boolean evaluate( InternalContextAdapter context)
throws MethodInvocationException
{
- Object left = jjtGetChild(0).value( context );
- Object right = jjtGetChild(1).value( context );
+ Object left = getChild(0).value( context );
+ Object right = getChild(1).value( context );
/*
* null check
@@ -64,7 +64,7 @@
{
log.error((left == null ? "Left" : "Right")
+ " side ("
- + jjtGetChild( (left == null? 0 : 1) ).literal()
+ + getChild( (left == null? 0 : 1) ).literal()
+ ") of '!=' operation has null value."
+ " Operation not possible. "
+ context.getCurrentTemplateName() + " [line " + getLine()
@@ -114,7 +114,7 @@
log.error((left.toString() == null ? "Left" : "Right")
+ " string side "
+ "String representation ("
- + jjtGetChild( (left == null? 0 : 1) ).literal()
+ + getChild( (left == null? 0 : 1) ).literal()
+ ") of '!=' operation has null value."
+ " Operation not possible. "
+ context.getCurrentTemplateName() + " [line " + getLine()
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTNotNode.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTNotNode.java?rev=329445&r1=329444&r2=329445&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTNotNode.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTNotNode.java Sat Oct 29 10:00:14 2005
@@ -44,7 +44,7 @@
public boolean evaluate( InternalContextAdapter context)
throws MethodInvocationException
{
- if (jjtGetChild(0).evaluate(context))
+ if (getChild(0).evaluate(context))
return false;
else
return true;
@@ -53,6 +53,6 @@
public Object value( InternalContextAdapter context)
throws MethodInvocationException
{
- return (jjtGetChild(0).evaluate( context ) ? Boolean.FALSE : Boolean.TRUE) ;
+ return (getChild(0).evaluate( context ) ? Boolean.FALSE : Boolean.TRUE) ;
}
}
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTObjectArray.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTObjectArray.java?rev=329445&r1=329444&r2=329445&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTObjectArray.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTObjectArray.java Sat Oct 29 10:00:14 2005
@@ -52,7 +52,7 @@
for (int i = 0; i < size; i++)
{
- objectArray.add( jjtGetChild(i).value(context) );
+ objectArray.add( getChild(i).value(context) );
}
return objectArray;
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTOrNode.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTOrNode.java?rev=329445&r1=329444&r2=329445&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTOrNode.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTOrNode.java Sat Oct 29 10:00:14 2005
@@ -70,8 +70,8 @@
public boolean evaluate( InternalContextAdapter context)
throws MethodInvocationException
{
- Node left = jjtGetChild(0);
- Node right = jjtGetChild(1);
+ Node left = getChild(0);
+ Node right = getChild(1);
/*
* if the left is not null and true, then true
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTReference.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTReference.java?rev=329445&r1=329444&r2=329445&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTReference.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTReference.java Sat Oct 29 10:00:14 2005
@@ -108,7 +108,7 @@
if (numChildren > 0 )
{
- identifier = jjtGetChild(numChildren - 1).getFirstToken().image;
+ identifier = getChild(numChildren - 1).getFirstToken().image;
}
/*
@@ -170,7 +170,7 @@
{
for (int i = 0; i < numChildren; i++)
{
- result = jjtGetChild(i).execute(result,context);
+ result = getChild(i).execute(result,context);
}
return result;
@@ -371,7 +371,7 @@
for (int i = 0; i < numChildren - 1; i++)
{
- result = jjtGetChild(i).execute(result, context);
+ result = getChild(i).execute(result, context);
if (result == null)
{
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java?rev=329445&r1=329444&r2=329445&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java Sat Oct 29 10:00:14 2005
@@ -140,7 +140,7 @@
*/
private ASTReference getLeftHandSide()
{
- return (ASTReference) jjtGetChild(0);
+ return (ASTReference) getChild(0);
// return (ASTReference) jjtGetChild(0).jjtGetChild(0).jjtGetChild(0);
}
@@ -150,7 +150,7 @@
*/
private Node getRightHandSide()
{
- return jjtGetChild(1);
+ return getChild(1);
// return jjtGetChild(0).jjtGetChild(0).jjtGetChild(1).jjtGetChild(0);
}
}
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTSubtractNode.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTSubtractNode.java?rev=329445&r1=329444&r2=329445&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTSubtractNode.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTSubtractNode.java Sat Oct 29 10:00:14 2005
@@ -64,8 +64,8 @@
* get the two args
*/
- Object left = jjtGetChild(0).value( context );
- Object right = jjtGetChild(1).value( context );
+ Object left = getChild(0).value( context );
+ Object right = getChild(1).value( context );
/*
* if either is null, lets log and bail
@@ -75,7 +75,7 @@
{
log.error((left == null ? "Left" : "Right")
+ " side ("
- + jjtGetChild( (left == null? 0 : 1) ).literal()
+ + getChild( (left == null? 0 : 1) ).literal()
+ ") of subtraction operation has null value."
+ " Operation not possible. "
+ context.getCurrentTemplateName() + " [line " + getLine()
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/Node.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/Node.java?rev=329445&r1=329444&r2=329445&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/Node.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/Node.java Sat Oct 29 10:00:14 2005
@@ -34,44 +34,13 @@
*/
public interface Node
+ extends org.apache.velocity.runtime.parser.Node
{
-
- /**
- * This method is called after the node has been made the current
- * node. It indicates that child nodes can now be added to it.
- */
- public void jjtOpen();
-
- /**
- * This method is called after all the child nodes have been
- * added.
- */
- public void jjtClose();
-
- /**
- * This pair of methods are used to inform the node of its
- * parent.
- */
- public void jjtSetParent(Node n);
- public Node jjtGetParent();
-
- /**
- * This method tells the node to add its argument to the node's
- * list of children.
- */
- public void jjtAddChild(Node n, int i);
-
/**
* This method returns a child node. The children are numbered
* from zero, left to right.
*/
- public Node jjtGetChild(int i);
-
- /** Return the number of children the node has. */
- public int jjtGetNumChildren();
-
- /** Accept the visitor. **/
- public Object jjtAccept(ParserVisitor visitor, Object data);
+ public Node getChild(int i);
public Object childrenAccept(ParserVisitor visitor, Object data);
Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/SimpleNode.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/SimpleNode.java?rev=329445&r1=329444&r2=329445&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/SimpleNode.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/SimpleNode.java Sat Oct 29 10:00:14 2005
@@ -84,16 +84,16 @@
return last;
}
- public void jjtSetParent(Node n)
+ public void jjtSetParent(org.apache.velocity.runtime.parser.Node n)
{
- parent = n;
+ parent = (Node) n;
}
- public Node jjtGetParent()
+ public org.apache.velocity.runtime.parser.Node jjtGetParent()
{
return parent;
}
- public void jjtAddChild(Node n, int i)
+ public void jjtAddChild(org.apache.velocity.runtime.parser.Node n, int i)
{
if (children == null)
{
@@ -105,10 +105,15 @@
System.arraycopy(children, 0, c, 0, children.length);
children = c;
}
- children[i] = n;
+ children[i] = (Node) n;
}
- public Node jjtGetChild(int i)
+ public org.apache.velocity.runtime.parser.Node jjtGetChild(int i)
+ {
+ return getChild(i);
+ }
+
+ public Node getChild(int i)
{
return children[i];
}
@@ -202,7 +207,7 @@
{
try
{
- jjtGetChild(i).init( context, data);
+ getChild(i).init( context, data);
}
catch (ReferenceException re)
{
@@ -231,7 +236,7 @@
int i, k = jjtGetNumChildren();
for (i = 0; i < k; i++)
- jjtGetChild(i).render(context, writer);
+ getChild(i).render(context, writer);
return true;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org