From commits-return-8221-archive-asf-public=cust-asf.ponee.io@groovy.apache.org Fri Apr 5 18:41:05 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 [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 6BE5D18060F for ; Fri, 5 Apr 2019 20:41:04 +0200 (CEST) Received: (qmail 75911 invoked by uid 500); 5 Apr 2019 18:41:03 -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 75898 invoked by uid 99); 5 Apr 2019 18:41:03 -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; Fri, 05 Apr 2019 18:41:03 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id EE4E389A5E; Fri, 5 Apr 2019 18:41:02 +0000 (UTC) Date: Fri, 05 Apr 2019 18:41:02 +0000 To: "commits@groovy.apache.org" Subject: [groovy] branch master updated: Trivial refactoring: Remove duplicated branch in `switch` statement MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <155448966282.10869.15118314272883487014@gitbox.apache.org> From: sunlan@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: groovy X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 9833db6c25de2284d9470fadb190ab362c5644a5 X-Git-Newrev: 336baf0e791223b2be631030c59bf49cd85b2220 X-Git-Rev: 336baf0e791223b2be631030c59bf49cd85b2220 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. sunlan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git The following commit(s) were added to refs/heads/master by this push: new 336baf0 Trivial refactoring: Remove duplicated branch in `switch` statement 336baf0 is described below commit 336baf0e791223b2be631030c59bf49cd85b2220 Author: Daniel Sun AuthorDate: Sat Apr 6 02:39:06 2019 +0800 Trivial refactoring: Remove duplicated branch in `switch` statement --- src/main/java/org/codehaus/groovy/syntax/Types.java | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/codehaus/groovy/syntax/Types.java b/src/main/java/org/codehaus/groovy/syntax/Types.java index 3415bd3..91a98d1 100644 --- a/src/main/java/org/codehaus/groovy/syntax/Types.java +++ b/src/main/java/org/codehaus/groovy/syntax/Types.java @@ -506,6 +506,8 @@ public class Types { return specific >= NEWLINE && specific <= PIPE; case LITERAL: + + case LITERAL_EXPRESSION: return specific >= STRING && specific <= DECIMAL_NUMBER; case NUMBER: @@ -526,6 +528,8 @@ public class Types { return specific == KEYWORD_TRUE || specific == KEYWORD_FALSE; case TYPE_NAME: + + case CREATABLE_TYPE_NAME: if (specific == IDENTIFIER) { return true; } @@ -535,12 +539,7 @@ public class Types { case PRIMITIVE_TYPE: return specific >= KEYWORD_VOID && specific <= KEYWORD_CHAR; - case CREATABLE_TYPE_NAME: - if (specific == IDENTIFIER) { - return true; - } - - /* FALL THROUGH */ + /* FALL THROUGH */ case CREATABLE_PRIMITIVE_TYPE: return specific >= KEYWORD_BOOLEAN && specific <= KEYWORD_CHAR; @@ -726,9 +725,6 @@ public class Types { } break; - case LITERAL_EXPRESSION: - return specific >= STRING && specific <= DECIMAL_NUMBER; - case ARRAY_EXPRESSION: return specific == LEFT_SQUARE_BRACKET; @@ -828,6 +824,8 @@ public class Types { case SYNTH_MIXIN: case SYNTH_METHOD: case SYNTH_PROPERTY: + + case SYNTH_VARIABLE_DECLARATION: return actual == IDENTIFIER; case SYNTH_LIST: @@ -843,9 +841,6 @@ public class Types { case SYNTH_LABEL: return actual == COLON; - - case SYNTH_VARIABLE_DECLARATION: - return actual == IDENTIFIER; } return false;