Mercurial > hg > xemacs-beta
view tests/automated/hash-table-tests.el @ 4604:e0a8715fdb1f
Support new IGNORE-INVALID-SEQUENCESP argument, #'query-coding-region.
lisp/ChangeLog addition:
2009-02-07 Aidan Kehoe <kehoea@parhasard.net>
* coding.el (query-coding-clear-highlights):
Rename the BUFFER argument to BUFFER-OR-STRING, describe it as
possibly being a string in its documentation.
(default-query-coding-region):
Add a new IGNORE-INVALID-SEQUENCESP argument, document that this
function does not support it.
Bind case-fold-search to nil, we don't want this to influence what the
function thinks is encodable or not.
(query-coding-region):
Add a new IGNORE-INVALID-SEQUENCESP argument, document what it
does; reflect this new argument in the associated compiler macro.
(query-coding-string):
Add a new IGNORE-INVALID-SEQUENCESP argument, document what it
does. Support the HIGHLIGHT argument correctly.
* unicode.el (unicode-query-coding-region):
Add a new IGNORE-INVALID-SEQUENCESP argument, document what it
does, implement this. Document a potential problem.
Use #'query-coding-clear-highlights instead of reimplementing it
ourselves.
Remove some debugging messages.
* mule/arabic.el (iso-8859-6):
* mule/cyrillic.el (iso-8859-5):
* mule/greek.el (iso-8859-7):
* mule/hebrew.el (iso-8859-8):
* mule/latin.el (iso-8859-2):
* mule/latin.el (iso-8859-3):
* mule/latin.el (iso-8859-4):
* mule/latin.el (iso-8859-14):
* mule/latin.el (iso-8859-15):
* mule/latin.el (iso-8859-16):
* mule/latin.el (iso-8859-9):
* mule/latin.el (windows-1252):
* mule/mule-coding.el (iso-8859-1):
Avoid the assumption that characters not given an explicit mapping
in these coding systems map to the ISO 8859-1 characters
corresponding to the octets on disk; this makes it much more
reasonable to implement the IGNORE-INVALID-SEQUENCESP argument to
query-coding-region.
* mule/mule-cmds.el (set-language-info):
Correct the docstring.
* mule/mule-cmds.el (finish-set-language-environment):
Treat invalid Unicode sequences produced from
invalid-sequence-coding-system and corresponding to control
characters the same as control characters in redisplay.
* mule/mule-cmds.el:
Document that encode-coding-char is available in coding.el
* mule/mule-coding.el (make-8-bit-generate-helper):
Change to return the both the encode-program generated and the
relevant non-ASCII charset; update the docstring to reflect this.
* mule/mule-coding.el
(make-8-bit-generate-encode-program-and-skip-chars-strings):
Rename this function; have it return skip-chars-strings as well as
the encode program. Have these skip-chars-strings use ranges for
charsets, where possible.
* mule/mule-coding.el (make-8-bit-create-decode-encode-tables):
Revise this to allow people to specify explicitly characters that
should be undefined (= corresponding to keys in
unicode-error-default-translation-table), and treating unspecified
octets above #x7f as undefined by default.
* mule/mule-coding.el (8-bit-fixed-query-coding-region):
Add a new IGNORE-INVALID-SEQUENCESP argument, implement support
for it using the 8-bit-fixed-invalid-sequences-skip-chars coding
system property; remove some debugging messages.
* mule/mule-coding.el (make-8-bit-coding-system):
This function is dumped, autoloading it makes no sense.
Document what happens when characters above #x7f are not
specified, implement this.
* mule/vietnamese.el:
Correct spelling.
tests/ChangeLog addition:
2009-02-07 Aidan Kehoe <kehoea@parhasard.net>
* automated/query-coding-tests.el:
Add FAILING-CASE arguments to the Assert calls, making #'q-c-debug
mostly unnecessary. Remove #'q-c-debug.
Add new tests that use the IGNORE-INVALID-SEQUENCESP argument to
#'query-coding-region; rework the existing ones to respect it.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sat, 07 Feb 2009 17:13:37 +0000 |
parents | 479443c0f95a |
children | 189fb67ca31a |
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))))