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

[yamaken at freedesktop.org]

Author: yamaken
Date: 2006-01-06 08:09:40 -0800 (Fri, 06 Jan 2006)
New Revision: 2810

Modified:
   branches/r5rs/sigscheme/operations.c
   branches/r5rs/sigscheme/sigschemeinternal.h
Log:
* sigscheme/sigschemeinternal.h
  - (SCM_LISTLEN_ENCODE_DOT, SCM_LISTLEN_ENCODE_DOTTED): Rename
    SCM_LISTLEN_ENCODE_DOT to SCM_LISTLEN_ENCODE_DOTTED
  - (SCM_LISTLEN_DOTP, SCM_LISTLEN_DOTTEDP): Rename SCM_LISTLEN_DOTP
    to SCM_LISTLEN_DOTTEDP
  - (SCM_LISTLEN_DOT, SCM_LISTLEN_DOTTED): Rename SCM_LISTLEN_DOT to
    SCM_LISTLEN_DOTTED
* sigscheme/operations.c
  - (scm_length): Follow the renamings


Modified: branches/r5rs/sigscheme/operations.c
===================================================================
--- branches/r5rs/sigscheme/operations.c	2006-01-06 15:52:04 UTC (rev 2809)
+++ branches/r5rs/sigscheme/operations.c	2006-01-06 16:09:40 UTC (rev 2810)
@@ -817,13 +817,13 @@
 
     for (len = 0, slow = lst;;) {
         if (NULLP(lst)) break;
-        if (!CONSP(lst))             return SCM_LISTLEN_ENCODE_DOT(len + 1);
+        if (!CONSP(lst))             return SCM_LISTLEN_ENCODE_DOTTED(len + 1);
         if (len != 0 && lst == slow) return SCM_LISTLEN_ENCODE_CIRCULAR(len);
 
         lst = CDR(lst);
         len++;
         if (NULLP(lst)) break;
-        if (!CONSP(lst)) return SCM_LISTLEN_ENCODE_DOT(len + 1);
+        if (!CONSP(lst)) return SCM_LISTLEN_ENCODE_DOTTED(len + 1);
         if (lst == slow) return SCM_LISTLEN_ENCODE_CIRCULAR(len);
 
         lst = CDR(lst);

Modified: branches/r5rs/sigscheme/sigschemeinternal.h
===================================================================
--- branches/r5rs/sigscheme/sigschemeinternal.h	2006-01-06 15:52:04 UTC (rev 2809)
+++ branches/r5rs/sigscheme/sigschemeinternal.h	2006-01-06 16:09:40 UTC (rev 2810)
@@ -349,13 +349,13 @@
 #define SCM_ERR_HEADER "Error: "
 
 /* result encoder/decoders for scm_length() */
-#define SCM_LISTLEN_ENCODE_DOT(len)      (-(len))
+#define SCM_LISTLEN_ENCODE_DOTTED(len)   (-(len))
 #define SCM_LISTLEN_ENCODE_CIRCULAR(len) (INT_MIN)
 #define SCM_LISTLEN_PROPERP(len)         (0 <= (len))
 #define SCM_LISTLEN_CIRCULARP(len)       ((len) == INT_MIN)
-#define SCM_LISTLEN_DOTP(len)            ((len) < 0                          \
+#define SCM_LISTLEN_DOTTEDP(len)         ((len) < 0                          \
                                           && !SCM_LISTLEN_CIRCULARP(len))
-#define SCM_LISTLEN_DOT(len)             (abs(len))
+#define SCM_LISTLEN_DOTTED(len)          (abs(len))
 #define SCM_LISTLEN_BEFORE_DOT(len)      (~(len))  /* abs(len) - 1 */
 
 /*=======================================