occheung
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

compiler.builtins: {fn→obj}_{serial,parallel}.

This commit is contained in:
whitequark 2015-12-10 23:03:28 +08:00
parent c660028abf
commit 143bae4bd3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
artiq/compiler/builtins.py
View File

@ -144,11 +144,11 @@ def fn_print():
def fn_kernel(): def fn_kernel():
return types.TBuiltinFunction("kernel") return types.TBuiltinFunction("kernel")
def fn_parallel(): def obj_parallel():
return types.TBuiltinFunction("parallel") return types.TBuiltin("parallel")
def fn_sequential(): def obj_sequential():
return types.TBuiltinFunction("sequential") return types.TBuiltin("sequential")
def fn_now(): def fn_now():
return types.TBuiltinFunction("now") return types.TBuiltinFunction("now")

4
artiq/compiler/prelude.py
View File

@ -29,8 +29,8 @@ def globals():
"kernel": builtins.fn_kernel(), "kernel": builtins.fn_kernel(),
# ARTIQ context managers # ARTIQ context managers
"parallel": builtins.fn_parallel(), "parallel": builtins.obj_parallel(),
"sequential": builtins.fn_sequential(), "sequential": builtins.obj_sequential(),
# ARTIQ time management functions # ARTIQ time management functions
"now": builtins.fn_now(), "now": builtins.fn_now(),