svn commit: r1860478 - /velocity/engine/branches/parser_experiments/velocity-engine-core/src/main/parser/StandardParser.jjt

[cbrisson]

Author: cbrisson
Date: Sat Jun  1 11:52:25 2019
New Revision: 1860478

URL: http://svn.apache.org/viewvc?rev=1860478&view=rev
Log:
[engine][VELOCITY-917] Parser fix

Modified:
    
velocity/engine/branches/parser_experiments/velocity-engine-core/src/main/parser/StandardParser.jjt

Modified: 
velocity/engine/branches/parser_experiments/velocity-engine-core/src/main/parser/StandardParser.jjt
URL: 
http://svn.apache.org/viewvc/velocity/engine/branches/parser_experiments/velocity-engine-core/src/main/parser/StandardParser.jjt?rev=1860478&r1=1860477&r2=1860478&view=diff
==============================================================================
--- 
velocity/engine/branches/parser_experiments/velocity-engine-core/src/main/parser/StandardParser.jjt
 (original)
+++ 
velocity/engine/branches/parser_experiments/velocity-engine-core/src/main/parser/StandardParser.jjt
 Sat Jun  1 11:52:25 2019
@@ -563,11 +563,6 @@ TOKEN_MGR_DECLS:
     private boolean inComment;
     private boolean inSet;
 
-    public char dollar = '$';
-    public char hash = '#';
-    public char arobase = '@';
-    public char star = '*';
-
     /**
      * Our own trace method. Use sparsingly in production, since each
      * and every call will introduce an execution branch and slow down parsing.
@@ -1826,7 +1821,7 @@ boolean Directive(boolean afterNewline)
 
         if ( d == null)
         {
-            if( directiveName.startsWith("@") )
+            if( directiveName.charAt(0) == at )
             {
                 // block macro call of type: #@foobar($arg1 $arg2) astBody #end
                 directiveType = Directive.BLOCK;