Author: yamakenz
Date: Mon Aug 27 21:48:54 2007
New Revision: 4917
Modified:
trunk/uim/rk.c
trunk/uim/skk.c
Log:
* uim/rk.c
- (rk_find_seq, rk_find_partial_seq, rk_expect_seq): Replace
deprecated UIM_SCM_NFALSEP() with TRUEP()
* uim/skk.c
- (find_cand_array_lisp, skk_get_entry, skk_get_nth_candidate,
skk_get_nr_candidates, make_comp_array_from_cache,
find_comp_array_lisp, skk_get_completion, skk_get_nth_completion,
skk_get_nr_completions, skk_clear_completions, skk_get_dcomp_word,
skk_commit_candidate, skk_purge_candidate): Ditto
Modified: trunk/uim/rk.c
==============================================================================
--- trunk/uim/rk.c (original)
+++ trunk/uim/rk.c Mon Aug 27 21:48:54 2007
@@ -102,7 +102,7 @@
for (; !uim_scm_nullp(rules); rules = uim_scm_cdr(rules)) {
uim_lisp rule = uim_scm_car(rules);
uim_lisp key = uim_scm_car(uim_scm_car(rule));
- if UIM_SCM_NFALSEP(str_seq_equal(seq, key)) {
+ if (TRUEP(str_seq_equal(seq, key))) {
return rule;
}
}
@@ -115,7 +115,7 @@
for (; !uim_scm_nullp(rules); rules = uim_scm_cdr(rules)) {
uim_lisp rule = uim_scm_car(rules);
uim_lisp key = uim_scm_car(uim_scm_car(rule));
- if UIM_SCM_NFALSEP(str_seq_partial(seq, key)) {
+ if (TRUEP(str_seq_partial(seq, key))) {
return rule;
}
}
@@ -134,7 +134,7 @@
uim_lisp rule = uim_scm_car(cur);
uim_lisp key = CAR(CAR(rule));
uim_lisp e = str_seq_partial(seq, key);
- if UIM_SCM_NFALSEP(e) {
+ if (TRUEP(e)) {
res = uim_scm_cons(e, res);
}
}
Modified: trunk/uim/skk.c
==============================================================================
--- trunk/uim/skk.c (original)
+++ trunk/uim/skk.c Mon Aug 27 21:48:54 2007
@@ -901,7 +901,7 @@
hs = REFER_C_STR(head_);
- if UIM_SCM_NFALSEP(numeric_conv_)
+ if (TRUEP(numeric_conv_))
rs = replace_numeric(hs);
if (okuri_ != uim_scm_null())
@@ -1134,7 +1134,7 @@
if (ca && ca->nr_cands > 0 && !is_purged_only(ca))
return uim_scm_t();
- if UIM_SCM_NFALSEP(numeric_conv_)
+ if (TRUEP(numeric_conv_))
return skk_get_entry(head_, okuri_head_, okuri_, uim_scm_f());
return uim_scm_f();
@@ -1669,7 +1669,7 @@
uim_lisp numlst_ = uim_scm_null();
int ignoring_indices[IGNORING_WORD_MAX + 1];
- if UIM_SCM_NFALSEP(numeric_conv_)
+ if (TRUEP(numeric_conv_))
numlst_ = skk_store_replaced_numeric_str(head_);
n = C_INT(nth_);
@@ -1758,7 +1758,7 @@
uim_lisp numlst_ = uim_scm_null();
int ignoring_indices[IGNORING_WORD_MAX + 1];
- if UIM_SCM_NFALSEP(numeric_conv_)
+ if (TRUEP(numeric_conv_))
numlst_ = skk_store_replaced_numeric_str(head_);
if (!NULLP(numlst_))
@@ -1827,7 +1827,7 @@
}
}
- if UIM_SCM_NFALSEP(use_look_)
+ if (TRUEP(use_look_))
look_get_comp(ca, s);
if (ca->nr_comps == 0) {
@@ -1869,7 +1869,7 @@
hs = REFER_C_STR(head_);
- if UIM_SCM_NFALSEP(numeric_conv_)
+ if (TRUEP(numeric_conv_))
rs = replace_numeric(hs);
if (!rs)
@@ -1891,7 +1891,7 @@
return uim_scm_t();
}
- if (UIM_SCM_NFALSEP(numeric_conv_) && has_numeric_in_head(head_))
+ if (TRUEP(numeric_conv_) && has_numeric_in_head(head_))
return skk_get_completion(head_, uim_scm_f(), use_look_);
return uim_scm_f();
@@ -1906,7 +1906,7 @@
char *str;
uim_lisp numlst_ = uim_scm_null();
- if UIM_SCM_NFALSEP(numeric_conv_)
+ if (TRUEP(numeric_conv_))
numlst_ = skk_store_replaced_numeric_str(head_);
if (!NULLP(numlst_))
@@ -1947,7 +1947,7 @@
if (ca)
n = ca->nr_comps;
- if (UIM_SCM_NFALSEP(numeric_conv_) && has_numeric_in_head(head_))
+ if (TRUEP(numeric_conv_) && has_numeric_in_head(head_))
return MAKE_INT(n +
C_INT(skk_get_nr_completions(head_, uim_scm_f(),
use_look_)));
@@ -1964,7 +1964,7 @@
hs = REFER_C_STR(head_);
- if UIM_SCM_NFALSEP(numeric_conv_)
+ if (TRUEP(numeric_conv_))
rs = replace_numeric(hs);
if (!rs)
@@ -2004,7 +2004,7 @@
}
}
- if (UIM_SCM_NFALSEP(numeric_conv_) && has_numeric_in_head(head_))
+ if (TRUEP(numeric_conv_) && has_numeric_in_head(head_))
skk_clear_completions(head_, uim_scm_f());
return uim_scm_t();
@@ -2055,7 +2055,7 @@
numlst_ = uim_scm_null();
hs = REFER_C_STR(head_);
- if UIM_SCM_NFALSEP(numeric_conv_)
+ if (TRUEP(numeric_conv_))
numlst_ = skk_store_replaced_numeric_str(head_);
if (!NULLP(numlst_)) {
@@ -2073,9 +2073,9 @@
sl->state & SKK_LINE_USE_FOR_COMPLETION)
return MAKE_STR(sl->head);
}
- if UIM_SCM_NFALSEP(use_look_) {
+ if (TRUEP(use_look_)) {
look_ = look_get_top_word(hs);
- if UIM_SCM_NFALSEP(look_)
+ if (TRUEP(look_))
return look_;
}
} else {
@@ -2087,10 +2087,10 @@
return restore_numeric(sl->head, numlst_);
}
}
- if UIM_SCM_NFALSEP(use_look_) {
+ if (TRUEP(use_look_)) {
look_ = look_get_top_word(rs);
free(rs);
- if UIM_SCM_NFALSEP(look_)
+ if (TRUEP(look_))
return look_;
} else {
free(rs);
@@ -2386,7 +2386,7 @@
uim_lisp numlst_ = uim_scm_null();
int ignoring_indices[IGNORING_WORD_MAX + 1];
- if UIM_SCM_NFALSEP(numeric_conv_)
+ if (TRUEP(numeric_conv_))
numlst_ = skk_store_replaced_numeric_str(head_);
nth = C_INT(nth_);
@@ -2533,7 +2533,7 @@
uim_lisp numlst_ = uim_scm_null();
int ignoring_indices[IGNORING_WORD_MAX + 1];
- if UIM_SCM_NFALSEP(numeric_conv_)
+ if (TRUEP(numeric_conv_))
numlst_ = skk_store_replaced_numeric_str(head_);
if (!NULLP(numlst_))
