-/*
+/* -*- coding: iso-2022-jp -*-
Copyright (C) 1995 Free Software Foundation, Inc.
Copyright (C) 1995 Sun Microsystems, Inc.
#include "sysdep.h"
#include "wnn/commonhd.h"
-#include "mule-charset.h"
+#include "character.h"
#include "wnn/jllib.h"
#include "wnn/cplib.h"
#define WNNSERVER_T 2
#define WNNSERVER_K 3
-int check_wnn_server_type (void);
+int check_wnn_server_type (void);
void w2m (w_char *wp, unsigned char *mp, unsigned char lb);
void m2w (unsigned char *mp, w_char *wp);
void w2y (w_char *w);
DEFUN ("wnn-server-open", Fwnn_open, 2, 2, 0, /*
Connect to jserver of host HNAME, make an environment with
login name LNAME in the server.
-Return nil if error occurs
+Return nil if error occurs.
*/
(hname, lname))
{
case WNNSERVER_C:
langname = "zh_CN";
break;
-/*
+/*
case WNNSERVER_T:
strcpy (langname, "zh_TW");
break;
DEFUN ("wnn-server-close", Fwnn_close, 0, 0, 0, /*
-Close the connection to jserver, Dictionary and friquency files
+Close the connection to jserver, Dictionary and frequency files
are not saved.
*/
())
if (!wnnfns_buf[snum]) return Qnil;
if (wnnfns_env_norm[snum])
{
- if (EQ(Vwnnenv_sticky, Qnil)) jl_env_un_sticky_e (wnnfns_env_norm[snum]);
+ if (NILP (Vwnnenv_sticky)) jl_env_un_sticky_e (wnnfns_env_norm[snum]);
else jl_env_sticky_e (wnnfns_env_norm[snum]);
jl_disconnect (wnnfns_env_norm[snum]);
}
if (wnnfns_env_rev[snum])
{
- if (EQ(Vwnnenv_sticky, Qnil)) jl_env_un_sticky_e (wnnfns_env_rev[snum]);
+ if (NILP (Vwnnenv_sticky)) jl_env_un_sticky_e (wnnfns_env_rev[snum]);
else jl_env_sticky_e (wnnfns_env_rev[snum]);
jl_disconnect (wnnfns_env_rev[snum]);
}
CHECK_STRING (args[0]);
CHECK_STRING (args[1]);
CHECK_INT (args[2]);
- if (!EQ(args[5], Qnil)) CHECK_STRING (args[5]);
- if (!EQ(args[6], Qnil)) CHECK_STRING (args[6]);
+ if (! NILP (args[5])) CHECK_STRING (args[5]);
+ if (! NILP (args[6])) CHECK_STRING (args[6]);
if ((snum = check_wnn_server_type ()) == -1) return Qnil;
if (!wnnfns_buf[snum]) return Qnil;
GCPRO1 (*args);
gcpro1.nvars = nargs;
if (jl_dic_add (wnnfns_buf[snum],
- XSTRING (args[0])->_data,
- XSTRING (args[1])->_data,
+ XSTRING_DATA (args[0]),
+ XSTRING_DATA (args[1]),
wnnfns_norm ? WNN_DIC_ADD_NOR : WNN_DIC_ADD_REV,
XINT (args[2]),
- (EQ(args[3], Qnil)) ? WNN_DIC_RDONLY : WNN_DIC_RW,
- (EQ(args[4], Qnil)) ? WNN_DIC_RDONLY : WNN_DIC_RW,
- (EQ(args[5], Qnil)) ? 0 : XSTRING (args[5])->_data,
- (EQ(args[6], Qnil)) ? 0 : XSTRING (args[6])->_data,
+ NILP (args[3]) ? WNN_DIC_RDONLY : WNN_DIC_RW,
+ NILP (args[4]) ? WNN_DIC_RDONLY : WNN_DIC_RW,
+ NILP (args[5]) ? 0 : XSTRING_DATA (args[5]),
+ NILP (args[6]) ? 0 : XSTRING_DATA (args[6]),
yes_or_no,
puts2 ) < 0)
{
int cnt, i;
unsigned char comment[1024];
Lisp_Object val;
- int snum;
+ int snum;
unsigned char lb;
if ((snum = check_wnn_server_type ()) == -1) return Qnil;
DEFUN ("wnn-server-dict-comment", Fwnn_dict_comment, 2, 2, 0, /*
Set comment to dictionary specified by DIC-NUMBER.
-Comment string COMMENT
-*/
+Comment string COMMENT.
+*/
(dicno, comment))
{
w_char wbuf[512];
CHECK_STRING (comment);
if ((snum = check_wnn_server_type ()) == -1) return Qnil;
if (!wnnfns_buf[snum]) return Qnil;
- m2w (XSTRING (comment)->_data, wbuf);
- if (jl_dic_comment_set (wnnfns_buf[snum], XINT (dicno), wbuf) < 0)
+ m2w (XSTRING_DATA (comment), wbuf);
+ if (jl_dic_comment_set (wnnfns_buf[snum], XINT (dicno), wbuf) < 0)
return Qnil;
return Qt;
}
{
int snum;
if ((snum = check_wnn_server_type ()) == -1) return Qnil;
- if (EQ(rev, Qnil))
+ if (NILP (rev))
{
if ((!wnnfns_buf[snum]) || (!wnnfns_env_norm[snum])) return Qnil;
jl_env_set (wnnfns_buf[snum], wnnfns_env_norm[snum]);
CHECK_STRING (hstring);
if ((snum = check_wnn_server_type ()) == -1) return Qnil;
if (!wnnfns_buf[snum]) return Qnil;
- m2w (XSTRING (hstring)->_data, wbuf);
+ m2w (XSTRING_DATA (hstring), wbuf);
if (snum == WNNSERVER_C)
w2y (wbuf);
#ifdef WNN6
- if ((cnt = jl_fi_ren_conv (wnnfns_buf[snum], wbuf, 0, -1, WNN_USE_MAE)) < 0)
+ if ((cnt = jl_fi_ren_conv (wnnfns_buf[snum], wbuf, 0, -1, WNN_USE_MAE)) < 0)
return Qnil;
#else
- if ((cnt = jl_ren_conv (wnnfns_buf[snum], wbuf, 0, -1, WNN_USE_MAE)) < 0)
+ if ((cnt = jl_ren_conv (wnnfns_buf[snum], wbuf, 0, -1, WNN_USE_MAE)) < 0)
return Qnil;
#endif
return make_int (cnt);
CHECK_INT (offset);
if ((snum = check_wnn_server_type ()) == -1) return Qnil;
if (!wnnfns_buf[snum]) return Qnil;
- if (EQ(dai, Qnil))
+ if (NILP (dai))
{
if (jl_set_jikouho (wnnfns_buf[snum], XINT (offset)) < 0) return Qnil;
}
no = XINT (bunNo);
#ifdef WNN6
if ((cnt = jl_fi_nobi_conv (wnnfns_buf[snum], no, XINT(len), -1, WNN_USE_MAE,
- (EQ(dai, Qnil)) ? WNN_SHO : WNN_DAI)) < 0)
+ NILP (dai) ? WNN_SHO : WNN_DAI)) < 0)
return Qnil;
#else
if ((cnt = jl_nobi_conv (wnnfns_buf[snum], no, XINT(len), -1, WNN_USE_MAE,
- (EQ(dai, Qnil)) ? WNN_SHO : WNN_DAI)) < 0)
+ NILP (dai) ? WNN_SHO : WNN_DAI)) < 0)
return Qnil;
#endif
return make_int (cnt);
DEFUN ("wnn-server-henkan-quit", Fwnn_quit_henkan, 0, 0, 0, /*
-do nothing
+do nothing.
*/
())
{
int no;
int snum;
if ((snum = check_wnn_server_type ()) == -1) return Qnil;
- if (EQ(bunNo, Qnil)) no = -1;
+ if (NILP (bunNo)) no = -1;
else
{
CHECK_INT (bunNo);
DEFUN ("wnn-server-word-add", Fwnn_word_toroku, 5, 5, 0, /*
Add a word to dictionary. Arguments are
-DIC-NUMBER, KANJI, YOMI, COMMENT, HINSI-NUMBER
+DIC-NUMBER, KANJI, YOMI, COMMENT, HINSI-NUMBER.
*/
(dicno, kanji, yomi, comment, hinsi))
{
CHECK_INT (hinsi);
if ((snum = check_wnn_server_type ()) == -1) return Qnil;
if (!wnnfns_buf[snum]) return Qnil;
- m2w (XSTRING (yomi)->_data, yomi_buf);
+ m2w (XSTRING_DATA (yomi), yomi_buf);
if (snum == WNNSERVER_C)
w2y (yomi_buf);
- m2w (XSTRING (kanji)->_data, kanji_buf);
- m2w (XSTRING (comment)->_data, comment_buf);
+ m2w (XSTRING_DATA (kanji), kanji_buf);
+ m2w (XSTRING_DATA (comment), comment_buf);
if (jl_word_add (wnnfns_buf[snum], XINT (dicno), yomi_buf, kanji_buf,
- comment_buf, XINT (hinsi), 0) < 0)
+ comment_buf, XINT (hinsi), 0) < 0)
return Qnil;
else return Qt;
}
DEFUN ("wnn-server-word-delete", Fwnn_word_sakujo, 2, 2, 0, /*
-Delete a word from dictionary, specified by DIC-NUMBER, SERIAL-NUMBER
+Delete a word from dictionary, specified by DIC-NUMBER, SERIAL-NUMBER.
*/
(no, serial))
{
DEFUN ("wnn-server-word-use", Fwnn_word_use, 2, 2, 0, /*
-Toggle on/off word, specified by DIC-NUMBER and SERIAL-NUMBER
+Toggle on/off word, specified by DIC-NUMBER and SERIAL-NUMBER.
*/
(no, serial))
{
DEFUN ("wnn-server-word-hindo-set", Fwnn_hindo_set, 3, 3, 0, /*
Set frequency to arbitrary value. Specified by DIC-NUMBER,
-SERIAL-NUMBER, FREQUENCY
+SERIAL-NUMBER, FREQUENCY.
*/
(no, serial, hindo))
{
if ((snum = check_wnn_server_type ()) == -1) return Qnil;
lb = lb_wnn_server_type[snum];
if (!wnnfns_buf[snum]) return Qnil;
- m2w (XSTRING (yomi)->_data, wbuf);
+ m2w (XSTRING_DATA (yomi), wbuf);
if (snum == WNNSERVER_C)
w2y (wbuf);
if ((count = jl_word_search_by_env (wnnfns_buf[snum],
{
int rc;
struct wnn_param param;
- Lisp_Object tail, key, val;
int snum;
if ((snum = check_wnn_server_type ()) == -1) return Qnil;
rc = jl_param_get (wnnfns_buf[snum], ¶m);
if (rc < 0) return Qnil;
- EXTERNAL_PROPERTY_LIST_LOOP (tail, key, val, Vsetvalues_alist)
- {
- int setval;
- CHECK_INT (val);
- setval = XINT (val);
- if (EQ (key, Qwnn_n)) param.n = setval;
- else if (EQ (key, Qwnn_nsho)) param.nsho = setval;
- else if (EQ (key, Qwnn_hindo)) param.p1 = setval;
- else if (EQ (key, Qwnn_len)) param.p2 = setval;
- else if (EQ (key, Qwnn_jiri)) param.p3 = setval;
- else if (EQ (key, Qwnn_flag)) param.p4 = setval;
- else if (EQ (key, Qwnn_jisho)) param.p5 = setval;
- else if (EQ (key, Qwnn_sbn)) param.p6 = setval;
- else if (EQ (key, Qwnn_dbn_len)) param.p7 = setval;
- else if (EQ (key, Qwnn_sbn_cnt)) param.p8 = setval;
- else if (EQ (key, Qwnn_suuji)) param.p9 = setval;
- else if (EQ (key, Qwnn_kana)) param.p10 = setval;
- else if (EQ (key, Qwnn_eisuu)) param.p11 = setval;
- else if (EQ (key, Qwnn_kigou)) param.p12 = setval;
- else if (EQ (key, Qwnn_toji_kakko)) param.p13 = setval;
- else if (EQ (key, Qwnn_fuzokogo)) param.p14 = setval;
- else if (EQ (key, Qwnn_kaikakko)) param.p15 = setval;
- else
- {
- signal_simple_error ("Invalid wnn keyword", key);
- return Qnil;
- }
- }
+ {
+ EXTERNAL_PROPERTY_LIST_LOOP_3 (key, val, Vsetvalues_alist)
+ {
+ int setval;
+ CHECK_INT (val);
+ setval = XINT (val);
+ if (EQ (key, Qwnn_n)) param.n = setval;
+ else if (EQ (key, Qwnn_nsho)) param.nsho = setval;
+ else if (EQ (key, Qwnn_hindo)) param.p1 = setval;
+ else if (EQ (key, Qwnn_len)) param.p2 = setval;
+ else if (EQ (key, Qwnn_jiri)) param.p3 = setval;
+ else if (EQ (key, Qwnn_flag)) param.p4 = setval;
+ else if (EQ (key, Qwnn_jisho)) param.p5 = setval;
+ else if (EQ (key, Qwnn_sbn)) param.p6 = setval;
+ else if (EQ (key, Qwnn_dbn_len)) param.p7 = setval;
+ else if (EQ (key, Qwnn_sbn_cnt)) param.p8 = setval;
+ else if (EQ (key, Qwnn_suuji)) param.p9 = setval;
+ else if (EQ (key, Qwnn_kana)) param.p10 = setval;
+ else if (EQ (key, Qwnn_eisuu)) param.p11 = setval;
+ else if (EQ (key, Qwnn_kigou)) param.p12 = setval;
+ else if (EQ (key, Qwnn_toji_kakko)) param.p13 = setval;
+ else if (EQ (key, Qwnn_fuzokogo)) param.p14 = setval;
+ else if (EQ (key, Qwnn_kaikakko)) param.p15 = setval;
+ else
+ {
+ signal_simple_error ("Invalid wnn keyword", key);
+ return Qnil;
+ }
+ }
+ }
#if 0
printf("wnn_n = %d\n",param.n);
printf("wnn_nsho = %d\n",param.nsho);
- printf("wnn_hindo = %d\n",param.p1);
- printf("wnn_len = %d\n",param.p2);
- printf("wnn_jiri = %d\n",param.p3);
- printf("wnn_flag = %d\n",param.p4);
- printf("wnn_jisho = %d\n",param.p5);
- printf("wnn_sbn = %d\n",param.p6);
- printf("wnn_dbn_len = %d\n",param.p7);
- printf("wnn_sbn_cnt = %d\n",param.p8);
- printf("wnn_suuji = %d\n",param.p9);
- printf("wnn_kana = %d\n",param.p10);
- printf("wnn_eisuu = %d\n",param.p11);
- printf("wnn_kigou = %d\n",param.p12);
- printf("wnn_toji_kakko = %d\n",param.p13);
- printf("wnn_fuzokogo = %d\n",param.p14);
- printf("wnn_kaikakko = %d\n",param.p15);
+ printf("wnn_hindo = %d\n",param.p1);
+ printf("wnn_len = %d\n",param.p2);
+ printf("wnn_jiri = %d\n",param.p3);
+ printf("wnn_flag = %d\n",param.p4);
+ printf("wnn_jisho = %d\n",param.p5);
+ printf("wnn_sbn = %d\n",param.p6);
+ printf("wnn_dbn_len = %d\n",param.p7);
+ printf("wnn_sbn_cnt = %d\n",param.p8);
+ printf("wnn_suuji = %d\n",param.p9);
+ printf("wnn_kana = %d\n",param.p10);
+ printf("wnn_eisuu = %d\n",param.p11);
+ printf("wnn_kigou = %d\n",param.p12);
+ printf("wnn_toji_kakko = %d\n",param.p13);
+ printf("wnn_fuzokogo = %d\n",param.p14);
+ printf("wnn_kaikakko = %d\n",param.p15);
#endif
rc = jl_param_set (wnnfns_buf[snum], ¶m);
CHECK_STRING (file);
if ((snum = check_wnn_server_type ()) == -1) return Qnil;
if (!wnnfns_buf[snum]) return Qnil;
- if (jl_fuzokugo_set (wnnfns_buf[snum], XSTRING (file)->_data) < 0)
+ if (jl_fuzokugo_set (wnnfns_buf[snum], XSTRING_DATA (file)) < 0)
return Qnil;
return Qt;
}
if ((snum = check_wnn_server_type ()) == -1) return Qnil;
lb = lb_wnn_server_type[snum];
if (!wnnfns_buf[snum]) return Qnil;
- m2w (XSTRING (name)->_data, wbuf);
+ m2w (XSTRING_DATA (name), wbuf);
if ((cnt = jl_hinsi_list (wnnfns_buf[snum], XINT (dicno), wbuf, &area)) < 0)
return Qnil;
if (cnt == 0) return make_int (0);
int snum;
CHECK_STRING (args[0]);
CHECK_STRING (args[1]);
- if (!EQ(args[3], Qnil)) CHECK_STRING (args[3]);
+ if (! NILP (args[3])) CHECK_STRING (args[3]);
if ((snum = check_wnn_server_type()) == -1) return Qnil;
if(!wnnfns_buf[snum]) return Qnil;
GCPRO1 (*args);
gcpro1.nvars = nargs;
if(jl_fi_dic_add(wnnfns_buf[snum],
- XSTRING(args[0])->_data,
- XSTRING(args[1])->_data,
- WNN_FI_SYSTEM_DICT,
- WNN_DIC_RDONLY,
- (EQ(args[2], Qnil)) ? WNN_DIC_RDONLY : WNN_DIC_RW,
- 0,
- (EQ(args[3], Qnil)) ? 0 : XSTRING(args[3])->_data,
- yes_or_no,
- puts2 ) < 0) {
+ XSTRING_DATA (args[0]),
+ XSTRING_DATA (args[1]),
+ WNN_FI_SYSTEM_DICT,
+ WNN_DIC_RDONLY,
+ NILP (args[2]) ? WNN_DIC_RDONLY : WNN_DIC_RW,
+ 0,
+ NILP (args[3]) ? 0 : XSTRING_DATA (args[3]),
+ yes_or_no,
+ puts2 ) < 0) {
UNGCPRO;
return Qnil;
}
int snum;
CHECK_STRING (args[0]);
CHECK_STRING (args[1]);
- if (!EQ(args[4], Qnil)) CHECK_STRING (args[4]);
- if (!EQ(args[5], Qnil)) CHECK_STRING (args[5]);
+ if (! NILP (args[4])) CHECK_STRING (args[4]);
+ if (! NILP (args[5])) CHECK_STRING (args[5]);
if ((snum = check_wnn_server_type()) == -1) return Qnil;
if(!wnnfns_buf[snum]) return Qnil;
GCPRO1 (*args);
gcpro1.nvars = nargs;
if(jl_fi_dic_add(wnnfns_buf[snum],
- XSTRING(args[0])->_data,
- XSTRING(args[1])->_data,
- WNN_FI_USER_DICT,
- (EQ(args[2], Qnil)) ? WNN_DIC_RDONLY : WNN_DIC_RW,
- (EQ(args[3], Qnil)) ? WNN_DIC_RDONLY : WNN_DIC_RW,
- (EQ(args[4], Qnil)) ? 0 : XSTRING(args[4])->_data,
- (EQ(args[5], Qnil)) ? 0 : XSTRING(args[5])->_data,
- yes_or_no,
- puts2 ) < 0) {
+ XSTRING_DATA (args[0]),
+ XSTRING_DATA (args[1]),
+ WNN_FI_USER_DICT,
+ NILP (args[2]) ? WNN_DIC_RDONLY : WNN_DIC_RW,
+ NILP (args[3]) ? WNN_DIC_RDONLY : WNN_DIC_RW,
+ NILP (args[4]) ? 0 : XSTRING_DATA (args[4]),
+ NILP (args[5]) ? 0 : XSTRING_DATA (args[5]),
+ yes_or_no,
+ puts2 ) < 0) {
UNGCPRO;
return Qnil;
}
struct wnn_henkan_env henv;
CHECK_STRING (args[0]);
CHECK_INT (args[1]);
- if (!EQ(args[3], Qnil)) CHECK_STRING (args[3]);
+ if (! NILP (args[3])) CHECK_STRING (args[3]);
if ((snum = check_wnn_server_type()) == -1) return Qnil;
if(!wnnfns_buf[snum]) return Qnil;
GCPRO1 (*args);
dic_no = js_get_autolearning_dic(cur_env, WNN_MUHENKAN_LEARNING);
if (dic_no == WNN_NO_LEARNING) {
if((dic_no = jl_dic_add(wnnfns_buf[snum],
- XSTRING(args[0])->_data,
+ XSTRING_DATA (args[0]),
0,
wnnfns_norm ? WNN_DIC_ADD_NOR : WNN_DIC_ADD_REV,
XINT(args[1]),
WNN_DIC_RW, WNN_DIC_RW,
- (EQ(args[3], Qnil)) ? 0 : XSTRING(args[3])->_data,
+ NILP (args[3]) ? 0 : XSTRING_DATA (args[3]),
0,
yes_or_no,
puts2)) < 0) {
}
}
vmask |= WNN_ENV_MUHENKAN_LEARN_MASK;
- henv.muhenkan_flag = (EQ(args[2], Qnil)) ? WNN_DIC_RDONLY : WNN_DIC_RW;
+ henv.muhenkan_flag = NILP (args[2]) ? WNN_DIC_RDONLY : WNN_DIC_RW;
if(jl_set_henkan_env(wnnfns_buf[snum],
vmask,
&henv) < 0) {
struct wnn_henkan_env henv;
CHECK_STRING (args[0]);
CHECK_INT (args[1]);
- if (!EQ(args[3], Qnil)) CHECK_STRING (args[3]);
+ if (! NILP (args[3])) CHECK_STRING (args[3]);
if ((snum = check_wnn_server_type()) == -1) return Qnil;
if(!wnnfns_buf[snum]) return Qnil;
GCPRO1 (*args);
dic_no = js_get_autolearning_dic(cur_env, WNN_BUNSETSUGIRI_LEARNING);
if (dic_no == WNN_NO_LEARNING) {
if((dic_no = jl_dic_add(wnnfns_buf[snum],
- XSTRING(args[0])->_data,
+ XSTRING_DATA (args[0]),
0,
wnnfns_norm ? WNN_DIC_ADD_NOR : WNN_DIC_ADD_REV,
XINT(args[1]),
WNN_DIC_RW, WNN_DIC_RW,
- (EQ(args[3], Qnil)) ? 0 : XSTRING(args[3])->_data,
+ NILP (args[3]) ? 0 : XSTRING_DATA (args[3]),
0,
yes_or_no,
puts2)) < 0) {
}
}
vmask |= WNN_ENV_BUNSETSUGIRI_LEARN_MASK;
- henv.bunsetsugiri_flag = (EQ(args[2], Qnil)) ? WNN_DIC_RDONLY : WNN_DIC_RW;
+ henv.bunsetsugiri_flag = NILP (args[2]) ? WNN_DIC_RDONLY : WNN_DIC_RW;
if(jl_set_henkan_env(wnnfns_buf[snum],
vmask,
&henv) < 0) {
struct wnn_henkan_env henv;
if ((snum = check_wnn_server_type()) == -1) return Qnil;
if(!wnnfns_buf[snum]) return Qnil;
- vmask |= WNN_ENV_LAST_IS_FIRST_MASK;
- henv.last_is_first_flag = (EQ(mode, Qnil)) ? False : True;
+ vmask |= WNN_ENV_LAST_IS_FIRST_MASK;
+ henv.last_is_first_flag = NILP (mode) ? False : True;
if(jl_set_henkan_env(wnnfns_buf[snum],
vmask,
&henv) < 0) return Qnil;
if ((snum = check_wnn_server_type()) == -1) return Qnil;
if(!wnnfns_buf[snum]) return Qnil;
vmask |= WNN_ENV_COMPLEX_CONV_MASK;
- henv.complex_flag = (EQ(mode, Qnil)) ? False : True;
+ henv.complex_flag = NILP (mode) ? False : True;
if(jl_set_henkan_env(wnnfns_buf[snum],
vmask,
&henv) < 0) return Qnil;
if ((snum = check_wnn_server_type()) == -1) return Qnil;
if(!wnnfns_buf[snum]) return Qnil;
vmask |= WNN_ENV_OKURI_LEARN_MASK;
- henv.okuri_learn_flag = (EQ(mode, Qnil)) ? False : True;
+ henv.okuri_learn_flag = NILP (mode) ? False : True;
if(jl_set_henkan_env(wnnfns_buf[snum],
vmask,
&henv) < 0) return Qnil;
if ((snum = check_wnn_server_type()) == -1) return Qnil;
if(!wnnfns_buf[snum]) return Qnil;
vmask |= WNN_ENV_PREFIX_LEARN_MASK;
- henv.prefix_learn_flag = (EQ(mode, Qnil)) ? False : True;
+ henv.prefix_learn_flag = NILP (mode) ? False : True;
if(jl_set_henkan_env(wnnfns_buf[snum],
vmask,
&henv) < 0) return Qnil;
if ((snum = check_wnn_server_type()) == -1) return Qnil;
if(!wnnfns_buf[snum]) return Qnil;
vmask |= WNN_ENV_SUFFIX_LEARN_MASK;
- henv.suffix_learn_flag = (EQ(mode, Qnil)) ? False : True;
+ henv.suffix_learn_flag = NILP (mode) ? False : True;
if(jl_set_henkan_env(wnnfns_buf[snum],
vmask,
&henv) < 0) return Qnil;
if ((snum = check_wnn_server_type()) == -1) return Qnil;
if(!wnnfns_buf[snum]) return Qnil;
vmask |= WNN_ENV_COMMON_LAERN_MASK;
- henv.common_learn_flag = (EQ(mode, Qnil)) ? False : True;
+ henv.common_learn_flag = NILP (mode) ? False : True;
if(jl_set_henkan_env(wnnfns_buf[snum],
vmask,
&henv) < 0) return Qnil;
if ((snum = check_wnn_server_type()) == -1) return Qnil;
if(!wnnfns_buf[snum]) return Qnil;
vmask |= WNN_ENV_YURAGI_MASK;
- henv.yuragi_flag = (EQ(mode, Qnil)) ? False : True;
+ henv.yuragi_flag = NILP (mode) ? False : True;
if(jl_set_henkan_env(wnnfns_buf[snum],
vmask,
&henv) < 0) return Qnil;
CHECK_STRING (name);
if ((snum = check_wnn_server_type ()) == -1) return Qnil;
if (!wnnfns_buf[snum]) return Qnil;
- m2w (XSTRING (name)->_data, w_buf);
+ m2w (XSTRING_DATA (name), w_buf);
if ((no = jl_hinsi_number (wnnfns_buf[snum], w_buf)) < 0) return Qnil;
return make_int (no);
}
}
void
-vars_of_mule_wnn (void)
+reinit_vars_of_mule_wnn (void)
{
int i;
+ for (i = 0; i < NSERVER; i++)
+ {
+ wnnfns_buf[i] = (struct wnn_buf *) 0;
+ wnnfns_env_norm[i] = (struct wnn_env *) 0;
+ wnnfns_env_rev[i] = (struct wnn_env *) 0;
+ }
+}
+
+void
+vars_of_mule_wnn (void)
+{
+ reinit_vars_of_mule_wnn ();
+
DEFVAR_INT ("lb-sisheng", &lb_sisheng /*
Leading character for Sisheng.
*/ );
Vwnn_uniq_level = Qwnn_uniq;
- for (i = 0; i < NSERVER; i++)
- {
- wnnfns_buf[i] = (struct wnn_buf *) 0;
- wnnfns_env_norm[i] = (struct wnn_env *) 0;
- wnnfns_env_rev[i] = (struct wnn_env *) 0;
- }
-
Fprovide(intern("wnn"));
}
if (EQ(Vwnn_server_type, Qcserver))
{
len = cwnn_yincod_pzy (pzy, wc,
- (EQ(Vcwnn_zhuyin, Qnil))
+ NILP (Vcwnn_zhuyin)
? CWNN_PINYIN
: CWNN_ZHUYIN);
for (i = 0; i < len; i++)
m2w (unsigned char *mp, w_char *wp)
{
unsigned int ch;
-
+
while ((ch = *mp++) != 0)
{
if (BUFBYTE_LEADING_BYTE_P (ch))
w++; pin++;
}
len = cwnn_pzy_yincod (ybuf, pbuf,
- (EQ(Vcwnn_zhuyin, Qnil)) ? CWNN_PINYIN : CWNN_ZHUYIN);
+ NILP (Vcwnn_zhuyin) ? CWNN_PINYIN : CWNN_ZHUYIN);
if (len <= 0)
return;