Author: yamakenz
Date: Mon Aug 27 19:48:30 2007
New Revision: 4910
Modified:
trunk/uim/look.c
trunk/uim/rk.c
trunk/uim/skk.c
trunk/uim/uim-scm-sigscheme.c
Log:
* uim/uim-scm-sigscheme.c
* uim/look.c
* uim/skk.c
* uim/rk.c
- Replace all deprecated uim_scm_null_list() with uim_scm_null() by
perl -i -pe 's/\buim_scm_null_list\b/uim_scm_null/g' uim/*.c
Modified: trunk/uim/look.c
==============================================================================
--- trunk/uim/look.c (original)
+++ trunk/uim/look.c Mon Aug 27 19:48:30 2007
@@ -61,7 +61,7 @@
dict_str = uim_strdup(str);
len = strlen(str);
- ret_ = uim_scm_null_list();
+ ret_ = uim_scm_null();
if (uim_look(dict_str, ctx) != 0) {
uim_look_set(ctx);
while (uim_look_get(dict_str, buf, sizeof(buf), ctx) != 0) {
Modified: trunk/uim/rk.c
==============================================================================
--- trunk/uim/rk.c (original)
+++ trunk/uim/rk.c Mon Aug 27 19:48:30 2007
@@ -129,7 +129,7 @@
static uim_lisp
rk_expect_seq(uim_lisp seq, uim_lisp rules)
{
- uim_lisp cur, res = uim_scm_null_list();
+ uim_lisp cur, res = uim_scm_null();
for (cur = rules; !uim_scm_nullp(cur); cur = uim_scm_cdr(cur)) {
uim_lisp rule = uim_scm_car(cur);
uim_lisp key = CAR(CAR(rule));
Modified: trunk/uim/skk.c
==============================================================================
--- trunk/uim/skk.c (original)
+++ trunk/uim/skk.c Mon Aug 27 19:48:30 2007
@@ -903,10 +903,10 @@
if UIM_SCM_NFALSEP(numeric_conv_)
rs = replace_numeric(hs);
- if (okuri_ != uim_scm_null_list())
+ if (okuri_ != uim_scm_null())
okuri = uim_scm_refer_c_str(okuri_);
- if (okuri_head_ == uim_scm_null_list()) {
+ if (okuri_head_ == uim_scm_null()) {
o = '\0';
} else {
const char *os = uim_scm_refer_c_str(okuri_head_);
@@ -1148,7 +1148,7 @@
int prev_is_num = 0;
int i, numlen = 0, start = 0;
char *numstr = NULL;
- uim_lisp lst = uim_scm_null_list();
+ uim_lisp lst = uim_scm_null();
str = uim_scm_refer_c_str(head_);
len = strlen(str);
@@ -1478,8 +1478,8 @@
char *convstr;
uim_lisp merged_str;
- if (str_ == uim_scm_null_list())
- return uim_scm_null_list();
+ if (str_ == uim_scm_null())
+ return uim_scm_null();
str = uim_scm_c_str(str_);
len = strlen(str);
@@ -1595,7 +1595,7 @@
/* nth start from 1 */
for (i = 1; i < nth; i++) {
if (uim_scm_nullp(lst_)) {
- return uim_scm_null_list();
+ return uim_scm_null();
}
lst_ = uim_scm_cdr(lst_);
}
@@ -1664,8 +1664,8 @@
int method_place = 0;
int sublen, newlen;
int mark;
- uim_lisp str_ = uim_scm_null_list();
- uim_lisp numlst_ = uim_scm_null_list();
+ uim_lisp str_ = uim_scm_null();
+ uim_lisp numlst_ = uim_scm_null();
int ignoring_indices[IGNORING_WORD_MAX + 1];
if UIM_SCM_NFALSEP(numeric_conv_)
@@ -1754,7 +1754,7 @@
int i, nr_cands = 0;
const char *numstr;
int method_place = 0;
- uim_lisp numlst_ = uim_scm_null_list();
+ uim_lisp numlst_ = uim_scm_null();
int ignoring_indices[IGNORING_WORD_MAX + 1];
if UIM_SCM_NFALSEP(numeric_conv_)
@@ -1903,7 +1903,7 @@
int n;
struct skk_comp_array *ca;
char *str;
- uim_lisp numlst_ = uim_scm_null_list();
+ uim_lisp numlst_ = uim_scm_null();
if UIM_SCM_NFALSEP(numeric_conv_)
numlst_ = skk_store_replaced_numeric_str(head_);
@@ -2051,7 +2051,7 @@
uim_lisp numlst_, look_;
char *rs = NULL;
- numlst_ = uim_scm_null_list();
+ numlst_ = uim_scm_null();
hs = uim_scm_refer_c_str(head_);
if UIM_SCM_NFALSEP(numeric_conv_)
@@ -2382,7 +2382,7 @@
uim_lisp numstr_;
const char *numstr;
int method_place = 0;
- uim_lisp numlst_ = uim_scm_null_list();
+ uim_lisp numlst_ = uim_scm_null();
int ignoring_indices[IGNORING_WORD_MAX + 1];
if UIM_SCM_NFALSEP(numeric_conv_)
@@ -2419,7 +2419,7 @@
if (k == nth) {
str = ca->cands[i];
/* reorder sub candidate */
- skk_commit_candidate(numstr_, uim_scm_null_list(),
uim_scm_null_list(), uim_scm_make_int(j), uim_scm_null_list());
+ skk_commit_candidate(numstr_, uim_scm_null(), uim_scm_null(),
uim_scm_make_int(j), uim_scm_null());
break;
}
k++;
@@ -2456,7 +2456,7 @@
}
reorder_candidate(ca, str);
- if (okuri_ != uim_scm_null_list()) {
+ if (okuri_ != uim_scm_null()) {
struct skk_line *sl;
const char *okuri;
int found = 0;
@@ -2529,7 +2529,7 @@
uim_lisp numstr_;
const char *numstr;
int method_place = 0;
- uim_lisp numlst_ = uim_scm_null_list();
+ uim_lisp numlst_ = uim_scm_null();
int ignoring_indices[IGNORING_WORD_MAX + 1];
if UIM_SCM_NFALSEP(numeric_conv_)
@@ -2565,7 +2565,7 @@
str = ca->cands[i];
/*
* don't purge word in sub candidate array
- * skk_purge_candidate(numstr_, uim_scm_null_list(),
uim_scm_null_list(), uim_scm_make_int(j), uim_scm_null_list());
+ * skk_purge_candidate(numstr_, uim_scm_null(), uim_scm_null(),
uim_scm_make_int(j), uim_scm_null());
*/
break;
}
@@ -2736,7 +2736,7 @@
tmp = uim_scm_refer_c_str(okuri_);
if (strlen(tmp)) {
- ca = find_cand_array_lisp(head_, okuri_head_, uim_scm_null_list(), 1,
numeric_conv_);
+ ca = find_cand_array_lisp(head_, okuri_head_, uim_scm_null(), 1,
numeric_conv_);
if (ca)
learn_word_to_cand_array(ca, word);
}
@@ -3234,8 +3234,8 @@
const char *str, *sep;
uim_lisp res;
- if (str_ == uim_scm_null_list())
- return uim_scm_null_list();
+ if (str_ == uim_scm_null())
+ return uim_scm_null();
str = uim_scm_refer_c_str(str_);
sep = strrchr(str, ';');
@@ -3253,8 +3253,8 @@
char *str, *sep;
uim_lisp res;
- if (str_ == uim_scm_null_list())
- return uim_scm_null_list();
+ if (str_ == uim_scm_null())
+ return uim_scm_null();
str = uim_scm_c_str(str_);
sep = strrchr(str, ';');
@@ -3319,8 +3319,8 @@
char *str;
uim_lisp cand_;
- if (str_ == uim_scm_null_list())
- return uim_scm_null_list();
+ if (str_ == uim_scm_null())
+ return uim_scm_null();
cand = uim_scm_refer_c_str(str_);
Modified: trunk/uim/uim-scm-sigscheme.c
==============================================================================
--- trunk/uim/uim-scm-sigscheme.c (original)
+++ trunk/uim/uim-scm-sigscheme.c Mon Aug 27 19:48:30 2007
@@ -633,7 +633,7 @@
assert(uim_scm_gc_any_contextp());
assert(uim_scm_gc_protectedp(elm1));
- return uim_scm_cons(elm1, uim_scm_null_list());
+ return uim_scm_cons(elm1, uim_scm_null());
}
uim_lisp
