seikananthy

Fork

Apply fixes for udict from Masanari Iida.

metaword.c cleanup.

Merge branch 'janitor/mmap-readonly'

kill filemap.c, just mmap inside file_dic.c.
2010-08-03 NIIBE Yutaka <gniibe@fsij.org>

* anthy/Makefile.am (noinst_HEADERS): Removed filemap.h.
* anthy/filemap.h: Removed.

* src-diclib/Makefile.am (libdiclib_la_SOURCES): Removed
filemap.c.
* src-diclib/filemap.c: Removed.
* src-diclib/file_dic.c (struct file_dic): Directly have PTR
ans SIZE.
(anthy_mmap): Moved here (was: filemap.c).
(anthy_quit_file_dic): Call munmap directly.

* src-splitter/depgraph.c: Delete #include <anthy/filemap.h>.

kill filemap.c, just mmap inside file_dic.c.
2010-08-03 NIIBE Yutaka <gniibe@fsij.org>

* anthy/Makefile.am (noinst_HEADERS): Removed filemap.h.
* anthy/filemap.h: Removed.

* src-diclib/Makefile.am (libdiclib_la_SOURCES): Removed
filemap.c.
* src-diclib/filemap.c: Removed.
* src-diclib/file_dic.c (struct file_dic): Directly have PTR
ans SIZE.
(anthy_mmap): Moved here (was: filemap.c).
(anthy_quit_file_dic): Call munmap directly.

* src-splitter/depgraph.c: Delete #include <anthy/filemap.h>.

more fix

more fix

more kill.
* src-worddic/dic_main.h (anthy_priv_dic_update): Removed.
* src-worddic/priv_dic.c: Likewise.
* src-worddic/word_dic.c (anthy_lock_dic): Don't call
anthy_priv_dic_update.

kill texttrie.
2010-08-02 NIIBE Yutaka <gniibe@fsij.org>

* anthy/texttrie.h: Removed.
* anthy/Makefile.am (noinst_HEADERS): Remove texttrie.h.

*
* src-worddic/Makefile.am (libanthydic_la_SOURCES): Remove
texttrie.c.

* src-worddic/dic_util.c (anthy_private_tt_dic, find_next_key)
(delete_prefix, encoding_prefix, find_same_word): Removed.
(struct iterate_contex): Removed in_tt and key_buf.

(anthy_dic_util_init, select_first_entry_in_textdic): Don't
access to in_tt field.
(anthy_priv_dic_delete): Don't call delete_prefix.
(anthy_priv_dic_select_first_entry): Just call
select_first_entry_in_textdic.
(anthy_priv_dic_select_next_entry): Don't call find_next_key.
(anthy_priv_dic_get_index): Don't access in_tt and key_buf.
(anthy_priv_dic_get_freq): Just call anthy_parse_word_line.
(anthy_priv_dic_get_wtype, anthy_priv_dic_get_word): Don't
call anthy_trie_find.
(add_word_to_textdic): Don't call anthy_trie_delete.

* src-worddic/priv_dic.c (anthy_private_tt_dic, open_tt_dic)
(copy_words_from_tt): Removed.
(anthy_priv_dic_update): Don't call anthy_trie_update_mapping.
(anthy_copy_words_from_private_dic): Don't call copy_words_from_tt.
(anthy_init_private_dic): Dont' call open_tt_dic and anthy_trie_close.
(anthy_release_private_dic): Don't call anthy_trie_close.

* src-worddic/texttrie.c: Removed.

* src-worddic/word_dic.c: Comment fix.

bug fix for record.c

bug fix for agent.c

cleanup depgraph transition

cleanup of word_dic.c and ext_ent.c

**DICTIONARY FORMAT CHANGE** Rules in anthy.dep now point to wtype name, instead of binary value.

wtype related cleanup.

Merge branch 'depgraph-wt'

Remove special handling of WF_MEISI. It is handled by depgraph now.

2010-07-06 NIIBE Yutaka <gniibe@fsij.org>

* anthy/wtype.h (CT_MEISIKA): Removed.
(anthy_wtype_get_meisi): Removed.

* src-worddic/word_lookup.c (add_dic_ent): No need to add
entries with CT_MEISIKA.

* src-worddic/wtype.c (pos_name_tab)
(anthy_init_wtype_by_name,anthy_wtype_get_meisi): Removed.

Merge branch 'depgraph-wt'

Remove conf variable DEPWORD/INDEPWORD

2010-07-06 NIIBE Yutaka <gniibe@fsij.org>

* anthy-conf.in (INDEPWORD, DEPWORD): Removed.
* anthy-test-conf.in: Likwise.
* test/prediction.c: Likewise.
* doc/GUIDE: Remove explanation of them.

Merge branch 'segclass-eucjp-literal-removal'

Bug fix of seg_class_tab.

2010-07-06 NIIBE Yutaka <gniibe@fsij.org>

* src-splitter/segclass.c (seg_class_tab): Added missing colons.

Merge branch 'feature/depgraph-wt'

Conflicts: both change applied: swap args and change the var
src-worddic/ext_ent.c

Merge branch 'janitor/mkdepgraph-cleanup'

Merge branch 'janitor/no-ptab-use'

wt based depgraph implementation. (No ptab.)

2010-07-05 NIIBE Yutaka <gniibe@fsij.org>

* anthy/dic.h (anthy_get_seq_ent_wtype_freq0): New.

* depgraph/indepword-wt.txt: New file.

* depgraph/Makefile.am: Use indepword-wt.txt.

* depgraph/mkdepgraph.c (INDEPWORD_INPUT_FILENAME): Use
indepword-wt.txt.
(parse_indep): Support #XX type description.
(init_indep_word_seq_tab): # is not comment any more.

* src-splitter/compose.c (enum_candidates): Use anthy_wtype_equal.

* src-splitter/wordlist.c (make_word_list): Use
anthy_get_seq_ent_wtype_freq0.

* src-worddic/ext_ent.c (anthy_get_ext_seq_ent_wtype): Bug fix.
Swap arg1 and arg2.

* src-worddic/word_dic.c (anthy_get_seq_ent_wtype_freq0): New.
(anthy_get_seq_ent_wtype_compound_freq): Use anthy_wtype_equal.

Don't use anthy/ruleparser, anthy/logger and anthy/conf for mkdepgraph.

2010-07-06 NIIBE Yutaka <gniibe@fsij.org>

* depgraph/Makefile.am (DEPWORDS): Change order (as same as
read order in master.depword).
(CLEANFILES): Added all.depword.
(all.depword): Added a rule to generate.

* depgraph/master.depword: Comment out all include.

* depgraph/mkdepgraph.c (parse_dep): Call fprintf instead of
anthy_log.
(check_nodes): Likewise.
(get_tokens): New.
(init_depword_tab): Simply use fopen/fgets/fclose.
(init_indep_word_seq_tab): Likewise.
(parse_indep): Error check when realloc fails.
(main): Don't use anthy/conf.

Merge branch 'janitor/segclass-eucjp-literal-removal'

Merge branch 'janitor/remove-ptab-fukushigkan'

Merge branch 'textdict-no-mmap'

Bug fix of textdic.c.

2010-07-06 NIIBE Yutaka <gniibe@fsij.org>

* src-worddic/textdic.c (anthy_textdic_scan): Added missing break.