commit e2a90098eeb3f6c4aadf17eaf4c8cfd5a9498b4d
author Claude Brisson <cbrisson@apache.org> Sat Oct 13 21:08:23 2018 +0000
committer Claude Brisson <cbrisson@apache.org> Sat Oct 13 21:08:23 2018 +0000
tree c288a7b35c0353324282172fab1d36645d05052c
parent 9fe5ccdc07c187b8d9cef10ba93feba9af5b1ddf

[VELOCITY-898] Remove debug code

git-svn-id: https://svn.apache.org/repos/asf/velocity/engine/branches/VELOCITY-898@1843786 13f79535-47bb-0310-9956-ffa450edef68

velocity-engine-core/pom.xml

diff --git a/velocity-engine-core/pom.xml b/velocity-engine-core/pom.xml
index 5e92db6..9271d84 100644
--- a/velocity-engine-core/pom.xml
+++ b/velocity-engine-core/pom.xml
@@ -169,9 +169,9 @@
           <buildParser>true</buildParser>
           <buildNodeFiles>${parser.nodefiles}</buildNodeFiles>
           <multi>true</multi>
-          <debugParser>true</debugParser>
-          <debugLookAhead>true</debugLookAhead>
-          <debugTokenManager>true</debugTokenManager>
+          <debugParser>false</debugParser>
+          <debugLookAhead>false</debugLookAhead>
+          <debugTokenManager>false</debugTokenManager>
           <jdkVersion>${maven.compiler.target}</jdkVersion>
           <nodeUsesParser>true</nodeUsesParser>
           <nodePackage>org.apache.velocity.runtime.parser.node</nodePackage>

velocity-engine-core/src/main/parser/Parser.jjt

diff --git a/velocity-engine-core/src/main/parser/Parser.jjt b/velocity-engine-core/src/main/parser/Parser.jjt
index 02d99f7..5de9260 100644
--- a/velocity-engine-core/src/main/parser/Parser.jjt
+++ b/velocity-engine-core/src/main/parser/Parser.jjt
@@ -711,19 +711,15 @@
 {
     <LEFT_CURLEY : "{" >
     {
-        System.out.println("@@@ LEFT_CURLEY - state = " + lexStateNames[curLexState] + " - curlyLevel = " + curlyLevel);
         ++curlyLevel;
     }
   |
     <RIGHT_CURLEY : "}" >
     {
-        System.out.println("@@@ RIGHT_CURLEY - state = " + lexStateNames[curLexState] + " - curlyLevel = " + curlyLevel);
         --curlyLevel;
         if (curLexState == ALT_VAL && curlyLevel == 0)
         {
-            System.out.println("@@@@ CLOSING ALT_VAL");
             stateStackPop();
-            System.out.println("@@@@ Poped state to " + lexStateNames[curLexState]);
         }
     }
 }
@@ -1359,16 +1355,13 @@
 {
     <LCURLY: "{">
     {
-        System.out.println("@@@ LCURLY - state = " + lexStateNames[curLexState] + " - curlyLevel = " + curlyLevel);
         ++curlyLevel;
     }
 |   <RCURLY: "}">
     {
-        System.out.println("@@@ LCURLY - state = " + lexStateNames[curLexState] + " - curlyLevel = " + curlyLevel);
         /* maybe it wasn't for our state */
         while (curlyLevel == 0 && curLexState != DEFAULT)
         {
-            System.out.println("@@@@ RCURLY wasn't for us");
             stateStackPop();
         }
         /* At this point, here are all the possible states:
@@ -1993,11 +1986,11 @@
       )
       |
       (
-         <LCURLY> { System.out.println("@@@@ INSIDE LCURLY"); }
+         <LCURLY>
          ( <IDENTIFIER> | <OLD_IDENTIFIER> ) (Index())*
          (LOOKAHEAD(2) <DOT> (LOOKAHEAD(3) Method() | Identifier() ) (Index())* )*
-         [ <PIPE> { System.out.println("@@@@ FOUND PIPE"); } Expression() { System.out.println("@@@@ FOUND EXPRESSION"); } ]
-         ( <RCURLY> { System.out.println("@@@@ FOUND RCURLY"); } | <RIGHT_CURLEY> { System.out.println("@@@@ FOUND RIGHT_CURLEY"); } )
+         [ <PIPE> Expression() ]
+         ( <RCURLY> | <RIGHT_CURLEY> )
       )
 }