Mercurial > hg > xemacs-beta
annotate tests/automated/hash-table-tests.el @ 4981:4aebb0131297
Cleanups/renaming of EXTERNAL_TO_C_STRING and friends
-------------------- ChangeLog entries follow: --------------------
modules/ChangeLog addition:
2010-02-05 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c:
* postgresql/postgresql.c (CHECK_LIVE_CONNECTION):
* postgresql/postgresql.c (Fpq_connectdb):
* postgresql/postgresql.c (Fpq_connect_start):
* postgresql/postgresql.c (Fpq_lo_import):
* postgresql/postgresql.c (Fpq_lo_export):
* ldap/eldap.c (Fldap_open):
* ldap/eldap.c (Fldap_search_basic):
* ldap/eldap.c (Fldap_add):
* ldap/eldap.c (Fldap_modify):
* ldap/eldap.c (Fldap_delete):
* canna/canna_api.c (Fcanna_initialize):
* canna/canna_api.c (Fcanna_store_yomi):
* canna/canna_api.c (Fcanna_parse):
* canna/canna_api.c (Fcanna_henkan_begin):
EXTERNAL_TO_C_STRING returns its argument instead of storing it
in a parameter, and is renamed to EXTERNAL_TO_ITEXT. Similar
things happen to related macros. See entry in src/ChangeLog.
More Mule-izing of postgresql.c. Extract out common code
between `pq-connectdb' and `pq-connect-start'. Fix places
that signal an error string using a formatted string to instead
follow the standard and have a fixed reason followed by the
particular error message stored as one of the frobs.
src/ChangeLog addition:
2010-02-05 Ben Wing <ben@xemacs.org>
* console-msw.c (write_string_to_mswindows_debugging_output):
* console-msw.c (Fmswindows_message_box):
* console-x.c (x_perhaps_init_unseen_key_defaults):
* console.c:
* database.c (dbm_get):
* database.c (dbm_put):
* database.c (dbm_remove):
* database.c (berkdb_get):
* database.c (berkdb_put):
* database.c (berkdb_remove):
* database.c (Fopen_database):
* device-gtk.c (gtk_init_device):
* device-msw.c (msprinter_init_device_internal):
* device-msw.c (msprinter_default_printer):
* device-msw.c (msprinter_init_device):
* device-msw.c (sync_printer_with_devmode):
* device-msw.c (Fmsprinter_select_settings):
* device-x.c (sanity_check_geometry_resource):
* device-x.c (Dynarr_add_validified_lisp_string):
* device-x.c (x_init_device):
* device-x.c (Fx_put_resource):
* device-x.c (Fx_valid_keysym_name_p):
* device-x.c (Fx_set_font_path):
* dialog-msw.c (push_lisp_string_as_unicode):
* dialog-msw.c (handle_directory_dialog_box):
* dialog-msw.c (handle_file_dialog_box):
* dialog-x.c (dbox_descriptor_to_widget_value):
* editfns.c (Fformat_time_string):
* editfns.c (Fencode_time):
* editfns.c (Fset_time_zone_rule):
* emacs.c (make_argc_argv):
* emacs.c (Fdump_emacs):
* emodules.c (emodules_load):
* eval.c:
* eval.c (maybe_signal_error_1):
* event-msw.c (Fdde_alloc_advise_item):
* event-msw.c (mswindows_dde_callback):
* event-msw.c (mswindows_wnd_proc):
* fileio.c (report_error_with_errno):
* fileio.c (Fsysnetunam):
* fileio.c (Fdo_auto_save):
* font-mgr.c (extract_fcapi_string):
* font-mgr.c (Ffc_config_app_font_add_file):
* font-mgr.c (Ffc_config_app_font_add_dir):
* font-mgr.c (Ffc_config_filename):
* frame-gtk.c (gtk_set_frame_text_value):
* frame-gtk.c (gtk_create_widgets):
* frame-msw.c (mswindows_init_frame_1):
* frame-msw.c (mswindows_set_title_from_ibyte):
* frame-msw.c (msprinter_init_frame_3):
* frame-x.c (x_set_frame_text_value):
* frame-x.c (x_set_frame_properties):
* frame-x.c (start_drag_internal_1):
* frame-x.c (x_cde_transfer_callback):
* frame-x.c (x_create_widgets):
* glyphs-eimage.c (my_jpeg_output_message):
* glyphs-eimage.c (jpeg_instantiate):
* glyphs-eimage.c (gif_instantiate):
* glyphs-eimage.c (png_instantiate):
* glyphs-eimage.c (tiff_instantiate):
* glyphs-gtk.c (xbm_instantiate_1):
* glyphs-gtk.c (gtk_xbm_instantiate):
* glyphs-gtk.c (gtk_xpm_instantiate):
* glyphs-gtk.c (gtk_xface_instantiate):
* glyphs-gtk.c (cursor_font_instantiate):
* glyphs-gtk.c (gtk_redisplay_widget):
* glyphs-gtk.c (gtk_widget_instantiate_1):
* glyphs-gtk.c (gtk_add_tab_item):
* glyphs-msw.c (mswindows_xpm_instantiate):
* glyphs-msw.c (bmp_instantiate):
* glyphs-msw.c (mswindows_resource_instantiate):
* glyphs-msw.c (xbm_instantiate_1):
* glyphs-msw.c (mswindows_xbm_instantiate):
* glyphs-msw.c (mswindows_xface_instantiate):
* glyphs-msw.c (mswindows_redisplay_widget):
* glyphs-msw.c (mswindows_widget_instantiate):
* glyphs-msw.c (add_tree_item):
* glyphs-msw.c (add_tab_item):
* glyphs-msw.c (mswindows_combo_box_instantiate):
* glyphs-msw.c (mswindows_widget_query_string_geometry):
* glyphs-x.c (x_locate_pixmap_file):
* glyphs-x.c (xbm_instantiate_1):
* glyphs-x.c (x_xbm_instantiate):
* glyphs-x.c (extract_xpm_color_names):
* glyphs-x.c (x_xpm_instantiate):
* glyphs-x.c (x_xface_instantiate):
* glyphs-x.c (autodetect_instantiate):
* glyphs-x.c (safe_XLoadFont):
* glyphs-x.c (cursor_font_instantiate):
* glyphs-x.c (x_redisplay_widget):
* glyphs-x.c (Fchange_subwindow_property):
* glyphs-x.c (x_widget_instantiate):
* glyphs-x.c (x_tab_control_redisplay):
* glyphs.c (pixmap_to_lisp_data):
* gui-x.c (menu_separator_style_and_to_external):
* gui-x.c (add_accel_and_to_external):
* gui-x.c (button_item_to_widget_value):
* hpplay.c (player_error_internal):
* hpplay.c (play_sound_file):
* hpplay.c (play_sound_data):
* intl.c (Fset_current_locale):
* lisp.h:
* menubar-gtk.c (gtk_xemacs_set_accel_keys):
* menubar-msw.c (populate_menu_add_item):
* menubar-msw.c (populate_or_checksum_helper):
* menubar-x.c (menu_item_descriptor_to_widget_value_1):
* nt.c (init_user_info):
* nt.c (get_long_basename):
* nt.c (nt_get_resource):
* nt.c (init_mswindows_environment):
* nt.c (get_cached_volume_information):
* nt.c (mswindows_readdir):
* nt.c (read_unc_volume):
* nt.c (mswindows_stat):
* nt.c (mswindows_getdcwd):
* nt.c (mswindows_executable_type):
* nt.c (Fmswindows_short_file_name):
* ntplay.c (nt_play_sound_file):
* objects-gtk.c:
* objects-gtk.c (gtk_valid_color_name_p):
* objects-gtk.c (gtk_initialize_font_instance):
* objects-gtk.c (gtk_font_list):
* objects-msw.c (font_enum_callback_2):
* objects-msw.c (parse_font_spec):
* objects-x.c (x_parse_nearest_color):
* objects-x.c (x_valid_color_name_p):
* objects-x.c (x_initialize_font_instance):
* objects-x.c (x_font_instance_truename):
* objects-x.c (x_font_list):
* objects-xlike-inc.c (XFUN):
* objects-xlike-inc.c (xft_find_charset_font):
* process-nt.c (mswindows_report_winsock_error):
* process-nt.c (nt_create_process):
* process-nt.c (get_internet_address):
* process-nt.c (nt_open_network_stream):
* process-unix.c:
* process-unix.c (allocate_pty):
* process-unix.c (get_internet_address):
* process-unix.c (unix_canonicalize_host_name):
* process-unix.c (unix_open_network_stream):
* realpath.c:
* select-common.h (lisp_data_to_selection_data):
* select-gtk.c (symbol_to_gtk_atom):
* select-gtk.c (atom_to_symbol):
* select-msw.c (symbol_to_ms_cf):
* select-msw.c (mswindows_register_selection_data_type):
* select-x.c (symbol_to_x_atom):
* select-x.c (x_atom_to_symbol):
* select-x.c (hack_motif_clipboard_selection):
* select-x.c (Fx_store_cutbuffer_internal):
* sound.c (Fplay_sound_file):
* sound.c (Fplay_sound):
* sound.h (sound_perror):
* sysdep.c:
* sysdep.c (qxe_allocating_getcwd):
* sysdep.c (qxe_execve):
* sysdep.c (copy_in_passwd):
* sysdep.c (qxe_getpwnam):
* sysdep.c (qxe_ctime):
* sysdll.c (dll_open):
* sysdll.c (dll_function):
* sysdll.c (dll_variable):
* sysdll.c (search_linked_libs):
* sysdll.c (dll_error):
* sysfile.h:
* sysfile.h (PATHNAME_CONVERT_OUT_TSTR):
* sysfile.h (PATHNAME_CONVERT_OUT_UTF_8):
* sysfile.h (PATHNAME_CONVERT_OUT):
* sysfile.h (LISP_PATHNAME_CONVERT_OUT):
* syswindows.h (ITEXT_TO_TSTR):
* syswindows.h (LOCAL_FILE_FORMAT_TO_TSTR):
* syswindows.h (TSTR_TO_LOCAL_FILE_FORMAT):
* syswindows.h (LOCAL_FILE_FORMAT_TO_INTERNAL_MSWIN):
* syswindows.h (LISP_LOCAL_FILE_FORMAT_MAYBE_URL_TO_TSTR):
* text.h:
* text.h (eicpy_ext_len):
* text.h (enum new_dfc_src_type):
* text.h (EXTERNAL_TO_ITEXT):
* text.h (GET_STRERROR):
* tooltalk.c (check_status):
* tooltalk.c (Fadd_tooltalk_message_arg):
* tooltalk.c (Fadd_tooltalk_pattern_attribute):
* tooltalk.c (Fadd_tooltalk_pattern_arg):
* win32.c (tstr_to_local_file_format):
* win32.c (mswindows_lisp_error_1):
* win32.c (mswindows_report_process_error):
* win32.c (Fmswindows_shell_execute):
* win32.c (mswindows_read_link_1):
Changes involving external/internal format conversion,
mostly code cleanup and renaming.
1. Eliminate the previous macros like LISP_STRING_TO_EXTERNAL
that stored its result in a parameter. The new version of
LISP_STRING_TO_EXTERNAL returns its result through the
return value, same as the previous NEW_LISP_STRING_TO_EXTERNAL.
Use the new-style macros throughout the code.
2. Rename C_STRING_TO_EXTERNAL and friends to ITEXT_TO_EXTERNAL,
in keeping with overall naming rationalization involving
Itext and related types.
Macros involved in previous two:
EXTERNAL_TO_C_STRING -> EXTERNAL_TO_ITEXT
EXTERNAL_TO_C_STRING_MALLOC -> EXTERNAL_TO_ITEXT_MALLOC
SIZED_EXTERNAL_TO_C_STRING -> SIZED_EXTERNAL_TO_ITEXT
SIZED_EXTERNAL_TO_C_STRING_MALLOC -> SIZED_EXTERNAL_TO_ITEXT_MALLOC
C_STRING_TO_EXTERNAL -> ITEXT_TO_EXTERNAL
C_STRING_TO_EXTERNAL_MALLOC -> ITEXT_TO_EXTERNAL_MALLOC
LISP_STRING_TO_EXTERNAL
LISP_STRING_TO_EXTERNAL_MALLOC
LISP_STRING_TO_TSTR
C_STRING_TO_TSTR -> ITEXT_TO_TSTR
TSTR_TO_C_STRING -> TSTR_TO_ITEXT
The following four still return their values through parameters,
since they have more than one value to return:
C_STRING_TO_SIZED_EXTERNAL -> ITEXT_TO_SIZED_EXTERNAL
LISP_STRING_TO_SIZED_EXTERNAL
C_STRING_TO_SIZED_EXTERNAL_MALLOC -> ITEXT_TO_SIZED_EXTERNAL_MALLOC
LISP_STRING_TO_SIZED_EXTERNAL_MALLOC
Sometimes additional casts had to be inserted, since the old
macros played strange games and completely defeated the type system
of the store params.
3. Rewrite many places where direct calls to TO_EXTERNAL_FORMAT
occurred with calls to one of the convenience macros listed above,
or to make_extstring().
4. Eliminate SIZED_C_STRING macros (they were hardly used, anyway)
and use a direct call to TO_EXTERNAL_FORMAT or TO_INTERNAL_FORMAT.
4. Use LISP_PATHNAME_CONVERT_OUT in many places instead of something
like LISP_STRING_TO_EXTERNAL(..., Qfile_name).
5. Eliminate some temporary variables that are no longer necessary
now that we return a value rather than storing it into a variable.
6. Some Mule-izing in database.c.
7. Error functions:
-- A bit of code cleanup in maybe_signal_error_1.
-- Eliminate report_file_type_error; it's just an alias for
signal_error_2 with params in a different order.
-- Fix some places in the hostname-handling code that directly
inserted externally-retrieved error strings into the
supposed ASCII "reason" param instead of doing the right thing
and sticking text descriptive of what was going on in "reason"
and putting the external message in a frob.
8. Use Ascbyte instead of CIbyte in process-unix.c and maybe one
or two other places.
9. Some code cleanup in copy_in_passwd() in sysdep.c.
10. Fix a real bug due to accidental variable shadowing in
tstr_to_local_file_format() in win32.c.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Fri, 05 Feb 2010 11:02:24 -0600 |
| parents | 189fb67ca31a |
| children | 0f66906b6e37 |
| rev | line source |
|---|---|
| 428 | 1 ;; Copyright (C) 1998 Free Software Foundation, Inc. |
| 2 | |
| 3 ;; Author: Martin Buchholz <martin@xemacs.org> | |
| 4 ;; Maintainer: Martin Buchholz <martin@xemacs.org> | |
| 5 ;; Created: 1998 | |
| 6 ;; Keywords: tests, database | |
| 7 | |
| 8 ;; This file is part of XEmacs. | |
| 9 | |
| 10 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 11 ;; under the terms of the GNU General Public License as published by | |
| 12 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 13 ;; any later version. | |
| 14 | |
| 15 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 16 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 18 ;; General Public License for more details. | |
| 19 | |
| 20 ;; You should have received a copy of the GNU General Public License | |
| 21 ;; along with XEmacs; see the file COPYING. If not, write to the Free | |
| 22 ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | |
| 23 ;; 02111-1307, USA. | |
| 24 | |
| 25 ;;; Synched up with: Not in FSF. | |
| 26 | |
| 27 ;;; Commentary: | |
| 28 | |
| 29 ;;; Test hash tables implementation | |
| 30 ;;; See test-harness.el | |
| 31 | |
| 32 (condition-case err | |
| 33 (require 'test-harness) | |
| 34 (file-error | |
| 35 (when (and (boundp 'load-file-name) (stringp load-file-name)) | |
| 36 (push (file-name-directory load-file-name) load-path) | |
| 37 (require 'test-harness)))) | |
| 38 | |
| 39 ;; Test all combinations of make-hash-table keywords | |
| 40 (dolist (test '(eq eql equal)) | |
| 41 (dolist (size '(0 1 100)) | |
| 42 (dolist (rehash-size '(1.1 9.9)) | |
| 43 (dolist (rehash-threshold '(0.2 .9)) | |
| 442 | 44 (dolist (weakness '(nil key value key-or-value key-and-value)) |
| 428 | 45 (dolist (data '(() (1 2) (1 2 3 4))) |
| 46 (let ((ht (make-hash-table | |
| 47 :test test | |
| 48 :size size | |
| 49 :rehash-size rehash-size | |
| 50 :rehash-threshold rehash-threshold | |
| 51 :weakness weakness))) | |
|
4855
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
52 (Assert-equal ht (car (let ((print-readably t)) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
53 (read-from-string (prin1-to-string ht))))) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
54 (Assert-eq test (hash-table-test ht)) |
| 428 | 55 (Assert (<= size (hash-table-size ht))) |
|
4855
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
56 (Assert-eql rehash-size (hash-table-rehash-size ht)) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
57 (Assert-eql rehash-threshold (hash-table-rehash-threshold ht)) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
58 (Assert-eq weakness (hash-table-weakness ht))))))))) |
| 428 | 59 |
| 60 (loop for (fun weakness) in '((make-hashtable nil) | |
| 442 | 61 (make-weak-hashtable key-and-value) |
| 428 | 62 (make-key-weak-hashtable key) |
| 63 (make-value-weak-hashtable value)) | |
|
4855
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
64 do (Assert-eq weakness (hash-table-weakness (funcall fun 10)))) |
| 428 | 65 |
| 66 (loop for (type weakness) in '((non-weak nil) | |
| 442 | 67 (weak key-and-value) |
| 428 | 68 (key-weak key) |
| 69 (value-weak value)) | |
|
4855
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
70 do (Assert-equal (make-hash-table :type type) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
71 (make-hash-table :weakness weakness))) |
| 428 | 72 |
| 73 (Assert (not (equal (make-hash-table :weakness nil) | |
| 74 (make-hash-table :weakness t)))) | |
| 75 | |
| 76 (let ((ht (make-hash-table :size 20 :rehash-threshold .75 :test 'eq)) | |
| 77 (size 80)) | |
| 78 (Assert (hashtablep ht)) | |
| 79 (Assert (hash-table-p ht)) | |
|
4855
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
80 (Assert-eq 'eq (hash-table-test ht)) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
81 (Assert-eq 'non-weak (hash-table-type ht)) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
82 (Assert-eq 'non-weak (hashtable-type ht)) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
83 (Assert-eq 'nil (hash-table-weakness ht)) |
| 428 | 84 (dotimes (j size) |
| 85 (puthash j (- j) ht) | |
|
4855
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
86 (Assert-eq (gethash j ht) (- j)) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
87 (Assert= (hash-table-count ht) (1+ j)) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
88 (Assert= (hashtable-fullness ht) (hash-table-count ht)) |
| 428 | 89 (puthash j j ht) |
|
4855
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
90 (Assert-eq (gethash j ht 'foo) j) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
91 (Assert= (hash-table-count ht) (1+ j)) |
| 428 | 92 (setf (gethash j ht) (- j)) |
|
4855
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
93 (Assert-eq (gethash j ht) (- j)) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
94 (Assert= (hash-table-count ht) (1+ j))) |
| 428 | 95 |
| 96 (clrhash ht) | |
|
4855
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
97 (Assert= 0 (hash-table-count ht)) |
| 428 | 98 |
| 99 (dotimes (j size) | |
| 100 (puthash j (- j) ht) | |
|
4855
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
101 (Assert-eq (gethash j ht) (- j)) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
102 (Assert= (hash-table-count ht) (1+ j))) |
| 428 | 103 |
| 104 (let ((k-sum 0) (v-sum 0)) | |
| 105 (maphash #'(lambda (k v) (incf k-sum k) (incf v-sum v)) ht) | |
|
4855
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
106 (Assert= k-sum (/ (* size (- size 1)) 2)) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
107 (Assert= v-sum (- k-sum))) |
| 428 | 108 |
| 109 (let ((count size)) | |
| 110 (dotimes (j size) | |
| 111 (remhash j ht) | |
|
4855
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
112 (Assert-eq (gethash j ht) nil) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
113 (Assert-eq (gethash j ht 'foo) 'foo) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
114 (Assert= (hash-table-count ht) (decf count))))) |
| 428 | 115 |
| 116 (let ((ht (make-hash-table :size 30 :rehash-threshold .25 :test 'equal)) | |
| 117 (size 70)) | |
| 118 (Assert (hashtablep ht)) | |
| 119 (Assert (hash-table-p ht)) | |
| 120 (Assert (>= (hash-table-size ht) (/ 30 .25))) | |
|
4855
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
121 (Assert-eql .25 (hash-table-rehash-threshold ht)) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
122 (Assert-eq 'equal (hash-table-test ht)) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
123 (Assert-eq (hash-table-test ht) (hashtable-test-function ht)) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
124 (Assert-eq 'non-weak (hash-table-type ht)) |
| 428 | 125 (dotimes (j size) |
| 126 (puthash (int-to-string j) (- j) ht) | |
|
4855
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
127 (Assert-eq (gethash (int-to-string j) ht) (- j)) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
128 (Assert= (hash-table-count ht) (1+ j)) |
| 428 | 129 (puthash (int-to-string j) j ht) |
|
4855
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
130 (Assert-eq (gethash (int-to-string j) ht 'foo) j) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
131 (Assert= (hash-table-count ht) (1+ j))) |
| 428 | 132 |
| 133 (clrhash ht) | |
|
4855
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
134 (Assert= 0 (hash-table-count ht)) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
135 (Assert-equal ht (copy-hash-table ht)) |
| 428 | 136 |
| 137 (dotimes (j size) | |
| 138 (setf (gethash (int-to-string j) ht) (- j)) | |
|
4855
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
139 (Assert-eq (gethash (int-to-string j) ht) (- j)) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
140 (Assert= (hash-table-count ht) (1+ j))) |
| 428 | 141 |
| 142 (let ((count size)) | |
| 143 (dotimes (j size) | |
| 144 (remhash (int-to-string j) ht) | |
|
4855
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
145 (Assert-eq (gethash (int-to-string j) ht) nil) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
146 (Assert-eq (gethash (int-to-string j) ht 'foo) 'foo) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
147 (Assert= (hash-table-count ht) (decf count))))) |
| 428 | 148 |
| 149 (let ((iterations 5) (one 1.0) (two 2.0)) | |
| 150 (flet ((check-copy | |
| 151 (ht) | |
| 152 (let ((copy-of-ht (copy-hash-table ht))) | |
|
4855
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
153 (Assert-equal ht copy-of-ht) |
| 428 | 154 (Assert (not (eq ht copy-of-ht))) |
|
4855
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
155 (Assert-eq (hash-table-count ht) (hash-table-count copy-of-ht)) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
156 (Assert-eq (hash-table-type ht) (hash-table-type copy-of-ht)) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
157 (Assert-eq (hash-table-size ht) (hash-table-size copy-of-ht)) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
158 (Assert-eql (hash-table-rehash-size ht) (hash-table-rehash-size copy-of-ht)) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
159 (Assert-eql (hash-table-rehash-threshold ht) (hash-table-rehash-threshold copy-of-ht))))) |
| 428 | 160 |
| 161 (let ((ht (make-hash-table :size 100 :rehash-threshold .6 :test 'eq))) | |
| 162 (dotimes (j iterations) | |
| 163 (puthash (+ one 0.0) t ht) | |
| 164 (puthash (+ two 0.0) t ht) | |
| 444 | 165 (puthash (cons 1 2) t ht) |
| 166 (puthash (cons 3 4) t ht)) | |
|
4855
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
167 (Assert-eq (hashtable-test-function ht) 'eq) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
168 (Assert-eq (hash-table-test ht) 'eq) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
169 (Assert= (* iterations 4) (hash-table-count ht)) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
170 (Assert-eq nil (gethash 1.0 ht)) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
171 (Assert-eq nil (gethash '(1 . 2) ht)) |
| 428 | 172 (check-copy ht) |
| 173 ) | |
| 174 | |
| 175 (let ((ht (make-hash-table :size 100 :rehash-threshold .6 :test 'eql))) | |
| 176 (dotimes (j iterations) | |
| 177 (puthash (+ one 0.0) t ht) | |
| 178 (puthash (+ two 0.0) t ht) | |
| 444 | 179 (puthash (cons 1 2) t ht) |
| 180 (puthash (cons 3 4) t ht)) | |
|
4855
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
181 (Assert-eq (hashtable-test-function ht) 'eql) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
182 (Assert-eq (hash-table-test ht) 'eql) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
183 (Assert= (+ 2 (* 2 iterations)) (hash-table-count ht)) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
184 (Assert-eq t (gethash 1.0 ht)) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
185 (Assert-eq nil (gethash '(1 . 2) ht)) |
| 428 | 186 (check-copy ht) |
| 187 ) | |
| 188 | |
| 189 (let ((ht (make-hash-table :size 100 :rehash-threshold .6 :test 'equal))) | |
| 190 (dotimes (j iterations) | |
| 191 (puthash (+ one 0.0) t ht) | |
| 192 (puthash (+ two 0.0) t ht) | |
| 444 | 193 (puthash (cons 1 2) t ht) |
| 194 (puthash (cons 3 4) t ht)) | |
|
4855
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
195 (Assert-eq (hashtable-test-function ht) 'equal) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
196 (Assert-eq (hash-table-test ht) 'equal) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
197 (Assert= 4 (hash-table-count ht)) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
198 (Assert-eq t (gethash 1.0 ht)) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
199 (Assert-eq t (gethash '(1 . 2) ht)) |
| 428 | 200 (check-copy ht) |
| 201 ) | |
| 202 | |
| 203 )) | |
| 204 | |
| 205 ;; Test that weak hash-tables are properly handled | |
| 206 (loop for (weakness expected-count expected-k-sum expected-v-sum) in | |
| 207 '((nil 6 38 25) | |
| 208 (t 3 6 9) | |
| 209 (key 4 38 9) | |
| 210 (value 4 6 25)) | |
| 211 do | |
| 212 (let* ((ht (make-hash-table :weakness weakness)) | |
| 213 (my-obj (cons ht ht))) | |
| 214 (garbage-collect) | |
| 215 (puthash my-obj 1 ht) | |
| 216 (puthash 2 my-obj ht) | |
| 217 (puthash 4 8 ht) | |
| 218 (puthash (cons ht ht) 16 ht) | |
| 219 (puthash 32 (cons ht ht) ht) | |
| 220 (puthash (cons ht ht) (cons ht ht) ht) | |
| 221 (let ((k-sum 0) (v-sum 0)) | |
| 222 (maphash #'(lambda (k v) | |
| 223 (when (integerp k) (incf k-sum k)) | |
| 224 (when (integerp v) (incf v-sum v))) | |
| 225 ht) | |
|
4855
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
226 (Assert-eq 38 k-sum) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
227 (Assert-eq 25 v-sum)) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
228 (Assert-eq 6 (hash-table-count ht)) |
| 428 | 229 (garbage-collect) |
|
4855
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
230 (Assert-eq expected-count (hash-table-count ht)) |
| 428 | 231 (let ((k-sum 0) (v-sum 0)) |
| 232 (maphash #'(lambda (k v) | |
| 233 (when (integerp k) (incf k-sum k)) | |
| 234 (when (integerp v) (incf v-sum v))) | |
| 235 ht) | |
|
4855
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
236 (Assert-eq expected-k-sum k-sum) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
237 (Assert-eq expected-v-sum v-sum)))) |
| 428 | 238 |
| 239 ;;; Test the ability to puthash and remhash the current elt of a maphash | |
| 240 (let ((ht (make-hash-table :test 'eql))) | |
| 241 (dotimes (j 100) (setf (gethash j ht) (- j))) | |
| 242 (maphash #'(lambda (k v) | |
| 243 (if (oddp k) (remhash k ht) (puthash k (- v) ht))) | |
| 244 ht) | |
| 245 (let ((k-sum 0) (v-sum 0)) | |
| 246 (maphash #'(lambda (k v) (incf k-sum k) (incf v-sum v)) ht) | |
|
4855
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
247 (Assert= (* 50 49) k-sum) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
248 (Assert= v-sum k-sum))) |
| 428 | 249 |
| 250 ;;; Test reading and printing of hash-table objects | |
| 251 (let ((h1 #s(hashtable weakness t rehash-size 3.0 rehash-threshold .2 test eq data (1 2 3 4))) | |
| 252 (h2 #s(hash-table weakness t rehash-size 3.0 rehash-threshold .2 test eq data (1 2 3 4))) | |
| 253 (h3 (make-hash-table :weakness t :rehash-size 3.0 :rehash-threshold .2 :test 'eq))) | |
|
4855
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
254 (Assert-equal h1 h2) |
| 428 | 255 (Assert (not (equal h1 h3))) |
| 256 (puthash 1 2 h3) | |
| 257 (puthash 3 4 h3) | |
|
4855
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
258 (Assert-equal h1 h3)) |
| 428 | 259 |
| 260 ;;; Testing equality of hash tables | |
|
4855
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
261 (Assert-equal (make-hash-table :test 'eql :size 300 :rehash-threshold .9 :rehash-size 3.0) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
262 (make-hash-table :test 'eql)) |
| 428 | 263 (Assert (not (equal (make-hash-table :test 'eq) |
| 264 (make-hash-table :test 'equal)))) | |
| 265 (let ((h1 (make-hash-table)) | |
| 266 (h2 (make-hash-table))) | |
|
4855
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
267 (Assert-equal h1 h2) |
| 428 | 268 (Assert (not (eq h1 h2))) |
| 269 (puthash 1 2 h1) | |
| 270 (Assert (not (equal h1 h2))) | |
| 271 (puthash 1 2 h2) | |
|
4855
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
272 (Assert-equal h1 h2) |
| 428 | 273 (puthash 1 3 h2) |
| 274 (Assert (not (equal h1 h2))) | |
| 275 (clrhash h1) | |
| 276 (Assert (not (equal h1 h2))) | |
| 277 (clrhash h2) | |
|
4855
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
278 (Assert-equal h1 h2) |
| 428 | 279 ) |
| 280 | |
| 281 ;;; Test sxhash | |
|
4855
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
282 (Assert= (sxhash "foo") (sxhash "foo")) |
|
189fb67ca31a
Create Assert-eq, Assert-equal, etc.
Ben Wing <ben@xemacs.org>
parents:
4398
diff
changeset
|
283 (Assert= (sxhash '(1 2 3)) (sxhash '(1 2 3))) |
|
4398
479443c0f95a
Have list hashes depend on the order of the contents, as is the case for vectors.
Aidan Kehoe <kehoea@parhasard.net>
parents:
1761
diff
changeset
|
284 (Assert (/= (sxhash '(1 2 3)) (sxhash '(3 2 1)))) |