Update to Java commit 68a53fa (2024.02.08): CLJ-2813 Anonymous args accept non-integers, also allows discarded content

Author: dmiller

Clojure/Clojure.Tests/clojure/test_clojure/reader.cljc

@@ -428,12 +428,13 @@
     (doseq [form top-levels]
       (clojure.walk/postwalk
         #(when (list? %)
-           (is (= (expected-metadata (first %))
-                  (meta %)))
+           (when (contains? expected-metadata (first %))
+             (is (= (expected-metadata (first %))
+                   (meta %))))
            (is (->> (meta %)
                  vals
                  (filter number?)
-                 (every? (partial instance? Int32))))                                      ;;; Integer
+                 (every? (partial instance? Int32))))                     ;;; Integer
            (swap! verified-forms inc))
         form))
     ;; sanity check against e.g. reading returning ()
@@ -453,7 +454,26 @@
 
 ;; Anonymous function literal (#())
 
-(deftest t-Anonymouns-function-literal)
+(deftest t-Anonymous-function-literal
+  ;; #(vector %) => #(fn* [gen__#] (vector gen__#))
+  ;; [\S]+ matches the anon arg, then \1 is backref matching first group
+  (is (= "(fn* [] (vector))" (pr-str (read-string "#(vector)"))))
+  (is (not (nil? (re-matches #"\(fn\* \[([\S]+)] \(vector \1\)\)" (pr-str (read-string "#(vector %)"))))))
+  (is (not (nil? (re-matches #"\(fn\* \[([\S]+)] \(vector \1 \1\)\)" (pr-str (read-string "#(vector % %)"))))))
+  (is (not (nil? (re-matches #"\(fn\* \[([\S]+)] \(vector \1 \1\)\)" (pr-str (read-string "#(vector % %1)"))))))
+  (is (not (nil? (re-matches #"\(fn\* \[([\S]+) ([\S]+)] \(vector \1 \2\)\)" (pr-str (read-string "#(vector %1 %2)"))))))
+  (is (not (nil? (re-matches #"\(fn\* \[([\S]+) ([\S]+) & ([\S]+)] \(vector \2 \3\)\)" (pr-str (read-string "#(vector %2 %&)"))))))
+
+  ;; invalid formats
+  (is (thrown? Exception (read-string "#(vector %%)")))                                                                 ;;; RuntimeException
+  (is (thrown? Exception (read-string "#(vector %1/2)"))) 																;;; RuntimeException
+  (is (thrown? Exception (read-string "#(vector %1.5)"))) 																;;; RuntimeException
+  (is (thrown? Exception (read-string "#(vector %-0.2)"))) 																;;; RuntimeException
+  (is (thrown? Exception (read-string "#(vector %3M)"))) 																;;; RuntimeException
+
+  ;; check sneaking in discarded content
+  (is (thrown? Exception (read-string "#(list %#_(first arg)1.00000001 %#_(secong arg)2r10 %#_(rest arg)-1.5)"))) 	    ;;; RuntimeException
+  )
 
 ;; Syntax-quote (`, note, the "backquote" character), Unquote (~) and
 ;; Unquote-splicing (~@)

Clojure/Clojure/Lib/LispReader.cs

@@ -571,6 +571,7 @@ public static object InterpretToken(string rawToken, string token, string mask,
         //static Regex symbolPat = new Regex("[:]?([\\D&&[^/]].*/)?(/|[\\D&&[^/]][^/]*)");
         static readonly Regex symbolPat = new Regex("^[:]?([^\\p{Nd}/].*/)?(/|[^\\p{Nd}/][^/]*)$");
         static readonly Regex keywordPat = new Regex("^[:]?([^/].*/)?(/|[^/][^/]*)$");
+        static readonly Regex argPat = new Regex("^%(?:(&)|([1-9][0-9]*))?$");
 
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "Standard API")]
         private static void ExtractNamesUsingMask(string token, string maskNS, string maskName, out string ns, out string name)
@@ -1778,27 +1779,21 @@ sealed class ArgReader : ReaderBase
         {
             protected override object Read(PushbackTextReader r, char pct, object opts, object pendingForms)
             {
-                //if (ARG_ENV.deref() == null)
-                //    return interpretToken(readToken(r, '%'));
+                var token = readSimpleToken(r, '%');
+
                 if (ARG_ENV.deref() == null)
                 {
-                    return InterpretToken(readSimpleToken(r, '%'), null);
+                    return InterpretToken(token, null);
                 }
 
-                int ch = r.Read();
-                Unread(r, ch);
-                //% alone is first arg
-                if (ch == -1 || isWhitespace(ch) || isTerminatingMacro(ch))
-                {
-                    return registerArg(1);
-                }
-                //object n = ReadAux(r, true, null, true, opts, pendingForms);
-                object n = ReadAux(r, opts, EnsurePending(pendingForms));
-                if (n.Equals(Compiler.AmpersandSym))
-                    return registerArg(-1);
-                if (!Util.IsNumeric(n))
+                Match m = argPat.Match(token);
+                if (!m.Success)
                     throw new ArgumentException("arg literal must be %, %& or %integer");
-                return registerArg(Util.ConvertToInt(n));
+
+                if (m.Groups[1].Success) // %&
+                    return registerArg(-1);
+
+                return registerArg(m.Groups[2].Success ? int.Parse(m.Groups[2].Value) : 1);
             }
 
             [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "ClojureJVM name match")]