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 2020/01/11 20:03:30 UTC
[groovy] 02/02: Assure values sorted in ascending order
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 9e42796c1bbdb7a587d41e17b1ec3557058d0ce1
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sun Jan 12 03:59:43 2020 +0800
Assure values sorted in ascending order
(cherry picked from commit a8925eccf6bd6eac12d2f518d35e62833a359932)
---
src/main/java/org/apache/groovy/ast/tools/ExpressionUtils.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/groovy/ast/tools/ExpressionUtils.java b/src/main/java/org/apache/groovy/ast/tools/ExpressionUtils.java
index 648a295..5e328ad 100644
--- a/src/main/java/org/apache/groovy/ast/tools/ExpressionUtils.java
+++ b/src/main/java/org/apache/groovy/ast/tools/ExpressionUtils.java
@@ -34,6 +34,7 @@ import org.codehaus.groovy.runtime.typehandling.NumberMath;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.Arrays;
+import java.util.stream.IntStream;
import static org.codehaus.groovy.syntax.Types.BITWISE_AND;
import static org.codehaus.groovy.syntax.Types.BITWISE_OR;
@@ -50,11 +51,10 @@ import static org.codehaus.groovy.syntax.Types.RIGHT_SHIFT_UNSIGNED;
public class ExpressionUtils {
// NOTE: values are sorted in ascending order
- private static final int[] HANDLED_TYPES = {
- PLUS, MINUS, MULTIPLY, DIVIDE, POWER,
- LEFT_SHIFT, RIGHT_SHIFT, RIGHT_SHIFT_UNSIGNED,
- BITWISE_OR, BITWISE_AND, BITWISE_XOR,
- };
+ private static final int[] HANDLED_TYPES = IntStream.of(
+ PLUS, MINUS, MULTIPLY, DIVIDE, POWER,
+ LEFT_SHIFT, RIGHT_SHIFT, RIGHT_SHIFT_UNSIGNED,
+ BITWISE_OR, BITWISE_AND, BITWISE_XOR).sorted().toArray();
private ExpressionUtils() {
}