Mercurial > hg > xemacs-beta
annotate netinstall/ini.h @ 4690:257b468bf2ca
Move the #'query-coding-region implementation to C.
This is necessary because there is no reasonable way to access the
corresponding mswindows-multibyte functionality from Lisp, and we need such
functionality if we're going to have a reliable and portable
#'query-coding-region implementation. However, this change doesn't yet
provide #'query-coding-region for the mswindow-multibyte coding systems,
there should be no functional differences between an XEmacs with this change
and one without it.
src/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
Move the #'query-coding-region implementation to C.
This is necessary because there is no reasonable way to access the
corresponding mswindows-multibyte functionality from Lisp, and we
need such functionality if we're going to have a reliable and
portable #'query-coding-region implementation. However, this
change doesn't yet provide #'query-coding-region for the
mswindow-multibyte coding systems, there should be no functional
differences between an XEmacs with this change and one without it.
* mule-coding.c (struct fixed_width_coding_system):
Add a new coding system type, fixed_width, and implement it. It
uses the CCL infrastructure but has a much simpler creation API,
and its own query_method, formerly in lisp/mule/mule-coding.el.
* unicode.c:
Move the Unicode query method implementation here from
unicode.el.
* lisp.h: Declare Fmake_coding_system_internal, Fcopy_range_table
here.
* intl-win32.c (complex_vars_of_intl_win32):
Use Fmake_coding_system_internal, not Fmake_coding_system.
* general-slots.h: Add Qsucceeded, Qunencodable, Qinvalid_sequence
here.
* file-coding.h (enum coding_system_variant):
Add fixed_width_coding_system here.
(struct coding_system_methods):
Add query_method and query_lstream_method to the coding system
methods.
Provide flags for the query methods.
Declare the default query method; initialise it correctly in
INITIALIZE_CODING_SYSTEM_TYPE.
* file-coding.c (default_query_method):
New function, the default query method for coding systems that do
not set it. Moved from coding.el.
(make_coding_system_1):
Accept new elements in PROPS in #'make-coding-system; aliases, a
list of aliases; safe-chars and safe-charsets (these were
previously accepted but not saved); and category.
(Fmake_coding_system_internal):
New function, what used to be #'make-coding-system--on Mule
builds, we've now moved some of the functionality of this to
Lisp.
(Fcoding_system_canonical_name_p):
Move this earlier in the file, since it's now called from within
make_coding_system_1.
(Fquery_coding_region):
Move the implementation of this here, from coding.el.
(complex_vars_of_file_coding):
Call Fmake_coding_system_internal, not Fmake_coding_system;
specify safe-charsets properties when we're a mule build.
* extents.h (mouse_highlight_priority, Fset_extent_priority,
Fset_extent_face, Fmap_extents):
Make these available to other C files.
lisp/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
Move the #'query-coding-region implementation to C.
* coding.el:
Consolidate code that depends on the presence or absence of Mule
at the end of this file.
(default-query-coding-region, query-coding-region):
Move these functions to C.
(default-query-coding-region-safe-charset-skip-chars-map):
Remove this variable, the corresponding C variable is
Vdefault_query_coding_region_chartab_cache in file-coding.c.
(query-coding-string): Update docstring to reflect actual multiple
values, be more careful about not modifying a range table that
we're currently mapping over.
(encode-coding-char): Make the implementation of this simpler.
(featurep 'mule): Autoload #'make-coding-system from
mule/make-coding-system.el if we're a mule build; provide an
appropriate compiler macro.
Do various non-mule compatibility things if we're not a mule
build.
* update-elc.el (additional-dump-dependencies):
Add mule/make-coding-system as a dump time dependency if we're a
mule build.
* unicode.el (ccl-encode-to-ucs-2):
(decode-char):
(encode-char):
Move these earlier in the file, for the sake of some byte compile
warnings.
(unicode-query-coding-region):
Move this to unicode.c
* mule/make-coding-system.el:
New file, not dumped. Contains the functionality to rework the
arguments necessary for fixed-width coding systems, and contains
the implementation of #'make-coding-system, which now calls
#'make-coding-system-internal.
* mule/vietnamese.el (viscii):
* mule/latin.el (iso-8859-2):
(windows-1250):
(iso-8859-3):
(iso-8859-4):
(iso-8859-14):
(iso-8859-15):
(iso-8859-16):
(iso-8859-9):
(macintosh):
(windows-1252):
* mule/hebrew.el (iso-8859-8):
* mule/greek.el (iso-8859-7):
(windows-1253):
* mule/cyrillic.el (iso-8859-5):
(koi8-r):
(koi8-u):
(windows-1251):
(alternativnyj):
(koi8-ru):
(koi8-t):
(koi8-c):
(koi8-o):
* mule/arabic.el (iso-8859-6):
(windows-1256):
Move all these coding systems to being of type fixed-width, not of
type CCL. This allows the distinct query-coding-region for them to
be in C, something which will eventually allow us to implement
query-coding-region for the mswindows-multibyte coding systems.
* mule/general-late.el (posix-charset-to-coding-system-hash):
Document why we're pre-emptively persuading the byte compiler that
the ELC for this file needs to be written using escape-quoted.
Call #'set-unicode-query-skip-chars-args, now the Unicode
query-coding-region implementation is in C.
* mule/thai-xtis.el (tis-620):
Don't bother checking whether we're XEmacs or not here.
* mule/mule-coding.el:
Move the eight bit fixed-width functionality from this file to
make-coding-system.el.
tests/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
* automated/mule-tests.el:
Check a coding system's type, not an 8-bit-fixed property, for
whether that coding system should be treated as a fixed-width
coding system.
* automated/query-coding-tests.el:
Don't test the query coding functionality for mswindows-multibyte
coding systems, it's not yet implemented.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sat, 19 Sep 2009 22:53:13 +0100 |
parents | ce0b3f2eff35 |
children |
rev | line source |
---|---|
448 | 1 /* |
2 * Copyright (c) 2000, Red Hat, Inc. | |
3 * | |
4 * This program is free software; you can redistribute it and/or modify | |
5 * it under the terms of the GNU General Public License as published by | |
6 * the Free Software Foundation; either version 2 of the License, or | |
7 * (at your option) any later version. | |
8 * | |
9 * A copy of the GNU General Public License can be found at | |
10 * http://www.gnu.org/ | |
11 * | |
12 * Written by DJ Delorie <dj@cygnus.com> | |
13 * | |
14 */ | |
15 | |
16 /* When setup.ini is parsed, the information is stored according to | |
17 the declarations here. ini.cc (via inilex and iniparse) | |
18 initializes these structures. choose.cc sets the action and trust | |
19 fields. download.cc downloads any needed files for selected | |
20 packages (the chosen "install" field). install.cc installs | |
21 selected packages. */ | |
22 | |
23 #define YYSTYPE char * | |
24 | |
25 /* lowest number must be most trusted, highest least trusted */ | |
26 #define TRUST_PREV 0 | |
27 #define TRUST_CURR 1 | |
28 #define TRUST_TEST 2 | |
29 #define NTRUST 3 | |
30 #define TRUST_UNKNOWN 3 /* intentionally not in NTRUST */ | |
31 | |
32 #define TY_GENERIC 0 | |
33 #define TY_CYGWIN 1 | |
34 #define TY_NATIVE 2 | |
35 | |
36 #define ACTION_UNKNOWN 0 | |
37 #define ACTION_SAME 1 | |
38 #define ACTION_NEW 2 | |
39 #define ACTION_UPGRADE 3 | |
40 #define ACTION_UNINSTALL 4 | |
41 #define ACTION_ERROR 5 | |
42 | |
43 #define SRCACTION_NO 0 | |
44 #define SRCACTION_YES 1 | |
45 | |
46 typedef struct { | |
47 char *name; /* package name, like "cygwin" */ | |
48 char *sdesc; /* short description (replaces "name" if provided) */ | |
49 char *ldesc; /* long description (multi-line) */ | |
50 int action; /* ACTION_* - only NEW and UPGRADE get installed */ | |
51 int srcaction;/* SRCACTION_ */ | |
52 int trust; /* TRUST_* (selects among info[] below) */ | |
53 int type; /* TY_GENERIC, TY_CYGWIN or TY_NATIVE. */ | |
54 | |
55 struct { | |
56 char *version; /* version part of filename */ | |
57 char *install; /* file name to install */ | |
58 int install_size; /* in bytes */ | |
59 char *source; /* sources for installed binaries */ | |
60 int source_size; /* in bytes */ | |
61 } info[NTRUST+1]; /* +1 for TRUST_UNKNOWN */ | |
62 } Package; | |
63 | |
454 | 64 #ifdef __cplusplus |
65 extern "C" { | |
66 #endif | |
67 | |
448 | 68 extern Package *package; |
69 extern Package *xemacs_package; | |
70 | |
71 extern int npackages; | |
72 | |
73 Package *new_package (char *name); | |
74 void ini_init (char *string); | |
75 | |
657 | 76 #define pinfo(p) ((p).info[(p).trust]) |
77 #define pi pinfo(package[i]) | |
448 | 78 |
79 #define LOOP_PACKAGES \ | |
80 for (i=0; i<npackages; i++) \ | |
81 if ((package[i].action == ACTION_NEW \ | |
82 || package[i].action == ACTION_UPGRADE) \ | |
83 && pi.install) | |
84 | |
85 #ifdef __cplusplus | |
86 } | |
87 #endif |