Merge pull request #1637 from oskarkv/patch-1
Look for o!-syms in (flatten args) of defmacro!
This commit is contained in:
commit
86deff6531
1
AUTHORS
1
AUTHORS
@ -88,3 +88,4 @@
|
||||
* Yoan Tournade <yoan@ytotech.com>
|
||||
* Simon Gomizelj <simon@vodik.xyz>
|
||||
* Yigong Wang <wang@yigo.ng>
|
||||
* Oskar Kvist <oskar.kvist@gmail.com>
|
||||
|
1
NEWS.rst
1
NEWS.rst
@ -54,6 +54,7 @@ New Features
|
||||
* `while` and `for` are allowed to have empty bodies
|
||||
* `for` supports the various new clause types offered by `lfor`
|
||||
* Added a new module ``hy.model_patterns``
|
||||
* `defmacro!` now allows optional args
|
||||
|
||||
Bug Fixes
|
||||
------------------------------
|
||||
|
@ -206,7 +206,12 @@ the second form, the second result is inserted into the third form, and so on."
|
||||
"Like `defmacro/g!`, with automatic once-only evaluation for 'o!' params.
|
||||
|
||||
Such 'o!' params are available within `body` as the equivalent 'g!' symbol."
|
||||
(setv os (lfor s args :if (.startswith s "o!") s)
|
||||
(defn extract-o!-sym [arg]
|
||||
(cond [(and (symbol? arg) (.startswith arg "o!"))
|
||||
arg]
|
||||
[(and (instance? list arg) (.startswith (first arg) "o!"))
|
||||
(first arg)]))
|
||||
(setv os (list (filter identity (map extract-o!-sym args)))
|
||||
gs (lfor s os (HySymbol (+ "g!" (cut s 2)))))
|
||||
`(defmacro/g! ~name ~args
|
||||
`(do (setv ~@(interleave ~gs ~os))
|
||||
|
@ -257,7 +257,14 @@
|
||||
;; test that o! is evaluated once only
|
||||
(setv foo 40)
|
||||
(foo! (+= foo 1))
|
||||
(assert (= 41 foo)))
|
||||
(assert (= 41 foo))
|
||||
;; test &optional args
|
||||
(defmacro! bar! [o!a &optional [o!b 1]] `(do ~g!a ~g!a ~g!b ~g!b))
|
||||
;; test that o!s are evaluated once only
|
||||
(bar! (+= foo 1) (+= foo 1))
|
||||
(assert (= 43 foo))
|
||||
;; test that the optional arg works
|
||||
(assert (= (bar! 2) 1)))
|
||||
|
||||
|
||||
(defn test-if-not []
|
||||
|
Loading…
Reference in New Issue
Block a user