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

Replace hyify with unmangle

Browse Source
This commit is contained in:
Kodi Arfer 2018-03-04 14:52:30 -08:00
parent 3c97d2982c
commit 6875ae0e3f
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hy/core/language.hy
View File

@ -454,20 +454,16 @@ as EOF (defaults to an empty string)."
"Reads and tokenizes first line of `input`."
(read :from-file (StringIO input)))
(defn hyify [text]
"Convert `text` to match hy identifier."
(.replace (string text) "_" "-"))
(defn keyword [value]
"Create a keyword from `value`.
Strings numbers and even objects with the __name__ magic will work."
(if (and (string? value) (value.startswith HyKeyword.PREFIX))
(hyify value)
(unmangle value)
(if (string? value)
(HyKeyword (+ ":" (hyify value)))
(HyKeyword (+ ":" (unmangle value)))
(try
(hyify (.__name__ value))
(unmangle (.__name__ value))
(except [] (HyKeyword (+ ":" (string value))))))))
(defn name [value]
@ -476,11 +472,11 @@ Strings numbers and even objects with the __name__ magic will work."
Keyword special character will be stripped. String will be used as is.
Even objects with the __name__ magic will work."
(if (and (string? value) (value.startswith HyKeyword.PREFIX))
(hyify (cut value 2))
(unmangle (cut value 2))
(if (string? value)
(hyify value)
(unmangle value)
(try
(hyify (. value __name__))
(unmangle (. value __name__))
(except [] (string value))))))
(defn xor [a b]