jvanzyl 00/11/02 11:33:19
Modified: src/java/org/apache/velocity/runtime/parser/node
ASTReference.java SimpleNode.java
Log:
- cleaning up the way the end of a reference is marked so that
when a reference evaluates to null that full reference literal
can be extracted for logging. right when nested references cause
an error the full reference literal isn't reported correctly.
Revision Changes Path
1.6 +6 -0
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTReference.java
Index: ASTReference.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTReference.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ASTReference.java 2000/10/27 05:14:48 1.5
+++ ASTReference.java 2000/11/02 19:33:08 1.6
@@ -41,6 +41,12 @@
return visitor.visit(this, data);
}
+ public void jjtClose()
+ {
+ super.jjtClose();
+ last.last = true;
+ }
+
public Object init(Context context, Object data) throws Exception
{
rootString = getRoot();
1.6 +0 -3
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/SimpleNode.java
Index: SimpleNode.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/SimpleNode.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SimpleNode.java 2000/10/21 01:59:22 1.5
+++ SimpleNode.java 2000/11/02 19:33:09 1.6
@@ -43,9 +43,6 @@
public void jjtClose()
{
last = parser.getToken(0); // added
-
- if (id == ParserTreeConstants.JJTREFERENCE)
- last.last = true;
}
public void setFirstToken(Token t)
