More SCM_NIMP patches.

[Dirk Herrmann <dirk at ida dot ing dot tu-bs dot de>]

The subject says it all.

diff -u -p -r1.13 coop-threads.c
--- coop-threads.c      1999/12/16 20:48:03     1.13
+++ coop-threads.c      1999/12/23 17:34:43
@@ -413,7 +413,7 @@ scm_make_mutex (void)
 SCM
 scm_lock_mutex (SCM m)
 {
-  SCM_ASSERT (SCM_NIMP (m) && SCM_MUTEXP (m), m, SCM_ARG1, s_lock_mutex);
+  SCM_ASSERT (SCM_MUTEXP (m), m, SCM_ARG1, s_lock_mutex);
   coop_mutex_lock (SCM_MUTEX_DATA (m));
   return SCM_BOOL_T;
 }

diff -u -p -r1.52 debug.c
--- debug.c     1999/12/18 13:42:46     1.52
+++ debug.c     1999/12/23 17:38:57
@@ -274,8 +274,7 @@ GUILE_PROC (scm_gloc_p, "gloc?", 1, 0, 0
 "")
 #define FUNC_NAME s_scm_gloc_p
 {
-  return SCM_BOOL((SCM_NIMP (obj)
-                   && SCM_MEMOIZEDP (obj)
+  return SCM_BOOL((SCM_MEMOIZEDP (obj)
                    && (SCM_MEMOIZED_EXP (obj) & 7) == 1));
 }
 #undef FUNC_NAME
@@ -540,9 +539,7 @@ static SCM
 scm_m_start_stack (SCM exp, SCM env)
 {
   exp = SCM_CDR (exp);
-  SCM_ASSERT (SCM_NIMP (exp)
-             && SCM_ECONSP (exp)
-             && SCM_NIMP (SCM_CDR (exp))
+  SCM_ASSERT (SCM_ECONSP (exp)
              && SCM_ECONSP (SCM_CDR (exp))
              && SCM_NULLP (SCM_CDDR (exp)),
              exp,

diff -u -p -r1.3 dynl-vms.c
--- dynl-vms.c  1999/12/12 20:35:01     1.3
+++ dynl-vms.c  1999/12/23 17:40:36
@@ -83,8 +83,8 @@ SCM dynl(SCM dir, SCM symbol, SCM fname)
   void (*fcn)();
   long retval;
   ASSERT(IMP(dir) || STRINGP(dir), dir, ARG1, s_dynl);
-  ASSERT(NIMP(fname) && STRINGP(fname), fname, ARG2, s_dynl);
-  ASSERT(NIMP(symbol) && STRINGP(symbol), symbol, ARG3, s_dynl);
+  ASSERT(STRINGP(fname), fname, ARG2, s_dynl);
+  ASSERT(STRINGP(symbol), symbol, ARG3, s_dynl);
   descriptorize(&fnamed, fname);
   descriptorize(&symbold, symbol);
   DEFER_INTS;