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

Combine some literal compilation methods

Browse Source
This commit is contained in:
Kodi Arfer 2017-08-28 10:49:18 -07:00
parent 5f36a53577
commit e30abcd20f
1 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
hy/compiler.py
View File

@ -24,6 +24,7 @@ import ast
import sys import sys
import keyword import keyword
import copy import copy
import inspect
from collections import defaultdict from collections import defaultdict
@ -436,7 +437,13 @@ class HyASTCompiler(object):
def compile_atom(self, atom_type, atom): def compile_atom(self, atom_type, atom):
if atom_type in _compile_table: if atom_type in _compile_table:
ret = _compile_table[atom_type](self, atom) # _compile_table[atom_type] is a method for compiling this
# type of atom, so call it. If it has an extra parameter,
# pass in `atom_type`.
arity = len(inspect.getargspec(_compile_table[atom_type])[0])
ret = (_compile_table[atom_type](self, atom, atom_type)
if arity == 3
else _compile_table[atom_type](self, atom))
if not isinstance(ret, Result): if not isinstance(ret, Result):
ret = Result() + ret ret = Result() + ret
return ret return ret
@ -1716,7 +1723,7 @@ class HyASTCompiler(object):
return self.compile(expression) return self.compile(expression)
if expression == []: if expression == []:
return self.compile_list(expression) return self.compile_list(expression, HyList)
fn = expression[0] fn = expression[0]
func = None func = None
@ -1901,16 +1908,6 @@ class HyASTCompiler(object):
return ret return ret
@builds(HyList)
def compile_list(self, expression):
elts, ret, _ = self._compile_collect(expression)
return ret + asty.List(expression, elts=elts, ctx=ast.Load())
@builds(HySet)
def compile_set(self, expression):
elts, ret, _ = self._compile_collect(expression)
return ret + asty.Set(expression, elts=elts, ctx=ast.Load())
@builds("fn") @builds("fn")
@builds("fn*") @builds("fn*")
# The starred version is for internal use (particularly, in the # The starred version is for internal use (particularly, in the
@ -2178,16 +2175,13 @@ class HyASTCompiler(object):
raise HyTypeError(cons, "Can't compile a top-level cons cell") raise HyTypeError(cons, "Can't compile a top-level cons cell")
@builds(HyInteger) @builds(HyInteger)
def compile_integer(self, number):
return asty.Num(number, n=long_type(number))
@builds(HyFloat) @builds(HyFloat)
def compile_float(self, number):
return asty.Num(number, n=float(number))
@builds(HyComplex) @builds(HyComplex)
def compile_complex(self, number): def compile_numeric_literal(self, number, building):
return asty.Num(number, n=complex(number)) f = {HyInteger: long_type,
HyFloat: float,
HyComplex: complex}[building]
return asty.Num(number, n=f(number))
@builds(HySymbol) @builds(HySymbol)
def compile_symbol(self, symbol): def compile_symbol(self, symbol):
@ -2222,13 +2216,18 @@ class HyASTCompiler(object):
@builds(HyString) @builds(HyString)
@builds(HyKeyword) @builds(HyKeyword)
def compile_string(self, string):
return asty.Str(string, s=str_type(string))
@builds(HyBytes) @builds(HyBytes)
def compile_bytes(self, bytestring): def compile_string(self, string, building):
f = asty.Bytes if PY3 else asty.Str node = asty.Bytes if PY3 and building is HyBytes else asty.Str
return f(bytestring, s=bytes_type(bytestring)) f = bytes_type if building is HyBytes else str_type
return node(string, s=f(string))
@builds(HyList)
@builds(HySet)
def compile_list(self, expression, building):
elts, ret, _ = self._compile_collect(expression)
node = {HyList: asty.List, HySet: asty.Set}[building]
return ret + node(expression, elts=elts, ctx=ast.Load())
@builds(HyDict) @builds(HyDict)
def compile_dict(self, m): def compile_dict(self, m):