[core] Use devoted File Separator control character for parser end of template processing

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

1 files changed, 4 insertions, 2 deletions

diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/VelocityCharStream.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/VelocityCharStream.java
index f6a93c08..e6a06151 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/VelocityCharStream.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/parser/VelocityCharStream.java
@@ -61,9 +61,11 @@ implements CharStream
     private int inBuf = 0;
 
     /* CB - to properly handle EOF *inside* javacc lexer,
-     * we send a 'zero-width whitespace' *just before* EOF
+     * we send a 'file separator' ascii char *just before* EOF
+     * (see https://en.wikipedia.org/wiki/Delimiter#ASCII_delimited_text)
      */
     private boolean beforeEOF = false;
+    private static char END_OF_FILE = '\u001C';
 
     private void ExpandBuff(boolean wrapAround)
     {
@@ -161,7 +163,7 @@ implements CharStream
                     inputStream.close();
                     throw new java.io.IOException();
                 }
-                buffer[maxNextCharInd++] = '\u200B';
+                buffer[maxNextCharInd++] = END_OF_FILE;
                 beforeEOF = true;
             }
             else