[VELOCITY-977] Upgrade Java Compiler Compiler to Version 7.0.13upstream-master

author: Sylwester Lachiewicz <slachiewicz@apache.org> 2024-02-16 22:09:43 +0100
committer: Sylwester Lachiewicz <slachiewicz@apache.org> 2024-03-14 00:24:53 +0100
commit: 86cfcf41105f8a25db11ca6483e33c20fc0804d9 (patch)
tree: e3e002e8a3241ce90414012c2943523a3fd5f79b
parent: d01540079096b68e99c3d67a1578433d3a8fb8d1 (diff)
download: apache-velocity-engine-upstream-master.tar.gz
56 files changed, 180 insertions, 589 deletions
diff --git a/.gitignore b/.gitignore
index d4c08857..663439a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,13 +14,4 @@ bin
 # OSX
 .DS_Store
 
-# Generated sources
-velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/JJTParserState.java
-velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/Parser.java
-velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/ParserConstants.java
-velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/ParserTokenManager.java
-velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/ParserTreeConstants.java
-velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/Token.java
-velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/TokenMgrError.java
-
 .java-version
diff --git a/pom.xml b/pom.xml
index 55557f40..60072a39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,9 +94,9 @@
                     </executions>
                 </plugin>
                 <plugin>
-                    <groupId>com.google.code.maven-replacer-plugin</groupId>
-                    <artifactId>replacer</artifactId>
-                    <version>1.5.3</version>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>javacc-maven-plugin</artifactId>
+                    <version>3.1.0</version>
                 </plugin>
             </plugins>
         </pluginManagement>
diff --git a/velocity-custom-parser-example/pom.xml b/velocity-custom-parser-example/pom.xml
index 784a2065..d2535b2b 100644
--- a/velocity-custom-parser-example/pom.xml
+++ b/velocity-custom-parser-example/pom.xml
@@ -140,7 +140,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>javacc-maven-plugin</artifactId>
-                <version>2.6</version>
                 <configuration>
                     <isStatic>false</isStatic>
                     <buildParser>true</buildParser>
@@ -209,34 +208,6 @@
                 </executions>
             </plugin>
 
-            <!-- add missing imports to some parser generated files -->
-            <plugin>
-                <groupId>com.google.code.maven-replacer-plugin</groupId>
-                <artifactId>replacer</artifactId>
-                <executions>
-                    <execution>
-                        <id>patch-parser-files</id>
-                        <phase>process-sources</phase>
-                        <goals>
-                            <goal>replace</goal>
-                        </goals>
-                        <configuration>
-                            <includes>
-                                <include>${project.build.directory}/generated-sources/jjtree/**/JJT${parser.basename}ParserState.java</include>
-                                <include>${project.build.directory}/generated-sources/jjtree/**/${parser.basename}ParserVisitor.java</include>
-                            </includes>
-                            <replacements>
-                                <replacement>
-                                    <token>import ${parser.package}.*;</token>
-                                    <value>import ${parser.package}.*;
-import org.apache.velocity.runtime.parser.node.*;</value>
-                                </replacement>
-                            </replacements>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
             <!-- tests -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/velocity-engine-core/pom.xml b/velocity-engine-core/pom.xml
index 52ad120f..1fe6fba3 100644
--- a/velocity-engine-core/pom.xml
+++ b/velocity-engine-core/pom.xml
@@ -108,7 +108,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>javacc-maven-plugin</artifactId>
-                <version>2.6</version>
                 <configuration>
                     <isStatic>false</isStatic>
                     <buildParser>true</buildParser>
@@ -117,7 +116,6 @@
                     <debugParser>${parser.debug}</debugParser>
                     <debugLookAhead>${parser.debug}</debugLookAhead>
                     <debugTokenManager>${parser.debug}</debugTokenManager>
-                    <jdkVersion>${maven.compiler.target}</jdkVersion>
                     <nodeUsesParser>true</nodeUsesParser>
                     <nodePackage>org.apache.velocity.runtime.parser.node</nodePackage>
                     <sourceDirectory>${project.build.directory}/parser</sourceDirectory>
@@ -139,29 +137,6 @@
                 </executions>
             </plugin>
 
-            <!-- post-processing of parser genereted source files -->
-            <plugin>
-                <groupId>com.google.code.maven-replacer-plugin</groupId>
-                <artifactId>replacer</artifactId>
-                <executions>
-                    <execution>
-                        <id>patch-parser-files</id>
-                        <phase>process-sources</phase>
-                        <goals>
-                            <goal>replace</goal>
-                        </goals>
-                        <configuration>
-                            <file>${project.build.directory}/generated-sources/javacc/org/apache/velocity/runtime/parser/TokenMgrError.java</file>
-                            <replacements>
-                                <replacement>
-                                    <token>static final int</token>
-                                    <value>public static final int</value>
-                                </replacement>
-                            </replacements>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
 
             <!-- handle VelocityEngineVersion file -->
             <plugin>
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Define.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Define.java
index f1e90f6a..fd653bc5 100755
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Define.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Define.java
@@ -27,7 +27,7 @@ import org.apache.velocity.runtime.RuntimeServices;
 import org.apache.velocity.runtime.parser.ParseException;
 import org.apache.velocity.runtime.parser.Token;
 import org.apache.velocity.runtime.parser.node.Node;
-import org.apache.velocity.runtime.parser.node.ParserTreeConstants;
+import org.apache.velocity.runtime.parser.node.StandardParserTreeConstants;
 import org.apache.velocity.util.StringUtils;
 
 import java.io.Writer;
@@ -112,7 +112,7 @@ public class Define extends Block
              templateName, t);
       }
 
-      if (argtypes.get(0) == ParserTreeConstants.JJTWORD)
+      if (argtypes.get(0) == StandardParserTreeConstants.JJTWORD)
       {
           throw new MacroParseException("The argument to #define is of the wrong type",
               templateName, t);
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Directive.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Directive.java
index 9d938f78..b6c04449 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Directive.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Directive.java
@@ -170,7 +170,7 @@ public abstract class Directive implements DirectiveConstants, Cloneable
      * checking.  We do this so that Custom directives do not trigger any parse
      * errors in IDEs.
      * @param argtypes type, Array of argument types of each argument to the directive
-     * for example ParserTreeConstants.JJTWORD
+     * for example StandardParserTreeConstants.JJTWORD
      * @param t token of directive
      * @param templateName the name of the template this directive is referenced in.
      * @throws ParseException
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Evaluate.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Evaluate.java
index 89ccdb6b..e6c2aa28 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Evaluate.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Evaluate.java
@@ -28,8 +28,8 @@ import org.apache.velocity.exception.TemplateInitException;
 import org.apache.velocity.runtime.RuntimeServices;
 import org.apache.velocity.runtime.parser.ParseException;
 import org.apache.velocity.runtime.parser.node.Node;
-import org.apache.velocity.runtime.parser.node.ParserTreeConstants;
 import org.apache.velocity.runtime.parser.node.SimpleNode;
+import org.apache.velocity.runtime.parser.node.StandardParserTreeConstants;
 import org.apache.velocity.util.introspection.Info;
 
 import java.io.IOException;
@@ -112,8 +112,8 @@ public class Evaluate extends Directive
         }
 
         Node childNode = node.jjtGetChild(0);
-        if ( childNode.getType() !=  ParserTreeConstants.JJTSTRINGLITERAL &&
-             childNode.getType() !=  ParserTreeConstants.JJTREFERENCE )
+        if ( childNode.getType() !=  StandardParserTreeConstants.JJTSTRINGLITERAL &&
+             childNode.getType() !=  StandardParserTreeConstants.JJTREFERENCE )
         {
            throw new TemplateInitException(
                    "#" + getName() + "()  argument must be a string literal or reference",
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Foreach.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Foreach.java
index 991e097a..3a356157 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Foreach.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Foreach.java
@@ -341,17 +341,17 @@ public class Foreach extends Directive
             throw new MacroParseException("Too few arguments to the #foreach directive",
               templateName, t);
         }
-        else if (argtypes.get(0) != ParserTreeConstants.JJTREFERENCE)
+        else if (argtypes.get(0) != StandardParserTreeConstants.JJTREFERENCE)
         {
             throw new MacroParseException("Expected argument 1 of #foreach to be a reference",
                 templateName, t);
         }
-        else if (argtypes.get(1) != ParserTreeConstants.JJTWORD)
+        else if (argtypes.get(1) != StandardParserTreeConstants.JJTWORD)
         {
             throw new MacroParseException("Expected word 'in' at argument position 2 in #foreach",
                 templateName, t);
         }
-        else if (argtypes.get(2) == ParserTreeConstants.JJTWORD)
+        else if (argtypes.get(2) == StandardParserTreeConstants.JJTWORD)
         {
             throw new MacroParseException("Argument 3 of #foreach is of the wrong type",
                 templateName, t);
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Include.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Include.java
index 1e1abd7b..1a333597 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Include.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Include.java
@@ -28,7 +28,7 @@ import org.apache.velocity.exception.VelocityException;
 import org.apache.velocity.runtime.RuntimeConstants;
 import org.apache.velocity.runtime.RuntimeServices;
 import org.apache.velocity.runtime.parser.node.Node;
-import org.apache.velocity.runtime.parser.node.ParserTreeConstants;
+import org.apache.velocity.runtime.parser.node.StandardParserTreeConstants;
 import org.apache.velocity.runtime.resource.Resource;
 import org.apache.velocity.util.StringUtils;
 
@@ -163,8 +163,8 @@ public class Include extends InputBase
 
             Node n = node.jjtGetChild(i);
 
-            if ( n.getType() ==  ParserTreeConstants.JJTSTRINGLITERAL ||
-                 n.getType() ==  ParserTreeConstants.JJTREFERENCE )
+            if ( n.getType() ==  StandardParserTreeConstants.JJTSTRINGLITERAL ||
+                 n.getType() ==  StandardParserTreeConstants.JJTREFERENCE )
             {
                 if (!renderOutput( n, context, writer ))
                     outputErrorToStream( writer, "error with arg " + i
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Macro.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Macro.java
index 973c3358..65a21527 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Macro.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Macro.java
@@ -25,7 +25,7 @@ import org.apache.velocity.runtime.RuntimeServices;
 import org.apache.velocity.runtime.parser.ParseException;
 import org.apache.velocity.runtime.parser.Token;
 import org.apache.velocity.runtime.parser.node.Node;
-import org.apache.velocity.runtime.parser.node.ParserTreeConstants;
+import org.apache.velocity.runtime.parser.node.StandardParserTreeConstants;
 
 import java.io.IOException;
 import java.io.Writer;
@@ -139,7 +139,7 @@ public class Macro extends Directive
         /*
          *  lets make sure that the first arg is an ASTWord
          */
-        if(argtypes.get(0) != ParserTreeConstants.JJTWORD)
+        if(argtypes.get(0) != StandardParserTreeConstants.JJTWORD)
         {
             throw new MacroParseException("Macro argument 1"
                     + " must be a token without surrounding \' or \""
@@ -157,7 +157,7 @@ public class Macro extends Directive
         // value is specified.
         for (int argPos = 1; argPos < argtypes.size(); argPos++)
         {
-            if (argtypes.get(argPos) == ParserTreeConstants.JJTDIRECTIVEASSIGN)
+            if (argtypes.get(argPos) == StandardParserTreeConstants.JJTDIRECTIVEASSIGN)
             {
                // Absorb next argument type since parser enforces that these are in
                // pairs, and we don't need to check the type of the second
@@ -165,7 +165,7 @@ public class Macro extends Directive
                argPos++;
                consecutive = true;
             }
-            else if (argtypes.get(argPos) != ParserTreeConstants.JJTREFERENCE)
+            else if (argtypes.get(argPos) != StandardParserTreeConstants.JJTREFERENCE)
             {
                 throw new MacroParseException("Macro argument " + (argPos + 1)
                   + " must be a reference", templateName, t);
@@ -206,7 +206,7 @@ public class Macro extends Directive
         {
             Node curnode = node.jjtGetChild(i);
             MacroArg macroArg = new MacroArg();
-            if (curnode.getType() == ParserTreeConstants.JJTDIRECTIVEASSIGN)
+            if (curnode.getType() == StandardParserTreeConstants.JJTDIRECTIVEASSIGN)
             {
                 // This is an argument with a default value
             	macroArg.name = curnode.getFirstTokenImage();
@@ -290,5 +290,5 @@ public class Macro extends Directive
         ret.append(" )");
         return ret;
     }
-    
+
 }
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Parse.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Parse.java
index 06dbf13b..23133548 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Parse.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Parse.java
@@ -32,8 +32,8 @@ import org.apache.velocity.runtime.RuntimeServices;
 import org.apache.velocity.runtime.parser.ParseException;
 import org.apache.velocity.runtime.parser.Token;
 import org.apache.velocity.runtime.parser.node.Node;
-import org.apache.velocity.runtime.parser.node.ParserTreeConstants;
 import org.apache.velocity.runtime.parser.node.SimpleNode;
+import org.apache.velocity.runtime.parser.node.StandardParserTreeConstants;
 import org.apache.velocity.util.StringUtils;
 
 import java.io.IOException;
@@ -336,7 +336,7 @@ public class Parse extends InputBase
                templateName, t);
         }
 
-        if (argtypes.get(0) == ParserTreeConstants.JJTWORD)
+        if (argtypes.get(0) == StandardParserTreeConstants.JJTWORD)
         {
             throw new MacroParseException("The argument to #" + getName() + " is of the wrong type",
                 templateName, t);
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/RuntimeMacro.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/RuntimeMacro.java
index 95ddb165..c6a43386 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/RuntimeMacro.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/RuntimeMacro.java
@@ -33,7 +33,7 @@ import org.apache.velocity.runtime.RuntimeServices;
 import org.apache.velocity.runtime.parser.Token;
 import org.apache.velocity.runtime.parser.node.ASTDirective;
 import org.apache.velocity.runtime.parser.node.Node;
-import org.apache.velocity.runtime.parser.node.ParserTreeConstants;
+import org.apache.velocity.runtime.parser.node.StandardParserTreeConstants;
 import org.apache.velocity.util.StringUtils;
 
 import org.apache.commons.lang3.Validate;
@@ -153,7 +153,7 @@ public class RuntimeMacro extends Directive
         for (int n=0; n < node.jjtGetNumChildren(); n++)
         {
             Node child = node.jjtGetChild(n);
-            if (child.getType() == ParserTreeConstants.JJTWORD)
+            if (child.getType() == StandardParserTreeConstants.JJTWORD)
             {
                 badArgsErrorMsg = "Invalid arg '" + child.getFirstTokenImage()
                 + "' in macro #" + macroName + " at " + StringUtils.formatFileString(child);
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/contrib/For.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/contrib/For.java
index aaefae9b..6da8252e 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/contrib/For.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/contrib/For.java
@@ -28,7 +28,7 @@ import org.apache.velocity.runtime.parser.ParseException;
 import org.apache.velocity.runtime.parser.Token;
 import org.apache.velocity.runtime.parser.node.ASTReference;
 import org.apache.velocity.runtime.parser.node.Node;
-import org.apache.velocity.runtime.parser.node.ParserTreeConstants;
+import org.apache.velocity.runtime.parser.node.StandardParserTreeConstants;
 
 import java.io.IOException;
 import java.io.Writer;
@@ -124,14 +124,14 @@ public class For extends Foreach
     // $var' combo.
     if (argtypes.size() > 3)
     {
-      if (argtypes.get(3) != ParserTreeConstants.JJTWORD)
+      if (argtypes.get(3) != StandardParserTreeConstants.JJTWORD)
       {
         throw new MacroParseException(
             "Expected word 'index' at argument position 4 in #foreach",
             templateName, t);
       }
       else if (argtypes.size() == 4
-          || argtypes.get(4) != ParserTreeConstants.JJTREFERENCE)
+          || argtypes.get(4) != StandardParserTreeConstants.JJTREFERENCE)
       {
         throw new MacroParseException(
             "Expected a reference after 'index' in #foreach", templateName, t);
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTAndNode.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTAndNode.java
index 2338d40f..9e01549f 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTAndNode.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTAndNode.java
@@ -57,10 +57,10 @@ public class ASTAndNode extends ASTLogicalOperator
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.StandardParserVisitor, java.lang.Object)
      */
     @Override
-    public Object jjtAccept(ParserVisitor visitor, Object data)
+    public Object jjtAccept(StandardParserVisitor visitor, Object data)
     {
         return visitor.visit(this, data);
     }
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTAssignment.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTAssignment.java
index 2cc2973d..1ea72b8b 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTAssignment.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTAssignment.java
@@ -46,10 +46,10 @@ public class ASTAssignment extends SimpleNode
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.StandardParserVisitor, java.lang.Object)
      */
     @Override
-    public Object jjtAccept(ParserVisitor visitor, Object data)
+    public Object jjtAccept(StandardParserVisitor visitor, Object data)
     {
         return visitor.visit(this, data);
     }
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTBlock.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTBlock.java
index c8358ed5..e075a1a0 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTBlock.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTBlock.java
@@ -65,10 +65,10 @@ public class ASTBlock extends SimpleNode
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.StandardParserVisitor, java.lang.Object)
      */
     @Override
-    public Object jjtAccept(ParserVisitor visitor, Object data)
+    public Object jjtAccept(StandardParserVisitor visitor, Object data)
     {
         return visitor.visit(this, data);
     }
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTComment.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTComment.java
index b2d3ba2a..331e4065 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTComment.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTComment.java
@@ -59,10 +59,10 @@ public class ASTComment extends SimpleNode
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.StandardParserVisitor, java.lang.Object)
      */
     @Override
-    public Object jjtAccept(ParserVisitor visitor, Object data)
+    public Object jjtAccept(StandardParserVisitor visitor, Object data)
     {
         return visitor.visit(this, data);
     }
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTComparisonNode.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTComparisonNode.java
index 721aa23d..88656ecc 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTComparisonNode.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTComparisonNode.java
@@ -55,10 +55,10 @@ public abstract class ASTComparisonNode extends ASTBinaryOperator
 
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.StandardParserVisitor, java.lang.Object)
      */
     @Override
-    public Object jjtAccept(ParserVisitor visitor, Object data)
+    public Object jjtAccept(StandardParserVisitor visitor, Object data)
     {
         return visitor.visit(this, data);
     }
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTDirective.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTDirective.java
index 925edf45..9d19f218 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTDirective.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTDirective.java
@@ -86,10 +86,10 @@ public class ASTDirective extends SimpleNode
 
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.StandardParserVisitor, java.lang.Object)
      */
     @Override
-    public Object jjtAccept(ParserVisitor visitor, Object data)
+    public Object jjtAccept(StandardParserVisitor visitor, Object data)
     {
         return visitor.visit(this, data);
     }
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTElseIfStatement.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTElseIfStatement.java
index 78334c33..2392f2cd 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTElseIfStatement.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTElseIfStatement.java
@@ -71,10 +71,10 @@ public class ASTElseIfStatement extends SimpleNode
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.StandardParserVisitor, java.lang.Object)
      */
     @Override
-    public Object jjtAccept(ParserVisitor visitor, Object data)
+    public Object jjtAccept(StandardParserVisitor visitor, Object data)
     {
         return visitor.visit(this, data);
     }
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTElseStatement.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTElseStatement.java
index 378501cd..1c7d7700 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTElseStatement.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTElseStatement.java
@@ -53,10 +53,10 @@ public class ASTElseStatement extends SimpleNode
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.StandardParserVisitor, java.lang.Object)
      */
     @Override
-    public Object jjtAccept(ParserVisitor visitor, Object data)
+    public Object jjtAccept(StandardParserVisitor visitor, Object data)
     {
         return visitor.visit(this, data);
     }
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTEscape.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTEscape.java
index 67539ec0..63024b50 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTEscape.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTEscape.java
@@ -59,10 +59,10 @@ public class ASTEscape extends SimpleNode
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.StandardParserVisitor, java.lang.Object)
      */
     @Override
-    public Object jjtAccept(ParserVisitor visitor, Object data)
+    public Object jjtAccept(StandardParserVisitor visitor, Object data)
     {
         return visitor.visit(this, data);
     }
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTEscapedDirective.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTEscapedDirective.java
index 3a7ba3a7..f980c17a 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTEscapedDirective.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTEscapedDirective.java
@@ -57,10 +57,10 @@ public class ASTEscapedDirective extends SimpleNode
 
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.StandardParserVisitor, java.lang.Object)
      */
     @Override
-    public Object jjtAccept(ParserVisitor visitor, Object data)
+    public Object jjtAccept(StandardParserVisitor visitor, Object data)
     {
         return visitor.visit(this, data);
     }
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTExpression.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTExpression.java
index 6b11698a..5afae1e8 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTExpression.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTExpression.java
@@ -47,10 +47,10 @@ public class ASTExpression extends SimpleNode
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.StandardParserVisitor, java.lang.Object)
      */
     @Override
-    public Object jjtAccept(ParserVisitor visitor, Object data)
+    public Object jjtAccept(StandardParserVisitor visitor, Object data)
     {
         return visitor.visit(this, data);
     }
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTFalse.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTFalse.java
index aed9d6f5..1ac3a293 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTFalse.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTFalse.java
@@ -48,10 +48,10 @@ public class ASTFalse extends SimpleNode
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.StandardParserVisitor, java.lang.Object)
      */
     @Override
-    public Object jjtAccept(ParserVisitor visitor, Object data)
+    public Object jjtAccept(StandardParserVisitor visitor, Object data)
     {
         return visitor.visit(this, data);
     }
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTFloatingPointLiteral.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTFloatingPointLiteral.java
index 1f13c30a..2afb8e69 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTFloatingPointLiteral.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTFloatingPointLiteral.java
@@ -59,10 +59,10 @@ public class ASTFloatingPointLiteral extends SimpleNode
 
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.StandardParserVisitor, java.lang.Object)
      */
     @Override
-    public Object jjtAccept(ParserVisitor visitor, Object data)
+    public Object jjtAccept(StandardParserVisitor visitor, Object data)
     {
         return visitor.visit(this, data);
     }
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIdentifier.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIdentifier.java
index 3cb762a4..33514188 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIdentifier.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIdentifier.java
@@ -89,10 +89,10 @@ public class ASTIdentifier extends SimpleNode
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.StandardParserVisitor, java.lang.Object)
      */
     @Override
-    public Object jjtAccept(ParserVisitor visitor, Object data)
+    public Object jjtAccept(StandardParserVisitor visitor, Object data)
     {
         return visitor.visit(this, data);
     }
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIfStatement.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIfStatement.java
index b1b1bb66..24e76554 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIfStatement.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIfStatement.java
@@ -69,10 +69,10 @@ public class ASTIfStatement extends SimpleNode
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.StandardParserVisitor, java.lang.Object)
      */
     @Override
-    public Object jjtAccept(ParserVisitor visitor, Object data)
+    public Object jjtAccept(StandardParserVisitor visitor, Object data)
     {
         return visitor.visit(this, data);
     }
@@ -210,7 +210,7 @@ public class ASTIfStatement extends SimpleNode
      * @param context
      * @param visitor
      */
-    public void process( InternalContextAdapter context, ParserVisitor visitor)
+    public void process( InternalContextAdapter context, StandardParserVisitor visitor)
     {
     }
 }
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIncludeStatement.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIncludeStatement.java
index 37f88b2b..636f7a4f 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIncludeStatement.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIncludeStatement.java
@@ -47,10 +47,10 @@ public class ASTIncludeStatement extends SimpleNode
 
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.StandardParserVisitor, java.lang.Object)
      */
     @Override
-    public Object jjtAccept(ParserVisitor visitor, Object data)
+    public Object jjtAccept(StandardParserVisitor visitor, Object data)
     {
         return visitor.visit(this, data);
     }
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIntegerLiteral.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIntegerLiteral.java
index 56e2c3ba..ca1fa919 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIntegerLiteral.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIntegerLiteral.java
@@ -56,10 +56,10 @@ public class ASTIntegerLiteral extends SimpleNode
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.StandardParserVisitor, java.lang.Object)
      */
     @Override
-    public Object jjtAccept(ParserVisitor visitor, Object data)
+    public Object jjtAccept(StandardParserVisitor visitor, Object data)
     {
         return visitor.visit(this, data);
     }
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIntegerRange.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIntegerRange.java
index 5135ff92..a4128935 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIntegerRange.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTIntegerRange.java
@@ -58,10 +58,10 @@ public class ASTIntegerRange extends SimpleNode
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.StandardParserVisitor, java.lang.Object)
      */
     @Override
-    public Object jjtAccept(ParserVisitor visitor, Object data)
+    public Object jjtAccept(StandardParserVisitor visitor, Object data)
     {
         return visitor.visit(this, data);
     }
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMap.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMap.java
index c259b2fb..cef591b3 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMap.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMap.java
@@ -56,10 +56,10 @@ public class ASTMap extends SimpleNode
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.StandardParserVisitor, java.lang.Object)
      */
     @Override
-    public Object jjtAccept(ParserVisitor visitor, Object data)
+    public Object jjtAccept(StandardParserVisitor visitor, Object data)
     {
         return visitor.visit(this, data);
     }
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMathNode.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMathNode.java
index e298bc0f..25b58cff 100755
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMathNode.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMathNode.java
@@ -70,7 +70,7 @@ public abstract class ASTMathNode extends ASTBinaryOperator
      * {@inheritDoc}
      */
     @Override
-    public Object jjtAccept(ParserVisitor visitor, Object data)
+    public Object jjtAccept(StandardParserVisitor visitor, Object data)
     {
         return visitor.visit(this, data);
     }
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMethod.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMethod.java
index 5696b6bb..a9e15788 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMethod.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTMethod.java
@@ -87,10 +87,10 @@ public class ASTMethod extends SimpleNode
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.StandardParserVisitor, java.lang.Object)
      */
     @Override
-    public Object jjtAccept(ParserVisitor visitor, Object data)
+    public Object jjtAccept(StandardParserVisitor visitor, Object data)
     {
         return visitor.visit(this, data);
     }
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTNegateNode.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTNegateNode.java
index 842a2925..59a5bfd1 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTNegateNode.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTNegateNode.java
@@ -36,10 +36,10 @@ public class ASTNegateNode extends SimpleNode
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.StandardParserVisitor, java.lang.Object)
      */
     @Override
-    public Object jjtAccept(ParserVisitor visitor, Object data)
+    public Object jjtAccept(StandardParserVisitor visitor, Object data)
     {
         return visitor.visit(this, data);
     }
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTNotNode.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTNotNode.java
index 310a3536..1ad97978 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTNotNode.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTNotNode.java
@@ -48,10 +48,10 @@ public class ASTNotNode extends SimpleNode
 
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.StandardParserVisitor, java.lang.Object)
      */
     @Override
-    public Object jjtAccept(ParserVisitor visitor, Object data)
+    public Object jjtAccept(StandardParserVisitor visitor, Object data)
     {
         return visitor.visit(this, data);
     }
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTObjectArray.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTObjectArray.java
index 16d1b236..52062255 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTObjectArray.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTObjectArray.java
@@ -52,10 +52,10 @@ public class ASTObjectArray extends SimpleNode
 
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.StandardParserVisitor, java.lang.Object)
      */
     @Override
-    public Object jjtAccept(ParserVisitor visitor, Object data)
+    public Object jjtAccept(StandardParserVisitor visitor, Object data)
     {
         return visitor.visit(this, data);
     }
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTOrNode.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTOrNode.java
index c019e452..07cdbaff 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTOrNode.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTOrNode.java
@@ -57,10 +57,10 @@ public class ASTOrNode extends ASTLogicalOperator
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.StandardParserVisitor, java.lang.Object)
      */
     @Override
-    public Object jjtAccept(ParserVisitor visitor, Object data)
+    public Object jjtAccept(StandardParserVisitor visitor, Object data)
     {
         return visitor.visit(this, data);
     }
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTParameters.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTParameters.java
index 1c004286..b61b310c 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTParameters.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTParameters.java
@@ -45,10 +45,10 @@ public class ASTParameters extends SimpleNode
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.StandardParserVisitor, java.lang.Object)
      */
     @Override
-    public Object jjtAccept(ParserVisitor visitor, Object data)
+    public Object jjtAccept(StandardParserVisitor visitor, Object data)
     {
         return visitor.visit(this, data);
     }
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTReference.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTReference.java
index d4ddda9d..08f6a74b 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTReference.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTReference.java
@@ -140,10 +140,10 @@ public class ASTReference extends SimpleNode
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.StandardParserVisitor, java.lang.Object)
      */
     @Override
-    public Object jjtAccept(ParserVisitor visitor, Object data)
+    public Object jjtAccept(StandardParserVisitor visitor, Object data)
     {
         return visitor.visit(this, data);
     }
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java
index 0cf4d566..7bd15d77 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java
@@ -82,10 +82,10 @@ public class ASTSetDirective extends SimpleNode
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.StandardParserVisitor, java.lang.Object)
      */
     @Override
-    public Object jjtAccept(ParserVisitor visitor, Object data)
+    public Object jjtAccept(StandardParserVisitor visitor, Object data)
     {
         return visitor.visit(this, data);
     }
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java
index 44134727..1131e3d2 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java
@@ -278,11 +278,11 @@ public class ASTStringLiteral extends SimpleNode
      * @param visitor
      * @param data
      * @return rendered object
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor,
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.StandardParserVisitor,
      *      java.lang.Object)
      */
     @Override
-    public Object jjtAccept(ParserVisitor visitor, Object data)
+    public Object jjtAccept(StandardParserVisitor visitor, Object data)
     {
         return visitor.visit(this, data);
     }
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTText.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTText.java
index 0f4be56f..a79b90b9 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTText.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTText.java
@@ -78,12 +78,12 @@ public class ASTText extends SimpleNode
     {
         return ctext;
     }
-    
+
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.StandardParserVisitor, java.lang.Object)
      */
     @Override
-    public Object jjtAccept(ParserVisitor visitor, Object data)
+    public Object jjtAccept(StandardParserVisitor visitor, Object data)
     {
         return visitor.visit(this, data);
     }
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTTextblock.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTTextblock.java
index d133b292..eade03de 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTTextblock.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTTextblock.java
@@ -51,10 +51,10 @@ public class ASTTextblock extends SimpleNode
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.StandardParserVisitor, java.lang.Object)
      */
     @Override
-    public Object jjtAccept(ParserVisitor visitor, Object data)
+    public Object jjtAccept(StandardParserVisitor visitor, Object data)
     {
         return visitor.visit(this, data);
     }
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTTrue.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTTrue.java
index 7763ed60..7c143573 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTTrue.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTTrue.java
@@ -48,10 +48,10 @@ public class ASTTrue extends SimpleNode
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.StandardParserVisitor, java.lang.Object)
      */
     @Override
-    public Object jjtAccept(ParserVisitor visitor, Object data)
+    public Object jjtAccept(StandardParserVisitor visitor, Object data)
     {
         return visitor.visit(this, data);
     }
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTVariable.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTVariable.java
index 6b104667..f6009ccb 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTVariable.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTVariable.java
@@ -47,10 +47,10 @@ public class ASTVariable extends SimpleNode
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.StandardParserVisitor, java.lang.Object)
      */
     @Override
-    public Object jjtAccept(ParserVisitor visitor, Object data)
+    public Object jjtAccept(StandardParserVisitor visitor, Object data)
     {
         return visitor.visit(this, data);
     }
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTWord.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTWord.java
index 9493babf..e42ceb59 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTWord.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTWord.java
@@ -46,10 +46,10 @@ public class ASTWord extends SimpleNode
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.StandardParserVisitor, java.lang.Object)
      */
     @Override
-    public Object jjtAccept(ParserVisitor visitor, Object data)
+    public Object jjtAccept(StandardParserVisitor visitor, Object data)
     {
         return visitor.visit(this, data);
     }
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTprocess.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTprocess.java
index e9c67039..6d1dabef 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTprocess.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ASTprocess.java
@@ -46,10 +46,10 @@ public class ASTprocess extends SimpleNode
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.StandardParserVisitor, java.lang.Object)
      */
     @Override
-    public Object jjtAccept(ParserVisitor visitor, Object data)
+    public Object jjtAccept(StandardParserVisitor visitor, Object data)
     {
         return visitor.visit(this, data);
     }
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/IndentationFixer.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/IndentationFixer.java
index 907aaecb..7a06f07d 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/IndentationFixer.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/IndentationFixer.java
@@ -9,7 +9,7 @@ import java.util.regex.Pattern;
  * Helper class to fix indentation in structured mode.
  */
 
-public class IndentationFixer implements ParserVisitor
+public class IndentationFixer implements StandardParserVisitor
 {
     protected String parentIndentation = null;
     protected String extraIndentation = null;
@@ -359,4 +359,9 @@ public class IndentationFixer implements ParserVisitor
     {
         return null;
     }
+
+    @Override
+    public Object visit(ASTNegateNode node, Object data) {
+        return null;
+    }
 }
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/Node.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/Node.java
index ff867a15..69decff4 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/Node.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/Node.java
@@ -91,7 +91,7 @@ public interface Node extends Renderable
      * @param data
      * @return The Node execution result object.
      */
-    Object jjtAccept(ParserVisitor visitor, Object data);
+    Object jjtAccept(StandardParserVisitor visitor, Object data);
 
     /*
      * ========================================================================
@@ -103,12 +103,12 @@ public interface Node extends Renderable
      */
 
     /**
-     * @see #jjtAccept(ParserVisitor, Object)
+     * @see #jjtAccept(StandardParserVisitor, Object)
      * @param visitor
      * @param data
      * @return The node execution result.
      */
-    Object childrenAccept(ParserVisitor visitor, Object data);
+    Object childrenAccept(StandardParserVisitor visitor, Object data);
 
     /**
      * @return The first token.
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ParserTreeConstants.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ParserTreeConstants.java
deleted file mode 100644
index 7cc1dc53..00000000
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ParserTreeConstants.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.apache.velocity.runtime.parser.node;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- */
-
-public interface ParserTreeConstants extends StandardParserTreeConstants
-{
-}
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ParserVisitor.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ParserVisitor.java
deleted file mode 100644
index 8fe14fe6..00000000
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/ParserVisitor.java
+++ /dev/null
@@ -1,332 +0,0 @@
-package org.apache.velocity.runtime.parser.node;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- */
-
-/**
- * Interface used in implementation of visitor pattern.  Based on
- * code autogenerated by JavaCC. Formerly found in package
- * org.apache.velocity.runtime.parser.
- *
- * @version $Id$
- * @since 1.5
- */
-public interface ParserVisitor
-{
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(SimpleNode node, Object data);
-
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-
-  Object visit(ASTprocess node, Object data);
-
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(ASTText node, Object data);
-
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(ASTEscapedDirective node, Object data);
-
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(ASTEscape node, Object data);
-
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(ASTComment node, Object data);
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(ASTTextblock node, Object data);
-
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(ASTFloatingPointLiteral node, Object data);
-
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(ASTIntegerLiteral node, Object data);
-
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(ASTStringLiteral node, Object data);
-
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(ASTIdentifier node, Object data);
-
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(ASTWord node, Object data);
-
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-
-  Object visit(ASTDirectiveAssign node, Object data);
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(ASTDirective node, Object data);
-
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(ASTBlock node, Object data);
-
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(ASTMap node, Object data);
-
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(ASTObjectArray node, Object data);
-
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(ASTIntegerRange node, Object data);
-
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(ASTMethod node, Object data);
-
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(ASTIndex node, Object data);
-
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(ASTReference node, Object data);
-
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(ASTTrue node, Object data);
-
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(ASTFalse node, Object data);
-
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(ASTIfStatement node, Object data);
-
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(ASTElseStatement node, Object data);
-
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(ASTElseIfStatement node, Object data);
-
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(ASTSetDirective node, Object data);
-
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(ASTExpression node, Object data);
-
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(ASTAssignment node, Object data);
-
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(ASTOrNode node, Object data);
-
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(ASTAndNode node, Object data);
-
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(ASTEQNode node, Object data);
-
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(ASTNENode node, Object data);
-
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(ASTLTNode node, Object data);
-
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(ASTGTNode node, Object data);
-
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(ASTLENode node, Object data);
-
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(ASTGENode node, Object data);
-
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(ASTAddNode node, Object data);
-
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(ASTSubtractNode node, Object data);
-
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(ASTMulNode node, Object data);
-
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(ASTDivNode node, Object data);
-
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(ASTModNode node, Object data);
-
-  /**
-   * @param node
-   * @param data
-   * @return The object rendered by this node.
-   */
-  Object visit(ASTNotNode node, Object data);
-}
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SimpleNode.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SimpleNode.java
index f85d6926..9b5218a1 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SimpleNode.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/node/SimpleNode.java
@@ -232,20 +232,20 @@ public class SimpleNode implements Node, Cloneable
 
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.Node#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.Node#jjtAccept(org.apache.velocity.runtime.parser.node.StandardParserVisitor, java.lang.Object)
      */
     @Override
-    public Object jjtAccept(ParserVisitor visitor, Object data)
+    public Object jjtAccept(StandardParserVisitor visitor, Object data)
     {
         return visitor.visit(this, data);
     }
 
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.Node#childrenAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.Node#childrenAccept(org.apache.velocity.runtime.parser.node.StandardParserVisitor, java.lang.Object)
      */
     @Override
-    public Object childrenAccept(ParserVisitor visitor, Object data)
+    public Object childrenAccept(StandardParserVisitor visitor, Object data)
     {
         if (children != null)
         {
@@ -311,7 +311,7 @@ public class SimpleNode implements Node, Cloneable
         dump(prefix, pw);
         pw.flush();
     }
-    
+
     /**
      * <p>Dumps nodes tree on System.out.</p>
      * <p>Override this method if you want to customize how the node dumps
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/visitor/BaseVisitor.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/visitor/BaseVisitor.java
index 397a3cd6..326e5a78 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/visitor/BaseVisitor.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/visitor/BaseVisitor.java
@@ -33,7 +33,7 @@ import java.io.Writer;
  * @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
  * @version $Id$
  */
-public abstract class BaseVisitor implements ParserVisitor
+public abstract class BaseVisitor implements StandardParserVisitor
 {
     /** Context used during traversal */
     protected InternalContextAdapter context;
@@ -58,7 +58,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.SimpleNode, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.SimpleNode, java.lang.Object)
      */
     @Override
     public Object visit(SimpleNode node, Object data)
@@ -68,7 +68,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTprocess, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTprocess, java.lang.Object)
      */
     @Override
     public Object visit(ASTprocess node, Object data)
@@ -78,7 +78,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTExpression, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTExpression, java.lang.Object)
      */
     @Override
     public Object visit(ASTExpression node, Object data)
@@ -88,7 +88,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTAssignment, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTAssignment, java.lang.Object)
      */
     @Override
     public Object visit(ASTAssignment node, Object data)
@@ -98,7 +98,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTOrNode, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTOrNode, java.lang.Object)
      */
     @Override
     public Object visit(ASTOrNode node, Object data)
@@ -108,7 +108,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTAndNode, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTAndNode, java.lang.Object)
      */
     @Override
     public Object visit(ASTAndNode node, Object data)
@@ -118,7 +118,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTEQNode, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTEQNode, java.lang.Object)
      */
     @Override
     public Object visit(ASTEQNode node, Object data)
@@ -128,7 +128,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTNENode, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTNENode, java.lang.Object)
      */
     @Override
     public Object visit(ASTNENode node, Object data)
@@ -138,7 +138,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTLTNode, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTLTNode, java.lang.Object)
      */
     @Override
     public Object visit(ASTLTNode node, Object data)
@@ -148,7 +148,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTGTNode, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTGTNode, java.lang.Object)
      */
     @Override
     public Object visit(ASTGTNode node, Object data)
@@ -158,7 +158,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTLENode, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTLENode, java.lang.Object)
      */
     @Override
     public Object visit(ASTLENode node, Object data)
@@ -168,7 +168,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTGENode, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTGENode, java.lang.Object)
      */
     @Override
     public Object visit(ASTGENode node, Object data)
@@ -178,7 +178,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTAddNode, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTAddNode, java.lang.Object)
      */
     @Override
     public Object visit(ASTAddNode node, Object data)
@@ -188,7 +188,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTSubtractNode, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTSubtractNode, java.lang.Object)
      */
     @Override
     public Object visit(ASTSubtractNode node, Object data)
@@ -198,7 +198,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTMulNode, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTMulNode, java.lang.Object)
      */
     @Override
     public Object visit(ASTMulNode node, Object data)
@@ -208,7 +208,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTDivNode, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTDivNode, java.lang.Object)
      */
     @Override
     public Object visit(ASTDivNode node, Object data)
@@ -218,7 +218,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTModNode, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTModNode, java.lang.Object)
      */
     @Override
     public Object visit(ASTModNode node, Object data)
@@ -228,7 +228,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTNotNode, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTNotNode, java.lang.Object)
      */
     @Override
     public Object visit(ASTNotNode node, Object data)
@@ -238,7 +238,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTIntegerLiteral, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTIntegerLiteral, java.lang.Object)
      */
     @Override
     public Object visit(ASTIntegerLiteral node, Object data)
@@ -248,7 +248,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTFloatingPointLiteral, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTFloatingPointLiteral, java.lang.Object)
      * @since 1.5
      */
     @Override
@@ -259,7 +259,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTStringLiteral, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTStringLiteral, java.lang.Object)
      */
     @Override
     public Object visit(ASTStringLiteral node, Object data)
@@ -269,7 +269,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTIdentifier, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTIdentifier, java.lang.Object)
      */
     @Override
     public Object visit(ASTIdentifier node, Object data)
@@ -279,7 +279,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTMethod, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTMethod, java.lang.Object)
      */
     @Override
     public Object visit(ASTMethod node, Object data)
@@ -289,7 +289,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTIndex, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTIndex, java.lang.Object)
      */
     @Override
     public Object visit(ASTIndex node, Object data)
@@ -299,7 +299,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTReference, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTReference, java.lang.Object)
      */
     @Override
     public Object visit(ASTReference node, Object data)
@@ -309,7 +309,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTTrue, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTTrue, java.lang.Object)
      */
     @Override
     public Object visit(ASTTrue node, Object data)
@@ -319,7 +319,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTFalse, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTFalse, java.lang.Object)
      */
     @Override
     public Object visit(ASTFalse node, Object data)
@@ -329,7 +329,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTBlock, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTBlock, java.lang.Object)
      */
     @Override
     public Object visit(ASTBlock node, Object data)
@@ -339,7 +339,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTText, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTText, java.lang.Object)
      */
     @Override
     public Object visit(ASTText node, Object data)
@@ -349,7 +349,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTIfStatement, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTIfStatement, java.lang.Object)
      */
     @Override
     public Object visit(ASTIfStatement node, Object data)
@@ -359,7 +359,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTElseStatement, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTElseStatement, java.lang.Object)
      */
     @Override
     public Object visit(ASTElseStatement node, Object data)
@@ -369,7 +369,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTElseIfStatement, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTElseIfStatement, java.lang.Object)
      */
     @Override
     public Object visit(ASTElseIfStatement node, Object data)
@@ -379,7 +379,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTComment, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTComment, java.lang.Object)
      */
     @Override
     public Object visit(ASTComment node, Object data)
@@ -389,7 +389,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTTextblock, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTTextblock, java.lang.Object)
      */
     @Override
     public Object visit(ASTTextblock node, Object data)
@@ -399,7 +399,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTObjectArray, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTObjectArray, java.lang.Object)
      */
     @Override
     public Object visit(ASTObjectArray node, Object data)
@@ -409,7 +409,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTWord, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTWord, java.lang.Object)
      */
     @Override
     public Object visit(ASTWord node, Object data)
@@ -419,7 +419,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTSetDirective, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTSetDirective, java.lang.Object)
      */
     @Override
     public Object visit(ASTSetDirective node, Object data)
@@ -429,7 +429,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTDirectiveAssign, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTDirectiveAssign, java.lang.Object)
      */
     @Override
     public Object visit(ASTDirectiveAssign node, Object data)
@@ -439,7 +439,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTDirective, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTDirective, java.lang.Object)
      */
     @Override
     public Object visit(ASTDirective node, Object data)
@@ -449,7 +449,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTEscapedDirective, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTEscapedDirective, java.lang.Object)
      * @since 1.5
      */
     @Override
@@ -460,7 +460,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTEscape, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTEscape, java.lang.Object)
      * @since 1.5
      */
     @Override
@@ -471,7 +471,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTMap, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTMap, java.lang.Object)
      * @since 1.5
      */
     @Override
@@ -482,7 +482,7 @@ public abstract class BaseVisitor implements ParserVisitor
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTIntegerRange, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.StandardParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTIntegerRange, java.lang.Object)
      * @since 1.5
      */
     @Override
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/visitor/NodeViewMode.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/visitor/NodeViewMode.java
index baac596d..4f13d337 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/visitor/NodeViewMode.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/visitor/NodeViewMode.java
@@ -241,6 +241,11 @@ public class NodeViewMode extends BaseVisitor
         return showNode(node,data);
     }
 
+    @Override
+    public Object visit(ASTNegateNode node, Object data) {
+        return showNode(node,data);
+    }
+
     /**
      * @see org.apache.velocity.runtime.visitor.BaseVisitor#visit(org.apache.velocity.runtime.parser.node.ASTFloatingPointLiteral, java.lang.Object)
      */
diff --git a/velocity-engine-core/src/main/parser/Parser.jjt b/velocity-engine-core/src/main/parser/Parser.jjt
index 593d044b..0ae0fdc1 100644
--- a/velocity-engine-core/src/main/parser/Parser.jjt
+++ b/velocity-engine-core/src/main/parser/Parser.jjt
@@ -234,12 +234,12 @@ public class ${parser.basename}Parser implements Parser
      * the new stream that we want parsed.
      */
     @Override
-    public SimpleNode parse( Reader reader, Template template )
+    public SimpleNode parse( Reader reader, Template t )
         throws ParseException
     {
         SimpleNode sn = null;
 
-        currentTemplate = template;
+        currentTemplate = t;
 
         try
         {
@@ -267,7 +267,7 @@ public class ${parser.basename}Parser implements Parser
              *  thrown by the Macro class when something is amiss in the
              *  Macro specification
              */
-            log.error("{}: {}", template.getName(), mee.getMessage(), mee);
+            log.error("{}: {}", t.getName(), mee.getMessage(), mee);
             throw mee;
         }
         catch (ParseException pe)
@@ -282,7 +282,7 @@ public class ${parser.basename}Parser implements Parser
         }
         catch (Exception e)
         {
-            String msg = template.getName() + ": " + e.getMessage();
+            String msg = t.getName() + ": " + e.getMessage();
             log.error(msg, e);
             throw new VelocityException(msg, e, getRuntimeServices().getLogContext().getStackTrace());
         }
@@ -572,7 +572,7 @@ TOKEN_MGR_DECLS:
     {
         ${parser.basename}Parser.trace(message);
     }
-    
+
     /**
      * Switches to a new state (add some log to the default method)
      */
@@ -1541,7 +1541,7 @@ TOKEN :
  * the template has been turned into an AST,
  * this method returns the root of AST which
  * can subsequently be traversed by a visitor
- * which implements the ParserVisitor interface
+ * which implements the StandardParserVisitor interface
  * which is generated automatically by JavaCC
  */
 SimpleNode process() :
@@ -1714,47 +1714,47 @@ int DirectiveArg() #void : {}
 {
     Reference()
     {
-        return ParserTreeConstants.JJTREFERENCE;
+        return StandardParserTreeConstants.JJTREFERENCE;
     }
 |   Word()
     {
-        return ParserTreeConstants.JJTWORD;
+        return StandardParserTreeConstants.JJTWORD;
     }
 |   StringLiteral()
     {
-        return ParserTreeConstants.JJTSTRINGLITERAL;
+        return StandardParserTreeConstants.JJTSTRINGLITERAL;
     }
 
 |   IntegerLiteral()
     {
-        return ParserTreeConstants.JJTINTEGERLITERAL;
+        return StandardParserTreeConstants.JJTINTEGERLITERAL;
     }
     /*
      * Need to put this before the floating point expansion
      */
 |   LOOKAHEAD(  <LBRACKET> (<WHITESPACE> | <NEWLINE>)* ( Reference() | IntegerLiteral())     (<WHITESPACE> | <NEWLINE>)* <DOUBLEDOT> ) IntegerRange()
     {
-        return ParserTreeConstants.JJTINTEGERRANGE;
+        return StandardParserTreeConstants.JJTINTEGERRANGE;
     }
 |   FloatingPointLiteral()
     {
-        return ParserTreeConstants.JJTFLOATINGPOINTLITERAL;
+        return StandardParserTreeConstants.JJTFLOATINGPOINTLITERAL;
     }
 |   Map()
     {
-        return ParserTreeConstants.JJTMAP;
+        return StandardParserTreeConstants.JJTMAP;
     }
 |   ObjectArray()
     {
-        return ParserTreeConstants.JJTOBJECTARRAY;
+        return StandardParserTreeConstants.JJTOBJECTARRAY;
     }
 |   True()
     {
-        return ParserTreeConstants.JJTTRUE;
+        return StandardParserTreeConstants.JJTTRUE;
     }
 |   False()
     {
-        return ParserTreeConstants.JJTFALSE;
+        return StandardParserTreeConstants.JJTFALSE;
     }
 }
 
@@ -1878,7 +1878,7 @@ boolean Directive(boolean afterNewline) :
               LOOKAHEAD( { isMacro && isAssignment() })
               DirectiveAssign() (<WHITESPACE> | <NEWLINE>)* <EQUALS> ( <WHITESPACE> | <NEWLINE> )*
               {
-                  argtypes.add(ParserTreeConstants.JJTDIRECTIVEASSIGN);
+                  argtypes.add(StandardParserTreeConstants.JJTDIRECTIVEASSIGN);
               }
             ]
             LOOKAHEAD( { !isRightParenthesis() } )
@@ -1886,7 +1886,7 @@ boolean Directive(boolean afterNewline) :
               argType = DirectiveArg()
               {
                   argtypes.add(argType);
-                  if (d == null && argType == ParserTreeConstants.JJTWORD)
+                  if (d == null && argType == StandardParserTreeConstants.JJTWORD)
                   {
                       if (isVM)
                       {
author	Sylwester Lachiewicz <slachiewicz@apache.org>	2024-02-16 22:09:43 +0100
committer	Sylwester Lachiewicz <slachiewicz@apache.org>	2024-03-14 00:24:53 +0100
commit	86cfcf41105f8a25db11ca6483e33c20fc0804d9 (patch)
tree	e3e002e8a3241ce90414012c2943523a3fd5f79b
parent	d01540079096b68e99c3d67a1578433d3a8fb8d1 (diff)
download	apache-velocity-engine-upstream-master.tar.gz