Mercurial > hg > xemacs-beta
annotate lisp/mule/general-late.el @ 4844:91b3d00e717f
Various cleanups for Dynarr code, from Unicode-internal ws
dynarr.c: Add comment explaining Dynarr_largest() use.
dynarr.c: In Dynarr_insert_many(), don't call Dynarr_resize() unless we
actually need to resize, and note that an assert() that we are
inserting at or below the current end could be wrong if code
wants to access stuff between `len' and `largest'.
dynarr.c: Don't just Dynarr_resize() to the right size; instead use
Dynarr_reset() then Dynarr_add_many(), so that the 'len' and
'largest' and such get set properly.
dynarr.c, faces.c, gutter.c, lisp.h, lread.c, lrecord.h, redisplay-output.c, redisplay.c: Rename Dynarr member 'cur' to 'len' since it's the length of
the dynarr, not really a pointer to a "current insertion point".
Use type_checking_assert() instead of just assert() in some places.
Add additional assertions (Dynarr_verify*()) to check that we're
being given positions within range. Use them in Dynarr_at,
Dynarr_atp, etc. New Dynarr_atp_allow_end() for retrieving a
pointer to a position that might be the element past the last one.
New Dynarr_past_lastp() to retrieve a pointer to the position
past the last one, using Dynarr_atp_allow_end(). Change code
appropriately to use it.
Rename Dynarr_end() to Dynarr_lastp() (pointer to the last
element) for clarity, and change code appropriately to use it.
Change code appropriately to use Dynarr_begin().
Rewrite Dynarr_add_many(). New version can accept a NULL pointer
to mean "reserve space but don't put anything in it". Used by
stack_like_malloc().
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Wed, 13 Jan 2010 04:07:42 -0600 |
parents | 257b468bf2ca |
children | 308d34e9f07d |
rev | line source |
---|---|
3707 | 1 ;;; general-late.el --- General Mule code that needs to be run late when |
2 ;; dumping. | |
3 ;; Copyright (C) 2006 Free Software Foundation | |
4 | |
5 ;; Author: Aidan Kehoe | |
6 | |
7 ;; This file is part of XEmacs. | |
8 | |
9 ;; XEmacs is free software; you can redistribute it and/or modify it | |
10 ;; under the terms of the GNU General Public License as published by | |
11 ;; the Free Software Foundation; either version 2, or (at your option) | |
12 ;; any later version. | |
13 | |
14 ;; XEmacs is distributed in the hope that it will be useful, but | |
15 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
17 ;; General Public License for more details. | |
18 | |
19 ;; You should have received a copy of the GNU General Public License | |
20 ;; along with XEmacs; see the file COPYING. If not, write to the | |
21 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | |
22 ;; Boston, MA 02110-1301, USA. | |
23 | |
24 ;;; Commentary: | |
25 | |
26 ;;; Code: | |
27 | |
28 ;; The variable is declared in mule-cmds.el; it's initialised here, to give | |
29 ;; the language-specific code a chance to create its coding systems. | |
30 | |
31 (setq posix-charset-to-coding-system-hash | |
4145 | 32 (loop |
33 ;; We want both normal and internal coding systems in order | |
34 ;; to pick up coding system aliases. | |
35 for coding-system in (coding-system-list 'every) | |
36 with res = (make-hash-table :test #'equal) | |
37 do | |
38 (setq coding-system (symbol-name coding-system)) | |
39 (unless (or (string-match #r"\(-unix\|-mac\|-dos\)$" coding-system) | |
40 (string-match #r"^\(internal\|mswindows\)" coding-system)) | |
41 (puthash | |
42 (replace-in-string (downcase coding-system) "[^a-z0-9]" "") | |
43 (coding-system-name (intern coding-system)) res)) | |
44 finally return res) | |
3707 | 45 |
46 ;; In a thoughtless act of cultural imperialism, move English, German | |
47 ;; and Japanese to the front of language-info-alist to make start-up a | |
48 ;; fraction faster for those languages. | |
49 language-info-alist | |
50 (cons (assoc "Japanese" language-info-alist) | |
51 (remassoc "Japanese" language-info-alist)) | |
52 language-info-alist | |
53 (cons (assoc "German" language-info-alist) | |
54 (remassoc "German" language-info-alist)) | |
55 language-info-alist | |
56 (cons (assoc "English" language-info-alist) | |
4246 | 57 (remassoc "English" language-info-alist)) |
58 | |
59 ;; Make Installation-string actually reflect the environment at | |
60 ;; byte-compile time. (We can't necessarily decode it when version.el | |
61 ;; is loaded, since not all the coding systems are available then.) | |
62 Installation-string (if-boundp 'Installation-file-coding-system | |
63 (decode-coding-string | |
64 Installation-string | |
65 Installation-file-coding-system) | |
4549
68d1ca56cffa
First part of interactive checks that coding systems encode regions.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4246
diff
changeset
|
66 Installation-string) |
68d1ca56cffa
First part of interactive checks that coding systems encode regions.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4246
diff
changeset
|
67 |
4690
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4596
diff
changeset
|
68 ;; This used to be here to convince the byte-compiler to encode the |
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4596
diff
changeset
|
69 ;; output file using escape-quoted. This is no longer necessary, but |
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4596
diff
changeset
|
70 ;; keeping it here avoids doing the eval-when-compile clause below |
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4596
diff
changeset
|
71 ;; twice, which is a significant improvement. |
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4596
diff
changeset
|
72 system-type (symbol-value (intern "\u0073ystem-type"))) |
4549
68d1ca56cffa
First part of interactive checks that coding systems encode regions.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4246
diff
changeset
|
73 |
4690
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4596
diff
changeset
|
74 ;; When this file is being compiled, all the charsets have been loaded, so |
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4596
diff
changeset
|
75 ;; we can construct the query-skip-chars-arg string correctly. |
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4596
diff
changeset
|
76 (set-unicode-query-skip-chars-args |
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4596
diff
changeset
|
77 (eval-when-compile |
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4596
diff
changeset
|
78 (when-fboundp 'map-charset-chars |
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4596
diff
changeset
|
79 (loop |
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4596
diff
changeset
|
80 for charset in (charset-list) |
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4596
diff
changeset
|
81 with skip-chars-string = "" |
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4596
diff
changeset
|
82 do |
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4596
diff
changeset
|
83 (block no-ucs-mapping |
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4596
diff
changeset
|
84 (map-charset-chars |
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4596
diff
changeset
|
85 #'(lambda (begin end) |
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4596
diff
changeset
|
86 (loop |
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4596
diff
changeset
|
87 while (and begin (>= end begin)) |
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4596
diff
changeset
|
88 do |
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4596
diff
changeset
|
89 (when (= -1 (char-to-unicode begin)) |
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4596
diff
changeset
|
90 (return-from no-ucs-mapping)) |
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4596
diff
changeset
|
91 (setq begin (int-to-char (1+ begin))))) |
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4596
diff
changeset
|
92 charset) |
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4596
diff
changeset
|
93 (setq skip-chars-string |
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4596
diff
changeset
|
94 (concat skip-chars-string |
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4596
diff
changeset
|
95 (charset-skip-chars-string charset)))) |
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4596
diff
changeset
|
96 finally return skip-chars-string))) |
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4596
diff
changeset
|
97 unicode-invalid-sequence-regexp-range |
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4596
diff
changeset
|
98 (eval-when-compile |
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4596
diff
changeset
|
99 (concat (loop |
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4596
diff
changeset
|
100 for i from #x80 to #xFF |
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4596
diff
changeset
|
101 collect (aref (decode-coding-string (int-char i) |
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4596
diff
changeset
|
102 'utf-8) 0))))) |
3707 | 103 |
3767 | 104 ;; At this point in the dump, all the charsets have been loaded. Now, load |
105 ;; their Unicode mappings. | |
106 (if load-unicode-tables-at-dump-time | |
107 (let ((data-directory (expand-file-name "etc" source-directory))) | |
108 (load-unicode-tables))) | |
109 | |
4246 | 110 ;;; general-late.el ends here |