From commits-return-7030-archive-asf-public=cust-asf.ponee.io@groovy.apache.org Thu Jul 5 02:30:30 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 8A302180608 for ; Thu, 5 Jul 2018 02:30:29 +0200 (CEST) Received: (qmail 55305 invoked by uid 500); 5 Jul 2018 00:30:28 -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 55296 invoked by uid 99); 5 Jul 2018 00:30:28 -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, 05 Jul 2018 00:30:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5DC2EDFB1A; Thu, 5 Jul 2018 00:30:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sunlan@apache.org To: commits@groovy.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: groovy git commit: Stop supporting qualifying path expression with `def` for the time being Date: Thu, 5 Jul 2018 00:30:28 +0000 (UTC) Repository: groovy Updated Branches: refs/heads/master 9677e936f -> ce7e5a754 Stop supporting qualifying path expression with `def` for the time being The enhanced command expression introduces ambiguities, we should resolve them later. http://ci.groovy-lang.org/viewLog.html?buildId=51095&tab=buildResultsDiv&buildTypeId=Groovy_Jdk8Build_PlusSnapshotDeploy&guest=1 Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/ce7e5a75 Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/ce7e5a75 Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/ce7e5a75 Branch: refs/heads/master Commit: ce7e5a754115ce6d7791763c862ef8061bbb8dd7 Parents: 9677e93 Author: sunlan Authored: Thu Jul 5 08:30:17 2018 +0800 Committer: sunlan Committed: Thu Jul 5 08:30:17 2018 +0800 ---------------------------------------------------------------------- src/antlr/GroovyParser.g4 | 2 +- .../parser-antlr4/src/test/resources/bugs/BUG-GROOVY-8641.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/ce7e5a75/src/antlr/GroovyParser.g4 ---------------------------------------------------------------------- diff --git a/src/antlr/GroovyParser.g4 b/src/antlr/GroovyParser.g4 index e420c15..f2a3e2f 100644 --- a/src/antlr/GroovyParser.g4 +++ b/src/antlr/GroovyParser.g4 @@ -1146,7 +1146,7 @@ identifier { DOT == _input.LT(2).getType() }? STATIC | IN - | DEF +// | DEF | TRAIT | AS ; http://git-wip-us.apache.org/repos/asf/groovy/blob/ce7e5a75/subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-8641.groovy ---------------------------------------------------------------------- diff --git a/subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-8641.groovy b/subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-8641.groovy index ac4e3ae..dd55c2c 100644 --- a/subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-8641.groovy +++ b/subprojects/parser-antlr4/src/test/resources/bugs/BUG-GROOVY-8641.groovy @@ -26,7 +26,7 @@ def delegate = new Object() { delegate.with { in.foo - def.foo +// def.foo trait.foo as.foo }