Author: cbrisson
Date: Thu Jul 21 20:38:04 2016
New Revision: 1753733
URL: http://svn.apache.org/viewvc?rev=1753733&view=rev
Log:
[engine] nicify SimpleTree.dump()
Modified:
velocity/engine/trunk/src/changes/changes.xml
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SimpleNode.java
Modified: velocity/engine/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/changes/changes.xml?rev=1753733&r1=1753732&r2=1753733&view=diff
==============================================================================
--- velocity/engine/trunk/src/changes/changes.xml (original)
+++ velocity/engine/trunk/src/changes/changes.xml Thu Jul 21 20:38:04 2016
@@ -27,6 +27,10 @@
<body>
<release version="2.0" date="In Subversion">
+ <action type="add" dev="cbrisson">
+ nicified AST tree debug output
+ </action>
+
<action type="fix" dev="cbrisson" issue=VELOCITY-830">
fix parsing of $obj._method()
</action>
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SimpleNode.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SimpleNode.java?rev=1753733&r1=1753732&r2=1753733&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SimpleNode.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SimpleNode.java
Thu Jul 21 20:38:04 2016
@@ -231,7 +231,7 @@ public class SimpleNode implements Node
*/
public String toString(String prefix)
{
- return prefix + toString();
+ return prefix + "_" + toString();
}
/**
@@ -242,15 +242,16 @@ public class SimpleNode implements Node
*/
public void dump(String prefix)
{
- System.out.println(toString(prefix));
+ System.out.println(toString());
if (children != null)
{
for (int i = 0; i < children.length; ++i)
{
SimpleNode n = (SimpleNode) children[i];
+ System.out.print(prefix + " |_");
if (n != null)
{
- n.dump(prefix + " ");
+ n.dump(prefix + ( i == children.length - 1 ? " " : " | "
));
}
}
}
@@ -431,10 +432,11 @@ public class SimpleNode implements Node
}
t = t.next;
}
-
- return "SimpleNode [id=" + id + ", info=" + info + ", invalid="
- + invalid + ", children=" + Arrays.toString(children)
- + ", tokens=" + tokens + "]";
+ String tok = tokens.toString();
+ if (tok.length() > 50) tok = tok.substring(0, 50) + "...";
+ return getClass().getSimpleName() + " [id=" + id + ", info=" + info +
", invalid="
+ + invalid
+ + ", tokens=" + tok + "]";
}
public String getTemplateName()
