mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 11:50:28 +02:00
* New macro SCM_TRUE_P.
* Use SCM_EQ_P to compare SCM values.
This commit is contained in:
parent
8b3bda2058
commit
dd039d6dc6
3 changed files with 18 additions and 8 deletions
|
@ -1,3 +1,10 @@
|
|||
2000-03-29 Dirk Herrmann <D.Herrmann@tu-bs.de>
|
||||
|
||||
* boolean.h (SCM_TRUE_P): New macro.
|
||||
|
||||
* boolean.h (SCM_FALSEP, SCM_NFALSEP, SCM_BOOLP), pairs.h
|
||||
(SCM_NULLP, SCM_NNULLP): Use SCM_EQ_P to compare SCM values.
|
||||
|
||||
2000-03-28 Dirk Herrmann <D.Herrmann@tu-bs.de>
|
||||
|
||||
* continuations.h (SCM_CONTREGS, SCM_SET_CONTREGS): New macros to
|
||||
|
|
|
@ -50,10 +50,11 @@
|
|||
/* Boolean Values
|
||||
*
|
||||
*/
|
||||
#define SCM_FALSEP(x) (SCM_BOOL_F == (x))
|
||||
#define SCM_NFALSEP(x) (SCM_BOOL_F != (x))
|
||||
#define SCM_TRUE_P(x) (SCM_EQ_P ((x), SCM_BOOL_T))
|
||||
#define SCM_FALSEP(x) (SCM_EQ_P ((x), SCM_BOOL_F))
|
||||
#define SCM_NFALSEP(x) (!SCM_FALSEP (x))
|
||||
|
||||
#define SCM_BOOLP(x) ((x) == SCM_BOOL_T || (x) == SCM_BOOL_F)
|
||||
#define SCM_BOOLP(x) (SCM_TRUE_P (x) || SCM_FALSEP (x))
|
||||
|
||||
/* Convert from a C boolean to a SCM boolean value */
|
||||
#define SCM_BOOL(f) ((f) ? SCM_BOOL_T : SCM_BOOL_F)
|
||||
|
@ -64,7 +65,9 @@
|
|||
/* SCM_BOOL_NOT returns the other boolean.
|
||||
* The order of ^s here is important for Borland C++ (!?!?!)
|
||||
*/
|
||||
#define SCM_BOOL_NOT(x) SCM_PACK(SCM_UNPACK(x) ^ (SCM_UNPACK (SCM_BOOL_T) ^ SCM_UNPACK (SCM_BOOL_F)))
|
||||
#define SCM_BOOL_NOT(x) (SCM_PACK (SCM_UNPACK (x) \
|
||||
^ (SCM_UNPACK (SCM_BOOL_T) \
|
||||
^ SCM_UNPACK (SCM_BOOL_F))))
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -52,8 +52,8 @@
|
|||
|
||||
|
||||
|
||||
#define SCM_NULLP(x) (SCM_EOL == (x))
|
||||
#define SCM_NNULLP(x) (SCM_EOL != (x))
|
||||
#define SCM_NULLP(x) (SCM_EQ_P ((x), SCM_EOL))
|
||||
#define SCM_NNULLP(x) (!SCM_NULLP (x))
|
||||
|
||||
#define SCM_CAR(x) (SCM_CELL_OBJECT_0 (x))
|
||||
#define SCM_CDR(x) (SCM_CELL_OBJECT_1 (x))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue