mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-24 12:20:20 +02:00
Code Activity

nil is false, whee

Browse source 
* libguile/boolean.h (scm_is_false): Recognize nil as false, by default.
  (scm_is_bool): Recognize nil as a boolean.

* libguile/boolean.c (scm_not, scm_boolean, scm_to_bool, scm_is_bool):
  Adapt to treat nil as false.

* libguile/vm-i-system.c (br-if, br-if-not): Just use scm_is_false
  instead of specifically mentioning nil.
This commit is contained in:
Andy Wingo 2010-03-23 20:23:19 +01:00
parent 655aadf4b0
commit d38b431ace
3 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libguile/boolean.h
View file

@ -27,7 +27,9 @@
/* Boolean Values
/* Boolean Values. Obviously there are #t and #f, but there is also nil to deal
* with. We choose to treat nil as a false boolean. All options might silently
* break existing code, but this one seems most responsible.
*
*/
@ -58,8 +60,8 @@
#endif
#define scm_is_true_and_not_nil(x) (!scm_is_false_or_nil (x))
/* XXX Should these macros treat %nil as false by default? */
#define scm_is_false(x) (scm_is_false_and_not_nil (x))
/* %nil is false. */
#define scm_is_false(x) (scm_is_false_or_nil (x))
#define scm_is_true(x) (!scm_is_false (x))
/*
@ -90,8 +92,7 @@
SCM_API int scm_is_bool (SCM);
/* XXX Should scm_is_bool treat %nil as a boolean? */
#define scm_is_bool(x) (scm_is_bool_and_not_nil (x))
#define scm_is_bool(x) (scm_is_bool_or_nil (x))
#define scm_from_bool(x) ((x) ? SCM_BOOL_T : SCM_BOOL_F)
SCM_API int scm_to_bool (SCM x);