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

[yamaken at freedesktop.org]

Author: yamaken
Date: 2006-01-03 02:26:44 -0800 (Tue, 03 Jan 2006)
New Revision: 2753

Modified:
   branches/r5rs/sigscheme/storage-fatty.h
   branches/r5rs/sigscheme/storage.c
Log:
* sigscheme/storage-fatty.h
  - (scm_null, scm_true, scm_false, scm_eof, scm_unbound, scm_undef):
    Rename to scm_const_* to avoid conflict with the scm_bool
    introduced in r2752
  - (scm_const_null, scm_const_true, scm_const_false, scm_const_eof,
    scm_const_unbound, scm_const_undef): Renamed from scm_*
  - (SCM_SAL_NULL, SCM_SAL_TRUE, SCM_SAL_FALSE, SCM_SAL_EOF,
    SCM_SAL_UNBOUND, SCM_SAL_UNDEF): Follow the renamings
* sigscheme/storage.c
  - (scm_null, scm_true, scm_false, scm_eof, scm_unbound, scm_undef):
    Rename to scm_const_* to avoid conflict with the scm_bool
    introduced in r2752
  - (scm_const_null, scm_const_true, scm_const_false, scm_const_eof,
    scm_const_unbound, scm_const_undef): Renamed from scm_*
  - (scm_init_storage, initialize_special_constants): Follow the renamings


Modified: branches/r5rs/sigscheme/storage-fatty.h
===================================================================
--- branches/r5rs/sigscheme/storage-fatty.h	2006-01-03 10:12:46 UTC (rev 2752)
+++ branches/r5rs/sigscheme/storage-fatty.h	2006-01-03 10:26:44 UTC (rev 2753)
@@ -384,18 +384,18 @@
   Special Constants and Predicates
 ============================================================================*/
 #define SCM_SAL_INVALID          NULL
-#define SCM_SAL_NULL             scm_null
-#define SCM_SAL_TRUE             scm_true
-#define SCM_SAL_FALSE            scm_false
-#define SCM_SAL_EOF              scm_eof
-#define SCM_SAL_UNBOUND          scm_unbound
-#define SCM_SAL_UNDEF            scm_undef
+#define SCM_SAL_NULL             scm_const_null
+#define SCM_SAL_TRUE             scm_const_true
+#define SCM_SAL_FALSE            scm_const_false
+#define SCM_SAL_EOF              scm_const_eof
+#define SCM_SAL_UNBOUND          scm_const_unbound
+#define SCM_SAL_UNDEF            scm_const_undef
 
 #define SCM_SAL_EQ(a, b)   ((a) == (b))
 
 /* storage.c */
-extern ScmObj scm_null, scm_true, scm_false, scm_eof;
-extern ScmObj scm_unbound, scm_undef;
+extern ScmObj scm_const_null, scm_const_true, scm_const_false, scm_const_eof;
+extern ScmObj scm_const_unbound, scm_const_undef;
 
 /*============================================================================
   Predefined Symbols

Modified: branches/r5rs/sigscheme/storage.c
===================================================================
--- branches/r5rs/sigscheme/storage.c	2006-01-03 10:12:46 UTC (rev 2752)
+++ branches/r5rs/sigscheme/storage.c	2006-01-03 10:26:44 UTC (rev 2753)
@@ -73,8 +73,8 @@
 /* SCM_OBJ_COMPACT MUST NOT refer these variables. Use SCM_NULL and so on. */
 
 /* constants */
-ScmObj scm_null, scm_true, scm_false, scm_eof;
-ScmObj scm_unbound, scm_undef;
+ScmObj scm_const_null, scm_const_true, scm_const_false, scm_const_eof;
+ScmObj scm_const_unbound, scm_const_undef;
 static ScmCell null_cell, true_cell, false_cell, eof_cell;
 static ScmCell unbound_cell, undef_cell;
 #endif
@@ -97,7 +97,7 @@
     scm_init_gc(heap_size, heap_alloc_threshold, n_heaps_max, n_heaps_init);
 
 #if 0 && (SCM_COMPAT_SIOD_BUGS && !SCM_OBJ_COMPACT)
-    scm_gc_protect_with_init(&scm_true, MAKE_INT(1));
+    scm_gc_protect_with_init(&scm_const_true, MAKE_INT(1));
 #endif
 
 #if SCM_USE_VALUECONS
@@ -133,15 +133,15 @@
 initialize_special_constants(void)
 {
 #if !SCM_OBJ_COMPACT
-    SCM_CONSTANT_BIND_SUBSTANCE(scm_null,    null_cell);
-    SCM_CONSTANT_BIND_SUBSTANCE(scm_true,    true_cell);
-    SCM_CONSTANT_BIND_SUBSTANCE(scm_false,   false_cell);
-    SCM_CONSTANT_BIND_SUBSTANCE(scm_eof,     eof_cell);
-    SCM_CONSTANT_BIND_SUBSTANCE(scm_unbound, unbound_cell);
-    SCM_CONSTANT_BIND_SUBSTANCE(scm_undef,   undef_cell);
+    SCM_CONSTANT_BIND_SUBSTANCE(scm_const_null,    null_cell);
+    SCM_CONSTANT_BIND_SUBSTANCE(scm_const_true,    true_cell);
+    SCM_CONSTANT_BIND_SUBSTANCE(scm_const_false,   false_cell);
+    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_false = scm_null;
+    scm_const_false = scm_const_null;
 #endif /* SCM_COMPAT_SIOD_BUGS */
 #endif /* !SCM_OBJ_COMPACT */
 }