[uim-commit] r1071 - branches/r5rs/uim

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-07-29 07:59:15 -0700 (Fri, 29 Jul 2005)
New Revision: 1071

Modified:
   branches/r5rs/uim/uim-scm.c
   branches/r5rs/uim/uim-scm.h
Log:
* uim/uim-scm.h
  - (UIM_SCM_EXTENDED_API): New macro. See the comment nearby the
    definition
  - (uim_scm_apply, uim_scm_quote, uim_scm_list1, uim_scm_list2,
    uim_scm_list3, uim_scm_list4, uim_scm_list5): Surround by #ifdef
    UIM_SCM_EXTENDED_API
  - (uim_scm_cadr, uim_scm_caar, uim_scm_cdar, uim_scm_cddr,
    uim_scm_length, uim_scm_reverse): Rename the argument
    appropriately. The names 'list' have been renamed to 'lst' to
    avoid conflictiong with C++ STL
* uim/uim-scm.c
  - (uim_scm_cadr, uim_scm_caar, uim_scm_cdar, uim_scm_cddr,
    uim_scm_length, uim_scm_reverse): Rename the argument
  - (uim_scm_car, uim_scm_cdr): Revert the argument renaming in r1060
    since 'pair' is more accurate than 'list' for the functions


Modified: branches/r5rs/uim/uim-scm.c
===================================================================
--- branches/r5rs/uim/uim-scm.c	2005-07-29 14:30:11 UTC (rev 1070)
+++ branches/r5rs/uim/uim-scm.c	2005-07-29 14:59:15 UTC (rev 1071)
@@ -295,6 +295,7 @@
   return ret;
 }
 
+#ifdef UIM_SCM_EXTENDED_API
 uim_lisp
 uim_scm_apply(uim_lisp proc, uim_lisp args)
 {
@@ -306,6 +307,7 @@
 {
   return ScmOp_quote(obj);
 }
+#endif  /* UIM_SCM_EXTENDED_API */
 
 uim_lisp
 uim_scm_eval_c_string(const char *str)
@@ -320,39 +322,39 @@
 }
 
 uim_lisp
-uim_scm_car(uim_lisp list)
+uim_scm_car(uim_lisp pair)
 {
-  return ScmOp_car(list);
+  return ScmOp_car(pair);
 }
 
 uim_lisp
-uim_scm_cdr(uim_lisp list)
+uim_scm_cdr(uim_lisp pair)
 {
-  return ScmOp_cdr(list);
+  return ScmOp_cdr(pair);
 }
 
 uim_lisp
-uim_scm_cadr(uim_lisp list)
+uim_scm_cadr(uim_lisp lst)
 {
-  return ScmOp_cadr(list);
+  return ScmOp_cadr(lst);
 }
 
 uim_lisp
-uim_scm_caar(uim_lisp list)
+uim_scm_caar(uim_lisp lst)
 {
-  return ScmOp_caar(list);
+  return ScmOp_caar(lst);
 }
 
 uim_lisp
-uim_scm_cdar(uim_lisp list)
+uim_scm_cdar(uim_lisp lst)
 {
-  return ScmOp_cdar(list);
+  return ScmOp_cdar(lst);
 }
 
 uim_lisp
-uim_scm_cddr(uim_lisp list)
+uim_scm_cddr(uim_lisp lst)
 {
-  return ScmOp_cddr(list);
+  return ScmOp_cddr(lst);
 }
 
 uim_lisp
@@ -362,17 +364,18 @@
 }
 
 uim_lisp
-uim_scm_length(uim_lisp list)
+uim_scm_length(uim_lisp lst)
 {
-  return ScmOp_length(list);
+  return ScmOp_length(lst);
 }
 
 uim_lisp
-uim_scm_reverse(uim_lisp list)
+uim_scm_reverse(uim_lisp lst)
 {
-  return ScmOp_reverse(list);
+  return ScmOp_reverse(lst);
 }
 
+#ifdef UIM_SCM_EXTENDED_API
 uim_lisp
 uim_scm_list1(uim_lisp elm1)
 {
@@ -413,6 +416,7 @@
   lst = uim_scm_cons(elm1, uim_scm_cons(elm2, uim_scm_list3(elm3, elm4, elm5)));
   return lst;
 }
+#endif  /* UIM_SCM_EXTENDED_API */
 
 uim_bool
 uim_scm_require_file(const char *fn)

Modified: branches/r5rs/uim/uim-scm.h
===================================================================
--- branches/r5rs/uim/uim-scm.h	2005-07-29 14:30:11 UTC (rev 1070)
+++ branches/r5rs/uim/uim-scm.h	2005-07-29 14:59:15 UTC (rev 1071)
@@ -58,6 +58,16 @@
 extern "C" {
 #endif
 
+/*
+  UIM_SCM_EXTENDED_API indicates that the interfaces are extended in
+  the r5rs barnch. Some of interfaces are re-adopted from
+  uim-compat-scm.h. Since it contradicts with the "core interface
+  policy" described above (2005-01-10 YamaKen), it must be
+  distinguished from original ones for now. A discussion may be
+  required to make the new API standard before next stable series
+  has been released.  -- YamaKen 2005-07-29
+*/
+#define UIM_SCM_EXTENDED_API
 
 /*
   uim companion tools should treat lisp object as opaque. struct
@@ -102,10 +112,12 @@
 uim_scm_require_file(const char *fn);
 uim_lisp
 uim_scm_eval(uim_lisp obj);
+#ifdef UIM_SCM_EXTENDED_API
 uim_lisp
 uim_scm_apply(uim_lisp proc, uim_lisp args);
 uim_lisp
 uim_scm_quote(uim_lisp obj);
+#endif  /* UIM_SCM_EXTENDED_API */
 
 uim_lisp
 uim_scm_eval_c_string(const char *str);
@@ -190,21 +202,22 @@
 uim_lisp
 uim_scm_cons(uim_lisp car, uim_lisp cdr);
 uim_lisp
-uim_scm_car(uim_lisp cell);
+uim_scm_car(uim_lisp pair);
 uim_lisp
-uim_scm_cdr(uim_lisp cell);
+uim_scm_cdr(uim_lisp pair);
 uim_lisp
-uim_scm_cadr(uim_lisp cell);
+uim_scm_cadr(uim_lisp lst);
 uim_lisp
-uim_scm_caar(uim_lisp cell);
+uim_scm_caar(uim_lisp lst);
 uim_lisp
-uim_scm_cdar(uim_lisp cell);
+uim_scm_cdar(uim_lisp lst);
 uim_lisp
-uim_scm_cddr(uim_lisp cell);
+uim_scm_cddr(uim_lisp lst);
 uim_lisp
-uim_scm_length(uim_lisp list);
+uim_scm_length(uim_lisp lst);
 uim_lisp
-uim_scm_reverse(uim_lisp cell);
+uim_scm_reverse(uim_lisp lst);
+#ifdef UIM_SCM_EXTENDED_API
 uim_lisp
 uim_scm_list1(uim_lisp elm1);
 uim_lisp
@@ -216,6 +229,7 @@
 uim_lisp
 uim_scm_list5(uim_lisp elm1, uim_lisp elm2, uim_lisp elm3, uim_lisp elm4,
               uim_lisp elm5);
+#endif  /* UIM_SCM_EXTENDED_API */
 
 
 #ifdef __cplusplus