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

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-09-18 03:22:13 -0700 (Sun, 18 Sep 2005)
New Revision: 1514

Modified:
   branches/r5rs/uim/uim-compat-scm.c
   branches/r5rs/uim/uim-compat-scm.h
   branches/r5rs/uim/uim-scm.c
   branches/r5rs/uim/uim-scm.h
   branches/r5rs/uim/uim.c
Log:
* This commit cancels the trunk-incompatible uim-scm API change in
  r1063 and r1065. trunk-conpatibility of the API has been recovered.

* uim/uim-scm.h
  - (uim_scm_quote, uim_scm_list1, uim_scm_list2, uim_scm_list3,
    uim_scm_list4, uim_scm_list5): Move to uim-compat-scm.h
* uim/uim-compat-scm.h
  - (uim_scm_quote, uim_scm_list1, uim_scm_list2, uim_scm_list3,
    uim_scm_list4, uim_scm_list5): Moved from uim-scm.h
* uim/uim-scm.c
  - (uim_scm_quote, uim_scm_list1, uim_scm_list2, uim_scm_list3,
    uim_scm_list4, uim_scm_list5): Move to uim-compat-scm.c
* uim/uim-compat-scm.c
  - (uim_scm_quote, uim_scm_list1, uim_scm_list2, uim_scm_list3,
    uim_scm_list4, uim_scm_list5): Moved from uim-scm.c
* uim/uim.c
  - Resurrect #include "uim-compat-scm.h"


Modified: branches/r5rs/uim/uim-compat-scm.c
===================================================================
--- branches/r5rs/uim/uim-compat-scm.c	2005-09-18 09:13:40 UTC (rev 1513)
+++ branches/r5rs/uim/uim-compat-scm.c	2005-09-18 10:22:13 UTC (rev 1514)
@@ -171,12 +171,62 @@
 }
 
 uim_lisp
+uim_scm_quote(uim_lisp obj)
+{
+  /* TODO : fixme Kazuki Ohta <mover at hct.zaq.ne.jp> */
+  return (uim_lisp)Scm_NewCons(SCM_QUOTE,
+			       Scm_NewCons((ScmObj)obj,
+					   SCM_NULL));
+}
+
+uim_lisp
 uim_scm_nth(uim_lisp n, uim_lisp lst)
 {
   return (uim_lisp)ScmOp_list_ref((ScmObj)lst,
 				  (ScmObj)n);
 }
 
+uim_lisp
+uim_scm_list1(uim_lisp elm1)
+{
+  uim_lisp lst;
+  lst = uim_scm_cons(elm1, uim_scm_null_list());
+  return lst;
+}
+
+uim_lisp
+uim_scm_list2(uim_lisp elm1, uim_lisp elm2)
+{
+  uim_lisp lst;
+  lst = uim_scm_cons(elm1, uim_scm_cons(elm2, uim_scm_null_list()));
+  return lst;
+}
+
+uim_lisp
+uim_scm_list3(uim_lisp elm1, uim_lisp elm2, uim_lisp elm3)
+{
+  uim_lisp lst;
+  lst = uim_scm_cons(elm1, uim_scm_cons(elm2, uim_scm_cons(elm3, uim_scm_null_list())));
+  return lst;
+}
+
+uim_lisp
+uim_scm_list4(uim_lisp elm1, uim_lisp elm2, uim_lisp elm3, uim_lisp elm4)
+{
+  uim_lisp lst;
+  lst = uim_scm_cons(elm1, uim_scm_list3(elm2, elm3, elm4));
+  return lst;
+}
+
+uim_lisp
+uim_scm_list5(uim_lisp elm1, uim_lisp elm2, uim_lisp elm3, uim_lisp elm4,
+              uim_lisp elm5)
+{
+  uim_lisp lst;
+  lst = uim_scm_cons(elm1, uim_scm_cons(elm2, uim_scm_list3(elm3, elm4, elm5)));
+  return lst;
+}
+
 /* Is this function used from somewhere? I think this function could be removed. */
 uim_lisp
 uim_scm_nreverse(uim_lisp cell)

Modified: branches/r5rs/uim/uim-compat-scm.h
===================================================================
--- branches/r5rs/uim/uim-compat-scm.h	2005-09-18 09:13:40 UTC (rev 1513)
+++ branches/r5rs/uim/uim-compat-scm.h	2005-09-18 10:22:13 UTC (rev 1514)
@@ -88,7 +88,20 @@
 uim_scm_qintern_c_str(const char *str);
 
 uim_lisp
+uim_scm_quote(uim_lisp obj);
+uim_lisp
 uim_scm_nth(uim_lisp n, uim_lisp lst);
+uim_lisp
+uim_scm_list1(uim_lisp elm1);
+uim_lisp
+uim_scm_list2(uim_lisp elm1, uim_lisp elm2);
+uim_lisp
+uim_scm_list3(uim_lisp elm1, uim_lisp elm2, uim_lisp elm3);
+uim_lisp
+uim_scm_list4(uim_lisp elm1, uim_lisp elm2, uim_lisp elm3, uim_lisp elm4);
+uim_lisp
+uim_scm_list5(uim_lisp elm1, uim_lisp elm2, uim_lisp elm3, uim_lisp elm4,
+              uim_lisp elm5);
 
 uim_lisp
 uim_scm_nreverse(uim_lisp cell);

Modified: branches/r5rs/uim/uim-scm.c
===================================================================
--- branches/r5rs/uim/uim-scm.c	2005-09-18 09:13:40 UTC (rev 1513)
+++ branches/r5rs/uim/uim-scm.c	2005-09-18 10:22:13 UTC (rev 1514)
@@ -333,15 +333,6 @@
 					   Scm_NewCons((ScmObj)args, SCM_NULL)),	
 			       SCM_NULL);
 }
-
-uim_lisp
-uim_scm_quote(uim_lisp obj)
-{
-  /* TODO : fixme Kazuki Ohta <mover at hct.zaq.ne.jp> */
-  return (uim_lisp)Scm_NewCons(SCM_QUOTE,
-			       Scm_NewCons((ScmObj)obj,
-					   SCM_NULL));
-}
 #endif  /* UIM_SCM_EXTENDED_API */
 
 uim_lisp
@@ -411,49 +402,6 @@
   return (uim_lisp)ScmOp_reverse((ScmObj)lst);
 }
 
-#ifdef UIM_SCM_EXTENDED_API
-uim_lisp
-uim_scm_list1(uim_lisp elm1)
-{
-  uim_lisp lst;
-  lst = uim_scm_cons(elm1, uim_scm_null_list());
-  return lst;
-}
-
-uim_lisp
-uim_scm_list2(uim_lisp elm1, uim_lisp elm2)
-{
-  uim_lisp lst;
-  lst = uim_scm_cons(elm1, uim_scm_cons(elm2, uim_scm_null_list()));
-  return lst;
-}
-
-uim_lisp
-uim_scm_list3(uim_lisp elm1, uim_lisp elm2, uim_lisp elm3)
-{
-  uim_lisp lst;
-  lst = uim_scm_cons(elm1, uim_scm_cons(elm2, uim_scm_cons(elm3, uim_scm_null_list())));
-  return lst;
-}
-
-uim_lisp
-uim_scm_list4(uim_lisp elm1, uim_lisp elm2, uim_lisp elm3, uim_lisp elm4)
-{
-  uim_lisp lst;
-  lst = uim_scm_cons(elm1, uim_scm_list3(elm2, elm3, elm4));
-  return lst;
-}
-
-uim_lisp
-uim_scm_list5(uim_lisp elm1, uim_lisp elm2, uim_lisp elm3, uim_lisp elm4,
-              uim_lisp elm5)
-{
-  uim_lisp lst;
-  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-09-18 09:13:40 UTC (rev 1513)
+++ branches/r5rs/uim/uim-scm.h	2005-09-18 10:22:13 UTC (rev 1514)
@@ -115,8 +115,6 @@
 #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
@@ -217,19 +215,6 @@
 uim_scm_length(uim_lisp lst);
 uim_lisp
 uim_scm_reverse(uim_lisp lst);
-#ifdef UIM_SCM_EXTENDED_API
-uim_lisp
-uim_scm_list1(uim_lisp elm1);
-uim_lisp
-uim_scm_list2(uim_lisp elm1, uim_lisp elm2);
-uim_lisp
-uim_scm_list3(uim_lisp elm1, uim_lisp elm2, uim_lisp elm3);
-uim_lisp
-uim_scm_list4(uim_lisp elm1, uim_lisp elm2, uim_lisp elm3, uim_lisp elm4);
-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

Modified: branches/r5rs/uim/uim.c
===================================================================
--- branches/r5rs/uim/uim.c	2005-09-18 09:13:40 UTC (rev 1513)
+++ branches/r5rs/uim/uim.c	2005-09-18 10:22:13 UTC (rev 1514)
@@ -41,6 +41,7 @@
 #include "uim.h"
 #include "uim-im-switcher.h"
 #include "uim-scm.h"
+#include "uim-compat-scm.h"
 #include "uim-custom.h"
 #include "context.h"
 #include "gettext.h"