summaryrefslogtreecommitdiff
path: root/libguile/hash.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2011-05-13 10:19:48 +0200
committerAndy Wingo <wingo@pobox.com>2011-05-13 13:48:07 +0200
commit210c0325d38abc7409b34b6b4724a297c5524eb5 (patch)
tree2a4ede58c95d97364b334fff31e51ee56db5fb97 /libguile/hash.c
parent544a29de14c980e1357bda4a241eef7590c6c624 (diff)
downloadguile-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/hash.c')
-rw-r--r--libguile/hash.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/libguile/hash.c b/libguile/hash.c
index 8448c7ce9..a79f03d95 100644
--- a/libguile/hash.c
+++ b/libguile/hash.c
@@ -160,18 +160,16 @@ scm_hasher(SCM obj, unsigned long n, size_t d)
if (SCM_CHARP(obj))
return (unsigned)(scm_c_downcase(SCM_CHAR(obj))) % n;
switch (SCM_UNPACK (obj)) {
-#ifndef SICP
- case SCM_UNPACK(SCM_EOL):
+ case SCM_EOL_BITS:
d = 256;
break;
-#endif
- case SCM_UNPACK(SCM_BOOL_T):
+ case SCM_BOOL_T_BITS:
d = 257;
break;
- case SCM_UNPACK(SCM_BOOL_F):
+ case SCM_BOOL_F_BITS:
d = 258;
break;
- case SCM_UNPACK(SCM_EOF_VAL):
+ case SCM_EOF_VAL_BITS:
d = 259;
break;
default: