Mercurial > hg > xemacs-beta
view src/rangetab.c @ 2367:ecf1ebac70d8
[xemacs-hg @ 2004-11-04 23:05:23 by ben]
commit mega-patch
configure.in: Turn off -Winline and -Wchar-subscripts.
Use the right set of cflags when compiling modules.
Rewrite ldap configuration to separate the inclusion of lber
(needed in recent Cygwin) from the basic checks for the
needed libraries.
add a function for MAKE_JUNK_C; initially code was added to
generate xemacs.def using this, but it will need to be rewritten.
add an rm -f for junk.c to avoid weird Cygwin bug with cp -f onto
an existing file.
Sort list of auto-detected functions and eliminate unused checks for
stpcpy, setlocale and getwd.
Add autodetection of Cygwin scanf problems
BETA: Rewrite section on configure to indicate what flags are important
and what not.
digest-doc.c, make-dump-id.c, profile.c, sorted-doc.c: Add proper decls for main().
make-msgfile.c: Document that this is old junk.
Move proposal to text.c.
make-msgfile.lex: Move proposal to text.c.
make-mswin-unicode.pl: Convert error-generating code so that the entire message will
be seen as a single unrecognized token.
mule/mule-ccl.el: Update docs.
lispref/mule.texi: Update CCL docs.
ldap/eldap.c: Mule-ize.
Use EXTERNAL_LIST_LOOP_2 instead of deleted EXTERNAL_LIST_LOOP.
* XEmacs 21.5.18 "chestnut" is released.
---------------------------------------------------------------
MULE-RELATED WORK:
---------------------------------------------------------------
---------------------------
byte-char conversion
---------------------------
buffer.c, buffer.h, insdel.c, text.c: Port FSF algorithm for byte-char conversion, replacing broken
previous version. Track the char position of the gap. Add
functions to do char-byte conversion downwards as well as upwards.
Move comments about algorithm workings to internals manual.
---------------------------
work on types
---------------------------
alloc.c, console-x-impl.h, dump-data.c, dump-data.h, dumper.c, dialog-msw.c, dired-msw.c, doc.c, editfns.c, esd.c, event-gtk.h, event-msw.c, events.c, file-coding.c, file-coding.h, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-shared.c, glyphs-x.c, glyphs.c, glyphs.h, gui.c, hpplay.c, imgproc.c, intl-win32.c, lrecord.h, lstream.c, keymap.c, lisp.h, libsst.c, linuxplay.c, miscplay.c, miscplay.h, mule-coding.c, nas.c, nt.c, ntheap.c, ntplay.c, objects-msw.c, objects-tty.c, objects-x.c, print.c, process-nt.c, process.c, redisplay.h, select-common.h, select-gtk.c, select-x.c, sgiplay.c, sound.c, sound.h, sunplay.c, sysfile.h, sysdep.c, syswindows.h, text.c, unexnt.c, win32.c, xgccache.c: Further work on types. This creates a full set of types for all
the basic semantics of `char' that I have so far identified, so that
its semantics can always be identified for the purposes of proper
Mule-safe code, and the raw use of `char' always avoided.
(1) More type renaming, for consistency of naming.
Char_ASCII -> Ascbyte
UChar_ASCII -> UAscbyte
Char_Binary -> CBinbyte
UChar_Binary -> Binbyte
SChar_Binary -> SBinbyte
(2) Introduce Rawbyte, CRawbyte, Boolbyte, Chbyte, UChbyte, and
Bitbyte and use them.
(3) New types Itext, Wexttext and Textcount for separating out
the concepts of bytes and textual units (different under UTF-16
and UTF-32, which are potential internal encodings).
(4) qxestr*_c -> qxestr*_ascii.
lisp.h: New; goes with other qxe() functions. #### Maybe goes in a
different section.
lisp.h: Group generic int-type defs together with EMACS_INT defs.
lisp.h: * lisp.h (WEXTTEXT_IS_WIDE)
New defns.
lisp.h: New type to replace places where int occurs as a boolean.
It's signed because occasionally people may want to use -1 as
an error value, and because unsigned ints are viral -- see comments
in the internals manual against using them.
dynarr.c: int -> Bytecount.
---------------------------
Mule-izing
---------------------------
device-x.c: Partially Mule-ize.
dumper.c, dumper.h: Mule-ize. Use Rawbyte. Use stderr_out not printf. Use wext_*().
sysdep.c, syswindows.h, text.c: New Wexttext API for manipulation of external text that may be
Unicode (e.g. startup code under Windows).
emacs.c: Mule-ize. Properly deal with argv in external encoding.
Use wext_*() and Wexttext. Use Rawbyte.
#if 0 some old junk on SCO that is unlikely to be correct.
Rewrite allocation code in run-temacs.
emacs.c, symsinit.h, win32.c: Rename win32 init function and call it even earlier, to
initialize mswindows_9x_p even earlier, for use in startup code
(XEUNICODE_P).
process.c: Use _wenviron not environ under Windows, to get Unicode environment
variables.
event-Xt.c: Mule-ize drag-n-drop related stuff.
dragdrop.c, dragdrop.h, frame-x.c: Mule-ize.
text.h: Add some more stand-in defines for particular kinds of conversion;
use in Mule-ization work in frame-x.c etc.
---------------------------
Freshening
---------------------------
intl-auto-encap-win32.c, intl-auto-encap-win32.h: Regenerate.
---------------------------
Unicode-work
---------------------------
intl-win32.c, syswindows.h: Factor out common options to MultiByteToWideChar and
WideCharToMultiByte. Add convert_unicode_to_multibyte_malloc()
and convert_unicode_to_multibyte_dynarr() and use. Add stuff for
alloca() conversion of multibyte/unicode.
alloc.c: Use dfc_external_data_len() in case of unicode coding system.
alloc.c, mule-charset.c: Don't zero out and reinit charset Unicode tables. This fucks up
dump-time loading. Anyway, either we load them at dump time or
run time, never both.
unicode.c: Dump the blank tables as well.
---------------------------------------------------------------
DOCUMENTATION, MOSTLY MULE-RELATED:
---------------------------------------------------------------
EmacsFrame.c, emodules.c, event-Xt.c, fileio.c, input-method-xlib.c, mule-wnnfns.c, redisplay-gtk.c, redisplay-tty.c, redisplay-x.c, regex.c, sysdep.c: Add comment about Mule work needed.
text.h: Add more documentation describing why DFC routines were not written
to return their value. Add some other DFC documentation.
console-msw.c, console-msw.h: Add pointer to docs in win32.c.
emacs.c: Add comments on sources of doc info.
text.c, charset.h, unicode.c, intl-win32.c, intl-encap-win32.c, text.h, file-coding.c, mule-coding.c: Collect background comments and related to text matters and
internationalization, and proposals for work to be done, in text.c
or Internals manual, stuff related to specific textual API's in
text.h, and stuff related to internal implementation of Unicode
conversion in unicode.c. Put lots of pointers to the comments to
make them easier to find.
s/mingw32.h, s/win32-common.h, s/win32-native.h, s/windowsnt.h, win32.c: Add bunches of new documentation on the different kinds of
builds and environments under Windows and how they work.
Collect this info in win32.c. Add pointers to these docs in
the relevant s/* files.
emacs.c: Document places with long comments.
Remove comment about exiting, move to internals manual, put
in pointer.
event-stream.c: Move docs about event queues and focus to internals manual, put
in pointer.
events.h: Move docs about event stream callbacks to internals manual, put
in pointer.
profile.c, redisplay.c, signal.c: Move documentation to the Internals manual.
process-nt.c: Add pointer to comment in win32-native.el.
lisp.h: Add comments about some comment conventions.
lisp.h: Add comment about the second argument.
device-msw.c, redisplay-msw.c: @@#### comments are out-of-date.
---------------------------------------------------------------
PDUMP WORK (MOTIVATED BY UNICODE CHANGES)
---------------------------------------------------------------
alloc.c, buffer.c, bytecode.c, console-impl.h, console.c, device.c, dumper.c, lrecord.h, elhash.c, emodules.h, events.c, extents.c, frame.c, glyphs.c, glyphs.h, mule-charset.c, mule-coding.c, objects.c, profile.c, rangetab.c, redisplay.c, specifier.c, specifier.h, window.c, lstream.c, file-coding.h, file-coding.c: PDUMP:
Properly implement dump_add_root_block(), which never worked before,
and is necessary for dumping Unicode tables.
Pdump name changes for accuracy:
XD_STRUCT_PTR -> XD_BLOCK_PTR.
XD_STRUCT_ARRAY -> XD_BLOCK_ARRAY.
XD_C_STRING -> XD_ASCII_STRING.
*_structure_* -> *_block_*.
lrecord.h: some comments added about
dump_add_root_block() vs dump_add_root_block_ptr().
extents.c: remove incorrect comment about pdump problems with gap array.
---------------------------------------------------------------
ALLOCATION
---------------------------------------------------------------
abbrev.c, alloc.c, bytecode.c, casefiddle.c, device-msw.c, device-x.c, dired-msw.c, doc.c, doprnt.c, dragdrop.c, editfns.c, emodules.c, file-coding.c, fileio.c, filelock.c, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-x.c, gui-msw.c, gui-x.c, imgproc.c, intl-win32.c, lread.c, menubar-gtk.c, menubar.c, nt.c, objects-msw.c, objects-x.c, print.c, process-nt.c, process-unix.c, process.c, realpath.c, redisplay.c, search.c, select-common.c, symbols.c, sysdep.c, syswindows.h, text.c, text.h, ui-byhand.c: New macros {alloca,xnew}_{itext,{i,ext,raw,bin,asc}bytes} for
more convenient allocation of these commonly requested items.
Modify functions to use alloca_ibytes, alloca_array, alloca_extbytes,
xnew_ibytes, etc. also XREALLOC_ARRAY, xnew.
alloc.c: Rewrite the allocation functions to factor out repeated code.
Add assertions for freeing dumped data.
lisp.h: Moved down and consolidated with other allocation stuff.
lisp.h, dynarr.c: New functions for allocation that's very efficient when mostly in
LIFO order.
lisp.h, text.c, text.h: Factor out some stuff for general use by alloca()-conversion funs.
text.h, lisp.h: Fill out convenience routines for allocating various kinds of
bytes and put them in lisp.h. Use them in place of xmalloc(),
ALLOCA().
text.h: Fill out the convenience functions so the _MALLOC() kinds match
the alloca() kinds.
---------------------------------------------------------------
ERROR-CHECKING
---------------------------------------------------------------
text.h: Create ASSERT_ASCTEXT_ASCII() and ASSERT_ASCTEXT_ASCII_LEN()
from similar Eistring checkers and change the Eistring checkers to
use them instead.
---------------------------------------------------------------
MACROS IN LISP.H
---------------------------------------------------------------
lisp.h: Redo GCPRO declarations. Create a "base" set of functions that can
be used to generate any kind of gcpro sets -- regular, ngcpro,
nngcpro, private ones used in GC_EXTERNAL_LIST_LOOP_2.
buffer.c, callint.c, chartab.c, console-msw.c, device-x.c, dialog-msw.c, dired.c, extents.c, ui-gtk.c, rangetab.c, nt.c, mule-coding.c, minibuf.c, menubar-msw.c, menubar.c, menubar-gtk.c, lread.c, lisp.h, gutter.c, glyphs.c, glyphs-widget.c, fns.c, fileio.c, file-coding.c, specifier.c: Eliminate EXTERNAL_LIST_LOOP, which does not check for circularities.
Use EXTERNAL_LIST_LOOP_2 instead or EXTERNAL_LIST_LOOP_3
or EXTERNAL_PROPERTY_LIST_LOOP_3 or GC_EXTERNAL_LIST_LOOP_2
(new macro). Removed/redid comments on EXTERNAL_LIST_LOOP.
---------------------------------------------------------------
SPACING FIXES
---------------------------------------------------------------
callint.c, hftctl.c, number-gmp.c, process-unix.c: Spacing fixes.
---------------------------------------------------------------
FIX FOR GEOMETRY PROBLEM IN FIRST FRAME
---------------------------------------------------------------
unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by
release 1.5.12 of Cygwin].
toolbar.c: bug fix for problem of initial frame being 77 chars wide on Windows.
will be overridden by my other ws.
---------------------------------------------------------------
FIX FOR LEAKING PROCESS HANDLES:
---------------------------------------------------------------
process-nt.c: Fixes for leaking handles. Inspired by work done by Adrian Aichner
<adrian@xemacs.org>.
---------------------------------------------------------------
FIX FOR CYGWIN BUG (Unicode-related):
---------------------------------------------------------------
unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by
release 1.5.12 of Cygwin].
---------------------------------------------------------------
WARNING FIXES:
---------------------------------------------------------------
console-stream.c: `reinit' is unused.
compiler.h, event-msw.c, frame-msw.c, intl-encap-win32.c, text.h: Add stuff to deal with ANSI-aliasing warnings I got.
regex.c: Gather includes together to avoid warning.
---------------------------------------------------------------
CHANGES TO INITIALIZATION ROUTINES:
---------------------------------------------------------------
buffer.c, emacs.c, console.c, debug.c, device-x.c, device.c, dragdrop.c, emodules.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, font-lock.c, frame-msw.c, glyphs-widget.c, glyphs.c, gui-x.c, insdel.c, lread.c, lstream.c, menubar-gtk.c, menubar-x.c, minibuf.c, mule-wnnfns.c, objects-msw.c, objects.c, print.c, scrollbar-x.c, search.c, select-x.c, text.c, undo.c, unicode.c, window.c, symsinit.h: Call reinit_*() functions directly from emacs.c, for clarity.
Factor out some redundant init code. Move disallowed stuff
that had crept into vars_of_glyphs() into complex_vars_of_glyphs().
Call init_eval_semi_early() from eval.c not in the middle of
vars_of_() in emacs.c since there should be no order dependency
in the latter calls.
---------------------------------------------------------------
ARMAGEDDON:
---------------------------------------------------------------
alloc.c, emacs.c, lisp.h, print.c: Rename inhibit_non_essential_printing_operations to
inhibit_non_essential_conversion_operations.
text.c: Assert on !inhibit_non_essential_conversion_operations.
console-msw.c, print.c: Don't do conversion in SetConsoleTitle or FindWindow to avoid
problems during armageddon. Put #errors for NON_ASCII_INTERNAL_FORMAT
in places where problems would arise.
---------------------------------------------------------------
CHANGES TO THE BUILD PROCEDURE:
---------------------------------------------------------------
config.h.in, s/cxux.h, s/usg5-4-2.h, m/powerpc.h: Add comment about correct ordering of this file.
Rearrange everything to follow this -- put all #undefs together
and before the s&m files. Add undefs for HAVE_ALLOCA, C_ALLOCA,
BROKEN_ALLOCA_IN_FUNCTION_CALLS, STACK_DIRECTION. Remove unused
HAVE_STPCPY, HAVE_GETWD, HAVE_SETLOCALE.
m/gec63.h: Deleted; totally broken, not used at all, not in FSF.
m/7300.h, m/acorn.h, m/alliant-2800.h, m/alliant.h, m/altos.h, m/amdahl.h, m/apollo.h, m/att3b.h, m/aviion.h, m/celerity.h, m/clipper.h, m/cnvrgnt.h, m/convex.h, m/cydra5.h, m/delta.h, m/delta88k.h, m/dpx2.h, m/elxsi.h, m/ews4800r.h, m/gould.h, m/hp300bsd.h, m/hp800.h, m/hp9000s300.h, m/i860.h, m/ibmps2-aix.h, m/ibmrs6000.h, m/ibmrt-aix.h, m/ibmrt.h, m/intel386.h, m/iris4d.h, m/iris5d.h, m/iris6d.h, m/irist.h, m/isi-ov.h, m/luna88k.h, m/m68k.h, m/masscomp.h, m/mg1.h, m/mips-nec.h, m/mips-siemens.h, m/mips.h, m/news.h, m/nh3000.h, m/nh4000.h, m/ns32000.h, m/orion105.h, m/pfa50.h, m/plexus.h, m/pmax.h, m/powerpc.h, m/pyrmips.h, m/sequent-ptx.h, m/sequent.h, m/sgi-challenge.h, m/symmetry.h, m/tad68k.h, m/tahoe.h, m/targon31.h, m/tekxd88.h, m/template.h, m/tower32.h, m/tower32v3.h, m/ustation.h, m/vax.h, m/wicat.h, m/xps100.h: Delete C_ALLOCA, HAVE_ALLOCA, STACK_DIRECTION,
BROKEN_ALLOCA_IN_FUNCTION_CALLS. All of this is auto-detected.
When in doubt, I followed recent FSF sources, which also have
these things deleted.
author | ben |
---|---|
date | Thu, 04 Nov 2004 23:08:28 +0000 |
parents | 04bc9d2f42c7 |
children | ab71ad6ff3dd |
line wrap: on
line source
/* XEmacs routines to deal with range tables. Copyright (C) 1995 Sun Microsystems, Inc. Copyright (C) 1995, 2002 Ben Wing. 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ /* Written by Ben Wing, August 1995. */ #include <config.h> #include "lisp.h" #include "rangetab.h" Lisp_Object Qrange_tablep; Lisp_Object Qrange_table; /************************************************************************/ /* Range table object */ /************************************************************************/ /* We use a sorted array of ranges. #### We should be using the gap array stuff from extents.c. This is not hard but just requires moving that stuff out of that file. */ static Lisp_Object mark_range_table (Lisp_Object obj) { Lisp_Range_Table *rt = XRANGE_TABLE (obj); int i; for (i = 0; i < Dynarr_length (rt->entries); i++) mark_object (Dynarr_at (rt->entries, i).val); return Qnil; } static void print_range_table (Lisp_Object obj, Lisp_Object printcharfun, int UNUSED (escapeflag)) { Lisp_Range_Table *rt = XRANGE_TABLE (obj); int i; write_c_string (printcharfun, "#s(range-table data ("); for (i = 0; i < Dynarr_length (rt->entries); i++) { struct range_table_entry *rte = Dynarr_atp (rt->entries, i); if (i > 0) write_c_string (printcharfun, " "); if (rte->first == rte->last) write_fmt_string (printcharfun, "%ld ", (long) (rte->first)); else write_fmt_string (printcharfun, "(%ld %ld) ", (long) (rte->first), (long) (rte->last)); print_internal (rte->val, printcharfun, 1); } write_c_string (printcharfun, "))"); } static int range_table_equal (Lisp_Object obj1, Lisp_Object obj2, int depth) { Lisp_Range_Table *rt1 = XRANGE_TABLE (obj1); Lisp_Range_Table *rt2 = XRANGE_TABLE (obj2); int i; if (Dynarr_length (rt1->entries) != Dynarr_length (rt2->entries)) return 0; for (i = 0; i < Dynarr_length (rt1->entries); i++) { struct range_table_entry *rte1 = Dynarr_atp (rt1->entries, i); struct range_table_entry *rte2 = Dynarr_atp (rt2->entries, i); if (rte1->first != rte2->first || rte1->last != rte2->last || !internal_equal (rte1->val, rte2->val, depth + 1)) return 0; } return 1; } static unsigned long range_table_entry_hash (struct range_table_entry *rte, int depth) { return HASH3 (rte->first, rte->last, internal_hash (rte->val, depth + 1)); } static unsigned long range_table_hash (Lisp_Object obj, int depth) { Lisp_Range_Table *rt = XRANGE_TABLE (obj); int i; int size = Dynarr_length (rt->entries); unsigned long hash = size; /* approach based on internal_array_hash(). */ if (size <= 5) { for (i = 0; i < size; i++) hash = HASH2 (hash, range_table_entry_hash (Dynarr_atp (rt->entries, i), depth)); return hash; } /* just pick five elements scattered throughout the array. A slightly better approach would be to offset by some noise factor from the points chosen below. */ for (i = 0; i < 5; i++) hash = HASH2 (hash, range_table_entry_hash (Dynarr_atp (rt->entries, i*size/5), depth)); return hash; } static const struct memory_description rte_description_1[] = { { XD_LISP_OBJECT, offsetof (range_table_entry, val) }, { XD_END } }; static const struct sized_memory_description rte_description = { sizeof (range_table_entry), rte_description_1 }; static const struct memory_description rted_description_1[] = { XD_DYNARR_DESC (range_table_entry_dynarr, &rte_description), { XD_END } }; static const struct sized_memory_description rted_description = { sizeof (range_table_entry_dynarr), rted_description_1 }; static const struct memory_description range_table_description[] = { { XD_BLOCK_PTR, offsetof (Lisp_Range_Table, entries), 1, &rted_description }, { XD_END } }; DEFINE_LRECORD_IMPLEMENTATION ("range-table", range_table, 1, /*dumpable-flag*/ mark_range_table, print_range_table, 0, range_table_equal, range_table_hash, range_table_description, Lisp_Range_Table); /************************************************************************/ /* Range table operations */ /************************************************************************/ #ifdef ERROR_CHECK_STRUCTURES static void verify_range_table (Lisp_Range_Table *rt) { int i; for (i = 0; i < Dynarr_length (rt->entries); i++) { struct range_table_entry *rte = Dynarr_atp (rt->entries, i); assert (rte->last >= rte->first); if (i > 0) assert (Dynarr_at (rt->entries, i - 1).last < rte->first); } } #else #define verify_range_table(rt) #endif /* Look up in a range table without the Dynarr wrapper. Used also by the unified range table format. */ static Lisp_Object get_range_table (EMACS_INT pos, int nentries, struct range_table_entry *tab, Lisp_Object default_) { int left = 0, right = nentries; /* binary search for the entry. Based on similar code in extent_list_locate(). */ while (left != right) { /* RIGHT might not point to a valid entry (i.e. it's at the end of the list), so NEWPOS must round down. */ int newpos = (left + right) >> 1; struct range_table_entry *entry = tab + newpos; if (pos > entry->last) left = newpos+1; else if (pos < entry->first) right = newpos; else return entry->val; } return default_; } DEFUN ("range-table-p", Frange_table_p, 1, 1, 0, /* Return non-nil if OBJECT is a range table. */ (object)) { return RANGE_TABLEP (object) ? Qt : Qnil; } DEFUN ("make-range-table", Fmake_range_table, 0, 0, 0, /* Return a new, empty range table. You can manipulate it using `put-range-table', `get-range-table', `remove-range-table', and `clear-range-table'. */ ()) { Lisp_Range_Table *rt = alloc_lcrecord_type (Lisp_Range_Table, &lrecord_range_table); rt->entries = Dynarr_new (range_table_entry); return wrap_range_table (rt); } DEFUN ("copy-range-table", Fcopy_range_table, 1, 1, 0, /* Return a new range table which is a copy of RANGE-TABLE. It will contain the same values for the same ranges as RANGE-TABLE. The values will not themselves be copied. */ (range_table)) { Lisp_Range_Table *rt, *rtnew; CHECK_RANGE_TABLE (range_table); rt = XRANGE_TABLE (range_table); rtnew = alloc_lcrecord_type (Lisp_Range_Table, &lrecord_range_table); rtnew->entries = Dynarr_new (range_table_entry); Dynarr_add_many (rtnew->entries, Dynarr_atp (rt->entries, 0), Dynarr_length (rt->entries)); return wrap_range_table (rtnew); } DEFUN ("get-range-table", Fget_range_table, 2, 3, 0, /* Find value for position POS in RANGE-TABLE. If there is no corresponding value, return DEFAULT (defaults to nil). */ (pos, range_table, default_)) { Lisp_Range_Table *rt; CHECK_RANGE_TABLE (range_table); rt = XRANGE_TABLE (range_table); CHECK_INT_COERCE_CHAR (pos); return get_range_table (XINT (pos), Dynarr_length (rt->entries), Dynarr_atp (rt->entries, 0), default_); } void put_range_table (Lisp_Object table, EMACS_INT first, EMACS_INT last, Lisp_Object val) { int i; int insert_me_here = -1; Lisp_Range_Table *rt = XRANGE_TABLE (table); /* Now insert in the proper place. This gets tricky because we may be overlapping one or more existing ranges and need to fix them up. */ /* First delete all sections of any existing ranges that overlap the new range. */ for (i = 0; i < Dynarr_length (rt->entries); i++) { struct range_table_entry *entry = Dynarr_atp (rt->entries, i); /* We insert before the first range that begins at or after the new range. */ if (entry->first >= first && insert_me_here < 0) insert_me_here = i; if (entry->last < first) /* completely before the new range. */ continue; if (entry->first > last) /* completely after the new range. No more possibilities of finding overlapping ranges. */ break; if (entry->first < first && entry->last <= last) { /* looks like: [ NEW ] [ EXISTING ] */ /* truncate the end off of it. */ entry->last = first - 1; } else if (entry->first < first && entry->last > last) /* looks like: [ NEW ] [ EXISTING ] */ /* need to split this one in two. */ { struct range_table_entry insert_me_too; insert_me_too.first = last + 1; insert_me_too.last = entry->last; insert_me_too.val = entry->val; entry->last = first - 1; Dynarr_insert_many (rt->entries, &insert_me_too, 1, i + 1); } else if (entry->last > last) { /* looks like: [ NEW ] [ EXISTING ] */ /* truncate the start off of it. */ entry->first = last + 1; } else { /* existing is entirely within new. */ Dynarr_delete_many (rt->entries, i, 1); i--; /* back up since everything shifted one to the left. */ } } /* Someone asked us to delete the range, not insert it. */ if (UNBOUNDP (val)) return; /* Now insert the new entry, maybe at the end. */ if (insert_me_here < 0) insert_me_here = i; { struct range_table_entry insert_me; insert_me.first = first; insert_me.last = last; insert_me.val = val; Dynarr_insert_many (rt->entries, &insert_me, 1, insert_me_here); } /* Now see if we can combine this entry with adjacent ones just before or after. */ if (insert_me_here > 0) { struct range_table_entry *entry = Dynarr_atp (rt->entries, insert_me_here - 1); if (EQ (val, entry->val) && entry->last == first - 1) { entry->last = last; Dynarr_delete_many (rt->entries, insert_me_here, 1); insert_me_here--; /* We have morphed into a larger range. Update our records in case we also combine with the one after. */ first = entry->first; } } if (insert_me_here < Dynarr_length (rt->entries) - 1) { struct range_table_entry *entry = Dynarr_atp (rt->entries, insert_me_here + 1); if (EQ (val, entry->val) && entry->first == last + 1) { entry->first = first; Dynarr_delete_many (rt->entries, insert_me_here, 1); } } } DEFUN ("put-range-table", Fput_range_table, 4, 4, 0, /* Set the value for range (START, END) to be VALUE in RANGE-TABLE. */ (start, end, value, range_table)) { EMACS_INT first, last; CHECK_RANGE_TABLE (range_table); CHECK_INT_COERCE_CHAR (start); first = XINT (start); CHECK_INT_COERCE_CHAR (end); last = XINT (end); if (first > last) invalid_argument_2 ("start must be <= end", start, end); put_range_table (range_table, first, last, value); verify_range_table (XRANGE_TABLE (range_table)); return Qnil; } DEFUN ("remove-range-table", Fremove_range_table, 3, 3, 0, /* Remove the value for range (START, END) in RANGE-TABLE. */ (start, end, range_table)) { return Fput_range_table (start, end, Qunbound, range_table); } DEFUN ("clear-range-table", Fclear_range_table, 1, 1, 0, /* Flush RANGE-TABLE. */ (range_table)) { CHECK_RANGE_TABLE (range_table); Dynarr_reset (XRANGE_TABLE (range_table)->entries); return Qnil; } DEFUN ("map-range-table", Fmap_range_table, 2, 2, 0, /* Map FUNCTION over entries in RANGE-TABLE, calling it with three args, the beginning and end of the range and the corresponding value. Results are guaranteed to be correct (i.e. each entry processed exactly once) if FUNCTION modifies or deletes the current entry \(i.e. passes the current range to `put-range-table' or `remove-range-table'), but not otherwise. */ (function, range_table)) { Lisp_Range_Table *rt; int i; CHECK_RANGE_TABLE (range_table); CHECK_FUNCTION (function); rt = XRANGE_TABLE (range_table); /* Do not "optimize" by pulling out the length computation below! FUNCTION may have changed the table. */ for (i = 0; i < Dynarr_length (rt->entries); i++) { struct range_table_entry *entry = Dynarr_atp (rt->entries, i); EMACS_INT first, last; Lisp_Object args[4]; int oldlen; again: first = entry->first; last = entry->last; oldlen = Dynarr_length (rt->entries); args[0] = function; args[1] = make_int (first); args[2] = make_int (last); args[3] = entry->val; Ffuncall (countof (args), args); /* Has FUNCTION removed the entry? */ if (oldlen > Dynarr_length (rt->entries) && i < Dynarr_length (rt->entries) && (first != entry->first || last != entry->last)) goto again; } return Qnil; } /************************************************************************/ /* Range table read syntax */ /************************************************************************/ static int rangetab_data_validate (Lisp_Object UNUSED (keyword), Lisp_Object value, Error_Behavior UNUSED (errb)) { /* #### should deal with ERRB */ EXTERNAL_PROPERTY_LIST_LOOP_3 (range, data, value) { if (!INTP (range) && !CHARP (range) && !(CONSP (range) && CONSP (XCDR (range)) && NILP (XCDR (XCDR (range))) && (INTP (XCAR (range)) || CHARP (XCAR (range))) && (INTP (XCAR (XCDR (range))) || CHARP (XCAR (XCDR (range)))))) sferror ("Invalid range format", range); } return 1; } static Lisp_Object rangetab_instantiate (Lisp_Object data) { Lisp_Object rangetab = Fmake_range_table (); if (!NILP (data)) { data = Fcar (Fcdr (data)); /* skip over 'data keyword */ while (!NILP (data)) { Lisp_Object range = Fcar (data); Lisp_Object val = Fcar (Fcdr (data)); data = Fcdr (Fcdr (data)); if (CONSP (range)) Fput_range_table (Fcar (range), Fcar (Fcdr (range)), val, rangetab); else Fput_range_table (range, range, val, rangetab); } } return rangetab; } /************************************************************************/ /* Unified range tables */ /************************************************************************/ /* A "unified range table" is a format for storing range tables as contiguous blocks of memory. This is used by the regexp code, which needs to use range tables to properly handle [] constructs in the presence of extended characters but wants to store an entire compiled pattern as a contiguous block of memory. Unified range tables are designed so that they can be placed at an arbitrary (possibly mis-aligned) place in memory. (Dealing with alignment is a pain in the ass.) WARNING: No provisions for garbage collection are currently made. This means that there must not be any Lisp objects in a unified range table that need to be marked for garbage collection. Good candidates for objects that can go into a range table are -- numbers and characters (do not need to be marked) -- nil, t (marked elsewhere) -- charsets and coding systems (automatically marked because they are in a marked list, and can't be removed) Good but slightly less so: -- symbols (could be uninterned, but that is not likely) Somewhat less good: -- buffers, frames, devices (could get deleted) It is expected that you work with range tables in the normal format and then convert to unified format when you are done making modifications. As such, no functions are provided for modifying a unified range table. The only operations you can do to unified range tables are -- look up a value -- retrieve all the ranges in an iterative fashion */ /* The format of a unified range table is as follows: -- The first byte contains the number of bytes to skip to find the actual start of the table. This deals with alignment constraints, since the table might want to go at any arbitrary place in memory. -- The next three bytes contain the number of bytes to skip (from the *first* byte) to find the stuff after the table. It's stored in little-endian format because that's how God intended things. We don't necessarily start the stuff at the very end of the table because we want to have at least ALIGNOF (EMACS_INT) extra space in case we have to move the range table around. (It appears that some architectures don't maintain alignment when reallocing.) -- At the prescribed offset is a struct unified_range_table, containing some number of `struct range_table_entry' entries. */ struct unified_range_table { int nentries; struct range_table_entry first; }; /* Return size in bytes needed to store the data in a range table. */ int unified_range_table_bytes_needed (Lisp_Object rangetab) { return (sizeof (struct range_table_entry) * (Dynarr_length (XRANGE_TABLE (rangetab)->entries) - 1) + sizeof (struct unified_range_table) + /* ALIGNOF a struct may be too big. */ /* We have four bytes for the size numbers, and an extra four or eight bytes for making sure we get the alignment OK. */ ALIGNOF (EMACS_INT) + 4); } /* Convert a range table into unified format and store in DEST, which must be able to hold the number of bytes returned by range_table_bytes_needed(). */ void unified_range_table_copy_data (Lisp_Object rangetab, void *dest) { /* We cast to the above structure rather than just casting to char * and adding sizeof(int), because that will lead to mis-aligned data on the Alpha machines. */ struct unified_range_table *un; range_table_entry_dynarr *rted = XRANGE_TABLE (rangetab)->entries; int total_needed = unified_range_table_bytes_needed (rangetab); void *new_dest = ALIGN_PTR ((char *) dest + 4, EMACS_INT); * (char *) dest = (char) ((char *) new_dest - (char *) dest); * ((unsigned char *) dest + 1) = total_needed & 0xFF; total_needed >>= 8; * ((unsigned char *) dest + 2) = total_needed & 0xFF; total_needed >>= 8; * ((unsigned char *) dest + 3) = total_needed & 0xFF; un = (struct unified_range_table *) new_dest; un->nentries = Dynarr_length (rted); memcpy (&un->first, Dynarr_atp (rted, 0), sizeof (struct range_table_entry) * Dynarr_length (rted)); } /* Return number of bytes actually used by a unified range table. */ int unified_range_table_bytes_used (void *unrangetab) { return ((* ((unsigned char *) unrangetab + 1)) + ((* ((unsigned char *) unrangetab + 2)) << 8) + ((* ((unsigned char *) unrangetab + 3)) << 16)); } /* Make sure the table is aligned, and move it around if it's not. */ static void align_the_damn_table (void *unrangetab) { void *cur_dest = (char *) unrangetab + * (char *) unrangetab; if (cur_dest != ALIGN_PTR (cur_dest, EMACS_INT)) { int count = (unified_range_table_bytes_used (unrangetab) - 4 - ALIGNOF (EMACS_INT)); /* Find the proper location, just like above. */ void *new_dest = ALIGN_PTR ((char *) unrangetab + 4, EMACS_INT); /* memmove() works in the presence of overlapping data. */ memmove (new_dest, cur_dest, count); * (char *) unrangetab = (char) ((char *) new_dest - (char *) unrangetab); } } /* Look up a value in a unified range table. */ Lisp_Object unified_range_table_lookup (void *unrangetab, EMACS_INT pos, Lisp_Object default_) { void *new_dest; struct unified_range_table *un; align_the_damn_table (unrangetab); new_dest = (char *) unrangetab + * (char *) unrangetab; un = (struct unified_range_table *) new_dest; return get_range_table (pos, un->nentries, &un->first, default_); } /* Return number of entries in a unified range table. */ int unified_range_table_nentries (void *unrangetab) { void *new_dest; struct unified_range_table *un; align_the_damn_table (unrangetab); new_dest = (char *) unrangetab + * (char *) unrangetab; un = (struct unified_range_table *) new_dest; return un->nentries; } /* Return the OFFSETth range (counting from 0) in UNRANGETAB. */ void unified_range_table_get_range (void *unrangetab, int offset, EMACS_INT *min, EMACS_INT *max, Lisp_Object *val) { void *new_dest; struct unified_range_table *un; struct range_table_entry *tab; align_the_damn_table (unrangetab); new_dest = (char *) unrangetab + * (char *) unrangetab; un = (struct unified_range_table *) new_dest; assert (offset >= 0 && offset < un->nentries); tab = (&un->first) + offset; *min = tab->first; *max = tab->last; *val = tab->val; } /************************************************************************/ /* Initialization */ /************************************************************************/ void syms_of_rangetab (void) { INIT_LRECORD_IMPLEMENTATION (range_table); DEFSYMBOL_MULTIWORD_PREDICATE (Qrange_tablep); DEFSYMBOL (Qrange_table); DEFSUBR (Frange_table_p); DEFSUBR (Fmake_range_table); DEFSUBR (Fcopy_range_table); DEFSUBR (Fget_range_table); DEFSUBR (Fput_range_table); DEFSUBR (Fremove_range_table); DEFSUBR (Fclear_range_table); DEFSUBR (Fmap_range_table); } void structure_type_create_rangetab (void) { struct structure_type *st; st = define_structure_type (Qrange_table, 0, rangetab_instantiate); define_structure_type_keyword (st, Qdata, rangetab_data_validate); }