svn commit: r1843786 - in /velocity/engine/branches/VELOCITY-898/velocity-engine-core: pom.xml src/main/parser/Parser.jjt

[cbrisson]

Author: cbrisson
Date: Sat Oct 13 21:08:23 2018
New Revision: 1843786

URL: http://svn.apache.org/viewvc?rev=1843786&view=rev
Log:
[VELOCITY-898] Remove debug code

Modified:
    velocity/engine/branches/VELOCITY-898/velocity-engine-core/pom.xml
    
velocity/engine/branches/VELOCITY-898/velocity-engine-core/src/main/parser/Parser.jjt

Modified: velocity/engine/branches/VELOCITY-898/velocity-engine-core/pom.xml
URL: 
http://svn.apache.org/viewvc/velocity/engine/branches/VELOCITY-898/velocity-engine-core/pom.xml?rev=1843786&r1=1843785&r2=1843786&view=diff
==============================================================================
--- velocity/engine/branches/VELOCITY-898/velocity-engine-core/pom.xml 
(original)
+++ velocity/engine/branches/VELOCITY-898/velocity-engine-core/pom.xml Sat Oct 
13 21:08:23 2018
@@ -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>

Modified: 
velocity/engine/branches/VELOCITY-898/velocity-engine-core/src/main/parser/Parser.jjt
URL: 
http://svn.apache.org/viewvc/velocity/engine/branches/VELOCITY-898/velocity-engine-core/src/main/parser/Parser.jjt?rev=1843786&r1=1843785&r2=1843786&view=diff
==============================================================================
--- 
velocity/engine/branches/VELOCITY-898/velocity-engine-core/src/main/parser/Parser.jjt
 (original)
+++ 
velocity/engine/branches/VELOCITY-898/velocity-engine-core/src/main/parser/Parser.jjt
 Sat Oct 13 21:08:23 2018
@@ -711,19 +711,15 @@ TOKEN :
 {
     <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 @@ TOKEN :
 {
     <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 @@ void Reference() : {}
       )
       |
       (
-         <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> )
       )
 }