Author: yamakenz
Date: Fri Aug 10 20:37:19 2007
New Revision: 4821
Modified:
trunk/doc/COMPATIBILITY
trunk/uim/uim-compat-scm.c
trunk/uim/uim-compat-scm.h
trunk/uim/uim-sh.c
Log:
* uim/uim-compat-scm.h
* uim/uim-compat-scm.c
- (uim_scm_c_strs_into_list): Removed
* uim/uim-sh.c
- Exclude uim-compat-scm.h
- (uim_sh): Replace uim_scm_c_strs_into_list() with uim_scm_array2list()
* doc/COMPATIBILITY
- Update
Modified: trunk/doc/COMPATIBILITY
==============================================================================
--- trunk/doc/COMPATIBILITY (original)
+++ trunk/doc/COMPATIBILITY Fri Aug 10 20:37:19 2007
@@ -384,7 +384,7 @@
Affects: uim developers, IM developers
Updates: C API, libuim ABI
Version: 1.5.0
-Revision: ac4333, ac4334, ac4339, ac4347, ac4351-ac4353, ac4355, ac4444,
ac4446, ac4751, ac4761, ac4764, ac4788, ac4808, ac4812, ac4813, ac4815, ac4817,
ac4819
+Revision: ac4333, ac4334, ac4339, ac4347, ac4351-ac4353, ac4355, ac4444,
ac4446, ac4751, ac4761, ac4764, ac4788, ac4808, ac4812, ac4813, ac4815, ac4817,
ac4819, ac4821
Date: 2007-01-09 -
Modifier: YamaKen
Related: SigScheme introduction to uim
@@ -464,6 +464,7 @@
(removed) uim_scm_get_output()
(removed) uim_scm_set_output()
(removed) uim_scm_is_alive()
+ (removed) uim_scm_c_strs_into_list()
(removed) struct uim_api_tbl
(removed) im-return-str
(removed) im-return-str-list
Modified: trunk/uim/uim-compat-scm.c
==============================================================================
--- trunk/uim/uim-compat-scm.c (original)
+++ trunk/uim/uim-compat-scm.c Fri Aug 10 20:37:19 2007
@@ -44,25 +44,6 @@
static void *uim_scm_string_equal_internal(struct cmp_args *args);
-uim_lisp
-uim_scm_c_strs_into_list(int n_strs, const char *const *strs)
-{
- uim_lisp lst, str;
- const char *c_str;
- int i;
-
- assert(n_strs >= 0);
- assert(strs);
-
- for (lst = uim_scm_null_list(), i = n_strs - 1; 0 <= i; i--) {
- c_str = strs[i];
- str = uim_scm_make_str(c_str);
- lst = uim_scm_cons(str, lst);
- }
-
- return lst;
-}
-
uim_bool
uim_scm_string_equal(uim_lisp a, uim_lisp b)
{
Modified: trunk/uim/uim-compat-scm.h
==============================================================================
--- trunk/uim/uim-compat-scm.h (original)
+++ trunk/uim/uim-compat-scm.h Fri Aug 10 20:37:19 2007
@@ -60,8 +60,6 @@
extern "C" {
#endif
-uim_lisp
-uim_scm_c_strs_into_list(int n_strs, const char *const *strs);
uim_bool
uim_scm_string_equal(uim_lisp a, uim_lisp b);
Modified: trunk/uim/uim-sh.c
==============================================================================
--- trunk/uim/uim-sh.c (original)
+++ trunk/uim/uim-sh.c Fri Aug 10 20:37:19 2007
@@ -37,7 +37,6 @@
#include "uim.h"
#include "uim-scm.h"
-#include "uim-compat-scm.h"
#include "uim-scm-abbrev.h"
#ifdef LIBEDIT
@@ -94,8 +93,8 @@
return (void *)EXIT_FAILURE;
#endif
- args = uim_scm_c_strs_into_list(c_args->argc,
- (const char *const *)c_args->argv);
+ args = uim_scm_array2list((void **)c_args->argv, c_args->argc,
+ (uim_lisp (*)(void *))uim_scm_make_str);
uim_scm_callf("uim-sh", "o", args);
#ifdef UIM_SH_USE_EXIT_HOOK
