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

Unbreak tests.

This commit is contained in:
whitequark 2015-08-11 00:41:31 +03:00
parent 200330a808
commit 786fde827a
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artiq/compiler/transforms/artiq_ir_generator.py
View File

@ -186,7 +186,7 @@ class ARTIQIRGenerator(algorithm.Visitor):
optargs.append(ir.Argument(ir.TOption(typ.optargs[arg_name]), "arg." + arg_name)) optargs.append(ir.Argument(ir.TOption(typ.optargs[arg_name]), "arg." + arg_name))
func = ir.Function(typ, ".".join(self.name), [env_arg] + args + optargs, func = ir.Function(typ, ".".join(self.name), [env_arg] + args + optargs,
loc=node.keyword_loc) loc=node.lambda_loc if is_lambda else node.keyword_loc)
func.is_internal = is_internal func.is_internal = is_internal
self.functions.append(func) self.functions.append(func)
old_func, self.current_function = self.current_function, func old_func, self.current_function = self.current_function, func

2
artiq/compiler/transforms/inferencer.py
View File

@ -728,7 +728,7 @@ class Inferencer(algorithm.Visitor):
elif keyword.arg in typ.optargs: elif keyword.arg in typ.optargs:
self._unify(keyword.value.type, typ.optargs[keyword.arg], self._unify(keyword.value.type, typ.optargs[keyword.arg],
keyword.value.loc, None) keyword.value.loc, None)
passed_args.add(keyword.arg) passed_args[keyword.arg] = keyword.arg_loc
for formalname in typ.args: for formalname in typ.args:
if formalname not in passed_args: if formalname not in passed_args:

2
artiq/compiler/transforms/llvm_ir_generator.py
View File

@ -403,7 +403,7 @@ class LLVMIRGenerator:
finally: finally:
self.llfunction = None self.llfunction = None
self.llmap = {} self.llmap = {}
self.llphis = [] self.phis = []
def process_Phi(self, insn): def process_Phi(self, insn):
llinsn = self.llbuilder.phi(self.llty_of_type(insn.type), name=insn.name) llinsn = self.llbuilder.phi(self.llty_of_type(insn.type), name=insn.name)

2
lit-test/test/inferencer/error_builtin_calls.py
View File

@ -11,5 +11,5 @@ len(1)
# CHECK-L: ${LINE:+1}: error: the argument of list() must be of an iterable type # CHECK-L: ${LINE:+1}: error: the argument of list() must be of an iterable type
list(1) list(1)
# CHECK-L: ${LINE:+1}: error: an argument of range() must be of a numeric type # CHECK-L: ${LINE:+1}: error: an argument of range() must be of an integer type
range([]) range([])

2
lit-test/test/inferencer/error_call.py
View File

@ -13,7 +13,7 @@ f(*[])
# CHECK-L: ${LINE:+1}: error: variadic arguments are not supported # CHECK-L: ${LINE:+1}: error: variadic arguments are not supported
f(**[]) f(**[])
# CHECK-L: ${LINE:+1}: error: the argument 'x' is already passed # CHECK-L: ${LINE:+1}: error: the argument 'x' has been passed earlier as positional
f(1, x=1) f(1, x=1)
# CHECK-L: ${LINE:+1}: error: mandatory argument 'x' is not passed # CHECK-L: ${LINE:+1}: error: mandatory argument 'x' is not passed