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

Upgrade babashka spec.alpha (#1459)

Browse source
This commit is contained in:
Michiel Borkent 2023-01-03 22:03:19 +01:00 committed by GitHub
parent 2ac1428341
commit 8e64ef9df8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
resources/src/babashka/clojure/spec/alpha.clj
View file

@ -322,10 +322,7 @@
"Returns a symbol from a symbol or var"
[x]
(if (var? x)
(let [m (meta x)
n (:name m)
ns (:ns m)]
(symbol (str ns) (str n)))
(symbol x)
x))
(defn- unfn [expr]
@ -339,10 +336,7 @@
(defn- res [form]
(cond
(keyword? form) form
(symbol? form) (cond
(= 'fn form) 'clojure.core/fn ;; make tests pass, fn is not a macro in SCI
(= 'not form) 'clojure.core/not ;; make tests pass, not is not a macro in SCI
:else (c/or (-> form resolve ->sym) form))
(symbol? form) (c/or (-> form resolve ->sym) form)
(sequential? form) (walk/postwalk #(if (symbol? %) (res %) %) (unfn form))
:else form))

5
script/built_in.clj
View file

@ -9,7 +9,8 @@
(let [tmp-dir (fs/file tmp-dir)]
(shell {:dir tmp-dir} "git clone https://github.com/babashka/spec.alpha")
(let [spec-dir (fs/file tmp-dir "spec.alpha")]
(shell {:dir spec-dir} "git reset 1d9df099be4fbfd30b9b903642ad376373c16298 --hard")
(fs/copy-tree (fs/file spec-dir "src" "main" "clojure") (fs/file "resources" "src" "babashka")))))
(shell {:dir spec-dir} "git reset 951b49b8c173244e66443b8188e3ff928a0a71e7 --hard")
(fs/copy-tree (fs/file spec-dir "src" "main" "clojure") (fs/file "resources" "src" "babashka")
{:replace-existing true}))))