Mercurial > hg > xemacs-beta
view tests/automated/extent-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 | 20ae8821c23d |
children | 189fb67ca31a |
line wrap: on
line source
;; Copyright (C) 2001 Free Software Foundation, Inc. ;; Author: Hrvoje Niksic <hniksic@xemacs.org> ;; Maintainer: Hrvoje Niksic <hniksic@xemacs.org> ;; Created: 1999 ;; Keywords: tests ;; 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. ;;; Synched up with: Not in FSF. ;;; Commentary: ;; Test extents operations. ;; See test-harness.el for instructions on how to run these tests. (eval-when-compile (condition-case nil (require 'test-harness) (file-error (push "." load-path) (when (and (boundp 'load-file-name) (stringp load-file-name)) (push (file-name-directory load-file-name) load-path)) (require 'test-harness)))) ;;----------------------------------------------------- ;; Creating and attaching. ;;----------------------------------------------------- (with-temp-buffer (let ((extent (make-extent nil nil)) (string "somecoolstring")) ;; Detached extent. (Assert (extent-detached-p extent)) ;; Put it in a buffer. (set-extent-endpoints extent 1 1 (current-buffer)) (Assert (eq (extent-object extent) (current-buffer))) ;; And then into another buffer. (with-temp-buffer (set-extent-endpoints extent 1 1 (current-buffer)) (Assert (eq (extent-object extent) (current-buffer)))) ;; Now that the buffer doesn't exist, extent should be detached ;; again. (Assert (extent-detached-p extent)) ;; This line crashes XEmacs 21.2.46 and prior. (set-extent-endpoints extent 1 (length string) string) (Assert (eq (extent-object extent) string)) ) (let ((extent (make-extent 1 1))) ;; By default, extent should be closed-open (Assert (eq (get extent 'start-closed) t)) (Assert (eq (get extent 'start-open) nil)) (Assert (eq (get extent 'end-open) t)) (Assert (eq (get extent 'end-closed) nil)) ;; Make it closed-closed. (set-extent-property extent 'end-closed t) (Assert (eq (get extent 'start-closed) t)) (Assert (eq (get extent 'start-open) nil)) (Assert (eq (get extent 'end-open) nil)) (Assert (eq (get extent 'end-closed) t)) ;; open-closed (set-extent-property extent 'start-open t) (Assert (eq (get extent 'start-closed) nil)) (Assert (eq (get extent 'start-open) t)) (Assert (eq (get extent 'end-open) nil)) (Assert (eq (get extent 'end-closed) t)) ;; open-open (set-extent-property extent 'end-open t) (Assert (eq (get extent 'start-closed) nil)) (Assert (eq (get extent 'start-open) t)) (Assert (eq (get extent 'end-open) t)) (Assert (eq (get extent 'end-closed) nil))) ) ;;----------------------------------------------------- ;; Insertion behavior. ;;----------------------------------------------------- (defun et-range (extent) "List (START-POSITION END-POSITION) of EXTENT." (list (extent-start-position extent) (extent-end-position extent))) (defun et-insert-at (string position) "Insert STRING at POSITION in the current buffer." (save-excursion (goto-char position) (insert string))) ;; Test insertion at the beginning, middle, and end of the extent. ;; closed-open (with-temp-buffer (insert "###eee###") (let ((e (make-extent 4 7))) ;; current state: "###[eee)###" ;; 123 456 789 (Assert (equal (et-range e) '(4 7))) (et-insert-at "xxx" 4) ;; current state: "###[xxxeee)###" ;; 123 456789 012 (Assert (equal (et-range e) '(4 10))) (et-insert-at "yyy" 7) ;; current state: "###[xxxyyyeee)###" ;; 123 456789012 345 (Assert (equal (et-range e) '(4 13))) (et-insert-at "zzz" 13) ;; current state: "###[xxxyyyeee)zzz###" ;; 123 456789012 345678 (Assert (equal (et-range e) '(4 13))) )) ;; closed-closed (with-temp-buffer (insert "###eee###") (let ((e (make-extent 4 7))) (put e 'end-closed t) ;; current state: "###[eee]###" ;; 123 456 789 (Assert (equal (et-range e) '(4 7))) (et-insert-at "xxx" 4) ;; current state: "###[xxxeee]###" ;; 123 456789 012 (Assert (equal (et-range e) '(4 10))) (et-insert-at "yyy" 7) ;; current state: "###[xxxyyyeee]###" ;; 123 456789012 345 (Assert (equal (et-range e) '(4 13))) (et-insert-at "zzz" 13) ;; current state: "###[xxxyyyeeezzz]###" ;; 123 456789012345 678 (Assert (equal (et-range e) '(4 16))) )) ;; open-closed (with-temp-buffer (insert "###eee###") (let ((e (make-extent 4 7))) (put e 'start-open t) (put e 'end-closed t) ;; current state: "###(eee]###" ;; 123 456 789 (Assert (equal (et-range e) '(4 7))) (et-insert-at "xxx" 4) ;; current state: "###xxx(eee]###" ;; 123456 789 012 (Assert (equal (et-range e) '(7 10))) (et-insert-at "yyy" 8) ;; current state: "###xxx(eyyyee]###" ;; 123456 789012 345 (Assert (equal (et-range e) '(7 13))) (et-insert-at "zzz" 13) ;; current state: "###xxx(eyyyeezzz]###" ;; 123456 789012345 678 (Assert (equal (et-range e) '(7 16))) )) ;; open-open (with-temp-buffer (insert "###eee###") (let ((e (make-extent 4 7))) (put e 'start-open t) ;; current state: "###(eee)###" ;; 123 456 789 (Assert (equal (et-range e) '(4 7))) (et-insert-at "xxx" 4) ;; current state: "###xxx(eee)###" ;; 123456 789 012 (Assert (equal (et-range e) '(7 10))) (et-insert-at "yyy" 8) ;; current state: "###xxx(eyyyee)###" ;; 123456 789012 345 (Assert (equal (et-range e) '(7 13))) (et-insert-at "zzz" 13) ;; current state: "###xxx(eyyyee)zzz###" ;; 123456 789012 345678 (Assert (equal (et-range e) '(7 13))) )) ;;----------------------------------------------------- ;; Deletion behavior. ;;----------------------------------------------------- (dolist (props '((start-closed t end-open t) (start-closed t end-open nil) (start-closed nil end-open nil) (start-closed nil end-open t))) ;; Deletion needs to behave the same regardless of the open-ness of ;; the boundaries. (with-temp-buffer (insert "xxxxxxxxxx") (let ((e (make-extent 3 9))) (set-extent-properties e props) ;; current state: xx[xxxxxx]xx ;; 12 345678 90 (Assert (equal (et-range e) '(3 9))) (delete-region 1 2) ;; current state: x[xxxxxx]xx ;; 1 234567 89 (Assert (equal (et-range e) '(2 8))) (delete-region 2 4) ;; current state: x[xxxx]xx ;; 1 2345 67 (Assert (equal (et-range e) '(2 6))) (delete-region 1 3) ;; current state: [xxx]xx ;; 123 45 (Assert (equal (et-range e) '(1 4))) (delete-region 3 5) ;; current state: [xx]x ;; 12 3 (Assert (equal (et-range e) '(1 3))) ))) ;;; #### Should have a test for read-only-ness and insertion and ;;; deletion! ;;----------------------------------------------------- ;; `detachable' property ;;----------------------------------------------------- (dolist (props '((start-closed t end-open t) (start-closed t end-open nil) (start-closed nil end-open nil) (start-closed nil end-open t))) ;; `detachable' shouldn't relate to region properties, hence the ;; loop. (with-temp-buffer (insert "###eee###") (let ((e (make-extent 4 7))) (set-extent-properties e props) (Assert (get e 'detachable)) (Assert (not (extent-detached-p e))) (delete-region 4 5) ;; ###ee### (not detached yet) (Assert (not (extent-detached-p e))) (delete-region 4 6) ;; ###### (should be detached now) (Assert (extent-detached-p e)))) (with-temp-buffer (insert "###eee###") (let ((e (make-extent 4 7))) (set-extent-properties e props) (put e 'detachable nil) (Assert (not (get e 'detachable))) (Assert (not (extent-detached-p e))) (delete-region 4 5) ;; ###ee### (Assert (not (extent-detached-p e))) (delete-region 4 6) ;; ###[]### (Assert (not (extent-detached-p e))) (Assert (equal (et-range e) '(4 4))) )) ) ;;----------------------------------------------------- ;; Zero-length extents. ;;----------------------------------------------------- ;; closed-open (should stay put) (with-temp-buffer (insert "######") (let ((e (make-extent 4 4))) (et-insert-at "foo" 4) (Assert (equal (et-range e) '(4 4))))) ;; open-closed (should move) (with-temp-buffer (insert "######") (let ((e (make-extent 4 4))) (put e 'start-open t) (put e 'end-closed t) (et-insert-at "foo" 4) (Assert (equal (et-range e) '(7 7))))) ;; closed-closed (should extend) (with-temp-buffer (insert "######") (let ((e (make-extent 4 4))) (put e 'end-closed t) (et-insert-at "foo" 4) (Assert (equal (et-range e) '(4 7))))) ;; open-open (illegal; forced to behave like closed-open) (with-temp-buffer (insert "######") (let ((e (make-extent 4 4))) (put e 'start-open t) (et-insert-at "foo" 4) (Assert (equal (et-range e) '(4 4)))))