patch and git (5) (Anthy-dev 2544) - Anthy

続けて、もう一個。

2005-10-15  NIIBE Yutaka  <gniib****@fsij*****>

	* src-diclib/wtype.c (struct PTab): Removed.
	(ptab): Use struct wttable.
	(get_pos_by_name, anthy_init_wtype_by_name): Follow the changes.

diff --git a/src-diclib/wtype.c b/src-diclib/wtype.c
--- a/src-diclib/wtype.c
+++ b/src-diclib/wtype.c
@@ -12,36 +12,30 @@
 
 wtype_t anthy_wt_none, anthy_wt_all;
 
-/* 品詞の日本語の名前を品詞に変換するテーブル */
-static struct PTab {
+struct wttable {
   const char *name;
   int pos;
   int cos;
   int scos;
   int cc;
-  int ct;
+  int ct;/*カ変など*/
   int flags;
-} ptab[]= {
+};
+
+/* 品詞の日本語の名前を品詞に変換するテーブル */
+static struct wttable ptab[]= {
 #include "ptab.h"
 };
 
 /* 辞書中の品詞の名前を品詞に変換するテーブル */
-static struct wttable {
-  const char *name;
-  int pos;
-  int cos;
-  int scos;
-  int cc;
-  int ct;/*カ変など*/
-  int flags;
-} wttab[]= {
+static struct wttable wttab[]= {
 #include "wtab.h"
 };
 
-static struct PTab *
+static struct wttable *
 get_pos_by_name(const char *name)
 {
-  struct PTab *p;
+  struct wttable *p;
   for (p = ptab ; p->name ; p++) {
     if (!strcmp(p->name, name)) {
       return p;
@@ -106,7 +100,7 @@ anthy_type_to_wtype(const char *s, wtype
 int
 anthy_init_wtype_by_name(const char *name, wtype_t *w)
 {
-  struct PTab *p;
+  struct wttable *p;
   p = get_pos_by_name(name);
   *w = anthy_wt_all;
   if (p) {



Anthy

[Anthy-dev 2544] patch and git (5)