view tests/automated/hash-table-tests.el @ 5015:d95c102a96d3

cleanups for specifier font stages, from ben-unicode-internal (preparation for eliminating shadowed warnings) -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-02-08 Ben Wing <ben@xemacs.org> * faces.c: * faces.c (face_property_matching_instance): * faces.c (ensure_face_cachel_contains_charset): * faces.h (FACE_FONT): * lisp.h: * lisp.h (enum font_specifier_matchspec_stages): * objects-msw.c: * objects-msw.c (mswindows_font_spec_matches_charset): * objects-msw.c (mswindows_find_charset_font): * objects-tty.c: * objects-tty.c (tty_font_spec_matches_charset): * objects-tty.c (tty_find_charset_font): * objects-xlike-inc.c: * objects-xlike-inc.c (XFUN): * objects-xlike-inc.c (xft_find_charset_font): * objects.c: * objects.c (font_instantiate): * objects.c (FROB): * specifier.c: * specifier.c (charset_matches_specifier_tag_set_p): * specifier.c (call_charset_predicate): * specifier.c (define_specifier_tag): * specifier.c (Fdefine_specifier_tag): * specifier.c (setup_charset_initial_specifier_tags): * specifier.c (specifier_instance_from_inst_list): * specifier.c (FROB): * specifier.c (vars_of_specifier): * specifier.h: Rename the specifier-font-matching stages in preparation for eliminating shadowed warnings, some other related fixes from ben-unicode-internal. 1. Rename raw enums: initial -> STAGE_INITIAL final -> STAGE_FINAL impossible -> NUM_MATCHSPEC_STAGES 2. Move `enum font_specifier_matchspec_stages' from specifier.h to lisp.h. 3. Whitespace changes to match coding standards. 4. Eliminate unused second argument STAGE in charset predicates that don't use it -- the code that calls the charset predicates is now smart enough to supply the right number of arguments automatically. 5. Add some long(ish) comments and authorial notices, esp. in objects.c. 6. In specifier.c, change Vcharset_tag_lists from a vector over leading bytes to a hash table over charsets. This change is unnecessary currently but doesn't hurt and will be required when we merge in Unicode-internal. 7. In specifier.c, extract out the code that calls charset predicates into a function call_charset_predicate().
author Ben Wing <ben@xemacs.org>
date Mon, 08 Feb 2010 16:51:25 -0600
parents 189fb67ca31a
children 0f66906b6e37
line wrap: on
line source

;; Copyright (C) 1998 Free Software Foundation, Inc.

;; Author: Martin Buchholz <martin@xemacs.org>
;; Maintainer: Martin Buchholz <martin@xemacs.org>
;; Created: 1998
;; Keywords: tests, database

;; 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 hash tables implementation
;;; See test-harness.el

(condition-case err
    (require 'test-harness)
  (file-error
   (when (and (boundp 'load-file-name) (stringp load-file-name))
     (push (file-name-directory load-file-name) load-path)
     (require 'test-harness))))

;; Test all combinations of make-hash-table keywords
(dolist (test '(eq eql equal))
  (dolist (size '(0 1 100))
    (dolist (rehash-size '(1.1 9.9))
      (dolist (rehash-threshold '(0.2 .9))
	(dolist (weakness '(nil key value key-or-value key-and-value))
	  (dolist (data '(() (1 2) (1 2 3 4)))
	    (let ((ht (make-hash-table
		       :test test
		       :size size
		       :rehash-size rehash-size
		       :rehash-threshold rehash-threshold
		       :weakness weakness)))
	      (Assert-equal ht (car (let ((print-readably t))
				       (read-from-string (prin1-to-string ht)))))
	      (Assert-eq test (hash-table-test ht))
	      (Assert (<= size (hash-table-size ht)))
	      (Assert-eql rehash-size (hash-table-rehash-size ht))
	      (Assert-eql rehash-threshold (hash-table-rehash-threshold ht))
	      (Assert-eq weakness (hash-table-weakness ht)))))))))

(loop for (fun weakness) in '((make-hashtable nil)
			      (make-weak-hashtable key-and-value)
			      (make-key-weak-hashtable key)
			      (make-value-weak-hashtable value))
  do (Assert-eq weakness (hash-table-weakness (funcall fun 10))))

(loop for (type weakness) in '((non-weak nil)
			       (weak key-and-value)
			       (key-weak key)
			       (value-weak value))
  do (Assert-equal (make-hash-table :type type)
		    (make-hash-table :weakness weakness)))

(Assert (not (equal (make-hash-table :weakness nil)
		    (make-hash-table :weakness t))))

(let ((ht (make-hash-table :size 20 :rehash-threshold .75 :test 'eq))
      (size 80))
  (Assert (hashtablep ht))
  (Assert (hash-table-p ht))
  (Assert-eq 'eq (hash-table-test ht))
  (Assert-eq 'non-weak (hash-table-type ht))
  (Assert-eq 'non-weak (hashtable-type ht))
  (Assert-eq 'nil (hash-table-weakness ht))
  (dotimes (j size)
    (puthash j (- j) ht)
    (Assert-eq (gethash j ht) (- j))
    (Assert= (hash-table-count ht) (1+ j))
    (Assert= (hashtable-fullness ht) (hash-table-count ht))
    (puthash j j ht)
    (Assert-eq (gethash j ht 'foo) j)
    (Assert= (hash-table-count ht) (1+ j))
    (setf (gethash j ht) (- j))
    (Assert-eq (gethash j ht) (- j))
    (Assert= (hash-table-count ht) (1+ j)))

  (clrhash ht)
  (Assert= 0 (hash-table-count ht))

  (dotimes (j size)
    (puthash j (- j) ht)
    (Assert-eq (gethash j ht) (- j))
    (Assert= (hash-table-count ht) (1+ j)))

  (let ((k-sum 0) (v-sum 0))
    (maphash #'(lambda (k v) (incf k-sum k) (incf v-sum v)) ht)
    (Assert= k-sum (/ (* size (- size 1)) 2))
    (Assert= v-sum (- k-sum)))

  (let ((count size))
    (dotimes (j size)
      (remhash j ht)
      (Assert-eq (gethash j ht) nil)
      (Assert-eq (gethash j ht 'foo) 'foo)
      (Assert= (hash-table-count ht) (decf count)))))

(let ((ht (make-hash-table :size 30 :rehash-threshold .25 :test 'equal))
      (size 70))
  (Assert (hashtablep ht))
  (Assert (hash-table-p ht))
  (Assert (>= (hash-table-size ht) (/ 30 .25)))
  (Assert-eql .25 (hash-table-rehash-threshold ht))
  (Assert-eq 'equal (hash-table-test ht))
  (Assert-eq (hash-table-test ht) (hashtable-test-function ht))
  (Assert-eq 'non-weak (hash-table-type ht))
  (dotimes (j size)
    (puthash (int-to-string j) (- j) ht)
    (Assert-eq (gethash (int-to-string j) ht) (- j))
    (Assert= (hash-table-count ht) (1+ j))
    (puthash (int-to-string j) j ht)
    (Assert-eq (gethash (int-to-string j) ht 'foo) j)
    (Assert= (hash-table-count ht) (1+ j)))

  (clrhash ht)
  (Assert= 0 (hash-table-count ht))
  (Assert-equal ht (copy-hash-table ht))

  (dotimes (j size)
    (setf (gethash (int-to-string j) ht) (- j))
    (Assert-eq (gethash (int-to-string j) ht) (- j))
    (Assert= (hash-table-count ht) (1+ j)))

  (let ((count size))
    (dotimes (j size)
      (remhash (int-to-string j) ht)
      (Assert-eq (gethash (int-to-string j) ht) nil)
      (Assert-eq (gethash (int-to-string j) ht 'foo) 'foo)
      (Assert= (hash-table-count ht) (decf count)))))

(let ((iterations 5) (one 1.0) (two 2.0))
  (flet ((check-copy
	  (ht)
	  (let ((copy-of-ht (copy-hash-table ht)))
	    (Assert-equal ht copy-of-ht)
	    (Assert (not (eq ht copy-of-ht)))
	    (Assert-eq  (hash-table-count ht) (hash-table-count copy-of-ht))
	    (Assert-eq  (hash-table-type  ht) (hash-table-type  copy-of-ht))
	    (Assert-eq  (hash-table-size  ht) (hash-table-size  copy-of-ht))
	    (Assert-eql (hash-table-rehash-size ht) (hash-table-rehash-size copy-of-ht))
	    (Assert-eql (hash-table-rehash-threshold ht) (hash-table-rehash-threshold copy-of-ht)))))

  (let ((ht (make-hash-table :size 100 :rehash-threshold .6 :test 'eq)))
    (dotimes (j iterations)
      (puthash (+ one 0.0) t ht)
      (puthash (+ two 0.0) t ht)
      (puthash (cons 1 2) t ht)
      (puthash (cons 3 4) t ht))
    (Assert-eq (hashtable-test-function ht) 'eq)
    (Assert-eq (hash-table-test ht) 'eq)
    (Assert= (* iterations 4) (hash-table-count ht))
    (Assert-eq nil (gethash 1.0 ht))
    (Assert-eq nil (gethash '(1 . 2) ht))
    (check-copy ht)
    )

  (let ((ht (make-hash-table :size 100 :rehash-threshold .6 :test 'eql)))
    (dotimes (j iterations)
      (puthash (+ one 0.0) t ht)
      (puthash (+ two 0.0) t ht)
      (puthash (cons 1 2) t ht)
      (puthash (cons 3 4) t ht))
    (Assert-eq (hashtable-test-function ht) 'eql)
    (Assert-eq (hash-table-test ht) 'eql)
    (Assert= (+ 2 (* 2 iterations)) (hash-table-count ht))
    (Assert-eq t (gethash 1.0 ht))
    (Assert-eq nil (gethash '(1 . 2) ht))
    (check-copy ht)
    )

  (let ((ht (make-hash-table :size 100 :rehash-threshold .6 :test 'equal)))
    (dotimes (j iterations)
      (puthash (+ one 0.0) t ht)
      (puthash (+ two 0.0) t ht)
      (puthash (cons 1 2) t ht)
      (puthash (cons 3 4) t ht))
    (Assert-eq (hashtable-test-function ht) 'equal)
    (Assert-eq (hash-table-test ht) 'equal)
    (Assert= 4 (hash-table-count ht))
    (Assert-eq t (gethash 1.0 ht))
    (Assert-eq t (gethash '(1 . 2) ht))
    (check-copy ht)
    )

  ))

;; Test that weak hash-tables are properly handled
(loop for (weakness expected-count expected-k-sum expected-v-sum) in
  '((nil 6 38 25)
    (t 3 6 9)
    (key 4 38 9)
    (value 4 6 25))
  do
  (let* ((ht (make-hash-table :weakness weakness))
       (my-obj (cons ht ht)))
  (garbage-collect)
  (puthash my-obj 1 ht)
  (puthash 2 my-obj ht)
  (puthash 4 8 ht)
  (puthash (cons ht ht) 16 ht)
  (puthash 32 (cons ht ht) ht)
  (puthash (cons ht ht) (cons ht ht) ht)
  (let ((k-sum 0) (v-sum 0))
    (maphash #'(lambda (k v)
		 (when (integerp k) (incf k-sum k))
		 (when (integerp v) (incf v-sum v)))
	     ht)
    (Assert-eq 38 k-sum)
    (Assert-eq 25 v-sum))
  (Assert-eq 6 (hash-table-count ht))
  (garbage-collect)
  (Assert-eq expected-count (hash-table-count ht))
  (let ((k-sum 0) (v-sum 0))
    (maphash #'(lambda (k v)
		 (when (integerp k) (incf k-sum k))
		 (when (integerp v) (incf v-sum v)))
	     ht)
    (Assert-eq expected-k-sum k-sum)
    (Assert-eq expected-v-sum v-sum))))

;;; Test the ability to puthash and remhash the current elt of a maphash
(let ((ht (make-hash-table :test 'eql)))
  (dotimes (j 100) (setf (gethash j ht) (- j)))
  (maphash #'(lambda (k v)
	       (if (oddp k) (remhash k ht) (puthash k (- v) ht)))
	   ht)
  (let ((k-sum 0) (v-sum 0))
    (maphash #'(lambda (k v) (incf k-sum k) (incf v-sum v)) ht)
    (Assert= (* 50 49) k-sum)
    (Assert= v-sum k-sum)))

;;; Test reading and printing of hash-table objects
(let ((h1 #s(hashtable  weakness t rehash-size 3.0 rehash-threshold .2 test eq data (1 2 3 4)))
      (h2 #s(hash-table weakness t rehash-size 3.0 rehash-threshold .2 test eq data (1 2 3 4)))
      (h3 (make-hash-table :weakness t :rehash-size 3.0 :rehash-threshold .2 :test 'eq)))
  (Assert-equal h1 h2)
  (Assert (not (equal h1 h3)))
  (puthash 1 2 h3)
  (puthash 3 4 h3)
  (Assert-equal h1 h3))

;;; Testing equality of hash tables
(Assert-equal (make-hash-table :test 'eql :size 300 :rehash-threshold .9 :rehash-size 3.0)
	       (make-hash-table :test 'eql))
(Assert (not (equal (make-hash-table :test 'eq)
		    (make-hash-table :test 'equal))))
(let ((h1 (make-hash-table))
      (h2 (make-hash-table)))
  (Assert-equal h1 h2)
  (Assert (not (eq h1 h2)))
  (puthash 1 2 h1)
  (Assert (not (equal h1 h2)))
  (puthash 1 2 h2)
  (Assert-equal h1 h2)
  (puthash 1 3 h2)
  (Assert (not (equal h1 h2)))
  (clrhash h1)
  (Assert (not (equal h1 h2)))
  (clrhash h2)
  (Assert-equal h1 h2)
  )

;;; Test sxhash
(Assert= (sxhash "foo") (sxhash "foo"))
(Assert= (sxhash '(1 2 3)) (sxhash '(1 2 3)))
(Assert (/= (sxhash '(1 2 3)) (sxhash '(3 2 1))))