HCoop
/
bpt
/
guile.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'local-2.0/stable-2.0'
[bpt/guile.git]
/
libguile
/
hooks.c
diff --git
a/libguile/hooks.c
b/libguile/hooks.c
index
aa80151
..
782636e
100644
(file)
--- a/
libguile/hooks.c
+++ b/
libguile/hooks.c
@@
-1,18
+1,19
@@
-/* Copyright (C) 1995,1996,1998,1999,2000,2001, 2003, 2006, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1998,1999,2000,2001, 2003, 2006, 2008
, 2009, 2011
Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
*
* This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- *
License as published by the Free Software Foundation; either
- *
version 2.1 of
the License, or (at your option) any later version.
+ * modify it under the terms of the GNU Lesser General Public
License
+ *
as published by the Free Software Foundation; either version 3 of
+ * the License, or (at your option) any later version.
*
*
- * This library is distributed in the hope that it will be useful,
- *
but
WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
*/
*/
@@
-42,6
+43,9
@@
* using C 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)
{
void
scm_c_hook_init (scm_t_c_hook *hook, void *hook_data, scm_t_c_hook_type type)
{
@@
-56,8
+60,10
@@
scm_c_hook_add (scm_t_c_hook *hook,
void *fn_data,
int appendp)
{
void *fn_data,
int appendp)
{
- scm_t_c_hook_entry *entry
= scm_malloc (sizeof (scm_t_c_hook_entry))
;
+ scm_t_c_hook_entry *entry;
scm_t_c_hook_entry **loc = &hook->first;
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;
if (appendp)
while (*loc)
loc = &(*loc)->next;
@@
-77,9
+83,7
@@
scm_c_hook_remove (scm_t_c_hook *hook,
{
if ((*loc)->func == func && (*loc)->data == fn_data)
{
{
if ((*loc)->func == func && (*loc)->data == fn_data)
{
- scm_t_c_hook_entry *entry = *loc;
*loc = (*loc)->next;
*loc = (*loc)->next;
- free (entry);
return;
}
loc = &(*loc)->next;
return;
}
loc = &(*loc)->next;
@@
-130,22
+134,22
@@
static int
hook_print (SCM hook, SCM port, scm_print_state *pstate)
{
SCM ls, name;
hook_print (SCM hook, SCM port, scm_print_state *pstate)
{
SCM ls, name;
- scm_puts ("#<hook ", port);
+ scm_puts
_unlocked
("#<hook ", port);
scm_intprint (SCM_HOOK_ARITY (hook), 10, port);
scm_intprint (SCM_HOOK_ARITY (hook), 10, port);
- scm_putc (' ', port);
+ scm_putc
_unlocked
(' ', port);
scm_uintprint (SCM_UNPACK (hook), 16, port);
ls = SCM_HOOK_PROCEDURES (hook);
scm_uintprint (SCM_UNPACK (hook), 16, port);
ls = SCM_HOOK_PROCEDURES (hook);
- while (
SCM_NIMP
(ls))
+ while (
scm_is_pair
(ls))
{
{
- scm_putc (' ', port);
+ scm_putc
_unlocked
(' ', port);
name = scm_procedure_name (SCM_CAR (ls));
if (scm_is_true (name))
scm_iprin1 (name, port, pstate);
else
name = scm_procedure_name (SCM_CAR (ls));
if (scm_is_true (name))
scm_iprin1 (name, port, pstate);
else
- scm_putc ('?', port);
+ scm_putc
_unlocked
('?', port);
ls = SCM_CDR (ls);
}
ls = SCM_CDR (ls);
}
- scm_putc ('>', port);
+ scm_putc
_unlocked
('>', port);
return 1;
}
return 1;
}
@@
-199,16
+203,13
@@
SCM_DEFINE (scm_add_hook_x, "add-hook!", 2, 1, 0,
"procedure is not specified.")
#define FUNC_NAME s_scm_add_hook_x
{
"procedure is not specified.")
#define FUNC_NAME s_scm_add_hook_x
{
- SCM
arity,
rest;
- int n_args;
+ SCM rest;
+ int n_args
, p_req, p_opt, p_rest
;
SCM_VALIDATE_HOOK (1, hook);
SCM_VALIDATE_HOOK (1, hook);
- SCM_ASSERT (scm_i
s_true (arity = scm_i_procedure_arity (proc)
),
+ SCM_ASSERT (scm_i
_procedure_arity (proc, &p_req, &p_opt, &p_rest
),
proc, SCM_ARG2, FUNC_NAME);
n_args = SCM_HOOK_ARITY (hook);
proc, SCM_ARG2, FUNC_NAME);
n_args = SCM_HOOK_ARITY (hook);
- if (scm_to_int (SCM_CAR (arity)) > n_args
- || (scm_is_false (SCM_CADDR (arity))
- && (scm_to_int (SCM_CAR (arity)) + scm_to_int (SCM_CADR (arity))
- < n_args)))
+ if (p_req > n_args || (!p_rest && p_req + p_opt < n_args))
scm_wrong_type_arg (FUNC_NAME, 2, proc);
rest = scm_delq_x (proc, SCM_HOOK_PROCEDURES (hook));
SCM_SET_HOOK_PROCEDURES (hook,
scm_wrong_type_arg (FUNC_NAME, 2, proc);
rest = scm_delq_x (proc, SCM_HOOK_PROCEDURES (hook));
SCM_SET_HOOK_PROCEDURES (hook,
@@
-268,13
+269,24
@@
void
scm_c_run_hook (SCM hook, SCM args)
{
SCM procs = SCM_HOOK_PROCEDURES (hook);
scm_c_run_hook (SCM hook, SCM args)
{
SCM procs = SCM_HOOK_PROCEDURES (hook);
- while (
SCM_NIMP
(procs))
+ while (
scm_is_pair
(procs))
{
scm_apply_0 (SCM_CAR (procs), args);
procs = SCM_CDR (procs);
}
}
{
scm_apply_0 (SCM_CAR (procs), args);
procs = SCM_CDR (procs);
}
}
+void
+scm_c_run_hookn (SCM hook, SCM *argv, size_t nargs)
+{
+ SCM procs = SCM_HOOK_PROCEDURES (hook);
+ while (scm_is_pair (procs))
+ {
+ scm_call_n (SCM_CAR (procs), argv, nargs);
+ procs = SCM_CDR (procs);
+ }
+}
+
SCM_DEFINE (scm_hook_to_list, "hook->list", 1, 0, 0,
(SCM hook),
SCM_DEFINE (scm_hook_to_list, "hook->list", 1, 0, 0,
(SCM hook),