[engine] fix parser bug for VTL like:

  #foo()##
  #set($foo=$bar)




git-svn-id: https://svn.apache.org/repos/asf/velocity/engine/trunk@1768603 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 15 insertions, 0 deletions

diff --git a/velocity-engine-core/src/main/parser/Parser.jjt b/velocity-engine-core/src/main/parser/Parser.jjt
index 759492e6..b31c226d 100644
--- a/velocity-engine-core/src/main/parser/Parser.jjt
+++ b/velocity-engine-core/src/main/parser/Parser.jjt
@@ -885,6 +885,11 @@ TOKEN :
   {
      inComment = false;
      stateStackPop();
+     if (curLexState == REFERENCE || curLexState == REFMOD3)
+     {
+       // end of reference: pop again
+       stateStackPop();
+     }
   }
 
 }
@@ -896,6 +901,11 @@ TOKEN :
   {
     inComment = false;
     stateStackPop();
+     if (curLexState == REFERENCE || curLexState == REFMOD3)
+     {
+       // end of reference: pop again
+       stateStackPop();
+     }
   }
 }
 
@@ -906,6 +916,11 @@ TOKEN :
   {
     inComment = false;
     stateStackPop();
+     if (curLexState == REFERENCE || curLexState == REFMOD3)
+     {
+       // end of reference: pop again
+       stateStackPop();
+     }
   }
 }