CLJS-2887: Improve names in core macro specs

Author: mfikes

src/main/cljs/cljs/core/specs/alpha.cljc

@@ -16,17 +16,17 @@
 (s/def ::local-name (s/and simple-symbol? #(not= '& %)))
 
 (s/def ::binding-form
-  (s/or :sym ::local-name
-        :seq ::seq-binding-form
-        :map ::map-binding-form))
+  (s/or :local-symbol ::local-name
+        :seq-destructure ::seq-binding-form
+        :map-destructure ::map-binding-form))
 
 ;; sequential destructuring
 
 (s/def ::seq-binding-form
   (s/and vector?
-         (s/cat :elems (s/* ::binding-form)
-                :rest (s/? (s/cat :amp #{'&} :form ::binding-form))
-                :as (s/? (s/cat :as #{:as} :sym ::local-name)))))
+         (s/cat :forms (s/* ::binding-form)
+                :rest-forms (s/? (s/cat :ampersand #{'&} :form ::binding-form))
+                :as-form (s/? (s/cat :as #{:as} :as-sym ::local-name)))))
 
 ;; map destructuring
 
@@ -47,16 +47,21 @@
     (s/coll-of simple-symbol? :kind vector?)))
 
 (s/def ::map-bindings
-  (s/every (s/or :mb ::map-binding
-                 :nsk ::ns-keys
-                 :msb (s/tuple #{:as :or :keys :syms :strs} any?)) :kind map?))
+  (s/every (s/or :map-binding ::map-binding
+                 :qualified-keys-or-syms ::ns-keys
+                 :special-binding (s/tuple #{:as :or :keys :syms :strs} any?)) :kind map?))
 
 (s/def ::map-binding-form (s/merge ::map-bindings ::map-special-binding))
 
 ;; bindings
 
-(s/def ::binding (s/cat :binding ::binding-form :init-expr any?))
-(s/def ::bindings (s/and vector? (s/* ::binding)))
+(defn even-number-of-forms?
+  "Returns true if there are an even number of forms in a binding vector"
+  [forms]
+  (even? (count forms)))
+
+(s/def ::binding (s/cat :form ::binding-form :init-expr any?))
+(s/def ::bindings (s/and vector? even-number-of-forms? (s/* ::binding)))
 
 ;; let, if-let, when-let
 
@@ -75,25 +80,25 @@
 
 ;; defn, defn-, fn
 
-(s/def ::arg-list
+(s/def ::param-list
   (s/and
     vector?
-    (s/cat :args (s/* ::binding-form)
-           :varargs (s/? (s/cat :amp #{'&} :form ::binding-form)))))
+    (s/cat :params (s/* ::binding-form)
+           :var-params (s/? (s/cat :ampersand #{'&} :var-form ::binding-form)))))
 
-(s/def ::args+body
-  (s/cat :args ::arg-list
+(s/def ::params+body
+  (s/cat :params ::param-list
          :body (s/alt :prepost+body (s/cat :prepost map?
                                            :body (s/+ any?))
                       :body (s/* any?))))
 
 (s/def ::defn-args
-  (s/cat :name simple-symbol?
+  (s/cat :fn-name simple-symbol?
          :docstring (s/? string?)
          :meta (s/? map?)
-         :bs (s/alt :arity-1 ::args+body
-                    :arity-n (s/cat :bodies (s/+ (s/spec ::args+body))
-                                    :attr (s/? map?)))))
+         :fn-tail (s/alt :arity-1 ::params+body
+                         :arity-n (s/cat :bodies (s/+ (s/spec ::params+body))
+                                         :attr-map (s/? map?)))))
 
 (s/fdef core/defn
   :args ::defn-args
@@ -104,9 +109,9 @@
   :ret any?)
 
 (s/fdef core/fn
-  :args (s/cat :name (s/? simple-symbol?)
-               :bs (s/alt :arity-1 ::args+body
-                          :arity-n (s/+ (s/spec ::args+body))))
+  :args (s/cat :fn-name (s/? simple-symbol?)
+               :fn-tail (s/alt :arity-1 ::params+body
+                               :arity-n (s/+ (s/spec ::params+body))))
   :ret any?)
 
 ;;;; ns
@@ -118,7 +123,7 @@
 
 (s/def ::ns-refer-clojure
   (s/spec (s/cat :clause #{:refer-clojure}
-                 :filters ::filters)))
+                 :refer-filters ::filters)))
 
 (s/def ::refer (s/coll-of simple-symbol?))
 (s/def ::refer-macros (s/coll-of simple-symbol?))
@@ -150,7 +155,7 @@
 (s/def ::package-list
   (s/spec
     (s/cat :package simple-symbol?
-           :classes (s/* simple-symbol?))))
+           :classes (s/+ simple-symbol?))))
 
 (s/def ::import-list
   (s/* (s/alt :class simple-symbol?
@@ -193,10 +198,10 @@
               :use-macros ::ns-use-macros)))
 
 (s/def ::ns-form
-  (s/cat :name simple-symbol?
+  (s/cat :ns-name simple-symbol?
          :docstring (s/? string?)
          :attr-map (s/? map?)
-         :clauses ::ns-clauses))
+         :ns-clauses ::ns-clauses))
 
 (s/fdef core/ns-special-form
   :args ::ns-form)