comparison src/fileio.c @ 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 788c38f20376
children bc3ede8f29a8
comparison
equal deleted inserted replaced
5181:a00bfbd64e0a 5182:2e528066e2fc
3664 start = make_int (BUF_BEGV (current_buffer)); 3664 start = make_int (BUF_BEGV (current_buffer));
3665 end = make_int (BUF_ZV (current_buffer)); 3665 end = make_int (BUF_ZV (current_buffer));
3666 annotations = Qnil; 3666 annotations = Qnil;
3667 } 3667 }
3668 Flength (res); /* Check basic validity of return value */ 3668 Flength (res); /* Check basic validity of return value */
3669 annotations = merge (annotations, res, Qcar_less_than_car); 3669 annotations = list_merge (annotations, res, NULL, Qlss, Qcar);
3670 p = Fcdr (p); 3670 p = Fcdr (p);
3671 } 3671 }
3672 3672
3673 /* Now do the same for annotation functions implied by the file-format */ 3673 /* Now do the same for annotation functions implied by the file-format */
3674 if (UNBOUNDP (XSYMBOL_FUNCTION (Qformat_annotate_function))) 3674 if (UNBOUNDP (XSYMBOL_FUNCTION (Qformat_annotate_function)))
3695 start = make_int (BUF_BEGV (current_buffer)); 3695 start = make_int (BUF_BEGV (current_buffer));
3696 end = make_int (BUF_ZV (current_buffer)); 3696 end = make_int (BUF_ZV (current_buffer));
3697 annotations = Qnil; 3697 annotations = Qnil;
3698 } 3698 }
3699 Flength (res); 3699 Flength (res);
3700 annotations = merge (annotations, res, Qcar_less_than_car); 3700 annotations = list_merge (annotations, res, NULL, Qlss, Qcar);
3701 p = Fcdr (p); 3701 p = Fcdr (p);
3702 } 3702 }
3703 3703
3704 UNGCPRO; 3704 UNGCPRO;
3705 return annotations; 3705 return annotations;