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

embedding: fix location for diagnostics on quoted values. 

Fixes #489.
This commit is contained in:
whitequark 2016-07-07 06:55:21 +00:00
parent c065b5866f
commit 373578bc02
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artiq/compiler/embedding.py
View File

@ -558,7 +558,7 @@ class StitchingInferencer(Inferencer):
if attr_value_type is None: if attr_value_type is None:
# Slow path. We don't know what exactly is the attribute value, # Slow path. We don't know what exactly is the attribute value,
# so we quote it only for the error message that may possibly result. # so we quote it only for the error message that may possibly result.
ast = self.quote(attr_value, object_loc.expanded_from) ast = self.quote(attr_value, loc)
def proxy_diagnostic(diag): def proxy_diagnostic(diag):
note = diagnostic.Diagnostic("note", note = diagnostic.Diagnostic("note",
@ -981,7 +981,7 @@ class Stitcher:
diag = diagnostic.Diagnostic("fatal", diag = diagnostic.Diagnostic("fatal",
"this function cannot be called as an RPC", {}, "this function cannot be called as an RPC", {},
self._function_loc(host_function), self._function_loc(host_function),
notes=self._call_site_note(loc, is_syscall=True)) notes=self._call_site_note(loc, is_syscall=False))
self.engine.process(diag) self.engine.process(diag)
else: else:
assert False assert False