Return-Path: X-Original-To: apmail-freemarker-notifications-archive@minotaur.apache.org Delivered-To: apmail-freemarker-notifications-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AFEBF18A7B for ; Thu, 1 Oct 2015 22:08:52 +0000 (UTC) Received: (qmail 53263 invoked by uid 500); 1 Oct 2015 22:08:52 -0000 Delivered-To: apmail-freemarker-notifications-archive@freemarker.apache.org Received: (qmail 53246 invoked by uid 500); 1 Oct 2015 22:08:52 -0000 Mailing-List: contact notifications-help@freemarker.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@freemarker.incubator.apache.org Delivered-To: mailing list notifications@freemarker.incubator.apache.org Received: (qmail 53237 invoked by uid 99); 1 Oct 2015 22:08:52 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Oct 2015 22:08:52 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 2FE69180964 for ; Thu, 1 Oct 2015 22:08:52 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.226 X-Spam-Level: X-Spam-Status: No, score=-3.226 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.006] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id EFBRv61VB9me for ; Thu, 1 Oct 2015 22:08:51 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id F364F206E3 for ; Thu, 1 Oct 2015 22:08:50 +0000 (UTC) Received: (qmail 53221 invoked by uid 99); 1 Oct 2015 22:08:49 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Oct 2015 22:08:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A88CBE1550; Thu, 1 Oct 2015 22:08:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ddekany@apache.org To: notifications@freemarker.incubator.apache.org Date: Thu, 01 Oct 2015 22:08:49 -0000 Message-Id: <3e52475235fa4c179825c888ca186b13@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] incubator-freemarker git commit: Simplified static text parsing 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 Authored: Thu Oct 1 14:17:11 2015 +0200 Committer: ddekany 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(||) ( - { prevToken = t; } t = | t = @@ -3906,6 +3904,7 @@ TextBlock PCData() : buf.append(t.image); if (start == null) start = t; if (prevToken != null) prevToken.next = null; + prevToken = t; } )+ {