Update to Java commit e0ac2d7 (2020-12-11): CLJ-2585 - Fix index check in nth with not-found for regex matcher

Author: dmiller

Clojure/Clojure.Tests/clojure/test_clojure/other_functions.clj

@@ -348,6 +348,19 @@
 ; Regex Support
 ; re-matcher re-find re-matches re-groups re-seq
 
+(deftest test-regex-matcher
+  (let [matcher (re-matcher #"(\d{2})/(\d{2})/(\d{4})" "12/02/1975")]
+    (is (= ["12/02/1975" "12" "02" "1975"] (re-find matcher)))
+    (is (= ["12/02/1975" "12" "02" "1975"] (re-groups matcher)))
+    (is (= "12/02/1975" (nth matcher 0) (nth matcher 0 :foo)))
+    (is (= "12" (nth matcher 1) (nth matcher 1 :foo)))
+    (is (= "02" (nth matcher 2) (nth matcher 2 :foo)))
+    (is (= "1975" (nth matcher 3) (nth matcher 3 :foo)))
+    (is (thrown? ArgumentOutOfRangeException (nth matcher -1)))           ;;; IndexOutOfBoundsException
+    (is (= :foo (nth matcher -1 :foo)))
+    (is (thrown? ArgumentOutOfRangeException (nth matcher 4)))            ;;; IndexOutOfBoundsException
+    (is (= :foo (nth matcher 4 :foo)))))
+
 ; update
 
 (deftest test-update

Clojure/Clojure/Lib/RT.cs

@@ -1136,7 +1136,8 @@ static object NthFrom(object coll, int n, object notFound)
             {
                 if (jrem.IsUnrealizedOrFailed)
                     return notFound;
-                if (n < jrem.groupCount())
+                int groups = jrem.groupCount();
+                if (groups > 0 && n <= jrem.groupCount())
                     return jrem.group(n);
                 return notFound;
             }