*.[ch]: Replace GUILE_PROC w/ SCM_DEFINE.

[bpt/guile.git] / libguile / throw.c

diff --git a/libguile/throw.c b/libguile/throw.c
index 59e4ad9..ba2185f 100644 (file)
--- a/libguile/throw.c
+++ b/libguile/throw.c
@@ -526,7 +526,7 @@ scm_handle_by_throw (void *handler_data, SCM tag, SCM args)
 \f
 /* the Scheme-visible CATCH and LAZY-CATCH functions */
 
-GUILE_PROC(scm_catch, "catch", 3, 0, 0,
+SCM_DEFINE(scm_catch, "catch", 3, 0, 0,
            (SCM tag, SCM thunk, SCM handler),
 "Invoke @var{thunk} in the dynamic context of @var{handler} for
 exceptions matching @var{key}.  If thunk throws to the symbol @var{key},
@@ -551,7 +551,7 @@ this call to @code{catch}.")
 {
   struct scm_body_thunk_data c;
 
-  SCM_ASSERT ((SCM_NIMP(tag) && SCM_SYMBOLP(tag)) || tag == SCM_BOOL_T,
+  SCM_ASSERT (SCM_SYMBOLP(tag) || tag == SCM_BOOL_T,
              tag, SCM_ARG1, FUNC_NAME);
 
   c.tag = tag;
@@ -569,15 +569,14 @@ this call to @code{catch}.")
 #undef FUNC_NAME
 
 
-GUILE_PROC(scm_lazy_catch, "lazy-catch", 3, 0, 0,
+SCM_DEFINE(scm_lazy_catch, "lazy-catch", 3, 0, 0,
            (SCM tag, SCM thunk, SCM handler),
 "")
 #define FUNC_NAME s_scm_lazy_catch
 {
   struct scm_body_thunk_data c;
 
-  SCM_ASSERT ((SCM_NIMP(tag) && SCM_SYMBOLP(tag))
-             || (tag == SCM_BOOL_T),
+  SCM_ASSERT (SCM_SYMBOLP(tag) || (tag == SCM_BOOL_T),
              tag, SCM_ARG1, FUNC_NAME);
 
   c.tag = tag;
@@ -599,7 +598,7 @@ GUILE_PROC(scm_lazy_catch, "lazy-catch", 3, 0, 0,
 \f
 /* throwing */
 
-GUILE_PROC(scm_throw, "throw", 1, 0, 1,
+SCM_DEFINE(scm_throw, "throw", 1, 0, 1,
            (SCM key, SCM args),
 "Invoke the catch form matching @var{key}, passing @var{args} to the
 @var{handler}.  
@@ -634,7 +633,7 @@ scm_ithrow (SCM key, SCM args, int noreturn)
        abort ();
 
       dynpair = SCM_CAR (winds);
-      if (SCM_NIMP (dynpair) && SCM_CONSP (dynpair))
+      if (SCM_CONSP (dynpair))
        {
          SCM this_key = SCM_CAR (dynpair);