[uim-commit] r3043 - branches/r5rs/sigscheme/src

yamaken at freedesktop.org yamaken at freedesktop.org
Mon Jan 30 01:50:12 PST 2006


Author: yamaken
Date: 2006-01-30 01:50:06 -0800 (Mon, 30 Jan 2006)
New Revision: 3043

Modified:
   branches/r5rs/sigscheme/src/eval.c
   branches/r5rs/sigscheme/src/list.c
   branches/r5rs/sigscheme/src/port.c
   branches/r5rs/sigscheme/src/procedure.c
   branches/r5rs/sigscheme/src/string.c
   branches/r5rs/sigscheme/src/vector.c
Log:
* sigscheme/src/string.c
  - (scm_p_string2list): Rename local variable
* sigscheme/src/port.c
  - (scm_p_char_readyp): Ditto
* sigscheme/src/vector.c
  - (scm_p_vector2list): Ditto
* sigscheme/src/list.c
  - (scm_p_append): Ditto
* sigscheme/src/eval.c
  - (map_eval): Ditto
* sigscheme/src/procedure.c
  - (map_single_arg, map_multiple_args): Ditto


Modified: branches/r5rs/sigscheme/src/eval.c
===================================================================
--- branches/r5rs/sigscheme/src/eval.c	2006-01-30 09:42:42 UTC (rev 3042)
+++ branches/r5rs/sigscheme/src/eval.c	2006-01-30 09:50:06 UTC (rev 3043)
@@ -457,7 +457,7 @@
 map_eval(ScmObj args, scm_int_t *args_len, ScmObj env)
 {
     ScmQueue q;
-    ScmObj res, elm, rest;
+    ScmObj ret, elm, rest;
     scm_int_t len;
     DECLARE_INTERNAL_FUNCTION("(function call)");
 
@@ -466,8 +466,8 @@
         return SCM_NULL;
     }
 
-    res = SCM_NULL;
-    SCM_QUEUE_POINT_TO(q, res);
+    ret = SCM_NULL;
+    SCM_QUEUE_POINT_TO(q, ret);
 
     len = 0;
     FOR_EACH_PAIR (rest, args) {
@@ -483,7 +483,7 @@
         ERR_OBJ(SCM_ERRMSG_IMPROPER_ARGS, args);
 
     *args_len = len;
-    return res;
+    return ret;
 }
 
 /*=======================================

Modified: branches/r5rs/sigscheme/src/list.c
===================================================================
--- branches/r5rs/sigscheme/src/list.c	2006-01-30 09:42:42 UTC (rev 3042)
+++ branches/r5rs/sigscheme/src/list.c	2006-01-30 09:50:06 UTC (rev 3043)
@@ -301,14 +301,14 @@
 scm_p_append(ScmObj args)
 {
     ScmQueue q;
-    ScmObj lst, elm, res;
+    ScmObj lst, elm, ret;
     DECLARE_FUNCTION("append", procedure_variadic_0);
 
     if (NULLP(args))
         return SCM_NULL;
 
-    res = SCM_NULL;
-    SCM_QUEUE_POINT_TO(q, res);
+    ret = SCM_NULL;
+    SCM_QUEUE_POINT_TO(q, ret);
     /* duplicate and merge all but the last argument */
     FOR_EACH_BUTLAST (lst, args) {
         FOR_EACH (elm, lst)
@@ -318,7 +318,7 @@
     /* append the last argument */
     SCM_QUEUE_SLOPPY_APPEND(q, lst);
 
-    return res;
+    return ret;
 }
 
 ScmObj

Modified: branches/r5rs/sigscheme/src/port.c
===================================================================
--- branches/r5rs/sigscheme/src/port.c	2006-01-30 09:42:42 UTC (rev 3042)
+++ branches/r5rs/sigscheme/src/port.c	2006-01-30 09:50:06 UTC (rev 3043)
@@ -500,13 +500,13 @@
 scm_p_char_readyp(ScmObj args)
 {
     ScmObj port;
-    scm_bool res;
+    scm_bool ret;
     DECLARE_FUNCTION("char-ready?", procedure_variadic_0);
 
     port = scm_prepare_port(args, scm_in);
-    res = scm_port_char_readyp(port);
+    ret = scm_port_char_readyp(port);
 
-    return MAKE_BOOL(res);
+    return MAKE_BOOL(ret);
 }
 
 /*===========================================================================

Modified: branches/r5rs/sigscheme/src/procedure.c
===================================================================
--- branches/r5rs/sigscheme/src/procedure.c	2006-01-30 09:42:42 UTC (rev 3042)
+++ branches/r5rs/sigscheme/src/procedure.c	2006-01-30 09:50:06 UTC (rev 3043)
@@ -282,28 +282,28 @@
 map_single_arg(ScmObj proc, ScmObj lst)
 {
     ScmQueue q;
-    ScmObj elm, res;
+    ScmObj elm, ret;
     DECLARE_INTERNAL_FUNCTION("map");
 
-    res = SCM_NULL;
-    SCM_QUEUE_POINT_TO(q, res);
+    ret = SCM_NULL;
+    SCM_QUEUE_POINT_TO(q, ret);
     FOR_EACH (elm, lst) {
         elm = scm_call(proc, LIST_1(elm));
         SCM_QUEUE_ADD(q, elm);
     }
 
-    return res;
+    return ret;
 }
 
 static ScmObj
 map_multiple_args(ScmObj proc, ScmObj args)
 {
-    ScmQueue resq, argq;
-    ScmObj res, elm, map_args, rest_args, arg;
+    ScmQueue retq, argq;
+    ScmObj ret, elm, map_args, rest_args, arg;
     DECLARE_INTERNAL_FUNCTION("map");
 
-    res = SCM_NULL;
-    SCM_QUEUE_POINT_TO(resq, res);
+    ret = SCM_NULL;
+    SCM_QUEUE_POINT_TO(retq, ret);
     for (;;) {
         /* slice args */
         map_args = SCM_NULL;
@@ -313,7 +313,7 @@
             if (CONSP(arg))
                 SCM_QUEUE_ADD(argq, CAR(arg));
             else if (NULLP(arg))
-                return res;
+                return ret;
             else
                 ERR_OBJ("invalid argument", arg);
             /* pop destructively */
@@ -321,7 +321,7 @@
         }
 
         elm = scm_call(proc, map_args);
-        SCM_QUEUE_ADD(resq, elm);
+        SCM_QUEUE_ADD(retq, elm);
     }
 }
 

Modified: branches/r5rs/sigscheme/src/string.c
===================================================================
--- branches/r5rs/sigscheme/src/string.c	2006-01-30 09:42:42 UTC (rev 3042)
+++ branches/r5rs/sigscheme/src/string.c	2006-01-30 09:50:06 UTC (rev 3043)
@@ -822,7 +822,7 @@
     ScmMultibyteString mbs;
     ScmQueue q;
 #endif
-    ScmObj res;
+    ScmObj ret;
     scm_ichar_t ch;
     scm_int_t mb_len;
     const char *c_str;
@@ -833,9 +833,9 @@
     c_str = SCM_STRING_STR(str);
     mb_len = SCM_STRING_LEN(str);
 
-    res = SCM_NULL;
+    ret = SCM_NULL;
 #if SCM_USE_MULTIBYTE_CHAR
-    SCM_QUEUE_POINT_TO(q, res);
+    SCM_QUEUE_POINT_TO(q, ret);
     SCM_MBS_INIT2(mbs, c_str, strlen(c_str));
     while (mb_len--) {
         if (SCM_MBS_GET_SIZE(mbs)) {
@@ -856,11 +856,11 @@
 #else /* SCM_USE_MULTIBYTE_CHAR */
     while (mb_len) {
         ch = ((unsigned char *)c_str)[--mb_len];
-        res = CONS(MAKE_CHAR(ch), res);
+        ret = CONS(MAKE_CHAR(ch), ret);
     }
 #endif /* SCM_USE_MULTIBYTE_CHAR */
 
-    return res;
+    return ret;
 }
 
 ScmObj

Modified: branches/r5rs/sigscheme/src/vector.c
===================================================================
--- branches/r5rs/sigscheme/src/vector.c	2006-01-30 09:42:42 UTC (rev 3042)
+++ branches/r5rs/sigscheme/src/vector.c	2006-01-30 09:50:06 UTC (rev 3043)
@@ -161,7 +161,7 @@
 scm_p_vector2list(ScmObj vec)
 {
     ScmQueue q;
-    ScmObj res, *v;
+    ScmObj ret, *v;
     scm_int_t len, i;
     DECLARE_FUNCTION("vector->list", procedure_fixed_1);
 
@@ -170,12 +170,12 @@
     v   = SCM_VECTOR_VEC(vec);
     len = SCM_VECTOR_LEN(vec);
 
-    res = SCM_NULL;
-    SCM_QUEUE_POINT_TO(q, res);
+    ret = SCM_NULL;
+    SCM_QUEUE_POINT_TO(q, ret);
     for (i = 0; i < len; i++)
         SCM_QUEUE_ADD(q, v[i]);
 
-    return res;
+    return ret;
 }
 
 ScmObj



More information about the uim-commit mailing list