M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

transforms/inline: fix runtime exception encoding

This commit is contained in:
Sebastien Bourdeauducq 2014-09-29 18:09:26 +08:00
parent 4572b7657f
commit 2a40d69290
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
artiq/transforms/inline.py
View File

@ -235,25 +235,13 @@ class _ReferenceReplacer(ast.NodeVisitor):
self.generic_visit(node) self.generic_visit(node)
return node return node
def visit_Raise(self, node):
if node.cause is not None:
raise NotImplementedError("Exception causes are not supported")
if node.exc is not None:
exception_class = self.rm.get(self.obj, self.func_name, node.exc)
if not inspect.isclass(exception_class):
raise NotImplementedError("Exception must be a class")
exception_id = self.rm.exception_mapper.encode(exception_class)
node.exc = ast.copy_location(
ast.Call(func=ast.Name("EncodedException", ast.Load()),
args=[value_to_ast(exception_id)],
keywords=[], starargs=None, kwargs=None),
node.exc)
return node
def _encode_exception(self, e): def _encode_exception(self, e):
exception_class = self.rm.get(self.obj, self.func_name, e) exception_class = self.rm.get(self.obj, self.func_name, e)
if not inspect.isclass(exception_class): if not inspect.isclass(exception_class):
raise NotImplementedError("Exception type must be a class") raise NotImplementedError("Exception type must be a class")
if issubclass(exception_class, core_language.RuntimeException):
exception_id = exception_class.eid
else:
exception_id = self.rm.exception_mapper.encode(exception_class) exception_id = self.rm.exception_mapper.encode(exception_class)
return ast.copy_location( return ast.copy_location(
ast.Call(func=ast.Name("EncodedException", ast.Load()), ast.Call(func=ast.Name("EncodedException", ast.Load()),
@ -261,6 +249,13 @@ class _ReferenceReplacer(ast.NodeVisitor):
keywords=[], starargs=None, kwargs=None), keywords=[], starargs=None, kwargs=None),
e) e)
def visit_Raise(self, node):
if node.cause is not None:
raise NotImplementedError("Exception causes are not supported")
if node.exc is not None:
node.exc = self._encode_exception(node.exc)
return node
def visit_ExceptHandler(self, node): def visit_ExceptHandler(self, node):
if node.name is not None: if node.name is not None:
raise NotImplementedError("'as target' is not supported") raise NotImplementedError("'as target' is not supported")