Mercurial > hg > xemacs-beta
annotate tests/automated/tag-tests.el @ 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 | 43b4a54fbf66 |
| children | 189fb67ca31a |
| rev | line source |
|---|---|
| 2071 | 1 ;; Copyright (C) 2004 Vin Shelton |
| 2 | |
| 3 ;; Author: Vin Shelton <acs@xemacs.org> | |
| 4 ;; Maintainer: Vin Shelton <acs@xemacs.org> | |
| 5 ;; Created: 2004 | |
| 6 ;; Keywords: tests | |
| 7 | |
| 8 ;; This file is part of XEmacs. | |
| 9 | |
| 10 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 11 ;; under the terms of the GNU General Public License as published by | |
| 12 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 13 ;; any later version. | |
| 14 | |
| 15 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 16 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 18 ;; General Public License for more details. | |
| 19 | |
| 20 ;; You should have received a copy of the GNU General Public License | |
| 21 ;; along with XEmacs; see the file COPYING. If not, write to the Free | |
| 22 ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | |
| 23 ;; 02111-1307, USA. | |
| 24 | |
| 25 ;;; Synched up with: Not in FSF. | |
| 26 | |
| 27 ;;; Commentary: | |
| 28 | |
| 2073 | 29 ;; Test tag support. |
| 2071 | 30 ;; See test-harness.el for instructions on how to run these tests. |
| 31 | |
| 32 (let ((testfile "tag-test.c") | |
| 2073 | 33 (tagfile "TAGS") |
| 34 (tags-build-completion-table nil)) | |
| 35 | |
| 36 (cd (temp-directory)) | |
| 2071 | 37 |
| 38 ;; Create a TAGS file | |
| 39 (with-temp-file tagfile | |
| 40 (insert | |
| 41 " | |
| 42 tag-test.c,99 | |
| 2076 | 43 struct mystruct mystruct2,1 |
| 2071 | 44 struct mystruct *foo\(4,23 |
| 2076 | 45 DEFUN \(\"require\", Frequire,require,7,51 |
| 2071 | 46 ")) |
| 47 | |
| 48 ;; Create the test file | |
| 49 (with-temp-file testfile | |
| 50 (insert | |
| 51 " | |
| 52 struct mystruct { }; | |
| 53 | |
| 54 struct mystruct *foo\(\) { | |
| 55 } | |
| 56 | |
| 57 DEFUN \(\"require\", Frequire, 1, 2, 0, /* | |
| 58 If feature FEATURE is not loaded, load it from FILENAME. | |
| 59 If FEATURE is not a member of the list `features', then the feature | |
| 60 is not loaded; so load the file FILENAME. | |
| 61 If FILENAME is omitted, the printname of FEATURE is used as the file name. | |
| 62 */ | |
| 63 \(feature, filename\)\) | |
| 64 { | |
| 65 } | |
| 66 ")) | |
| 67 | |
| 68 (let ((tags-always-exact t)) | |
| 69 | |
| 70 ;; Search for the tag "mystruct"; this should succeed | |
| 3472 | 71 (Silence-Message |
| 72 (find-tag "mystruct")) | |
| 2071 | 73 (Assert (eq (point) 2)) |
| 74 | |
| 75 ;; Search again. The search should fail, based on the patch that | |
| 76 ;; Sven Grundmann submitted for 21.4.16. | |
| 77 (Check-Error-Message error "No more entries matching mystruct" | |
| 3472 | 78 (Silence-Message |
| 79 (tags-loop-continue)))) | |
| 2071 | 80 |
| 81 (let ((tags-always-exact nil)) | |
| 82 | |
| 83 ;; Search for the definition of "require". Until the etags.el upgrade | |
| 84 ;; from 21.5 in 21.4.16, this test would fail. | |
| 85 (condition-case nil | |
| 3472 | 86 (Silence-Message |
| 87 (find-tag "require")) | |
| 2071 | 88 (t t)) |
| 89 (Assert (eq (point) 52))) | |
| 90 | |
| 91 (kill-buffer testfile) | |
| 92 (delete-file testfile) | |
| 93 (kill-buffer tagfile) | |
| 94 (delete-file tagfile)) |