diff options
author | Andy Wingo <wingo@pobox.com> | 2013-11-08 14:08:42 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2013-11-08 14:08:42 +0100 |
commit | 9f309e2cd9ec78408d2b0df77c46d44f7bddb368 (patch) | |
tree | f1b2f21d15b9b9dc85eb6d562c256be1b4156002 /libguile/vm-builtins.h | |
parent | f41accb9c26e3b4df4170bda04b8860ee962657f (diff) | |
download | guile-9f309e2cd9ec78408d2b0df77c46d44f7bddb368.tar.gz |
Builtins have procedure properties
* libguile/vm-builtins.h (FOR_EACH_VM_BUILTIN): Add arity information.
(enum scm_vm_builtins):
* libguile/vm.c (scm_vm_builtin_ref):
(scm_vm_builtin_name_to_index):
(scm_vm_builtin_index_to_name): Adapt to macro interface change.
(scm_init_vm_builtin_properties): New helper, sets procedure
properties on builtins.
(scm_bootstrap_vm): Just define the builtins here. Later in the
bootstrap we set their properties.
(scm_sym_apply): Move definition here from expand.c.
* libguile/procprop.c (scm_init_procprop): Call
scm_init_vm_builtin_properties.
Diffstat (limited to 'libguile/vm-builtins.h')
-rw-r--r-- | libguile/vm-builtins.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libguile/vm-builtins.h b/libguile/vm-builtins.h index c51174ca8..ea9b9e216 100644 --- a/libguile/vm-builtins.h +++ b/libguile/vm-builtins.h @@ -22,17 +22,17 @@ #ifdef BUILDING_LIBGUILE #define FOR_EACH_VM_BUILTIN(M) \ - M(apply, APPLY) \ - M(values, VALUES) \ - M(abort_to_prompt, ABORT_TO_PROMPT) \ - M(call_with_values, CALL_WITH_VALUES) \ - M(call_with_current_continuation, CALL_WITH_CURRENT_CONTINUATION) + M(apply, APPLY, 2, 0, 1) \ + M(values, VALUES, 0, 0, 1) \ + M(abort_to_prompt, ABORT_TO_PROMPT, 1, 0, 1) \ + M(call_with_values, CALL_WITH_VALUES, 2, 0, 0) \ + M(call_with_current_continuation, CALL_WITH_CURRENT_CONTINUATION, 1, 0, 0) /* These enumerated values are embedded in RTL code, and as such are part of Guile's ABI. */ enum scm_vm_builtins { -#define ENUM(builtin, BUILTIN) SCM_VM_BUILTIN_##BUILTIN, +#define ENUM(builtin, BUILTIN, req, opt, rest) SCM_VM_BUILTIN_##BUILTIN, FOR_EACH_VM_BUILTIN(ENUM) #undef ENUM SCM_VM_BUILTIN_COUNT @@ -40,6 +40,7 @@ enum scm_vm_builtins SCM_INTERNAL SCM scm_vm_builtin_name_to_index (SCM name); SCM_INTERNAL SCM scm_vm_builtin_index_to_name (SCM idx); +SCM_INTERNAL void scm_init_vm_builtin_properties (void); #endif /* BUILDING_LIBGUILE */ |