Mercurial > hg > xemacs-beta
view tests/automated/search-tests.el @ 4995:8431b52e43b1
Move the various map* functions to C; add #'map-into.
src/ChangeLog addition:
2010-01-31 Aidan Kehoe <kehoea@parhasard.net>
Move #'mapcar*, #'mapcan, #'mapc, #'map, #'mapl, #'mapcon to C;
extend #'mapvector, #'mapconcat, #'mapcar to support more
SEQUENCES; have them all error with circular lists.
* fns.c (Fsubseq): Call CHECK_SEQUENCE here; Flength can return
from the debugger if it errors with a non-sequence, leading to a
crash in Fsubseq if sequence really is *not* a sequence.
(mapcarX): Rename mapcar1 to mapcarX; rework it comprehensively to
take an optional lisp output argument, and a varying number of
sequences.
Special-case a single list argument, as we used to, saving its
elements in the stack space for the results before calling
FUNCTION, so FUNCTION can corrupt the list all it
wants. dead_wrong_type_argument() in the other cases if we
encounter a non-cons where we expected a cons.
(Fmapconcat):
Accept further SEQUENCES after separator here. Special-case
the idiom (mapconcat 'identity SEQUENCE), don't even funcall.
(FmapcarX): Rename this from Fmapcar. Accept optional SEQUENCES.
(Fmapvector): Accept optional SEQUENCES.
(Fmapcan, Fmapc, Fmap): Move these here from cl-extra.el.
(Fmap_into): New function, as specified by Common Lisp.
(maplist): New function, the guts of the implementation of
Fmaplist and Fmapl.
(Fmaplist, Fmapl, Fmapcon): Move these from cl-extra.el.
(syms_of_fns):
Add a few needed symbols here, for the type tests
used by #'map. Add the new subrs, with aliases for #'mapc-internal
and #'mapcar.
* general-slots.h: Declare Qcoerce here, now it's used in both
indent.c and fns.c
* indent.c (syms_of_indent): Qcoerce is gone from here.
* lisp.h: Add ARRAYP(), SEQUENCEP(), and the corresponding CHECK_*
macros. Declare Fbit_vector, Fstring, FmapcarX, now other files
need to use them.
* data.c (Farrayp, Fsequencep): Use ARRAYP and SEQUENCEP, just
added to lisp.h
* buffer.c (Fbuffer_list): Now Fmapcar has been renamed FmapcarX
and takes MANY arguments, update this function to reflect that.
lisp/ChangeLog addition:
2010-01-31 Aidan Kehoe <kehoea@parhasard.net>
* cl.el (mapcar*): Delete; this is now in fns.c.
Use #'mapc, not #'mapc-internal in a couple of places.
* cl-macs.el (mapc, mapcar*, map): Delete these compiler macros
now the corresponding functions are in fns.c; there's no run-time
advantage to the macros.
* cl-extra.el (coerce): Extend the possible conversions here a
little; it's not remotely comprehensive yet, though it does allow
running slightly more Common Lisp code than previously.
(cl-mapcar-many): Delete.
(map, maplist, mapc, mapl, mapcan, mapcon): Move these to fns.c.
* bytecomp.el (byte-compile-maybe-mapc):
Use #'mapc itself, not #'mapc-internal, now the former is in C.
(mapcar*): Use #'byte-compile-maybe-mapc as this function's
byte-compile method, now a #'mapc that can take more than one
sequence is in C.
* obsolete.el (cl-mapc): Move this compatibility alias to this file.
* update-elc.el (do-autoload-commands): Use #'mapc, not
#'mapc-internal here.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 31 Jan 2010 18:29:48 +0000 |
parents | e91e3e353805 |
children | 9e7f5a77cc84 |
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 regexp-tests.el, ;; search-tests.el and case-tests.el. The current rule for what goes where ;; is: ;; ;; (1) Anything regexp-related goes in regexp-tests.el, including searches. ;; (2) Non-regexp searches go in search-tests.el. This includes case-folding ;; searches in the situation where the test tests both folding and ;; non-folding behavior. ;; (3) If it tests specifically case-folding search behavior, it may go in ;; case-tets.el, especially if it is testing something non-search-related ;; at the same time (e.g. the Unicode case map torture tests). (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 ;;#### Ben thinks this is unnecessary. with-temp-buffer creates ;;a new buffer, which automatically inherits the standard case table. ;;(set-case-table pristine-case-table) (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))