Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 4D6A4200C7F for ; Wed, 10 May 2017 04:34:39 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 4BFEA160BC3; Wed, 10 May 2017 02:34:39 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 91957160BB6 for ; Wed, 10 May 2017 04:34:38 +0200 (CEST) Received: (qmail 34361 invoked by uid 500); 10 May 2017 02:34:37 -0000 Mailing-List: contact commits-help@groovy.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@groovy.apache.org Delivered-To: mailing list commits@groovy.apache.org Received: (qmail 34352 invoked by uid 99); 10 May 2017 02:34:37 -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; Wed, 10 May 2017 02:34:37 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8A45EDFDAC; Wed, 10 May 2017 02:34:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: paulk@apache.org To: commits@groovy.apache.org Message-Id: <4086673698f24f8093ab83458016f7e3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: groovy git commit: GString literals can exist within source files at restricted places (originally related to parser restrictions because they start with the same character as comments). They can't start directly after a comment but leaving a blank line Date: Wed, 10 May 2017 02:34:37 +0000 (UTC) archived-at: Wed, 10 May 2017 02:34:39 -0000 Repository: groovy Updated Branches: refs/heads/GROOVY_2_6_X e3ac341b9 -> 7fca4b25c GString literals can exist within source files at restricted places (originally related to parser restrictions because they start with the same character as comments). They can't start directly after a comment but leaving a blank line is sufficient. Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/7fca4b25 Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/7fca4b25 Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/7fca4b25 Branch: refs/heads/GROOVY_2_6_X Commit: 7fca4b25cf7f2d12d059f8ffd00944522e2b7029 Parents: e3ac341 Author: paulk Authored: Wed May 10 12:33:26 2017 +1000 Committer: paulk Committed: Wed May 10 12:34:24 2017 +1000 ---------------------------------------------------------------------- subprojects/parser-antlr4/src/test/resources/core/GString_02.groovy | 1 + subprojects/parser-antlr4/src/test/resources/core/GString_06.groovy | 1 + subprojects/parser-antlr4/src/test/resources/core/Literal_03.groovy | 1 + 3 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/7fca4b25/subprojects/parser-antlr4/src/test/resources/core/GString_02.groovy ---------------------------------------------------------------------- diff --git a/subprojects/parser-antlr4/src/test/resources/core/GString_02.groovy b/subprojects/parser-antlr4/src/test/resources/core/GString_02.groovy index 2e69232..a995cb1 100644 --- a/subprojects/parser-antlr4/src/test/resources/core/GString_02.groovy +++ b/subprojects/parser-antlr4/src/test/resources/core/GString_02.groovy @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + /abc${'123'}def $a.b.c,d${->12}/ $/${-12}abc${'123'}def $a.b.c,d${->12}/$ http://git-wip-us.apache.org/repos/asf/groovy/blob/7fca4b25/subprojects/parser-antlr4/src/test/resources/core/GString_06.groovy ---------------------------------------------------------------------- diff --git a/subprojects/parser-antlr4/src/test/resources/core/GString_06.groovy b/subprojects/parser-antlr4/src/test/resources/core/GString_06.groovy index 18d5770..fa222dc 100644 --- a/subprojects/parser-antlr4/src/test/resources/core/GString_06.groovy +++ b/subprojects/parser-antlr4/src/test/resources/core/GString_06.groovy @@ -16,4 +16,5 @@ * specific language governing permissions and limitations * under the License. */ + /At $date/ \ No newline at end of file http://git-wip-us.apache.org/repos/asf/groovy/blob/7fca4b25/subprojects/parser-antlr4/src/test/resources/core/Literal_03.groovy ---------------------------------------------------------------------- diff --git a/subprojects/parser-antlr4/src/test/resources/core/Literal_03.groovy b/subprojects/parser-antlr4/src/test/resources/core/Literal_03.groovy index 865596b..5c81362 100644 --- a/subprojects/parser-antlr4/src/test/resources/core/Literal_03.groovy +++ b/subprojects/parser-antlr4/src/test/resources/core/Literal_03.groovy @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + /\123 \/ abc \u1234 \r\n\$/ $/\123 \/ abc \u1234 \r\n/$