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

Merge pull request #1422 from rkday/underscore_variables

Browse Source 
Treat _42 etc. as a variable name, not an integer
This commit is contained in:
gilch 2017-09-16 17:22:27 -06:00 committed by GitHub
commit cfdd321f9a
5 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -16,6 +16,7 @@ Changes from 0.13.0
as necessary, so you can write ``(eval `(+ 1 ~n))`` instead of as necessary, so you can write ``(eval `(+ 1 ~n))`` instead of
``(eval `(+ 1 ~(HyInteger n)))`` ``(eval `(+ 1 ~(HyInteger n)))``
* Literal `Inf`s and `NaN`s must now be capitalized like that * Literal `Inf`s and `NaN`s must now be capitalized like that
* Numeric literals can no longer begin with a comma or underscore
* `get` is available as a function * `get` is available as a function
* new `comment` macro * new `comment` macro
* support EDN `#_` syntax to discard the next term * support EDN `#_` syntax to discard the next term

6
docs/language/api.rst
View File

@ -44,9 +44,9 @@ integers is used. ``0x`` for Hex, ``0o`` for Octal, ``0b`` for Binary.
(print 0x80 0b11101 0o102 30) (print 0x80 0b11101 0o102 30)
Underscores and commas can appear anywhere in a numeric literal. They have no Underscores and commas can appear anywhere in a numeric literal except the very
effect on the value of the literal, but they're useful for visually separating beginning. They have no effect on the value of the literal, but they're useful
digits. for visually separating digits.
.. code-block:: clj .. code-block:: clj

6
hy/models.py
View File

@ -111,8 +111,10 @@ class HyKeyword(HyObject, str_type):
def strip_digit_separators(number): def strip_digit_separators(number):
return (number.replace("_", "").replace(",", "") # Don't strip a _ or , if it's the first character, as _42 and
if isinstance(number, string_types) # ,42 aren't valid numbers
return (number[0] + number[1:].replace("_", "").replace(",", "")
if isinstance(number, string_types) and len(number) > 1
else number) else number)

7
tests/native_tests/language.hy
View File

@ -1653,3 +1653,10 @@
(with [(pytest.raises AssertionError)] (with [(pytest.raises AssertionError)]
(assert (do (f 1) (f 2)) (do (f 3) (f 4)))) (assert (do (f 1) (f 2)) (do (f 3) (f 4))))
(assert (= s #{1 2 3 4})))) (assert (= s #{1 2 3 4}))))
(defn test-underscore_variables []
; https://github.com/hylang/hy/issues/1340
(defclass XYZ []
[_42 6])
(setv x (XYZ))
(assert (= (. x _42) 6)))

8
tests/test_lex.py
View File

@ -158,9 +158,11 @@ def test_lex_digit_separators():
HyInteger(12), HyInteger(34)])]) HyInteger(12), HyInteger(34)])])
assert tokenize("1,0_00j") == [HyComplex(1000j)] assert tokenize("1,0_00j") == [HyComplex(1000j)]
assert tokenize(",,,,___,__1__,,__,,2__,,,__") == [HyInteger(12)] assert tokenize("1,,,,___,____,,__,,2__,,,__") == [HyInteger(12)]
assert (tokenize(",,,,___,__1__,,__,,2__,q,__") == assert (tokenize("_1,,,,___,____,,__,,2__,,,__") ==
[HySymbol(",,,,___,__1__,,__,,2__,q,__")]) [HySymbol("_1,,,,___,____,,__,,2__,,,__")])
assert (tokenize("1,,,,___,____,,__,,2__,q,__") ==
[HySymbol("1,,,,___,____,,__,,2__,q,__")])
def test_lex_bad_attrs(): def test_lex_bad_attrs():