X-Git-Url: https://git.hcoop.net/bpt/guile.git/blobdiff_plain/c1b7c940eca528d8875bc9bd00fba1a885b4dddb..5b744b67f7f8350bd66d6c0b659f9375a6d700fa:/libguile/boolean.h

diff --git a/libguile/boolean.h b/libguile/boolean.h
index 3e9debd20..df72728ef 100644
--- a/libguile/boolean.h
+++ b/libguile/boolean.h
@@ -3,7 +3,7 @@
 #ifndef SCM_BOOLEAN_H
 #define SCM_BOOLEAN_H
 
-/* Copyright (C) 1995,1996,2000, 2006, 2008, 2009, 2010 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,2000, 2006, 2008, 2009, 2010, 2013 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 License
@@ -35,13 +35,13 @@
 
 /*
  * Use these macros if it's important (for correctness)
- * that %nil MUST be considered true
+ * that #nil MUST be considered true
  */
 #define scm_is_false_and_not_nil(x)     (scm_is_eq ((x), SCM_BOOL_F))
 #define scm_is_true_or_nil(x)          (!scm_is_eq ((x), SCM_BOOL_F))
 
 /*
- * Use these macros if %nil will never be tested,
+ * Use these macros if #nil will never be tested,
  * for increased efficiency.
  */
 #define scm_is_false_assume_not_nil(x)  (scm_is_eq ((x), SCM_BOOL_F))
@@ -56,7 +56,7 @@
   (SCM_MATCHES_BITS_IN_COMMON ((x), SCM_ELISP_NIL, SCM_BOOL_F))
 #define scm_is_true_and_not_nil(x) (!scm_is_false_or_nil (x))
 
-/* %nil is false. */
+/* #nil is false. */
 #define scm_is_false(x)  (scm_is_false_or_nil (x))
 #define scm_is_true(x)   (!scm_is_false (x))
 
@@ -90,6 +90,17 @@ SCM_API int scm_to_bool (SCM x);
 
 
 
+/* Older spellings for the above routines, kept around for
+   compatibility. */
+#define SCM_FALSEP(x)		(scm_is_false (x))
+#define SCM_NFALSEP(x)		(scm_is_true (x))
+#define SCM_BOOLP(x)            (scm_is_bool (x))
+#define SCM_BOOL(x)		(scm_from_bool (x))
+#define SCM_NEGATE_BOOL(f)	(scm_from_bool (!(f)))
+#define SCM_BOOL_NOT(x)		(scm_not (x))
+
+
+
 /*
  * The following macros efficiently implement boolean truth testing as
  * expected by most lisps, which treat '() aka SCM_EOL as false.
@@ -115,6 +126,7 @@ SCM_API int scm_to_bool (SCM x);
 
 SCM_API SCM scm_not (SCM x);
 SCM_API SCM scm_boolean_p (SCM obj);
+SCM_API SCM scm_nil_p (SCM obj);
 
 SCM_INTERNAL void scm_init_boolean (void);