Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Varify more vars #593

Merged
merged 2 commits into from
Jul 31, 2021
Merged

Varify more vars #593

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fdce925
varify
borkdude Jul 26, 2021
5f639ea
Merge branch 'master' into repair-namespaces
borkdude Jul 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions src/sci/impl/namespaces.cljc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,12 @@
(defmacro copy-var [sym _ns] sym)
(defmacro copy-core-var [sym] sym)))

(defn macrofy [f]
(vary-meta f #(assoc % :sci/macro true)))
(defn macrofy
([f] (vary-meta f #(assoc % :sci/macro true)))
([sym f] (macrofy sym f clojure-core-ns))
([sym f ns]
(vars/new-var sym f {:ns ns
:macro true})))

(defn ->*
[_ _ x & forms]
Expand Down Expand Up @@ -738,6 +742,12 @@
(clojure.lang.PersistentArrayMap/createAsIfByAssoc (to-array s))
(if (seq s) (first s) clojure.lang.PersistentArrayMap/EMPTY)))))

(defn core-var
([sym v] (core-var sym v false))
([sym v ctx?]
(vars/new-var sym v (cond-> {:ns clojure-core-ns}
ctx? (assoc :sci.impl/op needs-ctx)))))

(def clojure-core
{:obj clojure-core-ns
'*ns* vars/current-ns
Expand Down Expand Up @@ -982,7 +992,7 @@
'ex-info (copy-core-var ex-info)
'ex-message (copy-core-var ex-message)
'ex-cause (copy-core-var ex-cause)
'find-ns (with-meta sci-find-ns {:sci.impl/op needs-ctx})
'find-ns (core-var 'find-ns sci-find-ns true #_{:sci.impl/op needs-ctx})
'find-var (with-meta sci-find-var {:sci.impl/op needs-ctx})
'first (copy-core-var first)
'float? (copy-core-var float?)
Expand Down Expand Up @@ -1053,7 +1063,7 @@
'longs (copy-core-var longs)
'list* (copy-core-var list*)
'long-array (copy-core-var long-array)
'macroexpand (with-meta macroexpand* {:sci.impl/op needs-ctx})
'macroexpand (core-var 'macroexpand macroexpand* true #_(with-meta macroexpand* {:sci.impl/op needs-ctx}))
'macroexpand-1 (with-meta macroexpand-1* {:sci.impl/op needs-ctx})
'make-array (copy-core-var make-array)
'make-hierarchy (copy-core-var make-hierarchy)
Expand Down Expand Up @@ -1257,7 +1267,7 @@
'volatile! (copy-core-var volatile!)
'vreset! (copy-core-var vreset!)
'vswap! (copy-core-var vswap!*)
'when-first (macrofy when-first*)
'when-first (macrofy 'when-first when-first*)
'when-let (macrofy when-let*)
'when-some (macrofy when-some*)
'when (macrofy when*)
Expand Down