[uim-commit] r2877 - branches/r5rs/sigscheme

[kzk at freedesktop.org]

Author: kzk
Date: 2006-01-09 22:36:38 -0800 (Mon, 09 Jan 2006)
New Revision: 2877

Modified:
   branches/r5rs/sigscheme/storage-compact.h
   branches/r5rs/sigscheme/storage-fatty.h
   branches/r5rs/sigscheme/storage.c
Log:
* sigschme/storage-compact.h
  - SCM_SAL_FALSE and SCM_SAL_NULL must be the same when
    SCM_COMPAT_SIOD_BUGS is defined.
* sigschme/storage-fatty.h
  - Ditto
* sigschme/storage.c
  - (initialize_special_constants): mover the assurance of the
    equality between scm_const_false and scm_const_null to
    storage-fatty.h for the symmetry assumption between compact
    and non-compact.



Modified: branches/r5rs/sigscheme/storage-compact.h
===================================================================
--- branches/r5rs/sigscheme/storage-compact.h	2006-01-09 20:16:53 UTC (rev 2876)
+++ branches/r5rs/sigscheme/storage-compact.h	2006-01-10 06:36:38 UTC (rev 2877)
@@ -1006,7 +1006,12 @@
 #define SCM_SAL_UNDEF   ((ScmObj)(SCM_IMM_TAG_UNDEF))
 #define SCM_SAL_INVALID ((ScmObj)(SCM_IMM_TAG_INVALID))
 #define SCM_SAL_UNBOUND ((ScmObj)(SCM_IMM_TAG_UNBOUND))
+#if SCM_COMPAT_SIOD_BUGS
+#define SCM_SAL_FALSE   ((ScmObj)(SCM_IMM_TAG_NULL))
+#else
 #define SCM_SAL_FALSE   ((ScmObj)(SCM_IMM_TAG_FALSE))
+#endif /* SCM_COMPAT_SIOD_BUGS */
+
 #define SCM_SAL_TRUE    ((ScmObj)(SCM_IMM_TAG_TRUE))
 
 #define SCM_SAL_EQ(a, b) (SCM_STRIP_GCBIT(a) == SCM_STRIP_GCBIT(b))

Modified: branches/r5rs/sigscheme/storage-fatty.h
===================================================================
--- branches/r5rs/sigscheme/storage-fatty.h	2006-01-09 20:16:53 UTC (rev 2876)
+++ branches/r5rs/sigscheme/storage-fatty.h	2006-01-10 06:36:38 UTC (rev 2877)
@@ -398,7 +398,11 @@
 #define SCM_SAL_INVALID  NULL
 #define SCM_SAL_NULL     scm_const_null
 #define SCM_SAL_TRUE     scm_const_true
+#if SCM_COMPAT_SIOD_BUGS
+#define SCM_SAL_FALSE    scm_const_null
+#else
 #define SCM_SAL_FALSE    scm_const_false
+#endif /* SCM_COMPAT_SIOD_BUGS */
 #define SCM_SAL_EOF      scm_const_eof
 #define SCM_SAL_UNBOUND  scm_const_unbound
 #define SCM_SAL_UNDEF    scm_const_undef

Modified: branches/r5rs/sigscheme/storage.c
===================================================================
--- branches/r5rs/sigscheme/storage.c	2006-01-09 20:16:53 UTC (rev 2876)
+++ branches/r5rs/sigscheme/storage.c	2006-01-10 06:36:38 UTC (rev 2877)
@@ -140,10 +140,6 @@
     SCM_CONSTANT_BIND_SUBSTANCE(scm_const_eof,     eof_cell);
     SCM_CONSTANT_BIND_SUBSTANCE(scm_const_unbound, unbound_cell);
     SCM_CONSTANT_BIND_SUBSTANCE(scm_const_undef,   undef_cell);
-
-#if SCM_COMPAT_SIOD_BUGS
-    scm_const_false = scm_const_null;
-#endif /* SCM_COMPAT_SIOD_BUGS */
 #endif /* !SCM_OBJ_COMPACT */
 }