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 553E618389 for ; Sat, 19 Dec 2015 14:23:14 +0000 (UTC) Received: (qmail 55138 invoked by uid 500); 19 Dec 2015 14:23:14 -0000 Delivered-To: apmail-freemarker-notifications-archive@freemarker.apache.org Received: (qmail 55119 invoked by uid 500); 19 Dec 2015 14:23:14 -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 55110 invoked by uid 99); 19 Dec 2015 14:23:14 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 19 Dec 2015 14:23:14 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id C47561A1481 for ; Sat, 19 Dec 2015 14:23:13 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.226 X-Spam-Level: * X-Spam-Status: No, score=1.226 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.554] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id meSfDF52knWr for ; Sat, 19 Dec 2015 14:23:12 +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 6DDCF203B9 for ; Sat, 19 Dec 2015 14:23:11 +0000 (UTC) Received: (qmail 54839 invoked by uid 99); 19 Dec 2015 14:23:10 -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; Sat, 19 Dec 2015 14:23:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 79EBCE0991; Sat, 19 Dec 2015 14:23:10 +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: Sat, 19 Dec 2015 14:23:14 -0000 Message-Id: <1c511521cb37457f8e4f88e274fdff85@git.apache.org> In-Reply-To: <8b87d048b0044dfeb17fb503cacfc690@git.apache.org> References: <8b87d048b0044dfeb17fb503cacfc690@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/8] incubator-freemarker git commit: (More AST location information tests) (More AST location information tests) Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/f08867b6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/f08867b6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/f08867b6 Branch: refs/heads/2.3 Commit: f08867b604399abf9b0de8a6c89e1cbc560b300b Parents: cd6857c Author: ddekany Authored: Fri Dec 18 21:41:16 2015 +0100 Committer: ddekany Committed: Fri Dec 18 21:41:16 2015 +0100 ---------------------------------------------------------------------- .../resources/freemarker/core/ast-locations.ast | 52 +++++++++++++++++++- .../resources/freemarker/core/ast-locations.ftl | 10 +++- 2 files changed, 60 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f08867b6/src/test/resources/freemarker/core/ast-locations.ast ---------------------------------------------------------------------- diff --git a/src/test/resources/freemarker/core/ast-locations.ast b/src/test/resources/freemarker/core/ast-locations.ast index 1d94637..fb8974a 100644 --- a/src/test/resources/freemarker/core/ast-locations.ast +++ b/src/test/resources/freemarker/core/ast-locations.ast @@ -1,4 +1,4 @@ -#mixed_content // f.c.MixedContent; Location 1:1-10:33 +#mixed_content // f.c.MixedContent; Location 1:1-18:8 #if // f.c.ConditionalBlock; Location 1:1-1:15 - condition: exp // f.c.Identifier; Location 1:6-1:8 - AST-node subtype: "0" // Integer @@ -85,3 +85,53 @@ #recover // f.c.RecoveryBlock; Location 10:12-10:22 #text // f.c.TextBlock; Location 10:22-10:22 - content: "1" // String + #text // f.c.TextBlock; Location 10:34-10:34 + - content: "\n" // String + #list // f.c.IteratorBlock; Location 11:1-11:22 + - list source: s // f.c.Identifier; Location 11:8-11:8 + - target loop variable: "i" // String + #list // f.c.IteratorBlock; Location 12:1-12:23 + - list source: s // f.c.Identifier; Location 12:8-12:8 + - target loop variable: "i" // String + #text // f.c.TextBlock; Location 12:15-12:15 + - content: "1" // String + #text // f.c.TextBlock; Location 12:24-12:24 + - content: "\n" // String + #list // f.c.IteratorBlock; Location 13:1-13:28 + - list source: s // f.c.Identifier; Location 13:8-13:8 + - target loop variable: "i" // String + #sep // f.c.Sep; Location 13:15-13:20 + #list // f.c.IteratorBlock; Location 14:1-14:30 + - list source: s // f.c.Identifier; Location 14:8-14:8 + - target loop variable: "i" // String + #text // f.c.TextBlock; Location 14:15-14:15 + - content: "1" // String + #sep // f.c.Sep; Location 14:16-14:22 + #text // f.c.TextBlock; Location 14:22-14:22 + - content: "1" // String + #text // f.c.TextBlock; Location 14:31-14:31 + - content: "\n" // String + #list // f.c.IteratorBlock; Location 15:1-15:45 + - list source: s // f.c.Identifier; Location 15:8-15:8 + #items // f.c.Items; Location 15:10-15:37 + - target loop variable: "i" // String + #sep // f.c.Sep; Location 15:23-15:28 + #list // f.c.IteratorBlock; Location 16:1-16:49 + - list source: s // f.c.Identifier; Location 16:8-16:8 + #text // f.c.TextBlock; Location 16:10-16:10 + - content: "1" // String + #items // f.c.Items; Location 16:11-16:40 + - target loop variable: "i" // String + #text // f.c.TextBlock; Location 16:24-16:24 + - content: "1" // String + #sep // f.c.Sep; Location 16:25-16:31 + #text // f.c.TextBlock; Location 16:31-16:31 + - content: "1" // String + #text // f.c.TextBlock; Location 16:41-16:41 + - content: "1" // String + #text // f.c.TextBlock; Location 16:50-17:2 + - content: "\n1\n" // String + ${...} // f.c.DollarVariable; Location 18:1-18:8 + - content: + // f.c.AddConcatExpression; Location 18:3-18:7 + - left-hand operand: x // f.c.Identifier; Location 18:3-18:3 + - right-hand operand: y // f.c.Identifier; Location 18:7-18:7 http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f08867b6/src/test/resources/freemarker/core/ast-locations.ftl ---------------------------------------------------------------------- diff --git a/src/test/resources/freemarker/core/ast-locations.ftl b/src/test/resources/freemarker/core/ast-locations.ftl index cecc19e..6f299c4 100644 --- a/src/test/resources/freemarker/core/ast-locations.ftl +++ b/src/test/resources/freemarker/core/ast-locations.ftl @@ -7,4 +7,12 @@ <#if exp><#elseif exp> <#if exp><#elseif exp>1 <#attempt><#recover> -<#attempt>1<#recover>1 \ No newline at end of file +<#attempt>1<#recover>1 +<#list s as i> +<#list s as i>1 +<#list s as i><#sep> +<#list s as i>1<#sep>1 +<#list s><#items as i><#sep> +<#list s>1<#items as i>1<#sep>11 +1 +${x + y} \ No newline at end of file