Mercurial > emacs
annotate lisp/emacs-lisp/syntax.el @ 90601:a1a25ac6c88a
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 427-436)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 134-136)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-110
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 14 Sep 2006 09:24:00 +0000 |
parents | 146cd8369025 |
children | 6588c6259dfb |
rev | line source |
---|---|
45078 | 1 ;;; syntax.el --- helper functions to find syntactic context |
39756 | 2 |
64751
5b1a238fcbb4
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64085
diff
changeset
|
3 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004, |
68648
067115a6e738
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
66579
diff
changeset
|
4 ;; 2005, 2006 Free Software Foundation, Inc. |
39756 | 5 |
45078 | 6 ;; Maintainer: FSF |
7 ;; Keywords: internal | |
8 | |
39756 | 9 ;; This file is part of GNU Emacs. |
10 | |
11 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
12 ;; it under the terms of the GNU General Public License as published by | |
13 ;; the Free Software Foundation; either version 2, or (at your option) | |
14 ;; any later version. | |
15 | |
16 ;; GNU Emacs is distributed in the hope that it will be useful, | |
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 ;; GNU General Public License for more details. | |
20 | |
21 ;; You should have received a copy of the GNU General Public License | |
22 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
64085 | 23 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
24 ;; Boston, MA 02110-1301, USA. | |
39756 | 25 |
26 ;;; Commentary: | |
27 | |
28 ;; The main exported function is `syntax-ppss'. You might also need | |
51941
9bf93e387b5e
(syntax-ppss-flush-cache): Rename from syntax-ppss-after-change-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49598
diff
changeset
|
29 ;; to call `syntax-ppss-flush-cache' or to add it to |
70505
53adfd470fe4
(syntax-ppss): Flush the cache before rather than after a buffer modification.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68648
diff
changeset
|
30 ;; before-change-functions'(although this is automatically done by |
39756 | 31 ;; syntax-ppss when needed, but that might fail if syntax-ppss is |
70505
53adfd470fe4
(syntax-ppss): Flush the cache before rather than after a buffer modification.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68648
diff
changeset
|
32 ;; called in a context where before-change-functions is temporarily |
39756 | 33 ;; let-bound to nil). |
34 | |
35 ;;; Todo: | |
36 | |
37 ;; - do something about the case where the syntax-table is changed. | |
38 ;; This typically happens with tex-mode and its `$' operator. | |
39 ;; - move font-lock-syntactic-keywords in here. Then again, maybe not. | |
40 ;; - new functions `syntax-state', ... to replace uses of parse-partial-state | |
41 ;; with something higher-level (similar to syntax-ppss-context). | |
42 ;; - interaction with mmm-mode. | |
43 | |
44 ;;; Code: | |
45 | |
46 ;; Note: PPSS stands for `parse-partial-sexp state' | |
47 | |
48 (eval-when-compile (require 'cl)) | |
49 | |
65194
364fe66bab84
(font-lock-beginning-of-syntax-function): Add defvar.
Juanma Barranquero <lekktu@gmail.com>
parents:
64751
diff
changeset
|
50 (defvar font-lock-beginning-of-syntax-function) |
364fe66bab84
(font-lock-beginning-of-syntax-function): Add defvar.
Juanma Barranquero <lekktu@gmail.com>
parents:
64751
diff
changeset
|
51 |
39756 | 52 (defsubst syntax-ppss-depth (ppss) |
53 (nth 0 ppss)) | |
54 | |
55 (defsubst syntax-ppss-context (ppss) | |
56 (cond | |
57 ((nth 3 ppss) 'string) | |
58 ((nth 4 ppss) 'comment) | |
59 (t nil))) | |
60 | |
61 (defvar syntax-ppss-max-span 20000 | |
62 "Threshold below which cache info is deemed unnecessary. | |
63 We try to make sure that cache entries are at least this far apart | |
64 from each other, to avoid keeping too much useless info.") | |
65 | |
66 (defvar syntax-begin-function nil | |
67 "Function to move back outside of any comment/string/paren. | |
68 This function should move the cursor back to some syntactically safe | |
69 point (where the PPSS is equivalent to nil).") | |
70 | |
71 (defvar syntax-ppss-cache nil | |
72 "List of (POS . PPSS) pairs, in decreasing POS order.") | |
73 (make-variable-buffer-local 'syntax-ppss-cache) | |
74 (defvar syntax-ppss-last nil | |
75 "Cache of (LAST-POS . LAST-PPSS).") | |
76 (make-variable-buffer-local 'syntax-ppss-last) | |
77 | |
51941
9bf93e387b5e
(syntax-ppss-flush-cache): Rename from syntax-ppss-after-change-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49598
diff
changeset
|
78 (defalias 'syntax-ppss-after-change-function 'syntax-ppss-flush-cache) |
9bf93e387b5e
(syntax-ppss-flush-cache): Rename from syntax-ppss-after-change-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49598
diff
changeset
|
79 (defun syntax-ppss-flush-cache (beg &rest ignored) |
9bf93e387b5e
(syntax-ppss-flush-cache): Rename from syntax-ppss-after-change-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49598
diff
changeset
|
80 "Flush the cache of `syntax-ppss' starting at position BEG." |
39756 | 81 ;; Flush invalid cache entries. |
82 (while (and syntax-ppss-cache (> (caar syntax-ppss-cache) beg)) | |
83 (setq syntax-ppss-cache (cdr syntax-ppss-cache))) | |
84 ;; Throw away `last' value if made invalid. | |
85 (when (< beg (or (car syntax-ppss-last) 0)) | |
66266
f15e775dfb97
(syntax-ppss-flush-cache): Fix corner boundary case.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65194
diff
changeset
|
86 ;; If syntax-begin-function jumped to BEG, then the old state at BEG can |
f15e775dfb97
(syntax-ppss-flush-cache): Fix corner boundary case.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65194
diff
changeset
|
87 ;; depend on the text after BEG (which is presumably changed). So if |
f15e775dfb97
(syntax-ppss-flush-cache): Fix corner boundary case.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65194
diff
changeset
|
88 ;; BEG=(car (nth 10 syntax-ppss-last)) don't reuse that data because the |
f15e775dfb97
(syntax-ppss-flush-cache): Fix corner boundary case.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65194
diff
changeset
|
89 ;; assumed nil state at BEG may not be valid any more. |
f15e775dfb97
(syntax-ppss-flush-cache): Fix corner boundary case.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65194
diff
changeset
|
90 (if (<= beg (or (car (nth 10 syntax-ppss-last)) |
f15e775dfb97
(syntax-ppss-flush-cache): Fix corner boundary case.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65194
diff
changeset
|
91 (nth 9 syntax-ppss-last) |
66267
2b7c12a97893
(syntax-ppss-flush-cache): Fix typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66266
diff
changeset
|
92 (nth 3 syntax-ppss-last) |
66266
f15e775dfb97
(syntax-ppss-flush-cache): Fix corner boundary case.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65194
diff
changeset
|
93 0)) |
39756 | 94 (setq syntax-ppss-last nil) |
95 (setcar syntax-ppss-last nil))) | |
96 ;; Unregister if there's no cache left. Sadly this doesn't work | |
70505
53adfd470fe4
(syntax-ppss): Flush the cache before rather than after a buffer modification.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68648
diff
changeset
|
97 ;; because `before-change-functions' is temporarily bound to nil here. |
39756 | 98 ;; (unless syntax-ppss-cache |
70505
53adfd470fe4
(syntax-ppss): Flush the cache before rather than after a buffer modification.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68648
diff
changeset
|
99 ;; (remove-hook 'before-change-functions 'syntax-ppss-flush-cache t)) |
39756 | 100 ) |
101 | |
102 (defvar syntax-ppss-stats | |
103 [(0 . 0.0) (0 . 0.0) (0 . 0.0) (0 . 0.0) (0 . 0.0) (1 . 2500.0)]) | |
104 (defun syntax-ppss-stats () | |
40396
894b9bc4ca7a
(syntax-ppss-stats): Be more robust when dividing by 0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39889
diff
changeset
|
105 (mapcar (lambda (x) |
894b9bc4ca7a
(syntax-ppss-stats): Be more robust when dividing by 0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39889
diff
changeset
|
106 (condition-case nil |
894b9bc4ca7a
(syntax-ppss-stats): Be more robust when dividing by 0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39889
diff
changeset
|
107 (cons (car x) (truncate (/ (cdr x) (car x)))) |
894b9bc4ca7a
(syntax-ppss-stats): Be more robust when dividing by 0.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39889
diff
changeset
|
108 (error nil))) |
39756 | 109 syntax-ppss-stats)) |
110 | |
111 (defun syntax-ppss (&optional pos) | |
112 "Parse-Partial-Sexp State at POS. | |
113 The returned value is the same as `parse-partial-sexp' except that | |
114 the 2nd and 6th values of the returned state cannot be relied upon. | |
115 Point is at POS when this function returns." | |
116 ;; Default values. | |
117 (unless pos (setq pos (point))) | |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47356
diff
changeset
|
118 ;; |
39756 | 119 (let ((old-ppss (cdr syntax-ppss-last)) |
120 (old-pos (car syntax-ppss-last)) | |
121 (ppss nil) | |
122 (pt-min (point-min))) | |
123 (if (and old-pos (> old-pos pos)) (setq old-pos nil)) | |
124 ;; Use the OLD-POS if usable and close. Don't update the `last' cache. | |
51942
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
125 (condition-case nil |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
126 (if (and old-pos (< (- pos old-pos) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
127 ;; The time to use syntax-begin-function and |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
128 ;; find PPSS is assumed to be about 2 * distance. |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
129 (* 2 (/ (cdr (aref syntax-ppss-stats 5)) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
130 (1+ (car (aref syntax-ppss-stats 5))))))) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
131 (progn |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
132 (incf (car (aref syntax-ppss-stats 0))) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
133 (incf (cdr (aref syntax-ppss-stats 0)) (- pos old-pos)) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
134 (parse-partial-sexp old-pos pos nil nil old-ppss)) |
39756 | 135 |
136 (cond | |
51942
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
137 ;; Use OLD-PPSS if possible and close enough. |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
138 ((and (not old-pos) old-ppss |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
139 ;; BEWARE! We rely on the undocumented 9th field. The 9th |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
140 ;; field currently contains the list of positions of |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
141 ;; open-parens of the enclosing parens. I.e. those |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
142 ;; positions are outside of any string/comment |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
143 ;; and the first of those is outside of any paren |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
144 ;; (i.e. corresponds to a nil ppss). If this list is empty |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
145 ;; but we are in a string or comment, then the 8th field |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
146 ;; contains a similar "toplevel" position. If `pt-min' is |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
147 ;; too far from `pos', we could try to use other positions |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
148 ;; in (nth 9 old-ppss), but that doesn't seem to happen in |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
149 ;; practice and it would complicate this code (and the |
70505
53adfd470fe4
(syntax-ppss): Flush the cache before rather than after a buffer modification.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68648
diff
changeset
|
150 ;; before-change-function code even more). But maybe it |
51942
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
151 ;; would be useful in "degenerate" cases such as when the |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
152 ;; whole file is wrapped in a set of parenthesis. |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
153 (setq pt-min (or (car (nth 9 old-ppss)) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
154 (nth 8 old-ppss) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
155 (nth 2 old-ppss))) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
156 (<= pt-min pos) (< (- pos pt-min) syntax-ppss-max-span)) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
157 (incf (car (aref syntax-ppss-stats 1))) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
158 (incf (cdr (aref syntax-ppss-stats 1)) (- pos pt-min)) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
159 (setq ppss (parse-partial-sexp pt-min pos))) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
160 ;; The OLD-* data can't be used. Consult the cache. |
39756 | 161 (t |
51942
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
162 (let ((cache-pred nil) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
163 (cache syntax-ppss-cache) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
164 (pt-min (point-min)) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
165 ;; I differentiate between PT-MIN and PT-BEST because |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
166 ;; I feel like it might be important to ensure that the |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
167 ;; cache is only filled with 100% sure data (whereas |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
168 ;; syntax-begin-function might return incorrect data). |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
169 ;; Maybe that's just stupid. |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
170 (pt-best (point-min)) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
171 (ppss-best nil)) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
172 ;; look for a usable cache entry. |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
173 (while (and cache (< pos (caar cache))) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
174 (setq cache-pred cache) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
175 (setq cache (cdr cache))) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
176 (if cache (setq pt-min (caar cache) ppss (cdar cache))) |
39756 | 177 |
70505
53adfd470fe4
(syntax-ppss): Flush the cache before rather than after a buffer modification.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68648
diff
changeset
|
178 ;; Setup the before-change function if necessary. |
51942
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
179 (unless (or syntax-ppss-cache syntax-ppss-last) |
70505
53adfd470fe4
(syntax-ppss): Flush the cache before rather than after a buffer modification.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68648
diff
changeset
|
180 (add-hook 'before-change-functions |
53adfd470fe4
(syntax-ppss): Flush the cache before rather than after a buffer modification.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68648
diff
changeset
|
181 'syntax-ppss-flush-cache t t)) |
39756 | 182 |
51942
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
183 ;; Use the best of OLD-POS and CACHE. |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
184 (if (or (not old-pos) (< old-pos pt-min)) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
185 (setq pt-best pt-min ppss-best ppss) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
186 (incf (car (aref syntax-ppss-stats 4))) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
187 (incf (cdr (aref syntax-ppss-stats 4)) (- pos old-pos)) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
188 (setq pt-best old-pos ppss-best old-ppss)) |
39756 | 189 |
51942
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
190 ;; Use the `syntax-begin-function' if available. |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
191 ;; We could try using that function earlier, but: |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
192 ;; - The result might not be 100% reliable, so it's better to use |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
193 ;; the cache if available. |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
194 ;; - The function might be slow. |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
195 ;; - If this function almost always finds a safe nearby spot, |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
196 ;; the cache won't be populated, so consulting it is cheap. |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
197 (when (and (not syntax-begin-function) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
198 (boundp 'font-lock-beginning-of-syntax-function) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
199 font-lock-beginning-of-syntax-function) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
200 (set (make-local-variable 'syntax-begin-function) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
201 font-lock-beginning-of-syntax-function)) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
202 (when (and syntax-begin-function |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
203 (progn (goto-char pos) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
204 (funcall syntax-begin-function) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
205 ;; Make sure it's better. |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
206 (> (point) pt-best)) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
207 ;; Simple sanity check. |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
208 (not (memq (get-text-property (point) 'face) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
209 '(font-lock-string-face font-lock-doc-face |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
210 font-lock-comment-face)))) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
211 (incf (car (aref syntax-ppss-stats 5))) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
212 (incf (cdr (aref syntax-ppss-stats 5)) (- pos (point))) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
213 (setq pt-best (point) ppss-best nil)) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
214 |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
215 (cond |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
216 ;; Quick case when we found a nearby pos. |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
217 ((< (- pos pt-best) syntax-ppss-max-span) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
218 (incf (car (aref syntax-ppss-stats 2))) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
219 (incf (cdr (aref syntax-ppss-stats 2)) (- pos pt-best)) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
220 (setq ppss (parse-partial-sexp pt-best pos nil nil ppss-best))) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
221 ;; Slow case: compute the state from some known position and |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
222 ;; populate the cache so we won't need to do it again soon. |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
223 (t |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
224 (incf (car (aref syntax-ppss-stats 3))) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
225 (incf (cdr (aref syntax-ppss-stats 3)) (- pos pt-min)) |
39756 | 226 |
51942
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
227 ;; If `pt-min' is too far, add a few intermediate entries. |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
228 (while (> (- pos pt-min) (* 2 syntax-ppss-max-span)) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
229 (setq ppss (parse-partial-sexp |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
230 pt-min (setq pt-min (/ (+ pt-min pos) 2)) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
231 nil nil ppss)) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
232 (let ((pair (cons pt-min ppss))) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
233 (if cache-pred |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
234 (push pair (cdr cache-pred)) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
235 (push pair syntax-ppss-cache)))) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
236 |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
237 ;; Compute the actual return value. |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
238 (setq ppss (parse-partial-sexp pt-min pos nil nil ppss)) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47356
diff
changeset
|
239 |
51942
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
240 ;; Debugging check. |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
241 ;; (let ((real-ppss (parse-partial-sexp (point-min) pos))) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
242 ;; (setcar (last ppss 4) 0) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
243 ;; (setcar (last real-ppss 4) 0) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
244 ;; (setcar (last ppss 8) nil) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
245 ;; (setcar (last real-ppss 8) nil) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
246 ;; (unless (equal ppss real-ppss) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
247 ;; (message "!!Syntax: %s != %s" ppss real-ppss) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
248 ;; (setq ppss real-ppss))) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
249 |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
250 ;; Store it in the cache. |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
251 (let ((pair (cons pos ppss))) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
252 (if cache-pred |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
253 (if (> (- (caar cache-pred) pos) syntax-ppss-max-span) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
254 (push pair (cdr cache-pred)) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
255 (setcar cache-pred pair)) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
256 (if (or (null syntax-ppss-cache) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
257 (> (- (caar syntax-ppss-cache) pos) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
258 syntax-ppss-max-span)) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
259 (push pair syntax-ppss-cache) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
260 (setcar syntax-ppss-cache pair))))))))) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
261 |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
262 (setq syntax-ppss-last (cons pos ppss)) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
263 ppss) |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
264 (args-out-of-range |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
265 ;; If the buffer is more narrowed than when we built the cache, |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
266 ;; we may end up calling parse-partial-sexp with a position before |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
267 ;; point-min. In that case, just parse from point-min assuming |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
268 ;; a nil state. |
5fdfe35f3ac4
(syntax-ppss): Catch the case where the buffer is narrowed.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51941
diff
changeset
|
269 (parse-partial-sexp (point-min) pos))))) |
39756 | 270 |
271 ;; Debugging functions | |
272 | |
273 (defun syntax-ppss-debug () | |
274 (let ((pt nil) | |
275 (min-diffs nil)) | |
276 (dolist (x (append syntax-ppss-cache (list (cons (point-min) nil)))) | |
277 (when pt (push (- pt (car x)) min-diffs)) | |
278 (setq pt (car x))) | |
279 min-diffs)) | |
280 | |
281 ;; XEmacs compatibility functions | |
282 | |
283 ;; (defun buffer-syntactic-context (&optional buffer) | |
284 ;; "Syntactic context at point in BUFFER. | |
285 ;; Either of `string', `comment' or `nil'. | |
286 ;; This is an XEmacs compatibility function." | |
287 ;; (with-current-buffer (or buffer (current-buffer)) | |
288 ;; (syntax-ppss-context (syntax-ppss)))) | |
289 | |
290 ;; (defun buffer-syntactic-context-depth (&optional buffer) | |
291 ;; "Syntactic parenthesis depth at point in BUFFER. | |
292 ;; This is an XEmacs compatibility function." | |
293 ;; (with-current-buffer (or buffer (current-buffer)) | |
294 ;; (syntax-ppss-depth (syntax-ppss)))) | |
295 | |
296 (provide 'syntax) | |
52401 | 297 |
66266
f15e775dfb97
(syntax-ppss-flush-cache): Fix corner boundary case.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
65194
diff
changeset
|
298 ;; arch-tag: 302f1eeb-e77c-4680-a8c5-c543e01161a5 |
39756 | 299 ;;; syntax.el ends here |