diff options
author | Andy Wingo <wingo@oblong.net> | 2009-03-17 16:40:52 +0100 |
---|---|---|
committer | Andy Wingo <wingo@oblong.net> | 2009-03-17 16:40:52 +0100 |
commit | 3b91e017e32e1fb6b911f456c61aea6386075095 (patch) | |
tree | 23ec6a0c667756eb48148ada7704086eb489964d /libguile/procs.c | |
parent | 325226dad9ab6f0488500e7381a5d1c07dc9ae91 (diff) | |
parent | e20d7001c3f7150400169fecb0bf0eefdf122fe2 (diff) | |
download | guile-3b91e017e32e1fb6b911f456c61aea6386075095.tar.gz |
Merge commit 'e20d7001c3f7150400169fecb0bf0eefdf122fe2' into vm-check
Conflicts:
libguile/stacks.c
Diffstat (limited to 'libguile/procs.c')
-rw-r--r-- | libguile/procs.c | 47 |
1 files changed, 2 insertions, 45 deletions
diff --git a/libguile/procs.c b/libguile/procs.c index a2f5ef37a..8230e07ae 100644 --- a/libguile/procs.c +++ b/libguile/procs.c @@ -93,39 +93,6 @@ scm_c_define_subr_with_generic (const char *name, } -#ifdef CCLO -SCM -scm_makcclo (SCM proc, size_t len) -{ - scm_t_bits *base = scm_gc_malloc (len * sizeof (scm_t_bits), - "compiled closure"); - unsigned long i; - SCM s; - - for (i = 0; i < len; ++i) - base [i] = SCM_UNPACK (SCM_UNSPECIFIED); - - s = scm_cell (SCM_MAKE_CCLO_TAG (len), (scm_t_bits) base); - SCM_SET_CCLO_SUBR (s, proc); - return s; -} - -/* Undocumented debugging procedure */ -#ifdef GUILE_DEBUG -SCM_DEFINE (scm_make_cclo, "make-cclo", 2, 0, 0, - (SCM proc, SCM len), - "Create a compiled closure for @var{proc}, which reserves\n" - "@var{len} objects for its usage.") -#define FUNC_NAME s_scm_make_cclo -{ - return scm_makcclo (proc, scm_to_size_t (len)); -} -#undef FUNC_NAME -#endif -#endif - - - SCM_DEFINE (scm_procedure_p, "procedure?", 1, 0, 0, (SCM obj), "Return @code{#t} if @var{obj} is a procedure.") @@ -139,9 +106,6 @@ SCM_DEFINE (scm_procedure_p, "procedure?", 1, 0, 0, break; case scm_tcs_closures: case scm_tcs_subrs: -#ifdef CCLO - case scm_tc7_cclo: -#endif case scm_tc7_pws: return SCM_BOOL_T; case scm_tc7_smob: @@ -179,10 +143,9 @@ SCM_DEFINE (scm_thunk_p, "thunk?", 1, 0, 0, case scm_tc7_lsubr: case scm_tc7_rpsubr: case scm_tc7_asubr: -#ifdef CCLO - case scm_tc7_cclo: -#endif return SCM_BOOL_T; + case scm_tc7_gsubr: + return scm_from_bool (SCM_GSUBR_REQ (SCM_GSUBR_TYPE (obj)) == 0); case scm_tc7_pws: obj = SCM_PROCEDURE (obj); goto again; @@ -235,12 +198,6 @@ SCM_DEFINE (scm_procedure_documentation, "procedure-documentation", 1, 0, 0, return SCM_BOOL_F; default: return SCM_BOOL_F; -/* - case scm_tcs_subrs: -#ifdef CCLO - case scm_tc7_cclo: -#endif -*/ } } #undef FUNC_NAME |