Author: yamakenz
Date: Mon Aug 27 22:16:02 2007
New Revision: 4920
Modified:
trunk/doc/COMPATIBILITY
trunk/uim/uim-scm-sigscheme.c
trunk/uim/uim-scm.h
Log:
* uim/uim-scm.h
- (uim_scm_symbol_value_int): Change return type from int to long
* uim/uim-scm-sigscheme.c
- (uim_scm_symbol_value_int): Change return type from int to long
- (uim_scm_symbol_value_int_internal): Follow the change
* doc/COMPATIBILITY
- Update "uim-scm API reorganization in uim 1.5.0"
Modified: trunk/doc/COMPATIBILITY
==============================================================================
--- trunk/doc/COMPATIBILITY (original)
+++ trunk/doc/COMPATIBILITY Mon Aug 27 22:16:02 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, ac4877, ac4878, ac4881,
ac4882, ac4884, ac4885, ac4907, ac4914
+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, ac4884, ac4885, ac4907, ac4914, ac4920
Date: 2007-01-09 -
Modifier: YamaKen
Related: uim-scm API truth predicates reorganization in uim 1.5.0
@@ -523,6 +523,7 @@
(new) VECTOR_REF()
(new) VECTOR_SET()
(changed) uim_scm_length()
+ (changed) uim_scm_symbol_value_int()
(deprecated) uim_scm_null_list()
(deprecated) uim_scm_integerp()
(deprecated) uim_scm_stringp()
@@ -568,6 +569,7 @@
- uim-scm has been separated from libuim as libuim-scm
- uim-scm-abbrev.h is introduced
- Scheme integer type has been changed to long from int
+ - Return type of uim_scm_symbol_value_int() has been changed to long
- return type of uim_scm_length() is changed to long from uim_lisp
- uim_scm_null_list() is renamed to uim_scm_null(). The old name is
defined as an alias macro (deprecated)
Modified: trunk/uim/uim-scm-sigscheme.c
==============================================================================
--- trunk/uim/uim-scm-sigscheme.c (original)
+++ trunk/uim/uim-scm-sigscheme.c Mon Aug 27 22:16:02 2007
@@ -523,20 +523,20 @@
return val;
}
-int
+long
uim_scm_symbol_value_int(const char *symbol_str)
{
assert(uim_scm_gc_any_contextp());
assert(symbol_str);
- return
(int)(intptr_t)uim_scm_call_with_gc_ready_stack((uim_gc_gate_func_ptr)uim_scm_symbol_value_int_internal,
(void *)symbol_str);
+ return
(long)(intptr_t)uim_scm_call_with_gc_ready_stack((uim_gc_gate_func_ptr)uim_scm_symbol_value_int_internal,
(void *)symbol_str);
}
static void *
uim_scm_symbol_value_int_internal(const char *symbol_str)
{
uim_lisp val_;
- int val;
+ long val;
val_ = uim_scm_symbol_value(symbol_str);
val = (uim_scm_truep(val_)) ? uim_scm_c_int(val_) : 0;
Modified: trunk/uim/uim-scm.h
==============================================================================
--- trunk/uim/uim-scm.h (original)
+++ trunk/uim/uim-scm.h Mon Aug 27 22:16:02 2007
@@ -118,7 +118,7 @@
/* evaluations */
uim_lisp uim_scm_symbol_value (const char *symbol_str);
uim_bool uim_scm_symbol_value_bool(const char *symbol_str);
-int uim_scm_symbol_value_int (const char *symbol_str);
+long uim_scm_symbol_value_int (const char *symbol_str);
char *uim_scm_symbol_value_str (const char *symbol_str);
uim_lisp uim_scm_eval(uim_lisp obj);