You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2021/09/19 11:18:14 UTC
[groovy] branch danielsun/tweak-compare-bigdecimal updated (a9b7578
-> 17b5a78)
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a change to branch danielsun/tweak-compare-bigdecimal
in repository https://gitbox.apache.org/repos/asf/groovy.git.
discard a9b7578 Trivial tweak for comparing strings
discard 7c2a223 Trivial tweak for comparing `BigInteger` instances
discard 129d728 Trivial tweak for comparing `BigDecimal` instances
new 17b5a78 Trivial tweak for comparing
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (a9b7578)
\
N -- N -- N refs/heads/danielsun/tweak-compare-bigdecimal (17b5a78)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../groovy/runtime/ScriptBytecodeAdapter.java | 115 ++++++++++++---------
1 file changed, 69 insertions(+), 46 deletions(-)
[groovy] 01/01: Trivial tweak for comparing
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch danielsun/tweak-compare-bigdecimal
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 17b5a7830cdd1e73c6224769e371c26c3729ef68
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sun Sep 19 19:17:57 2021 +0800
Trivial tweak for comparing
---
.../groovy/runtime/ScriptBytecodeAdapter.java | 132 ++++++++++++++++-----
1 file changed, 102 insertions(+), 30 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/runtime/ScriptBytecodeAdapter.java b/src/main/java/org/codehaus/groovy/runtime/ScriptBytecodeAdapter.java
index 9c19475..cb2141d 100644
--- a/src/main/java/org/codehaus/groovy/runtime/ScriptBytecodeAdapter.java
+++ b/src/main/java/org/codehaus/groovy/runtime/ScriptBytecodeAdapter.java
@@ -20,6 +20,7 @@ package org.codehaus.groovy.runtime;
import groovy.lang.Closure;
import groovy.lang.EmptyRange;
+import groovy.lang.GString;
import groovy.lang.GroovyInterceptable;
import groovy.lang.GroovyObject;
import groovy.lang.GroovyRuntimeException;
@@ -39,6 +40,8 @@ import org.codehaus.groovy.runtime.wrappers.GroovyObjectWrapper;
import org.codehaus.groovy.runtime.wrappers.PojoWrapper;
import org.codehaus.groovy.runtime.wrappers.Wrapper;
+import java.math.BigDecimal;
+import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -725,18 +728,43 @@ public class ScriptBytecodeAdapter {
}
public static boolean compareEqual(Object left, Object right) {
- if (left==right) return true;
- Class<?> leftClass = left==null?null:left.getClass();
- Class<?> rightClass = right==null?null:right.getClass();
- if (leftClass ==Integer.class && rightClass==Integer.class) {
+ if (left == right) return true;
+
+ Class<?> leftClass = left == null ? null : left.getClass();
+ Class<?> rightClass = right == null ? null : right.getClass();
+
+ if (leftClass == Integer.class && rightClass == Integer.class) {
+ return left.equals(right);
+ }
+ if (leftClass == BigDecimal.class && rightClass == BigDecimal.class) {
+ return ((BigDecimal) left).compareTo((BigDecimal) right) == 0;
+ }
+ if (leftClass == BigInteger.class && rightClass == BigInteger.class) {
+ return ((BigInteger) left).compareTo((BigInteger) right) == 0;
+ }
+ if (leftClass == Long.class && rightClass == Long.class) {
+ return left.equals(right);
+ }
+ if (leftClass == Double.class && rightClass == Double.class) {
return left.equals(right);
}
- if (leftClass ==Double.class && rightClass==Double.class) {
+ if (leftClass == Float.class && rightClass == Float.class) {
return left.equals(right);
}
- if (leftClass ==Long.class && rightClass==Long.class) {
+
+ if (leftClass == String.class && rightClass == String.class
+ || left instanceof GString && right instanceof GString
+ || leftClass == String.class && right instanceof GString
+ || left instanceof GString && rightClass == String.class) {
+ if (leftClass != String.class) {
+ left = left.toString();
+ }
+ if (rightClass != String.class) {
+ right = right.toString();
+ }
return left.equals(right);
}
+
return DefaultTypeTransformation.compareEqual(left, right);
}
@@ -754,62 +782,106 @@ public class ScriptBytecodeAdapter {
}
public static boolean compareLessThan(Object left, Object right) {
- Class<?> leftClass = left==null?null:left.getClass();
- Class<?> rightClass = right==null?null:right.getClass();
- if (leftClass ==Integer.class && rightClass==Integer.class) {
+ Class<?> leftClass = left == null ? null : left.getClass();
+ Class<?> rightClass = right == null ? null : right.getClass();
+
+ if (leftClass == Integer.class && rightClass == Integer.class) {
return (Integer) left < (Integer) right;
}
- if (leftClass ==Double.class && rightClass==Double.class) {
- return (Double) left < (Double) right;
+ if (leftClass == BigDecimal.class && rightClass == BigDecimal.class) {
+ return ((BigDecimal) left).compareTo((BigDecimal) right) < 0;
+ }
+ if (leftClass == BigInteger.class && rightClass == BigInteger.class) {
+ return ((BigInteger) left).compareTo((BigInteger) right) < 0;
}
- if (leftClass ==Long.class && rightClass==Long.class) {
+ if (leftClass == Long.class && rightClass == Long.class) {
return (Long) left < (Long) right;
}
+ if (leftClass == Double.class && rightClass == Double.class) {
+ return (Double) left < (Double) right;
+ }
+ if (leftClass == Float.class && rightClass == Float.class) {
+ return (Float) left < (Float) right;
+ }
+
return compareTo(left, right) < 0;
}
public static boolean compareLessThanEqual(Object left, Object right) {
- Class<?> leftClass = left==null?null:left.getClass();
- Class<?> rightClass = right==null?null:right.getClass();
- if (leftClass ==Integer.class && rightClass==Integer.class) {
+ Class<?> leftClass = left == null ? null : left.getClass();
+ Class<?> rightClass = right == null ? null : right.getClass();
+
+ if (leftClass == Integer.class && rightClass == Integer.class) {
return (Integer) left <= (Integer) right;
}
- if (leftClass ==Double.class && rightClass==Double.class) {
- return (Double) left <= (Double) right;
+ if (leftClass == BigDecimal.class && rightClass == BigDecimal.class) {
+ return ((BigDecimal) left).compareTo((BigDecimal) right) <= 0;
+ }
+ if (leftClass == BigInteger.class && rightClass == BigInteger.class) {
+ return ((BigInteger) left).compareTo((BigInteger) right) <= 0;
}
- if (leftClass ==Long.class && rightClass==Long.class) {
+ if (leftClass == Long.class && rightClass == Long.class) {
return (Long) left <= (Long) right;
}
+ if (leftClass == Double.class && rightClass == Double.class) {
+ return (Double) left <= (Double) right;
+ }
+ if (leftClass == Float.class && rightClass == Float.class) {
+ return (Float) left <= (Float) right;
+ }
+
return compareTo(left, right) <= 0;
}
public static boolean compareGreaterThan(Object left, Object right) {
- Class<?> leftClass = left==null?null:left.getClass();
- Class<?> rightClass = right==null?null:right.getClass();
- if (leftClass ==Integer.class && rightClass==Integer.class) {
+ Class<?> leftClass = left == null ? null : left.getClass();
+ Class<?> rightClass = right == null ? null : right.getClass();
+
+ if (leftClass == Integer.class && rightClass == Integer.class) {
return (Integer) left > (Integer) right;
}
- if (leftClass ==Double.class && rightClass==Double.class) {
- return (Double) left > (Double) right;
+ if (leftClass == BigDecimal.class && rightClass == BigDecimal.class) {
+ return ((BigDecimal) left).compareTo((BigDecimal) right) > 0;
}
- if (leftClass ==Long.class && rightClass==Long.class) {
+ if (leftClass == BigInteger.class && rightClass == BigInteger.class) {
+ return ((BigInteger) left).compareTo((BigInteger) right) > 0;
+ }
+ if (leftClass == Long.class && rightClass == Long.class) {
return (Long) left > (Long) right;
}
+ if (leftClass == Double.class && rightClass == Double.class) {
+ return (Double) left > (Double) right;
+ }
+ if (leftClass == Float.class && rightClass == Float.class) {
+ return (Float) left > (Float) right;
+ }
+
return compareTo(left, right) > 0;
}
public static boolean compareGreaterThanEqual(Object left, Object right) {
- Class<?> leftClass = left==null?null:left.getClass();
- Class<?> rightClass = right==null?null:right.getClass();
- if (leftClass ==Integer.class && rightClass==Integer.class) {
+ Class<?> leftClass = left == null ? null : left.getClass();
+ Class<?> rightClass = right == null ? null : right.getClass();
+
+ if (leftClass == Integer.class && rightClass == Integer.class) {
return (Integer) left >= (Integer) right;
}
- if (leftClass ==Double.class && rightClass==Double.class) {
- return (Double) left >= (Double) right;
+ if (leftClass == BigDecimal.class && rightClass == BigDecimal.class) {
+ return ((BigDecimal) left).compareTo((BigDecimal) right) >= 0;
}
- if (leftClass ==Long.class && rightClass==Long.class) {
+ if (leftClass == BigInteger.class && rightClass == BigInteger.class) {
+ return ((BigInteger) left).compareTo((BigInteger) right) >= 0;
+ }
+ if (leftClass == Long.class && rightClass == Long.class) {
return (Long) left >= (Long) right;
}
+ if (leftClass == Double.class && rightClass == Double.class) {
+ return (Double) left >= (Double) right;
+ }
+ if (leftClass == Float.class && rightClass == Float.class) {
+ return (Float) left >= (Float) right;
+ }
+
return compareTo(left, right) >= 0;
}