Merge commit 'origin/master' into vm

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

diff --git a/libguile/procs.c b/libguile/procs.c
index cc0ee2d..6b4b586 100644 (file)
--- a/libguile/procs.c
+++ b/libguile/procs.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995,1996,1997,1999,2000,2001 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,1999,2000,2001, 2006, 2008 Free Software Foundation, Inc.
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -12,11 +12,14 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 
 \f
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 
 #include "libguile/_scm.h"
 
@@ -28,6 +31,7 @@
 
 #include "libguile/validate.h"
 #include "libguile/procs.h"
+#include "libguile/programs.h"
 \f
 
 
@@ -63,7 +67,7 @@ scm_c_make_subr (const char *name, long type, SCM (*fcn) ())
   entry = scm_subr_table_size;
   z = scm_cell ((entry << 8) + type, (scm_t_bits) fcn);
   scm_subr_table[entry].handle = z;
-  scm_subr_table[entry].name = scm_str2symbol (name);
+  scm_subr_table[entry].name = scm_from_locale_symbol (name);
   scm_subr_table[entry].generic = 0;
   scm_subr_table[entry].properties = SCM_EOL;
   scm_subr_table_size++;
@@ -149,7 +153,7 @@ SCM_DEFINE (scm_make_cclo, "make-cclo", 2, 0, 0,
            "@var{len} objects for its usage.")
 #define FUNC_NAME s_scm_make_cclo
 {
-  return scm_makcclo (proc, SCM_INUM (len));
+  return scm_makcclo (proc, scm_to_size_t (len));
 }
 #undef FUNC_NAME
 #endif
@@ -176,7 +180,7 @@ SCM_DEFINE (scm_procedure_p, "procedure?", 1, 0, 0,
       case scm_tc7_pws:
        return SCM_BOOL_T;
       case scm_tc7_smob:
-       return SCM_BOOL (SCM_SMOB_DESCRIPTOR (obj).apply);
+       return scm_from_bool (SCM_SMOB_DESCRIPTOR (obj).apply);
       default:
        return SCM_BOOL_F;
       }
@@ -189,7 +193,7 @@ SCM_DEFINE (scm_closure_p, "closure?", 1, 0, 0,
            "Return @code{#t} if @var{obj} is a closure.")
 #define FUNC_NAME s_scm_closure_p
 {
-  return SCM_BOOL (SCM_CLOSUREP (obj));
+  return scm_from_bool (SCM_CLOSUREP (obj));
 }
 #undef FUNC_NAME
 
@@ -204,7 +208,7 @@ SCM_DEFINE (scm_thunk_p, "thunk?", 1, 0, 0,
       switch (SCM_TYP7 (obj))
        {
        case scm_tcs_closures:
-         return SCM_BOOL (!SCM_CONSP (SCM_CLOSURE_FORMALS (obj)));
+         return scm_from_bool (!scm_is_pair (SCM_CLOSURE_FORMALS (obj)));
        case scm_tc7_subr_0:
        case scm_tc7_subr_1o:
        case scm_tc7_lsubr:
@@ -218,7 +222,9 @@ SCM_DEFINE (scm_thunk_p, "thunk?", 1, 0, 0,
          obj = SCM_PROCEDURE (obj);
          goto again;
        default:
-         ;
+          if (SCM_PROGRAM_P (obj) && SCM_PROGRAM_DATA (obj)->nargs == 0)
+            return SCM_BOOL_T;
+          /* otherwise fall through */
        }
     }
   return SCM_BOOL_F;
@@ -249,16 +255,16 @@ SCM_DEFINE (scm_procedure_documentation, "procedure-documentation", 1, 0, 0,
 #define FUNC_NAME s_scm_procedure_documentation
 {
   SCM code;
-  SCM_ASSERT (SCM_EQ_P (scm_procedure_p (proc), SCM_BOOL_T),
+  SCM_ASSERT (scm_is_true (scm_procedure_p (proc)),
              proc, SCM_ARG1, FUNC_NAME);
   switch (SCM_TYP7 (proc))
     {
     case scm_tcs_closures:
       code = SCM_CLOSURE_BODY (proc);
-      if (SCM_NULLP (SCM_CDR (code)))
+      if (scm_is_null (SCM_CDR (code)))
        return SCM_BOOL_F;
       code = SCM_CAR (code);
-      if (SCM_STRINGP (code))
+      if (scm_is_string (code))
        return code;
       else
        return SCM_BOOL_F;
@@ -284,7 +290,7 @@ SCM_DEFINE (scm_procedure_with_setter_p, "procedure-with-setter?", 1, 0, 0,
            "associated setter procedure.")
 #define FUNC_NAME s_scm_procedure_with_setter_p
 {
-  return SCM_BOOL(SCM_PROCEDURE_WITH_SETTER_P (obj));
+  return scm_from_bool(SCM_PROCEDURE_WITH_SETTER_P (obj));
 }
 #undef FUNC_NAME