Author: yamakenz
Date: Mon Aug 27 19:55:27 2007
New Revision: 4911
Modified:
trunk/uim/anthy-utf8.c
trunk/uim/anthy.c
trunk/uim/canna.c
trunk/uim/editline.c
trunk/uim/intl.c
trunk/uim/look.c
trunk/uim/m17nlib.c
trunk/uim/mana.c
trunk/uim/plugin.c
trunk/uim/prime.c
trunk/uim/rk.c
trunk/uim/skk.c
trunk/uim/uim-custom.c
trunk/uim/uim-func.c
trunk/uim/uim-module-manager.c
trunk/uim/uim-util.c
Log:
* uim/uim-func.c
* uim/uim-util.c
* uim/uim-custom.c
* uim/uim-module-manager.c
* uim/plugin.c
* uim/intl.c
* uim/editline.c
* uim/rk.c
* uim/look.c
* uim/anthy.c
* uim/anthy-utf8.c
* uim/canna.c
* uim/mana.c
* uim/skk.c
* uim/m17nlib.c
* uim/prime.c
- Replace all deprecated uim_scm_init_subr_?() with uim_scm_init_proc?() by
perl -i -pe 's/\buim_scm_init_subr_/uim_scm_init_proc/g' uim/*.c
Modified: trunk/uim/anthy-utf8.c
==============================================================================
--- trunk/uim/anthy-utf8.c (original)
+++ trunk/uim/anthy-utf8.c Mon Aug 27 19:55:27 2007
@@ -402,25 +402,25 @@
uim_scm_eval_c_string("(require-extension (srfi 1))"); /* for delete! */
- uim_scm_init_subr_0("anthy-utf8-lib-init", init_anthy_lib);
- uim_scm_init_subr_1("anthy-utf8-lib-alloc-context", create_context);
- uim_scm_init_subr_1("anthy-utf8-lib-free-context", release_context);
- uim_scm_init_subr_2("anthy-utf8-lib-set-string", set_string);
- uim_scm_init_subr_1("anthy-utf8-lib-get-nr-segments",get_nr_segments);
- uim_scm_init_subr_2("anthy-utf8-lib-get-nr-candidates", get_nr_candidates);
- uim_scm_init_subr_3("anthy-utf8-lib-get-nth-candidate", get_nth_candidate);
- uim_scm_init_subr_2("anthy-utf8-lib-get-unconv-candidate",
get_unconv_candidate);
- uim_scm_init_subr_2("anthy-utf8-lib-get-segment-length", get_segment_length);
- uim_scm_init_subr_3("anthy-utf8-lib-resize-segment", resize_segment);
- uim_scm_init_subr_3("anthy-utf8-lib-commit-segment", commit_segment);
- uim_scm_init_subr_0("anthy-utf8-lib-get-anthy-version", anthy_version);
- uim_scm_init_subr_2("anthy-utf8-lib-set-prediction-src-string",
set_prediction_src_string);
- uim_scm_init_subr_1("anthy-utf8-lib-get-nr-predictions", get_nr_predictions);
- uim_scm_init_subr_2("anthy-utf8-lib-get-nth-prediction", get_nth_prediction);
- uim_scm_init_subr_2("anthy-utf8-lib-commit-nth-prediction",
- commit_nth_prediction);
- uim_scm_init_subr_1("anthy-utf8-lib-eucjp-to-utf8", eucjp_to_utf8);
- uim_scm_init_subr_1("anthy-utf8-lib-utf8-to-eucjp", utf8_to_eucjp);
+ uim_scm_init_proc0("anthy-utf8-lib-init", init_anthy_lib);
+ uim_scm_init_proc1("anthy-utf8-lib-alloc-context", create_context);
+ uim_scm_init_proc1("anthy-utf8-lib-free-context", release_context);
+ uim_scm_init_proc2("anthy-utf8-lib-set-string", set_string);
+ uim_scm_init_proc1("anthy-utf8-lib-get-nr-segments",get_nr_segments);
+ uim_scm_init_proc2("anthy-utf8-lib-get-nr-candidates", get_nr_candidates);
+ uim_scm_init_proc3("anthy-utf8-lib-get-nth-candidate", get_nth_candidate);
+ uim_scm_init_proc2("anthy-utf8-lib-get-unconv-candidate",
get_unconv_candidate);
+ uim_scm_init_proc2("anthy-utf8-lib-get-segment-length", get_segment_length);
+ uim_scm_init_proc3("anthy-utf8-lib-resize-segment", resize_segment);
+ uim_scm_init_proc3("anthy-utf8-lib-commit-segment", commit_segment);
+ uim_scm_init_proc0("anthy-utf8-lib-get-anthy-version", anthy_version);
+ uim_scm_init_proc2("anthy-utf8-lib-set-prediction-src-string",
set_prediction_src_string);
+ uim_scm_init_proc1("anthy-utf8-lib-get-nr-predictions", get_nr_predictions);
+ uim_scm_init_proc2("anthy-utf8-lib-get-nth-prediction", get_nth_prediction);
+ uim_scm_init_proc2("anthy-utf8-lib-commit-nth-prediction",
+ commit_nth_prediction);
+ uim_scm_init_proc1("anthy-utf8-lib-eucjp-to-utf8", eucjp_to_utf8);
+ uim_scm_init_proc1("anthy-utf8-lib-utf8-to-eucjp", utf8_to_eucjp);
}
#ifndef ENABLE_ANTHY_UTF8_STATIC
Modified: trunk/uim/anthy.c
==============================================================================
--- trunk/uim/anthy.c (original)
+++ trunk/uim/anthy.c Mon Aug 27 19:55:27 2007
@@ -350,23 +350,23 @@
uim_scm_eval_c_string("(require-extension (srfi 1))"); /* for delete! */
- uim_scm_init_subr_0("anthy-lib-init", init_anthy_lib);
- uim_scm_init_subr_0("anthy-lib-alloc-context", create_context);
- uim_scm_init_subr_1("anthy-lib-free-context", release_context);
- uim_scm_init_subr_2("anthy-lib-set-string", set_string);
- uim_scm_init_subr_1("anthy-lib-get-nr-segments",get_nr_segments);
- uim_scm_init_subr_2("anthy-lib-get-nr-candidates", get_nr_candidates);
- uim_scm_init_subr_3("anthy-lib-get-nth-candidate", get_nth_candidate);
- uim_scm_init_subr_2("anthy-lib-get-unconv-candidate", get_unconv_candidate);
- uim_scm_init_subr_2("anthy-lib-get-segment-length", get_segment_length);
- uim_scm_init_subr_3("anthy-lib-resize-segment", resize_segment);
- uim_scm_init_subr_3("anthy-lib-commit-segment", commit_segment);
- uim_scm_init_subr_0("anthy-lib-get-anthy-version", anthy_version);
- uim_scm_init_subr_2("anthy-lib-set-prediction-src-string",
set_prediction_src_string);
- uim_scm_init_subr_1("anthy-lib-get-nr-predictions", get_nr_predictions);
- uim_scm_init_subr_2("anthy-lib-get-nth-prediction", get_nth_prediction);
- uim_scm_init_subr_2("anthy-lib-commit-nth-prediction",
- commit_nth_prediction);
+ uim_scm_init_proc0("anthy-lib-init", init_anthy_lib);
+ uim_scm_init_proc0("anthy-lib-alloc-context", create_context);
+ uim_scm_init_proc1("anthy-lib-free-context", release_context);
+ uim_scm_init_proc2("anthy-lib-set-string", set_string);
+ uim_scm_init_proc1("anthy-lib-get-nr-segments",get_nr_segments);
+ uim_scm_init_proc2("anthy-lib-get-nr-candidates", get_nr_candidates);
+ uim_scm_init_proc3("anthy-lib-get-nth-candidate", get_nth_candidate);
+ uim_scm_init_proc2("anthy-lib-get-unconv-candidate", get_unconv_candidate);
+ uim_scm_init_proc2("anthy-lib-get-segment-length", get_segment_length);
+ uim_scm_init_proc3("anthy-lib-resize-segment", resize_segment);
+ uim_scm_init_proc3("anthy-lib-commit-segment", commit_segment);
+ uim_scm_init_proc0("anthy-lib-get-anthy-version", anthy_version);
+ uim_scm_init_proc2("anthy-lib-set-prediction-src-string",
set_prediction_src_string);
+ uim_scm_init_proc1("anthy-lib-get-nr-predictions", get_nr_predictions);
+ uim_scm_init_proc2("anthy-lib-get-nth-prediction", get_nth_prediction);
+ uim_scm_init_proc2("anthy-lib-commit-nth-prediction",
+ commit_nth_prediction);
}
#ifndef ENABLE_ANTHY_STATIC
Modified: trunk/uim/canna.c
==============================================================================
--- trunk/uim/canna.c (original)
+++ trunk/uim/canna.c Mon Aug 27 19:55:27 2007
@@ -403,17 +403,17 @@
uim_scm_eval_c_string("(require-extension (srfi 1))"); /* for delete! */
- uim_scm_init_subr_1("canna-lib-init", init_canna_lib);
- uim_scm_init_subr_0("canna-lib-alloc-context", create_context);
- uim_scm_init_subr_1("canna-lib-release-context", release_context);
- uim_scm_init_subr_3("canna-lib-get-nth-candidate", get_nth_candidate);
- uim_scm_init_subr_2("canna-lib-get-unconv-candidate", get_unconv_candidate);
- uim_scm_init_subr_1("canna-lib-get-nr-segments",get_nr_segments);
- uim_scm_init_subr_2("canna-lib-get-nr-candidates", get_nr_candidates);
- uim_scm_init_subr_3("canna-lib-resize-segment", resize_segment);
- uim_scm_init_subr_2("canna-lib-begin-conversion", begin_conversion);
- uim_scm_init_subr_3("canna-lib-commit-segment", commit_segment);
- uim_scm_init_subr_1("canna-lib-reset-conversion", reset_conversion);
+ uim_scm_init_proc1("canna-lib-init", init_canna_lib);
+ uim_scm_init_proc0("canna-lib-alloc-context", create_context);
+ uim_scm_init_proc1("canna-lib-release-context", release_context);
+ uim_scm_init_proc3("canna-lib-get-nth-candidate", get_nth_candidate);
+ uim_scm_init_proc2("canna-lib-get-unconv-candidate", get_unconv_candidate);
+ uim_scm_init_proc1("canna-lib-get-nr-segments",get_nr_segments);
+ uim_scm_init_proc2("canna-lib-get-nr-candidates", get_nr_candidates);
+ uim_scm_init_proc3("canna-lib-resize-segment", resize_segment);
+ uim_scm_init_proc2("canna-lib-begin-conversion", begin_conversion);
+ uim_scm_init_proc3("canna-lib-commit-segment", commit_segment);
+ uim_scm_init_proc1("canna-lib-reset-conversion", reset_conversion);
}
void
Modified: trunk/uim/editline.c
==============================================================================
--- trunk/uim/editline.c (original)
+++ trunk/uim/editline.c Mon Aug 27 19:55:27 2007
@@ -57,7 +57,7 @@
el_set(el, EL_HIST, history, hist);
el_source(el, NULL);
- uim_scm_init_subr_0("editline-readline", editline_readline);
+ uim_scm_init_proc0("editline-readline", editline_readline);
uim_scm_callf("provide", "s", "editline");
}
Modified: trunk/uim/intl.c
==============================================================================
--- trunk/uim/intl.c (original)
+++ trunk/uim/intl.c Mon Aug 27 19:55:27 2007
@@ -196,16 +196,16 @@
{
intl_init_locale();
- uim_scm_init_subr_0("gettext-package", intl_gettext_package);
- uim_scm_init_subr_1("textdomain", intl_textdomain);
- uim_scm_init_subr_2("bindtextdomain", intl_bindtextdomain);
- uim_scm_init_subr_2("bind-textdomain-codeset", intl_bind_textdomain_codeset);
- uim_scm_init_subr_1("gettext", intl_gettext);
- uim_scm_init_subr_2("dgettext", intl_dgettext);
- uim_scm_init_subr_3("dcgettext", intl_dcgettext);
- uim_scm_init_subr_3("ngettext", intl_ngettext);
- uim_scm_init_subr_4("dngettext", intl_dngettext);
- uim_scm_init_subr_5("dcngettext", intl_dcngettext);
+ uim_scm_init_proc0("gettext-package", intl_gettext_package);
+ uim_scm_init_proc1("textdomain", intl_textdomain);
+ uim_scm_init_proc2("bindtextdomain", intl_bindtextdomain);
+ uim_scm_init_proc2("bind-textdomain-codeset", intl_bind_textdomain_codeset);
+ uim_scm_init_proc1("gettext", intl_gettext);
+ uim_scm_init_proc2("dgettext", intl_dgettext);
+ uim_scm_init_proc3("dcgettext", intl_dcgettext);
+ uim_scm_init_proc3("ngettext", intl_ngettext);
+ uim_scm_init_proc4("dngettext", intl_dngettext);
+ uim_scm_init_proc5("dcngettext", intl_dcngettext);
#if ENABLE_NLS
uim_scm_callf("provide", "s", "nls");
Modified: trunk/uim/look.c
==============================================================================
--- trunk/uim/look.c (original)
+++ trunk/uim/look.c Mon Aug 27 19:55:27 2007
@@ -82,7 +82,7 @@
void
uim_plugin_instance_init(void)
{
- uim_scm_init_subr_2("look-lib-look", uim_look_look);
+ uim_scm_init_proc2("look-lib-look", uim_look_look);
}
void
Modified: trunk/uim/m17nlib.c
==============================================================================
--- trunk/uim/m17nlib.c (original)
+++ trunk/uim/m17nlib.c Mon Aug 27 19:55:27 2007
@@ -848,36 +848,36 @@
void
uim_plugin_instance_init(void)
{
- uim_scm_init_subr_0("m17nlib-lib-init", init_m17nlib);
- uim_scm_init_subr_0("m17nlib-lib-nr-input-methods",
- get_nr_input_methods);
- uim_scm_init_subr_1("m17nlib-lib-nth-input-method-lang",
- get_input_method_lang);
- uim_scm_init_subr_1("m17nlib-lib-nth-input-method-name",
- get_input_method_name);
- uim_scm_init_subr_1("m17nlib-lib-nth-input-method-short-desc",
- get_input_method_short_desc);
- uim_scm_init_subr_1("m17nlib-lib-alloc-context", alloc_id);
- uim_scm_init_subr_1("m17nlib-lib-free-context", free_id);
- uim_scm_init_subr_2("m17nlib-lib-push-symbol-key", push_symbol_key);
- uim_scm_init_subr_1("m17nlib-lib-compose-mode?", compose_modep);
- uim_scm_init_subr_1("m17nlib-lib-preedit-changed?", preedit_changedp);
- uim_scm_init_subr_1("m17nlib-lib-get-left-of-cursor", get_left_of_cursor);
- uim_scm_init_subr_1("m17nlib-lib-get-right-of-cursor", get_right_of_cursor);
- uim_scm_init_subr_1("m17nlib-lib-get-left-of-candidate",
- get_left_of_candidate);
- uim_scm_init_subr_1("m17nlib-lib-get-selected-candidate",
- get_selected_candidate);
- uim_scm_init_subr_1("m17nlib-lib-get-right-of-candidate",
- get_right_of_candidate);
- uim_scm_init_subr_1("m17nlib-lib-get-result", get_result);
- uim_scm_init_subr_1("m17nlib-lib-commit", commit);
- uim_scm_init_subr_1("m17nlib-lib-candidate-show?", candidate_showp);
- uim_scm_init_subr_1("m17nlib-lib-fill-new-candidates!", fill_new_candidates);
- uim_scm_init_subr_1("m17nlib-lib-candidates-changed?", candidates_changedp);
- uim_scm_init_subr_1("m17nlib-lib-get-nr-candidates", get_nr_candidates);
- uim_scm_init_subr_2("m17nlib-lib-get-nth-candidate", get_nth_candidate);
- uim_scm_init_subr_1("m17nlib-lib-get-candidate-index", get_candidate_index);
+ uim_scm_init_proc0("m17nlib-lib-init", init_m17nlib);
+ uim_scm_init_proc0("m17nlib-lib-nr-input-methods",
+ get_nr_input_methods);
+ uim_scm_init_proc1("m17nlib-lib-nth-input-method-lang",
+ get_input_method_lang);
+ uim_scm_init_proc1("m17nlib-lib-nth-input-method-name",
+ get_input_method_name);
+ uim_scm_init_proc1("m17nlib-lib-nth-input-method-short-desc",
+ get_input_method_short_desc);
+ uim_scm_init_proc1("m17nlib-lib-alloc-context", alloc_id);
+ uim_scm_init_proc1("m17nlib-lib-free-context", free_id);
+ uim_scm_init_proc2("m17nlib-lib-push-symbol-key", push_symbol_key);
+ uim_scm_init_proc1("m17nlib-lib-compose-mode?", compose_modep);
+ uim_scm_init_proc1("m17nlib-lib-preedit-changed?", preedit_changedp);
+ uim_scm_init_proc1("m17nlib-lib-get-left-of-cursor", get_left_of_cursor);
+ uim_scm_init_proc1("m17nlib-lib-get-right-of-cursor", get_right_of_cursor);
+ uim_scm_init_proc1("m17nlib-lib-get-left-of-candidate",
+ get_left_of_candidate);
+ uim_scm_init_proc1("m17nlib-lib-get-selected-candidate",
+ get_selected_candidate);
+ uim_scm_init_proc1("m17nlib-lib-get-right-of-candidate",
+ get_right_of_candidate);
+ uim_scm_init_proc1("m17nlib-lib-get-result", get_result);
+ uim_scm_init_proc1("m17nlib-lib-commit", commit);
+ uim_scm_init_proc1("m17nlib-lib-candidate-show?", candidate_showp);
+ uim_scm_init_proc1("m17nlib-lib-fill-new-candidates!", fill_new_candidates);
+ uim_scm_init_proc1("m17nlib-lib-candidates-changed?", candidates_changedp);
+ uim_scm_init_proc1("m17nlib-lib-get-nr-candidates", get_nr_candidates);
+ uim_scm_init_proc2("m17nlib-lib-get-nth-candidate", get_nth_candidate);
+ uim_scm_init_proc1("m17nlib-lib-get-candidate-index", get_candidate_index);
}
void
Modified: trunk/uim/mana.c
==============================================================================
--- trunk/uim/mana.c (original)
+++ trunk/uim/mana.c Mon Aug 27 19:55:27 2007
@@ -241,9 +241,9 @@
void
uim_plugin_instance_init(void)
{
- uim_scm_init_subr_0("mana-lib-init", mana_init);
- uim_scm_init_subr_1("mana-lib-eval", mana_eval);
- uim_scm_init_subr_1("mana-lib-eucjp-string-length", eucjp_string_length);
+ uim_scm_init_proc0("mana-lib-init", mana_init);
+ uim_scm_init_proc1("mana-lib-eval", mana_eval);
+ uim_scm_init_proc1("mana-lib-eucjp-string-length", eucjp_string_length);
}
void
Modified: trunk/uim/plugin.c
==============================================================================
--- trunk/uim/plugin.c (original)
+++ trunk/uim/plugin.c Mon Aug 27 19:55:27 2007
@@ -247,8 +247,8 @@
if (UIM_CATCH_ERROR_BEGIN())
return;
- uim_scm_init_subr_1("load-plugin", plugin_load);
- uim_scm_init_subr_1("unload-plugin", plugin_unload);
+ uim_scm_init_proc1("load-plugin", plugin_load);
+ uim_scm_init_proc1("unload-plugin", plugin_unload);
UIM_CATCH_ERROR_END();
}
Modified: trunk/uim/prime.c
==============================================================================
--- trunk/uim/prime.c (original)
+++ trunk/uim/prime.c Mon Aug 27 19:55:27 2007
@@ -298,8 +298,8 @@
void
uim_plugin_instance_init(void)
{
- uim_scm_init_subr_1("prime-lib-init", prime_lib_init);
- uim_scm_init_subr_1("prime-lib-send-command", prime_send_command);
+ uim_scm_init_proc1("prime-lib-init", prime_lib_init);
+ uim_scm_init_proc1("prime-lib-send-command", prime_send_command);
}
void
Modified: trunk/uim/rk.c
==============================================================================
--- trunk/uim/rk.c (original)
+++ trunk/uim/rk.c Mon Aug 27 19:55:27 2007
@@ -144,9 +144,9 @@
void
uim_init_rk_subrs(void)
{
- uim_scm_init_subr_2("str-seq-equal?", str_seq_equal);
- uim_scm_init_subr_2("str-seq-partial?", str_seq_partial);
- uim_scm_init_subr_2("rk-lib-find-seq", rk_find_seq);
- uim_scm_init_subr_2("rk-lib-find-partial-seq", rk_find_partial_seq);
- uim_scm_init_subr_2("rk-lib-expect-seq", rk_expect_seq);
+ uim_scm_init_proc2("str-seq-equal?", str_seq_equal);
+ uim_scm_init_proc2("str-seq-partial?", str_seq_partial);
+ uim_scm_init_proc2("rk-lib-find-seq", rk_find_seq);
+ uim_scm_init_proc2("rk-lib-find-partial-seq", rk_find_partial_seq);
+ uim_scm_init_proc2("rk-lib-expect-seq", rk_expect_seq);
}
Modified: trunk/uim/skk.c
==============================================================================
--- trunk/uim/skk.c (original)
+++ trunk/uim/skk.c Mon Aug 27 19:55:27 2007
@@ -3499,28 +3499,28 @@
void
uim_plugin_instance_init(void)
{
- uim_scm_init_subr_5("skk-lib-dic-open", skk_dic_open);
- uim_scm_init_subr_1("skk-lib-read-personal-dictionary",
skk_read_personal_dictionary);
- uim_scm_init_subr_1("skk-lib-save-personal-dictionary",
skk_save_personal_dictionary);
- uim_scm_init_subr_4("skk-lib-get-entry", skk_get_entry);
- uim_scm_init_subr_1("skk-lib-store-replaced-numstr",
skk_store_replaced_numeric_str);
- uim_scm_init_subr_2("skk-lib-merge-replaced-numstr",
skk_merge_replaced_numeric_str);
- uim_scm_init_subr_1("skk-lib-replace-numeric", skk_replace_numeric);
- uim_scm_init_subr_5("skk-lib-get-nth-candidate", skk_get_nth_candidate);
- uim_scm_init_subr_4("skk-lib-get-nr-candidates", skk_get_nr_candidates);
- uim_scm_init_subr_5("skk-lib-commit-candidate", skk_commit_candidate);
- uim_scm_init_subr_5("skk-lib-purge-candidate", skk_purge_candidate);
- uim_scm_init_subr_5("skk-lib-learn-word", skk_learn_word);
- uim_scm_init_subr_1("skk-lib-get-annotation", skk_get_annotation);
- uim_scm_init_subr_1("skk-lib-remove-annotation", skk_remove_annotation);
- uim_scm_init_subr_3("skk-lib-get-completion", skk_get_completion);
- uim_scm_init_subr_4("skk-lib-get-nth-completion", skk_get_nth_completion);
- uim_scm_init_subr_3("skk-lib-get-nr-completions", skk_get_nr_completions);
- uim_scm_init_subr_2("skk-lib-clear-completions", skk_clear_completions);
- uim_scm_init_subr_3("skk-lib-get-dcomp-word", skk_get_dcomp_word);
- uim_scm_init_subr_1("skk-lib-eval-candidate", skk_eval_candidate);
- uim_scm_init_subr_3("skk-lib-substring", skk_substring);
- uim_scm_init_subr_1("skk-lib-look-open", skk_look_open);
+ uim_scm_init_proc5("skk-lib-dic-open", skk_dic_open);
+ uim_scm_init_proc1("skk-lib-read-personal-dictionary",
skk_read_personal_dictionary);
+ uim_scm_init_proc1("skk-lib-save-personal-dictionary",
skk_save_personal_dictionary);
+ uim_scm_init_proc4("skk-lib-get-entry", skk_get_entry);
+ uim_scm_init_proc1("skk-lib-store-replaced-numstr",
skk_store_replaced_numeric_str);
+ uim_scm_init_proc2("skk-lib-merge-replaced-numstr",
skk_merge_replaced_numeric_str);
+ uim_scm_init_proc1("skk-lib-replace-numeric", skk_replace_numeric);
+ uim_scm_init_proc5("skk-lib-get-nth-candidate", skk_get_nth_candidate);
+ uim_scm_init_proc4("skk-lib-get-nr-candidates", skk_get_nr_candidates);
+ uim_scm_init_proc5("skk-lib-commit-candidate", skk_commit_candidate);
+ uim_scm_init_proc5("skk-lib-purge-candidate", skk_purge_candidate);
+ uim_scm_init_proc5("skk-lib-learn-word", skk_learn_word);
+ uim_scm_init_proc1("skk-lib-get-annotation", skk_get_annotation);
+ uim_scm_init_proc1("skk-lib-remove-annotation", skk_remove_annotation);
+ uim_scm_init_proc3("skk-lib-get-completion", skk_get_completion);
+ uim_scm_init_proc4("skk-lib-get-nth-completion", skk_get_nth_completion);
+ uim_scm_init_proc3("skk-lib-get-nr-completions", skk_get_nr_completions);
+ uim_scm_init_proc2("skk-lib-clear-completions", skk_clear_completions);
+ uim_scm_init_proc3("skk-lib-get-dcomp-word", skk_get_dcomp_word);
+ uim_scm_init_proc1("skk-lib-eval-candidate", skk_eval_candidate);
+ uim_scm_init_proc3("skk-lib-substring", skk_substring);
+ uim_scm_init_proc1("skk-lib-look-open", skk_look_open);
}
void
Modified: trunk/uim/uim-custom.c
==============================================================================
--- trunk/uim/uim-custom.c (original)
+++ trunk/uim/uim-custom.c Mon Aug 27 19:55:27 2007
@@ -991,9 +991,9 @@
uim_scm_gc_protect(&return_val);
uim_scm_gc_protect(&uim_scm_last_val);
- uim_scm_init_subr_3("custom-update-cb-gate", uim_custom_cb_update_cb_gate);
- uim_scm_init_subr_2("custom-global-update-cb-gate",
- uim_custom_global_cb_update_cb_gate);
+ uim_scm_init_proc3("custom-update-cb-gate", uim_custom_cb_update_cb_gate);
+ uim_scm_init_proc2("custom-global-update-cb-gate",
+ uim_custom_global_cb_update_cb_gate);
uim_scm_require_file("custom.scm");
Modified: trunk/uim/uim-func.c
==============================================================================
--- trunk/uim/uim-func.c (original)
+++ trunk/uim/uim-func.c Mon Aug 27 19:55:27 2007
@@ -434,32 +434,32 @@
void
uim_init_im_subrs(void)
{
- uim_scm_init_subr_1("im-retrieve-context", im_retrieve_context);
- uim_scm_init_subr_2("im-set-encoding", im_set_encoding);
- uim_scm_init_subr_2("im-convertible?", im_convertiblep);
- /**/
- uim_scm_init_subr_2("im-commit", im_commit);
- /**/
- uim_scm_init_subr_1("im-clear-preedit", im_clear_preedit);
- uim_scm_init_subr_3("im-pushback-preedit", im_pushback_preedit);
- uim_scm_init_subr_1("im-update-preedit", im_update_preedit);
- /**/
- uim_scm_init_subr_1("im-clear-mode-list", im_clear_mode_list);
- uim_scm_init_subr_2("im-pushback-mode-list", im_pushback_mode_list);
- uim_scm_init_subr_1("im-update-mode-list", im_update_mode_list);
- uim_scm_init_subr_2("im-update-mode", im_update_mode);
- /**/
- uim_scm_init_subr_2("im-update-prop-list", im_update_prop_list);
- /**/
- uim_scm_init_subr_3("im-activate-candidate-selector",
im_activate_candidate_selector);
- uim_scm_init_subr_2("im-select-candidate", im_select_candidate);
- uim_scm_init_subr_2("im-shift-page-candidate", im_shift_page_candidate);
- uim_scm_init_subr_1("im-deactivate-candidate-selector",
im_deactivate_candidate_selector);
- /**/
- uim_scm_init_subr_5("im-acquire-text-internal", im_acquire_text);
- uim_scm_init_subr_5("im-delete-text-internal", im_delete_text);
- /**/
- uim_scm_init_subr_1("im-raise-configuration-change",
raise_configuration_change);
- uim_scm_init_subr_2("im-switch-app-global-im", switch_app_global_im);
- uim_scm_init_subr_2("im-switch-system-global-im", switch_system_global_im);
+ uim_scm_init_proc1("im-retrieve-context", im_retrieve_context);
+ uim_scm_init_proc2("im-set-encoding", im_set_encoding);
+ uim_scm_init_proc2("im-convertible?", im_convertiblep);
+ /**/
+ uim_scm_init_proc2("im-commit", im_commit);
+ /**/
+ uim_scm_init_proc1("im-clear-preedit", im_clear_preedit);
+ uim_scm_init_proc3("im-pushback-preedit", im_pushback_preedit);
+ uim_scm_init_proc1("im-update-preedit", im_update_preedit);
+ /**/
+ uim_scm_init_proc1("im-clear-mode-list", im_clear_mode_list);
+ uim_scm_init_proc2("im-pushback-mode-list", im_pushback_mode_list);
+ uim_scm_init_proc1("im-update-mode-list", im_update_mode_list);
+ uim_scm_init_proc2("im-update-mode", im_update_mode);
+ /**/
+ uim_scm_init_proc2("im-update-prop-list", im_update_prop_list);
+ /**/
+ uim_scm_init_proc3("im-activate-candidate-selector",
im_activate_candidate_selector);
+ uim_scm_init_proc2("im-select-candidate", im_select_candidate);
+ uim_scm_init_proc2("im-shift-page-candidate", im_shift_page_candidate);
+ uim_scm_init_proc1("im-deactivate-candidate-selector",
im_deactivate_candidate_selector);
+ /**/
+ uim_scm_init_proc5("im-acquire-text-internal", im_acquire_text);
+ uim_scm_init_proc5("im-delete-text-internal", im_delete_text);
+ /**/
+ uim_scm_init_proc1("im-raise-configuration-change",
raise_configuration_change);
+ uim_scm_init_proc2("im-switch-app-global-im", switch_app_global_im);
+ uim_scm_init_proc2("im-switch-system-global-im", switch_system_global_im);
}
Modified: trunk/uim/uim-module-manager.c
==============================================================================
--- trunk/uim/uim-module-manager.c (original)
+++ trunk/uim/uim-module-manager.c Mon Aug 27 19:55:27 2007
@@ -240,8 +240,8 @@
exit(EXIT_FAILURE);
}
- uim_scm_init_subr_1("write-loader.scm", write_loader_scm);
- uim_scm_init_subr_1("write-installed-modules.scm",
write_installed_modules_scm);
+ uim_scm_init_proc1("write-loader.scm", write_loader_scm);
+ uim_scm_init_proc1("write-installed-modules.scm",
write_installed_modules_scm);
if (!uim_scm_require_file("uim-module-manager.scm"))
uim_fatal_error("failed to require uim-module-manager.scm");
Modified: trunk/uim/uim-util.c
==============================================================================
--- trunk/uim/uim-util.c (original)
+++ trunk/uim/uim-util.c Mon Aug 27 19:55:27 2007
@@ -315,31 +315,31 @@
protected = uim_scm_f();
uim_scm_gc_protect(&protected);
- uim_scm_init_subr_0("uim-version", uim_version);
+ uim_scm_init_proc0("uim-version", uim_version);
- uim_scm_init_subr_0("sys-libdir", sys_libdir);
- uim_scm_init_subr_0("sys-pkglibdir", sys_pkglibdir);
- uim_scm_init_subr_0("sys-datadir", sys_datadir);
- uim_scm_init_subr_0("sys-pkgdatadir", sys_pkgdatadir);
-
- uim_scm_init_subr_1("file-readable?", file_readablep);
- uim_scm_init_subr_1("file-writable?", file_writablep);
- uim_scm_init_subr_1("file-executable?", file_executablep);
- uim_scm_init_subr_1("file-regular?", file_regularp);
- uim_scm_init_subr_1("file-directory?", file_directoryp);
- uim_scm_init_subr_1("file-mtime", file_mtime);
-
- uim_scm_init_subr_0("setugid?", setugidp);
-
- uim_scm_init_subr_1("getenv", c_getenv);
- uim_scm_init_subr_3("setenv", c_setenv);
- uim_scm_init_subr_1("unsetenv", c_unsetenv);
+ uim_scm_init_proc0("sys-libdir", sys_libdir);
+ uim_scm_init_proc0("sys-pkglibdir", sys_pkglibdir);
+ uim_scm_init_proc0("sys-datadir", sys_datadir);
+ uim_scm_init_proc0("sys-pkgdatadir", sys_pkgdatadir);
+
+ uim_scm_init_proc1("file-readable?", file_readablep);
+ uim_scm_init_proc1("file-writable?", file_writablep);
+ uim_scm_init_proc1("file-executable?", file_executablep);
+ uim_scm_init_proc1("file-regular?", file_regularp);
+ uim_scm_init_proc1("file-directory?", file_directoryp);
+ uim_scm_init_proc1("file-mtime", file_mtime);
+
+ uim_scm_init_proc0("setugid?", setugidp);
+
+ uim_scm_init_proc1("getenv", c_getenv);
+ uim_scm_init_proc3("setenv", c_setenv);
+ uim_scm_init_proc1("unsetenv", c_unsetenv);
/* SRFI-13 */
- uim_scm_init_subr_3("string-contains", string_contains);
- uim_scm_init_subr_2("string-prefix?", string_prefixp);
- uim_scm_init_subr_2("string-prefix-ci?", string_prefix_cip);
+ uim_scm_init_proc3("string-contains", string_contains);
+ uim_scm_init_proc2("string-prefix?", string_prefixp);
+ uim_scm_init_proc2("string-prefix-ci?", string_prefix_cip);
/* SRFI-43 */
- uim_scm_init_subr_1("vector-copy", vector_copy);
+ uim_scm_init_proc1("vector-copy", vector_copy);
}
