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

In hy.models, factor out strip_digit_separators

Browse Source
This commit is contained in:
Kodi Arfer 2017-02-16 18:09:23 -08:00
parent bebcbbeba6
commit 62e5d8e3e3
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hy/models.py
View File

@ -111,6 +111,12 @@ class HyKeyword(HyObject, str_type):
return obj return obj
def strip_digit_separators(number):
return (number.replace("_", "").replace(",", "")
if isinstance(number, string_types)
else number)
class HyInteger(HyObject, long_type): class HyInteger(HyObject, long_type):
""" """
Internal representation of a Hy Integer. May raise a ValueError as if Internal representation of a Hy Integer. May raise a ValueError as if
@ -120,7 +126,7 @@ class HyInteger(HyObject, long_type):
def __new__(cls, number, *args, **kwargs): def __new__(cls, number, *args, **kwargs):
if isinstance(number, string_types): if isinstance(number, string_types):
number = number.replace("_", "").replace(",", "") number = strip_digit_separators(number)
bases = {"0x": 16, "0o": 8, "0b": 2} bases = {"0x": 16, "0o": 8, "0b": 2}
for leader, base in bases.items(): for leader, base in bases.items():
if number.startswith(leader): if number.startswith(leader):
@ -148,9 +154,7 @@ class HyFloat(HyObject, float):
""" """
def __new__(cls, number, *args, **kwargs): def __new__(cls, number, *args, **kwargs):
if isinstance(number, string_types): number = float(strip_digit_separators(number))
number = number.replace("_", "").replace(",", "")
number = float(number)
return super(HyFloat, cls).__new__(cls, number) return super(HyFloat, cls).__new__(cls, number)
_wrappers[float] = HyFloat _wrappers[float] = HyFloat
@ -163,9 +167,7 @@ class HyComplex(HyObject, complex):
""" """
def __new__(cls, number, *args, **kwargs): def __new__(cls, number, *args, **kwargs):
if isinstance(number, string_types): number = complex(strip_digit_separators(number))
number = number.replace("_", "").replace(",", "")
number = complex(number)
return super(HyComplex, cls).__new__(cls, number) return super(HyComplex, cls).__new__(cls, number)
_wrappers[complex] = HyComplex _wrappers[complex] = HyComplex