CLJS-1214: :arglists meta has needless quoting

CLJS-1232: bad arglists for doc, regression

more robust handling of quoted arglists.

in all cases check whether :arglists has already been quoted to prevent
quoting multiple times.

in the doc string case, don't blindly use `second` check that we have
something quoted.

Author: dnolen

src/clj/cljs/analyzer.clj

@@ -695,14 +695,20 @@
      :sym (analyze expr-env `(quote ~(symbol (name (:ns var)) (name (:name var)))))
      :meta (let [ks [:ns :doc :file :line :column]
                  m (merge
-                     (assoc (zipmap ks (map #(list 'quote (get var %)) ks))
-                       :name `(quote ~(symbol (name (:name var))))
-                       :test `(when ~sym (.-cljs$lang$test ~sym))
-                       :arglists (map with-meta (:arglists var) (:arglists-meta var)))
                      (let [user-meta (:meta var)
                            uks (keys user-meta)]
                        (zipmap uks
-                         (map #(list 'quote (get user-meta %)) uks))))]
+                         (map #(list 'quote (get user-meta %)) uks)))
+                     (assoc (zipmap ks (map #(list 'quote (get var %)) ks))
+                       :name `(quote ~(symbol (name (:name var))))
+                       :test `(when ~sym (.-cljs$lang$test ~sym))
+                       :arglists (let [arglists (:arglists var)
+                                       arglists' (if (= 'quote (first arglists))
+                                                   (second arglists)
+                                                   arglists)]
+                                   (list 'quote
+                                     (doall (map with-meta arglists'
+                                              (:arglists-meta var)))))))]
              (analyze expr-env m))}))
 
 (defmethod parse 'if

src/clj/cljs/core.clj

@@ -2107,7 +2107,7 @@
                        {:variadic true
                         :max-fixed-arity c-1
                         :method-params [sig]
-                        :arglists [arglist]
+                        :arglists (core/list arglist)
                         :arglists-meta (doall (map meta [arglist]))})]
       `(do
          (def ~(with-meta name meta)

src/cljs/cljs/repl.cljs

@@ -17,10 +17,14 @@
   (cond
     (:forms m) (doseq [f (:forms m)]
                  (println "  " f))
-    (:arglists m) (if (or (:macro m)
-                          (:repl-special-function m))
-                    (prn (:arglists m))
-                    (prn (second (:arglists m)))))
+    (:arglists m) (let [arglists (:arglists m)]
+                    (if (or (:macro m)
+                         (:repl-special-function m))
+                     (prn arglists)
+                     (prn
+                       (if (= 'quote (first arglists))
+                         (second arglists)
+                         arglists)))))
   (if (:special-form m)
     (do
       (println "Special Form")

test/cljs/cljs/core_test.cljs

@@ -2783,6 +2783,12 @@
   (is (= (set {:a 0 :b 0 :c 0 :d 0 :e 0 :f 0 :g 0 :h 0 :i 0})
          #{[:a 0] [:b 0] [:c 0] [:d 0] [:e 0] [:f 0] [:g 0] [:h 0] [:i 0]})))
 
+(deftest test-var-aarglists
+  (is (= (-> #'first meta :arglists) '([coll])))
+  (is (= (-> #'hash-map meta :arglists) '([& keyvals])))
+  (is (= (-> #'map meta :arglists)
+        '([f] [f coll] [f c1 c2] [f c1 c2 c3] [f c1 c2 c3 & colls]))))
+
 (comment
   ;; ObjMap
   ;; (let [ks (map (partial str "foo") (range 500))