From a0ae7a94b783f58a00a0d6ff9a55352dcdeda0e9 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Sun, 2 Oct 2022 18:06:31 +0200 Subject: [PATCH] fix --- feature-spec-alpha/babashka/impl/spec.clj | 14 ++++++++------ src/babashka/impl/clojure/spec/alpha.clj | 3 ++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/feature-spec-alpha/babashka/impl/spec.clj b/feature-spec-alpha/babashka/impl/spec.clj index 7f1061a2..923fd1bf 100644 --- a/feature-spec-alpha/babashka/impl/spec.clj +++ b/feature-spec-alpha/babashka/impl/spec.clj @@ -1,10 +1,12 @@ (ns babashka.impl.spec {:no-doc true} - (:require [babashka.impl.clojure.spec.alpha :as s :refer [sns]] - [babashka.impl.clojure.spec.gen.alpha :as gen] - [babashka.impl.clojure.spec.test.alpha :as test :refer [tns]] - [clojure.core :as c] - [sci.core :as sci :refer [copy-var]])) + (:require + [babashka.impl.clojure.spec.alpha :as s :refer [sns]] + [babashka.impl.clojure.spec.gen.alpha :as gen] + [babashka.impl.clojure.spec.test.alpha :as test :refer [tns]] + [clojure.core :as c] + [clojure.spec.alpha :as csa] + [sci.core :as sci :refer [copy-var]])) (def gns (sci/create-ns 'clojure.spec.gen.alpha nil)) @@ -51,7 +53,7 @@ 'fdef (copy-var s/fdef sns) 'fspec (copy-var s/fspec sns) 'fspec-impl (copy-var s/fspec-impl sns) - 'every (copy-var s/every sns) + 'every (copy-var csa/every sns) 'every-impl (copy-var s/every-impl sns) 'every-kv (copy-var s/every-kv sns) 'keys (copy-var s/keys sns) diff --git a/src/babashka/impl/clojure/spec/alpha.clj b/src/babashka/impl/clojure/spec/alpha.clj index 33d34a8f..ee9bf1b6 100644 --- a/src/babashka/impl/clojure/spec/alpha.clj +++ b/src/babashka/impl/clojure/spec/alpha.clj @@ -535,7 +535,7 @@ mopts) (mapcat identity)))) -(defmacro every +#_(defmacro every "takes a pred and validates collection elements against that pred. Note that 'every' does not do exhaustive checking, rather it samples @@ -571,6 +571,7 @@ (assoc :clojure.spec.alpha/kind-form `'~(res (:kind opts)) :clojure.spec.alpha/describe (c/or desc `'(every ~(res pred) ~@(res-kind opts))))) gx (gensym) + _ (prn nopts) cpreds (cond-> [(list (c/or kind `coll?) gx)] count (conj `(= ~count (bounded-count ~count ~gx)))