mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-21 06:55:39 +00:00
462d8ba813
The new opaque type replaces the previous use of vectors for obarrays. `obarray-make` now returns objects of this type. Functions that take obarrays continue to accept vectors for compatibility, now just using their first slot to store an actual obarray object. obarray-size and obarray-default-size now obsolete. * lisp/obarray.el (obarray-default-size, obarray-size): Declare obsolete. (obarray-make, obarrayp, obarray-clear): Remove from here. * src/fns.c (reduce_emacs_uint_to_hash_hash): Remove from here. * src/lisp.h (struct Lisp_Obarray, OBARRAYP, XOBARRAY, CHECK_OBARRAY) (make_lisp_obarray, obarray_size, check_obarray) (obarray_iter_t, make_obarray_iter, obarray_iter_at_end) (obarray_iter_step, obarray_iter_symbol, DOOBARRAY, knuth_hash): New. (reduce_emacs_uint_to_hash_hash): Moved here. * src/lread.c (check_obarray): Renamed and reworked as... (checked_obarray_slow): ...this. (intern_sym, Funintern, oblookup, map_obarray) (Finternal__obarray_buckets): Adapt to new type. (obarray_index, allocate_obarray, make_obarray, grow_obarray) (obarray_default_bits, Fobarray_make, Fobarrayp, Fobarray_clear): New. * etc/emacs_lldb.py (Lisp_Object): * lisp/emacs-lisp/cl-macs.el (`(,type . ,pred)): * lisp/emacs-lisp/cl-preloaded.el (cl--typeof-types): * lisp/emacs-lisp/comp-common.el (comp-known-type-specifiers): * lisp/emacs-lisp/comp.el (comp-known-predicates): * src/alloc.c (cleanup_vector, process_mark_stack): * src/data.c (Ftype_of, syms_of_data): * src/minibuf.c (Ftry_completion, Fall_completions, Ftest_completion): * src/pdumper.c (dump_obarray_buckets, dump_obarray, dump_vectorlike): * src/print.c (print_vectorlike_unreadable): * test/lisp/abbrev-tests.el (abbrev-make-abbrev-table-test): * test/lisp/obarray-tests.el (obarrayp-test) (obarrayp-unchecked-content-test, obarray-make-default-test) (obarray-make-with-size-test): Adapt to new type.
94 lines
3.1 KiB
EmacsLisp
94 lines
3.1 KiB
EmacsLisp
;;; obarray-tests.el --- Tests for obarray -*- lexical-binding: t; -*-
|
|
|
|
;; Copyright (C) 2015-2024 Free Software Foundation, Inc.
|
|
|
|
;; Author: Przemysław Wojnowski <esperanto@cumego.com>
|
|
|
|
;; 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 <https://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
|
|
;;; Code:
|
|
|
|
(require 'obarray)
|
|
(require 'ert)
|
|
|
|
(ert-deftest obarrayp-test ()
|
|
"Should assert that given object is an obarray."
|
|
(should-not (obarrayp 42))
|
|
(should-not (obarrayp "aoeu"))
|
|
(should-not (obarrayp '()))
|
|
(should-not (obarrayp []))
|
|
(should-not (obarrayp ["a" "b" "c"]))
|
|
(should-not (obarrayp [1 2 3]))
|
|
(should-not (obarrayp (make-vector 7 0)))
|
|
(should-not (obarrayp (vector (obarray-make))))
|
|
(should (obarrayp (obarray-make)))
|
|
(should (obarrayp (obarray-make 7))))
|
|
|
|
(ert-deftest obarray-make-with-size-test ()
|
|
;; FIXME: Actually, `wrong-type-argument' is not the right error to signal,
|
|
;; so we shouldn't enforce this misbehavior in tests!
|
|
(should-error (obarray-make -1) :type 'wrong-type-argument)
|
|
(should-error (obarray-make 'a) :type 'wrong-type-argument))
|
|
|
|
(ert-deftest obarray-get-test ()
|
|
(let ((table (obarray-make 3)))
|
|
(should-not (obarray-get table "aoeu"))
|
|
(intern "aoeu" table)
|
|
(should (string= "aoeu" (obarray-get table "aoeu")))))
|
|
|
|
(ert-deftest obarray-put-test ()
|
|
(let ((table (obarray-make 3)))
|
|
(should-not (obarray-get table "aoeu"))
|
|
(should (string= "aoeu" (obarray-put table "aoeu")))
|
|
(should (string= "aoeu" (obarray-get table "aoeu")))))
|
|
|
|
(ert-deftest obarray-remove-test ()
|
|
(let ((table (obarray-make 3)))
|
|
(should-not (obarray-get table "aoeu"))
|
|
(should-not (obarray-remove table "aoeu"))
|
|
(should (string= "aoeu" (obarray-put table "aoeu")))
|
|
(should (string= "aoeu" (obarray-get table "aoeu")))
|
|
(should (obarray-remove table "aoeu"))
|
|
(should-not (obarray-get table "aoeu"))))
|
|
|
|
(ert-deftest obarray-map-test ()
|
|
"Should execute function on all elements of obarray."
|
|
(let* ((table (obarray-make 3))
|
|
(syms '())
|
|
(collect-names (lambda (sym) (push (symbol-name sym) syms))))
|
|
(obarray-map collect-names table)
|
|
(should (null syms))
|
|
(obarray-put table "a")
|
|
(obarray-put table "b")
|
|
(obarray-put table "c")
|
|
(obarray-map collect-names table)
|
|
(should (equal (sort syms #'string<) '("a" "b" "c")))))
|
|
|
|
(ert-deftest obarray-clear ()
|
|
(let ((o (obarray-make)))
|
|
(intern "a" o)
|
|
(intern "b" o)
|
|
(intern "c" o)
|
|
(obarray-clear o)
|
|
(let ((n 0))
|
|
(mapatoms (lambda (_) (setq n (1+ n))) o)
|
|
(should (equal n 0)))))
|
|
|
|
(provide 'obarray-tests)
|
|
;;; obarray-tests.el ends here
|