summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libguile/boolean.c2
-rw-r--r--libguile/boolean.h2
-rw-r--r--libguile/print.c4
-rw-r--r--libguile/tags.h14
4 files changed, 13 insertions, 9 deletions
diff --git a/libguile/boolean.c b/libguile/boolean.c
index 1ca0d7853..3391d6ce5 100644
--- a/libguile/boolean.c
+++ b/libguile/boolean.c
@@ -49,7 +49,7 @@ 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));
+ 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));
diff --git a/libguile/boolean.h b/libguile/boolean.h
index ba5313ca4..bc108f5c3 100644
--- a/libguile/boolean.h
+++ b/libguile/boolean.h
@@ -75,7 +75,7 @@
*
* If SCM_ENABLE_ELISP is true, then scm_is_bool_or_nil(x)
* returns 1 if and only if x is one of the following: SCM_BOOL_F,
- * SCM_BOOL_T, SCM_ELISP_NIL, or SCM_XXX_ANOTHER_BOOLEAN_DONT_USE.
+ * SCM_BOOL_T, SCM_ELISP_NIL, or SCM_XXX_ANOTHER_BOOLEAN_DONT_USE_0.
* Otherwise, it returns 0.
*/
#if SCM_ENABLE_ELISP
diff --git a/libguile/print.c b/libguile/print.c
index 8867e6b03..ca38d42d5 100644
--- a/libguile/print.c
+++ b/libguile/print.c
@@ -68,7 +68,9 @@ static const char *iflagnames[] =
"#<XXX UNUSED LISP FALSE -- DO NOT USE -- SHOULD NEVER BE SEEN XXX>",
"()",
"#t",
- "#<XXX UNUSED BOOLEAN -- DO NOT USE -- SHOULD NEVER BE SEEN XXX>",
+ "#<XXX UNUSED BOOLEAN 0 -- DO NOT USE -- SHOULD NEVER BE SEEN XXX>",
+ "#<XXX UNUSED BOOLEAN 1 -- DO NOT USE -- SHOULD NEVER BE SEEN XXX>",
+ "#<XXX UNUSED BOOLEAN 2 -- DO NOT USE -- SHOULD NEVER BE SEEN XXX>",
"#<unspecified>",
"#<undefined>",
"#<eof>",
diff --git a/libguile/tags.h b/libguile/tags.h
index 2e6dea22e..d11bf6864 100644
--- a/libguile/tags.h
+++ b/libguile/tags.h
@@ -498,7 +498,7 @@ enum scm_tc8_tags
* must all be equal except for two bit positions.
* (used to implement scm_is_lisp_false)
*
- * - SCM_ELISP_NIL, SCM_BOOL_F, SCM_BOOL_T, SCM_XXX_ANOTHER_BOOLEAN_DONT_USE
+ * - SCM_ELISP_NIL, SCM_BOOL_F, SCM_BOOL_T, SCM_XXX_ANOTHER_BOOLEAN_DONT_USE_0
* must all be equal except for two bit positions.
* (used to implement scm_is_bool_or_nil)
*
@@ -519,12 +519,14 @@ enum scm_tc8_tags
#define SCM_BOOL_T SCM_MAKIFLAG (4)
#ifdef BUILDING_LIBGUILE
-#define SCM_XXX_ANOTHER_BOOLEAN_DONT_USE SCM_MAKIFLAG (5)
+#define SCM_XXX_ANOTHER_BOOLEAN_DONT_USE_0 SCM_MAKIFLAG (5)
+#define SCM_XXX_ANOTHER_BOOLEAN_DONT_USE_1 SCM_MAKIFLAG (6)
+#define SCM_XXX_ANOTHER_BOOLEAN_DONT_USE_2 SCM_MAKIFLAG (7)
#endif
-#define SCM_UNSPECIFIED SCM_MAKIFLAG (6)
-#define SCM_UNDEFINED SCM_MAKIFLAG (7)
-#define SCM_EOF_VAL SCM_MAKIFLAG (8)
+#define SCM_UNSPECIFIED SCM_MAKIFLAG (8)
+#define SCM_UNDEFINED SCM_MAKIFLAG (9)
+#define SCM_EOF_VAL SCM_MAKIFLAG (10)
/* When a variable is unbound this is marked by the SCM_UNDEFINED
* value. The following is an unbound value which can be handled on
@@ -534,7 +536,7 @@ enum scm_tc8_tags
* the code which handles this value in C so that SCM_UNDEFINED can be
* used instead. It is not ideal to let this kind of unique and
* strange values loose on the Scheme level. */
-#define SCM_UNBOUND SCM_MAKIFLAG (9)
+#define SCM_UNBOUND SCM_MAKIFLAG (11)
#define SCM_UNBNDP(x) (scm_is_eq ((x), SCM_UNDEFINED))