luciano/babashka
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wip

Browse source
This commit is contained in:
Michiel Borkent 2022-10-02 17:43:52 +02:00
parent c994bc9d69
commit 0a88574d6f
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/babashka/impl/clojure/spec/alpha.clj
View file

@ -324,7 +324,7 @@
expr)) expr))
(defn sci-resolve [sym] (defn sci-resolve [sym]
(@sci.impl.utils/eval-resolve-state @ctx {} sym)) (sci/resolve @ctx sym))
(defn res [form] (defn res [form]
(cond (cond
@ -669,7 +669,6 @@
keys (mapv first pairs) keys (mapv first pairs)
pred-forms (mapv second pairs) pred-forms (mapv second pairs)
pf (mapv res pred-forms)] pf (mapv res pred-forms)]
;;(prn key-pred-forms)
(c/assert (c/and (even? (count key-pred-forms)) (every? keyword? keys)) "cat expects k1 p1 k2 p2..., where ks are keywords") (c/assert (c/and (even? (count key-pred-forms)) (every? keyword? keys)) "cat expects k1 p1 k2 p2..., where ks are keywords")
`(clojure.spec.alpha/cat-impl ~keys ~pred-forms '~pf))) `(clojure.spec.alpha/cat-impl ~keys ~pred-forms '~pf)))
@ -1581,12 +1580,12 @@
nil p nil p
:clojure.spec.alpha/amp (list* 'clojure.spec.alpha/& amp forms) :clojure.spec.alpha/amp (list* 'clojure.spec.alpha/& amp forms)
:clojure.spec.alpha/pcat (if rep+ :clojure.spec.alpha/pcat (if rep+
(list `+ rep+) (list 'clojure.spec.alpha/+ rep+)
(cons `cat (mapcat vector (c/or (seq ks) (repeat :_)) forms))) (cons 'clojure.spec.alpha/cat (mapcat vector (c/or (seq ks) (repeat :_)) forms)))
:clojure.spec.alpha/alt (if maybe :clojure.spec.alpha/alt (if maybe
(list `? maybe) (list 'clojure.spec.alpha/? maybe)
(cons `alt (mapcat vector ks forms))) (cons 'clojure.spec.alpha/alt (mapcat vector ks forms)))
:clojure.spec.alpha/rep (list (if splice `+ `*) forms))))) :clojure.spec.alpha/rep (list (if splice 'clojure.spec.alpha/+ 'clojure.spec.alpha/*) forms)))))
(defn- op-explain [form p path via in input] (defn- op-explain [form p path via in input]
;;(prn {:form form :p p :path path :input input}) ;;(prn {:form form :p p :path path :input input})

5
test-resources/lib_tests/babashka/run_all_libtests.clj
View file

@ -7,8 +7,7 @@
[clojure.java.io :as io] [clojure.java.io :as io]
[clojure.spec.test.alpha :as st] [clojure.spec.test.alpha :as st]
[clojure.string :as str] [clojure.string :as str]
[clojure.test :as t :refer [*report-counters*]] [clojure.test :as t :refer [*report-counters*]]))
[orchestra.spec.test :as ot]))
#_(defmethod t/report :begin-test-var [m] #_(defmethod t/report :begin-test-var [m]
(println "Running" (subs (str (-> m :var str)) 2))) (println "Running" (subs (str (-> m :var str)) 2)))
@ -50,7 +49,7 @@
(doseq [n namespaces] (doseq [n namespaces]
(let [orchestra? (str/starts-with? (str n) "orchestra")] (let [orchestra? (str/starts-with? (str n) "orchestra")]
(if orchestra? (if orchestra?
(alter-var-root #'st/spec-checking-fn (constantly ot/spec-checking-fn)) nil ;; (alter-var-root #'st/spec-checking-fn (constantly ot/spec-checking-fn))
(alter-var-root #'st/spec-checking-fn (constantly orig-spec-checking-fn))) (alter-var-root #'st/spec-checking-fn (constantly orig-spec-checking-fn)))
(when-not orchestra? (when-not orchestra?
(require n) (require n)