;;; Code:
-
-
-;; Only support SJ3 version 2.
-
(eval-when-compile
(require 'egg-com)
;; (load-library "egg/sj3")
((eq c 'STDYSIZE) 23)
((eq c 'LOCK) 31)
((eq c 'UNLOCK) 32)
- ((eq c 'BEGIN) 41)
- ((eq c 'BEGIN_EUC) 111)
- ((eq c 'TANCONV) 51)
- ((eq c 'TANCONV_EUC) 112)
- ((eq c 'KOUHO) 54)
- ((eq c 'KOUHO_EUC) 115)
- ((eq c 'KOUHOSU) 55)
- ((eq c 'KOUHOSU_EUC) 116)
+ ((eq c 'BEGIN) '(if (eq 1 sj3-server-version) 41 111))
+ ((eq c 'TANCONV) '(if (eq 1 sj3-server-version) 51 112))
+ ((eq c 'KOUHO) '(if (eq 1 sj3-server-version) 54 115))
+ ((eq c 'KOUHOSU) '(if (eq 1 sj3-server-version) 55 116))
((eq c 'STDY) 61)
- ((eq c 'CLSTDY) 62)
- ((eq c 'CLSTDY_EUC) 117)
- ((eq c 'WREG) 71)
- ((eq c 'WREG_EUC) 118)
- ((eq c 'WDEL) 72)
- ((eq c 'WDEL_EUC) 119)
+ ((eq c 'CLSTDY) '(if (eq 1 sj3-server-version) 62 117))
+ ((eq c 'WREG) '(if (eq 1 sj3-server-version) 71 118))
+ ((eq c 'WDEL) '(if (eq 1 sj3-server-version) 72 119))
((eq c 'MKDIC) 81)
((eq c 'MKSTDY) 82)
((eq c 'MKDIR) 83)
((eq c 'ACCESS) 84)
- ((eq c 'WSCH) 91)
- ((eq c 'WSCH_EUC) 120)
- ((eq c 'WNSCH) 92)
- ((eq c 'WNSCH_EUC) 121)
+ ((eq c 'WSCH) '(if (eq 1 sj3-server-version) 91 120))
+ ((eq c 'WNSCH) '(if (eq 1 sj3-server-version) 92 121))
((eq c 'VERSION) 103)
(t (error "No such constant")))))
(process-send-region proc (point-min) (point-max))
(goto-char (prog1 (point) (accept-process-output proc))))
receive-exprs))))
+
+(defmacro sj3rpc-server-coding-system ()
+ '(nth (1- sj3-server-version) sj3-server-coding-system-list))
+
+(defmacro sj3rpc-unpack-mb-string (coding-system)
+ `(let ((start (point)))
+ (while (not (search-forward "\0" nil t))
+ (comm-accept-process-output))
+ (decode-coding-string (buffer-substring start (1- (point)))
+ ,coding-system)))
\f
(defun sj3rpc-open (proc myhostname username)
"Open the session. Return 0 on success, error code on failure."
(comm-call-with-proc proc (result)
- (comm-format (u u s s s) (sj3-const OPEN) 2 ; Server version
+ (comm-format (u u s s s) (sj3-const OPEN) sj3-server-version
myhostname username
;; program name
(format "%d.emacs-egg" (emacs-pid)))
(defun sj3rpc-begin (env yomi)
"Begin conversion."
- (let ((yomi-ext (encode-coding-string yomi 'euc-japan))
- (p 0)
- len source converted stdy bunsetsu-list bl)
+ (let* ((codesys (sj3rpc-server-coding-system))
+ (yomi-ext (encode-coding-string yomi codesys))
+ (p 0)
+ len source converted stdy bunsetsu-list bl)
(sj3rpc-call-with-environment env (result)
- (comm-format (u s) (sj3-const BEGIN_EUC) yomi-ext)
+ (comm-format (u s) (sj3-const BEGIN) yomi-ext)
(comm-unpack (u) result)
(if (/= result 0)
(- result) ; failure
(comm-unpack (b) len)
(> len 0))
(setq stdy (sj3rpc-get-stdy proc))
- (comm-unpack (E) converted)
- (setq source
- (decode-coding-string (substring yomi-ext p (+ p len))
- 'euc-japan)
+ (setq converted (sj3rpc-unpack-mb-string codesys))
+ (setq source (decode-coding-string (substring yomi-ext p (+ p len))
+ codesys)
p (+ p len))
(let ((bl1 (cons (sj3-make-bunsetsu env
source converted nil stdy) nil)))
result))
(defun sj3rpc-get-bunsetsu-candidates-sub (proc env yomi yomi-ext len n)
- (let ((i 0)
+ (let ((codesys (sj3rpc-server-coding-system))
+ (i 0)
stdy converted bunsetsu bl bunsetsu-list cylen rest)
(comm-call-with-proc-1 proc (result)
- (comm-format (u u s) (sj3-const KOUHO_EUC) len yomi-ext)
+ (comm-format (u u s) (sj3-const KOUHO) len yomi-ext)
(comm-unpack (u) result)
(if (/= result 0)
(- result) ; failure
(while (< i n)
(comm-unpack (u) cylen)
(setq stdy (sj3rpc-get-stdy proc))
- (comm-unpack (E) converted)
- (setq rest (decode-coding-string
- (substring yomi-ext cylen) 'euc-japan))
+ (setq converted (sj3rpc-unpack-mb-string codesys))
+ (setq rest (decode-coding-string (substring yomi-ext cylen)
+ codesys))
(setq bunsetsu (sj3-make-bunsetsu env yomi converted rest stdy))
(if bl
(setq bl (setcdr bl (cons bunsetsu nil)))
bunsetsu-list))))
(defun sj3rpc-get-bunsetsu-candidates (env yomi)
- (let* ((yomi-ext (encode-coding-string yomi 'euc-japan))
+ (let* ((yomi-ext (encode-coding-string yomi (sj3rpc-server-coding-system)))
(len (length yomi-ext)))
(sj3rpc-call-with-environment env (result)
- (comm-format (u u s) (sj3-const KOUHOSU_EUC) len yomi-ext)
+ (comm-format (u u s) (sj3-const KOUHOSU) len yomi-ext)
(comm-unpack (u) result)
(if (/= result 0)
(- result) ; failure
yomi yomi-ext len result))))))
(defun sj3rpc-tanbunsetsu-conversion (env yomi)
- (let* ((yomi-ext (encode-coding-string yomi 'euc-japan))
+ (let* ((codesys (sj3rpc-server-coding-system))
+ (yomi-ext (encode-coding-string yomi codesys))
(len (length yomi-ext)) cylen stdy converted rest)
(sj3rpc-call-with-environment env (result)
- (comm-format (u u s) (sj3-const TANCONV_EUC) len yomi-ext)
+ (comm-format (u u s) (sj3-const TANCONV) len yomi-ext)
(comm-unpack (u) result)
(if (/= result 0)
(- result)
(comm-unpack (u) cylen)
(setq stdy (sj3rpc-get-stdy proc))
- (comm-unpack (E) converted)
- (setq rest (decode-coding-string
- (substring yomi-ext cylen) 'euc-japan))
+ (setq converted (sj3rpc-unpack-mb-string codesys))
+ (setq rest (decode-coding-string (substring yomi-ext cylen) codesys))
(setq bunsetsu (sj3-make-bunsetsu env yomi converted rest stdy))))))
(defun sj3rpc-bunsetsu-stdy (env stdy)
0)))
(defun sj3rpc-kugiri-stdy (env yomi1 yomi2 stdy)
- (let* ((yomi1-ext (encode-coding-string yomi1 'euc-japan))
- (yomi2-ext (encode-coding-string yomi2 'euc-japan)))
+ (let* ((codesys (sj3rpc-server-coding-system))
+ (yomi1-ext (encode-coding-string yomi1 codesys))
+ (yomi2-ext (encode-coding-string yomi2 codesys)))
(sj3rpc-call-with-environment env (result)
- (comm-format (u s s v) (sj3-const CLSTDY_EUC)
+ (comm-format (u s s v) (sj3-const CLSTDY)
yomi1-ext yomi2-ext stdy (length stdy))
(comm-unpack (u) result)
(if (/= result 0)
projects / elisp / tamago.git / blobdiff