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

[yamaken at freedesktop.org]

Author: yamaken
Date: 2006-01-10 09:06:55 -0800 (Tue, 10 Jan 2006)
New Revision: 2888

Modified:
   branches/r5rs/sigscheme/storage-fatty.h
Log:
* sigscheme/storage-fatty.h
  - (SCM_SAL_STRING_SET_LEN, SCM_SAL_STRING_SET_MUTABLE,
    SCM_SAL_STRING_SET_IMMUTABLE): Add SCM_AS_STRING() for all object
    access


Modified: branches/r5rs/sigscheme/storage-fatty.h
===================================================================
--- branches/r5rs/sigscheme/storage-fatty.h	2006-01-10 16:42:56 UTC (rev 2887)
+++ branches/r5rs/sigscheme/storage-fatty.h	2006-01-10 17:06:55 UTC (rev 2888)
@@ -278,15 +278,16 @@
     ((int)(SCM_AS_STRING(o)->obj.string.len & ~SCM_STRING_MUTABILITY_MASK))
 #define SCM_SAL_STRING_SET_LEN(o, _len)                                      \
     (SCM_AS_STRING(o)->obj.string.len                                        \
-     = (_len) | (int)((o)->obj.string.len & SCM_STRING_MUTABILITY_MASK))
+     = (_len) | (int)(SCM_AS_STRING(o)->obj.string.len                       \
+                      & SCM_STRING_MUTABILITY_MASK))
 #define SCM_SAL_STRING_MUTABLEP(o)                                           \
     (SCM_AS_STRING(o)->obj.string.len < 0)
 #define SCM_SAL_STRING_SET_MUTABLE(o)                                        \
     (SCM_AS_STRING(o)->obj.string.len                                        \
-     = (int)((o)->obj.string.len | SCM_STRING_MUTABLE))
+     = (int)(SCM_AS_STRING(o)->obj.string.len | SCM_STRING_MUTABLE))
 #define SCM_SAL_STRING_SET_IMMUTABLE(o)                                      \
     (SCM_AS_STRING(o)->obj.string.len                                        \
-     = (int)((o)->obj.string.len & ~SCM_STRING_MUTABILITY_MASK))
+     = (int)(SCM_AS_STRING(o)->obj.string.len & ~SCM_STRING_MUTABILITY_MASK))
 
 #define SCM_SAL_FUNCP(o)                   (SCM_TYPE(o) == ScmFunc)
 #define SCM_SAL_ENTYPE_FUNC(o)             (SCM_ENTYPE((o), ScmFunc))