comparison src/lisp.h @ 5182:2e528066e2fc

Move #'sort*, #'fill, #'merge to C from cl-seq.el. lisp/ChangeLog addition: 2010-04-01 Aidan Kehoe <kehoea@parhasard.net> * cl-seq.el (fill, sort*, merge): Move these functions to fns.c. (stable-sort): Make this docstring reflect the argument names used in the #'sort* docstring. * cl-macs.el (stable-sort): Make #'stable-sort exactly equivalent to #'sort* in compiled code. * bytecomp.el (byte-compile-maybe-add-*): New macro, for functions like #'sort and #'mapcar that, to be strictly compatible, should only take two args, but in our implementation can take more, because they're aliases of #'sort* and #'mapcar*. (byte-compile-mapcar, byte-compile-sort, byte-compile-fillarray): Use this new macro. (map-into): Add a byte-compile method for #'map-into in passing. * apropos.el (apropos-print): Use #'sort* with a :key argument, now it's in C. * compat.el (extent-at): Ditto. * register.el (list-registers): Ditto. * package-ui.el (pui-list-packages): Ditto. * help.el (sorted-key-descriptions): Ditto. src/ChangeLog addition: 2010-03-31 Aidan Kehoe <kehoea@parhasard.net> * fns.c (STRING_DATA_TO_OBJECT_ARRAY) (BIT_VECTOR_TO_OBJECT_ARRAY, c_merge_predicate_key) (c_merge_predicate_nokey, list_merge, array_merge) (list_array_merge_into_list, list_list_merge_into_array) (list_array_merge_into_array, CHECK_KEY_ARGUMENT, Fmerge) (list_sort, array_sort, FsortX): Move #'sort*, #'fill, #'merge from cl-seq.el to C, extending the implementations of Fsort, Ffillarray, and merge() to do so. * keymap.c (keymap_submaps, map_keymap_sort_predicate) (describe_map_sort_predicate): Change the calling semantics of the C sort predicates to return a non-nil Lisp object if the first argument is less than the second, rather than C integers. * fontcolor-msw.c (sort_font_list_function): * fileio.c (build_annotations): * dired.c (Fdirectory_files): * abbrev.c (Finsert_abbrev_table_description): Call list_sort instead of Fsort, list_merge instead of merge() in these functions. man/ChangeLog addition: 2010-04-01 Aidan Kehoe <kehoea@parhasard.net> * lispref/lists.texi (Rearrangement): Update the documentation of #'sort here, now that it accepts any type of sequence and the KEY keyword argument. (Though this is probably now the wrong place for this function, given that.)
author Aidan Kehoe <kehoea@parhasard.net>
date Thu, 01 Apr 2010 20:22:50 +0100
parents a00bfbd64e0a
children 1c1d8843de5e
comparison
equal deleted inserted replaced
5181:a00bfbd64e0a 5182:2e528066e2fc
5168 EXFUN (Frassq, 2); 5168 EXFUN (Frassq, 2);
5169 EXFUN (Fremassq, 2); 5169 EXFUN (Fremassq, 2);
5170 EXFUN (Freplace_list, 2); 5170 EXFUN (Freplace_list, 2);
5171 MODULE_API EXFUN (Freverse, 1); 5171 MODULE_API EXFUN (Freverse, 1);
5172 EXFUN (Fsafe_length, 1); 5172 EXFUN (Fsafe_length, 1);
5173 EXFUN (Fsort, 2);
5174 EXFUN (Fstring_equal, 2); 5173 EXFUN (Fstring_equal, 2);
5175 EXFUN (Fstring_lessp, 2); 5174 EXFUN (Fstring_lessp, 2);
5176 EXFUN (Fsubseq, 3); 5175 EXFUN (Fsubseq, 3);
5177 EXFUN (Fvalid_plist_p, 1); 5176 EXFUN (Fvalid_plist_p, 1);
5178 5177
5179 Lisp_Object list_sort (Lisp_Object, Lisp_Object, 5178 Lisp_Object list_merge (Lisp_Object org_l1, Lisp_Object org_l2,
5180 int (*) (Lisp_Object, Lisp_Object, Lisp_Object)); 5179 Lisp_Object (*c_predicate) (Lisp_Object o1,
5181 Lisp_Object merge (Lisp_Object, Lisp_Object, Lisp_Object); 5180 Lisp_Object o2,
5181 Lisp_Object pred,
5182 Lisp_Object keyf),
5183 Lisp_Object predicate, Lisp_Object key_func);
5184 Lisp_Object list_sort (Lisp_Object list,
5185 Lisp_Object (*c_predicate) (Lisp_Object, Lisp_Object,
5186 Lisp_Object, Lisp_Object),
5187 Lisp_Object predicate, Lisp_Object key_func);
5182 5188
5183 void bump_string_modiff (Lisp_Object); 5189 void bump_string_modiff (Lisp_Object);
5184 Lisp_Object memq_no_quit (Lisp_Object, Lisp_Object); 5190 Lisp_Object memq_no_quit (Lisp_Object, Lisp_Object);
5185 Lisp_Object assoc_no_quit (Lisp_Object, Lisp_Object); 5191 Lisp_Object assoc_no_quit (Lisp_Object, Lisp_Object);
5186 Lisp_Object assq_no_quit (Lisp_Object, Lisp_Object); 5192 Lisp_Object assq_no_quit (Lisp_Object, Lisp_Object);