mirror of
https://github.com/janet-lang/janet
synced 2024-11-24 01:17:16 +00:00
Use gensym in do-compare macro.
Improve hygiene of macro in case later changes introduce subtle bugs.
This commit is contained in:
parent
aaeaa3a944
commit
631622aa48
@ -832,17 +832,21 @@
|
||||
|
||||
(defmacro- do-compare
|
||||
[x y]
|
||||
(def f (gensym))
|
||||
(def f-res (gensym))
|
||||
(def g (gensym))
|
||||
(def g-res (gensym))
|
||||
~(do
|
||||
(def f (get ,x :compare))
|
||||
(def f-res (if f (f ,x ,y)))
|
||||
(if f-res
|
||||
f-res
|
||||
(def ,f (,get ,x :compare))
|
||||
(def ,f-res (if ,f (,f ,x ,y)))
|
||||
(if ,f-res
|
||||
,f-res
|
||||
(do
|
||||
(def g (get ,y :compare))
|
||||
(def g-res (if g (- (g ,y ,x))))
|
||||
(if g-res
|
||||
g-res
|
||||
(cmp ,x ,y))))))
|
||||
(def ,g (,get ,y :compare))
|
||||
(def ,g-res (if ,g (,- (,g ,y ,x))))
|
||||
(if ,g-res
|
||||
,g-res
|
||||
(,cmp ,x ,y))))))
|
||||
|
||||
(defn compare
|
||||
``Polymorphic compare. Returns -1, 0, 1 for x < y, x = y, x > y respectively.
|
||||
|
Loading…
Reference in New Issue
Block a user