You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2023/01/10 08:15:03 UTC
[groovy] branch master updated: copy containa DGM primitive array methods to ArrayGroovyMethods
This is an automated email from the ASF dual-hosted git repository.
paulk 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 0ebf400af2 copy containa DGM primitive array methods to ArrayGroovyMethods
0ebf400af2 is described below
commit 0ebf400af212759efa9193f3603f69549150c257
Author: Paul King <pa...@asert.com.au>
AuthorDate: Tue Jan 10 18:14:43 2023 +1000
copy containa DGM primitive array methods to ArrayGroovyMethods
---
.../groovy/runtime/ArrayGroovyMethods.java | 122 ++++++++++++++++++++
.../groovy/runtime/DefaultGroovyMethods.java | 126 ++++-----------------
2 files changed, 145 insertions(+), 103 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/runtime/ArrayGroovyMethods.java b/src/main/java/org/codehaus/groovy/runtime/ArrayGroovyMethods.java
index c7f571e3f6..4543d05bc4 100644
--- a/src/main/java/org/codehaus/groovy/runtime/ArrayGroovyMethods.java
+++ b/src/main/java/org/codehaus/groovy/runtime/ArrayGroovyMethods.java
@@ -24,6 +24,7 @@ import groovy.transform.stc.ClosureParams;
import groovy.transform.stc.FirstParam;
import groovy.transform.stc.FromString;
import org.codehaus.groovy.runtime.callsite.BooleanClosureWrapper;
+import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
import org.codehaus.groovy.util.BooleanArrayIterator;
import org.codehaus.groovy.util.ByteArrayIterator;
import org.codehaus.groovy.util.CharArrayIterator;
@@ -674,6 +675,127 @@ public class ArrayGroovyMethods {
// collectMany
//-------------------------------------------------------------------------
// contains
+
+ /**
+ * Checks whether the array contains the given value.
+ *
+ * @param self the array within which we count the number of occurrences
+ * @param value the value being searched for
+ * @return the number of occurrences
+ * @since 1.8.6
+ */
+ public static boolean contains(boolean[] self, Object value) {
+ for (boolean next : self) {
+ if (DefaultTypeTransformation.compareEqual(value, next)) return true;
+ }
+ return false;
+ }
+
+ /**
+ * Checks whether the array contains the given value.
+ *
+ * @param self the array we are searching
+ * @param value the value being searched for
+ * @return true if the array contains the value
+ * @since 1.8.6
+ */
+ public static boolean contains(byte[] self, Object value) {
+ for (byte next : self) {
+ if (DefaultTypeTransformation.compareEqual(value, next)) return true;
+ }
+ return false;
+ }
+
+ /**
+ * Checks whether the array contains the given value.
+ *
+ * @param self the array we are searching
+ * @param value the value being searched for
+ * @return true if the array contains the value
+ * @since 1.8.6
+ */
+ public static boolean contains(char[] self, Object value) {
+ for (char next : self) {
+ if (DefaultTypeTransformation.compareEqual(value, next)) return true;
+ }
+ return false;
+ }
+
+ /**
+ * Checks whether the array contains the given value.
+ *
+ * @param self the array we are searching
+ * @param value the value being searched for
+ * @return true if the array contains the value
+ * @since 1.8.6
+ */
+ public static boolean contains(short[] self, Object value) {
+ for (short next : self) {
+ if (DefaultTypeTransformation.compareEqual(value, next)) return true;
+ }
+ return false;
+ }
+
+ /**
+ * Checks whether the array contains the given value.
+ *
+ * @param self the array we are searching
+ * @param value the value being searched for
+ * @return true if the array contains the value
+ * @since 1.8.6
+ */
+ public static boolean contains(int[] self, Object value) {
+ for (int next : self) {
+ if (DefaultTypeTransformation.compareEqual(value, next)) return true;
+ }
+ return false;
+ }
+
+ /**
+ * Checks whether the array contains the given value.
+ *
+ * @param self the array we are searching
+ * @param value the value being searched for
+ * @return true if the array contains the value
+ * @since 1.8.6
+ */
+ public static boolean contains(long[] self, Object value) {
+ for (long next : self) {
+ if (DefaultTypeTransformation.compareEqual(value, next)) return true;
+ }
+ return false;
+ }
+
+ /**
+ * Checks whether the array contains the given value.
+ *
+ * @param self the array we are searching
+ * @param value the value being searched for
+ * @return true if the array contains the value
+ * @since 1.8.6
+ */
+ public static boolean contains(float[] self, Object value) {
+ for (float next : self) {
+ if (DefaultTypeTransformation.compareEqual(value, next)) return true;
+ }
+ return false;
+ }
+
+ /**
+ * Checks whether the array contains the given value.
+ *
+ * @param self the array we are searching
+ * @param value the value being searched for
+ * @return true if the array contains the value
+ * @since 1.8.6
+ */
+ public static boolean contains(double[] self, Object value) {
+ for (double next : self) {
+ if (DefaultTypeTransformation.compareEqual(value, next)) return true;
+ }
+ return false;
+ }
+
//-------------------------------------------------------------------------
// count
diff --git a/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java b/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
index 54534da62a..67cf127d7a 100644
--- a/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
+++ b/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
@@ -15270,124 +15270,44 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
return self;
}
- /**
- * Checks whether the array contains the given value.
- *
- * @param self the array we are searching
- * @param value the value being searched for
- * @return true if the array contains the value
- * @since 1.8.6
- */
- public static boolean contains(int[] self, Object value) {
- for (int next : self) {
- if (DefaultTypeTransformation.compareEqual(value, next)) return true;
- }
- return false;
+ @Deprecated
+ public static boolean contains(boolean[] self, Object value) {
+ return ArrayGroovyMethods.contains(self, value);
}
- /**
- * Checks whether the array contains the given value.
- *
- * @param self the array we are searching
- * @param value the value being searched for
- * @return true if the array contains the value
- * @since 1.8.6
- */
- public static boolean contains(long[] self, Object value) {
- for (long next : self) {
- if (DefaultTypeTransformation.compareEqual(value, next)) return true;
- }
- return false;
+ @Deprecated
+ public static boolean contains(byte[] self, Object value) {
+ return ArrayGroovyMethods.contains(self, value);
}
- /**
- * Checks whether the array contains the given value.
- *
- * @param self the array we are searching
- * @param value the value being searched for
- * @return true if the array contains the value
- * @since 1.8.6
- */
- public static boolean contains(short[] self, Object value) {
- for (short next : self) {
- if (DefaultTypeTransformation.compareEqual(value, next)) return true;
- }
- return false;
+ @Deprecated
+ public static boolean contains(char[] self, Object value) {
+ return ArrayGroovyMethods.contains(self, value);
}
- /**
- * Checks whether the array contains the given value.
- *
- * @param self the array we are searching
- * @param value the value being searched for
- * @return true if the array contains the value
- * @since 1.8.6
- */
- public static boolean contains(char[] self, Object value) {
- for (char next : self) {
- if (DefaultTypeTransformation.compareEqual(value, next)) return true;
- }
- return false;
+ @Deprecated
+ public static boolean contains(short[] self, Object value) {
+ return ArrayGroovyMethods.contains(self, value);
}
- /**
- * Checks whether the array contains the given value.
- *
- * @param self the array within which we count the number of occurrences
- * @param value the value being searched for
- * @return the number of occurrences
- * @since 1.8.6
- */
- public static boolean contains(boolean[] self, Object value) {
- for (boolean next : self) {
- if (DefaultTypeTransformation.compareEqual(value, next)) return true;
- }
- return false;
+ @Deprecated
+ public static boolean contains(int[] self, Object value) {
+ return ArrayGroovyMethods.contains(self, value);
}
- /**
- * Checks whether the array contains the given value.
- *
- * @param self the array we are searching
- * @param value the value being searched for
- * @return true if the array contains the value
- * @since 1.8.6
- */
- public static boolean contains(double[] self, Object value) {
- for (double next : self) {
- if (DefaultTypeTransformation.compareEqual(value, next)) return true;
- }
- return false;
+ @Deprecated
+ public static boolean contains(long[] self, Object value) {
+ return ArrayGroovyMethods.contains(self, value);
}
- /**
- * Checks whether the array contains the given value.
- *
- * @param self the array we are searching
- * @param value the value being searched for
- * @return true if the array contains the value
- * @since 1.8.6
- */
+ @Deprecated
public static boolean contains(float[] self, Object value) {
- for (float next : self) {
- if (DefaultTypeTransformation.compareEqual(value, next)) return true;
- }
- return false;
+ return ArrayGroovyMethods.contains(self, value);
}
- /**
- * Checks whether the array contains the given value.
- *
- * @param self the array we are searching
- * @param value the value being searched for
- * @return true if the array contains the value
- * @since 1.8.6
- */
- public static boolean contains(byte[] self, Object value) {
- for (byte next : self) {
- if (DefaultTypeTransformation.compareEqual(value, next)) return true;
- }
- return false;
+ @Deprecated
+ public static boolean contains(double[] self, Object value) {
+ return ArrayGroovyMethods.contains(self, value);
}
/**