[uim-commit] r209 - trunk/uim

[ekato@freedesktop.org]

Author: ekato
Date: 2005-01-09 21:02:00 -0800 (Sun, 09 Jan 2005)
New Revision: 209

Modified:
   trunk/uim/skk-dic.c
Log:
* uim/skk-dic.c : Remove "include siod.h".  Use
  uim_scm_null_list() instead of uim_scm_f() for some place
  appropriately.  Replace reverse() to uim_scm_reverse().



Modified: trunk/uim/skk-dic.c
===================================================================
--- trunk/uim/skk-dic.c	2005-01-10 04:18:26 UTC (rev 208)
+++ trunk/uim/skk-dic.c	2005-01-10 05:02:00 UTC (rev 209)
@@ -48,7 +48,6 @@
 
 #include "uim-scm.h"
 #include "uim-compat-scm.h"
-#include "siod.h"
 #include "context.h"
 
 /*
@@ -675,10 +674,10 @@
   struct skk_cand_array *ca;
 
   hs = uim_scm_refer_c_str(head_);
-  if (okuri_ != uim_scm_f()) {
+  if (okuri_ != uim_scm_null_list()) {
     okuri = uim_scm_refer_c_str(okuri_);
   }
-  if (okuri_head_ == uim_scm_f()) {
+  if (okuri_head_ == uim_scm_null_list()) {
     o = 0;
   } else {
     const char *os= uim_scm_refer_c_str(okuri_head_);
@@ -754,7 +753,7 @@
   }
   free(numstr);
  
-  return reverse(lst);
+  return uim_scm_reverse(lst);
 }
 
 static char *wide_num_list[] =
@@ -1018,8 +1017,8 @@
   char *convstr;
   uim_lisp merged_str;
 
-  if (str_ == uim_scm_f())
-    return uim_scm_f();
+  if (str_ == uim_scm_null_list())
+    return uim_scm_null_list();
 
   str = uim_scm_c_str(str_);
   len = strlen(str);
@@ -1109,7 +1108,7 @@
   int i;
   for (i = 1; i < nth; i++) {
     if (uim_scm_nullp(lst_)) {
-      return uim_scm_f();
+      return uim_scm_null_list();
     }
     lst_ = uim_scm_cdr(lst_);
   }
@@ -1307,7 +1306,7 @@
     str = ca->comps[n];
     return uim_scm_make_str(str);
   }
-  return uim_scm_f();
+  return uim_scm_null_list();
 }
 
 static uim_lisp
@@ -1467,7 +1466,7 @@
 	    if (k == nth) {
 	      str = ca->cands[i];
 	      /* reorder sub candidate */
-	      skk_commit_candidate(numstr_, uim_scm_f(), uim_scm_f(), uim_scm_make_int(j), uim_scm_null_list());
+	      skk_commit_candidate(numstr_, uim_scm_null_list(), uim_scm_null_list(), uim_scm_make_int(j), uim_scm_null_list());
 	      break;
 	    }
 	    k++;
@@ -1492,7 +1491,7 @@
   }
   reorder_candidate(ca, str);
 
-  if (okuri_ != uim_scm_f()) {
+  if (okuri_ != uim_scm_null_list()) {
     struct skk_line *sl;
     char *okuri;
     int found = 0;
@@ -1569,7 +1568,7 @@
 
   tmp = uim_scm_c_str(okuri_);
   if (strlen(tmp)) {
-    ca = find_cand_array_lisp(head_, okuri_head_, uim_scm_f(), 1);
+    ca = find_cand_array_lisp(head_, okuri_head_, uim_scm_null_list(), 1);
     if (ca) {
       learn_word_to_cand_array(ca, word);
     }