From commits-return-8860-archive-asf-public=cust-asf.ponee.io@groovy.apache.org Wed Jul 3 02:00:30 2019 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 [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 0A91218060E for ; Wed, 3 Jul 2019 04:00:29 +0200 (CEST) Received: (qmail 9512 invoked by uid 500); 3 Jul 2019 02:00:29 -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 9503 invoked by uid 99); 3 Jul 2019 02:00:29 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Jul 2019 02:00:29 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 1A30D87AD7; Wed, 3 Jul 2019 02:00:29 +0000 (UTC) Date: Wed, 03 Jul 2019 02:00:29 +0000 To: "commits@groovy.apache.org" Subject: [groovy] branch GROOVY_2_5_X updated: GROOVY-9184: reinstate dangling comma case MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <156211922897.10747.11455123678237416106@gitbox.apache.org> From: paulk@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: groovy X-Git-Refname: refs/heads/GROOVY_2_5_X X-Git-Reftype: branch X-Git-Oldrev: beeca7dc59bfbf43a1047796fefd3f8ffd588004 X-Git-Newrev: 58ad2e31dbfb78d9da1e72eefc45f6f92893dee5 X-Git-Rev: 58ad2e31dbfb78d9da1e72eefc45f6f92893dee5 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch GROOVY_2_5_X in repository https://gitbox.apache.org/repos/asf/groovy.git The following commit(s) were added to refs/heads/GROOVY_2_5_X by this push: new 58ad2e3 GROOVY-9184: reinstate dangling comma case 58ad2e3 is described below commit 58ad2e31dbfb78d9da1e72eefc45f6f92893dee5 Author: Paul King AuthorDate: Wed Jul 3 12:00:18 2019 +1000 GROOVY-9184: reinstate dangling comma case --- src/main/antlr2/org/codehaus/groovy/antlr/groovy.g | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/antlr2/org/codehaus/groovy/antlr/groovy.g b/src/main/antlr2/org/codehaus/groovy/antlr/groovy.g index 4458bc7..49f3bad 100644 --- a/src/main/antlr2/org/codehaus/groovy/antlr/groovy.g +++ b/src/main/antlr2/org/codehaus/groovy/antlr/groovy.g @@ -1197,7 +1197,7 @@ enumConstants nls! COMMA! ( (nls annotationsOpt IDENT) => nls! enumConstant | - (nls (RCURLY | classField)) => {break;} + (nls (SEMI! | RCURLY | classField)) => {break;} ) )* ;