[uim commit] r4555 - sigscheme-trunk/src

[codesite-noreply]

Author: yamakenz
Date: Wed May 23 05:48:25 2007
New Revision: 4555

Modified:
   sigscheme-trunk/src/module-sscm-ext.c
   sigscheme-trunk/src/sigscheme.h
   sigscheme-trunk/src/string-procedure.c
   sigscheme-trunk/src/vector.c

Log:
* This commit fix the configuration-depended compilation error reported in
  [uim-en 8]. Thanks Etsushi

* src/module-sscm-ext.c
  - (scm_p_string_mutablep): Move to string-procedure.c
  - (scm_p_vector_mutablep): Move to vector.c
* src/vector.c
  - (scm_p_vector_mutablep): Moved from module-sscm-ext.c
* src/string-procedure.c
  - (scm_p_string_mutablep): Moved from module-sscm-ext.c
* src/sigscheme.h
  - (scm_p_string_mutablep, scm_p_vector_mutablep): Move to appropriate place


Modified: sigscheme-trunk/src/module-sscm-ext.c
==============================================================================
--- sigscheme-trunk/src/module-sscm-ext.c       (original)
+++ sigscheme-trunk/src/module-sscm-ext.c       Wed May 23 05:48:25 2007
@@ -139,30 +139,6 @@
     return MAKE_BOOL(SCM_CONS_MUTABLEP(kons));
 }
 
-#if SCM_USE_STRING
-SCM_EXPORT ScmObj
-scm_p_string_mutablep(ScmObj str)
-{
-    DECLARE_FUNCTION("%string-mutable?", procedure_fixed_1);
-
-    ENSURE_STRING(str);
-
-    return MAKE_BOOL(SCM_STRING_MUTABLEP(str));
-}
-#endif /* SCM_USE_STRING */
-
-#if SCM_USE_VECTOR
-SCM_EXPORT ScmObj
-scm_p_vector_mutablep(ScmObj vec)
-{
-    DECLARE_FUNCTION("%vector-mutable?", procedure_fixed_1);
-
-    ENSURE_VECTOR(vec);
-
-    return MAKE_BOOL(SCM_VECTOR_MUTABLEP(vec));
-}
-#endif /* SCM_USE_VECTOR */
-
 /* R6RS (R5.91RS) compatible */
 SCM_EXPORT ScmObj
 scm_p_fixnum_width(void)

Modified: sigscheme-trunk/src/sigscheme.h
==============================================================================
--- sigscheme-trunk/src/sigscheme.h     (original)
+++ sigscheme-trunk/src/sigscheme.h     Wed May 23 05:48:25 2007
@@ -1503,6 +1503,7 @@
 SCM_EXPORT ScmObj scm_p_string2list(ScmObj str);
 SCM_EXPORT ScmObj scm_p_list2string(ScmObj lst);
 SCM_EXPORT ScmObj scm_p_string_fillx(ScmObj str, ScmObj ch);
+SCM_EXPORT ScmObj scm_p_string_mutablep(ScmObj str);
 #endif /* SCM_USE_STRING_PROCEDURE */
 
 /* vector.c */
@@ -1516,6 +1517,7 @@
 SCM_EXPORT ScmObj scm_p_vector2list(ScmObj vec);
 SCM_EXPORT ScmObj scm_p_list2vector(ScmObj lst);
 SCM_EXPORT ScmObj scm_p_vector_fillx(ScmObj vec, ScmObj fill);
+SCM_EXPORT ScmObj scm_p_vector_mutablep(ScmObj vec);
 #endif /* SCM_USE_VECTOR */
 
 /* deep-cadrs.c */
@@ -1643,12 +1645,6 @@
 SCM_EXPORT ScmObj scm_p_current_environment(ScmEvalState *eval_state);
 SCM_EXPORT ScmObj scm_p_prealloc_heaps(ScmObj n);
 SCM_EXPORT ScmObj scm_p_pair_mutablep(ScmObj kons);
-#if SCM_USE_STRING
-SCM_EXPORT ScmObj scm_p_string_mutablep(ScmObj str);
-#endif
-#if SCM_USE_VECTOR
-SCM_EXPORT ScmObj scm_p_vector_mutablep(ScmObj vec);
-#endif
 SCM_EXPORT ScmObj scm_p_fixnum_width(void);
 SCM_EXPORT ScmObj scm_p_least_fixnum(void);
 SCM_EXPORT ScmObj scm_p_greatest_fixnum(void);

Modified: sigscheme-trunk/src/string-procedure.c
==============================================================================
--- sigscheme-trunk/src/string-procedure.c      (original)
+++ sigscheme-trunk/src/string-procedure.c      Wed May 23 05:48:25 2007
@@ -596,3 +596,16 @@
 
     return SCM_UNDEF;
 }
+
+/* This procedure should rightfully be written in module-sscm-ext.c, but since
+ * SigScheme's function table generator isn't supporting #if -surrounded
+ * procedure, it packed into this file. */
+SCM_EXPORT ScmObj
+scm_p_string_mutablep(ScmObj str)
+{
+    DECLARE_FUNCTION("%string-mutable?", procedure_fixed_1);
+
+    ENSURE_STRING(str);
+
+    return MAKE_BOOL(SCM_STRING_MUTABLEP(str));
+}

Modified: sigscheme-trunk/src/vector.c
==============================================================================
--- sigscheme-trunk/src/vector.c        (original)
+++ sigscheme-trunk/src/vector.c        Wed May 23 05:48:25 2007
@@ -211,3 +211,16 @@
 
     return vec;
 }
+
+/* This procedure should rightfully be written in module-sscm-ext.c, but since
+ * SigScheme's function table generator isn't supporting #if -surrounded
+ * procedure, it packed into this file. */
+SCM_EXPORT ScmObj
+scm_p_vector_mutablep(ScmObj vec)
+{
+    DECLARE_FUNCTION("%vector-mutable?", procedure_fixed_1);
+
+    ENSURE_VECTOR(vec);
+
+    return MAKE_BOOL(SCM_VECTOR_MUTABLEP(vec));
+}