Skip to content

Commit 854ea19

Browse files
committed
fix
1 parent c7e18b0 commit 854ea19

File tree

1 file changed

+9
-14
lines changed

1 file changed

+9
-14
lines changed

src/sci/impl/copy_vars.cljc

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878

7979
(defmacro macrofy [& args]
8080
(let [[sym & args] args]
81-
`(macrofy* ~sym ~@args ~@(repeat (- 3 (count args)) nil) ~(var-meta &env sym nil))))
81+
`(macrofy* ~sym ~@args ~@(repeat (- 2 (count args)) nil) ~(var-meta &env sym nil))))
8282

8383

8484
;; Note: self hosted CLJS can't deal with multi-arity macros so this macro is split in 2
@@ -126,25 +126,21 @@
126126
(defn macrofy*
127127
([f] (vary-meta f #(assoc % :sci/macro true)))
128128
([sym f] (macrofy* sym f nil false))
129-
([sym f ns] (macrofy* sym f ns false))
130-
([sym f ns ctx?] (macrofy* sym f ns ctx? nil))
131-
([sym f ns ctx? extra-meta]
129+
([sym f ns] (macrofy* sym f ns nil))
130+
([sym f ns extra-meta]
132131
(let [ns (or ns clojure-core-ns)]
133132
(utils/new-var sym f (cond-> {:ns ns
134133
:macro true
135134
:sci/built-in true}
136135
(and (not elide-vars)
137136
extra-meta)
138-
(merge extra-meta))
139-
ctx?))))
137+
(merge extra-meta))))))
140138

141139
(defn new-var
142-
([sym f] (new-var sym f nil false))
143-
([sym f ns] (new-var sym f ns false))
144-
([sym f ns ctx?] (new-var sym f ns ctx? nil))
145-
([sym f ns ctx? extra-meta]
146-
(let [ctx? (or ctx? (true? ns))
147-
ns (if (true? ns)
140+
([sym f] (new-var sym f nil nil))
141+
([sym f ns] (new-var sym f ns nil))
142+
([sym f ns extra-meta]
143+
(let [ns (if (true? ns)
148144
clojure-core-ns
149145
(or ns clojure-core-ns))]
150146
(assert (and (not (boolean? ns))
@@ -153,5 +149,4 @@
153149
:sci/built-in true}
154150
(and (not elide-vars)
155151
extra-meta)
156-
(merge extra-meta))
157-
ctx?))))
152+
(merge extra-meta))))))

0 commit comments

Comments
 (0)