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

merge branch 'python-3.5.1'

Browse Source
This commit is contained in:
Zack M. Davis 2015-12-08 20:53:51 -08:00
commit a945f17f08
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hy/compiler.py
View File

@ -532,7 +532,7 @@ class HyASTCompiler(object):
raise HyTypeError(expr, raise HyTypeError(expr,
"There can only be one " "There can only be one "
"&rest argument") "&rest argument")
varargs = str(expr) varargs = expr
elif lambda_keyword == "&key": elif lambda_keyword == "&key":
if type(expr) != HyDict: if type(expr) != HyDict:
raise HyTypeError(expr, raise HyTypeError(expr,
@ -586,7 +586,7 @@ class HyASTCompiler(object):
raise HyTypeError(expr, raise HyTypeError(expr,
"There can only be one " "There can only be one "
"&kwargs argument") "&kwargs argument")
kwargs = str(expr) kwargs = expr
return ret, args, defaults, varargs, kwonlyargs, kwonlydefaults, kwargs return ret, args, defaults, varargs, kwonlyargs, kwonlydefaults, kwargs
@ -2262,10 +2262,14 @@ class HyASTCompiler(object):
# list because it's really just an internal parsing thing. # list because it's really just an internal parsing thing.
if kwargs: if kwargs:
kwargs = ast.arg(arg=kwargs, annotation=None) kwargs = ast.arg(arg=ast_str(kwargs), annotation=None,
lineno=kwargs.start_line,
col_offset=kwargs.start_column)
if stararg: if stararg:
stararg = ast.arg(arg=stararg, annotation=None) stararg = ast.arg(arg=ast_str(stararg), annotation=None,
lineno=stararg.start_line,
col_offset=stararg.start_column)
# Let's find a better home for these guys. # Let's find a better home for these guys.
else: else:
@ -2280,6 +2284,12 @@ class HyASTCompiler(object):
col_offset=x.start_column) col_offset=x.start_column)
for x in kwonlyargs] for x in kwonlyargs]
if kwargs:
kwargs = ast_str(kwargs)
if stararg:
stararg = ast_str(stararg)
args = ast.arguments( args = ast.arguments(
args=args, args=args,
vararg=stararg, vararg=stararg,