annotate tests/mule/match.el @ 5803:b79e1e02bf01

Preserve extent information in the command builder code. src/ChangeLog addition: 2014-07-14 Aidan Kehoe <kehoea@parhasard.net> * event-stream.c: * event-stream.c (mark_command_builder): * event-stream.c (finalize_command_builder): Removed. * event-stream.c (allocate_command_builder): * event-stream.c (free_command_builder): Removed. Use free_normal_lisp_object() instead. * event-stream.c (echo_key_event): * event-stream.c (regenerate_echo_keys_from_this_command_keys): Detach all extents here. * event-stream.c (maybe_echo_keys): * event-stream.c (reset_key_echo): * event-stream.c (execute_help_form): * event-stream.c (Fnext_event): * event-stream.c (command_builder_find_leaf_no_jit_binding): * event-stream.c (command_builder_find_leaf): * event-stream.c (lookup_command_event): * events.h (struct command_builder): Move the command builder's echo_buf to being a Lisp string rather than a malloced Ibyte array. This allows passing through extent information, which was previously dropped. It also simplifies the allocation and release code for the command builder. Rename echo_buf_index to echo_buf_fill_pointer, better reflecting its function. Don't rely on zero-termination (something not particularly compatible with Lisp-level code) when showing a substring of echo_buf that differs from that designated by echo_buf_fill_pointer, keep a separate counter instead and use that. * minibuf.c: * minibuf.c (echo_area_append): Use the new START and END keyword arguments to #'append-message, rather than consing a new string for basically every #'next-event prompt displayed. test/ChangeLog addition: 2014-07-14 Aidan Kehoe <kehoea@parhasard.net> * automated/extent-tests.el: Check that extent information is passed through to the echo area correctly with #'next-event's PROMPT argument. lisp/ChangeLog addition: 2014-07-14 Aidan Kehoe <kehoea@parhasard.net> * simple.el (raw-append-message): Use #'write-sequence in this, take its START and END keyword arguments, so our callers don't have to cons as much. * simple.el (append-message): Pass through START and END here.
author Aidan Kehoe <kehoea@parhasard.net>
date Mon, 14 Jul 2014 13:42:42 +0100
parents 308d34e9f07d
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
1 ;;; Testsuite for Mule string-matching - used to crash!
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
2
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
3 ;; Copyright (C) 1996 Sun Microsystems.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
4
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
5 ;; This file is part of XEmacs.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
6
5402
308d34e9f07d Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents: 70
diff changeset
7 ;; XEmacs is free software: you can redistribute it and/or modify it
308d34e9f07d Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents: 70
diff changeset
8 ;; under the terms of the GNU General Public License as published by the
308d34e9f07d Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents: 70
diff changeset
9 ;; Free Software Foundation, either version 3 of the License, or (at your
308d34e9f07d Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents: 70
diff changeset
10 ;; option) any later version.
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
11
5402
308d34e9f07d Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents: 70
diff changeset
12 ;; XEmacs is distributed in the hope that it will be useful, but WITHOUT
308d34e9f07d Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents: 70
diff changeset
13 ;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
308d34e9f07d Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents: 70
diff changeset
14 ;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
308d34e9f07d Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents: 70
diff changeset
15 ;; for more details.
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
16
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
17 ;; You should have received a copy of the GNU General Public License
5402
308d34e9f07d Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents: 70
diff changeset
18 ;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
19
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
20 ;;; Just load the file to run the test.
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
21
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
22 (defmacro test-match (result regexp string)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
23 `(save-excursion
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
24 (assert (eq ,result (string-match ,regexp ,string)))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
25 (let ((buf (get-buffer-create "*testsuite*"))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
26 (random-text "foo$(BEl5~(B"))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
27 (set-buffer buf)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
28 (erase-buffer)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
29 (insert random-text)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
30 (insert ,string)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
31 (goto-char (point-min))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
32 (forward-char (length random-text))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
33 (assert (eq (progn (re-search-forward ,regexp) (match-beginning 0))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
34 (+ 1 ,result (length random-text))))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
35 )))
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
36
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
37 (when (featurep 'mule)
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
38 (test-match 0 "a" "a")
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
39 (test-match 0 "[^a]" "$(B4A;z(B")
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
40 (test-match 2 "[^a]$(B;z(B" "ab$(B4A;z(B")
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
41 (test-match 1 "[^a]" "ab$(B4A;z(B")
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
42 (test-match 0 "[^a]" "$(B4A(Bb$(B4A;z(Bb")
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
43 (test-match 6 "[a]" "b$(B4A(Bb$(B4A;z(Bba")
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
44 (test-match 2 "[a]" "b$(B4A(Bab$(B4A;z(Bba")
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
45 (test-match 1 "[$(B4A(Ba]" "b$(B4A(Bab$(B4A;z(Bba")
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
46 (test-match 1 "[a$(B4A(B]" "b$(B4A(Bab$(B4A;z(Bba")
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
47 (test-match 0 "[^$(B4A(Ba]" "b$(B4A(Bab$(B4A;z(Bba")
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
48 (test-match 5 "$(B4A(B[^$(B4A(Ba]" "a$(B4A(Bab$(B4A4A;z(Bba")
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
49 )
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents:
diff changeset
50