freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [1/2] incubator-freemarker git commit: Simplified static text parsing
Date Thu, 01 Oct 2015 22:08:49 GMT
Repository: incubator-freemarker
Updated Branches:
  refs/heads/2.3-gae 6ac1b86a4 -> d8487ffee


Simplified static text parsing


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/6802cc71
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/6802cc71
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/6802cc71

Branch: refs/heads/2.3-gae
Commit: 6802cc7110d796c841f4d49d401dda1c3f78048a
Parents: 6ac1b86
Author: ddekany <ddekany@apache.org>
Authored: Thu Oct 1 14:17:11 2015 +0200
Committer: ddekany <ddekany@apache.org>
Committed: Thu Oct 1 14:17:11 2015 +0200

----------------------------------------------------------------------
 src/main/javacc/FTL.jj | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/6802cc71/src/main/javacc/FTL.jj
----------------------------------------------------------------------
diff --git a/src/main/javacc/FTL.jj b/src/main/javacc/FTL.jj
index f65f4c5..a3c5870 100644
--- a/src/main/javacc/FTL.jj
+++ b/src/main/javacc/FTL.jj
@@ -3893,9 +3893,7 @@ TextBlock PCData() :
 }
 {
     (
-        LOOKAHEAD(<STATIC_TEXT_WS>|<STATIC_TEXT_NON_WS>|<STATIC_TEXT_FALSE_ALARM>)
         (
-            { prevToken = t; }
             t = <STATIC_TEXT_WS>
             |
             t = <STATIC_TEXT_NON_WS>
@@ -3906,6 +3904,7 @@ TextBlock PCData() :
             buf.append(t.image);
             if (start == null) start = t;
             if (prevToken != null) prevToken.next = null;
+            prevToken = t;
         }
     )+
     {


Mime
View raw message