* strports.c (scm_object_to_string): New procedure.

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

diff --git a/libguile/gh_predicates.c b/libguile/gh_predicates.c
index 42cf2c0..1bd234b 100644 (file)
--- a/libguile/gh_predicates.c
+++ b/libguile/gh_predicates.c
@@ -1,4 +1,4 @@
-/*      Copyright (C) 1995,1996,1997 Free Software Foundation, Inc.
+/*      Copyright (C) 1995,1996,1997, 2000 Free Software Foundation, Inc.
 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -12,7 +12,8 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with this software; see the file COPYING.  If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
  *
  * As a special exception, the Free Software Foundation gives permission
  * for additional uses of the text contained in its release of GUILE.
@@ -36,86 +37,105 @@
  *
  * If you write modifications of your own for GUILE, it is your choice
  * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.  
- */
+ * If you do not wish that, delete this exception notice.  */
 \f
 
 /* type predicates and equality predicates */
 
-#include <stdio.h>
-
-#include <gh.h>
+#include "libguile/gh.h"
 
 /* type predicates: tell you if an SCM object has a given type */
 int 
 gh_boolean_p (SCM val)
 {
-  return (scm_boolean_p (val) == SCM_BOOL_T) ? 1 : 0;
+  return (SCM_NFALSEP (scm_boolean_p (val)));
 }
 int 
 gh_symbol_p (SCM val)
 {
-  return (scm_symbol_p (val) == SCM_BOOL_T) ? 1 : 0;
+  return (SCM_NFALSEP (scm_symbol_p (val)));
 }
 int 
 gh_char_p (SCM val)
 {
-  return (scm_char_p (val) == SCM_BOOL_T) ? 1 : 0;
+  return (SCM_NFALSEP (scm_char_p (val)));
 }
 int 
 gh_vector_p (SCM val)
 {
-  return (scm_vector_p (val) == SCM_BOOL_T) ? 1 : 0;
+  return (SCM_NFALSEP (scm_vector_p (val)));
 }
 int 
 gh_pair_p (SCM val)
 {
-  return (scm_pair_p (val) == SCM_BOOL_T) ? 1 : 0;
+  return (SCM_NFALSEP (scm_pair_p (val)));
 }
 int 
 gh_number_p (SCM val)
 {
-  return (scm_number_p (val) == SCM_BOOL_T) ? 1 : 0;
+  return (SCM_NFALSEP (scm_number_p (val)));
 }
 int 
 gh_string_p (SCM val)
 {
-  return (scm_string_p (val) == SCM_BOOL_T) ? 1 : 0;
+  return (SCM_NFALSEP (scm_string_p (val)));
 }
 int 
 gh_procedure_p (SCM val)
 {
-  return (scm_procedure_p (val) == SCM_BOOL_T) ? 1 : 0;
+  return (SCM_NFALSEP (scm_procedure_p (val)));
 }
 int 
 gh_list_p (SCM val)
 {
-  return (scm_list_p (val) == SCM_BOOL_T) ? 1 : 0;
+  return (SCM_NFALSEP (scm_list_p (val)));
 }
 int 
 gh_inexact_p (SCM val)
 {
-  return (scm_inexact_p (val) == SCM_BOOL_T) ? 1 : 0;
+  return (SCM_NFALSEP (scm_inexact_p (val)));
 }
 int 
 gh_exact_p (SCM val)
 {
-  return (scm_exact_p (val) == SCM_BOOL_T) ? 1 : 0;
+  return (SCM_NFALSEP (scm_exact_p (val)));
 }
 
 /* the three types of equality */
 int 
 gh_eq_p (SCM x, SCM y)
 {
-  return (scm_eq_p (x, y) == SCM_BOOL_T) ? 1 : 0;
+  return (SCM_NFALSEP (scm_eq_p (x, y)));
 }
 int 
 gh_eqv_p (SCM x, SCM y)
 {
-  return (scm_eqv_p (x, y) != SCM_BOOL_T) ? 1 : 0;
+  return (SCM_NFALSEP (scm_eqv_p (x, y)));
 }
 int 
 gh_equal_p (SCM x, SCM y)
 {
-  return (scm_equal_p (x, y) != SCM_BOOL_T) ? 1 : 0;
+  return (SCM_NFALSEP (scm_equal_p (x, y)));
+}
+
+/* equivalent to (string=? ...), but returns 0 or 1 rather than Scheme
+   booleans */
+int
+gh_string_equal_p(SCM s1, SCM s2)
+{
+  return (SCM_NFALSEP (scm_string_equal_p(s1, s2)));
 }
+
+/* equivalent to (null? ...), but returns 0 or 1 rather than Scheme
+   booleans */
+int
+gh_null_p(SCM l)
+{
+  return (SCM_NFALSEP(scm_null_p(l)));
+}
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/