Author: yamakenz
Date: Fri Aug 24 07:01:47 2007
New Revision: 4882
Modified:
trunk/doc/COMPATIBILITY
trunk/uim/uim-scm.c
trunk/uim/uim-scm.h
Log:
* src/sigscheme.h
- (uim_scm_init_subr_0, uim_scm_init_subr_1, uim_scm_init_subr_2,
uim_scm_init_subr_3, uim_scm_init_subr_4, uim_scm_init_subr_5):
* Rename to uim_scm_init_proc*()
* Redefine as alias macro to uim_scm_init_proc*()
- (uim_scm_init_proc0, uim_scm_init_proc1, uim_scm_init_proc2,
uim_scm_init_proc3, uim_scm_init_proc4, uim_scm_init_proc5): Renamed from
uim_scm_init_subr_*()
* src/sigscheme.c
- (uim_scm_init_subr_0, uim_scm_init_subr_1, uim_scm_init_subr_2,
uim_scm_init_subr_3, uim_scm_init_subr_4, uim_scm_init_subr_5): Rename to
uim_scm_init_proc*()
- (uim_scm_init_proc0, uim_scm_init_proc1, uim_scm_init_proc2,
uim_scm_init_proc3, uim_scm_init_proc4, uim_scm_init_proc5): Renamed from
uim_scm_init_subr_*()
* doc/COMPATIBILITY
- Update
Modified: trunk/doc/COMPATIBILITY
==============================================================================
--- trunk/doc/COMPATIBILITY (original)
+++ trunk/doc/COMPATIBILITY Fri Aug 24 07:01:47 2007
@@ -430,7 +430,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, ac4821, ac4830, ac4870, ac4871, ac4873, ac4875, ac4878, ac4881
+Revision: ac4333, ac4334, ac4339, ac4347, ac4351-ac4353, ac4355, ac4444,
ac4446, ac4751, ac4761, ac4764, ac4788, ac4808, ac4812, ac4813, ac4815, ac4817,
ac4819, ac4821, ac4830, ac4870, ac4871, ac4873, ac4875, ac4877, ac4878, ac4881,
ac4882
Date: 2007-01-09 -
Modifier: YamaKen
Related: uim-scm API truth predicates reorganization in uim 1.5.0
@@ -468,6 +468,13 @@
(new) uim_scm_vector_length()
(new) uim_scm_set_car()
(new) uim_scm_set_cdr()
+ (new) uim_scm_intp()
+ (new) uim_scm_init_proc0()
+ (new) uim_scm_init_proc1()
+ (new) uim_scm_init_proc2()
+ (new) uim_scm_init_proc3()
+ (new) uim_scm_init_proc4()
+ (new) uim_scm_init_proc5()
(new) MAKE_BOOL()
(new) MAKE_INT()
(new) MAKE_CHAR()
@@ -497,8 +504,15 @@
(new) LIST5()
(new) QUOTE()
(changed) uim_scm_length()
+ (deprecated) uim_scm_null_list()
+ (deprecated) uim_scm_integerp()
+ (deprecated) uim_scm_init_subr_0()
+ (deprecated) uim_scm_init_subr_1()
+ (deprecated) uim_scm_init_subr_2()
+ (deprecated) uim_scm_init_subr_3()
+ (deprecated) uim_scm_init_subr_4()
+ (deprecated) uim_scm_init_subr_5()
(removed) uim_scm_init_fsubr()
- (removed) uim_scm_null_list()
(removed) uim_scm_cadr()
(removed) uim_scm_caar()
(removed) uim_scm_cdar()
@@ -534,7 +548,12 @@
- uim-scm-abbrev.h is introduced
- Scheme integer type has been changed to long from int
- return type of uim_scm_length() is changed to long from uim_lisp
- - uim_scm_null_list() is renamed to uim_scm_null()
+ - uim_scm_null_list() is renamed to uim_scm_null(). The old name is
+ defined as an alias macro (deprecated)
+ - uim_scm_integerp() is renamed to uim_scm_intp(). The old name is
+ defined as an alias macro (deprecated)
+ - uim_scm_init_subr_*() are renamed to uim_scm_init_proc*(). The old
+ name is defined as an alias macro (deprecated)
- uim_scm_c_list() and other list-related functions are moved into
uim-custom.c and made static
- uim_scm_make_int(), uim_scm_make_str(), uim_scm_make_symbol(),
Modified: trunk/uim/uim-scm.c
==============================================================================
--- trunk/uim/uim-scm.c (original)
+++ trunk/uim/uim-scm.c Fri Aug 24 07:01:47 2007
@@ -1210,7 +1210,7 @@
}
void
-uim_scm_init_subr_0(const char *name, uim_lisp (*func)(void))
+uim_scm_init_proc0(const char *name, uim_lisp (*func)(void))
{
assert(uim_scm_gc_protected_contextp());
assert(name);
@@ -1220,7 +1220,7 @@
}
void
-uim_scm_init_subr_1(const char *name, uim_lisp (*func)(uim_lisp))
+uim_scm_init_proc1(const char *name, uim_lisp (*func)(uim_lisp))
{
assert(uim_scm_gc_protected_contextp());
assert(name);
@@ -1230,7 +1230,7 @@
}
void
-uim_scm_init_subr_2(const char *name, uim_lisp (*func)(uim_lisp, uim_lisp))
+uim_scm_init_proc2(const char *name, uim_lisp (*func)(uim_lisp, uim_lisp))
{
assert(uim_scm_gc_protected_contextp());
assert(name);
@@ -1240,8 +1240,8 @@
}
void
-uim_scm_init_subr_3(const char *name,
- uim_lisp (*func)(uim_lisp, uim_lisp, uim_lisp))
+uim_scm_init_proc3(const char *name,
+ uim_lisp (*func)(uim_lisp, uim_lisp, uim_lisp))
{
assert(uim_scm_gc_protected_contextp());
assert(name);
@@ -1251,8 +1251,8 @@
}
void
-uim_scm_init_subr_4(const char *name,
- uim_lisp (*func)(uim_lisp, uim_lisp, uim_lisp, uim_lisp))
+uim_scm_init_proc4(const char *name,
+ uim_lisp (*func)(uim_lisp, uim_lisp, uim_lisp, uim_lisp))
{
assert(uim_scm_gc_protected_contextp());
assert(name);
@@ -1262,9 +1262,9 @@
}
void
-uim_scm_init_subr_5(const char *name,
- uim_lisp (*func)(uim_lisp, uim_lisp, uim_lisp, uim_lisp,
- uim_lisp))
+uim_scm_init_proc5(const char *name,
+ uim_lisp (*func)(uim_lisp, uim_lisp, uim_lisp, uim_lisp,
+ uim_lisp))
{
assert(uim_scm_gc_protected_contextp());
assert(name);
Modified: trunk/uim/uim-scm.h
==============================================================================
--- trunk/uim/uim-scm.h (original)
+++ trunk/uim/uim-scm.h Fri Aug 24 07:01:47 2007
@@ -149,20 +149,18 @@
uim_scm_make_func_ptr(uim_func_ptr func_ptr);
/* procedure initializers */
-void
-uim_scm_init_subr_0(const char *name, uim_lisp (*fcn)(void));
-void
-uim_scm_init_subr_1(const char *name, uim_lisp (*fcn)(uim_lisp));
-void
-uim_scm_init_subr_2(const char *name, uim_lisp (*fcn)(uim_lisp, uim_lisp));
-void
-uim_scm_init_subr_3(const char *name, uim_lisp (*fcn)(uim_lisp, uim_lisp,
uim_lisp));
-void
-uim_scm_init_subr_4(const char *name, uim_lisp (*fcn)(uim_lisp, uim_lisp,
uim_lisp,
- uim_lisp));
-void
-uim_scm_init_subr_5(const char *name, uim_lisp (*fcn)(uim_lisp, uim_lisp,
uim_lisp,
- uim_lisp, uim_lisp));
+void uim_scm_init_proc0(const char *name, uim_lisp (*func)(void));
+void uim_scm_init_proc1(const char *name, uim_lisp (*func)(uim_lisp));
+void uim_scm_init_proc2(const char *name,
+ uim_lisp (*func)(uim_lisp, uim_lisp));
+void uim_scm_init_proc3(const char *name,
+ uim_lisp (*func)(uim_lisp, uim_lisp, uim_lisp));
+void uim_scm_init_proc4(const char *name,
+ uim_lisp (*func)(uim_lisp, uim_lisp, uim_lisp,
+ uim_lisp));
+void uim_scm_init_proc5(const char *name,
+ uim_lisp (*func)(uim_lisp, uim_lisp, uim_lisp,
+ uim_lisp, uim_lisp));
/* constants */
@@ -235,6 +233,14 @@
#define uim_scm_integerp uim_scm_intp
#define uim_scm_null_list uim_scm_null
+
+#define uim_scm_init_subr_0 uim_scm_init_proc0
+#define uim_scm_init_subr_1 uim_scm_init_proc1
+#define uim_scm_init_subr_2 uim_scm_init_proc2
+#define uim_scm_init_subr_3 uim_scm_init_proc3
+#define uim_scm_init_subr_4 uim_scm_init_proc4
+#define uim_scm_init_subr_5 uim_scm_init_proc5
+
#endif /* UIM_SCM_USE_DEPRECATED_API */
