implement equalp in C, fix case-folding, add equal() method for keymaps -------------------- ChangeLog entries follow: -------------------- lisp/ChangeLog addition: 2010-02-01 Ben Wing <ben@xemacs.org> * cl-extra.el: * cl-extra.el (cl-string-vector-equalp): Removed. * cl-extra.el (cl-bit-vector-vector-equalp): Removed. * cl-extra.el (cl-vector-array-equalp): Removed. * cl-extra.el (cl-hash-table-contents-equalp): Removed. * cl-extra.el (equalp): Removed. * cl-extra.el (cl-mapcar-many): Comment out the whole `equalp' implementation for the moment; remove once we're sure the C implementation works. * cl-macs.el: * cl-macs.el (equalp): Simplify the compiler-macro for `equalp' -- once it's in C, we don't need to try so hard to expand it. src/ChangeLog addition: 2010-02-01 Ben Wing <ben@xemacs.org> * abbrev.c (abbrev_match_mapper): * buffer.h (CANON_TABLE_OF): * buffer.h: * editfns.c (Fchar_equal): * minibuf.c (scmp_1): * text.c (qxestrcasecmp_i18n): * text.c (qxestrncasecmp_i18n): * text.c (qxetextcasecmp): * text.c (qxetextcasecmp_matching): Create new macro CANONCASE that converts to a canonical mapping and use it to do caseless comparisons instead of DOWNCASE. * alloc.c: * alloc.c (cons_equal): * alloc.c (vector_equal): * alloc.c (string_equal): * bytecode.c (compiled_function_equal): * chartab.c (char_table_entry_equal): * chartab.c (char_table_equal): * data.c (weak_list_equal): * data.c (weak_box_equal): * data.c (ephemeron_equal): * device-msw.c (equal_devmode): * elhash.c (hash_table_equal): * events.c (event_equal): * extents.c (properties_equal): * extents.c (extent_equal): * faces.c: * faces.c (face_equal): * faces.c (face_hash): * floatfns.c (float_equal): * fns.c: * fns.c (bit_vector_equal): * fns.c (plists_differ): * fns.c (Fplists_eq): * fns.c (Fplists_equal): * fns.c (Flax_plists_eq): * fns.c (Flax_plists_equal): * fns.c (internal_equal): * fns.c (internal_equalp): * fns.c (internal_equal_0): * fns.c (syms_of_fns): * glyphs.c (image_instance_equal): * glyphs.c (glyph_equal): * glyphs.c (glyph_hash): * gui.c (gui_item_equal): * lisp.h: * lrecord.h (struct lrecord_implementation): * marker.c (marker_equal): * number.c (bignum_equal): * number.c (ratio_equal): * number.c (bigfloat_equal): * objects.c (color_instance_equal): * objects.c (font_instance_equal): * opaque.c (equal_opaque): * opaque.c (equal_opaque_ptr): * rangetab.c (range_table_equal): * specifier.c (specifier_equal): Add a `foldcase' param to the equal() method and use it to implement `equalp' comparisons. Also add to plists_differ(), although we don't currently use it here. Rewrite internal_equalp(). Implement cross-type vector comparisons. Don't implement our own handling of numeric promotion -- just use the `=' primitive. Add internal_equal_0(), which takes a `foldcase' param and calls either internal_equal() or internal_equalp(). * buffer.h: When given a 0 for buffer (which is the norm when functions don't have a specific buffer available), use the current buffer's table, not `standard-case-table'; otherwise the current settings are ignored. * casetab.c: * casetab.c (set_case_table): When handling old-style vectors of 256 in `set-case-table' don't overwrite the existing table! Instead create a new table and populate. * device-msw.c (sync_printer_with_devmode): * lisp.h: * text.c (lisp_strcasecmp_ascii): Rename lisp_strcasecmp to lisp_strcasecmp_ascii and use lisp_strcasecmp_i18n for caseless comparisons in some places. * elhash.c: Delete unused lisp_string_hash and lisp_string_equal(). * events.h: * keymap-buttons.h: * keymap.h: * keymap.c (keymap_lookup_directly): * keymap.c (keymap_store): * keymap.c (FROB): * keymap.c (key_desc_list_to_event): * keymap.c (describe_map_mapper): * keymap.c (INCLUDE_BUTTON_ZERO): New file keymap-buttons.h; use to handle buttons 1-26 in place of duplicating code 26 times. * frame-gtk.c (allocate_gtk_frame_struct): * frame-msw.c (mswindows_init_frame_1): Fix some comments about internal_equal() in redisplay that don't apply any more. * keymap-slots.h: * keymap.c: New file keymap-slots.h. Use it to notate the slots in a keymap structure, similar to frameslots.h or coding-system-slots.h. * keymap.c (MARKED_SLOT): * keymap.c (keymap_equal): * keymap.c (keymap_hash): Implement. tests/ChangeLog addition: 2010-02-01 Ben Wing <ben@xemacs.org> * automated/case-tests.el: * automated/case-tests.el (uni-mappings): * automated/search-tests.el: Delete old pristine-case-table code. Rewrite the Unicode torture test to take into account whether overlapping mappings exist for more than one character, and not doing the upcase/downcase comparisons in such cases. * automated/lisp-tests.el (foo): * automated/lisp-tests.el (string-variable): * automated/lisp-tests.el (featurep): Replace Assert (equal ... with Assert-equal; same for other types of equality. Replace some awkward equivalents of Assert-equalp with Assert-equalp. Add lots of equalp tests. * automated/case-tests.el: * automated/regexp-tests.el: * automated/search-tests.el: Fix up the comments at the top of the files. Move rules about where to put tests into case-tests.el. * automated/test-harness.el: * automated/test-harness.el (test-harness-aborted-summary-template): New. * automated/test-harness.el (test-harness-from-buffer): * automated/test-harness.el (batch-test-emacs): Fix Assert-test-not. Create Assert-not-equal and variants. Delete the doc strings from all these convenience functions to avoid excessive repetition; instead use one copy in a comment.

#!/bin/sh

# Copyright (C) 2000 Andy Piper

# 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 2, 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; see the file COPYING.  If not, write to the Free
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.

# This file builds the release kits for both cygwin and win32. You
# must have both environments configured for it to work properly. In
# particular you must provide a suitable value for NATIVE_ZLIB_DIR.

# configuration
NATIVE_ZLIB_DIR=/usr/local/mingw/lib
PROGRAM_FILES='c:/Program Files/XEmacs'
TMPINSTALL=/tmp/local
# no configuration past this point

INSTALL=
FILES=
BUILD=1

for OPT in $*
do
    case $OPT in
    --install) INSTALL=1;;
    --installonly) INSTALL=1; BUILD='';;
    --help) echo "usage: build-msw-release.sh [--install]" && exit;;
    --*) ;;
    *) FILES="$FILES $OPT";;
    esac
done

# pick up version info
. version.sh

# decide on names
emacs_ver=${emacs_major_version}.${emacs_minor_version}.${emacs_beta_version}
cygwin_tarball=xemacs-i686-pc-cygwin-${emacs_ver}${emacs_kit_version}.tar.gz
win32_tarball=xemacs-i586-pc-win32-${emacs_ver}${emacs_kit_version}.tar.gz

DISTDIR=`pwd`/windows

# check to see if we should build
if test "$BUILD" = "1"
then

echo "Building the mswindows ${emacs_ver} release"

# cleanup everything first
if [ -f Makefile ] ; then
    make distclean
fi

# nuke the dist dir.
rm -rf windows

# create a dist directory 
mkdir -p windows/cygwin32
mkdir -p windows/win32
mkdir -p /usr/local
mkdir -p ${TMPINSTALL}

# first build win32
(cd nt;
  nmake -f xemacs.mak clean;
  nmake -f xemacs.mak)
(cd "${PROGRAM_FILES}";
    rm -rf ./XEmacs-${emacs_ver})
(cd nt;
  nmake -f xemacs.mak install;
  nmake -f xemacs.mak clean)

# now build cygwin
./configure --with-dragndrop --with-postgresql=no --with-x=no \
    --bindir=/usr/local/bin/i686-pc-cygwin --with-site-lisp=yes \
    --with-ipv6-cname=no --with-netinstall
make CFLAGS=-O3 MINGW_ZLIB_DIR=${NATIVE_ZLIB_DIR} beta

# deal with the netinstaller
(cd netinstall;
    strip setup.exe)
cp netinstall/setup.exe windows

# the win32 tar ball needs setup.exe
cp netinstall/setup.exe \
    "${PROGRAM_FILES}"/XEmacs-${emacs_ver}/i586-pc-win32

# make the win32 tarball
(cd "${PROGRAM_FILES}";
    tar czvf ${DISTDIR}/win32/${win32_tarball} \
	./XEmacs-${emacs_ver})

# make the tarball
make prefix=${TMPINSTALL} bindir=${TMPINSTALL}/bin/i686-pc-cygwin install
(cd ${TMPINSTALL};
    tar czvf ${DISTDIR}/cygwin32/${cygwin_tarball} \
    ./bin/i686-pc-cygwin \
    ./lib/xemacs-${emacs_ver} \
    ./lib/xemacs/lock \
    ./man/man1/ctags.1 \
    ./man/man1/etags.1 \
    ./man/man1/gnuattach.1 \
    ./man/man1/gnuclient.1 \
    ./man/man1/gnudoit.1 \
    ./man/man1/gnuserv.1 \
    ./man/man1/xemacs.1;
    rm -rf bin lib man)

# figure out the ini file.
cygwin_tarball_size=`ls -l windows/cygwin32/${cygwin_tarball} | awk '{ print $5; }'`
win32_tarball_size=`ls -l windows/win32/${win32_tarball} | awk '{ print $5; }'`

(cd netinstall;
    make CYGWIN_SIZE=${cygwin_tarball_size} \
	WIN32_SIZE=${win32_tarball_size} \
	KIT_VERSION=${emacs_kit_version} setup-bin.ini )
cp netinstall/setup-bin.ini windows

# tidy up
make distclean

fi
# end of build

# optionally install to the ftp site
if test "$INSTALL" != ""
then
    echo "Installing the mswindows ${emacs_ver} release"
    scp -r -oUser=slb -oProtocol=1 windows/* \
	ftp.xemacs.org:/pub/xemacs/windows
    # update setup.ini
    ssh -1 -l slb ftp.xemacs.org 'cd /pub/xemacs/windows; sh makeini.sh'
fi