From commits-return-5805-archive-asf-public=cust-asf.ponee.io@groovy.apache.org Fri Mar 9 06:01:49 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 5373C18064C for ; Fri, 9 Mar 2018 06:01:49 +0100 (CET) Received: (qmail 65989 invoked by uid 500); 9 Mar 2018 05:01:48 -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 65980 invoked by uid 99); 9 Mar 2018 05:01:48 -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; Fri, 09 Mar 2018 05:01:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AB45AF6515; Fri, 9 Mar 2018 05:01:47 +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: <7ca1c8ae81bc41908e05672c68c80758@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: groovy git commit: Trivial refactoring: remove duplicated code of number calculation Date: Fri, 9 Mar 2018 05:01:47 +0000 (UTC) Repository: groovy Updated Branches: refs/heads/master f73d55170 -> c8446c770 Trivial refactoring: remove duplicated code of number calculation Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/c8446c77 Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/c8446c77 Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/c8446c77 Branch: refs/heads/master Commit: c8446c770b68e699d00557ee655adbcd5be6919e Parents: f73d551 Author: sunlan Authored: Fri Mar 9 13:01:41 2018 +0800 Committer: sunlan Committed: Fri Mar 9 13:01:41 2018 +0800 ---------------------------------------------------------------------- .../runtime/dgmimpl/NumberNumberMetaMethod.java | 34 +++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/c8446c77/src/main/java/org/codehaus/groovy/runtime/dgmimpl/NumberNumberMetaMethod.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/NumberNumberMetaMethod.java b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/NumberNumberMetaMethod.java index 7e588cc..6dcddfb 100644 --- a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/NumberNumberMetaMethod.java +++ b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/NumberNumberMetaMethod.java @@ -60,59 +60,61 @@ public abstract class NumberNumberMetaMethod extends CallSiteAwareMetaMethod { } public CallSite createPojoCallSite(CallSite site, MetaClassImpl metaClass, MetaMethod metaMethod, Class[] params, Object receiver, Object[] args) { + Object firstArg = args[0]; + if (receiver instanceof Integer) { - if (args[0] instanceof Integer) + if (firstArg instanceof Integer) return createIntegerInteger(site, metaClass, metaMethod, params, receiver, args); - if (args[0] instanceof Long) + if (firstArg instanceof Long) return createIntegerLong(site, metaClass, metaMethod, params, receiver, args); - if (args[0] instanceof Float) + if (firstArg instanceof Float) return createIntegerFloat(site, metaClass, metaMethod, params, receiver, args); - if (args[0] instanceof Double) + if (firstArg instanceof Double) return createIntegerDouble(site, metaClass, metaMethod, params, receiver, args); } if (receiver instanceof Long) { - if (args[0] instanceof Integer) + if (firstArg instanceof Integer) return createLongInteger(site, metaClass, metaMethod, params, receiver, args); - if (args[0] instanceof Long) + if (firstArg instanceof Long) return createLongLong(site, metaClass, metaMethod, params, receiver, args); - if (args[0] instanceof Float) + if (firstArg instanceof Float) return createLongFloat(site, metaClass, metaMethod, params, receiver, args); - if (args[0] instanceof Double) + if (firstArg instanceof Double) return createLongDouble(site, metaClass, metaMethod, params, receiver, args); } if (receiver instanceof Float) { - if (args[0] instanceof Integer) + if (firstArg instanceof Integer) return createFloatInteger(site, metaClass, metaMethod, params, receiver, args); - if (args[0] instanceof Long) + if (firstArg instanceof Long) return createFloatLong(site, metaClass, metaMethod, params, receiver, args); - if (args[0] instanceof Float) + if (firstArg instanceof Float) return createFloatFloat(site, metaClass, metaMethod, params, receiver, args); - if (args[0] instanceof Double) + if (firstArg instanceof Double) return createFloatDouble(site, metaClass, metaMethod, params, receiver, args); } if (receiver instanceof Double) { - if (args[0] instanceof Integer) + if (firstArg instanceof Integer) return createDoubleInteger(site, metaClass, metaMethod, params, receiver, args); - if (args[0] instanceof Long) + if (firstArg instanceof Long) return createDoubleLong(site, metaClass, metaMethod, params, receiver, args); - if (args[0] instanceof Float) + if (firstArg instanceof Float) return createDoubleFloat(site, metaClass, metaMethod, params, receiver, args); - if (args[0] instanceof Double) + if (firstArg instanceof Double) return createDoubleDouble(site, metaClass, metaMethod, params, receiver, args); }