Fix multi-arity

Author: chrisrink10

src/basilisp/core.lpy

@@ -7122,14 +7122,22 @@
        ([arg1] ...)
        ([arg1 & others] ...))"
   [class-and-interfaces args & fs]
-  (let [formatted-arity (fn [method-name [arg-vec & body]]
+  (let [formatted-single (fn [method-name [arg-vec & body]]
+                           [(munge method-name)
+                            (apply list 'fn method-name (vec (concat ['this] arg-vec)) body)])
+        formatted-multi (fn [method-name & arities]
                           [(munge method-name)
-                           (apply list 'fn method-name (vec (concat ['this] arg-vec)) body)])
-        methods         (mapcat (fn [[method-name & body]]
-                                  (if (vector? (first body))
-                                    (formatted-arity method-name body)
-                                    (mapcat (partial formatted-arity method-name) body)))
-                                fs)]
+                           (apply list
+                                  'fn
+                                  method-name
+                                  (map (fn [[arg-vec & body]]
+                                         (apply list (vec (concat ['this] arg-vec)) body))
+                                       arities))])
+        methods      (mapcat (fn [[method-name & body]]
+                               (if (vector? (first body))
+                                 (formatted-single method-name body)
+                                 (apply formatted-multi method-name body)))
+                             fs)]
     #_(println methods)
     `((get-proxy-class ~@class-and-interfaces) ~(apply hash-map methods) ~@args)))
 

tests/basilisp/test_proxies.lpy

@@ -41,5 +41,4 @@
                 ([arg1 & args] (str "i am rest " arg1 " " args))))]
       (is (= "hi i am 0" (.to-string p)))
       (is (= "i am 1 yes" (.to-string p "yes")))
-      (is (= "i am rest first " (.to-string p "first")))
       (is (= "i am rest first (:yes)" (.to-string p "first" :yes))))))