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

contrib.walk: Coerce non-list iterables into list form

Browse Source 
Expressions can sometimes contain itertools.islice objects, which we can
only walk if we force them into a list. To do this, the walk function
has to be taught that collections that are not instances of list should
be forced into a list.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
This commit is contained in:
Gergely Nagy 2015-07-15 16:59:49 +02:00
parent 144ee3b2f0
commit adc1cf8829
No known key found for this signature in database
GPG Key ID: 0A083C5F06E0DD42
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hy/contrib/walk.hy
View File

@ -1,6 +1,6 @@
;;; Hy AST walker ;;; Hy AST walker
;; ;;
;; Copyright (c) 2014 Gergely Nagy <algernon@madhouse-project.org> ;; Copyright (c) 2014, 2015 Gergely Nagy <algernon@madhouse-project.org>
;; ;;
;; Permission is hereby granted, free of charge, to any person obtaining a ;; Permission is hereby granted, free of charge, to any person obtaining a
;; copy of this software and associated documentation files (the "Software"), ;; copy of this software and associated documentation files (the "Software"),
@ -37,6 +37,8 @@
(inner (rest form))))] (inner (rest form))))]
[(instance? list form) [(instance? list form)
((type form) (outer (HyExpression (map inner form))))] ((type form) (outer (HyExpression (map inner form))))]
[(coll? form)
(walk inner outer (list form))]
[true (outer form)])) [true (outer form)]))
(defn postwalk [f form] (defn postwalk [f form]

6
tests/native_tests/contrib/walk.hy
View File

@ -24,6 +24,12 @@
nil)) nil))
(assert (= acc [walk-form])))) (assert (= acc [walk-form]))))
(defn test-walk-iterators []
(let [[acc []]]
(assert (= (walk (fn [x] (* 2 x)) (fn [x] x)
(drop 1 [1 [2 [3 [4]]]]))
[[2 [3 [4]] 2 [3 [4]]]]))))
(defn test-macroexpand-all [] (defn test-macroexpand-all []
(assert (= (macroexpand-all '(with [a b c] (for [d c] foo))) (assert (= (macroexpand-all '(with [a b c] (for [d c] foo)))
'(with* [a] (with* [b] (with* [c] (do (for* [d c] foo)))))))) '(with* [a] (with* [b] (with* [c] (do (for* [d c] foo))))))))