CLJS-1567: make-array macro missing > 2 arg arity

Adds the additional arity to the macro,
along with tests for the macro and fn.

Author: mfikes

src/main/clojure/cljs/core.cljc

@@ -2335,7 +2335,15 @@
        `(js/Array. ~size))
      assoc :tag 'array))
   ([type size]
-    `(make-array ~size)))
+   `(make-array ~size))
+  ([type size & more-sizes]
+   (vary-meta
+     `(let [dims#     (list ~@more-sizes)
+            dimarray# (make-array ~size)]
+        (dotimes [i# (alength dimarray#)]
+          (aset dimarray# i# (apply make-array nil dims#)))
+        dimarray#)
+     assoc :tag 'array)))
 
 (core/defmacro list
   ([] '(.-EMPTY cljs.core/List))

src/test/cljs/cljs/core_test.cljs

@@ -1061,7 +1061,37 @@
     (is (primitive-arrays-equal #js [nil] (make-array nil 1)))
     (is (primitive-arrays-equal #js [nil] (apply make-array [nil 1])))
     (is (primitive-arrays-equal #js [nil nil] (make-array nil 2)))
-    (is (primitive-arrays-equal #js [nil nil] (apply make-array [nil 2])))))
+    (is (primitive-arrays-equal #js [nil nil] (apply make-array [nil 2])))
+    (is (primitive-arrays-equal #js [] (make-array nil 0 0)))
+    (is (primitive-arrays-equal #js [] (apply make-array [nil 0 0])))
+    (is (primitive-arrays-equal #js [] (make-array nil 0 1)))
+    (is (primitive-arrays-equal #js [] (apply make-array [nil 0 1])))
+    (is (primitive-arrays-equal #js [#js []] (make-array nil 1 0)))
+    (is (primitive-arrays-equal #js [#js []] (apply make-array [nil 1 0])))
+    (is (primitive-arrays-equal #js [#js [] #js []] (make-array nil 2 0)))
+    (is (primitive-arrays-equal #js [#js [] #js []] (apply make-array [nil 2 0])))
+    (is (primitive-arrays-equal #js [#js [nil]] (make-array nil 1 1)))
+    (is (primitive-arrays-equal #js [#js [nil]] (apply make-array [nil 1 1])))
+    (is (primitive-arrays-equal #js [#js [nil] #js [nil]] (make-array nil 2 1)))
+    (is (primitive-arrays-equal #js [#js [nil] #js [nil]] (apply make-array [nil 2 1])))
+    (is (primitive-arrays-equal #js [#js [nil nil] #js [nil nil]] (make-array nil 2 2)))
+    (is (primitive-arrays-equal #js [#js [nil nil] #js [nil nil]] (apply make-array [nil 2 2])))
+    (is (primitive-arrays-equal #js [] (make-array nil 0 0 0)))
+    (is (primitive-arrays-equal #js [] (apply make-array [nil 0 0 0])))
+    (is (primitive-arrays-equal #js [] (make-array nil 0 1 1)))
+    (is (primitive-arrays-equal #js [] (apply make-array [nil 0 1 1])))
+    (is (primitive-arrays-equal #js [#js []] (make-array nil 1 0 0)))
+    (is (primitive-arrays-equal #js [#js []] (apply make-array [nil 1 0 0])))
+    (is (primitive-arrays-equal #js [#js [] #js []] (make-array nil 2 0 0)))
+    (is (primitive-arrays-equal #js [#js [] #js []] (apply make-array [nil 2 0 0])))
+    (is (primitive-arrays-equal #js [#js [#js []]] (make-array nil 1 1 0)))
+    (is (primitive-arrays-equal #js [#js [#js []]] (apply make-array [nil 1 1 0])))
+    (is (primitive-arrays-equal #js [#js [#js [nil]]] (make-array nil 1 1 1)))
+    (is (primitive-arrays-equal #js [#js [#js [nil]]] (apply make-array [nil 1 1 1])))
+    (is (primitive-arrays-equal #js [#js [#js [nil nil] #js [nil nil]] #js [#js [nil nil] #js [nil nil]]]
+          (make-array nil 2 2 2)))
+    (is (primitive-arrays-equal #js [#js [#js [nil nil] #js [nil nil]] #js [#js [nil nil] #js [nil nil]]]
+          (apply make-array [nil 2 2 2])))))
 
 (deftest test-rearrange-sequential
   (testing "Test rearranging sequential collections"