[Message Prev][Message Next][Thread Prev][Thread Next][Message Index][Thread Index]
[MD:936] Meadow migration plan.
- X-ml-count: 936
- Subject: [MD:936] Meadow migration plan.
- From: Miyashita Hisashi(宮下 尚:HIMI) <himi@xxxxxxxxxxxxxxxxxxxxxxxxx>
- Date: Fri, 19 Feb 1999 18:27:48 +0900
- User-agent: T-gnus/6.10.058 (based on Pterodactyl Gnus v0.76) SEMI/1.13.3 (Komaiko) FLIM/1.12.6 (Family-Kōenmae) Emacs/20.3.5 (i386-*-nt4.0) MULE/4.0 (HANANOEN) Meadow/1.03 Alpha2 (FUDI-MURASAKI)
Keiichi Suzuki <keiichi@xxxxxxxxxxxx> writes:
> himi> akrさんのをしばらく使って逃げててください。 ^^;;;;
>
> これが使えないのです。
>
> Compiling file c:/usr/local/Meadow/1.03a2/site-lisp/mule-ucs/un-sample.el
> at Fri Feb 19 18:19:03 1999
> !! error (("CCL: Invalid command: (map-single r4 r1
> mucs-unicode-translation-table-1)"))
>
> となってしまいます。
>
> ;; これは全く見当がつきません。
だぁー、ごめんなさい。ccl.elが古いの入ってました。20.3.5相当に入れ替えてください。
## 一応パッチを渡しときます。
#### にしても、なんでこうなっちゃったんだろう。たぶん、marge後にテスト操作を
#### 行ったせいだろうなぁ。
from himi
Index: ccl.el
===================================================================
RCS file: g:/repdev/Meadow/lisp/international/ccl.el,v
retrieving revision 1.1.1.3
diff -r1.1.1.3 ccl.el
75c75
< ;; | (read-multibyte-character REG {charset} REG {code-point})
---
> ;; | (read-multibyte-character REG(charset) REG(codepoint))
81a82,84
> ;; UNIFY :=
> ;; (unify-char REG(table) REG(charset) REG(codepoint))
> ;; | (unify-char SYMBOL REG(charset) REG(codepoint))
83,91c86,91
< ;; (translate-character REG(table) REG(charset) REG(codepoint))
< ;; | (translate-character SYMBOL REG(charset) REG(codepoint))
< ;; MAP :=
< ;; (iterate-multiple-map REG REG MAP-IDs)
< ;; | (map-multiple REG REG (MAP-SET))
< ;; | (map-single REG REG MAP-ID)
< ;; MAP-IDs := MAP-ID ...
< ;; MAP-SET := MAP-IDs | (MAP-IDs) MAP-SET
< ;; MAP-ID := integer
---
> ;; (iterate-multiple-map REG REG TABLE-IDs)
> ;; | (translate-multiple-map REG REG (TABLE-SET))
> ;; | (translate-single-map REG REG TABLE-ID)
> ;; TABLE-IDs := TABLE-ID ...
> ;; TABLE-SET := TABLE-IDs | (TABLE-IDs) TABLE-SET
> ;; TABLE-ID := integer
103c103
< ;; ARRAY := '[' integer ... ']'
---
> ;; ARRAY := '[' interger ... ']'
107,111d106
< (defgroup ccl nil
< "CCL (Code Conversion Language) compiler."
< :prefix "ccl-"
< :group 'i18n)
<
116,118c111,113
< translate-character
< iterate-multiple-map map-multiple map-single]
< "Vector of CCL commands (symbols).")
---
> unify-character
> iterate-multiple-map translate-multiple-map translate-single-map]
> "*Vector of CCL commands (symbols).")
161c156
< "Vector of CCL compiled codes (symbols).")
---
> "*Vector of CCL compiled codes (symbols).")
166,167c161,162
< translate-character
< translate-character-const-tbl
---
> unify-character
> unify-character-const-tbl
170,171c165,166
< map-multiple
< map-single
---
> translate-multiple-map
> translate-single-map
206c201
< "Vector of CCL registers (symbols).")
---
> "*Vector of CCL registers (symbols).")
219c214
< "Vector of CCL arithmetic/logical operators (symbols).")
---
> "*Vector of CCL arithmetic/logical operators (symbols).")
230c225
< "Vector of CCL assignment operators (symbols).")
---
> "*Vector of CCL assignment operators (symbols).")
335c330
< "Return a compiled code of CCL-PROGRAM as a vector of integer."
---
> "Return a comiled code of CCL-PROGRAM as a vector of integer."
577,579c572
< (progn
< (ccl-embed-current-address jump-cond-address)
< (setq unconditional-jump nil))
---
> (ccl-embed-current-address jump-cond-address)
865,866c858
< (ccl-embed-extended-command 'read-multibyte-character rrr RRR 0))
< nil)
---
> (ccl-embed-extended-command 'read-multibyte-character rrr RRR 0)))
876,877c868
< (ccl-embed-extended-command 'write-multibyte-character rrr RRR 0))
< nil)
---
> (ccl-embed-extended-command 'write-multibyte-character rrr RRR 0)))
879,880c870,871
< ;; Compile translate-character
< (defun ccl-compile-translate-character (cmd)
---
> ;; Compile unify-character
> (defun ccl-compile-unify-character (cmd)
888,892c879,882
< (cond ((and (symbolp Rrr) (not (get Rrr 'ccl-register-number)))
< (if (not (get Rrr 'translation-table))
< (error "CCL: Invalid translation table %s in %s" Rrr cmd))
< (ccl-embed-extended-command 'translate-character-const-tbl
< rrr RRR 0)
---
> (cond ((symbolp Rrr)
> (if (not (get Rrr 'unification-table))
> (error "CCL: Invalid unification-table %s in %s" Rrr cmd))
> (ccl-embed-extended-command 'unify-character-const-tbl rrr RRR 0)
896,897c886
< (ccl-embed-extended-command 'translate-character rrr RRR Rrr))))
< nil)
---
> (ccl-embed-extended-command 'unify-character rrr RRR Rrr)))))
900,901c889
< (ccl-compile-multiple-map-function 'iterate-multiple-map cmd)
< nil)
---
> (ccl-compile-multiple-map-function 'iterate-multiple-map cmd))
903c891
< (defun ccl-compile-map-multiple (cmd)
---
> (defun ccl-compile-translate-multiple-map (cmd)
906,922c894,910
< (let ((func '(lambda (arg mp)
< (let ((len 0) result add)
< (while arg
< (if (consp (car arg))
< (setq add (funcall func (car arg) t)
< result (append result add)
< add (+ (-(car add)) 1))
< (setq result
< (append result
< (list (car arg)))
< add 1))
< (setq arg (cdr arg)
< len (+ len add)))
< (if mp
< (cons (- len) result)
< result))))
< arg)
---
> (let (arg
> (func (lambda (arg mp)
> (let ((len 0) result add)
> (while arg
> (if (consp (car arg))
> (setq add (funcall func (car arg) t)
> result (append result add)
> add (+ (-(car add)) 1))
> (setq result
> (append result
> (list (car arg)))
> add 1))
> (setq arg (cdr arg)
> len (+ len add)))
> (if mp
> (cons (- len) result)
> result)))))
925,926c913
< (ccl-compile-multiple-map-function 'map-multiple arg))
< nil)
---
> (ccl-compile-multiple-map-function 'translate-multiple-map arg)))
928c915
< (defun ccl-compile-map-single (cmd)
---
> (defun ccl-compile-translate-single-map (cmd)
933c920
< (map (nth 3 cmd))
---
> (table (nth 3 cmd))
937,941c924,928
< (ccl-embed-extended-command 'map-single rrr RRR 0)
< (cond ((symbolp map)
< (if (get map 'code-conversion-map)
< (ccl-embed-data map)
< (error "CCL: Invalid map: %s" map)))
---
> (ccl-embed-extended-command 'translate-single-map rrr RRR 0)
> (cond ((symbolp table)
> (if (get table 'ccl-translation-table)
> (ccl-embed-data table)
> (error "CCL: Invalid table: %s" table)))
943,944c930
< (error "CCL: Invalid type of arguments: %s" cmd))))
< nil)
---
> (error "CCL: Invalid type of arguments: %s" cmd)))))
952c938
< map)
---
> table)
958,964c944,950
< (setq map (car args))
< (cond ((symbolp map)
< (if (get map 'code-conversion-map)
< (ccl-embed-data map)
< (error "CCL: Invalid map: %s" map)))
< ((numberp map)
< (ccl-embed-data map))
---
> (setq table (car args))
> (cond ((symbolp table)
> (if (get table 'ccl-translation-table)
> (ccl-embed-data table)
> (error "CCL: Invalid table: %s" table)))
> ((numberp table)
> (ccl-embed-data table))
969d954
<
1250,1251c1235,1236
< (defun ccl-dump-translate-character (rrr RRR Rrr)
< (insert (format "translation table(r%d) r%d r%d\n" Rrr RRR rrr)))
---
> (defun ccl-dump-unify-character (rrr RRR Rrr)
> (insert (format "unify-character table(r%d) r%d r%d\n" Rrr RRR rrr)))
1253c1238
< (defun ccl-dump-translate-character-const-tbl (rrr RRR Rrr)
---
> (defun ccl-dump-unify-character-const-tbl (rrr RRR Rrr)
1255c1240
< (insert (format "translation table(%S) r%d r%d\n" tbl RRR rrr))))
---
> (insert (format "unify-character table(%d) r%d r%d\n" tbl RRR rrr))))
1261c1246
< (insert (format "\tnumber of maps is %d .\n\t [" notbl))
---
> (insert (format "\tnumber of tables is %d .\n\t [" notbl))
1268c1253
< (defun ccl-dump-map-multiple (rrr RRR Rrr)
---
> (defun ccl-dump-translate-multiple-map (rrr RRR Rrr)
1271,1272c1256,1257
< (insert (format "map-multiple r%d r%d\n" RRR rrr))
< (insert (format "\tnumber of maps and separators is %d\n\t [" notbl))
---
> (insert (format "translate-multiple-map r%d r%d\n" RRR rrr))
> (insert (format "\tnumber of tables and separators is %d\n\t [" notbl))
1281c1266
< (defun ccl-dump-map-single (rrr RRR Rrr)
---
> (defun ccl-dump-translate-single-map (rrr RRR Rrr)
1283c1268,1269
< (insert (format "map-single r%d r%d map(%S)\n" RRR rrr id))))
---
> (insert (format "translate-single-map r%d r%d table(%S)\n" RRR rrr id))))
>
1285d1270
<
1290,1291d1274
< ;; Auto-loaded functions.
<
1298c1281
< Optional arg VECTOR is a compiled CCL code of the CCL program."
---
> VECTOR is set as a CCL program."
1312,1329d1294
< (defmacro check-ccl-program (ccl-program &optional name)
< "Check validity of CCL-PROGRAM.
< If CCL-PROGRAM is a symbol denoting a valid CCL program, return
< CCL-PROGRAM, else return nil.
< If CCL-PROGRAM is a vector and optional arg NAME (symbol) is supplied,
< register CCL-PROGRAM by name NAME, and return NAME."
< `(let ((result ,ccl-program))
< (cond ((symbolp ,ccl-program)
< (or (numberp (get ,ccl-program 'ccl-program-idx))
< (setq result nil)))
< ((vectorp ,ccl-program)
< (setq result ,name)
< (register-ccl-program result ,ccl-program))
< (t
< (setq result nil)))
< result))
<
< ;;;###autoload
1332c1297
< The return value is a vector of resulting CCL registers."
---
> The return value is a vector of resulting CCL registeres."