From b6791b2e94a4958e0da1ce7266c82320aff82a1b Mon Sep 17 00:00:00 2001 From: "Greg J. Badros" Date: Fri, 3 Mar 2000 00:09:54 +0000 Subject: [PATCH] * error.h, error.c: Added `scm_wrong_type_arg_msg' to support displaying the expected type. Use SCM_LISTn in a couple places instead of scm_cons-ing by hand. * __scm.h: Added SCM_ASSERT_TYPE macro. * validate.h, scm_validate.h: Added the former, as a renamed version of the latter with SCM_ASSERT_TYPE used in SCM_MAKE_VALIDATE (instead of just SCM_ASSERT) * Makefile.am: Rename scm_validate.h to validate.h. * *.c, *.h: Include validate.h, not scm_validate.h (old name's prefix was superfluous). --- libguile/__scm.h | 4 ++++ libguile/alist.c | 2 +- libguile/arbiters.c | 2 +- libguile/async.c | 2 +- libguile/backtrace.c | 2 +- libguile/boolean.c | 2 +- libguile/chars.c | 2 +- libguile/coop-threads.c | 2 +- libguile/debug.c | 2 +- libguile/dynl.c | 2 +- libguile/eq.c | 2 +- libguile/error.c | 31 +++++++++++++++++++++++++------ libguile/error.h | 2 ++ libguile/eval.c | 2 +- libguile/evalext.c | 2 +- libguile/feature.c | 2 +- libguile/filesys.c | 2 +- libguile/fluids.c | 2 +- libguile/fports.c | 2 +- libguile/gc.c | 2 +- libguile/guardians.c | 2 +- libguile/hash.c | 2 +- libguile/hashtab.c | 2 +- libguile/ioext.c | 2 +- libguile/keywords.c | 2 +- libguile/lang.c | 2 +- libguile/list.c | 2 +- libguile/load.c | 2 +- libguile/macros.c | 2 +- libguile/net_db.c | 2 +- libguile/numbers.c | 2 +- libguile/objects.c | 2 +- libguile/pairs.c | 2 +- libguile/ports.c | 2 +- libguile/posix.c | 2 +- libguile/print.c | 2 +- libguile/procprop.c | 2 +- libguile/procs.c | 2 +- libguile/ramap.c | 2 +- libguile/random.c | 2 +- libguile/read.c | 2 +- libguile/regex-posix.c | 2 +- libguile/scm_validate.h | 2 +- libguile/scmsigs.c | 2 +- libguile/simpos.c | 2 +- libguile/socket.c | 2 +- libguile/sort.c | 2 +- libguile/srcprop.c | 2 +- libguile/stacks.c | 2 +- libguile/stime.c | 2 +- libguile/strings.c | 2 +- libguile/strop.c | 2 +- libguile/strorder.c | 2 +- libguile/struct.c | 2 +- libguile/symbols.c | 2 +- libguile/throw.c | 2 +- libguile/unif.c | 2 +- libguile/variable.c | 2 +- libguile/vectors.c | 2 +- libguile/vports.c | 2 +- libguile/weaks.c | 2 +- 61 files changed, 89 insertions(+), 64 deletions(-) diff --git a/libguile/__scm.h b/libguile/__scm.h index 960b92819..b52dc907f 100644 --- a/libguile/__scm.h +++ b/libguile/__scm.h @@ -390,11 +390,15 @@ do { \ #ifdef SCM_RECKLESS #define SCM_ASSERT(_cond, _arg, _pos, _subr) +#define SCM_ASSERT_TYPE(_cond, _arg, _pos, _subr) #define SCM_ASRTGO(_cond, _label) #else #define SCM_ASSERT(_cond, _arg, _pos, _subr) \ if (!(_cond)) \ scm_wta(_arg, (char *)(_pos), _subr) +#define SCM_ASSERT_TYPE(_cond, _arg, _pos, _subr, _msg) \ + if (!(_cond)) \ + scm_wrong_type_arg_msg(_subr, _pos, _arg, _msg) #define SCM_ASRTGO(_cond, _label) \ if (!(_cond)) \ goto _label diff --git a/libguile/alist.c b/libguile/alist.c index 9481412d1..f910829d0 100644 --- a/libguile/alist.c +++ b/libguile/alist.c @@ -48,7 +48,7 @@ #include "eq.h" #include "list.h" -#include "scm_validate.h" +#include "validate.h" #include "alist.h" diff --git a/libguile/arbiters.c b/libguile/arbiters.c index c4df49ab8..a121950c1 100644 --- a/libguile/arbiters.c +++ b/libguile/arbiters.c @@ -49,7 +49,7 @@ #include "smob.h" #include "genio.h" -#include "scm_validate.h" +#include "validate.h" #include "arbiters.h" diff --git a/libguile/async.c b/libguile/async.c index 6e59aa68a..fd3b93152 100644 --- a/libguile/async.c +++ b/libguile/async.c @@ -51,7 +51,7 @@ #include "throw.h" #include "smob.h" -#include "scm_validate.h" +#include "validate.h" #include "async.h" #ifdef HAVE_STRING_H diff --git a/libguile/backtrace.c b/libguile/backtrace.c index d3771e158..7cd563278 100644 --- a/libguile/backtrace.c +++ b/libguile/backtrace.c @@ -64,7 +64,7 @@ #include "throw.h" #include "fluids.h" -#include "scm_validate.h" +#include "validate.h" #include "backtrace.h" /* {Error reporting and backtraces} diff --git a/libguile/boolean.c b/libguile/boolean.c index 9859de9e7..7b4267b30 100644 --- a/libguile/boolean.c +++ b/libguile/boolean.c @@ -47,7 +47,7 @@ #include #include "_scm.h" -#include "scm_validate.h" +#include "validate.h" #include "boolean.h" diff --git a/libguile/chars.c b/libguile/chars.c index a83fcccec..bfa96ef0f 100644 --- a/libguile/chars.c +++ b/libguile/chars.c @@ -47,7 +47,7 @@ #include #include #include "_scm.h" -#include "scm_validate.h" +#include "validate.h" #include "chars.h" diff --git a/libguile/coop-threads.c b/libguile/coop-threads.c index 65374ce11..00a2cce05 100644 --- a/libguile/coop-threads.c +++ b/libguile/coop-threads.c @@ -44,7 +44,7 @@ -#include "scm_validate.h" +#include "validate.h" #include "coop-threads.h" /* A counter of the current number of threads */ diff --git a/libguile/debug.c b/libguile/debug.c index e02d8d136..9cbcb52b0 100644 --- a/libguile/debug.c +++ b/libguile/debug.c @@ -65,7 +65,7 @@ #include "dynwind.h" #include "modules.h" -#include "scm_validate.h" +#include "validate.h" #include "debug.h" diff --git a/libguile/dynl.c b/libguile/dynl.c index a5833e3e8..8634e7569 100644 --- a/libguile/dynl.c +++ b/libguile/dynl.c @@ -71,7 +71,7 @@ maybe_drag_in_eprintf () #include "smob.h" #include "keywords.h" -#include "scm_validate.h" +#include "validate.h" /* Converting a list of SCM strings into a argv-style array. You must have ints disabled for the whole lifetime of the created argv (from diff --git a/libguile/eq.c b/libguile/eq.c index 6ca1156da..885f297a7 100644 --- a/libguile/eq.c +++ b/libguile/eq.c @@ -51,7 +51,7 @@ #include "smob.h" #include "unif.h" -#include "scm_validate.h" +#include "validate.h" #include "eq.h" SCM_DEFINE1 (scm_eq_p, "eq?", scm_tc7_rpsubr, diff --git a/libguile/error.c b/libguile/error.c index 2353faf29..78e698619 100644 --- a/libguile/error.c +++ b/libguile/error.c @@ -51,7 +51,7 @@ #include "genio.h" #include "throw.h" -#include "scm_validate.h" +#include "validate.h" #include "error.h" #ifdef HAVE_STRING_H @@ -188,7 +188,7 @@ scm_out_of_range (const char *subr, SCM bad_value) scm_error (scm_out_of_range_key, subr, "Argument out of range: ~S", - scm_cons (bad_value, SCM_EOL), + SCM_LIST1(bad_value), SCM_BOOL_F); } @@ -198,7 +198,7 @@ scm_out_of_range_pos (const char *subr, SCM bad_value, SCM pos) scm_error (scm_out_of_range_key, subr, "Argument ~S out of range: ~S", - scm_listify (pos, bad_value, SCM_UNDEFINED), + SCM_LIST2(pos,bad_value), SCM_BOOL_F); } @@ -210,7 +210,7 @@ scm_wrong_num_args (SCM proc) scm_error (scm_args_number_key, NULL, "Wrong number of arguments to ~A", - scm_cons (proc, SCM_EOL), + SCM_LIST1(proc), SCM_BOOL_F); } @@ -222,11 +222,30 @@ scm_wrong_type_arg (const char *subr, int pos, SCM bad_value) subr, (pos == 0) ? "Wrong type argument: ~S" : "Wrong type argument in position ~A: ~S", - (pos == 0) ? scm_cons (bad_value, SCM_EOL) - : scm_cons (SCM_MAKINUM (pos), scm_cons (bad_value, SCM_EOL)), + (pos == 0) ? SCM_LIST1(bad_value) + : SCM_LIST2(SCM_MAKINUM(pos), bad_value), SCM_BOOL_F); } +void +scm_wrong_type_arg_msg (const char *subr, int pos, SCM bad_value, const char *szMessage) +{ + SCM msg = scm_makfrom0str(szMessage); + if (pos == 0) { + scm_error (scm_arg_type_key, + subr, "Wrong type argument (expecting ~A): ~S", + SCM_LIST2(msg,bad_value), + SCM_BOOL_F); + } else { + scm_error (scm_arg_type_key, + subr, + "Wrong type argument in position ~A (expecting ~A): ~S", + SCM_LIST3(SCM_MAKINUM(pos),msg,bad_value), + SCM_BOOL_F); + } +} + + SCM_SYMBOL (scm_memory_alloc_key, "memory-allocation-error"); void scm_memory_error (const char *subr) diff --git a/libguile/error.h b/libguile/error.h index 81a79ff46..11924dcea 100644 --- a/libguile/error.h +++ b/libguile/error.h @@ -78,6 +78,8 @@ extern void scm_out_of_range_pos (const char *subr, SCM bad_value, SCM pos) extern void scm_wrong_num_args (SCM proc) SCM_NORETURN; extern void scm_wrong_type_arg (const char *subr, int pos, SCM bad_value) SCM_NORETURN; +extern void scm_wrong_type_arg_msg (const char *subr, int pos, + SCM bad_value, const char *sz) SCM_NORETURN; extern void scm_memory_error (const char *subr) SCM_NORETURN; extern void scm_misc_error (const char *subr, const char *message, SCM args) SCM_NORETURN; diff --git a/libguile/eval.c b/libguile/eval.c index b257c2e55..35ff33d7e 100644 --- a/libguile/eval.c +++ b/libguile/eval.c @@ -96,7 +96,7 @@ char *alloca (); #include "feature.h" #include "modules.h" -#include "scm_validate.h" +#include "validate.h" #include "eval.h" SCM (*scm_memoize_method) (SCM, SCM); diff --git a/libguile/evalext.c b/libguile/evalext.c index 74430acf8..9fefca6be 100644 --- a/libguile/evalext.c +++ b/libguile/evalext.c @@ -49,7 +49,7 @@ #include "macros.h" #include "modules.h" -#include "scm_validate.h" +#include "validate.h" #include "evalext.h" SCM_SYMBOL (scm_sym_setter, "setter"); diff --git a/libguile/feature.c b/libguile/feature.c index b1068aadd..a6bb4347e 100644 --- a/libguile/feature.c +++ b/libguile/feature.c @@ -51,7 +51,7 @@ #include "procprop.h" #include "smob.h" -#include "scm_validate.h" +#include "validate.h" #include "feature.h" #ifdef HAVE_STRING_H diff --git a/libguile/filesys.c b/libguile/filesys.c index 4b19dcf09..6a909d8cc 100644 --- a/libguile/filesys.c +++ b/libguile/filesys.c @@ -51,7 +51,7 @@ #include "fports.h" #include "iselect.h" -#include "scm_validate.h" +#include "validate.h" #include "filesys.h" diff --git a/libguile/fluids.c b/libguile/fluids.c index cc02f8a1a..1254e3a5b 100644 --- a/libguile/fluids.c +++ b/libguile/fluids.c @@ -53,7 +53,7 @@ #include "eval.h" #define INITIAL_FLUIDS 10 -#include "scm_validate.h" +#include "validate.h" static volatile int n_fluids; long scm_tc16_fluid; diff --git a/libguile/fports.c b/libguile/fports.c index ad3295ec8..4d98e1875 100644 --- a/libguile/fports.c +++ b/libguile/fports.c @@ -48,7 +48,7 @@ #include #include "_scm.h" -#include "scm_validate.h" +#include "validate.h" #include "fports.h" #ifdef HAVE_STRING_H diff --git a/libguile/gc.c b/libguile/gc.c index 70bc24886..4b8cb7ef0 100644 --- a/libguile/gc.c +++ b/libguile/gc.c @@ -55,7 +55,7 @@ #include "unif.h" #include "async.h" -#include "scm_validate.h" +#include "validate.h" #include "gc.h" #ifdef HAVE_MALLOC_H diff --git a/libguile/guardians.c b/libguile/guardians.c index a43734361..ee5af5e33 100644 --- a/libguile/guardians.c +++ b/libguile/guardians.c @@ -62,7 +62,7 @@ #include "smob.h" #include "genio.h" -#include "scm_validate.h" +#include "validate.h" #include "guardians.h" static long scm_tc16_guardian; diff --git a/libguile/hash.c b/libguile/hash.c index d93c6010f..579248bbd 100644 --- a/libguile/hash.c +++ b/libguile/hash.c @@ -48,7 +48,7 @@ #include "_scm.h" #include "chars.h" -#include "scm_validate.h" +#include "validate.h" #include "hash.h" diff --git a/libguile/hashtab.c b/libguile/hashtab.c index 46214e92d..834b24a02 100644 --- a/libguile/hashtab.c +++ b/libguile/hashtab.c @@ -50,7 +50,7 @@ #include "hash.h" #include "eval.h" -#include "scm_validate.h" +#include "validate.h" #include "hashtab.h" diff --git a/libguile/ioext.c b/libguile/ioext.c index 0f07d1d48..56cdcea6d 100644 --- a/libguile/ioext.c +++ b/libguile/ioext.c @@ -54,7 +54,7 @@ #include "chars.h" #include "feature.h" -#include "scm_validate.h" +#include "validate.h" #include "ioext.h" #include diff --git a/libguile/keywords.c b/libguile/keywords.c index 7508e7425..01d08a6b7 100644 --- a/libguile/keywords.c +++ b/libguile/keywords.c @@ -49,7 +49,7 @@ #include "genio.h" #include "smob.h" -#include "scm_validate.h" +#include "validate.h" #include "keywords.h" diff --git a/libguile/lang.c b/libguile/lang.c index a98830355..3532f0e9f 100644 --- a/libguile/lang.c +++ b/libguile/lang.c @@ -49,7 +49,7 @@ #include "eval.h" #include "macros.h" -#include "scm_validate.h" +#include "validate.h" #include "lang.h" diff --git a/libguile/list.c b/libguile/list.c index fde37996d..e9e30ec11 100644 --- a/libguile/list.c +++ b/libguile/list.c @@ -47,7 +47,7 @@ #include "_scm.h" #include "eq.h" -#include "scm_validate.h" +#include "validate.h" #include "list.h" #ifdef __STDC__ diff --git a/libguile/load.c b/libguile/load.c index 86deef07a..cb1cde0d2 100644 --- a/libguile/load.c +++ b/libguile/load.c @@ -54,7 +54,7 @@ #include "alist.h" #include "dynwind.h" -#include "scm_validate.h" +#include "validate.h" #include "load.h" #include diff --git a/libguile/macros.c b/libguile/macros.c index 05275a395..0db571ddd 100644 --- a/libguile/macros.c +++ b/libguile/macros.c @@ -47,7 +47,7 @@ #include "_scm.h" #include "smob.h" -#include "scm_validate.h" +#include "validate.h" #include "macros.h" long scm_tc16_macro; diff --git a/libguile/net_db.c b/libguile/net_db.c index 6b89a9266..ada35dfe8 100644 --- a/libguile/net_db.c +++ b/libguile/net_db.c @@ -55,7 +55,7 @@ #include "_scm.h" #include "feature.h" -#include "scm_validate.h" +#include "validate.h" #include "net_db.h" #ifdef HAVE_STRING_H diff --git a/libguile/numbers.c b/libguile/numbers.c index 8670758ba..bcae5ed8e 100644 --- a/libguile/numbers.c +++ b/libguile/numbers.c @@ -52,7 +52,7 @@ #include "feature.h" #include "smob.h" -#include "scm_validate.h" +#include "validate.h" #include "numbers.h" #define DIGITS '0':case '1':case '2':case '3':case '4':\ diff --git a/libguile/objects.c b/libguile/objects.c index 2486b4f7d..16a8c0b8c 100644 --- a/libguile/objects.c +++ b/libguile/objects.c @@ -59,7 +59,7 @@ #include "eval.h" #include "alist.h" -#include "scm_validate.h" +#include "validate.h" #include "objects.h" diff --git a/libguile/pairs.c b/libguile/pairs.c index 742a95ebf..780f53734 100644 --- a/libguile/pairs.c +++ b/libguile/pairs.c @@ -47,7 +47,7 @@ #include "_scm.h" -#include "scm_validate.h" +#include "validate.h" diff --git a/libguile/ports.c b/libguile/ports.c index af1f8ffe0..37f527105 100644 --- a/libguile/ports.c +++ b/libguile/ports.c @@ -53,7 +53,7 @@ #include "keywords.h" -#include "scm_validate.h" +#include "validate.h" #include "ports.h" #ifdef HAVE_STRING_H diff --git a/libguile/posix.c b/libguile/posix.c index 757354390..a10e70669 100644 --- a/libguile/posix.c +++ b/libguile/posix.c @@ -50,7 +50,7 @@ #include "scmsigs.h" #include "feature.h" -#include "scm_validate.h" +#include "validate.h" #include "posix.h" diff --git a/libguile/print.c b/libguile/print.c index 71c9ff8bf..52d8d32de 100644 --- a/libguile/print.c +++ b/libguile/print.c @@ -60,7 +60,7 @@ #include "objects.h" #include "strports.h" -#include "scm_validate.h" +#include "validate.h" #include "print.h" diff --git a/libguile/procprop.c b/libguile/procprop.c index 529c92d3d..5d562c5ed 100644 --- a/libguile/procprop.c +++ b/libguile/procprop.c @@ -53,7 +53,7 @@ #include "gsubr.h" #include "objects.h" -#include "scm_validate.h" +#include "validate.h" #include "procprop.h" diff --git a/libguile/procs.c b/libguile/procs.c index e0041bd56..e82718e16 100644 --- a/libguile/procs.c +++ b/libguile/procs.c @@ -49,7 +49,7 @@ #include "objects.h" -#include "scm_validate.h" +#include "validate.h" #include "procs.h" diff --git a/libguile/ramap.c b/libguile/ramap.c index f6e417f8a..4782264c4 100644 --- a/libguile/ramap.c +++ b/libguile/ramap.c @@ -56,7 +56,7 @@ #include "eval.h" #include "feature.h" -#include "scm_validate.h" +#include "validate.h" #include "ramap.h" diff --git a/libguile/random.c b/libguile/random.c index 30279e6bc..3724bd71f 100644 --- a/libguile/random.c +++ b/libguile/random.c @@ -53,7 +53,7 @@ #include "numbers.h" #include "feature.h" -#include "scm_validate.h" +#include "validate.h" #include "random.h" diff --git a/libguile/read.c b/libguile/read.c index 19e5ef6b9..6f7b7ddf7 100644 --- a/libguile/read.c +++ b/libguile/read.c @@ -56,7 +56,7 @@ #include "hashtab.h" #include "hash.h" -#include "scm_validate.h" +#include "validate.h" #include "read.h" diff --git a/libguile/regex-posix.c b/libguile/regex-posix.c index dcbe85518..21fa43214 100644 --- a/libguile/regex-posix.c +++ b/libguile/regex-posix.c @@ -83,7 +83,7 @@ #include "ports.h" #include "feature.h" -#include "scm_validate.h" +#include "validate.h" #include "regex-posix.h" /* This is defined by some regex libraries and omitted by others. */ diff --git a/libguile/scm_validate.h b/libguile/scm_validate.h index 92e8f9b38..0299c96a2 100644 --- a/libguile/scm_validate.h +++ b/libguile/scm_validate.h @@ -1,4 +1,4 @@ -/* $Id: scm_validate.h,v 1.20 2000-03-02 20:54:43 gjb Exp $ */ +/* $Id: scm_validate.h,v 1.21 2000-03-03 00:09:53 gjb Exp $ */ /* Copyright (C) 1999 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify diff --git a/libguile/scmsigs.c b/libguile/scmsigs.c index 5a584bc44..bc4e3f7f9 100644 --- a/libguile/scmsigs.c +++ b/libguile/scmsigs.c @@ -51,7 +51,7 @@ #include "async.h" #include "eval.h" -#include "scm_validate.h" +#include "validate.h" #include "scmsigs.h" #ifdef HAVE_UNISTD_H diff --git a/libguile/simpos.c b/libguile/simpos.c index 5265269d4..e10122051 100644 --- a/libguile/simpos.c +++ b/libguile/simpos.c @@ -49,7 +49,7 @@ #include "scmsigs.h" -#include "scm_validate.h" +#include "validate.h" #include "simpos.h" #ifdef HAVE_STRING_H diff --git a/libguile/socket.c b/libguile/socket.c index b44cc4529..09af23200 100644 --- a/libguile/socket.c +++ b/libguile/socket.c @@ -51,7 +51,7 @@ #include "feature.h" #include "fports.h" -#include "scm_validate.h" +#include "validate.h" #include "socket.h" #ifdef HAVE_STRING_H diff --git a/libguile/sort.c b/libguile/sort.c index 507ca01bd..2b5e01ee5 100644 --- a/libguile/sort.c +++ b/libguile/sort.c @@ -86,7 +86,7 @@ char *alloca (); #include "alist.h" #include "feature.h" -#include "scm_validate.h" +#include "validate.h" #include "sort.h" /* The routine quicksort was extracted from the GNU C Library qsort.c diff --git a/libguile/srcprop.c b/libguile/srcprop.c index f217b5d56..2f79e4479 100644 --- a/libguile/srcprop.c +++ b/libguile/srcprop.c @@ -57,7 +57,7 @@ #include "hash.h" #include "weaks.h" -#include "scm_validate.h" +#include "validate.h" #include "srcprop.h" /* {Source Properties} diff --git a/libguile/stacks.c b/libguile/stacks.c index 7483f0d12..124b830aa 100644 --- a/libguile/stacks.c +++ b/libguile/stacks.c @@ -58,7 +58,7 @@ #include "procprop.h" #include "modules.h" -#include "scm_validate.h" +#include "validate.h" #include "stacks.h" diff --git a/libguile/stime.c b/libguile/stime.c index d6bcb14b5..ef54de968 100644 --- a/libguile/stime.c +++ b/libguile/stime.c @@ -48,7 +48,7 @@ #include "_scm.h" #include "feature.h" -#include "scm_validate.h" +#include "validate.h" #include "stime.h" #ifdef HAVE_UNISTD_H diff --git a/libguile/strings.c b/libguile/strings.c index b791f0175..f4bba65e2 100644 --- a/libguile/strings.c +++ b/libguile/strings.c @@ -49,7 +49,7 @@ #include "chars.h" #include "strings.h" -#include "scm_validate.h" +#include "validate.h" /* {Strings} diff --git a/libguile/strop.c b/libguile/strop.c index eee986aa4..de98e8332 100644 --- a/libguile/strop.c +++ b/libguile/strop.c @@ -27,7 +27,7 @@ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA #include "_scm.h" #include "chars.h" -#include "scm_validate.h" +#include "validate.h" #include "strop.h" #include "read.h" /*For SCM_CASE_INSENSITIVE_P*/ diff --git a/libguile/strorder.c b/libguile/strorder.c index 43c144312..4695b4279 100644 --- a/libguile/strorder.c +++ b/libguile/strorder.c @@ -47,7 +47,7 @@ #include "_scm.h" #include "chars.h" -#include "scm_validate.h" +#include "validate.h" #include "strorder.h" diff --git a/libguile/struct.c b/libguile/struct.c index 23fec6948..7ad351235 100644 --- a/libguile/struct.c +++ b/libguile/struct.c @@ -53,7 +53,7 @@ #include "weaks.h" #include "hashtab.h" -#include "scm_validate.h" +#include "validate.h" #include "struct.h" #ifdef HAVE_STRING_H diff --git a/libguile/symbols.c b/libguile/symbols.c index 30779bd97..f02603d08 100644 --- a/libguile/symbols.c +++ b/libguile/symbols.c @@ -52,7 +52,7 @@ #include "alist.h" #include "weaks.h" -#include "scm_validate.h" +#include "validate.h" #include "symbols.h" #ifdef HAVE_STRING_H diff --git a/libguile/throw.c b/libguile/throw.c index a10b282f8..e63c01a94 100644 --- a/libguile/throw.c +++ b/libguile/throw.c @@ -61,7 +61,7 @@ #include "stacks.h" #include "fluids.h" -#include "scm_validate.h" +#include "validate.h" #include "throw.h" diff --git a/libguile/unif.c b/libguile/unif.c index 4a96198ea..32ff7416a 100644 --- a/libguile/unif.c +++ b/libguile/unif.c @@ -53,7 +53,7 @@ #include "strop.h" #include "feature.h" -#include "scm_validate.h" +#include "validate.h" #include "unif.h" #include "ramap.h" diff --git a/libguile/variable.c b/libguile/variable.c index 19059988b..c4cb241b6 100644 --- a/libguile/variable.c +++ b/libguile/variable.c @@ -50,7 +50,7 @@ #include "genio.h" #include "smob.h" -#include "scm_validate.h" +#include "validate.h" #include "variable.h" diff --git a/libguile/vectors.c b/libguile/vectors.c index eb7b20b00..67308f476 100644 --- a/libguile/vectors.c +++ b/libguile/vectors.c @@ -48,7 +48,7 @@ #include "_scm.h" #include "eq.h" -#include "scm_validate.h" +#include "validate.h" #include "vectors.h" #include "unif.h" diff --git a/libguile/vports.c b/libguile/vports.c index 00056c0f6..04cfb1478 100644 --- a/libguile/vports.c +++ b/libguile/vports.c @@ -50,7 +50,7 @@ #include "chars.h" #include "fports.h" -#include "scm_validate.h" +#include "validate.h" #include "vports.h" #ifdef HAVE_STRING_H diff --git a/libguile/weaks.c b/libguile/weaks.c index 1836de13e..2ae77ce30 100644 --- a/libguile/weaks.c +++ b/libguile/weaks.c @@ -46,7 +46,7 @@ #include #include "_scm.h" -#include "scm_validate.h" +#include "validate.h" #include "weaks.h"