diff options
author | Andy Wingo <wingo@pobox.com> | 2011-05-13 10:19:48 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2011-05-13 13:48:07 +0200 |
commit | 210c0325d38abc7409b34b6b4724a297c5524eb5 (patch) | |
tree | 2a4ede58c95d97364b334fff31e51ee56db5fb97 /libguile/boolean.c | |
parent | 544a29de14c980e1357bda4a241eef7590c6c624 (diff) | |
download | guile-210c0325d38abc7409b34b6b4724a297c5524eb5.tar.gz |
allow iflags to be constant expressions with typing-strictness==2
* libguile/tags.h (SCM_MAKE_ITAG8_BITS): New helper, produces a
scm_t_bits instead of a SCM, because SCM_UNPACK is not a constant
expression with SCM_DEBUG_TYPING_STRICTNESS==2.
(SCM_MAKIFLAG_BITS): Remove SCM_MAKIFLAG, and replace with this, which
returns bits.
(SCM_BOOL_F_BITS, SCM_ELISP_NIL_BITS, SCM_EOL_BITS, SCM_BOOL_T_BITS):
(SCM_UNSPECIFIED_BITS, SCM_UNDEFINED_BITS, SCM_EOF_VAL_BITS):
(SCM_UNBOUND_BITS): New definitions. Defined SCM_BOOL_F, etc in terms
of them.
(SCM_XXX_ANOTHER_BOOLEAN_DONT_USE_0):
(SCM_XXX_ANOTHER_BOOLEAN_DONT_USE_1):
(SCM_XXX_ANOTHER_BOOLEAN_DONT_USE_2):
(SCM_XXX_ANOTHER_LISP_FALSE_DONT_USE): Be bits instead of SCM values.
(SCM_BITS_DIFFER_IN_EXACTLY_ONE_BIT_POSITION):
(SCM_BITS_DIFFER_IN_EXACTLY_TWO_BIT_POSITIONS): Rename from
SCM_VALUES_DIFFER_..., and take unpacked bits as the args.
* libguile/boolean.c: Update verify block to use
SCM_BITS_DIFFER_IN_EXACTLY_TWO_BIT_POSITIONS et al.
* libguile/debug.c (scm_debug_opts):
* libguile/print.c (scm_print_opts):
* libguile/read.c (scm_read_opts): Use iflags bits for initializers.
* libguile/hash.c (scm_hasher): Use _BITS for iflags as case labels.
* libguile/pairs.c: Nil/null compile-time check uses
SCM_ELISP_NIL_BITS.
Diffstat (limited to 'libguile/boolean.c')
-rw-r--r-- | libguile/boolean.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/libguile/boolean.c b/libguile/boolean.c index 452b8adda..3bf672d6d 100644 --- a/libguile/boolean.c +++ b/libguile/boolean.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1996, 2000, 2001, 2006, 2008, 2009, 2010 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1996, 2000, 2001, 2006, 2008, 2009, 2010, 2011 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 @@ -40,18 +40,18 @@ * See the comments preceeding the definitions of SCM_BOOL_F and * SCM_MATCHES_BITS_IN_COMMON in tags.h for more information. */ -verify (SCM_VALUES_DIFFER_IN_EXACTLY_ONE_BIT_POSITION \ - (SCM_BOOL_F, SCM_BOOL_T)); -verify (SCM_VALUES_DIFFER_IN_EXACTLY_ONE_BIT_POSITION \ - (SCM_ELISP_NIL, SCM_BOOL_F)); -verify (SCM_VALUES_DIFFER_IN_EXACTLY_ONE_BIT_POSITION \ - (SCM_ELISP_NIL, SCM_EOL)); -verify (SCM_VALUES_DIFFER_IN_EXACTLY_TWO_BIT_POSITIONS \ - (SCM_ELISP_NIL, SCM_BOOL_F, SCM_BOOL_T, \ - SCM_XXX_ANOTHER_BOOLEAN_DONT_USE_0)); -verify (SCM_VALUES_DIFFER_IN_EXACTLY_TWO_BIT_POSITIONS \ - (SCM_ELISP_NIL, SCM_BOOL_F, SCM_EOL, \ - SCM_XXX_ANOTHER_LISP_FALSE_DONT_USE)); +verify (SCM_BITS_DIFFER_IN_EXACTLY_ONE_BIT_POSITION \ + (SCM_BOOL_F_BITS, SCM_BOOL_T_BITS)); +verify (SCM_BITS_DIFFER_IN_EXACTLY_ONE_BIT_POSITION \ + (SCM_ELISP_NIL_BITS, SCM_BOOL_F_BITS)); +verify (SCM_BITS_DIFFER_IN_EXACTLY_ONE_BIT_POSITION \ + (SCM_ELISP_NIL_BITS, SCM_EOL_BITS)); +verify (SCM_BITS_DIFFER_IN_EXACTLY_TWO_BIT_POSITIONS \ + (SCM_ELISP_NIL_BITS, SCM_BOOL_F_BITS, SCM_BOOL_T_BITS, \ + SCM_XXX_ANOTHER_BOOLEAN_DONT_USE_0)); +verify (SCM_BITS_DIFFER_IN_EXACTLY_TWO_BIT_POSITIONS \ + (SCM_ELISP_NIL_BITS, SCM_BOOL_F_BITS, SCM_EOL_BITS, \ + SCM_XXX_ANOTHER_LISP_FALSE_DONT_USE)); SCM_DEFINE (scm_not, "not", 1, 0, 0, (SCM x), |