Skip to content

Commit 31e9ed7

Browse files
authored
Fix NS macro require emission (#204)
1 parent 6f344a4 commit 31e9ed7

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

src/basilisp/core/__init__.lpy

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1197,7 +1197,7 @@
11971197
(.refer-all which-ns new-ns)
11981198

11991199
(:refer opts)
1200-
(add-refers new-ns (:refer opts))
1200+
(add-refers current-ns new-ns (:refer opts))
12011201

12021202
:else nil))))
12031203

@@ -1254,18 +1254,19 @@
12541254
(let [doc (when (string? (first opts))
12551255
(first opts))
12561256
opts (if doc (rest opts) opts)
1257-
opts (reduce (fn [m opt]
1258-
(let [opt-name (first opt)
1259-
options (rest opt)]
1260-
(when-not (keyword? opt-name)
1261-
(throw (ex-info "Namespace option must be a keyword"
1262-
{:option opt-name})))
1263-
(assoc m opt-name (vec options))))
1264-
{}
1265-
opts)
1257+
opts (when (seq opts)
1258+
(reduce (fn [m opt]
1259+
(let [opt-name (first opt)
1260+
options (rest opt)]
1261+
(when-not (keyword? opt-name)
1262+
(throw (ex-info "Namespace option must be a keyword"
1263+
{:option opt-name})))
1264+
(assoc m opt-name (vec options))))
1265+
{}
1266+
opts))
12661267

12671268
requires (when (:require opts)
1268-
`(require ~@(:require opts)))
1269+
`(require ~@(map #(list 'quote %) (:require opts))))
12691270
imports (when (:import opts)
12701271
(map (fn [v]
12711272
`(import ~v))

0 commit comments

Comments
 (0)