Mercurial > hg > xemacs-beta
view src/elhash.h @ 5607:1a507c4c6c42
Refactor out sequence-oriented builtins from fns.c to the new sequence.c.
src/ChangeLog addition:
2011-12-04 Aidan Kehoe <kehoea@parhasard.net>
* Makefile.in.in (objs):
* depend:
Add sequence.o to the list of objects and dependencies.
* alloc.c:
* alloc.c (mark_bit_vector):
* alloc.c (print_bit_vector):
* alloc.c (bit_vector_equal):
* alloc.c (internal_bit_vector_equalp_hash):
* alloc.c (bit_vector_hash):
* alloc.c (init_alloc_once_early):
Move the implementation of the bit vector type here from fns.c.
* emacs.c (main_1):
Call syms_of_sequence() here, now sequence.c is included.
* fns.c (Fold_rassq):
Move this together with the rest of the Fold_* functions.
* fns.c:
* fns.c (syms_of_fns):
Move most functions dealing with sequences generally, and
especially those taking key arguments, to a separate file,
sequence.c.
* general-slots.h:
Qyes_or_no_p belong here, not fns.c.
* lisp.h:
Make Flist_length available here, it's used by sequence.c
* sequence.c:
* sequence.c (check_sequence_range):
* sequence.c (Flength):
* sequence.c (check_other_nokey):
* sequence.c (check_other_key):
* sequence.c (check_if_key):
* sequence.c (check_match_eq_key):
* sequence.c (check_match_eql_key):
* sequence.c (check_match_equal_key):
* sequence.c (check_match_equalp_key):
* sequence.c (check_match_other_key):
* sequence.c (check_lss_key):
* sequence.c (check_lss_key_car):
* sequence.c (check_string_lessp_key):
* sequence.c (check_string_lessp_key_car):
* sequence.c (get_check_match_function_1):
* sequence.c (get_merge_predicate):
* sequence.c (count_with_tail):
* sequence.c (list_count_from_end):
* sequence.c (string_count_from_end):
* sequence.c (Fcount):
* sequence.c (Fsubseq):
* sequence.c (list_position_cons_before):
* sequence.c (FmemberX):
* sequence.c (Fadjoin):
* sequence.c (FassocX):
* sequence.c (FrassocX):
* sequence.c (position):
* sequence.c (Fposition):
* sequence.c (Ffind):
* sequence.c (delq_no_quit_and_free_cons):
* sequence.c (FdeleteX):
* sequence.c (FremoveX):
* sequence.c (list_delete_duplicates_from_end):
* sequence.c (Fdelete_duplicates):
* sequence.c (Fremove_duplicates):
* sequence.c (Fnreverse):
* sequence.c (Freverse):
* sequence.c (list_merge):
* sequence.c (array_merge):
* sequence.c (list_array_merge_into_list):
* sequence.c (list_list_merge_into_array):
* sequence.c (list_array_merge_into_array):
* sequence.c (Fmerge):
* sequence.c (list_sort):
* sequence.c (array_sort):
* sequence.c (FsortX):
* sequence.c (Ffill):
* sequence.c (mapcarX):
* sequence.c (shortest_length_among_sequences):
* sequence.c (Fmapconcat):
* sequence.c (FmapcarX):
* sequence.c (Fmapvector):
* sequence.c (Fmapcan):
* sequence.c (Fmap):
* sequence.c (Fmap_into):
* sequence.c (Fsome):
* sequence.c (Fevery):
* sequence.c (Freduce):
* sequence.c (replace_string_range_1):
* sequence.c (Freplace):
* sequence.c (Fnsubstitute):
* sequence.c (Fsubstitute):
* sequence.c (subst):
* sequence.c (sublis):
* sequence.c (Fsublis):
* sequence.c (nsublis):
* sequence.c (Fnsublis):
* sequence.c (Fsubst):
* sequence.c (Fnsubst):
* sequence.c (tree_equal):
* sequence.c (Ftree_equal):
* sequence.c (mismatch_from_end):
* sequence.c (mismatch_list_list):
* sequence.c (mismatch_list_string):
* sequence.c (mismatch_list_array):
* sequence.c (mismatch_string_array):
* sequence.c (mismatch_string_string):
* sequence.c (mismatch_array_array):
* sequence.c (get_mismatch_func):
* sequence.c (Fmismatch):
* sequence.c (Fsearch):
* sequence.c (venn):
* sequence.c (nvenn):
* sequence.c (Funion):
* sequence.c (Fset_exclusive_or):
* sequence.c (Fnset_exclusive_or):
* sequence.c (syms_of_sequence):
Add this file, containing those general functions that dealt with
sequences that were in fns.c.
* symsinit.h:
Make syms_of_sequence() available here.
man/ChangeLog addition:
2011-12-04 Aidan Kehoe <kehoea@parhasard.net>
* internals/internals.texi (Basic Lisp Modules):
Document sequence.c here too.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 04 Dec 2011 18:42:50 +0000 |
parents | 58b38d5b32d0 |
children |
line wrap: on
line source
/* Lisp interface to hash tables -- include file. Copyright (C) 1995, 1996 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 3 of the License, 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. If not, see <http://www.gnu.org/licenses/>. */ /* Synched up with: Not in FSF. */ #ifndef INCLUDED_elhash_h_ #define INCLUDED_elhash_h_ typedef struct Lisp_Hash_Table Lisp_Hash_Table; DECLARE_LISP_OBJECT (hash_table, Lisp_Hash_Table); #define XHASH_TABLE(x) XRECORD (x, hash_table, Lisp_Hash_Table) #define wrap_hash_table(p) wrap_record (p, hash_table) #define HASH_TABLEP(x) RECORDP (x, hash_table) #define CHECK_HASH_TABLE(x) CHECK_RECORD (x, hash_table) #define CONCHECK_HASH_TABLE(x) CONCHECK_RECORD (x, hash_table) typedef struct htentry { #ifdef NEW_GC NORMAL_LISP_OBJECT_HEADER lheader; #endif /* NEW_GC */ Lisp_Object key; Lisp_Object value; } htentry; #define HTENTRY_CLEAR_P(htentry) ((*(EMACS_UINT*)(&((htentry)->key))) == 0) #ifdef NEW_GC typedef struct htentry Lisp_Hash_Table_Entry; DECLARE_LISP_OBJECT (hash_table_entry, Lisp_Hash_Table_Entry); #define XHASH_TABLE_ENTRY(x) \ XRECORD (x, hash_table_entry, Lisp_Hash_Table_Entry) #define wrap_hash_table_entry(p) wrap_record (p, hash_table_entry) #define HASH_TABLE_ENTRYP(x) RECORDP (x, hash_table_entry) #define CHECK_HASH_TABLE_ENTRY(x) CHECK_RECORD (x, hash_table_entry) #define CONCHECK_HASH_TABLE_ENTRY(x) CONCHECK_RECORD (x, hash_table_entry) #endif /* NEW_GC */ enum hash_table_weakness { HASH_TABLE_NON_WEAK, HASH_TABLE_KEY_WEAK, HASH_TABLE_VALUE_WEAK, HASH_TABLE_KEY_VALUE_WEAK, HASH_TABLE_KEY_CAR_WEAK, HASH_TABLE_VALUE_CAR_WEAK, HASH_TABLE_KEY_CAR_VALUE_WEAK, HASH_TABLE_WEAK }; enum hash_table_test { HASH_TABLE_EQ, HASH_TABLE_EQL, HASH_TABLE_EQUAL, HASH_TABLE_EQUALP }; extern const struct memory_description hash_table_description[]; EXFUN (Fcopy_hash_table, 1); EXFUN (Fhash_table_count, 1); EXFUN (Fgethash, 3); EXFUN (Fputhash, 3); EXFUN (Fremhash, 2); EXFUN (Fclrhash, 1); typedef struct Hash_Table_Test Hash_Table_Test; DECLARE_LISP_OBJECT (hash_table_test, struct Hash_Table_Test); #define XHASH_TABLE_TEST(x) XRECORD (x, hash_table_test, struct Hash_Table_Test) #define wrap_hash_table_test(p) wrap_record (p, hash_table_test) #define HASH_TABLE_TESTP(x) RECORDP (x, hash_table_test) #define CHECK_HASH_TABLE_TEST(x) CHECK_RECORD (x, hash_table_test) #define CONCHECK_HASH_TABLE_TEST(x) CONCHECK_RECORD (x, hash_table_test) typedef int (*hash_table_equal_function_t) (const Hash_Table_Test *http, Lisp_Object obj1, Lisp_Object obj2); typedef Hashcode (*hash_table_hash_function_t) (const Hash_Table_Test *http, Lisp_Object obj); typedef int (*maphash_function_t) (Lisp_Object key, Lisp_Object value, void* extra_arg); /* test here is a Lisp_Object of type hash-table-test. You probably don't want to call this, unless you have registered your own test. */ Lisp_Object make_general_lisp_hash_table (Lisp_Object test, Elemcount size, double rehash_size, double rehash_threshold, enum hash_table_weakness weakness); /* test here is a symbol, e.g. Qeq, Qequal. */ Lisp_Object make_lisp_hash_table (Elemcount size, enum hash_table_weakness weakness, Lisp_Object test); void elisp_maphash (maphash_function_t function, Lisp_Object hash_table, void *extra_arg); void elisp_maphash_unsafe (maphash_function_t function, Lisp_Object hash_table, void *extra_arg); void elisp_map_remhash (maphash_function_t predicate, Lisp_Object hash_table, void *extra_arg); int finish_marking_weak_hash_tables (void); void prune_weak_hash_tables (void); void pdump_reorganize_hash_table (Lisp_Object); htentry *inchash_eq (Lisp_Object key, Lisp_Object table, EMACS_INT offset); htentry *find_htentry (Lisp_Object key, const Lisp_Hash_Table *ht); Lisp_Object define_hash_table_test (Lisp_Object name, hash_table_equal_function_t equal_function, hash_table_hash_function_t hash_function, Lisp_Object lisp_equal_function, Lisp_Object lisp_hash_function); void mark_hash_table_tests (void); #endif /* INCLUDED_elhash_h_ */