Mercurial > hg > xemacs-beta
view tests/automated/search-tests.el @ 5015:d95c102a96d3
cleanups for specifier font stages, from ben-unicode-internal (preparation for eliminating shadowed warnings)
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-08 Ben Wing <ben@xemacs.org>
* faces.c:
* faces.c (face_property_matching_instance):
* faces.c (ensure_face_cachel_contains_charset):
* faces.h (FACE_FONT):
* lisp.h:
* lisp.h (enum font_specifier_matchspec_stages):
* objects-msw.c:
* objects-msw.c (mswindows_font_spec_matches_charset):
* objects-msw.c (mswindows_find_charset_font):
* objects-tty.c:
* objects-tty.c (tty_font_spec_matches_charset):
* objects-tty.c (tty_find_charset_font):
* objects-xlike-inc.c:
* objects-xlike-inc.c (XFUN):
* objects-xlike-inc.c (xft_find_charset_font):
* objects.c:
* objects.c (font_instantiate):
* objects.c (FROB):
* specifier.c:
* specifier.c (charset_matches_specifier_tag_set_p):
* specifier.c (call_charset_predicate):
* specifier.c (define_specifier_tag):
* specifier.c (Fdefine_specifier_tag):
* specifier.c (setup_charset_initial_specifier_tags):
* specifier.c (specifier_instance_from_inst_list):
* specifier.c (FROB):
* specifier.c (vars_of_specifier):
* specifier.h:
Rename the specifier-font-matching stages in preparation for
eliminating shadowed warnings, some other related fixes from
ben-unicode-internal.
1. Rename raw enums:
initial -> STAGE_INITIAL
final -> STAGE_FINAL
impossible -> NUM_MATCHSPEC_STAGES
2. Move `enum font_specifier_matchspec_stages' from
specifier.h to lisp.h.
3. Whitespace changes to match coding standards.
4. Eliminate unused second argument STAGE in charset predicates
that don't use it -- the code that calls the charset predicates
is now smart enough to supply the right number of arguments
automatically.
5. Add some long(ish) comments and authorial notices, esp. in
objects.c.
6. In specifier.c, change Vcharset_tag_lists from a vector over
leading bytes to a hash table over charsets. This change is
unnecessary currently but doesn't hurt and will be required
when we merge in Unicode-internal.
7. In specifier.c, extract out the code that calls charset predicates
into a function call_charset_predicate().
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 08 Feb 2010 16:51:25 -0600 |
parents | 9e7f5a77cc84 |
children | efaa6cd845e5 |
line wrap: on
line source
;;; -*- coding: iso-8859-1 -*- ;; Copyright (C) 2000 Free Software Foundation, Inc. ;; Copyright (C) 2010 Ben Wing. ;; Author: Yoshiki Hayashi <yoshiki@xemacs.org> ;; Maintainer: Yoshiki Hayashi <yoshiki@xemacs.org> ;; Created: 2000 ;; 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 of non-regexp searching. ;; Split out of case-tests.el. ;; NOTE NOTE NOTE: See also: ;; ;; (1) regexp-tests.el, for regexp searching. ;; (2) case-tests.el, for some case-related searches. ;; NOTE NOTE NOTE: There is some domain overlap among case-tests.el, ;; regexp-tests.el and search-tests.el. See case-tests.el. (with-temp-buffer (insert "Test Buffer") (let ((case-fold-search t)) (goto-char (point-min)) (Assert-eq (search-forward "test buffer" nil t) 12) (goto-char (point-min)) (Assert-eq (search-forward "Test buffer" nil t) 12) (goto-char (point-min)) (Assert-eq (search-forward "Test Buffer" nil t) 12) (setq case-fold-search nil) (goto-char (point-min)) (Assert (not (search-forward "test buffer" nil t))) (goto-char (point-min)) (Assert (not (search-forward "Test buffer" nil t))) (goto-char (point-min)) (Assert-eq (search-forward "Test Buffer" nil t) 12))) (with-temp-buffer (insert "abcdefghijklmnäopqrstuÄvwxyz") ;; case insensitive (Assert (not (search-forward "ö" nil t))) (goto-char (point-min)) (Assert-eq 16 (search-forward "ä" nil t)) (Assert-eq 24 (search-forward "ä" nil t)) (goto-char (point-min)) (Assert-eq 16 (search-forward "Ä" nil t)) (Assert-eq 24 (search-forward "Ä" nil t)) (goto-char (point-max)) (Assert-eq 23 (search-backward "ä" nil t)) (Assert-eq 15 (search-backward "ä" nil t)) (goto-char (point-max)) (Assert-eq 23 (search-backward "Ä" nil t)) (Assert-eq 15 (search-backward "Ä" nil t)) ;; case sensitive (setq case-fold-search nil) (goto-char (point-min)) (Assert (not (search-forward "ö" nil t))) (goto-char (point-min)) (Assert-eq 16 (search-forward "ä" nil t)) (Assert (not (search-forward "ä" nil t))) (goto-char (point-min)) (Assert-eq 24 (search-forward "Ä" nil t)) (goto-char 16) (Assert-eq 24 (search-forward "Ä" nil t)) (goto-char (point-max)) (Assert-eq 15 (search-backward "ä" nil t)) (goto-char 15) (Assert (not (search-backward "ä" nil t))) (goto-char (point-max)) (Assert-eq 23 (search-backward "Ä" nil t)) (Assert (not (search-backward "Ä" nil t)))) (with-temp-buffer (insert "aaaaäÄäÄäÄäÄäÄbbbb") (goto-char (point-min)) (Assert-eq 15 (search-forward "ää" nil t 5)) (goto-char (point-min)) (Assert (not (search-forward "ää" nil t 6))) (goto-char (point-max)) (Assert-eq 5 (search-backward "ää" nil t 5)) (goto-char (point-max)) (Assert (not (search-backward "ää" nil t 6)))) (when (featurep 'mule) (let* ((hiragana-a (make-char 'japanese-jisx0208 36 34)) (a-diaeresis ?ä) (case-table (copy-case-table (standard-case-table))) (str-hiragana-a (char-to-string hiragana-a)) (str-a-diaeresis (char-to-string a-diaeresis)) (string (concat str-hiragana-a str-a-diaeresis))) (put-case-table-pair hiragana-a a-diaeresis case-table) (with-temp-buffer (set-case-table case-table) (insert hiragana-a "abcdefg" a-diaeresis) ;; forward (goto-char (point-min)) (Assert (not (search-forward "ö" nil t))) (goto-char (point-min)) (Assert-eq 2 (search-forward str-hiragana-a nil t)) (goto-char (point-min)) (Assert-eq 2 (search-forward str-a-diaeresis nil t)) (goto-char (1+ (point-min))) (Assert-eq (point-max) (search-forward str-hiragana-a nil t)) (goto-char (1+ (point-min))) (Assert-eq (point-max) (search-forward str-a-diaeresis nil t)) ;; backward (goto-char (point-max)) (Assert (not (search-backward "ö" nil t))) (goto-char (point-max)) (Assert-eq (1- (point-max)) (search-backward str-hiragana-a nil t)) (goto-char (point-max)) (Assert-eq (1- (point-max)) (search-backward str-a-diaeresis nil t)) (goto-char (1- (point-max))) (Assert-eq 1 (search-backward str-hiragana-a nil t)) (goto-char (1- (point-max))) (Assert-eq 1 (search-backward str-a-diaeresis nil t)) (replace-match "a") (Assert (looking-at (format "abcdefg%c" a-diaeresis)))) (with-temp-buffer (set-case-table case-table) (insert string) (insert string) (insert string) (insert string) (insert string) (goto-char (point-min)) (Assert-eq 11 (search-forward string nil t 5)) (goto-char (point-min)) (Assert (not (search-forward string nil t 6))) (goto-char (point-max)) (Assert-eq 1 (search-backward string nil t 5)) (goto-char (point-max)) (Assert (not (search-backward string nil t 6)))))) ;; Bug reported in http://mid.gmane.org/y9lk5lu5orq.fsf@deinprogramm.de from ;; Michael Sperber. Fixed 2008-01-29. (with-string-as-buffer-contents "\n\nDer beruhmte deutsche Flei\xdf\n\n" (goto-char (point-min)) (Assert (search-forward "Flei\xdf"))) (with-temp-buffer (let ((target "M\xe9zard") (debug-xemacs-searches 1)) (Assert (not (search-forward target nil t))) (insert target) (goto-char (point-min)) ;; #### search-algorithm-used is simple-search after the following, ;; which shouldn't be necessary; it should be possible to use ;; Boyer-Moore. ;; ;; But searches for ASCII strings in buffers with nothing above ?\xFF ;; use Boyer Moore with the current implementation, which is the ;; important thing for the Gnus use case. (Assert= (1+ (length target)) (search-forward target nil t)))) (Skip-Test-Unless (boundp 'debug-xemacs-searches) ; normal when we have DEBUG_XEMACS "not a DEBUG_XEMACS build" "checks that the algorithm chosen by #'search-forward is relatively sane" (let ((debug-xemacs-searches 1) newcase) (with-temp-buffer (insert "\n\nDer beruehmte deutsche Fleiss\n\n") (goto-char (point-min)) (Assert (search-forward "Fleiss")) (delete-region (point-min) (point-max)) (insert "\n\nDer ber\xfchmte deutsche Flei\xdf\n\n") (goto-char (point-min)) (Assert (search-forward "Flei\xdf")) (Assert-eq 'boyer-moore search-algorithm-used) (delete-region (point-min) (point-max)) (when (featurep 'mule) (insert "\n\nDer ber\xfchmte deutsche Flei\xdf\n\n") (goto-char (point-min)) (Assert (search-forward (format "Fle%c\xdf" (make-char 'latin-iso8859-9 #xfd)))) (Assert-eq 'boyer-moore search-algorithm-used) (insert (make-char 'latin-iso8859-9 #xfd)) (goto-char (point-min)) (Assert (search-forward "Flei\xdf")) (Assert-eq 'simple-search search-algorithm-used) (goto-char (point-min)) (Assert (search-forward (format "Fle%c\xdf" (make-char 'latin-iso8859-9 #xfd)))) (Assert-eq 'simple-search search-algorithm-used) (setq newcase (copy-case-table (standard-case-table))) (put-case-table-pair (make-char 'ethiopic #x23 #x23) (make-char 'ethiopic #x23 #x25) newcase) (with-case-table ;; Check that when a multidimensional character has case and two ;; repeating octets, searches involving it in the search pattern ;; use simple-search; otherwise boyer_moore() gets confused in the ;; construction of the stride table. newcase (delete-region (point-min) (point-max)) (insert ?0) (insert (make-char 'ethiopic #x23 #x23)) (insert ?1) (goto-char (point-min)) (Assert-eql (search-forward (string (make-char 'ethiopic #x23 #x25)) nil t) 3) (Assert-eq 'simple-search search-algorithm-used) (goto-char (point-min)) (Assert-eql (search-forward (string (make-char 'ethiopic #x23 #x27)) nil t) nil) (Assert-eq 'boyer-moore search-algorithm-used)))))) ;; XEmacs bug of long standing. (with-temp-buffer (insert "foo\201bar") (goto-char (point-min)) (Assert-eq (search-forward "\201" nil t) 5))