Skip to content

Commit 12cacc6

Browse files
Merge pull request #501 from keymone/macro_q_deref
Macro q deref
2 parents 7d4fa2c + 0297126 commit 12cacc6

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

pixie/stdlib.pxi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2726,7 +2726,7 @@ Calling this function on something that is not ISeqable returns a seq with that
27262726
(= () form))
27272727
form
27282728
(let [[sym & args] form
2729-
fvar (resolve sym)]
2729+
fvar (resolve-in *ns* sym)]
27302730
(if (and fvar (macro? @fvar))
27312731
(apply @fvar args)
27322732
form))))

pixie/vm/stdlib.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,8 @@ def set_macro(f):
687687

688688
@returns(bool)
689689
@as_var("macro?")
690-
def macro_QMARK_(f):
690+
def macro_QMARK_(v):
691+
f = v.deref() if isinstance(v, Var) else v
691692
return true if isinstance(f, BaseCode) and f.is_macro() else false
692693

693694
@returns(unicode)

0 commit comments

Comments
 (0)