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

[yamaken at freedesktop.org]

Author: yamaken
Date: 2006-01-08 01:31:24 -0800 (Sun, 08 Jan 2006)
New Revision: 2842

Modified:
   branches/r5rs/sigscheme/encoding.h
Log:
* sigscheme/encoding.c
  - (scm_mb_bare_c_strlen): Simplify with SCM_MBS_INIT2()
* sigscheme/operations.c
  - (scm_p_string_ref, scm_p_string_setd, scm_p_substring): Ditto
  - (scm_p_string2list):
    * Ditto
    * Simplify with SCM_CHARCODEC_READ_CHAR()


Modified: branches/r5rs/sigscheme/encoding.h
===================================================================
--- branches/r5rs/sigscheme/encoding.h	2006-01-08 09:29:48 UTC (rev 2841)
+++ branches/r5rs/sigscheme/encoding.h	2006-01-08 09:31:24 UTC (rev 2842)
@@ -53,11 +53,6 @@
 
 #define SCM_MB_MAX_LEN 4
 
-#define SCM_MBS_SET_STR(mbs, s)          ((mbs).str = (s))
-#define SCM_MBS_GET_STR(mbs)             ((mbs).str)
-#define SCM_MBS_SET_SIZE(mbs, siz)       ((mbs).size = (siz))
-#define SCM_MBS_GET_SIZE(mbs)            ((mbs).size)
-
 #define SCM_MBCINFO_SET_SIZE(inf, siz)   ((inf).size = (siz))
 #define SCM_MBCINFO_GET_SIZE(inf)        ((inf).size)
 #if SCM_USE_STATEFUL_ENCODING
@@ -82,6 +77,10 @@
     } while (/* CONSTCOND */ 0)
 
 
+#define SCM_MBS_SET_STR(mbs, s)       ((mbs).str = (s))
+#define SCM_MBS_GET_STR(mbs)          ((mbs).str)
+#define SCM_MBS_SET_SIZE(mbs, siz)    ((mbs).size = (siz))
+#define SCM_MBS_GET_SIZE(mbs)         ((mbs).size)
 #if SCM_USE_STATEFUL_ENCODING
 #define SCM_MBS_GET_STATE(mbs)        ((mbs).state)
 #define SCM_MBS_SET_STATE(mbs, stat)  ((mbs).state = (stat))