From 143bae4bd319dd945d669bfca086de392406f312 Mon Sep 17 00:00:00 2001 From: whitequark Date: Thu, 10 Dec 2015 23:03:28 +0800 Subject: [PATCH] =?UTF-8?q?compiler.builtins:=20{fn=E2=86=92obj}=5F{serial?= =?UTF-8?q?,parallel}.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- artiq/compiler/builtins.py | 8 ++++---- artiq/compiler/prelude.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/artiq/compiler/builtins.py b/artiq/compiler/builtins.py index 99065d39b..57d506b78 100644 --- a/artiq/compiler/builtins.py +++ b/artiq/compiler/builtins.py @@ -144,11 +144,11 @@ def fn_print(): def fn_kernel(): return types.TBuiltinFunction("kernel") -def fn_parallel(): - return types.TBuiltinFunction("parallel") +def obj_parallel(): + return types.TBuiltin("parallel") -def fn_sequential(): - return types.TBuiltinFunction("sequential") +def obj_sequential(): + return types.TBuiltin("sequential") def fn_now(): return types.TBuiltinFunction("now") diff --git a/artiq/compiler/prelude.py b/artiq/compiler/prelude.py index 26870cb52..34ecd9695 100644 --- a/artiq/compiler/prelude.py +++ b/artiq/compiler/prelude.py @@ -29,8 +29,8 @@ def globals(): "kernel": builtins.fn_kernel(), # ARTIQ context managers - "parallel": builtins.fn_parallel(), - "sequential": builtins.fn_sequential(), + "parallel": builtins.obj_parallel(), + "sequential": builtins.obj_sequential(), # ARTIQ time management functions "now": builtins.fn_now(),