Mercurial > hg > xemacs-beta
view lisp/mule/thai-xtis.el @ 4995:8431b52e43b1
Move the various map* functions to C; add #'map-into.
src/ChangeLog addition:
2010-01-31 Aidan Kehoe <kehoea@parhasard.net>
Move #'mapcar*, #'mapcan, #'mapc, #'map, #'mapl, #'mapcon to C;
extend #'mapvector, #'mapconcat, #'mapcar to support more
SEQUENCES; have them all error with circular lists.
* fns.c (Fsubseq): Call CHECK_SEQUENCE here; Flength can return
from the debugger if it errors with a non-sequence, leading to a
crash in Fsubseq if sequence really is *not* a sequence.
(mapcarX): Rename mapcar1 to mapcarX; rework it comprehensively to
take an optional lisp output argument, and a varying number of
sequences.
Special-case a single list argument, as we used to, saving its
elements in the stack space for the results before calling
FUNCTION, so FUNCTION can corrupt the list all it
wants. dead_wrong_type_argument() in the other cases if we
encounter a non-cons where we expected a cons.
(Fmapconcat):
Accept further SEQUENCES after separator here. Special-case
the idiom (mapconcat 'identity SEQUENCE), don't even funcall.
(FmapcarX): Rename this from Fmapcar. Accept optional SEQUENCES.
(Fmapvector): Accept optional SEQUENCES.
(Fmapcan, Fmapc, Fmap): Move these here from cl-extra.el.
(Fmap_into): New function, as specified by Common Lisp.
(maplist): New function, the guts of the implementation of
Fmaplist and Fmapl.
(Fmaplist, Fmapl, Fmapcon): Move these from cl-extra.el.
(syms_of_fns):
Add a few needed symbols here, for the type tests
used by #'map. Add the new subrs, with aliases for #'mapc-internal
and #'mapcar.
* general-slots.h: Declare Qcoerce here, now it's used in both
indent.c and fns.c
* indent.c (syms_of_indent): Qcoerce is gone from here.
* lisp.h: Add ARRAYP(), SEQUENCEP(), and the corresponding CHECK_*
macros. Declare Fbit_vector, Fstring, FmapcarX, now other files
need to use them.
* data.c (Farrayp, Fsequencep): Use ARRAYP and SEQUENCEP, just
added to lisp.h
* buffer.c (Fbuffer_list): Now Fmapcar has been renamed FmapcarX
and takes MANY arguments, update this function to reflect that.
lisp/ChangeLog addition:
2010-01-31 Aidan Kehoe <kehoea@parhasard.net>
* cl.el (mapcar*): Delete; this is now in fns.c.
Use #'mapc, not #'mapc-internal in a couple of places.
* cl-macs.el (mapc, mapcar*, map): Delete these compiler macros
now the corresponding functions are in fns.c; there's no run-time
advantage to the macros.
* cl-extra.el (coerce): Extend the possible conversions here a
little; it's not remotely comprehensive yet, though it does allow
running slightly more Common Lisp code than previously.
(cl-mapcar-many): Delete.
(map, maplist, mapc, mapl, mapcan, mapcon): Move these to fns.c.
* bytecomp.el (byte-compile-maybe-mapc):
Use #'mapc itself, not #'mapc-internal, now the former is in C.
(mapcar*): Use #'byte-compile-maybe-mapc as this function's
byte-compile method, now a #'mapc that can take more than one
sequence is in C.
* obsolete.el (cl-mapc): Move this compatibility alias to this file.
* update-elc.el (do-autoload-commands): Use #'mapc, not
#'mapc-internal here.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 31 Jan 2010 18:29:48 +0000 |
parents | 257b468bf2ca |
children | 308d34e9f07d |
line wrap: on
line source
;;; thai-xtis.el --- Support for Thai (XTIS) -*- coding: iso-2022-7bit; -*- ;; Copyright (C) 1999 Electrotechnical Laboratory, JAPAN. ;; Licensed to the Free Software Foundation. ;; Author: TAKAHASHI Naoto <ntakahas@etl.go.jp> ;; MORIOKA Tomohiko <tomo@etl.go.jp> ;; Created: 1998-03-27 for Emacs-20.3 by TAKAHASHI Naoto ;; 1999-03-29 imported and modified for XEmacs by MORIOKA Tomohiko ;; Keywords: mule, multilingual, Thai, XTIS ;; This file is part of XEmacs. ;; XEmacs is free software; you can redistribute it and/or modify it ;; under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; XEmacs is distributed in the hope that it will be useful, but ;; WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ;; General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with XEmacs; see the file COPYING. If not, write to the Free ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ;; 02111-1307, USA. ;;; Commentary: ;; For Thai, the pre-composed character set proposed by ;; Virach Sornlertlamvanich <virach@links.nectec.or.th> is supported. ;;; Code: (make-charset 'thai-xtis "Precomposed Thai (XTIS by Virach)." '(registries ["xtis-0"] dimension 2 columns 1 chars 94 final ?? graphic 0)) (define-category ?x "Precomposed Thai character.") (modify-category-entry 'thai-xtis ?x) (when (featurep 'xemacs) (let ((deflist '(;; chars syntax ("$(?!0(B-$(?NxP0R0S0`0(B-$(?e0(B" "w") ("$(?p0(B-$(?y0(B" "w") ("$(?O0f0_0o0z0{0(B" "_") )) elm chars len syntax to ch i) (while deflist (setq elm (car deflist)) (setq chars (car elm) len (length chars) syntax (nth 1 elm) i 0) (while (< i len) (if (= (aref chars i) ?-) (setq i (1+ i) to (nth 1 (split-char (aref chars i)))) (setq ch (nth 1 (split-char (aref chars i))) to ch)) (while (<= ch to) (modify-syntax-entry (vector 'thai-xtis ch) syntax) (setq ch (1+ ch))) (setq i (1+ i))) (setq deflist (cdr deflist)))) (put-charset-property 'thai-xtis 'preferred-coding-system 'tis-620) ) ;; This is the ccl-decode-thai-xtis automaton. ;; ;; "WRITE x y" == (insert (make-char 'thai-xtis x y)) ;; "write x" == (insert x) ;; rx' == (tis620-to-thai-xtis-second-byte-bitpattern rx) ;; r3 == "no vower nor tone" ;; r4 == (charset-id 'thai-xtis) ;; ;; | input (= r0) ;; state |-------------------------------------------- ;; | consonant | vowel | tone ;; ---------+-------------+-------------+---------------- ;; r1 == 0 | r1 = r0 | WRITE r0,r3 | WRITE r0,r3 ;; r2 == 0 | | | ;; ---------+-------------+-------------+---------------- ;; r1 == C | WRITE r1,r3 | r2 = r0' | WRITE r1,r3|r0' ;; r2 == 0 | r1 = r0 | | r1 = 0 ;; ---------+-------------+-------------+---------------- ;; r1 == C | WRITE r1,r2 | WRITE r1,r2 | WRITE r1,r2|r0' ;; r2 == V | r1 = r0 | WRITE r0,r3 | r1 = r2 = 0 ;; | r2 = 0 | r1 = r2 = 0 | ;; ;; ;; | input (= r0) ;; state |----------------------------------------- ;; | symbol | ASCII | EOF ;; ---------+-------------+-------------+------------- ;; r1 == 0 | WRITE r0,r3 | write r0 | ;; r2 == 0 | | | ;; ---------+-------------+-------------+------------- ;; r1 == C | WRITE r1,r3 | WRITE r1,r3 | WRITE r1,r3 ;; r2 == 0 | WRITE r0,r3 | write r0 | ;; | r1 = 0 | r1 = 0 | ;; ---------+-------------+-------------+------------- ;; r1 == C | WRITE r1,r2 | WRITE r1,r2 | WRITE r1,r2 ;; r2 == V | WRITE r0,r3 | write r0 | ;; | r1 = r2 = 0 | r1 = r2 = 0 | (eval-and-compile ;; input : r5 = 1st byte, r6 = 2nd byte ;; Their values will be destroyed. (define-ccl-program ccl-thai-xtis-write '(0 ((r5 = ((r5 & #x7F) << 7)) (r6 = ((r6 & #x7F) | r5)) (write-multibyte-character r4 r6)))) (define-ccl-program ccl-thai-xtis-consonant '(0 (if (r1 == 0) (r1 = r0) (if (r2 == 0) ((r5 = r1) (r6 = r3) (call ccl-thai-xtis-write) (r1 = r0)) ((r5 = r1) (r6 = r2) (call ccl-thai-xtis-write) (r1 = r0) (r2 = 0)))))) (define-ccl-program ccl-thai-xtis-vowel '(0 ((if (r1 == 0) ((r5 = r0) (r6 = r3) (call ccl-thai-xtis-write)) ((if (r2 == 0) (r2 = ((r0 - 204) << 3)) ((r5 = r1) (r6 = r2) (call ccl-thai-xtis-write) (r5 = r0) (r6 = r3) (call ccl-thai-xtis-write) (r1 = 0) (r2 = 0)))))))) (define-ccl-program ccl-thai-xtis-vowel-d1 '(0 ((if (r1 == 0) ((r5 = r0) (r6 = r3) (call ccl-thai-xtis-write)) ((if (r2 == 0) (r2 = #x38) ((r5 = r1) (r6 = r2) (call ccl-thai-xtis-write) (r5 = r0) (r6 = r3) (call ccl-thai-xtis-write) (r1 = 0) (r2 = 0)))))))) (define-ccl-program ccl-thai-xtis-vowel-ee '(0 ((if (r1 == 0) ((r5 = r0) (r6 = r3) (call ccl-thai-xtis-write)) ((if (r2 == 0) (r2 = #x78) ((r5 = r1) (r6 = r2) (call ccl-thai-xtis-write) (r5 = r0) (r6 = r3) (call ccl-thai-xtis-write) (r1 = 0) (r2 = 0)))))))) (define-ccl-program ccl-thai-xtis-tone '(0 (if (r1 == 0) ((r5 = r0) (r6 = r3) (call ccl-thai-xtis-write)) (if (r2 == 0) ((r5 = r1) (r6 = ((r0 - #xE6) | r3)) (call ccl-thai-xtis-write) (r1 = 0)) ((r5 = r1) (r6 = ((r0 - #xE6) | r2)) (call ccl-thai-xtis-write) (r1 = 0) (r2 = 0)))))) (define-ccl-program ccl-thai-xtis-symbol '(0 (if (r1 == 0) ((r5 = r0) (r6 = r3) (call ccl-thai-xtis-write)) (if (r2 == 0) ((r5 = r1) (r6 = r3) (call ccl-thai-xtis-write) (r5 = r0) (r6 = r3) (call ccl-thai-xtis-write) (r1 = 0)) ((r5 = r1) (r6 = r2) (call ccl-thai-xtis-write) (r5 = r0) (r6 = r3) (call ccl-thai-xtis-write) (r1 = 0) (r2 = 0)))))) (define-ccl-program ccl-thai-xtis-ascii '(0 (if (r1 == 0) (write r0) (if (r2 == 0) ((r5 = r1) (r6 = r3) (call ccl-thai-xtis-write) (write r0) (r1 = 0)) ((r5 = r1) (r6 = r2) (call ccl-thai-xtis-write) (write r0) (r1 = 0) (r2 = 0)))))) (define-ccl-program ccl-thai-xtis-eof '(0 (if (r1 != 0) (if (r2 == 0) ((r5 = r1) (r6 = r3) (call ccl-thai-xtis-write)) ((r5 = r1) (r6 = r2) (call ccl-thai-xtis-write)))))) (define-ccl-program ccl-decode-thai-xtis `(4 ((read r0) (r1 = 0) (r2 = 0) (r3 = #x30) (r4 = ,(charset-id 'thai-xtis)) (loop (if (r0 < 161) (call ccl-thai-xtis-ascii) (branch (r0 - 161) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-consonant) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-vowel-d1) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-vowel) (call ccl-thai-xtis-vowel) (call ccl-thai-xtis-vowel) (call ccl-thai-xtis-vowel) (call ccl-thai-xtis-vowel) (call ccl-thai-xtis-vowel) (call ccl-thai-xtis-vowel) nil nil nil nil (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-tone) (call ccl-thai-xtis-tone) (call ccl-thai-xtis-tone) (call ccl-thai-xtis-tone) (call ccl-thai-xtis-tone) (call ccl-thai-xtis-tone) (call ccl-thai-xtis-tone) (call ccl-thai-xtis-vowel-ee) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) (call ccl-thai-xtis-symbol) nil nil nil)) (read r0) (repeat))) (call ccl-thai-xtis-eof))) ) (defconst leading-code-private-21 #x9F) (define-ccl-program ccl-encode-thai-xtis `(1 ((read r0) (loop (if (r0 == ,leading-code-private-21) ((read r1) (if (r1 == ,(charset-id 'thai-xtis)) ((read r0) (write r0) (read r0) (r1 = (r0 & 7)) (r0 = ((r0 - #xB0) >> 3)) (if (r0 != 0) (write r0 [0 209 212 213 214 215 216 217 218 238])) (if (r1 != 0) (write r1 [0 231 232 233 234 235 236 237])) (read r0) (repeat)) ((write r0 r1) (read r0) (repeat)))) (write-read-repeat r0)))))) (make-coding-system 'tis-620 'ccl "TIS620 (Thai)" `(mnemonic "TIS620" decode ccl-decode-thai-xtis encode ccl-encode-thai-xtis safe-charsets (ascii thai-xtis) documentation "external=tis620, internal=thai-xtis")) (coding-system-put 'tis-620 'category 'iso-8-1) (set-language-info-alist "Thai-XTIS" '((charset thai-xtis) (coding-system tis-620 iso-2022-7bit) (tutorial . "TUTORIAL.th") (tutorial-coding-system . tis-620) (coding-priority tis-620 iso-2022-7bit) (sample-text . "$(?!:(B") (documentation . t))) ;; thai-xtis.el ends here.