Yaltik/hy
2
0
Fork 0
Code Pull Requests Releases Activity

Make defmacro! work with optional args

Browse Source
This commit is contained in:
Oskar Kvist 2018-06-11 17:37:31 +02:00 committed by Kodi Arfer
parent f22195dfbc
commit edbe8e3b7f
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS.rst
View File

@ -54,6 +54,7 @@ New Features
* `while` and `for` are allowed to have empty bodies * `while` and `for` are allowed to have empty bodies
* `for` supports the various new clause types offered by `lfor` * `for` supports the various new clause types offered by `lfor`
* Added a new module ``hy.model_patterns`` * Added a new module ``hy.model_patterns``
* `defmacro!` now allows optional args
Bug Fixes Bug Fixes
------------------------------ ------------------------------

7
hy/core/macros.hy
View File

@ -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. "Like `defmacro/g!`, with automatic once-only evaluation for 'o!' params.
Such 'o!' params are available within `body` as the equivalent 'g!' symbol." 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))))) gs (lfor s os (HySymbol (+ "g!" (cut s 2)))))
`(defmacro/g! ~name ~args `(defmacro/g! ~name ~args
`(do (setv ~@(interleave ~gs ~os)) `(do (setv ~@(interleave ~gs ~os))

9
tests/native_tests/native_macros.hy
View File

@ -257,7 +257,14 @@
;; test that o! is evaluated once only ;; test that o! is evaluated once only
(setv foo 40) (setv foo 40)
(foo! (+= foo 1)) (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 [] (defn test-if-not []