same as Clojure 69dd29d2c8

Author: dnolen

src/main/cljs/cljs/spec.cljc

@@ -57,7 +57,8 @@
 
   Returns a spec."
   [form & {:keys [gen]}]
-  `(cljs.spec/spec-impl '~(res &env form) ~form ~gen nil))
+  (when form
+    `(cljs.spec/spec-impl '~(res &env form) ~form ~gen nil)))
 
 (defmacro multi-spec
   "Takes the name of a spec/predicate-returning multimethod and a
@@ -251,7 +252,9 @@
   that returns a test.check generator."
   [& {:keys [args ret fn gen]}]
   (let [env &env]
-    `(cljs.spec/fspec-impl ~args '~(res env args) ~ret '~(res env ret) ~fn '~(res env fn) ~gen)))
+    `(cljs.spec/fspec-impl (spec ~args) '~(res env args)
+                           (spec ~ret) '~(res env ret)
+                           (spec ~fn) '~(res env fn) ~gen)))
 
 (defmacro tuple
   "takes one or more preds and returns a spec for a tuple, a vector

src/main/cljs/cljs/spec.cljs

@@ -1060,20 +1060,13 @@
 (defn ^:skip-wiki fspec-impl
   "Do not call this directly, use 'fspec'"
   [argspec aform retspec rform fnspec fform gfn]
-  (assert (c/and argspec retspec))
   (let [specs {:args argspec :ret retspec :fn fnspec}]
     (reify
       IFn
       (-invoke [this x] (valid? this x))
       ILookup
-      (-lookup [this k]
-        (-lookup this k nil))
-      (-lookup [_ k not-found]
-        (case k
-          :args argspec
-          :ret retspec
-          :fn fnspec
-          not-found))
+      (-lookup [this k] (get specs k))
+      (-lookup [_ k not-found] (get specs k not-found))
       Spec
       (conform* [_ f] (if (fn? f)
                         (if (identical? f (validate-fn f specs *fspec-iterations*)) f ::invalid)