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

[yamaken at freedesktop.org]

Author: yamaken
Date: 2006-01-03 00:50:55 -0800 (Tue, 03 Jan 2006)
New Revision: 2750

Modified:
   branches/r5rs/sigscheme/eval.c
   branches/r5rs/sigscheme/operations.c
   branches/r5rs/sigscheme/sigschemeinternal.h
Log:
* sigscheme/sigschemeinternal.h
  - (scm_p_c_length, scm_length): Rename scm_p_c_length() to scm_length()
* sigscheme/operations.c
  - (scm_p_c_length, scm_length): Rename scm_p_c_length() to scm_length()
* sigscheme/sigschemeinternal.h
* sigscheme/operations.c
* sigscheme/eval.c
  - Follow the renaming by following script
    perl -i -pe 's/\bscm_p_c_length\b\b/scm_length/g' sigscheme/*.[ch]


Modified: branches/r5rs/sigscheme/eval.c
===================================================================
--- branches/r5rs/sigscheme/eval.c	2006-01-03 08:45:47 UTC (rev 2749)
+++ branches/r5rs/sigscheme/eval.c	2006-01-03 08:50:55 UTC (rev 2750)
@@ -807,7 +807,7 @@
         return (ScmObj)TRV_ENDP(*t);
 
     case TR_MSG_SPLICE:
-        splice_len = scm_p_c_length(obj);
+        splice_len = scm_length(obj);
 #if SCM_STRICT_R5RS
         if (splice_len < 0)
             ERR_OBJ("got bad splice list", obj);

Modified: branches/r5rs/sigscheme/operations.c
===================================================================
--- branches/r5rs/sigscheme/operations.c	2006-01-03 08:45:47 UTC (rev 2749)
+++ branches/r5rs/sigscheme/operations.c	2006-01-03 08:50:55 UTC (rev 2750)
@@ -753,7 +753,7 @@
     if (!CONSP(obj))
         return SCM_FALSE;
 
-    len = scm_p_c_length(obj);
+    len = scm_length(obj);
 
     return MAKE_BOOL(len != -1);
 }
@@ -763,12 +763,9 @@
  *
  * This function is ported from Gauche, by Shiro Kawai(shiro at acm.org)
  */
-/* FIXME:
- * - Rename to scm_c_length() since it isn't a Scheme procedure
- * - Insert its copyright and license into this file properly
- */
+/* FIXME: Insert its copyright and license into this file properly */
 int
-scm_p_c_length(ScmObj lst)
+scm_length(ScmObj lst)
 {
     ScmObj slow = lst;
     int len = 0;
@@ -795,7 +792,7 @@
 ScmObj
 scm_p_length(ScmObj obj)
 {
-    int len = scm_p_c_length(obj);
+    int len = scm_length(obj);
     DECLARE_FUNCTION("length", procedure_fixed_1);
 
     if (len < 0)

Modified: branches/r5rs/sigscheme/sigschemeinternal.h
===================================================================
--- branches/r5rs/sigscheme/sigschemeinternal.h	2006-01-03 08:45:47 UTC (rev 2749)
+++ branches/r5rs/sigscheme/sigschemeinternal.h	2006-01-03 08:50:55 UTC (rev 2750)
@@ -294,7 +294,7 @@
 #define ENSURE_NO_MORE_ARG(args)                                             \
     (NO_MORE_ARG(args) || (ERR_OBJ("superfluous argument(s)", (args)), 1))
 #define ENSURE_PROPER_ARG_LIST(args)                                         \
-    (scm_p_c_length(args) >= 0 || (ERR_OBJ("bad argument list", (args)), 1))
+    (scm_length(args) >= 0 || (ERR_OBJ("bad argument list", (args)), 1))
 #if SCM_STRICT_ARGCHECK
 #define NO_MORE_ARG(args)                                                    \
     (!CONSP(args)                                                            \
@@ -503,7 +503,7 @@
 void scm_error_obj(const char *func_name, const char *msg, ScmObj obj) SCM_NORETURN;
 
 /* operations.c */
-int scm_p_c_length(ScmObj lst);
+int scm_length(ScmObj lst);
 
 /* io.c */
 void scm_init_io(void);