changeset 26:7bc89500bd53

*** empty log message ***
author gongo
date Sat, 10 Nov 2007 21:09:25 +0900
parents 1e084bee588f
children 7134bc86f50d
files ChangeLog redit-client-sm.el redit-client-sm.elc
diffstat 3 files changed, 30 insertions(+), 34 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat Nov 10 20:38:15 2007 +0900
+++ b/ChangeLog	Sat Nov 10 21:09:25 2007 +0900
@@ -1,5 +1,9 @@
 2007-11-10  Wataru MIYAGUNI  <gongo@cr.ie.u-ryukyu.ac.jp>
 
+	* redit-client-sm.el: redit-select-command (obsolete)
+	editor側では select 要らないってことで。
+	これで、editor側で必要なのは join, put, quit, その他編集コマンド。
+
 	* add: translate.el
 	translate のテストルーチン。使い方は
 
--- a/redit-client-sm.el	Sat Nov 10 20:38:15 2007 +0900
+++ b/redit-client-sm.el	Sat Nov 10 21:09:25 2007 +0900
@@ -73,8 +73,8 @@
 (defvar redit-get-ack-command        "44") ;; obsolete
 (defvar redit-put-command            "45")
 (defvar redit-put-ack-command        "46")
-(defvar redit-select-command         "47")
-(defvar redit-select-ack-command     "48")
+(defvar redit-select-command         "47") ;; obsolete
+(defvar redit-select-ack-command     "48") ;; obsolete
 (defvar redit-register-command       "49") ;; obsolete
 (defvar redit-register-ack-command   "50") ;; obsolete
 (defvar redit-deregister-command     "51") ;; obsolete
@@ -83,10 +83,10 @@
 (defvar redit-quit-ack-command       "54")
 
 ;; Queue struct
-(defstruct Queue (front nil) (rear nil))
-(setq redit-client-command-queue (make-Queue))
-(setq redit-client-receive-queue (make-Queue))
-(setq redit-client-send-queue (make-Queue))
+;; (defstruct Queue (front nil) (rear nil))
+;; (setq redit-client-command-queue (make-Queue))
+;; (setq redit-client-receive-queue (make-Queue))
+;; (setq redit-client-send-queue (make-Queue))
 
 ;; line translated queue
 ;; (setq after-CQ (make-Queue))
@@ -96,8 +96,6 @@
 ;; Fix Me
 ;; 適当に作ってしまったので。
 ;; 一応コマンドは認識してます。
-;; エンディアンとか考える必要あるん?
-;; UTF8だから大丈夫とか言っていい?
 (defun redit-pack-int-loop (num count)
   (if (> count 0)
       (concat
@@ -112,7 +110,7 @@
    (redit-pack-int cmd) (redit-pack-int sid) (redit-pack-int eid)
    (redit-pack-int seq) (redit-pack-int lno) (redit-pack-int siz)))
 
-(defun unpack-int (pkt byte)
+(defun redit-unpack-int (pkt byte)
   (let (num)
     (setq num (* byte 4))
     (string-to-char (substring pkt (- num 1) num))))
@@ -215,19 +213,19 @@
 ;; select : select session
 ;; ユーザの入力を受け取って、selectコマンドを構成し、通信プロセスに渡す
 ;; (redit-select-command ()
-(defun redit-select-command (session-name)
-  "select session"
-  (interactive "P")
-  (if (setq session-name (read-string "session name:"))
-      (progn 
-	(setq redit-client-session-id (string-to-number session-name))
-	(process-send-string 
-	 redit-client-process
-	 (concat (format "%10d%10d%10d%10d%10d%10d" (string-to-number redit-select-command) redit-client-session-id redit-client-editor-id (gen-seqno) 0 0) session-name "\n"))
-	)
-    (error "invalid session name.")
-    )
-  )
+;;(defun redit-select-command (session-name)
+;;  "select session"
+;;  (interactive "P")
+;;  (if (setq session-name (read-string "session name:"))
+;;      (progn 
+;;	(setq redit-client-session-id (string-to-number session-name))
+;;	(process-send-string 
+;;	 redit-client-process
+;;	 (concat (format "%10d%10d%10d%10d%10d%10d" (string-to-number redit-select-command) redit-client-session-id redit-client-editor-id (gen-seqno) 0 0) session-name "\n"))
+;;	)
+;;    (error "invalid session name.")
+;;    )
+;;  )
 
 ;; (defun redit-put-command ()
 ;; "put"
@@ -692,23 +690,17 @@
   (setq redit-client-seqno (+ redit-client-seqno 1)))
 
 (defun rep-get-command-from-pkt (pkt)
-  ;;(string-to-number (substring pkt 0 10)))
-  (unpack-int pkt 1))
+  (redit-unpack-int pkt 1))
 (defun rep-get-session-id-from-pkt (pkt)
-  ;;(string-to-number (substring pkt 10 20)))
-  (unpack-int pkt 2))
+  (redit-unpack-int pkt 2))
 (defun rep-get-editor-id-from-pkt (pkt)
-  ;;(string-to-number (substring pkt 20 30)))
-  (unpack-int pkt 3))
+  (redit-unpack-int pkt 3))
 (defun rep-get-sequence-id-from-pkt (pkt)
-  ;;(string-to-number (substring pkt 30 40)))
-  (unpack-int pkt 4))
+  (redit-unpack-int pkt 4))
 (defun rep-get-line-number-from-pkt (pkt)
-  ;;(string-to-number (substring pkt 40 50)))
-  (unpack-int pkt 5))
+  (redit-unpack-int pkt 5))
 (defun rep-get-text-size-from-pkt (pkt)
-  ;;(string-to-number (substring pkt 50 60)))
-  (unpack-int pkt 6))
+  (redit-unpack-int pkt 6))
 (defun rep-get-text-from-pkt (pkt)
   (let ((size (rep-get-text-size-from-pkt pkt)))
   (substring (decode-coding-string pkt 'euc-jp) 27 (+ 27 size))))
Binary file redit-client-sm.elc has changed