Mercurial > hg > xemacs-beta
annotate lib-src/update-custom.sh @ 4995:8431b52e43b1
Move the various map* functions to C; add #'map-into.
src/ChangeLog addition:
2010-01-31 Aidan Kehoe <kehoea@parhasard.net>
Move #'mapcar*, #'mapcan, #'mapc, #'map, #'mapl, #'mapcon to C;
extend #'mapvector, #'mapconcat, #'mapcar to support more
SEQUENCES; have them all error with circular lists.
* fns.c (Fsubseq): Call CHECK_SEQUENCE here; Flength can return
from the debugger if it errors with a non-sequence, leading to a
crash in Fsubseq if sequence really is *not* a sequence.
(mapcarX): Rename mapcar1 to mapcarX; rework it comprehensively to
take an optional lisp output argument, and a varying number of
sequences.
Special-case a single list argument, as we used to, saving its
elements in the stack space for the results before calling
FUNCTION, so FUNCTION can corrupt the list all it
wants. dead_wrong_type_argument() in the other cases if we
encounter a non-cons where we expected a cons.
(Fmapconcat):
Accept further SEQUENCES after separator here. Special-case
the idiom (mapconcat 'identity SEQUENCE), don't even funcall.
(FmapcarX): Rename this from Fmapcar. Accept optional SEQUENCES.
(Fmapvector): Accept optional SEQUENCES.
(Fmapcan, Fmapc, Fmap): Move these here from cl-extra.el.
(Fmap_into): New function, as specified by Common Lisp.
(maplist): New function, the guts of the implementation of
Fmaplist and Fmapl.
(Fmaplist, Fmapl, Fmapcon): Move these from cl-extra.el.
(syms_of_fns):
Add a few needed symbols here, for the type tests
used by #'map. Add the new subrs, with aliases for #'mapc-internal
and #'mapcar.
* general-slots.h: Declare Qcoerce here, now it's used in both
indent.c and fns.c
* indent.c (syms_of_indent): Qcoerce is gone from here.
* lisp.h: Add ARRAYP(), SEQUENCEP(), and the corresponding CHECK_*
macros. Declare Fbit_vector, Fstring, FmapcarX, now other files
need to use them.
* data.c (Farrayp, Fsequencep): Use ARRAYP and SEQUENCEP, just
added to lisp.h
* buffer.c (Fbuffer_list): Now Fmapcar has been renamed FmapcarX
and takes MANY arguments, update this function to reflect that.
lisp/ChangeLog addition:
2010-01-31 Aidan Kehoe <kehoea@parhasard.net>
* cl.el (mapcar*): Delete; this is now in fns.c.
Use #'mapc, not #'mapc-internal in a couple of places.
* cl-macs.el (mapc, mapcar*, map): Delete these compiler macros
now the corresponding functions are in fns.c; there's no run-time
advantage to the macros.
* cl-extra.el (coerce): Extend the possible conversions here a
little; it's not remotely comprehensive yet, though it does allow
running slightly more Common Lisp code than previously.
(cl-mapcar-many): Delete.
(map, maplist, mapc, mapl, mapcan, mapcon): Move these to fns.c.
* bytecomp.el (byte-compile-maybe-mapc):
Use #'mapc itself, not #'mapc-internal, now the former is in C.
(mapcar*): Use #'byte-compile-maybe-mapc as this function's
byte-compile method, now a #'mapc that can take more than one
sequence is in C.
* obsolete.el (cl-mapc): Move this compatibility alias to this file.
* update-elc.el (do-autoload-commands): Use #'mapc, not
#'mapc-internal here.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sun, 31 Jan 2010 18:29:48 +0000 |
| parents | 3ecd8885ac67 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 #!/bin/sh |
| 2 ### update-custom.sh --- update Customize group dependencies | |
| 3 | |
| 4 # Author: Hrvoje Niksic, based on update-autoloads.el by | |
| 5 # Jamie Zawinski, Ben Wing, Martin Buchholz, and Steve Baur | |
| 6 # Maintainer: Hrvoje Niksic | |
| 7 # Keywords: internal | |
| 8 | |
| 9 # This file is part of XEmacs. | |
| 10 | |
| 11 # XEmacs is free software; you can redistribute it and/or modify it | |
| 12 # under the terms of the GNU General Public License as published by | |
| 13 # the Free Software Foundation; either version 2, or (at your option) | |
| 14 # any later version. | |
| 15 | |
| 16 # XEmacs is distributed in the hope that it will be useful, but | |
| 17 # WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 18 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 19 # General Public License for more details. | |
| 20 | |
| 21 # You should have received a copy of the GNU General Public License | |
| 22 # along with XEmacs; see the file COPYING. If not, write to | |
| 23 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 24 # Boston, MA 02111-1307, USA. | |
| 25 | |
| 26 ### Commentary: | |
| 27 | |
| 28 # This is much simpler than update-autoloads.el. All we need to do is | |
| 29 # compute a list of directories we want to use, and feed it to | |
| 30 # Custom-make-dependencies. End of story. | |
| 31 | |
| 32 ### Code: | |
| 33 | |
| 34 set -eu | |
| 35 | |
| 36 # get to the right directory | |
| 37 test ! -d ./lisp -a -d ../lisp && cd .. | |
| 38 if test ! -d ./lisp ; then | |
| 39 echo $0: neither ./lisp/ nor ../lisp/ exist | |
| 40 exit 1 | |
| 41 fi | |
| 42 | |
| 43 test -z "$EMACS" && EMACS="./src/xemacs" | |
| 44 echo " (using $EMACS)" | |
| 45 | |
| 46 export EMACS | |
| 47 | |
| 48 EMACS_DIR=`cd \`dirname $EMACS\` && pwd`; | |
| 49 # Account for various system automounter configurations | |
| 50 if test -d "/net"; then | |
| 51 if test -d "/tmp_mnt/net"; then tdir="/tmp_mnt/net"; else tdir="/tmp_mnt"; fi | |
| 52 EMACS_DIR=`echo "$EMACS_DIR" | \ | |
| 53 sed -e "s|^${tdir}/|/net/|" -e "s|^/a/|/net/|" -e "s|^/amd/|/net/|"` | |
| 54 fi | |
| 55 REAL="$EMACS_DIR/`basename $EMACS`" | |
| 56 | |
| 57 echo "Rebuilding custom-loads with $REAL..." | |
| 58 | |
| 59 if [ "`uname -r | sed 's/\(.\).*/\1/'`" -gt 4 ]; then | |
| 60 echon() | |
| 61 { | |
| 62 /bin/echo $* '\c' | |
| 63 } | |
| 64 else | |
| 65 echon() | |
| 66 { | |
| 67 echo -n $* | |
| 68 } | |
| 69 fi | |
| 70 | |
| 71 # Compute patterns to ignore when searching for files | |
| 72 ignore_dirs="" | |
| 73 | |
| 74 # Only use Mule XEmacs to build Mule-specific autoloads & custom-loads. | |
| 75 echon "Checking for Mule support..." | |
| 76 lisp_prog='(princ (featurep (quote mule)))' | |
| 77 mule_p="`$EMACS -batch -q -no-site-file -eval \"$lisp_prog\"`" | |
| 78 if test "$mule_p" = nil ; then | |
| 79 echo No | |
| 80 ignore_dirs="$ignore_dirs mule" | |
| 81 else | |
| 82 echo Yes | |
| 83 fi | |
| 84 | |
| 85 echon "Checking directories..." | |
| 86 dirs=lisp/ | |
| 87 for dir in lisp/*; do | |
| 88 if test -d $dir \ | |
| 89 -a $dir != lisp/CVS \ | |
| 90 -a $dir != lisp/SCCS; then | |
| 91 for ignore in $ignore_dirs; do | |
| 92 if test $dir = lisp/$ignore; then | |
| 93 continue 2 | |
| 94 fi | |
| 95 done | |
| 96 rm -f "$dir/custom-load.elc" | |
| 97 dirs="$dirs $dir" | |
| 98 fi | |
| 99 done | |
| 100 echo done | |
| 101 | |
| 102 $EMACS -batch -q -no-site-file -l cus-dep -f Custom-make-dependencies $dirs |