diff options
author | Andy Wingo <wingo@pobox.com> | 2018-06-18 10:23:04 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2018-06-18 10:50:17 +0200 |
commit | 6f294ecc7522343be2774b18e2fe8e37ac58779c (patch) | |
tree | a564d7ff9c60443673167d6f8c913308a62f6c5b /libguile/hooks.c | |
parent | 8a6f46ee96e0946e539e3a33c95c3228b63e9fb3 (diff) | |
download | guile-6f294ecc7522343be2774b18e2fe8e37ac58779c.tar.gz |
Devolve more validate macros
* libguile.h: Add chooks.h.
* libguile/Makefile.am: Add chooks.h and chooks.c.
* libguile/chooks.c:
* libguile/chooks.h: New files, for the C implementation of hooks.
Broken out to avoid cycles in gc.h includes.
* libguile/gc.h:
* libguile/gc.c (scm_i_gc_admin_mutex, scm_i_sweep_mutex): Remove unused
mutexes. Include chooks instead of hooks in the main header.
* libguile/deprecated.h (scm_gc_running_p): Deprecate this macro always
defined to 0.
(SCM_VALIDATE_VECTOR_OR_DVECTOR): Deprecate this weird one too.
* libguile/array-map.c: Add procs.h include.
* libguile/threads.h:
* libguile/vm.c:
* libguile/r6rs-ports.c: Add smob.h include.
* libguile/atomic.h (SCM_VALIDATE_ATOMIC_BOX): Devolve.
* libguile/deprecation.c (scm_c_issue_deprecation_warning): Remove use
of scm_gc_running_p.
* libguile/error.c (scm_error_scm): Remove use of scm_gc_running_p.
* libguile/filesys.h (SCM_VALIDATE_DIR)
* libguile/fluids.h (SCM_VALIDATE_FLUID)
* libguile/fports.h (SCM_VALIDATE_FPORT, SCM_VALIDATE_OPFPORT)
* libguile/generalized-arrays.h (SCM_VALIDATE_ARRAY)
* libguile/hooks.h (SCM_VALIDATE_HOOK)
* libguile/keywords.h (SCM_VALIDATE_KEYWORD)
* libguile/ports.h (SCM_VALIDATE_PORT, SCM_VALIDATE_INPUT_PORT)
(SCM_VALIDATE_OUTPUT_PORT, SCM_VALIDATE_OPINPORT)
(SCM_VALIDATE_OPENPORT, SCM_VALIDATE_OPPORT, SCM_VALIDATE_OPOUTPORT)
* libguile/procs.h (SCM_VALIDATE_PROC)
* libguile/random.h (SCM_VALIDATE_RSTATE)
* libguile/regex-posix.h (SCM_VALIDATE_RGXP)
* libguile/stacks.h (SCM_VALIDATE_STACK, SCM_VALIDATE_FRAME)
* libguile/strports.h (SCM_VALIDATE_OPOUTSTRPORT)
* libguile/struct.h (SCM_VALIDATE_STRUCT SCM_VALIDATE_VTABLE)
* libguile/symbols.h (SCM_VALIDATE_SYMBOL)
* libguile/variable.h (SCM_VALIDATE_VARIABLE)
* libguile/vectors.h (SCM_VALIDATE_VECTOR SCM_VALIDATE_VECTOR_LEN):
Devolve.
* libguile/validate.h: It's empty now!
hooks squish
Diffstat (limited to 'libguile/hooks.c')
-rw-r--r-- | libguile/hooks.c | 84 |
1 files changed, 2 insertions, 82 deletions
diff --git a/libguile/hooks.c b/libguile/hooks.c index 2a953a9b7..fce2ff387 100644 --- a/libguile/hooks.c +++ b/libguile/hooks.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1995,1996,1998,1999,2000,2001, 2003, 2006, 2008, 2009, 2011 Free Software Foundation, Inc. +/* Copyright (C) 1995-1996,1998-2001,2003,2006,2008-2009,2011,2018 + * Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -35,87 +36,6 @@ #include "libguile/hooks.h" -/* C level hooks - * - * Currently, this implementation is separate from the Scheme level - * hooks. The possibility exists to implement the Scheme level hooks - * using C level hooks. - */ - -/* Hint for `scm_gc_malloc ()' and friends. */ -static const char hook_entry_gc_hint[] = "hook entry"; - -void -scm_c_hook_init (scm_t_c_hook *hook, void *hook_data, scm_t_c_hook_type type) -{ - hook->first = 0; - hook->type = type; - hook->data = hook_data; -} - -void -scm_c_hook_add (scm_t_c_hook *hook, - scm_t_c_hook_function func, - void *fn_data, - int appendp) -{ - scm_t_c_hook_entry *entry; - scm_t_c_hook_entry **loc = &hook->first; - - entry = scm_gc_malloc (sizeof (scm_t_c_hook_entry), hook_entry_gc_hint); - if (appendp) - while (*loc) - loc = &(*loc)->next; - entry->next = *loc; - entry->func = func; - entry->data = fn_data; - *loc = entry; -} - -void -scm_c_hook_remove (scm_t_c_hook *hook, - scm_t_c_hook_function func, - void *fn_data) -{ - scm_t_c_hook_entry **loc = &hook->first; - while (*loc) - { - if ((*loc)->func == func && (*loc)->data == fn_data) - { - *loc = (*loc)->next; - return; - } - loc = &(*loc)->next; - } - fprintf (stderr, "Attempt to remove non-existent hook function\n"); - abort (); -} - -void * -scm_c_hook_run (scm_t_c_hook *hook, void *data) -{ - scm_t_c_hook_entry *entry = hook->first; - scm_t_c_hook_type type = hook->type; - void *res = 0; - while (entry) - { - res = (entry->func) (hook->data, entry->data, data); - if (res) - { - if (type == SCM_C_HOOK_OR) - break; - } - else - { - if (type == SCM_C_HOOK_AND) - break; - } - entry = entry->next; - } - return res; -} - - /* Scheme level hooks * * A hook is basically a list of procedures to be called at well defined |