diff options
| author | Dirk Herrmann <dirk@dirk-herrmanns-seiten.de> | 2001-03-17 12:20:36 +0000 |
|---|---|---|
| committer | Dirk Herrmann <dirk@dirk-herrmanns-seiten.de> | 2001-03-17 12:20:36 +0000 |
| commit | 68baa7e7f8088e21eaa3d0b568a985528314ada5 (patch) | |
| tree | 6391cbf1b6a8dab68459241a46872228b858aa15 | |
| parent | 9f40cd879d951cdaa3409aef31340b2b1472921d (diff) | |
* validate.h (SCM_WRONG_NUM_ARGS): Call scm_error_num_args_subr
instead of scm_wrong_num_args.
* coop-threads.c: Don't include libguile/strings.h. (Was only
needed for former implementation of SCM_WRONG_NUM_ARGS.)
* debug.c (scm_m_start_stack): Don't use SCM_ASSERT to check for
wrong-num-args errors.
| -rw-r--r-- | libguile/ChangeLog | 11 | ||||
| -rw-r--r-- | libguile/coop-threads.c | 1 | ||||
| -rw-r--r-- | libguile/debug.c | 17 | ||||
| -rw-r--r-- | libguile/validate.h | 4 |
4 files changed, 22 insertions, 11 deletions
diff --git a/libguile/ChangeLog b/libguile/ChangeLog index a367901c9..bbf67e72e 100644 --- a/libguile/ChangeLog +++ b/libguile/ChangeLog @@ -1,5 +1,16 @@ 2001-03-17 Dirk Herrmann <D.Herrmann@tu-bs.de> + * validate.h (SCM_WRONG_NUM_ARGS): Call scm_error_num_args_subr + instead of scm_wrong_num_args. + + * coop-threads.c: Don't include libguile/strings.h. (Was only + needed for former implementation of SCM_WRONG_NUM_ARGS.) + + * debug.c (scm_m_start_stack): Don't use SCM_ASSERT to check for + wrong-num-args errors. + +2001-03-17 Dirk Herrmann <D.Herrmann@tu-bs.de> + * error.[ch] (scm_error_num_args_subr): New function. 2001-03-16 Martin Grabmueller <mgrabmue@cs.tu-berlin.de> diff --git a/libguile/coop-threads.c b/libguile/coop-threads.c index b8e52ef5f..e76f9179c 100644 --- a/libguile/coop-threads.c +++ b/libguile/coop-threads.c @@ -47,7 +47,6 @@ #include "libguile/validate.h" #include "libguile/coop-threads.h" #include "libguile/root.h" -#include "libguile/strings.h" /* A counter of the current number of threads */ size_t scm_thread_count = 0; diff --git a/libguile/debug.c b/libguile/debug.c index 354ddd6e6..7c1cf8bc4 100644 --- a/libguile/debug.c +++ b/libguile/debug.c @@ -1,5 +1,5 @@ - /* Debugging extensions for Guile - * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Free Software Foundation +/* Debugging extensions for Guile + * Copyright (C) 1995,1996,1997,1998,1999,2000,2001 Free Software Foundation * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -543,16 +543,17 @@ SCM_SYNTAX(s_start_stack, "start-stack", scm_makacro, scm_m_start_stack); static SCM scm_m_start_stack (SCM exp, SCM env) +#define FUNC_NAME s_start_stack { exp = SCM_CDR (exp); - SCM_ASSERT (SCM_ECONSP (exp) - && SCM_ECONSP (SCM_CDR (exp)) - && SCM_NULLP (SCM_CDDR (exp)), - exp, - SCM_WNA, - s_start_stack); + if (!SCM_ECONSP (exp) + || !SCM_ECONSP (SCM_CDR (exp)) + || !SCM_NULLP (SCM_CDDR (exp))) + SCM_WRONG_NUM_ARGS (); return scm_start_stack (scm_eval_car (exp, env), SCM_CADR (exp), env); } +#undef FUNC_NAME + /* {Debug Objects} * diff --git a/libguile/validate.h b/libguile/validate.h index 969b412ad..a75e7eea2 100644 --- a/libguile/validate.h +++ b/libguile/validate.h @@ -1,4 +1,4 @@ -/* $Id: validate.h,v 1.28 2001-03-15 11:24:45 mgrabmue Exp $ */ +/* $Id: validate.h,v 1.29 2001-03-17 12:20:36 dirk Exp $ */ /* Copyright (C) 1999, 2000 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify @@ -58,7 +58,7 @@ do { scm_misc_error (FUNC_NAME, str, args); } while (0) #define SCM_WRONG_NUM_ARGS() \ - do { scm_wrong_num_args (scm_makfrom0str (FUNC_NAME)); } while (0) + do { scm_error_num_args_subr (FUNC_NAME); } while (0) #define SCM_WRONG_TYPE_ARG(pos, obj) \ do { scm_wrong_type_arg (FUNC_NAME, pos, obj); } while (0) |