CLJS-2852: Clojure imparity: ns-publics returns different arglists for macros

Author: mfikes

src/main/clojure/cljs/core.cljc

@@ -3056,19 +3056,27 @@
          (.push ~dest (unchecked-get (js-arguments) i#))
          (recur (inc i#))))))
 
+(core/defn- elide-implicit-macro-args [arglists]
+  (core/map (core/fn [arglist]
+              (if (core/vector? arglist)
+                (core/subvec arglist 2)
+                (core/drop 2 arglist)))
+    arglists))
+
 (core/defn- variadic-fn [name meta [[arglist & body :as method] :as fdecl] emit-var?]
   (core/letfn [(dest-args [c]
                  (map (core/fn [n] `(unchecked-get (js-arguments) ~n))
                    (range c)))]
     (core/let [rname (symbol (core/str ana/*cljs-ns*) (core/str name))
                sig   (remove '#{&} arglist)
                c-1   (core/dec (count sig))
+               macro? (:macro meta)
                meta  (assoc meta
                        :top-fn
                        {:variadic? true
-                        :max-fixed-arity c-1
-                        :method-params [sig]
-                        :arglists (core/list arglist)
+                        :max-fixed-arity (core/cond-> c-1 macro? (core/- 2))
+                        :method-params (core/cond-> [sig] macro? elide-implicit-macro-args)
+                        :arglists (core/cond-> (core/list arglist) macro? elide-implicit-macro-args)
                         :arglists-meta (doall (map meta [arglist]))})]
       `(do
          (def ~(with-meta name meta)
@@ -3117,12 +3125,13 @@
                           (concat
                             (map count sigs)
                             [(core/- (count (first (filter varsig? arglists))) 2)]))
+               macro?   (:macro meta)
                meta     (assoc meta
                           :top-fn
                           {:variadic? variadic
-                           :max-fixed-arity maxfa
-                           :method-params sigs
-                           :arglists arglists
+                           :max-fixed-arity (core/cond-> maxfa macro? (core/- 2))
+                           :method-params (core/cond-> sigs macro? elide-implicit-macro-args)
+                           :arglists (core/cond-> arglists macro? elide-implicit-macro-args)
                            :arglists-meta (doall (map meta arglists))})
                args-sym (gensym "args")
                param-counts (map count arglists)]

src/test/cljs/cljs/macro_test.cljs

@@ -9,7 +9,8 @@
 (ns cljs.macro-test
   (:refer-clojure :exclude [==])
   (:require [cljs.test :refer-macros [deftest is]])
-  (:use-macros [cljs.macro-test.macros :only [==]]))
+  (:use-macros [cljs.macro-test.macros :only [==]])
+  (:require-macros [cljs.macro-test.cljs2852]))
 
 (deftest test-macros
   (is (= (== 1 1) 2)))
@@ -22,3 +23,8 @@
 
 (deftest test-cljs-2283
   (is (= ":a" (first (js-keys (js-obj :a 1))))))
+
+(deftest test-cljs-2852
+  (is (= '([x])) (cljs.macro-test.cljs2852/beta))
+  (is (= '([x] [x y])) (cljs.macro-test.cljs2852/delta))
+  (is (= '([x] [x & xs])) (cljs.macro-test.cljs2852/zeta)))

src/test/cljs/cljs/macro_test/cljs2852.clj

@@ -0,0 +1,21 @@
+(ns cljs.macro-test.cljs2852)
+
+(defmacro alpha
+  ([x]))
+
+(defmacro beta []
+  `'~(:arglists (meta #'alpha)))
+
+(defmacro gamma
+  ([x])
+  ([x y]))
+
+(defmacro delta []
+  `'~(:arglists (meta #'gamma)))
+
+(defmacro epsilon
+  ([x])
+  ([x & xs]))
+
+(defmacro zeta []
+  `'~(:arglists (meta #'epsilon)))