Mercurial > hg > xemacs-beta
annotate tests/automated/search-tests.el @ 4897:91a023144e72
fix longstanding search bug involving searching for Control-1 chars
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-01-29 Ben Wing <ben@xemacs.org>
* search.c (boyer_moore): Fix longstanding bug involving
searching for Control-1 chars; code was trying to directly
extract the last byte in the textual representation of a char
from an Ichar (and doing it in a buggy fashion) rather than
just converting the Ichar to text and looking at the last byte.
tests/ChangeLog addition:
2010-01-29 Ben Wing <ben@xemacs.org>
* automated/search-tests.el:
New file.
* automated/search-tests.el:
* automated/case-tests.el:
* automated/case-tests.el (pristine-case-table): Removed.
* automated/case-tests.el (uni-mappings):
* automated/lisp-tests.el:
* automated/regexp-tests.el:
Extract some search-related code from case-tests and regexp-tests
and move to search-tests. Move some regexp-related code from
lisp-tests to regexp-tests.
Write a comment trying to express the proper division of labor
between case-tests, search-tests and regexp-tests.
Add a new test for the Control-1 search bug.
Fix a buggy test in the Unicode torture-test section of case-tests.el.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Fri, 29 Jan 2010 20:57:42 -0600 |
parents | |
children | c902301f8b7d |
rev | line source |
---|---|
4897
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
1 ;;; -*- coding: iso-8859-1 -*- |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
2 |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
3 ;; Copyright (C) 2000 Free Software Foundation, Inc. |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
4 ;; Copyright (C) 2010 Ben Wing. |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
5 |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
6 ;; Author: Yoshiki Hayashi <yoshiki@xemacs.org> |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
7 ;; Maintainer: Yoshiki Hayashi <yoshiki@xemacs.org> |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
8 ;; Created: 2000 |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
9 ;; Keywords: tests |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
10 |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
11 ;; This file is part of XEmacs. |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
12 |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
13 ;; XEmacs is free software; you can redistribute it and/or modify it |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
14 ;; under the terms of the GNU General Public License as published by |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
15 ;; the Free Software Foundation; either version 2, or (at your option) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
16 ;; any later version. |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
17 |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
18 ;; XEmacs is distributed in the hope that it will be useful, but |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
19 ;; WITHOUT ANY WARRANTY; without even the implied warranty of |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
21 ;; General Public License for more details. |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
22 |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
23 ;; You should have received a copy of the GNU General Public License |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
24 ;; along with XEmacs; see the file COPYING. If not, write to the Free |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
25 ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
26 ;; 02111-1307, USA. |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
27 |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
28 ;;; Synched up with: Not in FSF. |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
29 |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
30 ;;; Commentary: |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
31 |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
32 ;; Test of non-regexp searching. |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
33 |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
34 ;; Split out of case-tests.el. |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
35 |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
36 ;; NOTE NOTE NOTE: See also: |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
37 ;; |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
38 ;; (1) regexp-tests.el, for regexp searching. |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
39 ;; (2) case-tests.el, for some case-related searches. |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
40 |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
41 ;; NOTE NOTE NOTE: There is some domain overlap among regexp-tests.el, |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
42 ;; search-tests.el and case-tests.el. The current rule for what goes where |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
43 ;; is: |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
44 ;; |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
45 ;; (1) Anything regexp-related goes in regexp-tests.el, including searches. |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
46 ;; (2) Non-regexp searches go in search-tests.el. This includes case-folding |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
47 ;; searches in the situation where the test tests both folding and |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
48 ;; non-folding behavior. |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
49 ;; (3) If it tests specifically case-folding search behavior, it may go in |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
50 ;; case-tets.el, especially if it is testing something non-search-related |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
51 ;; at the same time (e.g. the Unicode case map torture tests). |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
52 |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
53 (with-temp-buffer |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
54 (insert "Test Buffer") |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
55 (let ((case-fold-search t)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
56 (goto-char (point-min)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
57 (Assert-eq (search-forward "test buffer" nil t) 12) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
58 (goto-char (point-min)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
59 (Assert-eq (search-forward "Test buffer" nil t) 12) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
60 (goto-char (point-min)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
61 (Assert-eq (search-forward "Test Buffer" nil t) 12) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
62 |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
63 (setq case-fold-search nil) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
64 (goto-char (point-min)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
65 (Assert (not (search-forward "test buffer" nil t))) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
66 (goto-char (point-min)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
67 (Assert (not (search-forward "Test buffer" nil t))) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
68 (goto-char (point-min)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
69 (Assert-eq (search-forward "Test Buffer" nil t) 12))) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
70 |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
71 (with-temp-buffer |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
72 (insert "abcdefghijklmnäopqrstuÄvwxyz") |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
73 ;; case insensitive |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
74 (Assert (not (search-forward "ö" nil t))) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
75 (goto-char (point-min)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
76 (Assert-eq 16 (search-forward "ä" nil t)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
77 (Assert-eq 24 (search-forward "ä" nil t)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
78 (goto-char (point-min)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
79 (Assert-eq 16 (search-forward "Ä" nil t)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
80 (Assert-eq 24 (search-forward "Ä" nil t)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
81 (goto-char (point-max)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
82 (Assert-eq 23 (search-backward "ä" nil t)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
83 (Assert-eq 15 (search-backward "ä" nil t)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
84 (goto-char (point-max)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
85 (Assert-eq 23 (search-backward "Ä" nil t)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
86 (Assert-eq 15 (search-backward "Ä" nil t)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
87 ;; case sensitive |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
88 (setq case-fold-search nil) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
89 (goto-char (point-min)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
90 (Assert (not (search-forward "ö" nil t))) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
91 (goto-char (point-min)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
92 (Assert-eq 16 (search-forward "ä" nil t)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
93 (Assert (not (search-forward "ä" nil t))) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
94 (goto-char (point-min)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
95 (Assert-eq 24 (search-forward "Ä" nil t)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
96 (goto-char 16) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
97 (Assert-eq 24 (search-forward "Ä" nil t)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
98 (goto-char (point-max)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
99 (Assert-eq 15 (search-backward "ä" nil t)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
100 (goto-char 15) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
101 (Assert (not (search-backward "ä" nil t))) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
102 (goto-char (point-max)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
103 (Assert-eq 23 (search-backward "Ä" nil t)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
104 (Assert (not (search-backward "Ä" nil t)))) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
105 |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
106 (with-temp-buffer |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
107 (insert "aaaaäÄäÄäÄäÄäÄbbbb") |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
108 (goto-char (point-min)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
109 (Assert-eq 15 (search-forward "ää" nil t 5)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
110 (goto-char (point-min)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
111 (Assert (not (search-forward "ää" nil t 6))) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
112 (goto-char (point-max)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
113 (Assert-eq 5 (search-backward "ää" nil t 5)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
114 (goto-char (point-max)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
115 (Assert (not (search-backward "ää" nil t 6)))) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
116 |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
117 (when (featurep 'mule) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
118 (let* ((hiragana-a (make-char 'japanese-jisx0208 36 34)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
119 (a-diaeresis ?ä) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
120 (case-table (copy-case-table (standard-case-table))) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
121 (str-hiragana-a (char-to-string hiragana-a)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
122 (str-a-diaeresis (char-to-string a-diaeresis)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
123 (string (concat str-hiragana-a str-a-diaeresis))) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
124 (put-case-table-pair hiragana-a a-diaeresis case-table) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
125 (with-temp-buffer |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
126 (set-case-table case-table) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
127 (insert hiragana-a "abcdefg" a-diaeresis) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
128 ;; forward |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
129 (goto-char (point-min)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
130 (Assert (not (search-forward "ö" nil t))) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
131 (goto-char (point-min)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
132 (Assert-eq 2 (search-forward str-hiragana-a nil t)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
133 (goto-char (point-min)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
134 (Assert-eq 2 (search-forward str-a-diaeresis nil t)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
135 (goto-char (1+ (point-min))) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
136 (Assert-eq (point-max) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
137 (search-forward str-hiragana-a nil t)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
138 (goto-char (1+ (point-min))) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
139 (Assert-eq (point-max) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
140 (search-forward str-a-diaeresis nil t)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
141 ;; backward |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
142 (goto-char (point-max)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
143 (Assert (not (search-backward "ö" nil t))) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
144 (goto-char (point-max)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
145 (Assert-eq (1- (point-max)) (search-backward str-hiragana-a nil t)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
146 (goto-char (point-max)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
147 (Assert-eq (1- (point-max)) (search-backward str-a-diaeresis nil t)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
148 (goto-char (1- (point-max))) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
149 (Assert-eq 1 (search-backward str-hiragana-a nil t)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
150 (goto-char (1- (point-max))) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
151 (Assert-eq 1 (search-backward str-a-diaeresis nil t)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
152 (replace-match "a") |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
153 (Assert (looking-at (format "abcdefg%c" a-diaeresis)))) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
154 (with-temp-buffer |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
155 (set-case-table case-table) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
156 (insert string) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
157 (insert string) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
158 (insert string) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
159 (insert string) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
160 (insert string) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
161 (goto-char (point-min)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
162 (Assert-eq 11 (search-forward string nil t 5)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
163 (goto-char (point-min)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
164 (Assert (not (search-forward string nil t 6))) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
165 (goto-char (point-max)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
166 (Assert-eq 1 (search-backward string nil t 5)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
167 (goto-char (point-max)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
168 (Assert (not (search-backward string nil t 6)))))) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
169 |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
170 ;; Bug reported in http://mid.gmane.org/y9lk5lu5orq.fsf@deinprogramm.de from |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
171 ;; Michael Sperber. Fixed 2008-01-29. |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
172 (with-string-as-buffer-contents "\n\nDer beruhmte deutsche Flei\xdf\n\n" |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
173 (goto-char (point-min)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
174 (Assert (search-forward "Flei\xdf"))) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
175 |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
176 (with-temp-buffer |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
177 (let ((target "M\xe9zard") |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
178 (debug-xemacs-searches 1)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
179 (Assert (not (search-forward target nil t))) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
180 (insert target) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
181 (goto-char (point-min)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
182 ;; #### search-algorithm-used is simple-search after the following, |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
183 ;; which shouldn't be necessary; it should be possible to use |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
184 ;; Boyer-Moore. |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
185 ;; |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
186 ;; But searches for ASCII strings in buffers with nothing above ?\xFF |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
187 ;; use Boyer Moore with the current implementation, which is the |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
188 ;; important thing for the Gnus use case. |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
189 (Assert= (1+ (length target)) (search-forward target nil t)))) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
190 |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
191 (Skip-Test-Unless |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
192 (boundp 'debug-xemacs-searches) ; normal when we have DEBUG_XEMACS |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
193 "not a DEBUG_XEMACS build" |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
194 "checks that the algorithm chosen by #'search-forward is relatively sane" |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
195 (let ((debug-xemacs-searches 1)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
196 (with-temp-buffer |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
197 ;;#### Ben thinks this is unnecessary. with-temp-buffer creates |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
198 ;;a new buffer, which automatically inherits the standard case table. |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
199 ;;(set-case-table pristine-case-table) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
200 (insert "\n\nDer beruhmte deutsche Fleiss\n\n") |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
201 (goto-char (point-min)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
202 (Assert (search-forward "Fleiss")) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
203 (delete-region (point-min) (point-max)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
204 (insert "\n\nDer beruhmte deutsche Flei\xdf\n\n") |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
205 (goto-char (point-min)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
206 (Assert (search-forward "Flei\xdf")) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
207 (Assert-eq 'boyer-moore search-algorithm-used) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
208 (delete-region (point-min) (point-max)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
209 (when (featurep 'mule) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
210 (insert "\n\nDer beruhmte deutsche Flei\xdf\n\n") |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
211 (goto-char (point-min)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
212 (Assert |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
213 (search-forward (format "Fle%c\xdf" |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
214 (make-char 'latin-iso8859-9 #xfd)))) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
215 (Assert-eq 'boyer-moore search-algorithm-used) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
216 (insert (make-char 'latin-iso8859-9 #xfd)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
217 (goto-char (point-min)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
218 (Assert (search-forward "Flei\xdf")) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
219 (Assert-eq 'simple-search search-algorithm-used) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
220 (goto-char (point-min)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
221 (Assert (search-forward (format "Fle%c\xdf" |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
222 (make-char 'latin-iso8859-9 #xfd)))) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
223 (Assert-eq 'simple-search search-algorithm-used))))) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
224 |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
225 |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
226 ;; XEmacs bug of long standing. |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
227 |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
228 (with-temp-buffer |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
229 (insert "foo\201bar") |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
230 (goto-char (point-min)) |
91a023144e72
fix longstanding search bug involving searching for Control-1 chars
Ben Wing <ben@xemacs.org>
parents:
diff
changeset
|
231 (Assert-eq (search-forward "\201" nil t) 5)) |