* Minor fixes to error checking macros.

diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 71163e6..f2717de 100644 (file)
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,10 @@
+2001-02-28  Dirk Herrmann  <D.Herrmann@tu-bs.de>
+
+       * __scm.h (SCM_ASSERT_TYPE):  Add missing macro parameter.
+       (Obviously nobody compiles with SCM_RECKLESS defined...)
+
+       * validate.h (SCM_ASSERT_RANGE):  Use the argument number.
+
 2001-02-23  Mikael Djurfeldt  <mdj@linnaeus.mit.edu>
 
        * ports.c, ports.h (scm_c_read, scm_c_write): New functions.

diff --git a/libguile/__scm.h b/libguile/__scm.h
index 75a01a9..d48ae66 100644 (file)
--- a/libguile/__scm.h
+++ b/libguile/__scm.h
@@ -483,7 +483,7 @@ do { \
 
 #ifdef SCM_RECKLESS
 #define SCM_ASSERT(_cond, _arg, _pos, _subr)
-#define SCM_ASSERT_TYPE(_cond, _arg, _pos, _subr)
+#define SCM_ASSERT_TYPE(_cond, _arg, _pos, _subr, _msg)
 #define SCM_ASRTGO(_cond, _label)
 #else
 #define SCM_ASSERT(_cond, _arg, _pos, _subr) \

diff --git a/libguile/validate.h b/libguile/validate.h
index 2212c27..029d7e3 100644 (file)
--- a/libguile/validate.h
+++ b/libguile/validate.h
@@ -1,4 +1,4 @@
-/* $Id: validate.h,v 1.25 2001-01-24 00:02:43 dirk Exp $ */
+/* $Id: validate.h,v 1.26 2001-02-28 16:58:12 dirk Exp $ */
 /*     Copyright (C) 1999, 2000 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -83,7 +83,7 @@
   do { scm_out_of_range_pos (FUNC_NAME, arg, SCM_MAKINUM (pos)); } while (0)
 
 #define SCM_ASSERT_RANGE(pos, arg, f) \
-  do { if (!(f)) scm_out_of_range (FUNC_NAME, arg); } while (0)
+  do { if (!(f)) scm_out_of_range_pos (FUNC_NAME, arg, SCM_MAKINUM (pos)); } while (0)
 
 #define SCM_MUST_MALLOC_TYPE(type) \
   ((type *) scm_must_malloc (sizeof (type), FUNC_NAME))