Mercurial > hg > xemacs-beta
view src/hash.h @ 5168:cf900a2f1fa3
extract gap array from extents.c, use in range tables
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-03-22 Ben Wing <ben@xemacs.org>
* Makefile.in.in (objs):
* array.c:
* array.c (gap_array_adjust_markers):
* array.c (gap_array_move_gap):
* array.c (gap_array_make_gap):
* array.c (gap_array_insert_els):
* array.c (gap_array_delete_els):
* array.c (gap_array_make_marker):
* array.c (gap_array_delete_marker):
* array.c (gap_array_delete_all_markers):
* array.c (gap_array_clone):
* array.h:
* depend:
* emacs.c (main_1):
* extents.c:
* extents.c (EXTENT_GAP_ARRAY_AT):
* extents.c (extent_list_num_els):
* extents.c (extent_list_locate):
* extents.c (extent_list_at):
* extents.c (extent_list_delete_all):
* extents.c (allocate_extent_list):
* extents.c (syms_of_extents):
* extents.h:
* extents.h (XEXTENT_LIST_MARKER):
* lisp.h:
* rangetab.c:
* rangetab.c (mark_range_table):
* rangetab.c (print_range_table):
* rangetab.c (range_table_equal):
* rangetab.c (range_table_hash):
* rangetab.c (verify_range_table):
* rangetab.c (get_range_table_pos):
* rangetab.c (Fmake_range_table):
* rangetab.c (Fcopy_range_table):
* rangetab.c (Fget_range_table):
* rangetab.c (put_range_table):
* rangetab.c (Fclear_range_table):
* rangetab.c (Fmap_range_table):
* rangetab.c (unified_range_table_bytes_needed):
* rangetab.c (unified_range_table_copy_data):
* rangetab.c (unified_range_table_lookup):
* rangetab.h:
* rangetab.h (struct range_table_entry):
* rangetab.h (struct Lisp_Range_Table):
* rangetab.h (rangetab_gap_array_at):
* symsinit.h:
Rename dynarr.c to array.c. Move gap array from extents.c to array.c.
Extract dynarr, gap array and stack-like malloc into new file array.h.
Rename GAP_ARRAY_NUM_ELS -> gap_array_length(). Add gap_array_at(),
gap_array_atp().
Rewrite range table code to use gap arrays. Make put_range_table()
smarter so that its operation is O(log n) for adding a localized
range.
* gc.c (lispdesc_block_size_1):
Don't ABORT() when two elements are located at the same place.
This will happen with a size-0 gap array -- both parts of the array
(before and after gap) are in the same place.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 22 Mar 2010 19:12:15 -0500 |
parents | de9952d2ed18 |
children | 308d34e9f07d |
line wrap: on
line source
/* Copyright (C) 2003 Ben Wing. 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. */ #ifndef INCLUDED_hash_h_ #define INCLUDED_hash_h_ typedef struct { const void *key; void *contents; } hentry; typedef int (*hash_table_test_function) (const void *, const void *); typedef Hashcode (*hash_table_hash_function) (const void *); struct hash_table { hentry *harray; long zero_set; void *zero_entry; Elemcount size; /* size of the hasharray */ Elemcount fullness; /* number of entries in the hash table */ hash_table_hash_function hash_function; hash_table_test_function test_function; }; /* SIZE is the number of initial entries. The hash table will be grown automatically if the number of entries approaches the size */ struct hash_table *make_hash_table (Elemcount size); struct hash_table *make_string_hash_table (Elemcount size); struct hash_table *make_general_hash_table (Elemcount size, hash_table_hash_function hash_function, hash_table_test_function test_function); /* Clear HASH-TABLE. A freshly created hash table is already cleared up. */ void clrhash (struct hash_table *hash_table); /* Free HASH-TABLE and its substructures */ void free_hash_table (struct hash_table *hash_table); /* Returns a hentry whose key is 0 if the entry does not exist in HASH-TABLE */ const void *gethash (const void *key, struct hash_table *hash_table, const void **ret_value); /* KEY should be different from 0 */ void puthash (const void *key, void *contents, struct hash_table *hash_table); /* delete the entry with key KEY */ void remhash (const void *key, struct hash_table *hash_table); typedef int (*maphash_function) (const void* key, void* contents, void* arg); typedef int (*remhash_predicate) (const void* key, const void* contents, void* arg); /* Call MF (key, contents, arg) for every entry in HASH-TABLE */ void maphash (maphash_function mf, struct hash_table *hash_table, void* arg); /* Delete all objects from HASH-TABLE satisfying PREDICATE */ void map_remhash (remhash_predicate predicate, struct hash_table *hash_table, void *arg); /* Grow the table if it has less than BREATHING_ROOM elements that can be added before a resize will be triggered. After the grow, the table can hold at least BREATHING_ROOM elements (and probably a lot more) before needing resizing again. */ void pregrow_hash_table_if_necessary (struct hash_table *hash_table, Elemcount breathing_room); #endif /* INCLUDED_hash_h_ */