Mercurial > hg > xemacs-beta

diff lisp/bytecomp.el @ 5182:2e528066e2fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 8c3671b62dad
children 0d436a78c514
line wrap: on
line diff
--- a/lisp/bytecomp.el	Mon Mar 29 23:23:33 2010 -0500
+++ b/lisp/bytecomp.el	Thu Apr 01 20:22:50 2010 +0100
@@ -3510,8 +3510,8 @@
                                 (null (memq 'quoted-lambda
                                             byte-compile-warnings))
                                 (byte-compile-warn
-                                 "Passing a quoted lambda to #'%s, forcing \
-function quoting" (car form))))
+                                 "Passing a quoted lambda (arg %d) to #'%s, \
+forcing function quoting" ,en (car form))))
                       (setcar fn 'function))))
           (byte-compile-normal-call form)))
 
@@ -3549,6 +3549,25 @@
        (setq form (cons 'mapl (cdr form))))
   (byte-compile-funarg form))
 
+;; For when calls to #'sort or #'mapcar have more than two args, something
+;; recent XEmacs can handle, but GNU and 21.4 can't.
+(defmacro byte-compile-maybe-add-* (complex max)
+  `#'(lambda (form)
+       (when (> (length (cdr form)) ,max)
+         (when (memq 'callargs byte-compile-warnings)
+           (byte-compile-warn
+            "#'%s called with %d arguments, using #'%s instead"
+            (car form) (length (cdr form)) ',complex))
+         (setq form (cons ',complex (cdr form))))
+       (funcall (or (get ',complex 'byte-compile)
+                    'byte-compile-normal-call) form)))
+
+(defalias 'byte-compile-mapcar (byte-compile-maybe-add-* mapcar* 2))
+
+(defalias 'byte-compile-sort (byte-compile-maybe-add-* sort* 2))
+
+(defalias 'byte-compile-fillarray (byte-compile-maybe-add-* fill 2))
+
 ;; (function foo) must compile like 'foo, not like (symbol-function 'foo).
 ;; Otherwise it will be incompatible with the interpreter,
 ;; and (funcall (function foo)) will lose with autoloads.
@@ -3725,7 +3744,8 @@
 (byte-defop-compiler-1 while)
 (byte-defop-compiler-1 funcall)
 (byte-defop-compiler-1 apply byte-compile-funarg)
-(byte-defop-compiler-1 mapcar byte-compile-maybe-mapc)
+(byte-defop-compiler-1 mapcar byte-compile-mapcar)
+(byte-defop-compiler-1 mapcar* byte-compile-maybe-mapc)
 (byte-defop-compiler-1 mapatoms byte-compile-funarg)
 (byte-defop-compiler-1 mapconcat byte-compile-funarg)
 (byte-defop-compiler-1 mapc byte-compile-funarg)
@@ -3743,7 +3763,6 @@
 (byte-defop-compiler-1 map-plist byte-compile-funarg)
 (byte-defop-compiler-1 map-range-table byte-compile-funarg)
 (byte-defop-compiler-1 map-syntax-table byte-compile-funarg)
-(byte-defop-compiler-1 mapcar* byte-compile-maybe-mapc)
 
 (byte-defop-compiler-1 remove-if byte-compile-funarg)
 (byte-defop-compiler-1 remove-if-not byte-compile-funarg)
@@ -3771,8 +3790,9 @@
 (byte-defop-compiler-1 get-window-with-predicate byte-compile-funarg)
 
 (byte-defop-compiler-1 map byte-compile-funarg-2)
+(byte-defop-compiler-1 map-into byte-compile-funarg-2)
 (byte-defop-compiler-1 apropos-internal byte-compile-funarg-2)
-(byte-defop-compiler-1 sort byte-compile-funarg-2)
+(byte-defop-compiler-1 sort byte-compile-sort)
 (byte-defop-compiler-1 sort* byte-compile-funarg-2)
 (byte-defop-compiler-1 stable-sort byte-compile-funarg-2)
 (byte-defop-compiler-1 substitute-if byte-compile-funarg-2)
@@ -3793,6 +3813,7 @@
 (byte-defop-compiler-1 let*)
 
 (byte-defop-compiler-1 integerp)
+(byte-defop-compiler-1 fillarray)
 
 (defun byte-compile-progn (form)
   (byte-compile-body-do-effect (cdr form)))