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

Add support for explicit exception chaining

Browse Source 
A la PEP 3134
This commit is contained in:
Allison Kaptur 2014-05-01 16:30:40 -04:00
parent ddcf192da4
commit 1499d49878
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hy/compiler.py
View File

@ -305,13 +305,12 @@ def _raise_wrong_args_number(expression, error):
len(expression))) len(expression)))
def checkargs(exact=None, min=None, max=None, even=None): def checkargs(exact=None, min=None, max=None, even=None, multiple=None):
def _dec(fn): def _dec(fn):
def checker(self, expression): def checker(self, expression):
if exact is not None and (len(expression) - 1) != exact: if exact is not None and (len(expression) - 1) != exact:
_raise_wrong_args_number( _raise_wrong_args_number(
expression, "`%%s' needs %d arguments, got %%d" % exact) expression, "`%%s' needs %d arguments, got %%d" % exact)
if min is not None and (len(expression) - 1) < min: if min is not None and (len(expression) - 1) < min:
_raise_wrong_args_number( _raise_wrong_args_number(
expression, expression,
@ -330,6 +329,14 @@ def checkargs(exact=None, min=None, max=None, even=None):
"`%%s' needs an %s number of arguments, got %%d" "`%%s' needs an %s number of arguments, got %%d"
% (even_str)) % (even_str))
if multiple is not None:
if not (len(expression) - 1) in multiple:
choices = ", ".join([str(val) for val in multiple[:-1]])
choices += " or %s" % multiple[-1]
_raise_wrong_args_number(
expression,
"`%%s' needs %s arguments, got %%d" % choices)
return fn(self, expression) return fn(self, expression)
return checker return checker
@ -665,13 +672,21 @@ class HyASTCompiler(object):
@builds("throw") @builds("throw")
@builds("raise") @builds("raise")
@checkargs(max=1) @checkargs(multiple=[0, 1, 3])
def compile_throw_expression(self, expr): def compile_throw_expression(self, expr):
expr.pop(0) expr.pop(0)
ret = Result() ret = Result()
if expr: if expr:
ret += self.compile(expr.pop(0)) ret += self.compile(expr.pop(0))
cause = None
if PY3:
if len(expr) == 2:
if expr[0] == HyKeyword(":from"):
expr.pop(0)
cause = self.compile(expr.pop(0))
cause = cause.expr
# Use ret.expr to get a literal `None` # Use ret.expr to get a literal `None`
ret += ast.Raise( ret += ast.Raise(
lineno=expr.start_line, lineno=expr.start_line,
@ -680,7 +695,7 @@ class HyASTCompiler(object):
exc=ret.expr, exc=ret.expr,
inst=None, inst=None,
tback=None, tback=None,
cause=None) cause=cause)
return ret return ret