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

Make hy-repr use double spaces for dictionaries

Browse Source
This commit is contained in:
Kodi Arfer 2017-10-31 11:58:25 -07:00
parent 199bb70150
commit 90a09b5b44
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hy/contrib/hy_repr.hy
View File

@ -44,9 +44,17 @@
(hy-repr-register tuple (fn [x] (hy-repr-register tuple (fn [x]
(+ "(," (if x " " "") (-cat x) ")"))) (+ "(," (if x " " "") (-cat x) ")")))
(hy-repr-register dict :placeholder "{...}" (fn [x] (hy-repr-register dict :placeholder "{...}" (fn [x]
(+ "{" (-cat (reduce + (.items x))) "}"))) (setv text (.join " " (genexpr
(+ (hy-repr k) " " (hy-repr v))
[[k v] (.items x)])))
(+ "{" text "}")))
(hy-repr-register HyDict :placeholder "{...}" (fn [x] (hy-repr-register HyDict :placeholder "{...}" (fn [x]
(+ "{" (-cat x) "}"))) (setv text (.join " " (genexpr
(+ (hy-repr k) " " (hy-repr v))
[[k v] (partition x)])))
(if (% (len x) 2)
(+= text (+ " " (hy-repr (get x -1)))))
(+ "{" text "}")))
(hy-repr-register [set HySet] (fn [x] (hy-repr-register [set HySet] (fn [x]
(+ "#{" (-cat x) "}"))) (+ "#{" (-cat x) "}")))
(hy-repr-register frozenset (fn [x] (hy-repr-register frozenset (fn [x]

8
tests/native_tests/contrib/hy_repr.hy
View File

@ -28,7 +28,7 @@
'(+ 1 2) '(+ 1 2)
[1 2 3] (, 1 2 3) #{1 2 3} (frozenset #{1 2 3}) [1 2 3] (, 1 2 3) #{1 2 3} (frozenset #{1 2 3})
'[1 2 3] '(, 1 2 3) '#{1 2 3} '(frozenset #{1 2 3}) '[1 2 3] '(, 1 2 3) '#{1 2 3} '(frozenset #{1 2 3})
{"a" 1 "b" 2 "a" 3} '{"a" 1 "b" 2 "a" 3} {"a" 1 "b" 2 "a" 3} '{"a" 1 "b" 2 "a" 3}
[1 [2 3] (, 4 (, 'mysymbol :mykeyword)) {"a" b"hello"} '(f #* a #** b)] [1 [2 3] (, 4 (, 'mysymbol :mykeyword)) {"a" b"hello"} '(f #* a #** b)]
'[1 [2 3] (, 4 (, mysymbol :mykeyword)) {"a" b"hello"} (f #* a #** b)]]) '[1 [2 3] (, 4 (, mysymbol :mykeyword)) {"a" b"hello"} (f #* a #** b)]])
(for [original-val values] (for [original-val values]
@ -58,7 +58,7 @@
"'[1 `[~(+ 1 2) ~@(+ [1] [2])] 4]" "'[1 `[~(+ 1 2) ~@(+ [1] [2])] 4]"
"'[1 `[~(do (print x 'y) 1)] 4]" "'[1 `[~(do (print x 'y) 1)] 4]"
"{1 20}" "{1 20}"
"'{1 10 1 20}" "'{1 10 1 20}"
"'asymbol" "'asymbol"
":akeyword" ":akeyword"
"'(f #* args #** kwargs)"]) "'(f #* args #** kwargs)"])
@ -92,7 +92,7 @@
(assert (= (hy-repr (hy.HyInteger 7)) "'7")) (assert (= (hy-repr (hy.HyInteger 7)) "'7"))
(assert (= (hy-repr (hy.HyString "hello")) "'\"hello\"")) (assert (= (hy-repr (hy.HyString "hello")) "'\"hello\""))
(assert (= (hy-repr (hy.HyList [1 2 3])) "'[1 2 3]")) (assert (= (hy-repr (hy.HyList [1 2 3])) "'[1 2 3]"))
(assert (= (hy-repr (hy.HyDict [1 2 3])) "'{1 2 3}"))) (assert (= (hy-repr (hy.HyDict [1 2 3])) "'{1 2 3}")))
(defn test-hy-repr-self-reference [] (defn test-hy-repr-self-reference []
@ -105,7 +105,7 @@
(assert (in (hy-repr x) (list-comp (assert (in (hy-repr x) (list-comp
; The ordering of a dictionary isn't guaranteed, so we need ; The ordering of a dictionary isn't guaranteed, so we need
; to check for all possible orderings. ; to check for all possible orderings.
(+ "{" (.join " " p) "}") (+ "{" (.join " " p) "}")
[p (permutations ["1 2" "3 [4 {...}]" "6 7"])])))) [p (permutations ["1 2" "3 [4 {...}]" "6 7"])]))))
(defn test-hy-repr-custom [] (defn test-hy-repr-custom []