Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use &reader instead of hy.&reader in #/ #74

Merged
merged 3 commits into from
Aug 18, 2023
Merged

Use &reader instead of hy.&reader in #/ #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77cc6b6
Simplify some `macrotools` tests
Kodiologist Aug 14, 2023
e938801
Whitespace adjustments
Kodiologist Aug 14, 2023
316e1e6
use `&reader` instead of `hy.&reader`
scauligi Aug 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions hyrule/macrotools.hy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,8 @@

=> (#/ os/path.basename "path/to/file")
"file"]]
(.slurp-space hy.&reader)
(setv [mod #* ident] (.split (.read-ident hy.&reader) ".")
(.slurp-space &reader)
(setv [mod #* ident] (.split (.read-ident &reader) ".")
imp `(hy.M ~(hy.mangle (.replace mod "/" "."))))
(if ident
`(. ~imp ~@(map hy.models.Symbol ident))
Expand Down
101 changes: 28 additions & 73 deletions tests/test_macrotools.hy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,95 +6,50 @@
hyrule [macroexpand-all])


(defn test-with-gensym []
(import ast)
(import hy.compiler [hy-compile])
(setv macro1 "(defmacro nif [expr pos zero neg]
(with-gensyms [a]
`(do
(setv ~a ~expr)
(cond (> ~a 0) ~pos
(= ~a 0) ~zero
(< ~a 0) ~neg))))

(print (nif (inc -1) 1 0 -1))
")
;; expand the macro twice, should use a different
;; gensym each time
(setv _ast1 (hy-compile (hy.read-many macro1) __name__))
(setv _ast2 (hy-compile (hy.read-many macro1) __name__))
(setv s1 (ast.unparse _ast1))
(setv s2 (ast.unparse _ast2))
(assert (in (hy.mangle "_a\uffff") s1))
(assert (in (hy.mangle "_a\uffff") s2))
(assert (not (= s1 s2))))
(defmacro example--with-gensyms []
(with-gensyms [a]
`(setv ~a 1)))
(defmacro/g! example--defmacro/g! []
`(setv ~g!res 1))
(defmacro! example--defmacro! []
`(setv ~g!res 1))

(defn test-gensym-tools []
(defn check []
; `C` should have two distinct attributes.
(assert (=
(len (sfor a (dir C) :if (not (.startswith a "__")) a))
2)))

(defclass C [] (example--with-gensyms) (example--with-gensyms))
(check)
(defclass C [] (example--defmacro/g!) (example--defmacro/g!))
(check)
(defclass C [] (example--defmacro!) (example--defmacro!))
(check))


(defn test-defmacro/g! []
(import ast)
(import hy.compiler [hy-compile])
(setv macro1 "(defmacro/g! nif [expr pos zero neg]
`(do
(setv ~g!res ~expr)
(cond (> ~g!res 0) ~pos
(= ~g!res 0) ~zero
(< ~g!res 0) ~neg)))

(print (nif (inc -1) 1 0 -1))
")
;; expand the macro twice, should use a different
;; gensym each time
(setv _ast1 (hy-compile (hy.read-many macro1) __name__))
(setv _ast2 (hy-compile (hy.read-many macro1) __name__))
(setv s1 (ast.unparse _ast1))
(setv s2 (ast.unparse _ast2))
(assert (in (hy.mangle "_res\uffff") s1))
(assert (in (hy.mangle "_res\uffff") s2))
(assert (not (= s1 s2)))

;; defmacro/g! didn't like numbers initially because they
;; don't have a startswith method and blew up during expansion
(setv macro2 "(defmacro/g! two-point-zero [] `(+ (float 1) 1.0))")
(assert (hy-compile (hy.read-many macro2) __name__)))
(defmacro/g! two-point-zero []
`(+ (float 1) 1.0))
(assert (= (two-point-zero) 2.0)))


(defn test-defmacro! []
;; defmacro! must do everything defmacro/g! can
(import ast)
(import hy.compiler [hy-compile])
(setv macro1 "(defmacro! nif [expr pos zero neg]
`(do
(setv ~g!res ~expr)
(cond (> ~g!res 0) ~pos
(= ~g!res 0) ~zero
(< ~g!res 0) ~neg)))

(print (nif (inc -1) 1 0 -1))
")
;; expand the macro twice, should use a different
;; gensym each time
(setv _ast1 (hy-compile (hy.read-many macro1) __name__))
(setv _ast2 (hy-compile (hy.read-many macro1) __name__))
(setv s1 (ast.unparse _ast1))
(setv s2 (ast.unparse _ast2))
(assert (in (hy.mangle "_res\uffff") s1))
(assert (in (hy.mangle "_res\uffff") s2))
(assert (not (= s1 s2)))

;; defmacro/g! didn't like numbers initially because they
;; don't have a startswith method and blew up during expansion
(setv macro2 "(defmacro! two-point-zero [] `(+ (float 1) 1.0))")
(assert (hy-compile (hy.read-many macro2) __name__))

(defmacro! foo! [o!foo] `(do ~g!foo ~g!foo))
(defmacro! foo! [o!foo]
`(do ~g!foo ~g!foo))
;; test that o! becomes g!
(assert (= "Hy" (foo! "Hy")))
;; test that o! is evaluated once only
(setv foo 40)
(foo! (+= foo 1))
(assert (= 41 foo))
;; test optional args
(defmacro! bar! [o!a [o!b 1]] `(do ~g!a ~g!a ~g!b ~g!b))
(defmacro! bar! [o!a [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))
Expand Down