Mercurial > hg > xemacs-beta
annotate src/extents-impl.h @ 5353:38e24b8be4ea
Improve the lexical scoping in #'block, #'return-from.
lisp/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el:
* bytecomp.el (byte-compile-initial-macro-environment):
Shadow `block', `return-from' here, we implement them differently
when byte-compiling.
* bytecomp.el (byte-compile-active-blocks): New.
* bytecomp.el (byte-compile-block-1): New.
* bytecomp.el (byte-compile-return-from-1): New.
* bytecomp.el (return-from-1): New.
* bytecomp.el (block-1): New.
These are two aliases that exist to have their own associated
byte-compile functions, which functions implement `block' and
`return-from'.
* cl-extra.el (cl-macroexpand-all):
Fix a bug here when macros in the environment have been compiled.
* cl-macs.el (block):
* cl-macs.el (return):
* cl-macs.el (return-from):
Be more careful about lexical scope in these macros.
* cl.el:
* cl.el ('cl-block-wrapper): Removed.
* cl.el ('cl-block-throw): Removed.
These aren't needed in code generated by this XEmacs. They
shouldn't be needed in code generated by XEmacs 21.4, but if it
turns out the packages do need them, we can put them back.
2011-01-30 Mike Sperber <mike@xemacs.org>
* font-lock.el (font-lock-fontify-pending-extents): Don't fail if
`font-lock-mode' is unset, which can happen in the middle of
`revert-buffer'.
2011-01-23 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete):
* cl-macs.el (delq):
* cl-macs.el (remove):
* cl-macs.el (remq):
Don't use the compiler macro if these functions were given the
wrong number of arguments, as happens in lisp-tests.el.
* cl-seq.el (remove, remq): Removed.
I added these to subr.el, and forgot to remove them from here.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-setq, byte-compile-set):
Remove kludge allowing keywords' values to be set, all the code
that does that is gone.
* cl-compat.el (elt-satisfies-test-p):
* faces.el (set-face-parent):
* faces.el (face-doc-string):
* gtk-font-menu.el:
* gtk-font-menu.el (gtk-reset-device-font-menus):
* msw-font-menu.el:
* msw-font-menu.el (mswindows-reset-device-font-menus):
* package-get.el (package-get-installedp):
* select.el (select-convert-from-image-data):
* sound.el:
* sound.el (load-sound-file):
* x-font-menu.el (x-reset-device-font-menus-core):
Don't quote keywords, they're self-quoting, and the
win from backward-compatibility is sufficiently small now that the
style problem overrides it.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (block, return-from): Require that NAME be a symbol
in these macros, as always documented in the #'block docstring and
as required by Common Lisp.
* descr-text.el (unidata-initialize-unihan-database):
Correct the use of non-symbols in #'block and #'return-from in
this function.
2011-01-15 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (concatenate): Accept more complicated TYPEs in this
function, handing the sequences over to #'coerce if we don't
understand them here.
* cl-macs.el (inline): Don't proclaim #'concatenate as inline, its
compiler macro is more useful than doing that.
2011-01-11 Aidan Kehoe <kehoea@parhasard.net>
* subr.el (delete, delq, remove, remq): Move #'remove, #'remq
here, they don't belong in cl-seq.el; move #'delete, #'delq here
from fns.c, implement them in terms of #'delete*, allowing support
for sequences generally.
* update-elc.el (do-autoload-commands): Use #'delete*, not #'delq
here, now the latter's no longer dumped.
* cl-macs.el (delete, delq): Add compiler macros transforming
#'delete and #'delq to #'delete* calls.
2011-01-10 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box): Correct a misplaced parenthesis
here, thank you Mats Lidell in 87zkr9gqrh.fsf@mail.contactor.se !
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box):
* list-mode.el (display-completion-list):
These functions used to use cl-parsing-keywords; change them to
use defun* instead, fixing the build. (Not sure what led to me
not including this change in d1b17a33450b!)
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (define-star-compiler-macros):
Make sure the form has ITEM and LIST specified before attempting
to change to calls with explicit tests; necessary for some tests
in lisp-tests.el to compile correctly.
(stable-union, stable-intersection): Add compiler macros for these
functions, in the same way we do for most of the other functions
in cl-seq.el.
2011-01-01 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (dolist, dotimes, do-symbols, macrolet)
(symbol-macrolet):
Define these macros with defmacro* instead of parsing the argument
list by hand, for the sake of style and readability; use backquote
where appropriate, instead of calling #'list and and friends, for
the same reason.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* x-misc.el (device-x-display):
Provide this function, documented in the Lispref for years, but
not existing previously. Thank you Julian Bradfield, thank you
Jeff Mincy.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl-seq.el:
Move the heavy lifting from this file to C. Dump the
cl-parsing-keywords macro, but don't use defun* for the functions
we define that do take keywords, dynamic scope lossage makes that
not practical.
* subr.el (sort, fillarray): Move these aliases here.
(map-plist): #'nsublis is now built-in, but at this point #'eql
isn't necessarily available as a test; use #'eq.
* obsolete.el (cl-delete-duplicates): Make this available for old
compiler macros and old code.
(memql): Document that this is equivalent to #'member*, and worse.
* cl.el (adjoin, subst): Removed. These are in C.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* simple.el (assoc-ignore-case): Remove a duplicate definition of
this function (it's already in subr.el).
* iso8859-1.el (char-width):
On non-Mule, make this function equivalent to that produced by
(constantly 1), but preserve its docstring.
* subr.el (subst-char-in-string): Define this in terms of
#'substitute, #'nsubstitute.
(string-width): Define this using #'reduce and #'char-width.
(char-width): Give this a simpler definition, it makes far more
sense to check for mule at load time and redefine, as we do in
iso8859-1.el.
(store-substring): Implement this in terms of #'replace, now
#'replace is cheap.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* update-elc.el (lisp-files-needed-for-byte-compilation)
(lisp-files-needing-early-byte-compilation):
cl-macs belongs in the former, not the latter, it is as
fundamental as bytecomp.el.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl.el:
Provde the Common Lisp program-error, type-error as error
symbols. This doesn't nearly go far enough for anyone using the
Common Lisp errors.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete-duplicates):
If the form has an incorrect number of arguments, don't attempt a
compiler macroexpansion.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (cl-safe-expr-p):
Forms that start with the symbol lambda are also safe.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
For these functions' compiler macros, the optimisation is safe
even if the first and the last arguments have side effects, since
they're only used the once.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (inline-side-effect-free-compiler-macros):
Unroll a loop here at macro-expansion time, so these compiler
macros are compiled. Use #'eql instead of #'eq in a couple of
places for better style.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (notany, notevery): Avoid some dynamic scope
stupidity with local variable names in these functions, when they
weren't prefixed with cl-; go into some more detail in the doc
strings.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns): #'remove, #'remq are
free of side-effects.
(side-effect-and-error-free-fns):
Drop dot, dot-marker from the list.
2010-11-17 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (coerce):
In the argument list, name the first argument OBJECT, not X; the
former name was always used in the doc string and is clearer.
Handle vector type specifications which include the length of the
target sequence, error if there's a mismatch.
* cl-macs.el (cl-make-type-test): Handle type specifications
starting with the symbol 'eql.
2010-11-14 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (eql): Don't remove the byte-compile property of this
symbol. That was necessary to override a bug in bytecomp.el where
#'eql was confused with #'eq, which bug we no longer have.
If neither expression is constant, don't attempt to handle the
expression in this compiler macro, leave it to byte-compile-eql,
which produces better code anyway.
* bytecomp.el (eq): #'eql is not the function associated with the
byte-eq byte code.
(byte-compile-eql): Add an explicit compile method for this
function, for cases where the cl-macs compiler macro hasn't
reduced it to #'eq or #'equal.
2010-10-25 Aidan Kehoe <kehoea@parhasard.net>
Add compiler macros and compilation sanity-checking for various
functions that take keywords.
* byte-optimize.el (side-effect-free-fns): #'symbol-value is
side-effect free and not error free.
* bytecomp.el (byte-compile-normal-call): Check keyword argument
lists for sanity; store information about the positions where
keyword arguments start using the new byte-compile-keyword-start
property.
* cl-macs.el (cl-const-expr-val): Take a new optional argument,
cl-not-constant, defaulting to nil, in this function; return it if
the expression is not constant.
(cl-non-fixnum-number-p): Make this into a separate function, we
want to pass it to #'every.
(eql): Use it.
(define-star-compiler-macros): Use the same code to generate the
member*, assoc* and rassoc* compiler macros; special-case some
code in #'add-to-list in subr.el.
(remove, remq): Add compiler macros for these two functions, in
preparation for #'remove being in C.
(define-foo-if-compiler-macros): Transform (remove-if-not ...) calls to
(remove ... :if-not) at compile time, which will be a real win
once the latter is in C.
(define-substitute-if-compiler-macros)
(define-subst-if-compiler-macros): Similarly for these functions.
(delete-duplicates): Change this compiler macro to use
#'plists-equal; if we don't have information about the type of
SEQUENCE at compile time, don't bother attempting to inline the
call, the function will be in C soon enough.
(equalp): Remove an old commented-out compiler macro for this, if
we want to see it it's in version control.
(subst-char-in-string): Transform this to a call to nsubstitute or
nsubstitute, if that is appropriate.
* cl.el (ldiff): Don't call setf here, this makes for a load-time
dependency problem in cl-macs.el
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* term/vt100.el:
Refer to XEmacs, not GNU Emacs, in permissions.
* term/bg-mouse.el:
* term/sup-mouse.el:
Put copyright notice in canonical "Copyright DATE AUTHOR" form.
Refer to XEmacs, not GNU Emacs, in permissions.
* site-load.el:
Add permission boilerplate.
* mule/canna-leim.el:
* alist.el:
Refer to XEmacs, not APEL/this program, in permissions.
* mule/canna-leim.el:
Remove my copyright, I've assigned it to the FSF.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* gtk.el:
* gtk-widget-accessors.el:
* gtk-package.el:
* gtk-marshal.el:
* gtk-compose.el:
* gnome.el:
Add copyright notice based on internal evidence.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* easymenu.el: Add reference to COPYING to permission notice.
* gutter.el:
* gutter-items.el:
* menubar-items.el:
Fix typo "Xmacs" in permissions notice.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* auto-save.el:
* font.el:
* fontconfig.el:
* mule/kinsoku.el:
Add "part of XEmacs" text to permission notice.
2010-10-14 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns):
* cl-macs.el (remf, getf):
* cl-extra.el (tailp, cl-set-getf, cl-do-remf):
* cl.el (ldiff, endp):
Tighten up Common Lisp compatibility for #'ldiff, #'endp, #'tailp;
add circularity checking for the first two.
#'cl-set-getf and #'cl-do-remf were Lisp implementations of
#'plist-put and #'plist-remprop; change the names to aliases,
changes the macros that use them to using #'plist-put and
#'plist-remprop directly.
2010-10-12 Aidan Kehoe <kehoea@parhasard.net>
* abbrev.el (fundamental-mode-abbrev-table, global-abbrev-table):
Create both these abbrev tables using the usual
#'define-abbrev-table calls, rather than attempting to
special-case them.
* cl-extra.el: Force cl-macs to be loaded here, if cl-extra.el is
being loaded interpreted. Previously other, later files would
redundantly call (load "cl-macs") when interpreted, it's more
reasonable to do it here, once.
* cmdloop.el (read-quoted-char-radix): Use defcustom here, we
don't have any dump-order dependencies that would prevent that.
* custom.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling, rely on cl-extra.el in the
former case and the appropriate entry in bytecomp-load-hook in the
latter. Get rid of custom-declare-variable-list, we have no
dump-time dependencies that would require it.
* faces.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling.
* packages.el: Remove some inaccurate comments.
* post-gc.el (cleanup-simple-finalizers): Use #'delete-if-not
here, now the order of preloaded-file-list has been changed to
make it available.
* subr.el (custom-declare-variable-list): Remove. No need for it.
Also remove a stub define-abbrev-table from this file, given the
current order of preloaded-file-list there's no need for it.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-constp) Forms quoted with FUNCTION are
also constant.
(byte-compile-initial-macro-environment): In #'the, if FORM is
constant and does not match TYPE, warn at byte-compile time.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* backquote.el (bq-vector-contents, bq-list*): Remove; the former
is equivalent to (append VECTOR nil), the latter to (list* ...).
(bq-process-2): Use (append VECTOR nil) instead of using
#'bq-vector-contents to convert to a list.
(bq-process-1): Now we use list* instead of bq-list
* subr.el (list*): Moved from cl.el, since it is now required to
be available the first time a backquoted form is encountered.
* cl.el (list*): Move to subr.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* test-harness.el (Check-Message):
Add an omitted comma here, thank you the buildbot.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* hash-table.el (hash-table-key-list, hash-table-value-list)
(hash-table-key-value-alist, hash-table-key-value-plist):
Remove some useless #'nreverse calls in these files; our hash
tables have no order, it's not helpful to pretend they do.
* behavior.el (read-behavior):
Do the same in this file, in some code evidently copied from
hash-table.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* info.el (Info-insert-dir):
* format.el (format-deannotate-region):
* files.el (cd, save-buffers-kill-emacs):
Use #'some, #'every and related functions for applying boolean
operations to lists, instead of rolling our own ones that cons and
don't short-circuit.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-initial-macro-environment):
* cl-macs.el (the):
Rephrase the docstring, make its implementation when compiling
files a little nicer.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* descr-text.el (unidata-initialize-unicodedata-database)
(unidata-initialize-unihan-database, describe-char-unicode-data)
(describe-char-unicode-data):
Wrap calls to the database functions with (with-fboundp ...),
avoiding byte compile warnings on builds without support for the
database functions.
(describe-char): (reduce #'max ...), not (apply #'max ...), no
need to cons needlessly.
(describe-char): Remove a redundant lambda wrapping
#'extent-properties.
(describe-char-unicode-data): Call #'nsubst when replacing "" with
nil in the result of #'split-string, instead of consing inside
mapcar.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* x-faces.el (x-available-font-sizes):
* specifier.el (let-specifier):
* package-ui.el (pui-add-required-packages):
* msw-faces.el (mswindows-available-font-sizes):
* modeline.el (modeline-minor-mode-menu):
* minibuf.el (minibuf-directory-files):
Replace the O2N (delq nil (mapcar (lambda (W) (and X Y)) Z)) with
the ON (mapcan (lambda (W) (and X (list Y))) Z) in these files.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
When these functions are handed more than two arguments, and those
arguments have no side effects, transform to a series of two
argument calls, avoiding funcall in the byte-compiled code.
* mule/mule-cmds.el (finish-set-language-environment):
Take advantage of this change in a function called 256 times at
startup.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-function-form, byte-compile-quote)
(byte-compile-quote-form):
Warn at compile time, and error at runtime, if a (quote ...) or a
(function ...) form attempts to quote more than one object.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (byte-optimize-apply): Transform (apply 'nconc
(mapcar ...)) to (mapcan ...); warn about use of the first idiom.
* update-elc.el (do-autoload-commands):
* packages.el (packages-find-package-library-path):
* frame.el (frame-list):
* extents.el (extent-descendants):
* etags.el (buffer-tag-table-files):
* dumped-lisp.el (preloaded-file-list):
* device.el (device-list):
* bytecomp-runtime.el (proclaim-inline, proclaim-notinline)
Use #'mapcan, not (apply #'nconc (mapcar ...) in all these files.
* bytecomp-runtime.el (eval-when-compile, eval-and-compile):
In passing, mention that these macros also evaluate the body when
interpreted.
tests/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
Test lexical scope for `block', `return-from'; add a
Known-Bug-Expect-Failure for a contorted example that fails when
byte-compiled.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Mon, 07 Feb 2011 12:01:24 +0000 |
| parents | a9c41067dd88 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 872 | 1 /* Copyright (c) 1994, 1995 Free Software Foundation. |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
2 Copyright (c) 1995, 1996, 2002, 2010 Ben Wing. |
| 872 | 3 |
| 4 This file is part of XEmacs. | |
| 5 | |
| 6 XEmacs is free software; you can redistribute it and/or modify it | |
| 7 under the terms of the GNU General Public License as published by the | |
| 8 Free Software Foundation; either version 2, or (at your option) any | |
| 9 later version. | |
| 10 | |
| 11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 14 for more details. | |
| 15 | |
| 16 You should have received a copy of the GNU General Public License | |
| 17 along with XEmacs; see the file COPYING. If not, write to | |
| 18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 19 Boston, MA 02111-1307, USA. */ | |
| 20 | |
| 21 /* Synched up with: Not in FSF. */ | |
| 22 | |
| 23 #ifndef INCLUDED_extents_impl_h_ | |
| 24 #define INCLUDED_extents_impl_h_ | |
| 25 | |
| 26 #include "extents.h" | |
| 27 | |
| 28 struct extent | |
| 29 { | |
|
5120
d1247f3cc363
latest work on lisp-object workspace;
Ben Wing <ben@xemacs.org>
parents:
3017
diff
changeset
|
30 FROB_BLOCK_LISP_OBJECT_HEADER lheader; |
| 872 | 31 |
| 32 Memxpos start; | |
| 33 Memxpos end; | |
| 34 Lisp_Object object; /* A buffer, string, Qnil (extent detached from no | |
| 35 buffer), Qt (destroyed extent) */ | |
| 36 | |
| 37 /* Extent properties are conceptually a plist, but the most common | |
| 38 props are implemented as bits instead of conses. */ | |
| 39 struct | |
| 40 { | |
| 41 Lisp_Object face; | |
| 42 | |
| 43 /* These flags are simply an optimization for common boolean properties | |
| 44 which go onto the extent's property list. Any of them would work if | |
| 45 done in the normal way, but the space savings of doing these in this | |
| 46 way is significant. Note that if you add a flag, there are numerous | |
| 47 places in extents.c that need to know about it. | |
| 48 | |
| 49 Another consideration is that some of these properties are accessed | |
| 50 during redisplay, so it's good for access to them to be fast (a bit | |
| 51 reference instead of a search down a plist). | |
| 52 | |
| 53 `begin_glyph_layout' and `end_glyph_layout' are unusual in that | |
| 54 they have 4 states instead of 2. | |
| 55 | |
| 56 Other special extent properties are stored in an auxiliary | |
| 57 structure that sits at the beginning of the plist. The has_aux | |
| 58 flag indicates whether this structure exists. The has_parent | |
| 59 flag is an optimization indicating whether the extent has a parent | |
| 60 (this could also be determined by looking in the aux structure). */ | |
| 61 | |
| 62 enum_field (glyph_layout) begin_glyph_layout :2; | |
| 63 /* 2 text, margins, or whitespace */ | |
| 64 enum_field (glyph_layout) end_glyph_layout :2; | |
| 65 /* 4 text, margins, or whitespace */ | |
| 66 unsigned int has_parent :1; /* 5 extent has a parent */ | |
| 67 unsigned int has_aux :1; /* 6 extent has an aux. structure */ | |
| 68 unsigned int start_open :1; /* 7 insertion behavior at start */ | |
| 69 unsigned int end_open :1; /* 8 insertion behavior at end */ | |
| 70 unsigned int unique :1; /* 9 there may be only one attached */ | |
| 71 unsigned int duplicable :1; /* 10 copied to strings by kill/undo */ | |
| 72 unsigned int detachable :1; /* 11 extent detaches if text deleted */ | |
| 73 unsigned int internal :1; /* 12 used by map-extents etc. */ | |
| 74 unsigned int in_red_event :1; /* 13 An event has been spawned for | |
| 75 initial redisplay. | |
| 76 (not exported to lisp) */ | |
| 77 unsigned int unused16 :1; /* 16 unused bits */ | |
| 78 /* --- Adding more flags will cause the extent struct to grow by another | |
| 79 word. It's not clear that this would make a difference, however, | |
| 80 because on 32-bit machines things tend to get allocated in chunks | |
| 81 of 4 bytes. */ | |
| 82 } flags; | |
| 83 /* The plist may have an auxiliary structure as its first element */ | |
| 84 Lisp_Object plist; | |
| 85 }; | |
| 86 | |
| 87 /* Basic properties of an extent (not affected by the extent's parent) */ | |
| 88 #define extent_object(e) ((e)->object) | |
| 89 #define extent_start(e) ((e)->start + 0) | |
| 90 #define extent_end(e) ((e)->end + 0) | |
| 91 #define set_extent_start(e, val) ((void) ((e)->start = (val))) | |
| 92 #define set_extent_end(e, val) ((void) ((e)->end = (val))) | |
| 93 #define extent_endpoint(e, endp) ((endp) ? extent_end (e) : extent_start (e)) | |
| 94 #define set_extent_endpoint(e, val, endp) \ | |
| 95 ((endp) ? set_extent_end (e, val) : set_extent_start (e, val)) | |
| 96 #define extent_detached_p(e) (extent_start (e) < 0) | |
| 97 | |
| 98 /* Additional information that may be present in an extent. The idea is | |
| 99 that fast access is provided to this information, but since (hopefully) | |
| 100 most extents won't have this set on them, we usually don't need to | |
| 101 have this structure around and thus the size of an extent is smaller. */ | |
| 102 | |
| 103 typedef struct extent_auxiliary extent_auxiliary; | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
104 |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
105 #define EXTENT_AUXILIARY_SLOTS \ |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
106 SLOT (begin_glyph) \ |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
107 SLOT (end_glyph) \ |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
108 SLOT (parent) \ |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
109 /* We use a weak list here. Originally I didn't do this and \ |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
110 depended on having the extent's finalization method remove \ |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
111 itself from its parent's children list. This runs into \ |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
112 lots and lots of problems though because everything is in \ |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
113 a really really bizarre state when an extent's finalization \ |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
114 method is called (it happens in sweep_extents() by way of \ |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
115 ADDITIONAL_FREE_extent()) and it's extremely difficult to \ |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
116 avoid getting hosed by just-freed objects. */ \ |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
117 SLOT (children) \ |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
118 SLOT (invisible) \ |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
119 SLOT (read_only) \ |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
120 SLOT (mouse_face) \ |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
121 SLOT (initial_redisplay_function) \ |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
122 SLOT (before_change_functions) \ |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
123 SLOT (after_change_functions) |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
124 |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
125 |
| 872 | 126 struct extent_auxiliary |
| 127 { | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
128 NORMAL_LISP_OBJECT_HEADER header; |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
129 #define SLOT(x) Lisp_Object x; |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
130 EXTENT_AUXILIARY_SLOTS |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
131 #undef SLOT |
| 872 | 132 int priority; |
| 133 }; | |
| 134 | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
135 extern Lisp_Object Vextent_auxiliary_defaults; |
| 872 | 136 |
| 137 struct extent_info | |
| 138 { | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
139 NORMAL_LISP_OBJECT_HEADER header; |
| 872 | 140 |
| 141 struct extent_list *extents; | |
| 142 struct stack_of_extents *soe; | |
| 143 }; | |
| 144 | |
| 145 /* A "normal" field is one that is stored in the `struct flags' structure | |
| 146 in an extent. an "aux" field is one that is stored in the extent's | |
| 147 auxiliary structure. | |
| 148 | |
| 149 The functions below that have `extent_no_chase' in their name operate | |
| 150 on an extent directly (ignoring its parent), and should normally | |
| 151 only be used on extents known not to have a parent. The other | |
| 152 versions chase down any parent links. */ | |
| 153 | |
| 154 #define extent_no_chase_normal_field(e, field) ((e)->flags.field) | |
| 155 | |
| 156 DECLARE_INLINE_HEADER ( | |
| 157 struct extent_auxiliary * | |
| 158 extent_aux_or_default (EXTENT e) | |
| 159 ) | |
| 160 { | |
| 161 return e->flags.has_aux ? | |
| 162 XEXTENT_AUXILIARY (XCAR (e->plist)) : | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
163 XEXTENT_AUXILIARY (Vextent_auxiliary_defaults); |
| 872 | 164 } |
| 165 | |
| 166 #define extent_no_chase_aux_field(e, field) (extent_aux_or_default(e)->field) | |
| 167 | |
| 168 #define extent_normal_field(e, field) \ | |
| 169 extent_no_chase_normal_field (extent_ancestor (e), field) | |
| 170 | |
| 171 #define extent_aux_field(e, field) \ | |
| 172 extent_no_chase_aux_field (extent_ancestor (e), field) | |
| 173 | |
| 174 #define set_extent_no_chase_aux_field(e, field, value) do { \ | |
| 175 EXTENT sencaf_e = (e); \ | |
| 176 if (! sencaf_e->flags.has_aux) \ | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
177 attach_extent_auxiliary (sencaf_e); \ |
|
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
178 XEXTENT_AUXILIARY (XCAR (sencaf_e->plist))->field = (value); \ |
| 872 | 179 } while (0) |
| 180 | |
| 181 #define set_extent_no_chase_normal_field(e, field, value) \ | |
| 182 extent_no_chase_normal_field (e, field) = (value) | |
| 183 | |
| 184 #define set_extent_aux_field(e, field, value) \ | |
| 185 set_extent_no_chase_aux_field (extent_ancestor (e), field, value) | |
| 186 | |
| 187 #define set_extent_normal_field(e, field, value) \ | |
| 188 set_extent_no_chase_normal_field (extent_ancestor (e), field, value) | |
| 189 | |
| 190 /* The `parent' and `children' fields are not affected by any | |
| 191 parent links. We don't provide any settors for these fields | |
| 192 because they need special handling and it's cleaner just to | |
| 193 do this in the particular functions that need to do this. */ | |
| 194 | |
| 195 #define extent_parent(e) extent_no_chase_aux_field (e, parent) | |
| 196 #define extent_children(e) extent_no_chase_aux_field (e, children) | |
| 197 | |
| 198 EXTENT extent_ancestor_1 (EXTENT e); | |
| 199 | |
| 200 /* extent_ancestor() chases all the parent links until there aren't any | |
| 201 more. extent_ancestor_1() does the same thing but it a function; | |
| 202 the following optimizes the most common case. */ | |
| 203 DECLARE_INLINE_HEADER ( | |
| 204 EXTENT | |
| 205 extent_ancestor (EXTENT e) | |
| 206 ) | |
| 207 { | |
| 208 return e->flags.has_parent ? extent_ancestor_1 (e) : e; | |
| 209 } | |
| 210 | |
| 211 #define extent_begin_glyph(e) extent_aux_field (e, begin_glyph) | |
| 212 #define extent_end_glyph(e) extent_aux_field (e, end_glyph) | |
| 213 #define extent_priority(e) extent_aux_field (e, priority) | |
| 214 #define extent_invisible(e) extent_aux_field (e, invisible) | |
| 215 #define extent_read_only(e) extent_aux_field (e, read_only) | |
| 216 #define extent_mouse_face(e) extent_aux_field (e, mouse_face) | |
| 217 #define extent_initial_redisplay_function(e) extent_aux_field (e, initial_redisplay_function) | |
| 218 #define extent_before_change_functions(e) extent_aux_field (e, before_change_functions) | |
| 219 #define extent_after_change_functions(e) extent_aux_field (e, after_change_functions) | |
| 220 | |
| 221 #define set_extent_begin_glyph(e, value) \ | |
| 222 set_extent_aux_field (e, begin_glyph, value) | |
| 223 #define set_extent_end_glyph(e, value) \ | |
| 224 set_extent_aux_field (e, end_glyph, value) | |
| 225 #define set_extent_priority(e, value) \ | |
| 226 set_extent_aux_field (e, priority, value) | |
| 227 #define set_extent_invisible_1(e, value) \ | |
| 228 set_extent_aux_field (e, invisible, value) | |
| 229 #define set_extent_read_only(e, value) \ | |
| 230 set_extent_aux_field (e, read_only, value) | |
| 231 #define set_extent_mouse_face(e, value) \ | |
| 232 set_extent_aux_field (e, mouse_face, value) | |
| 233 /* Use Fset_extent_initial_redisplay_function unless you know what you're doing */ | |
| 234 #define set_extent_initial_redisplay_function(e, value) \ | |
| 235 set_extent_aux_field (e, initial_redisplay_function, value) | |
| 236 #define set_extent_before_change_functions(e, value) \ | |
| 237 set_extent_aux_field (e, before_change_functions, value) | |
| 238 #define set_extent_after_change_functions(e, value) \ | |
| 239 set_extent_aux_field (e, after_change_functions, value) | |
| 240 | |
| 241 #define extent_face(e) extent_normal_field (e, face) | |
| 242 #define extent_begin_glyph_layout(e) ((enum glyph_layout) extent_normal_field (e, begin_glyph_layout)) | |
| 243 #define extent_end_glyph_layout(e) ((enum glyph_layout) extent_normal_field (e, end_glyph_layout)) | |
| 244 #define extent_start_open_p(e) extent_normal_field (e, start_open) | |
| 245 #define extent_end_open_p(e) extent_normal_field (e, end_open) | |
| 246 #define extent_unique_p(e) extent_normal_field (e, unique) | |
| 247 #define extent_duplicable_p(e) extent_normal_field (e, duplicable) | |
| 248 #define extent_detachable_p(e) extent_normal_field (e, detachable) | |
| 249 #define extent_internal_p(e) extent_normal_field (e, internal) | |
| 250 #define extent_in_red_event_p(e) extent_normal_field (e, in_red_event) | |
| 251 | |
| 252 #define set_extent_face(e, val) \ | |
| 253 set_extent_normal_field (e, face, val) | |
| 254 #define set_extent_begin_glyph_layout(e, val) \ | |
| 255 set_extent_normal_field (e, begin_glyph_layout, val) | |
| 256 #define set_extent_end_glyph_layout(e, val) \ | |
| 257 set_extent_normal_field (e, end_glyph_layout, val) | |
| 258 #define set_extent_start_open_p(e, val) \ | |
| 259 set_extent_normal_field (e, start_open, val) | |
| 260 #define set_extent_end_open_p(e, val) \ | |
| 261 set_extent_normal_field (e, end_open, val) | |
| 262 #define set_extent_unique_p(e, val) \ | |
| 263 set_extent_normal_field (e, unique, val) | |
| 264 #define set_extent_duplicable_p(e, val) \ | |
| 265 set_extent_normal_field (e, duplicable, val) | |
| 266 #define set_extent_detachable_p(e, val) \ | |
| 267 set_extent_normal_field (e, detachable, val) | |
| 268 #define set_extent_internal_p(e, val) \ | |
| 269 set_extent_normal_field (e, internal, val) | |
| 270 #define set_extent_in_red_event_p(e, val) \ | |
| 271 set_extent_normal_field (e, in_red_event, val) | |
| 272 | |
| 273 DECLARE_INLINE_HEADER ( | |
| 274 Lisp_Object * | |
| 275 extent_no_chase_plist_addr (EXTENT e) | |
| 276 ) | |
| 277 { | |
| 278 return e->flags.has_aux ? &XCDR (e->plist) : &e->plist; | |
| 279 } | |
| 280 | |
| 281 #define extent_no_chase_plist(e) (*extent_no_chase_plist_addr (e)) | |
| 282 | |
| 283 #define extent_plist_addr(e) extent_no_chase_plist_addr (extent_ancestor (e)) | |
| 284 #define extent_plist_slot(e) extent_no_chase_plist (extent_ancestor (e)) | |
| 285 | |
| 286 | |
| 287 #define EXTENT_LIVE_P(e) (!EQ (extent_object (e), Qt)) | |
| 288 | |
| 289 #define CHECK_LIVE_EXTENT(x) do { \ | |
| 290 CHECK_EXTENT (x); \ | |
| 291 if (!EXTENT_LIVE_P (XEXTENT (x))) \ | |
| 292 dead_wrong_type_argument (Qextent_live_p, (x)); \ | |
| 293 } while (0) | |
| 294 #define CONCHECK_LIVE_EXTENT(x) do { \ | |
| 295 CONCHECK_EXTENT (x); \ | |
| 296 if (!EXTENT_LIVE_P (XEXTENT (x))) \ | |
| 297 x = wrong_type_argument (Qextent_live_p, (x)); \ | |
| 298 } while (0) | |
| 299 | |
| 300 #endif /* INCLUDED_extents_impl_h_ */ |