Mercurial > hg > xemacs-beta
annotate src/line-number.c @ 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 | 804517e16990 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 /* Line number cache. |
| 2 Copyright (C) 1997 Free Software Foundation, Inc. | |
| 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 /* To calculate the line numbers, redisplay must count the newlines | |
| 24 from a known position. This used to be BUF_BEGV, but this made the | |
| 25 line numbering extremely slow for large buffers, because Emacs had | |
| 26 to rescan the whole buffer at each redisplay. | |
| 27 | |
| 28 To make line numbering efficient, we maintain a buffer-local cache | |
| 29 of recently used positions and their line numbers. The cache is | |
| 30 implemented as a small ring of cache positions. A cache position | |
| 31 is either nil or a cons of a buffer position (marker) and the | |
| 32 corresponding line number. | |
| 33 | |
| 34 When calculating the line numbers, this cache is consulted if it | |
| 35 would otherwise take too much time to count the newlines in the | |
| 36 buffer (see the comment to buffer_line_number().) | |
| 37 | |
| 38 Insertion and deletions that contain/delete newlines invalidate the | |
| 39 cached positions after the insertion point. This guarantees | |
| 40 relatively fast line numbers caching (even in buffers where point | |
| 41 moves a lot), and low memory usage. All of this is done only in | |
| 42 the buffers where the cache is actually initialized -- i.e. where | |
| 43 line-numbering is on, and you move the point farther than | |
| 44 LINE_NUMBER_FAR from the beginning of buffer. In this sense, the | |
| 45 cache is lazy -- if you don't use it, you don't pay for it. | |
| 46 | |
| 47 NOTE: line-number cache should not be confused with line-start | |
| 48 cache. Line-start cache (a part of redisplay) works with the | |
| 49 display lines, whereas this works with the buffer lines (literally | |
| 50 counting the newlines). */ | |
| 51 | |
| 52 #include <config.h> | |
| 53 #include "lisp.h" | |
| 54 #include "buffer.h" | |
| 55 | |
| 56 #include "line-number.h" | |
| 57 | |
| 58 /* #### The following three values could stand more exploration for | |
| 59 best performance. */ | |
| 60 | |
| 61 /* Size of the ring. The current code expects this to be a small | |
| 62 number. If you make it larger, you should probably optimize the | |
| 63 code below to keep it sorted. */ | |
| 64 #define LINE_NUMBER_RING_SIZE 8 | |
| 65 | |
| 66 /* How much traversal has to be exceeded for two points to be | |
| 67 considered "far" from each other. When two points are far, cache | |
| 68 will be used. */ | |
| 69 #define LINE_NUMBER_FAR 16384 | |
| 70 | |
| 71 /* How large a string has to be to give up searching it for newlines, | |
| 72 before change. */ | |
| 73 #define LINE_NUMBER_LARGE_STRING 256 | |
| 74 | |
| 75 /* To be used only when you *know* the cache has been allocated! */ | |
| 76 #define LINE_NUMBER_RING(b) (XCAR ((b)->text->line_number_cache)) | |
| 77 #define LINE_NUMBER_BEGV(b) (XCDR ((b)->text->line_number_cache)) | |
| 78 | |
| 79 | |
| 80 /* Initialize the cache. Cache is (in pseudo-BNF): | |
| 81 | |
| 82 CACHE = nil | INITIALIZED-CACHE | |
| 83 INITIALIZED-CACHE = cons (RING, BEGV-LINE) | |
| 84 RING = vector (*RING-ELEMENT) | |
| 85 RING-ELEMENT = nil | RING-PAIR | |
| 86 RING-PAIR = cons (marker, integer) | |
| 87 BEGV-LINE = integer | |
| 88 | |
| 89 Line number cache should never, ever, be visible to Lisp (because | |
| 90 destructively modifying its elements can cause crashes.) Debug it | |
| 91 using debug_print (current_buffer->text->last_number_cache). */ | |
| 92 static void | |
| 93 allocate_line_number_cache (struct buffer *b) | |
| 94 { | |
| 95 b->text->line_number_cache = Fcons (make_vector (LINE_NUMBER_RING_SIZE, Qnil), | |
| 96 Qzero); | |
| 97 narrow_line_number_cache (b); | |
| 98 } | |
| 99 | |
| 100 /* Flag LINE_NUMBER_BEGV (b) as dirty. Do it only if the line number | |
| 442 | 101 cache is already initialized. */ |
| 428 | 102 void |
| 103 narrow_line_number_cache (struct buffer *b) | |
| 104 { | |
| 105 if (NILP (b->text->line_number_cache)) | |
| 106 return; | |
| 107 | |
| 108 if (BUF_BEG (b) == BUF_BEGV (b)) | |
| 109 /* The is the case Fwiden and save_restriction_restore. Since we | |
| 110 know the correct value, we can update it now. */ | |
| 111 LINE_NUMBER_BEGV (b) = Qzero; | |
| 112 else | |
| 113 /* Calculating the line number of BUF_BEGV here is a bad idea, | |
| 114 because there is absolutely no reason to do it before the next | |
| 115 redisplay. We simply mark it as dirty instead. */ | |
| 116 LINE_NUMBER_BEGV (b) = make_int (-1); | |
| 117 } | |
| 118 | |
| 119 /* Invalidate the line number cache positions that lie after POS. */ | |
| 120 static void | |
| 665 | 121 invalidate_line_number_cache (struct buffer *b, Charbpos pos) |
| 428 | 122 { |
| 123 EMACS_INT i, j; | |
| 124 Lisp_Object *ring = XVECTOR_DATA (LINE_NUMBER_RING (b)); | |
| 125 | |
| 126 for (i = 0; i < LINE_NUMBER_RING_SIZE; i++) | |
| 127 { | |
| 128 if (!CONSP (ring[i])) | |
| 129 break; | |
| 130 /* As the marker stays behind the insertions, this check might | |
| 131 as well be `>'. However, Finsert_before_markers can advance | |
| 132 the marker anyway, which bites in shell buffers. | |
| 133 | |
| 134 #### This forces recreation of the cached marker (and | |
| 135 recalculation of newlines) every time a newline is inserted | |
| 136 at point, which is way losing. Isn't there a way to make a | |
| 137 marker impervious to Finsert_before_markers()?? Maybe I | |
| 138 should convert the code to use extents. */ | |
| 139 if (marker_position (XCAR (ring[i])) >= pos) | |
| 140 { | |
| 141 /* Get the marker out of the way. */ | |
| 142 Fset_marker (XCAR (ring[i]), Qnil, Qnil); | |
| 143 /* ...and shift the ring elements, up to the first nil. */ | |
| 144 for (j = i; !NILP (ring[j]) && j < LINE_NUMBER_RING_SIZE - 1; j++) | |
| 145 ring[j] = ring[j + 1]; | |
| 146 ring[j] = Qnil; | |
| 147 /* Must recheck position i. */ | |
| 148 i--; | |
| 149 } | |
| 150 } | |
| 151 } | |
| 152 | |
| 153 /* Invalidate the cache positions after POS, if the string to be | |
| 154 inserted contains a newline. If the string is too large (larger | |
| 155 than LINE_NUMBER_LARGE_STRING), invalidate the cache positions | |
| 156 after POS without prior search. | |
| 157 | |
| 158 This will do nothing if the cache is uninitialized. */ | |
| 159 void | |
| 665 | 160 insert_invalidate_line_number_cache (struct buffer *b, Charbpos pos, |
| 867 | 161 const Ibyte *nonreloc, Bytecount length) |
| 428 | 162 { |
| 163 if (NILP (b->text->line_number_cache)) | |
| 164 return; | |
| 165 | |
| 166 if (length > LINE_NUMBER_LARGE_STRING | |
| 167 || | |
| 168 /* We could also count how many newlines there are in the string | |
| 169 and update the cache accordingly, but it would be too much | |
| 170 work for too little gain. */ | |
| 647 | 171 memchr ((void *)nonreloc, '\n', length)) |
| 428 | 172 invalidate_line_number_cache (b, pos); |
| 173 } | |
| 174 | |
| 175 /* Invalidate the cache positions after FROM, if the region to be | |
| 176 deleted contains a newline. If the region-to-be-deleted is larger | |
| 177 than LINE_NUMBER_LARGE_STRING, invalidate the cache positions after | |
| 178 FROM without unconditionally. | |
| 179 | |
| 180 This will do nothing if the cache is uninitialized. */ | |
| 181 void | |
| 665 | 182 delete_invalidate_line_number_cache (struct buffer *b, Charbpos from, Charbpos to) |
| 428 | 183 { |
| 184 if (NILP (b->text->line_number_cache)) | |
| 185 return; | |
| 186 | |
| 187 if ((to - from) > LINE_NUMBER_LARGE_STRING) | |
| 188 invalidate_line_number_cache (b, from); | |
| 189 else | |
| 190 { | |
| 191 EMACS_INT shortage; | |
| 192 scan_buffer (b, '\n', from, to, 1, &shortage, 0); | |
| 193 if (!shortage) | |
| 194 invalidate_line_number_cache (b, from); | |
| 195 } | |
| 196 } | |
| 197 | |
| 198 /* Get the nearest known position we know the line number of | |
| 199 (i.e. BUF_BEGV, and cached positions). The return position will be | |
| 200 either closer than BEG, or BEG. The line of this known position | |
| 201 will be stored in LINE. | |
| 202 | |
| 203 *LINE should be initialized to the line number of BEG (normally, | |
| 204 BEG will be BUF_BEGV, and *LINE will be XINT (LINE_NUMBER_BEGV). | |
| 205 This will initialize the cache, if necessary. */ | |
| 206 static void | |
| 665 | 207 get_nearest_line_number (struct buffer *b, Charbpos *beg, Charbpos pos, |
| 428 | 208 EMACS_INT *line) |
| 209 { | |
| 210 EMACS_INT i; | |
| 211 Lisp_Object *ring = XVECTOR_DATA (LINE_NUMBER_RING (b)); | |
| 212 Charcount length = pos - *beg; | |
| 213 | |
| 214 if (length < 0) | |
| 215 length = -length; | |
| 216 | |
| 217 /* Find the ring entry closest to POS, if it is closer than BEG. */ | |
| 218 for (i = 0; i < LINE_NUMBER_RING_SIZE && CONSP (ring[i]); i++) | |
| 219 { | |
| 665 | 220 Charbpos newpos = marker_position (XCAR (ring[i])); |
| 428 | 221 Charcount howfar = newpos - pos; |
| 222 if (howfar < 0) | |
| 223 howfar = -howfar; | |
| 224 if (howfar < length) | |
| 225 { | |
| 226 length = howfar; | |
| 227 *beg = newpos; | |
| 228 *line = XINT (XCDR (ring[i])); | |
| 229 } | |
| 230 } | |
| 231 } | |
| 232 | |
| 233 /* Add a (POS . LINE) pair to the ring, and rotate it. */ | |
| 234 static void | |
| 665 | 235 add_position_to_cache (struct buffer *b, Charbpos pos, EMACS_INT line) |
| 428 | 236 { |
| 237 Lisp_Object *ring = XVECTOR_DATA (LINE_NUMBER_RING (b)); | |
| 238 int i = LINE_NUMBER_RING_SIZE - 1; | |
| 239 | |
| 240 /* Set the last marker in the ring to point nowhere. */ | |
| 241 if (CONSP (ring[i])) | |
| 242 Fset_marker (XCAR (ring[i]), Qnil, Qnil); | |
| 243 | |
| 244 /* Rotate the ring... */ | |
| 245 for (; i > 0; i--) | |
| 246 ring[i] = ring[i - 1]; | |
| 247 | |
| 248 /* ...and update it. */ | |
| 249 ring[0] = Fcons (Fset_marker (Fmake_marker (), make_int (pos), | |
| 771 | 250 wrap_buffer (b)), |
| 428 | 251 make_int (line)); |
| 252 } | |
| 253 | |
| 254 /* Calculate the line number in buffer B at position POS. If CACHEP | |
| 255 is non-zero, initialize and facilitate the line-number cache. The | |
| 256 line number of the first line is 0. If narrowing is in effect, | |
| 257 count the lines are counted from the beginning of the visible | |
| 258 portion of the buffer. | |
| 259 | |
| 260 The cache works as follows: To calculate the line number, we need | |
| 261 two positions: position of point (POS) and the position from which | |
| 262 to count newlines (BEG). We start by setting BEG to BUF_BEGV. If | |
| 263 this would require too much searching (i.e. pos - BUF_BEGV > | |
| 264 LINE_NUMBER_FAR), try to find a closer position in the ring. If it | |
| 265 is found, use that position for BEG, and increment the line number | |
| 266 appropriately. | |
| 267 | |
| 268 If the calculation (with or without the cache lookup) required more | |
| 269 than LINE_NUMBER_FAR characters of traversal, update the cache. */ | |
| 270 EMACS_INT | |
| 665 | 271 buffer_line_number (struct buffer *b, Charbpos pos, int cachep) |
| 428 | 272 { |
| 665 | 273 Charbpos beg = BUF_BEGV (b); |
| 428 | 274 EMACS_INT cached_lines = 0; |
| 275 EMACS_INT shortage, line; | |
| 276 | |
| 277 if ((pos > beg ? pos - beg : beg - pos) <= LINE_NUMBER_FAR) | |
| 278 cachep = 0; | |
| 279 | |
| 280 if (cachep) | |
| 281 { | |
| 282 if (NILP (b->text->line_number_cache)) | |
| 283 allocate_line_number_cache (b); | |
| 284 /* If we don't know the line number of BUF_BEGV, calculate it now. */ | |
| 285 if (XINT (LINE_NUMBER_BEGV (b)) == -1) | |
| 286 { | |
| 287 LINE_NUMBER_BEGV (b) = Qzero; | |
| 288 /* #### This has a side-effect of changing the cache. */ | |
| 289 LINE_NUMBER_BEGV (b) = | |
| 290 make_int (buffer_line_number (b, BUF_BEGV (b), 1)); | |
| 291 } | |
| 292 cached_lines = XINT (LINE_NUMBER_BEGV (b)); | |
| 293 get_nearest_line_number (b, &beg, pos, &cached_lines); | |
| 294 } | |
| 295 | |
| 296 scan_buffer (b, '\n', beg, pos, pos > beg ? EMACS_INT_MAX : -EMACS_INT_MAX, | |
| 297 &shortage, 0); | |
| 298 | |
| 299 line = EMACS_INT_MAX - shortage; | |
| 300 if (beg > pos) | |
| 301 line = -line; | |
| 302 line += cached_lines; | |
| 303 | |
| 304 if (cachep) | |
| 305 { | |
| 306 /* If too far, update the cache. */ | |
| 307 if ((pos > beg ? pos - beg : beg - pos) > LINE_NUMBER_FAR) | |
| 308 add_position_to_cache (b, pos, line); | |
| 309 /* Account for narrowing. If cache is not used, this is | |
| 310 unnecessary, because we counted from BUF_BEGV anyway. */ | |
| 311 line -= XINT (LINE_NUMBER_BEGV (b)); | |
| 312 } | |
| 313 | |
| 314 return line; | |
| 315 } |