drop sym->check-map helper, implement check-1

Author: swannodette

src/main/cljs/cljs/spec/test.cljc

@@ -142,10 +142,27 @@ Returns a collection of syms naming the vars unstrumented."
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; testing  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(defmacro sym->check-map
-  [[quote s]]
-  (if-let [{:keys [name] :as v} (ana-api/resolve &env s)]
-    `{:s    '~s
-      :v    (var ~name)
-      :spec (s/get-spec (var ~name))}
-    `{:s    '~s}))
+(defmacro check-1
+  [[quote s] f opts]
+  (let [{:keys [name] :as v} (ana-api/resolve &env s)]
+    `(let [s#        '~name
+           opts#     ~opts
+           v#        ~(when v `(var ~name))
+           spec#     ~(when v `(s/get-spec (var ~name)))
+           re-inst?# (and v# (seq (unstrument '~name)) true)
+           f#        (or ~f (when v# @v#))]
+       (try
+         (cond
+           (nil? f#)
+           {:failure (ex-info "No fn to spec" {::s/failure :no-fn})
+            :sym     s# :spec spec#}
+
+           (:args spec#)
+           (let [tcret# (quick-check f# spec# opts#)]
+             (make-check-result s# spec# tcret#))
+
+           :default
+           {:failure (ex-info "No :args spec" {::s/failure :no-args-spec})
+            :sym     s# :spec spec#})
+         (finally
+           (when re-inst?# (instrument '~name)))))))

src/main/cljs/cljs/spec/test.cljs

@@ -222,26 +222,6 @@ with explain-data + ::s/failure."
     (when-let [shrunk (-> test-check-ret :shrunk)]
       {:failure (:result shrunk)})))
 
-(defn- check-1
-  [{:keys [s f v spec]} opts]
-  (let [re-inst? (and v (seq (unstrument s)) true)
-        f (or f (when v @v))]
-    (try
-      (cond
-        (nil? f)
-        {:failure (ex-info "No fn to spec" {::s/failure :no-fn})
-         :sym s :spec spec}
-
-        (:args spec)
-        (let [tcret (quick-check f spec opts)]
-          (make-check-result s spec tcret))
-
-        :default
-        {:failure (ex-info "No :args spec" {::s/failure :no-args-spec})
-         :sym s :spec spec})
-      (finally
-        (when re-inst? (instrument s))))))
-
 (defn- validate-check-opts
   [opts]
   (assert (every? ident? (keys (:gen opts))) "check :gen expects ident keys"))
@@ -414,9 +394,9 @@ key with a count for each different :type of result."
     ([a b]
      (ranged-rand 8 5)))
   (foo 1 2)
-  (m/unstrument-1 ranged-rand)
+  (m/unstrument-1 `ranged-rand)
 
-  (m/sym->check-map 'ranged-rand)
+  (m/check-1 `ranged-rand nil {})
   )