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

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-12-20 06:01:27 -0800 (Tue, 20 Dec 2005)
New Revision: 2668

Modified:
   branches/r5rs/sigscheme/storage.c
Log:
* sigscheme/storage.c
  - (scm_make_int, scm_make_char, scm_make_string_internal,
    scm_make_immutable_string, scm_make_immutable_string_copying,
    scm_make_string, scm_make_string_copying, scm_make_func,
    scm_make_closure, scm_make_vector, scm_make_port,
    scm_make_continuation, scm_make_value_packet): Cosmetic change


Modified: branches/r5rs/sigscheme/storage.c
===================================================================
--- branches/r5rs/sigscheme/storage.c	2005-12-20 13:54:59 UTC (rev 2667)
+++ branches/r5rs/sigscheme/storage.c	2005-12-20 14:01:27 UTC (rev 2668)
@@ -171,7 +171,6 @@
 #if !SCM_OBJ_COMPACT
     obj = scm_alloc_cell();
 #endif
-
     SCM_ENTYPE_INT(obj);
     SCM_INT_SET_VALUE(obj, val);
 
@@ -199,7 +198,6 @@
 #if !SCM_OBJ_COMPACT
     obj = scm_alloc_cell();
 #endif
-
     SCM_ENTYPE_CHAR(obj);
     SCM_CHAR_SET_VALUE(obj, val);
 
@@ -209,8 +207,9 @@
 static ScmObj
 scm_make_string_internal(char *str, int is_immutable)
 {
-    ScmObj obj = scm_alloc_cell();
+    ScmObj obj;
 
+    obj = scm_alloc_cell();
     SCM_ENTYPE_STRING(obj);
     SCM_STRING_SET_STR(obj, str);
     SCM_STRING_SET_LEN(obj, str ? scm_mb_bare_c_strlen(str) : 0);
@@ -226,32 +225,33 @@
 ScmObj
 scm_make_immutable_string(char *str)
 {
-    return scm_make_string_internal(str, 1);
+    return scm_make_string_internal(str, TRUE);
 }
 
 ScmObj
 scm_make_immutable_string_copying(const char *str)
 {
-    return scm_make_string_internal(strdup(str), 1);
+    return scm_make_string_internal(strdup(str), TRUE);
 }
 
 ScmObj
 scm_make_string(char *str)
 {
-    return scm_make_string_internal(str, 0);
+    return scm_make_string_internal(str, FALSE);
 }
 
 ScmObj
 scm_make_string_copying(const char *str)
 {
-    return scm_make_string_internal(strdup(str), 0);
+    return scm_make_string_internal(strdup(str), FALSE);
 }
 
 ScmObj
 scm_make_func(enum ScmFuncTypeCode type, ScmFuncType func)
 {
-    ScmObj obj = scm_alloc_cell();
+    ScmObj obj;
 
+    obj = scm_alloc_cell();
     SCM_ENTYPE_FUNC(obj);
     SCM_FUNC_SET_TYPECODE(obj, type);
     SCM_FUNC_SET_CFUNC(obj, func);
@@ -262,8 +262,9 @@
 ScmObj
 scm_make_closure(ScmObj exp, ScmObj env)
 {
-    ScmObj obj = scm_alloc_cell();
+    ScmObj obj;
 
+    obj = scm_alloc_cell();
     SCM_ENTYPE_CLOSURE(obj);
     SCM_CLOSURE_SET_EXP(obj, exp);
     SCM_CLOSURE_SET_ENV(obj, env);
@@ -274,8 +275,9 @@
 ScmObj
 scm_make_vector(ScmObj *vec, int len)
 {
-    ScmObj obj = scm_alloc_cell();
+    ScmObj obj;
 
+    obj = scm_alloc_cell();
     SCM_ENTYPE_VECTOR(obj);
     SCM_VECTOR_SET_VEC(obj, vec);
     SCM_VECTOR_SET_LEN(obj, len);
@@ -286,8 +288,9 @@
 ScmObj
 scm_make_port(ScmCharPort *cport, enum ScmPortFlag flag)
 {
-    ScmObj obj = scm_alloc_cell();
+    ScmObj obj;
 
+    obj = scm_alloc_cell();
     SCM_ENTYPE_PORT(obj);
 
     if (flag & SCM_PORTFLAG_INPUT)
@@ -304,8 +307,9 @@
 ScmObj
 scm_make_continuation(void)
 {
-    ScmObj obj = scm_alloc_cell();
+    ScmObj obj;
 
+    obj = scm_alloc_cell();
     SCM_ENTYPE_CONTINUATION(obj);
     SCM_CONTINUATION_SET_OPAQUE(obj, INVALID_CONTINUATION_OPAQUE);
     SCM_CONTINUATION_SET_TAG(obj, 0);
@@ -317,8 +321,9 @@
 ScmObj
 scm_make_value_packet(ScmObj values)
 {
-    ScmObj obj = scm_alloc_cell();
+    ScmObj obj;
 
+    obj = scm_alloc_cell();
     SCM_ENTYPE_VALUEPACKET(obj);
     SCM_VALUEPACKET_SET_VALUES(obj, values);