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

yamaken at freedesktop.org yamaken at freedesktop.org
Mon Sep 5 06:50:41 PDT 2005


Author: yamaken
Date: 2005-09-05 06:50:39 -0700 (Mon, 05 Sep 2005)
New Revision: 1428

Modified:
   branches/r5rs/sigscheme/eval.c
   branches/r5rs/sigscheme/main.c
   branches/r5rs/sigscheme/operations-siod.c
   branches/r5rs/sigscheme/operations-srfi23.c
   branches/r5rs/sigscheme/operations.c
   branches/r5rs/sigscheme/sigscheme.h
Log:
* sigscheme/sigscheme.h
  - (ScmOp_caar, ScmOp_cadr, ScmOp_cdar, ScmOp_cddr, ScmOp_caaar,
    ScmOp_caadr, ScmOp_cadar, ScmOp_caddr, ScmOp_cdaar, ScmOp_cdadr,
    ScmOp_cddar, ScmOp_cdddr, ScmOp_caaaar, ScmOp_caaadr,
    ScmOp_caadar, ScmOp_caaddr, ScmOp_cadaar, ScmOp_cadadr,
    ScmOp_caddar, ScmOp_cadddr, ScmOp_cdaaar, ScmOp_cdaadr,
    ScmOp_cdadar, ScmOp_cdaddr, ScmOp_cddaar, ScmOp_cddadr,
    ScmOp_cdddar, ScmOp_cddddr): Rename the argument name 'pair' to
    'lst' since:
    * These operations are not for pair but list
    * The name 'list' may conflict with the STL. Although
      well-developed major C++ platforms may not cause problems, I
      prefer conservative way. Other functions using such words 'list'
      and 'string' should also be renamed, I think
* sigscheme/operations.c
  - (ScmOp_equalp, ScmOp_numberp, ScmOp_equal, ScmOp_procedurep):
    Simplify
  - (ScmOp_car, ScmOp_cdr):
    * Fix the error message "list required" with "pair required"
    * Fix invalid () => () handling as COMPAT_SIOD_BUGS. R5RS
      compliant implemenation must not behaves so
    * Remove inappropriate NULLP(obj) check. the CONSP check is
      sufficient for R5RS.
    * Remove the FIXME comment since COMPAT_SIOD_BUGS is sufficient to
      handle both SIOD like and R5RS
  - (ScmOp_setcar, ScmOp_setcdr): Conform type checking to the
    standard coding style
  - (ScmOp_caar, ScmOp_cadr, ScmOp_cdar, ScmOp_cddr, ScmOp_caaar,
    ScmOp_caadr, ScmOp_cadar, ScmOp_caddr, ScmOp_cdaar, ScmOp_cdadr,
    ScmOp_cddar, ScmOp_cdddr, ScmOp_caaaar, ScmOp_caaadr,
    ScmOp_caadar, ScmOp_caaddr, ScmOp_cadaar, ScmOp_cadadr,
    ScmOp_caddar, ScmOp_cadddr, ScmOp_cdaaar, ScmOp_cdaadr,
    ScmOp_cdadar, ScmOp_cdaddr, ScmOp_cddaar, ScmOp_cddadr,
    ScmOp_cdddar, ScmOp_cddddr): Rename the argument name 'pair' to
    'lst'
  - (ScmOp_string_fill): Cosmetic change
* sigscheme/operations-siod.c
  - (ScmOp_siod_eql): Simplify
* sigscheme/main.c
  - (repl): Cosmetic change
* sigscheme/eval.c
  - (ScmExp_case): Fix a misspelling of a variable name
  - (ScmExp_do): Cosmetic change
* sigscheme/operations-srfi23.c
  - (ScmOp_SRFI23_error): Cosmetic change


Modified: branches/r5rs/sigscheme/eval.c
===================================================================
--- branches/r5rs/sigscheme/eval.c	2005-09-05 12:09:03 UTC (rev 1427)
+++ branches/r5rs/sigscheme/eval.c	2005-09-05 13:50:39 UTC (rev 1428)
@@ -1041,24 +1041,24 @@
     ScmObj env    = *envp;
     ScmObj key    = ScmOp_eval(CAR(arg), env);
     ScmObj clause = SCM_NULL;
-    ScmObj datums = SCM_NULL;
+    ScmObj data   = SCM_NULL;
     ScmObj exps   = SCM_NULL;
 
     /* looping in each clause */
     for (arg = CDR(arg); !NULLP(arg); arg = CDR(arg)) {
         clause = CAR(arg);
-        datums = CAR(clause);
+        data   = CAR(clause);
         exps   = CDR(clause);
-        if (NULLP(clause) || NULLP(datums) || NULLP(exps))
+        if (NULLP(clause) || NULLP(data) || NULLP(exps))
             SigScm_Error("case : syntax error\n");
 
         /* check "else" symbol */
-        if (NULLP(CDR(arg)) && !CONSP(datums) && NFALSEP(SCM_SYMBOL_VCELL(datums)))
+        if (NULLP(CDR(arg)) && !CONSP(data) && NFALSEP(SCM_SYMBOL_VCELL(data)))
             return ScmExp_begin(exps, &env);
 
-        /* evaluate datums and compare to key by eqv? */
-        for (; !NULLP(datums); datums = CDR(datums)) {
-            if (NFALSEP(ScmOp_eqvp(CAR(datums), key))) {
+        /* evaluate data and compare to key by eqv? */
+        for (; !NULLP(data); data = CDR(data)) {
+            if (NFALSEP(ScmOp_eqvp(CAR(data), key))) {
                 return ScmExp_begin(exps, &env);
             }
         }
@@ -1458,13 +1458,19 @@
          * results to the "vals" variable and set it in hand.
          */
         vals = SCM_NULL;
-        for (tmp_steps = steps; !NULLP(tmp_steps); tmp_steps = CDR(tmp_steps)) {
+        for (tmp_steps = steps;
+             !NULLP(tmp_steps);
+             tmp_steps = CDR(tmp_steps))
+        {
             vals = Scm_NewCons(ScmOp_eval(CAR(tmp_steps), env), vals);
         }
         vals = ScmOp_reverse(vals);
 
         /* set it */
-        for (tmp_vars = vars; !NULLP(tmp_vars) && !NULLP(vals); tmp_vars = CDR(tmp_vars), vals = CDR(vals)) {
+        for (tmp_vars = vars;
+             !NULLP(tmp_vars) && !NULLP(vals);
+             tmp_vars = CDR(tmp_vars), vals = CDR(vals))
+        {
             obj = lookup_environment(CAR(tmp_vars), env);
             if (!NULLP(obj)) {
                 SET_CAR(obj, CAR(vals));

Modified: branches/r5rs/sigscheme/main.c
===================================================================
--- branches/r5rs/sigscheme/main.c	2005-09-05 12:09:03 UTC (rev 1427)
+++ branches/r5rs/sigscheme/main.c	2005-09-05 13:50:39 UTC (rev 1428)
@@ -72,7 +72,7 @@
 
     printf("sscm> ");
 
-    for( s_exp = SigScm_Read(stdin_port);
+    for (s_exp = SigScm_Read(stdin_port);
          !EOFP(s_exp);
          s_exp = SigScm_Read(stdin_port))
     {

Modified: branches/r5rs/sigscheme/operations-siod.c
===================================================================
--- branches/r5rs/sigscheme/operations-siod.c	2005-09-05 12:09:03 UTC (rev 1427)
+++ branches/r5rs/sigscheme/operations-siod.c	2005-09-05 13:50:39 UTC (rev 1428)
@@ -117,10 +117,8 @@
 {
     if (EQ(obj1, obj2))
         return SCM_TRUE;
-    else if (!INTP(obj1))
+    else if (!INTP(obj1) || !INTP(obj2))
         return SCM_FALSE;
-    else if (!INTP(obj2))
-        return SCM_FALSE;
     else if (SCM_INT_VALUE(obj1) == SCM_INT_VALUE(obj2))
         return SCM_TRUE;
 

Modified: branches/r5rs/sigscheme/operations-srfi23.c
===================================================================
--- branches/r5rs/sigscheme/operations-srfi23.c	2005-09-05 12:09:03 UTC (rev 1427)
+++ branches/r5rs/sigscheme/operations-srfi23.c	2005-09-05 13:50:39 UTC (rev 1428)
@@ -69,20 +69,23 @@
         SigScm_Error("error : at least 1 argument required\n");
 
     if (!STRINGP(CAR(args)))
-        SigScm_ErrorObj("error : first argument should be string but got ", CAR(args));
+        SigScm_ErrorObj("error : first argument should be string but got ",
+                        CAR(args));
     
     /* prepend message */
     fprintf(SCM_PORTINFO_FILE(scm_current_error_port), "Error: ");
 
     /* show message */
-    fprintf(SCM_PORTINFO_FILE(scm_current_error_port), "%s", SCM_STRING_STR(CAR(args)));
+    fprintf(SCM_PORTINFO_FILE(scm_current_error_port),
+            "%s", SCM_STRING_STR(CAR(args)));
 
     /* show each obj */
     for (args = CDR(args); !NULLP(args); args = CDR(args)) {
         fprintf(SCM_PORTINFO_FILE(scm_current_error_port), " ");
 
 #if SCM_USE_SRFI38
-        SigScm_WriteToPortWithSharedStructure(scm_current_error_port, CAR(args));
+        SigScm_WriteToPortWithSharedStructure(scm_current_error_port,
+                                              CAR(args));
 #else
         SigScm_WriteToPort(scm_current_error_port, CAR(args));
 #endif

Modified: branches/r5rs/sigscheme/operations.c
===================================================================
--- branches/r5rs/sigscheme/operations.c	2005-09-05 12:09:03 UTC (rev 1427)
+++ branches/r5rs/sigscheme/operations.c	2005-09-05 13:50:39 UTC (rev 1428)
@@ -158,12 +158,8 @@
                 return SCM_FALSE;
 
             /* check dot pair */
-            if (!CONSP(CDR(obj1))) {
-                if (FALSEP(ScmOp_equalp(CDR(obj1), CDR(obj2))))
-                    return SCM_FALSE;
-                else
-                    return SCM_TRUE;
-            }
+            if (!CONSP(CDR(obj1)))
+                return ScmOp_equalp(CDR(obj1), CDR(obj2));
         }
         return SCM_TRUE;
 
@@ -174,7 +170,8 @@
 
         /* check contents */
         for (i = 0; i < SCM_VECTOR_LEN(obj1); i++) {
-            if (FALSEP(ScmOp_equalp(SCM_VECTOR_CREF(obj1, i), SCM_VECTOR_CREF(obj2, i))))
+            if (FALSEP(ScmOp_equalp(SCM_VECTOR_CREF(obj1, i),
+                                    SCM_VECTOR_CREF(obj2, i))))
                 return SCM_FALSE;
         }
         return SCM_TRUE;
@@ -339,10 +336,7 @@
 
 ScmObj ScmOp_numberp(ScmObj obj)
 {
-    if (INTP(obj))
-        return SCM_TRUE;
-
-    return SCM_FALSE;
+    return (INTP(obj)) ? SCM_TRUE : SCM_FALSE;
 }
 
 ScmObj ScmOp_equal(ScmObj args, ScmObj env)
@@ -368,9 +362,7 @@
             SigScm_ErrorObj("= : number required but got ", obj);
 
         if (SCM_INT_VALUE(obj) != val)
-        {
             return SCM_FALSE;
-        }
     }
 
     return SCM_TRUE;
@@ -768,44 +760,26 @@
 ==============================================================================*/
 ScmObj ScmOp_car(ScmObj obj)
 {
-    /*
-     * TODO: fixme! : Kazuki Ohta <mover at hct.zaq.ne.jp>
-     *
-     * In R5RS (car '()) becomes an error, but current uim assumes (car '()) == ()
-     * in many places. So, I decided to change ScmOp_car to SIOD like behavior.
-     * 
-     */
-#if !SCM_COMPAT_SIOD_BUGS
+#if SCM_COMPAT_SIOD_BUGS
     if (NULLP(obj))
-        SigScm_Error("car : empty list\n");
-#endif
-    if (NULLP(obj))
         return SCM_NULL;
+#endif
 
     if (!CONSP(obj))
-        SigScm_ErrorObj("car : list required but got ", obj);
+        SigScm_ErrorObj("car : pair required but got ", obj);
 
     return CAR(obj);
 }
 
 ScmObj ScmOp_cdr(ScmObj obj)
 {
-    /*
-     * TODO: fixme! : Kazuki Ohta <mover at hct.zaq.ne.jp>
-     *
-     * In R5RS (car '()) becomes an error, but current uim assumes (car '()) == ()
-     * in many places. So, I decided to change ScmOp_car to SIOD like behavior.
-     * 
-     */
-#if !SCM_COMPAT_SIOD_BUGS
+#if SCM_COMPAT_SIOD_BUGS
     if (NULLP(obj))
-        SigScm_Error("cdr : empty list\n");
-#endif
-    if (NULLP(obj))
         return SCM_NULL;
+#endif
 
     if (!CONSP(obj))
-        SigScm_ErrorObj("cdr : list required but got ", obj);
+        SigScm_ErrorObj("cdr : pair required but got ", obj);
 
     return CDR(obj);
 }
@@ -822,11 +796,11 @@
 
 ScmObj ScmOp_setcar(ScmObj pair, ScmObj car)
 {
-    if (CONSP(pair))
-        SET_CAR(pair, car);
-    else
+    if (!CONSP(pair))
         SigScm_ErrorObj("set-car! : pair required but got ", pair);
 
+    SET_CAR(pair, car);
+
 #if SCM_COMPAT_SIOD
     return car;
 #else
@@ -836,11 +810,11 @@
 
 ScmObj ScmOp_setcdr(ScmObj pair, ScmObj cdr)
 {
-    if (CONSP(pair))
-        SET_CDR(pair, cdr);
-    else
+    if (!CONSP(pair))
         SigScm_ErrorObj("set-cdr! : pair required but got ", pair);
 
+    SET_CDR(pair, cdr);
+
 #if SCM_COMPAT_SIOD
     return cdr;
 #else
@@ -848,117 +822,117 @@
 #endif
 }
 
-ScmObj ScmOp_caar(ScmObj pair)
+ScmObj ScmOp_caar(ScmObj lst)
 {
-    return ScmOp_car( ScmOp_car(pair) );
+    return ScmOp_car( ScmOp_car(lst) );
 }
-ScmObj ScmOp_cadr(ScmObj pair)
+ScmObj ScmOp_cadr(ScmObj lst)
 {
-    return ScmOp_car( ScmOp_cdr(pair) );
+    return ScmOp_car( ScmOp_cdr(lst) );
 }
-ScmObj ScmOp_cdar(ScmObj pair)
+ScmObj ScmOp_cdar(ScmObj lst)
 {
-    return ScmOp_cdr( ScmOp_car(pair) );
+    return ScmOp_cdr( ScmOp_car(lst) );
 }
-ScmObj ScmOp_cddr(ScmObj pair)
+ScmObj ScmOp_cddr(ScmObj lst)
 {
-    return ScmOp_cdr( ScmOp_cdr(pair) );
+    return ScmOp_cdr( ScmOp_cdr(lst) );
 }
-ScmObj ScmOp_caaar(ScmObj pair)
+ScmObj ScmOp_caaar(ScmObj lst)
 {
-    return ScmOp_car( ScmOp_car( ScmOp_car(pair) ));
+    return ScmOp_car( ScmOp_car( ScmOp_car(lst) ));
 }
-ScmObj ScmOp_caadr(ScmObj pair)
+ScmObj ScmOp_caadr(ScmObj lst)
 {
-    return ScmOp_car( ScmOp_car( ScmOp_cdr(pair) ));
+    return ScmOp_car( ScmOp_car( ScmOp_cdr(lst) ));
 }
-ScmObj ScmOp_cadar(ScmObj pair)
+ScmObj ScmOp_cadar(ScmObj lst)
 {
-    return ScmOp_car( ScmOp_cdr( ScmOp_car(pair) ));
+    return ScmOp_car( ScmOp_cdr( ScmOp_car(lst) ));
 }
-ScmObj ScmOp_caddr(ScmObj pair)
+ScmObj ScmOp_caddr(ScmObj lst)
 {
-    return ScmOp_car( ScmOp_cdr( ScmOp_cdr(pair) ));
+    return ScmOp_car( ScmOp_cdr( ScmOp_cdr(lst) ));
 }
-ScmObj ScmOp_cdaar(ScmObj pair)
+ScmObj ScmOp_cdaar(ScmObj lst)
 {
-    return ScmOp_cdr( ScmOp_car( ScmOp_car(pair) ));
+    return ScmOp_cdr( ScmOp_car( ScmOp_car(lst) ));
 }
-ScmObj ScmOp_cdadr(ScmObj pair)
+ScmObj ScmOp_cdadr(ScmObj lst)
 {
-    return ScmOp_cdr( ScmOp_car( ScmOp_cdr(pair) ));
+    return ScmOp_cdr( ScmOp_car( ScmOp_cdr(lst) ));
 }
-ScmObj ScmOp_cddar(ScmObj pair)
+ScmObj ScmOp_cddar(ScmObj lst)
 {
-    return ScmOp_cdr( ScmOp_cdr( ScmOp_car(pair) ));
+    return ScmOp_cdr( ScmOp_cdr( ScmOp_car(lst) ));
 }
-ScmObj ScmOp_cdddr(ScmObj pair)
+ScmObj ScmOp_cdddr(ScmObj lst)
 {
-    return ScmOp_cdr( ScmOp_cdr( ScmOp_cdr(pair) ));
+    return ScmOp_cdr( ScmOp_cdr( ScmOp_cdr(lst) ));
 }
-ScmObj ScmOp_caaaar(ScmObj pair)
+ScmObj ScmOp_caaaar(ScmObj lst)
 {
-    return ScmOp_car( ScmOp_car( ScmOp_car( ScmOp_car(pair) )));
+    return ScmOp_car( ScmOp_car( ScmOp_car( ScmOp_car(lst) )));
 }
-ScmObj ScmOp_caaadr(ScmObj pair)
+ScmObj ScmOp_caaadr(ScmObj lst)
 {
-    return ScmOp_car( ScmOp_car( ScmOp_car( ScmOp_cdr(pair) )));
+    return ScmOp_car( ScmOp_car( ScmOp_car( ScmOp_cdr(lst) )));
 }
-ScmObj ScmOp_caadar(ScmObj pair)
+ScmObj ScmOp_caadar(ScmObj lst)
 {
-    return ScmOp_car( ScmOp_car( ScmOp_cdr( ScmOp_car(pair) )));
+    return ScmOp_car( ScmOp_car( ScmOp_cdr( ScmOp_car(lst) )));
 }
-ScmObj ScmOp_caaddr(ScmObj pair)
+ScmObj ScmOp_caaddr(ScmObj lst)
 {
-    return ScmOp_car( ScmOp_car( ScmOp_cdr( ScmOp_cdr(pair) )));
+    return ScmOp_car( ScmOp_car( ScmOp_cdr( ScmOp_cdr(lst) )));
 }
-ScmObj ScmOp_cadaar(ScmObj pair)
+ScmObj ScmOp_cadaar(ScmObj lst)
 {
-    return ScmOp_car( ScmOp_cdr( ScmOp_car( ScmOp_car(pair) )));
+    return ScmOp_car( ScmOp_cdr( ScmOp_car( ScmOp_car(lst) )));
 }
-ScmObj ScmOp_cadadr(ScmObj pair)
+ScmObj ScmOp_cadadr(ScmObj lst)
 {
-    return ScmOp_car( ScmOp_cdr( ScmOp_car( ScmOp_cdr(pair) )));
+    return ScmOp_car( ScmOp_cdr( ScmOp_car( ScmOp_cdr(lst) )));
 }
-ScmObj ScmOp_caddar(ScmObj pair)
+ScmObj ScmOp_caddar(ScmObj lst)
 {
-    return ScmOp_car( ScmOp_cdr( ScmOp_cdr( ScmOp_car(pair) )));
+    return ScmOp_car( ScmOp_cdr( ScmOp_cdr( ScmOp_car(lst) )));
 }
-ScmObj ScmOp_cadddr(ScmObj pair)
+ScmObj ScmOp_cadddr(ScmObj lst)
 {
-    return ScmOp_car( ScmOp_cdr( ScmOp_cdr( ScmOp_cdr(pair) )));
+    return ScmOp_car( ScmOp_cdr( ScmOp_cdr( ScmOp_cdr(lst) )));
 }
-ScmObj ScmOp_cdaaar(ScmObj pair)
+ScmObj ScmOp_cdaaar(ScmObj lst)
 {
-    return ScmOp_cdr( ScmOp_car( ScmOp_car( ScmOp_car(pair) )));
+    return ScmOp_cdr( ScmOp_car( ScmOp_car( ScmOp_car(lst) )));
 }
-ScmObj ScmOp_cdaadr(ScmObj pair)
+ScmObj ScmOp_cdaadr(ScmObj lst)
 {
-    return ScmOp_cdr( ScmOp_car( ScmOp_car( ScmOp_cdr(pair) )));
+    return ScmOp_cdr( ScmOp_car( ScmOp_car( ScmOp_cdr(lst) )));
 }
-ScmObj ScmOp_cdadar(ScmObj pair)
+ScmObj ScmOp_cdadar(ScmObj lst)
 {
-    return ScmOp_cdr( ScmOp_car( ScmOp_cdr( ScmOp_car(pair) )));
+    return ScmOp_cdr( ScmOp_car( ScmOp_cdr( ScmOp_car(lst) )));
 }
-ScmObj ScmOp_cdaddr(ScmObj pair)
+ScmObj ScmOp_cdaddr(ScmObj lst)
 {
-    return ScmOp_cdr( ScmOp_car( ScmOp_cdr( ScmOp_cdr(pair) )));
+    return ScmOp_cdr( ScmOp_car( ScmOp_cdr( ScmOp_cdr(lst) )));
 }
-ScmObj ScmOp_cddaar(ScmObj pair)
+ScmObj ScmOp_cddaar(ScmObj lst)
 {
-    return ScmOp_cdr( ScmOp_cdr( ScmOp_car( ScmOp_car(pair) )));
+    return ScmOp_cdr( ScmOp_cdr( ScmOp_car( ScmOp_car(lst) )));
 }
-ScmObj ScmOp_cddadr(ScmObj pair)
+ScmObj ScmOp_cddadr(ScmObj lst)
 {
-    return ScmOp_cdr( ScmOp_cdr( ScmOp_car( ScmOp_cdr(pair) )));
+    return ScmOp_cdr( ScmOp_cdr( ScmOp_car( ScmOp_cdr(lst) )));
 }
-ScmObj ScmOp_cdddar(ScmObj pair)
+ScmObj ScmOp_cdddar(ScmObj lst)
 {
-    return ScmOp_cdr( ScmOp_cdr( ScmOp_cdr( ScmOp_car(pair) )));
+    return ScmOp_cdr( ScmOp_cdr( ScmOp_cdr( ScmOp_car(lst) )));
 }
-ScmObj ScmOp_cddddr(ScmObj pair)
+ScmObj ScmOp_cddddr(ScmObj lst)
 {
-    return ScmOp_cdr( ScmOp_cdr( ScmOp_cdr( ScmOp_cdr(pair) )));
+    return ScmOp_cdr( ScmOp_cdr( ScmOp_cdr( ScmOp_cdr(lst) )));
 }
 
 ScmObj ScmOp_list(ScmObj obj, ScmObj env)
@@ -1701,7 +1675,8 @@
     /* create new str */
     char_size = strlen(SCM_CHAR_VALUE(ch));
     str_len   = SCM_STRING_LEN(string);
-    new_str   = (char*)realloc(SCM_STRING_STR(string), sizeof(char) * str_len * char_size + 1);
+    new_str   = (char*)realloc(SCM_STRING_STR(string),
+                               sizeof(char) * str_len * char_size + 1);
     for (i = 0, p = new_str; i < char_size * str_len;) {
         strcpy(p, SCM_CHAR_VALUE(ch));
 
@@ -1870,10 +1845,7 @@
 =======================================*/
 ScmObj ScmOp_procedurep(ScmObj obj)
 {
-    if (FUNCP(obj) || CLOSUREP(obj))
-        return SCM_TRUE;
-
-    return SCM_FALSE;
+    return (FUNCP(obj) || CLOSUREP(obj)) ? SCM_TRUE : SCM_FALSE;
 }
 
 ScmObj ScmOp_map(ScmObj map_arg, ScmObj env)

Modified: branches/r5rs/sigscheme/sigscheme.h
===================================================================
--- branches/r5rs/sigscheme/sigscheme.h	2005-09-05 12:09:03 UTC (rev 1427)
+++ branches/r5rs/sigscheme/sigscheme.h	2005-09-05 13:50:39 UTC (rev 1428)
@@ -71,7 +71,7 @@
 #define SCM_USE_SRFI8           1  /* use SRFI-8 receive procedure written in C */
 #define SCM_USE_SRFI23          1  /* use SRFI-23 error procedure written in C */
 #define SCM_USE_SRFI38          1  /* use SRFI-38 write/ss written in C */
-#define SCM_USE_SRFI60          1  /* use SRFI-60 integers as bits written in C*/
+#define SCM_USE_SRFI60          1  /* use SRFI-60 integers as bits written in C */
 #define SCM_USE_NONSTD_FEATURES 1  /* use Non-R5RS standard features */
 #define SCM_COMPAT_SIOD         1  /* use SIOD compatible features */
 #define SCM_COMPAT_SIOD_BUGS    1  /* emulate the buggy behaviors of SIOD */
@@ -215,34 +215,34 @@
 ScmObj ScmOp_cons(ScmObj car, ScmObj cdr);
 ScmObj ScmOp_setcar(ScmObj pair, ScmObj car);
 ScmObj ScmOp_setcdr(ScmObj pair, ScmObj cdr);
-ScmObj ScmOp_caar(ScmObj pair);
-ScmObj ScmOp_cadr(ScmObj pair);
-ScmObj ScmOp_cdar(ScmObj pair);
-ScmObj ScmOp_cddr(ScmObj pair);
-ScmObj ScmOp_caaar(ScmObj pair);
-ScmObj ScmOp_caadr(ScmObj pair);
-ScmObj ScmOp_cadar(ScmObj pair);
-ScmObj ScmOp_caddr(ScmObj pair);
-ScmObj ScmOp_cdaar(ScmObj pair);
-ScmObj ScmOp_cdadr(ScmObj pair);
-ScmObj ScmOp_cddar(ScmObj pair);
-ScmObj ScmOp_cdddr(ScmObj pair);
-ScmObj ScmOp_caaaar(ScmObj pair);
-ScmObj ScmOp_caaadr(ScmObj pair);
-ScmObj ScmOp_caadar(ScmObj pair);
-ScmObj ScmOp_caaddr(ScmObj pair);
-ScmObj ScmOp_cadaar(ScmObj pair);
-ScmObj ScmOp_cadadr(ScmObj pair);
-ScmObj ScmOp_caddar(ScmObj pair);
-ScmObj ScmOp_cadddr(ScmObj pair);
-ScmObj ScmOp_cdaaar(ScmObj pair);
-ScmObj ScmOp_cdaadr(ScmObj pair);
-ScmObj ScmOp_cdadar(ScmObj pair);
-ScmObj ScmOp_cdaddr(ScmObj pair);
-ScmObj ScmOp_cddaar(ScmObj pair);
-ScmObj ScmOp_cddadr(ScmObj pair);
-ScmObj ScmOp_cdddar(ScmObj pair);
-ScmObj ScmOp_cddddr(ScmObj pair);
+ScmObj ScmOp_caar(ScmObj lst);
+ScmObj ScmOp_cadr(ScmObj lst);
+ScmObj ScmOp_cdar(ScmObj lst);
+ScmObj ScmOp_cddr(ScmObj lst);
+ScmObj ScmOp_caaar(ScmObj lst);
+ScmObj ScmOp_caadr(ScmObj lst);
+ScmObj ScmOp_cadar(ScmObj lst);
+ScmObj ScmOp_caddr(ScmObj lst);
+ScmObj ScmOp_cdaar(ScmObj lst);
+ScmObj ScmOp_cdadr(ScmObj lst);
+ScmObj ScmOp_cddar(ScmObj lst);
+ScmObj ScmOp_cdddr(ScmObj lst);
+ScmObj ScmOp_caaaar(ScmObj lst);
+ScmObj ScmOp_caaadr(ScmObj lst);
+ScmObj ScmOp_caadar(ScmObj lst);
+ScmObj ScmOp_caaddr(ScmObj lst);
+ScmObj ScmOp_cadaar(ScmObj lst);
+ScmObj ScmOp_cadadr(ScmObj lst);
+ScmObj ScmOp_caddar(ScmObj lst);
+ScmObj ScmOp_cadddr(ScmObj lst);
+ScmObj ScmOp_cdaaar(ScmObj lst);
+ScmObj ScmOp_cdaadr(ScmObj lst);
+ScmObj ScmOp_cdadar(ScmObj lst);
+ScmObj ScmOp_cdaddr(ScmObj lst);
+ScmObj ScmOp_cddaar(ScmObj lst);
+ScmObj ScmOp_cddadr(ScmObj lst);
+ScmObj ScmOp_cdddar(ScmObj lst);
+ScmObj ScmOp_cddddr(ScmObj lst);
 ScmObj ScmOp_list(ScmObj obj, ScmObj env);
 ScmObj ScmOp_nullp(ScmObj obj);
 ScmObj ScmOp_listp(ScmObj obj);



More information about the uim-commit mailing list