Merge branch 'float_and_complex' of git://github.com/khinsen/hy into pr-109

This commit is contained in:
Paul Tagliamonte 2013-04-12 09:09:38 -04:00
commit 3ec828e660
4 changed files with 95 additions and 2 deletions

View File

@ -25,6 +25,8 @@ from hy.errors import HyError
from hy.models.expression import HyExpression from hy.models.expression import HyExpression
from hy.models.integer import HyInteger from hy.models.integer import HyInteger
from hy.models.float import HyFloat
from hy.models.complex import HyComplex
from hy.models.string import HyString from hy.models.string import HyString
from hy.models.symbol import HySymbol from hy.models.symbol import HySymbol
from hy.models.list import HyList from hy.models.list import HyList
@ -902,8 +904,20 @@ class HyASTCompiler(object):
return ret return ret
@builds(HyInteger) @builds(HyInteger)
def compile_number(self, number): def compile_integer(self, number):
return ast.Num(n=int(number), # See HyInteger above. return ast.Num(n=int(number),
lineno=number.start_line,
col_offset=number.start_column)
@builds(HyFloat)
def compile_integer(self, number):
return ast.Num(n=float(number),
lineno=number.start_line,
col_offset=number.start_column)
@builds(HyComplex)
def compile_integer(self, number):
return ast.Num(n=complex(number),
lineno=number.start_line, lineno=number.start_line,
col_offset=number.start_column) col_offset=number.start_column)

View File

@ -20,6 +20,8 @@
from hy.models.expression import HyExpression from hy.models.expression import HyExpression
from hy.models.integer import HyInteger from hy.models.integer import HyInteger
from hy.models.float import HyFloat
from hy.models.complex import HyComplex
from hy.models.symbol import HySymbol from hy.models.symbol import HySymbol
from hy.models.string import HyString from hy.models.string import HyString
from hy.models.keyword import HyKeyword from hy.models.keyword import HyKeyword
@ -46,6 +48,8 @@ def _resolve_atom(obj):
Resolve a bare atom into one of the following (in order): Resolve a bare atom into one of the following (in order):
- Integer - Integer
- Float
- Complex
- Symbol - Symbol
""" """
try: try:
@ -53,6 +57,17 @@ def _resolve_atom(obj):
except ValueError: except ValueError:
pass pass
try:
return HyFloat(obj)
except ValueError:
pass
try:
return HyComplex(obj)
except ValueError:
pass
table = { table = {
"true": "True", "true": "True",
"false": "False", "false": "False",

32
hy/models/complex.py Normal file
View File

@ -0,0 +1,32 @@
# Copyright (c) 2013 Paul Tagliamonte <paultag@debian.org>
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
# to deal in the Software without restriction, including without limitation
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
# and/or sell copies of the Software, and to permit persons to whom the
# Software is furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
from hy.models import HyObject
class HyComplex(HyObject, complex):
"""
Internal represntation of a Hy Complex. May raise a ValueError as if
complex(foo) was called, given HyComplex(foo).
"""
def __new__(cls, number, *args, **kwargs):
number = complex(number)
return super(HyComplex, cls).__new__(cls, number)

32
hy/models/float.py Normal file
View File

@ -0,0 +1,32 @@
# Copyright (c) 2013 Paul Tagliamonte <paultag@debian.org>
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
# to deal in the Software without restriction, including without limitation
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
# and/or sell copies of the Software, and to permit persons to whom the
# Software is furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
from hy.models import HyObject
class HyFloat(HyObject, float):
"""
Internal represntation of a Hy Float. May raise a ValueError as if
float(foo) was called, given HyFloat(foo).
"""
def __new__(cls, number, *args, **kwargs):
number = float(number)
return super(HyFloat, cls).__new__(cls, number)