Mercurial > emacs
view test/occur-testsuite.el @ 107984:bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Basically, this makes the structure of buffer-local values and object
forwarding explicit in the type of Lisp_Symbols rather than use
special Lisp_Objects for that. This tends to lead to slightly more
verbose code, but is more C-like, simpler, and makes it easier to make
sure we handled all cases, among other things by letting the compiler
help us check it.
* lisp.h (enum Lisp_Misc_Type, union Lisp_Misc):
Removing forwarding objects.
(enum Lisp_Fwd_Type, enum symbol_redirect, union Lisp_Fwd): New types.
(struct Lisp_Symbol): Make the various forms of variable-forwarding
explicit rather than hiding them inside Lisp_Object "values".
(XFWDTYPE): New macro.
(XINTFWD, XBOOLFWD, XOBJFWD, XKBOARD_OBJFWD): Redefine.
(XBUFFER_LOCAL_VALUE): Remove.
(SYMBOL_VAL, SYMBOL_ALIAS, SYMBOL_BLV, SYMBOL_FWD, SET_SYMBOL_VAL)
(SET_SYMBOL_ALIAS, SET_SYMBOL_BLV, SET_SYMBOL_FWD): New macros.
(SYMBOL_VALUE, SET_SYMBOL_VALUE): Remove.
(struct Lisp_Intfwd, struct Lisp_Boolfwd, struct Lisp_Objfwd)
(struct Lisp_Buffer_Objfwd, struct Lisp_Kboard_Objfwd):
Remove the Lisp_Misc_* header.
(struct Lisp_Buffer_Local_Value): Redefine.
(BLV_FOUND, SET_BLV_FOUND, BLV_VALUE, SET_BLV_VALUE): New macros.
(struct Lisp_Misc_Any): Add filler to get the right size.
(struct Lisp_Free): Use struct Lisp_Misc_Any rather than struct
Lisp_Intfwd.
(DEFVAR_LISP, DEFVAR_LISP_NOPRO, DEFVAR_BOOL, DEFVAR_INT)
(DEFVAR_KBOARD): Allocate a forwarding object.
* data.c (do_blv_forwarding, store_blv_forwarding): New macros.
(let_shadows_global_binding_p): New function.
(union Lisp_Val_Fwd): New type.
(make_blv): New function.
(swap_in_symval_forwarding, indirect_variable, do_symval_forwarding)
(store_symval_forwarding, swap_in_global_binding, Fboundp)
(swap_in_symval_forwarding, find_symbol_value, Fset)
(let_shadows_buffer_binding_p, set_internal, default_value)
(Fset_default, Fmake_variable_buffer_local, Fmake_local_variable)
(Fkill_local_variable, Fmake_variable_frame_local)
(Flocal_variable_p, Flocal_variable_if_set_p)
(Fvariable_binding_locus):
* xdisp.c (select_frame_for_redisplay):
* lread.c (Fintern, Funintern, init_obarray, defvar_int)
(defvar_bool, defvar_lisp_nopro, defvar_lisp, defvar_kboard):
* frame.c (store_frame_param):
* eval.c (Fdefvaralias, Fuser_variable_p, specbind, unbind_to):
* bytecode.c (Fbyte_code) <varref, varset>: Adapt to the new symbol
value structure.
* buffer.c (PER_BUFFER_SYMBOL): Move from buffer.h.
(clone_per_buffer_values): Only adjust markers into the current buffer.
(reset_buffer_local_variables): PER_BUFFER_IDX is never -2.
(Fbuffer_local_value, set_buffer_internal_1)
(swap_out_buffer_local_variables):
Adapt to the new symbol value structure.
(DEFVAR_PER_BUFFER): Allocate a Lisp_Buffer_Objfwd object.
(defvar_per_buffer): Take a new arg for the fwd object.
(buffer_lisp_local_variables): Return a proper alist (different fix
for bug#4138).
* alloc.c (Fmake_symbol): Use SET_SYMBOL_VAL.
(Fgarbage_collect): Don't handle buffer_defaults specially.
(mark_object): Handle new symbol value structure rather than the old
special Lisp_Misc_* objects.
(gc_sweep) <symbols>: Free also the buffer-local-value objects.
* term.c (set_tty_color_mode):
* bidi.c (bidi_initialize): Don't access the ->value field directly.
* buffer.h (PER_BUFFER_VAR_OFFSET): Don't bother with
a buffer_local_flags.
* print.c (print_object): Get rid of impossible forwarding objects.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Mon, 19 Apr 2010 21:50:52 -0400 |
parents | bfde3c2dbef5 |
children | 6378d1b57038 |
line wrap: on
line source
;;; occur-testsuite.el --- Test suite for occur. ;; Copyright (C) 2010 Free Software Foundation, Inc. ;; Author: Juri Linkov <juri@jurta.org> ;; Keywords: matching, internal ;; This file is part of GNU Emacs. ;; GNU Emacs 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 3 of the License, or ;; (at your option) any later version. ;; GNU Emacs 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 GNU Emacs. If not, see <http://www.gnu.org/licenses/>. ;;; Commentary: ;; Type M-x test-occur RET to test the functionality of `occur'. ;;; Code: (defconst occur-tests '( ;; * Test one-line matches (at bob, eob, bol, eol). ("x" 0 "\ xa b cx xd xex fx " "\ 5 matches for \"x\" in buffer: *temp* 1:xa 3:cx 4:xd 5:xex 6:fx ") ;; * Test multi-line matches, this is the first test from ;; http://lists.gnu.org/archive/html/emacs-devel/2005-06/msg01008.html ;; where numbers are replaced with letters. ("a\na" 0 "\ a a a a a " "\ 2 matches for \"a^Ja\" in buffer: *temp* 1:a :a 3:a :a ") ;; * Test multi-line matches, this is the second test from ;; http://lists.gnu.org/archive/html/emacs-devel/2005-06/msg01008.html ;; where numbers are replaced with letters. ("a\nb" 0 "\ a b c a b " "\ 2 matches for \"a^Jb\" in buffer: *temp* 1:a :b 4:a :b ") ;; * Test line numbers for multi-line matches with empty last match line. ("a\n" 0 "\ a c a " "\ 2 matches for \"a^J\" in buffer: *temp* 1:a : 4:a : ") ;; * Test multi-line matches with 3 match lines. ("x\n.x\n" 0 "\ ax bx c d ex fx " "\ 2 matches for \"x^J.x^J\" in buffer: *temp* 1:ax :bx :c 5:ex :fx : ") ;; * Test non-overlapping context lines with matches at bob/eob. ("x" 1 "\ ax b c d ex f g hx " "\ 3 matches for \"x\" in buffer: *temp* 1:ax :b ------- :d 5:ex :f ------- :g 8:hx ") ;; * Test non-overlapping context lines with matches not at bob/eob. ("x" 1 "\ a bx c d ex f " "\ 2 matches for \"x\" in buffer: *temp* :a 2:bx :c ------- :d 5:ex :f ") ;; * Test overlapping context lines with matches at bob/eob. ("x" 2 "\ ax bx c dx e f gx h i j kx " "\ 5 matches for \"x\" in buffer: *temp* 1:ax 2:bx :c 4:dx :e :f 7:gx :h :i :j 11:kx ") ;; * Test overlapping context lines with matches not at bob/eob. ("x" 2 "\ a b cx d e f gx h i " "\ 2 matches for \"x\" in buffer: *temp* :a :b 3:cx :d :e :f 7:gx :h :i ") ;; * Test overlapping context lines with empty first and last line.. ("x" 2 "\ b cx d e f gx h " "\ 2 matches for \"x\" in buffer: *temp* : :b 3:cx :d :e :f 7:gx :h : ") ;; * Test multi-line overlapping context lines. ("x\n.x" 2 "\ ax bx c d ex fx g h i jx kx " "\ 3 matches for \"x^J.x\" in buffer: *temp* 1:ax :bx :c :d 5:ex :fx :g :h :i 10:jx :kx ") ;; * Test multi-line non-overlapping context lines. ("x\n.x" 2 "\ ax bx c d e f gx hx " "\ 2 matches for \"x^J.x\" in buffer: *temp* 1:ax :bx :c :d ------- :e :f 7:gx :hx ") ;; * Test non-overlapping negative (before-context) lines. ("x" -2 "\ a bx c d e fx g h ix " "\ 3 matches for \"x\" in buffer: *temp* :a 2:bx ------- :d :e 6:fx ------- :g :h 9:ix ") ;; * Test overlapping negative (before-context) lines. ("x" -3 "\ a bx c dx e f gx h " "\ 3 matches for \"x\" in buffer: *temp* :a 2:bx :c 4:dx :e :f 7:gx ") ) "List of tests for `occur'. Each element has the format: \(REGEXP NLINES INPUT-BUFFER-STRING OUTPUT-BUFFER-STRING).") (defun test-occur () (interactive) (let ((count 1) failed (occur-hook nil)) (dolist (test occur-tests) (let ((regexp (nth 0 test)) (nlines (nth 1 test)) (input-buffer-string (nth 2 test)) (output-buffer-string (nth 3 test))) (save-excursion (with-temp-buffer (insert input-buffer-string) (occur regexp nlines) (unless (equal output-buffer-string (with-current-buffer "*Occur*" (buffer-string))) (setq failed (cons count failed)))))) (setq count (1+ count))) (if failed (message "FAILED TESTS: %S" (reverse failed)) (message "SUCCESS")))) (provide 'occur-testsuite) ;;; occur-testsuite.el ends here