Mercurial > emacs
annotate lisp/progmodes/cc-engine.el @ 27926:ed606bdaf5b4
(machine): Add `mipsel-*-netbsd*' and
`arm-*-netbsd*'.
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Wed, 01 Mar 2000 12:54:21 +0000 |
parents | 03befb219d03 |
children | 68e734ab7d5d |
rev | line source |
---|---|
18720 | 1 ;;; cc-engine.el --- core syntax guessing engine for CC mode |
2 | |
26817 | 3 ;; Copyright (C) 1985,1987,1992-1999 Free Software Foundation, Inc. |
18720 | 4 |
26817 | 5 ;; Authors: 1998-1999 Barry A. Warsaw and Martin Stjernholm |
24282 | 6 ;; 1992-1997 Barry A. Warsaw |
18720 | 7 ;; 1987 Dave Detlefs and Stewart Clamen |
8 ;; 1985 Richard M. Stallman | |
24282 | 9 ;; Maintainer: bug-cc-mode@gnu.org |
18720 | 10 ;; Created: 22-Apr-1997 (split from cc-mode.el) |
20142 | 11 ;; Version: See cc-mode.el |
18720 | 12 ;; Keywords: c languages oop |
13 | |
14 ;; This file is part of GNU Emacs. | |
15 | |
16 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
17 ;; it under the terms of the GNU General Public License as published by | |
18 ;; the Free Software Foundation; either version 2, or (at your option) | |
19 ;; any later version. | |
20 | |
21 ;; GNU Emacs is distributed in the hope that it will be useful, | |
22 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
23 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
24 ;; GNU General Public License for more details. | |
25 | |
26 ;; You should have received a copy of the GNU General Public License | |
27 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
28 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
29 ;; Boston, MA 02111-1307, USA. | |
30 | |
26817 | 31 (eval-when-compile |
32 (let ((load-path | |
33 (if (and (boundp 'byte-compile-current-file) | |
34 (stringp byte-compile-current-file)) | |
35 (cons (file-name-directory byte-compile-current-file) | |
36 load-path) | |
37 load-path))) | |
38 (load "cc-defs" nil t))) | |
39 (require 'cc-langs) | |
40 | |
18720 | 41 |
18844
6b269c4ad2eb
(c-maybe-labelp): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
18720
diff
changeset
|
42 ;; KLUDGE ALERT: c-maybe-labelp is used to pass information between |
6b269c4ad2eb
(c-maybe-labelp): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
18720
diff
changeset
|
43 ;; c-crosses-statement-barrier-p and c-beginning-of-statement-1. A |
6b269c4ad2eb
(c-maybe-labelp): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
18720
diff
changeset
|
44 ;; better way should be implemented, but this will at least shut up |
6b269c4ad2eb
(c-maybe-labelp): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
18720
diff
changeset
|
45 ;; the byte compiler. |
6b269c4ad2eb
(c-maybe-labelp): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
18720
diff
changeset
|
46 (defvar c-maybe-labelp nil) |
6b269c4ad2eb
(c-maybe-labelp): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
18720
diff
changeset
|
47 |
6b269c4ad2eb
(c-maybe-labelp): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
18720
diff
changeset
|
48 ;; WARNING WARNING WARNING |
6b269c4ad2eb
(c-maybe-labelp): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
18720
diff
changeset
|
49 ;; |
6b269c4ad2eb
(c-maybe-labelp): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
18720
diff
changeset
|
50 ;; Be *exceptionally* careful about modifications to this function! |
6b269c4ad2eb
(c-maybe-labelp): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
18720
diff
changeset
|
51 ;; Much of CC Mode depends on this Doing The Right Thing. If you |
6b269c4ad2eb
(c-maybe-labelp): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
18720
diff
changeset
|
52 ;; break it you will be sorry. If you think you know how this works, |
6b269c4ad2eb
(c-maybe-labelp): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
18720
diff
changeset
|
53 ;; you probably don't. No human on Earth does! :-) |
6b269c4ad2eb
(c-maybe-labelp): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
18720
diff
changeset
|
54 ;; |
6b269c4ad2eb
(c-maybe-labelp): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
18720
diff
changeset
|
55 ;; WARNING WARNING WARNING |
18720 | 56 |
57 (defun c-beginning-of-statement-1 (&optional lim) | |
58 ;; move to the start of the current statement, or the previous | |
59 ;; statement if already at the beginning of one. | |
60 (let ((firstp t) | |
61 (substmt-p t) | |
18844
6b269c4ad2eb
(c-maybe-labelp): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
18720
diff
changeset
|
62 donep c-in-literal-cache saved |
18720 | 63 (last-begin (point))) |
64 ;; first check for bare semicolon | |
65 (if (and (progn (c-backward-syntactic-ws lim) | |
66 (eq (char-before) ?\;)) | |
67 (c-safe (progn (forward-char -1) | |
68 (setq saved (point)) | |
69 t)) | |
70 (progn (c-backward-syntactic-ws lim) | |
19251
6a7d40ec4b29
(c-beginning-of-statement-1): When checking for bare semi, don't match
Richard M. Stallman <rms@gnu.org>
parents:
18844
diff
changeset
|
71 (memq (char-before) '(?\; ?{ ?:))) |
18720 | 72 ) |
73 (setq last-begin saved) | |
74 (goto-char last-begin) | |
75 (while (not donep) | |
76 ;; stop at beginning of buffer | |
77 (if (bobp) (setq donep t) | |
78 ;; go backwards one balanced expression, but be careful of | |
79 ;; unbalanced paren being reached | |
24282 | 80 (if (not (c-safe (progn (c-backward-sexp 1) t))) |
18720 | 81 (progn |
82 (if firstp | |
83 (backward-up-list 1) | |
84 (goto-char last-begin)) | |
85 ;; skip over any unary operators, or other special | |
86 ;; characters appearing at front of identifier | |
87 (save-excursion | |
88 (c-backward-syntactic-ws lim) | |
24282 | 89 (skip-chars-backward "-+!*&:.~@ \t\n") |
18720 | 90 (if (eq (char-before) ?\() |
91 (setq last-begin (point)))) | |
92 (goto-char last-begin) | |
93 (setq last-begin (point) | |
94 donep t))) | |
95 | |
18844
6b269c4ad2eb
(c-maybe-labelp): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
18720
diff
changeset
|
96 (setq c-maybe-labelp nil) |
18720 | 97 ;; see if we're in a literal. if not, then this bufpos may be |
98 ;; a candidate for stopping | |
99 (cond | |
100 ;; CASE 0: did we hit the error condition above? | |
101 (donep) | |
102 ;; CASE 1: are we in a literal? | |
103 ((eq (c-in-literal lim) 'pound) | |
104 (beginning-of-line)) | |
105 ;; CASE 2: some other kind of literal? | |
106 ((c-in-literal lim)) | |
107 ;; CASE 3: are we looking at a conditional keyword? | |
26817 | 108 ((or (and c-conditional-key (looking-at c-conditional-key)) |
18720 | 109 (and (eq (char-after) ?\() |
110 (save-excursion | |
24282 | 111 (c-forward-sexp 1) |
18720 | 112 (c-forward-syntactic-ws) |
113 (not (eq (char-after) ?\;))) | |
114 (let ((here (point)) | |
115 (foundp (progn | |
116 (c-backward-syntactic-ws lim) | |
117 (forward-word -1) | |
118 (and lim | |
119 (<= lim (point)) | |
120 (not (c-in-literal lim)) | |
20142 | 121 (not (eq (char-before) ?_)) |
26817 | 122 c-conditional-key |
18720 | 123 (looking-at c-conditional-key) |
124 )))) | |
125 ;; did we find a conditional? | |
126 (if (not foundp) | |
127 (goto-char here)) | |
128 foundp))) | |
129 ;; are we in the middle of an else-if clause? | |
130 (if (save-excursion | |
131 (and (not substmt-p) | |
24282 | 132 (c-safe (progn (c-forward-sexp -1) t)) |
18720 | 133 (looking-at "\\<else\\>[ \t\n]+\\<if\\>") |
134 (not (c-in-literal lim)))) | |
135 (progn | |
24282 | 136 (c-forward-sexp -1) |
18720 | 137 (c-backward-to-start-of-if lim))) |
138 ;; are we sitting at an else clause, that we are not a | |
139 ;; substatement of? | |
140 (if (and (not substmt-p) | |
141 (looking-at "\\<else\\>[^_]")) | |
142 (c-backward-to-start-of-if lim)) | |
24282 | 143 ;; a finally or a series of catches? |
144 (if (not substmt-p) | |
145 (while (looking-at "\\<\\(catch\\|finally\\)\\>[^_]") | |
146 (c-safe (c-backward-sexp 2)) | |
147 (if (eq (char-after) ?\() | |
148 (c-safe (c-backward-sexp))))) | |
18720 | 149 ;; are we sitting at the while of a do-while? |
150 (if (and (looking-at "\\<while\\>[^_]") | |
151 (c-backward-to-start-of-do lim)) | |
152 (setq substmt-p nil)) | |
153 (setq last-begin (point) | |
154 donep substmt-p)) | |
26817 | 155 ;; CASE 4: are we looking at a label? (But we handle |
156 ;; switch labels later.) | |
157 ((and (looking-at c-label-key) | |
158 (not (looking-at "default\\>")))) | |
18720 | 159 ;; CASE 5: is this the first time we're checking? |
160 (firstp (setq firstp nil | |
161 substmt-p (not (c-crosses-statement-barrier-p | |
162 (point) last-begin)) | |
163 last-begin (point))) | |
164 ;; CASE 6: have we crossed a statement barrier? | |
24282 | 165 ((save-excursion |
166 ;; Move over in-expression blocks before checking the | |
167 ;; barrier | |
168 (if (or (memq (char-after) '(?\( ?\[)) | |
169 (and (eq (char-after) ?{) | |
170 (c-looking-at-inexpr-block lim))) | |
171 (c-forward-sexp 1)) | |
172 (c-crosses-statement-barrier-p (point) last-begin)) | |
18720 | 173 (setq donep t)) |
174 ;; CASE 7: ignore labels | |
18844
6b269c4ad2eb
(c-maybe-labelp): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
18720
diff
changeset
|
175 ((and c-maybe-labelp |
18720 | 176 (or (and c-access-key (looking-at c-access-key)) |
177 ;; with switch labels, we have to go back further | |
178 ;; to try to pick up the case or default | |
179 ;; keyword. Potential bogosity alert: we assume | |
180 ;; `case' or `default' is first thing on line | |
181 (let ((here (point))) | |
182 (beginning-of-line) | |
26817 | 183 (c-forward-syntactic-ws here) |
18720 | 184 (if (looking-at c-switch-label-key) |
185 t | |
186 (goto-char here) | |
187 nil)) | |
188 (looking-at c-label-key)))) | |
189 ;; CASE 8: ObjC or Java method def | |
190 ((and c-method-key | |
191 (setq last-begin (c-in-method-def-p))) | |
192 (setq donep t)) | |
193 ;; CASE 9: nothing special | |
194 (t (setq last-begin (point))) | |
195 )))) | |
196 (goto-char last-begin) | |
24282 | 197 ;; We always want to skip over the non-whitespace modifier |
198 ;; characters that can start a statement. | |
199 (let ((lim (point))) | |
26817 | 200 (skip-chars-backward "-+!*&~@` \t\n" (c-point 'boi)) |
24282 | 201 (skip-chars-forward " \t\n" lim)))) |
18720 | 202 |
203 (defun c-end-of-statement-1 () | |
19377
989d0412ada3
(c-end-of-statement-1): Eliminate false hits on important characters
Richard M. Stallman <rms@gnu.org>
parents:
19301
diff
changeset
|
204 (condition-case nil |
989d0412ada3
(c-end-of-statement-1): Eliminate false hits on important characters
Richard M. Stallman <rms@gnu.org>
parents:
19301
diff
changeset
|
205 (let (beg end found) |
18720 | 206 (while (and (not (eobp)) |
19377
989d0412ada3
(c-end-of-statement-1): Eliminate false hits on important characters
Richard M. Stallman <rms@gnu.org>
parents:
19301
diff
changeset
|
207 (progn |
989d0412ada3
(c-end-of-statement-1): Eliminate false hits on important characters
Richard M. Stallman <rms@gnu.org>
parents:
19301
diff
changeset
|
208 (setq beg (point)) |
24282 | 209 (c-forward-sexp 1) |
19377
989d0412ada3
(c-end-of-statement-1): Eliminate false hits on important characters
Richard M. Stallman <rms@gnu.org>
parents:
19301
diff
changeset
|
210 (setq end (point)) |
989d0412ada3
(c-end-of-statement-1): Eliminate false hits on important characters
Richard M. Stallman <rms@gnu.org>
parents:
19301
diff
changeset
|
211 (goto-char beg) |
989d0412ada3
(c-end-of-statement-1): Eliminate false hits on important characters
Richard M. Stallman <rms@gnu.org>
parents:
19301
diff
changeset
|
212 (setq found nil) |
989d0412ada3
(c-end-of-statement-1): Eliminate false hits on important characters
Richard M. Stallman <rms@gnu.org>
parents:
19301
diff
changeset
|
213 (while (and (not found) |
989d0412ada3
(c-end-of-statement-1): Eliminate false hits on important characters
Richard M. Stallman <rms@gnu.org>
parents:
19301
diff
changeset
|
214 (re-search-forward "[;{}]" end t)) |
989d0412ada3
(c-end-of-statement-1): Eliminate false hits on important characters
Richard M. Stallman <rms@gnu.org>
parents:
19301
diff
changeset
|
215 (if (not (c-in-literal beg)) |
989d0412ada3
(c-end-of-statement-1): Eliminate false hits on important characters
Richard M. Stallman <rms@gnu.org>
parents:
19301
diff
changeset
|
216 (setq found t))) |
989d0412ada3
(c-end-of-statement-1): Eliminate false hits on important characters
Richard M. Stallman <rms@gnu.org>
parents:
19301
diff
changeset
|
217 (not found))) |
989d0412ada3
(c-end-of-statement-1): Eliminate false hits on important characters
Richard M. Stallman <rms@gnu.org>
parents:
19301
diff
changeset
|
218 (goto-char end)) |
989d0412ada3
(c-end-of-statement-1): Eliminate false hits on important characters
Richard M. Stallman <rms@gnu.org>
parents:
19301
diff
changeset
|
219 (re-search-backward "[;{}]") |
18720 | 220 (forward-char 1)) |
19806
dc7a5df6e4b9
(c-end-of-statement-1): Wrap backward-up-list in a c-safe call so no
Richard M. Stallman <rms@gnu.org>
parents:
19377
diff
changeset
|
221 (error |
18720 | 222 (let ((beg (point))) |
19806
dc7a5df6e4b9
(c-end-of-statement-1): Wrap backward-up-list in a c-safe call so no
Richard M. Stallman <rms@gnu.org>
parents:
19377
diff
changeset
|
223 (c-safe (backward-up-list -1)) |
18720 | 224 (let ((end (point))) |
225 (goto-char beg) | |
19806
dc7a5df6e4b9
(c-end-of-statement-1): Wrap backward-up-list in a c-safe call so no
Richard M. Stallman <rms@gnu.org>
parents:
19377
diff
changeset
|
226 (search-forward ";" end 'move))) |
dc7a5df6e4b9
(c-end-of-statement-1): Wrap backward-up-list in a c-safe call so no
Richard M. Stallman <rms@gnu.org>
parents:
19377
diff
changeset
|
227 ))) |
18720 | 228 |
229 | |
230 (defun c-crosses-statement-barrier-p (from to) | |
231 ;; Does buffer positions FROM to TO cross a C statement boundary? | |
232 (let ((here (point)) | |
233 (lim from) | |
234 crossedp) | |
235 (condition-case () | |
236 (progn | |
237 (goto-char from) | |
238 (while (and (not crossedp) | |
239 (< (point) to)) | |
24282 | 240 (skip-chars-forward "^;{}:" (1- to)) |
18720 | 241 (if (not (c-in-literal lim)) |
242 (progn | |
243 (if (memq (char-after) '(?\; ?{ ?})) | |
244 (setq crossedp t) | |
245 (if (eq (char-after) ?:) | |
18844
6b269c4ad2eb
(c-maybe-labelp): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents:
18720
diff
changeset
|
246 (setq c-maybe-labelp t)) |
18720 | 247 (forward-char 1)) |
248 (setq lim (point))) | |
249 (forward-char 1)))) | |
250 (error (setq crossedp nil))) | |
251 (goto-char here) | |
252 crossedp)) | |
253 | |
254 | |
255 ;; Skipping of "syntactic whitespace", defined as lexical whitespace, | |
256 ;; C and C++ style comments, and preprocessor directives. Search no | |
257 ;; farther back or forward than optional LIM. If LIM is omitted, | |
258 ;; `beginning-of-defun' is used for backward skipping, point-max is | |
259 ;; used for forward skipping. | |
260 | |
261 (defun c-forward-syntactic-ws (&optional lim) | |
262 ;; Forward skip of syntactic whitespace for Emacs 19. | |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
263 (let* ((here (point-max)) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
264 (hugenum (point-max))) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
265 (while (/= here (point)) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
266 (setq here (point)) |
26817 | 267 (c-forward-comment hugenum) |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
268 ;; skip preprocessor directives |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
269 (when (and (eq (char-after) ?#) |
18720 | 270 (= (c-point 'boi) (point))) |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
271 (while (eq (char-before (c-point 'eol)) ?\\) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
272 (forward-line 1)) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
273 (end-of-line)) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
274 ) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
275 (if lim (goto-char (min (point) lim))))) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
276 |
18720 | 277 (defun c-backward-syntactic-ws (&optional lim) |
278 ;; Backward skip over syntactic whitespace for Emacs 19. | |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
279 (let* ((here (point-min)) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
280 (hugenum (- (point-max)))) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
281 (while (/= here (point)) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
282 (setq here (point)) |
26817 | 283 (c-forward-comment hugenum) |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
284 (c-beginning-of-macro)) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
285 (if lim (goto-char (max (point) lim))))) |
18720 | 286 |
287 | |
21106
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
288 ;; Moving by tokens, where a token is defined as all symbols and |
24282 | 289 ;; identifiers which aren't syntactic whitespace (note that "->" is |
290 ;; considered to be two tokens). Point is always either left at the | |
291 ;; beginning of a token or not moved at all. COUNT specifies the | |
292 ;; number of tokens to move; a negative COUNT moves in the opposite | |
293 ;; direction. A COUNT of 0 moves to the next token beginning only if | |
294 ;; not already at one. If BALANCED is true, move over balanced | |
295 ;; parens, otherwise move into them. Also, if BALANCED is true, never | |
296 ;; move out of an enclosing paren. LIM sets the limit for the | |
297 ;; movement and defaults to the point limit. Returns the number of | |
21106
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
298 ;; tokens left to move (positive or negative). If BALANCED is true, a |
24282 | 299 ;; move over a balanced paren counts as one. Note that if COUNT is 0 |
300 ;; and no appropriate token beginning is found, 1 will be returned. | |
301 ;; Thus, a return value of 0 guarantees that point is at the requested | |
302 ;; position and a return value less (without signs) than COUNT | |
303 ;; guarantees that point is at the beginning of some token. | |
21106
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
304 |
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
305 (defun c-forward-token-1 (&optional count balanced lim) |
24282 | 306 (or count (setq count 1)) |
307 (if (< count 0) | |
308 (- (c-backward-token-1 (- count) balanced lim)) | |
309 (let ((jump-syntax (if balanced | |
310 '(?w ?_ ?\( ?\) ?\" ?\\ ?/ ?$ ?') | |
311 '(?w ?_ ?\" ?\\ ?/ ?'))) | |
312 (last (point)) | |
313 (prev (point))) | |
314 (if (/= (point) | |
315 (progn (c-forward-syntactic-ws) (point))) | |
316 ;; Skip whitespace. Count this as a move if we did in fact | |
317 ;; move and aren't out of bounds. | |
318 (or (eobp) | |
319 (and lim (> (point) lim)) | |
320 (setq count (max (1- count) 0)))) | |
321 (if (and (= count 0) | |
322 (or (and (memq (char-syntax (or (char-after) ? )) '(?w ?_)) | |
323 (memq (char-syntax (or (char-before) ? )) '(?w ?_))) | |
324 (eobp))) | |
325 ;; If count is zero we should jump if in the middle of a | |
326 ;; token or if there is whitespace between point and the | |
327 ;; following token beginning. | |
328 (setq count 1)) | |
329 ;; Avoid having the limit tests inside the loop. | |
330 (save-restriction | |
331 (if lim (narrow-to-region (point-min) lim)) | |
332 (if (eobp) | |
333 (goto-char last) | |
334 (condition-case nil | |
335 (while (> count 0) | |
336 (setq prev last | |
337 last (point)) | |
338 (if (memq (char-syntax (char-after)) jump-syntax) | |
339 (goto-char (scan-sexps (point) 1)) | |
340 (forward-char)) | |
341 (c-forward-syntactic-ws lim) | |
342 (setq count (1- count))) | |
343 (error (goto-char last))) | |
344 (when (eobp) | |
345 (goto-char prev) | |
346 (setq count (1+ count))))) | |
347 count))) | |
21106
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
348 |
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
349 (defun c-backward-token-1 (&optional count balanced lim) |
24282 | 350 (or count (setq count 1)) |
351 (if (< count 0) | |
352 (- (c-forward-token-1 (- count) balanced lim)) | |
353 (let ((jump-syntax (if balanced | |
354 '(?w ?_ ?\( ?\) ?\" ?\\ ?/ ?$ ?') | |
355 '(?w ?_ ?\" ?\\ ?/ ?'))) | |
356 last) | |
357 (if (and (= count 0) | |
358 (or (and (memq (char-syntax (or (char-after) ? )) '(?w ?_)) | |
359 (memq (char-syntax (or (char-before) ? )) '(?w ?_))) | |
360 (/= (point) | |
361 (save-excursion (c-forward-syntactic-ws) (point))) | |
362 (eobp))) | |
363 ;; If count is zero we should jump if in the middle of a | |
364 ;; token or if there is whitespace between point and the | |
365 ;; following token beginning. | |
366 (setq count 1)) | |
367 ;; Avoid having the limit tests inside the loop. | |
368 (save-restriction | |
369 (if lim (narrow-to-region lim (point-max))) | |
370 (or (bobp) | |
371 (progn | |
372 (condition-case nil | |
373 (while (progn | |
374 (setq last (point)) | |
375 (> count 0)) | |
376 (c-backward-syntactic-ws lim) | |
377 (if (memq (char-syntax (char-before)) jump-syntax) | |
378 (goto-char (scan-sexps (point) -1)) | |
379 (backward-char)) | |
380 (setq count (1- count))) | |
381 (error (goto-char last))) | |
382 (if (bobp) (goto-char last))))) | |
383 count))) | |
21106
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
384 |
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
385 |
18720 | 386 ;; Return `c' if in a C-style comment, `c++' if in a C++ style |
387 ;; comment, `string' if in a string literal, `pound' if on a | |
388 ;; preprocessor line, or nil if not in a comment at all. Optional LIM | |
389 ;; is used as the backward limit of the search. If omitted, or nil, | |
390 ;; `beginning-of-defun' is used." | |
391 | |
392 (defun c-in-literal (&optional lim) | |
393 ;; Determine if point is in a C++ literal. we cache the last point | |
394 ;; calculated if the cache is enabled | |
395 (if (and (boundp 'c-in-literal-cache) | |
396 c-in-literal-cache | |
397 (= (point) (aref c-in-literal-cache 0))) | |
398 (aref c-in-literal-cache 1) | |
399 (let ((rtn (save-excursion | |
400 (let* ((lim (or lim (c-point 'bod))) | |
401 (state (parse-partial-sexp lim (point)))) | |
402 (cond | |
403 ((nth 3 state) 'string) | |
404 ((nth 4 state) (if (nth 7 state) 'c++ 'c)) | |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
405 ((c-beginning-of-macro lim) 'pound) |
18720 | 406 (t nil)))))) |
407 ;; cache this result if the cache is enabled | |
408 (and (boundp 'c-in-literal-cache) | |
409 (setq c-in-literal-cache (vector (point) rtn))) | |
410 rtn))) | |
411 | |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
412 ;; XEmacs has a built-in function that should make this much quicker. |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
413 ;; I don't think we even need the cache, which makes our lives more |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
414 ;; complicated anyway. In this case, lim is ignored. |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
415 (defun c-fast-in-literal (&optional lim) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
416 (let ((context (buffer-syntactic-context))) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
417 (cond |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
418 ((eq context 'string) 'string) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
419 ((eq context 'comment) 'c++) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
420 ((eq context 'block-comment) 'c) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
421 ((save-excursion (c-beginning-of-macro lim)) 'pound)))) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
422 |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
423 (if (fboundp 'buffer-syntactic-context) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
424 (defalias 'c-in-literal 'c-fast-in-literal)) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
425 |
26817 | 426 (defun c-literal-limits (&optional lim near not-in-delimiter) |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
427 ;; Returns a cons of the beginning and end positions of the comment |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
428 ;; or string surrounding point (including both delimiters), or nil |
24282 | 429 ;; if point isn't in one. If LIM is non-nil, it's used as the |
430 ;; "safe" position to start parsing from. If NEAR is non-nil, then | |
431 ;; the limits of any literal next to point is returned. "Next to" | |
432 ;; means there's only [ \t] between point and the literal. The | |
26817 | 433 ;; search for such a literal is done first in forward direction. If |
434 ;; NOT-IN-DELIMITER is non-nil, the case when point is inside a | |
435 ;; starting delimiter won't be recognized. This only has effect for | |
436 ;; comments, which have starting delimiters with more than one | |
437 ;; character. | |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
438 (save-excursion |
24282 | 439 (let* ((pos (point)) |
440 (lim (or lim (c-point 'bod))) | |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
441 (state (parse-partial-sexp lim (point)))) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
442 (cond ((nth 3 state) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
443 ;; String. Search backward for the start. |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
444 (while (nth 3 state) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
445 (search-backward (make-string 1 (nth 3 state))) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
446 (setq state (parse-partial-sexp lim (point)))) |
24282 | 447 (cons (point) (or (c-safe (c-forward-sexp 1) (point)) |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
448 (point-max)))) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
449 ((nth 7 state) |
24282 | 450 ;; Line comment. Search from bol for the comment starter. |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
451 (beginning-of-line) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
452 (setq state (parse-partial-sexp lim (point)) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
453 lim (point)) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
454 (while (not (nth 7 state)) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
455 (search-forward "//") ; Should never fail. |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
456 (setq state (parse-partial-sexp |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
457 lim (point) nil nil state) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
458 lim (point))) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
459 (backward-char 2) |
26817 | 460 (cons (point) (progn (c-forward-comment 1) (point)))) |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
461 ((nth 4 state) |
24282 | 462 ;; Block comment. Search backward for the comment starter. |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
463 (while (nth 4 state) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
464 (search-backward "/*") ; Should never fail. |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
465 (setq state (parse-partial-sexp lim (point)))) |
26817 | 466 (cons (point) (progn (c-forward-comment 1) (point)))) |
467 ((and (not not-in-delimiter) | |
468 (not (nth 5 state)) | |
469 (eq (char-before) ?/) | |
470 (looking-at "[/*]")) | |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
471 ;; We're standing in a comment starter. |
26817 | 472 (backward-char 1) |
473 (cons (point) (progn (c-forward-comment 1) (point)))) | |
24282 | 474 (near |
475 (goto-char pos) | |
476 ;; Search forward for a literal. | |
477 (skip-chars-forward " \t") | |
478 (cond | |
479 ((eq (char-syntax (or (char-after) ?\ )) ?\") ; String. | |
480 (cons (point) (or (c-safe (c-forward-sexp 1) (point)) | |
481 (point-max)))) | |
482 ((looking-at "/[/*]") ; Line or block comment. | |
26817 | 483 (cons (point) (progn (c-forward-comment 1) (point)))) |
24282 | 484 (t |
485 ;; Search backward. | |
486 (skip-chars-backward " \t") | |
487 (let ((end (point)) beg) | |
488 (cond | |
489 ((eq (char-syntax (or (char-before) ?\ )) ?\") ; String. | |
490 (setq beg (c-safe (c-backward-sexp 1) (point)))) | |
491 ((and (c-safe (forward-char -2) t) | |
492 (looking-at "*/")) | |
493 ;; Block comment. Due to the nature of line | |
494 ;; comments, they will always be covered by the | |
495 ;; normal case above. | |
496 (goto-char end) | |
26817 | 497 (c-forward-comment -1) |
24282 | 498 ;; If LIM is bogus, beg will be bogus. |
499 (setq beg (point)))) | |
500 (if beg (cons beg end)))))) | |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
501 )))) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
502 |
26817 | 503 (defun c-literal-limits-fast (&optional lim near not-in-delimiter) |
24282 | 504 ;; Like c-literal-limits, but for emacsen whose `parse-partial-sexp' |
26817 | 505 ;; returns the pos of the comment start. |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
506 (save-excursion |
26817 | 507 (let* ((pos (point)) |
508 (lim (or lim (c-point 'bod))) | |
509 (state (parse-partial-sexp lim (point)))) | |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
510 (cond ((nth 3 state) ; String. |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
511 (goto-char (nth 8 state)) |
24282 | 512 (cons (point) (or (c-safe (c-forward-sexp 1) (point)) |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
513 (point-max)))) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
514 ((nth 4 state) ; Comment. |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
515 (goto-char (nth 8 state)) |
26817 | 516 (cons (point) (progn (c-forward-comment 1) (point)))) |
517 ((and (not not-in-delimiter) | |
518 (not (nth 5 state)) | |
519 (eq (char-before) ?/) | |
520 (looking-at "[/*]")) | |
521 ;; We're standing in a comment starter. | |
522 (backward-char 1) | |
523 (cons (point) (progn (c-forward-comment 1) (point)))) | |
524 (near | |
525 (goto-char pos) | |
526 ;; Search forward for a literal. | |
527 (skip-chars-forward " \t") | |
528 (cond | |
529 ((eq (char-syntax (or (char-after) ?\ )) ?\") ; String. | |
530 (cons (point) (or (c-safe (c-forward-sexp 1) (point)) | |
531 (point-max)))) | |
532 ((looking-at "/[/*]") ; Line or block comment. | |
533 (cons (point) (progn (c-forward-comment 1) (point)))) | |
534 (t | |
535 ;; Search backward. | |
536 (skip-chars-backward " \t") | |
537 (let ((end (point)) beg) | |
538 (cond | |
539 ((eq (char-syntax (or (char-before) ?\ )) ?\") ; String. | |
540 (setq beg (c-safe (c-backward-sexp 1) (point)))) | |
541 ((and (c-safe (forward-char -2) t) | |
542 (looking-at "*/")) | |
543 ;; Block comment. Due to the nature of line | |
544 ;; comments, they will always be covered by the | |
545 ;; normal case above. | |
546 (goto-char end) | |
547 (c-forward-comment -1) | |
548 ;; If LIM is bogus, beg will be bogus. | |
549 (setq beg (point)))) | |
550 (if beg (cons beg end)))))) | |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
551 )))) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
552 |
26817 | 553 (if (c-safe (> (length (save-excursion (parse-partial-sexp 1 1))) 8)) |
554 (defalias 'c-literal-limits 'c-literal-limits-fast)) | |
555 | |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
556 (defun c-collect-line-comments (range) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
557 ;; If the argument is a cons of two buffer positions (such as |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
558 ;; returned by c-literal-limits), and that range contains a C++ |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
559 ;; style line comment, then an extended range is returned that |
21106
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
560 ;; contains all adjacent line comments (i.e. all comments that |
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
561 ;; starts in the same column with no empty lines or non-whitespace |
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
562 ;; characters between them). Otherwise the argument is returned. |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
563 (save-excursion |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
564 (condition-case nil |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
565 (if (and (consp range) (progn |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
566 (goto-char (car range)) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
567 (looking-at "//"))) |
21106
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
568 (let ((col (current-column)) |
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
569 (beg (point)) |
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
570 (end (cdr range))) |
26817 | 571 (while (and (c-forward-comment -1) |
21106
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
572 (looking-at "//") |
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
573 (= col (current-column))) |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
574 (setq beg (point))) |
21106
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
575 (goto-char end) |
26817 | 576 (while (and (progn (skip-chars-forward " \t") |
577 (looking-at "//")) | |
578 (= col (current-column)) | |
579 (prog1 (zerop (forward-line 1)) | |
580 (setq end (point))))) | |
21106
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
581 (cons beg end)) |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
582 range) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
583 (error range)))) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
584 |
24282 | 585 (defun c-literal-type (range) |
586 ;; Convenience function that given the result of c-literal-limits, | |
587 ;; returns nil or the type of literal that the range surrounds. | |
588 ;; It's much faster than using c-in-literal and is intended to be | |
589 ;; used when you need both the type of a literal and its limits. | |
590 (if (consp range) | |
26817 | 591 (save-excursion |
592 (goto-char (car range)) | |
593 (cond ((eq (char-syntax (or (char-after) ?\ )) ?\") 'string) | |
594 ((looking-at "//") 'c++) | |
595 (t 'c))) ; Assuming the range is valid. | |
24282 | 596 range)) |
597 | |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
598 |
18720 | 599 |
600 ;; utilities for moving and querying around syntactic elements | |
601 (defvar c-parsing-error nil) | |
602 | |
603 (defun c-parse-state () | |
604 ;; Finds and records all open parens between some important point | |
605 ;; earlier in the file and point. | |
606 ;; | |
607 ;; if there's a state cache, return it | |
608 (setq c-parsing-error nil) | |
609 (if (boundp 'c-state-cache) c-state-cache | |
610 (let* (at-bob | |
611 (pos (save-excursion | |
612 ;; go back 2 bods, but ignore any bogus positions | |
613 ;; returned by beginning-of-defun (i.e. open paren | |
614 ;; in column zero) | |
615 (let ((cnt 2)) | |
616 (while (not (or at-bob (zerop cnt))) | |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
617 (goto-char (c-point 'bod)) |
24282 | 618 (if (and |
619 (eq (char-after) ?\{) | |
620 ;; The following catches an obscure special | |
621 ;; case where the brace is preceded by an | |
622 ;; open paren. That can only legally occur | |
623 ;; with blocks inside expressions and in | |
624 ;; Pike special brace lists. Even so, this | |
625 ;; test is still bogus then, but hopefully | |
626 ;; good enough. (We don't want to use | |
627 ;; up-list here since it might be slow.) | |
628 (save-excursion | |
629 (c-backward-syntactic-ws) | |
630 (not (eq (char-before) ?\()))) | |
18720 | 631 (setq cnt (1- cnt))) |
632 (if (bobp) | |
633 (setq at-bob t)))) | |
634 (point))) | |
635 (here (save-excursion | |
636 ;;(skip-chars-forward " \t}") | |
637 (point))) | |
638 (last-bod pos) (last-pos pos) | |
639 placeholder state sexp-end) | |
640 ;; cache last bod position | |
641 (while (catch 'backup-bod | |
642 (setq state nil) | |
643 (while (and pos (< pos here)) | |
644 (setq last-pos pos) | |
645 (if (and (setq pos (c-safe (scan-lists pos 1 -1))) | |
646 (<= pos here)) | |
647 (progn | |
648 (setq sexp-end (c-safe (scan-sexps (1- pos) 1))) | |
649 (if (and sexp-end | |
650 (<= sexp-end here)) | |
651 ;; we want to record both the start and end | |
652 ;; of this sexp, but we only want to record | |
653 ;; the last-most of any of them before here | |
654 (progn | |
655 (if (eq (char-after (1- pos)) ?\{) | |
656 (setq state (cons (cons (1- pos) sexp-end) | |
657 (if (consp (car state)) | |
658 (cdr state) | |
659 state)))) | |
660 (setq pos sexp-end)) | |
661 ;; we're contained in this sexp so put pos on | |
662 ;; front of list | |
663 (setq state (cons (1- pos) state)))) | |
664 ;; something bad happened. check to see if we | |
665 ;; crossed an unbalanced close brace. if so, we | |
666 ;; didn't really find the right `important bufpos' | |
667 ;; so lets back up and try again | |
668 (if (and (not pos) (not at-bob) | |
669 (setq placeholder | |
670 (c-safe (scan-lists last-pos 1 1))) | |
671 ;;(char-after (1- placeholder)) | |
672 (<= placeholder here) | |
673 (eq (char-after (1- placeholder)) ?\})) | |
674 (while t | |
675 (setq last-bod (c-safe (scan-lists last-bod -1 1))) | |
676 (if (not last-bod) | |
677 (progn | |
678 ;; bogus, but what can we do here? | |
679 (setq c-parsing-error (1- placeholder)) | |
680 (throw 'backup-bod nil)) | |
681 (setq at-bob (= last-bod (point-min)) | |
682 pos last-bod) | |
683 (if (= (char-after last-bod) ?\{) | |
684 (throw 'backup-bod t))) | |
685 )) ;end-if | |
686 )) ;end-while | |
687 nil)) | |
688 state))) | |
689 | |
690 (defun c-whack-state (bufpos state) | |
691 ;; whack off any state information that appears on STATE which lies | |
692 ;; after the bounds of BUFPOS. | |
693 (let (newstate car) | |
694 (while state | |
695 (setq car (car state) | |
696 state (cdr state)) | |
697 (if (consp car) | |
698 ;; just check the car, because in a balanced brace | |
699 ;; expression, it must be impossible for the corresponding | |
700 ;; close brace to be before point, but the open brace to be | |
701 ;; after. | |
702 (if (<= bufpos (car car)) | |
703 nil ; whack it off | |
704 ;; its possible that the open brace is before bufpos, but | |
705 ;; the close brace is after. In that case, convert this | |
706 ;; to a non-cons element. | |
707 (if (<= bufpos (cdr car)) | |
708 (setq newstate (append newstate (list (car car)))) | |
709 ;; we know that both the open and close braces are | |
710 ;; before bufpos, so we also know that everything else | |
711 ;; on state is before bufpos, so we can glom up the | |
712 ;; whole thing and exit. | |
713 (setq newstate (append newstate (list car) state) | |
714 state nil))) | |
715 (if (<= bufpos car) | |
716 nil ; whack it off | |
717 ;; it's before bufpos, so everything else should too | |
718 (setq newstate (append newstate (list car) state) | |
719 state nil)))) | |
720 newstate)) | |
721 | |
722 (defun c-hack-state (bufpos which state) | |
723 ;; Using BUFPOS buffer position, and WHICH (must be 'open or | |
724 ;; 'close), hack the c-parse-state STATE and return the results. | |
725 (if (eq which 'open) | |
726 (let ((car (car state))) | |
727 (if (or (null car) | |
728 (consp car) | |
729 (/= bufpos car)) | |
730 (cons bufpos state) | |
731 state)) | |
732 (if (not (eq which 'close)) | |
733 (error "c-hack-state, bad argument: %s" which)) | |
734 ;; 'close brace | |
735 (let ((car (car state)) | |
736 (cdr (cdr state))) | |
737 (if (consp car) | |
738 (setq car (car cdr) | |
739 cdr (cdr cdr))) | |
740 ;; TBD: is this test relevant??? | |
741 (if (consp car) | |
742 state ;on error, don't change | |
743 ;; watch out for balanced expr already on cdr of list | |
744 (cons (cons car bufpos) | |
745 (if (consp (car cdr)) | |
746 (cdr cdr) cdr)) | |
747 )))) | |
748 | |
749 (defun c-adjust-state (from to shift state) | |
750 ;; Adjust all points in state that lie in the region FROM..TO by | |
24282 | 751 ;; SHIFT amount. |
18720 | 752 (mapcar |
753 (function | |
754 (lambda (e) | |
755 (if (consp e) | |
756 (let ((car (car e)) | |
757 (cdr (cdr e))) | |
758 (if (and (<= from car) (< car to)) | |
759 (setcar e (+ shift car))) | |
760 (if (and (<= from cdr) (< cdr to)) | |
761 (setcdr e (+ shift cdr)))) | |
762 (if (and (<= from e) (< e to)) | |
763 (setq e (+ shift e)))) | |
764 e)) | |
765 state)) | |
766 | |
767 | |
768 (defun c-beginning-of-inheritance-list (&optional lim) | |
769 ;; Go to the first non-whitespace after the colon that starts a | |
770 ;; multiple inheritance introduction. Optional LIM is the farthest | |
771 ;; back we should search. | |
772 (let ((lim (or lim (c-point 'bod))) | |
773 (placeholder (progn | |
774 (back-to-indentation) | |
775 (point)))) | |
776 (c-backward-syntactic-ws lim) | |
777 (while (and (> (point) lim) | |
778 (memq (char-before) '(?, ?:)) | |
779 (progn | |
780 (beginning-of-line) | |
781 (setq placeholder (point)) | |
782 (skip-chars-forward " \t") | |
783 (not (looking-at c-class-key)) | |
784 )) | |
785 (c-backward-syntactic-ws lim)) | |
786 (goto-char placeholder) | |
787 (skip-chars-forward "^:" (c-point 'eol)))) | |
788 | |
789 (defun c-in-method-def-p () | |
790 ;; Return nil if we aren't in a method definition, otherwise the | |
791 ;; position of the initial [+-]. | |
792 (save-excursion | |
793 (beginning-of-line) | |
794 (and c-method-key | |
795 (looking-at c-method-key) | |
796 (point)) | |
797 )) | |
798 | |
24335
0c4688f9a396
Added c-at-toplevel-p for font-lock.el.
Simon Marshall <simon@gnu.org>
parents:
24282
diff
changeset
|
799 (defun c-at-toplevel-p () |
0c4688f9a396
Added c-at-toplevel-p for font-lock.el.
Simon Marshall <simon@gnu.org>
parents:
24282
diff
changeset
|
800 "Return a determination as to whether point is at the `top-level'. |
0c4688f9a396
Added c-at-toplevel-p for font-lock.el.
Simon Marshall <simon@gnu.org>
parents:
24282
diff
changeset
|
801 Being at the top-level means that point is either outside any |
0c4688f9a396
Added c-at-toplevel-p for font-lock.el.
Simon Marshall <simon@gnu.org>
parents:
24282
diff
changeset
|
802 enclosing block (such function definition), or inside a class |
0c4688f9a396
Added c-at-toplevel-p for font-lock.el.
Simon Marshall <simon@gnu.org>
parents:
24282
diff
changeset
|
803 definition, but outside any method blocks. |
0c4688f9a396
Added c-at-toplevel-p for font-lock.el.
Simon Marshall <simon@gnu.org>
parents:
24282
diff
changeset
|
804 |
0c4688f9a396
Added c-at-toplevel-p for font-lock.el.
Simon Marshall <simon@gnu.org>
parents:
24282
diff
changeset
|
805 If point is not at the top-level (e.g. it is inside a method |
0c4688f9a396
Added c-at-toplevel-p for font-lock.el.
Simon Marshall <simon@gnu.org>
parents:
24282
diff
changeset
|
806 definition), then nil is returned. Otherwise, if point is at a |
0c4688f9a396
Added c-at-toplevel-p for font-lock.el.
Simon Marshall <simon@gnu.org>
parents:
24282
diff
changeset
|
807 top-level not enclosed within a class definition, t is returned. |
0c4688f9a396
Added c-at-toplevel-p for font-lock.el.
Simon Marshall <simon@gnu.org>
parents:
24282
diff
changeset
|
808 Otherwise, a 2-vector is returned where the zeroth element is the |
0c4688f9a396
Added c-at-toplevel-p for font-lock.el.
Simon Marshall <simon@gnu.org>
parents:
24282
diff
changeset
|
809 buffer position of the start of the class declaration, and the first |
0c4688f9a396
Added c-at-toplevel-p for font-lock.el.
Simon Marshall <simon@gnu.org>
parents:
24282
diff
changeset
|
810 element is the buffer position of the enclosing class's opening |
0c4688f9a396
Added c-at-toplevel-p for font-lock.el.
Simon Marshall <simon@gnu.org>
parents:
24282
diff
changeset
|
811 brace." |
0c4688f9a396
Added c-at-toplevel-p for font-lock.el.
Simon Marshall <simon@gnu.org>
parents:
24282
diff
changeset
|
812 (let ((state (c-parse-state))) |
0c4688f9a396
Added c-at-toplevel-p for font-lock.el.
Simon Marshall <simon@gnu.org>
parents:
24282
diff
changeset
|
813 (or (not (c-most-enclosing-brace state)) |
0c4688f9a396
Added c-at-toplevel-p for font-lock.el.
Simon Marshall <simon@gnu.org>
parents:
24282
diff
changeset
|
814 (c-search-uplist-for-classkey state)))) |
0c4688f9a396
Added c-at-toplevel-p for font-lock.el.
Simon Marshall <simon@gnu.org>
parents:
24282
diff
changeset
|
815 |
18720 | 816 (defun c-just-after-func-arglist-p (&optional containing) |
817 ;; Return t if we are between a function's argument list closing | |
818 ;; paren and its opening brace. Note that the list close brace | |
819 ;; could be followed by a "const" specifier or a member init hanging | |
820 ;; colon. Optional CONTAINING is position of containing s-exp open | |
821 ;; brace. If not supplied, point is used as search start. | |
822 (save-excursion | |
823 (c-backward-syntactic-ws) | |
824 (let ((checkpoint (or containing (point)))) | |
825 (goto-char checkpoint) | |
826 ;; could be looking at const specifier | |
827 (if (and (eq (char-before) ?t) | |
828 (forward-word -1) | |
829 (looking-at "\\<const\\>")) | |
830 (c-backward-syntactic-ws) | |
831 ;; otherwise, we could be looking at a hanging member init | |
832 ;; colon | |
833 (goto-char checkpoint) | |
834 (if (and (eq (char-before) ?:) | |
835 (progn | |
836 (forward-char -1) | |
837 (c-backward-syntactic-ws) | |
838 (looking-at "[ \t\n]*:\\([^:]+\\|$\\)"))) | |
839 nil | |
840 (goto-char checkpoint)) | |
841 ) | |
842 (and (eq (char-before) ?\)) | |
843 ;; check if we are looking at a method def | |
844 (or (not c-method-key) | |
845 (progn | |
24282 | 846 (c-forward-sexp -1) |
18720 | 847 (forward-char -1) |
848 (c-backward-syntactic-ws) | |
849 (not (or (memq (char-before) '(?- ?+)) | |
850 ;; or a class category | |
851 (progn | |
24282 | 852 (c-forward-sexp -2) |
18720 | 853 (looking-at c-class-key)) |
854 ))))) | |
855 ))) | |
856 | |
857 ;; defuns to look backwards for things | |
858 (defun c-backward-to-start-of-do (&optional lim) | |
859 ;; Move to the start of the last "unbalanced" do expression. | |
860 ;; Optional LIM is the farthest back to search. If none is found, | |
861 ;; nil is returned and point is left unchanged, otherwise t is returned. | |
862 (let ((do-level 1) | |
863 (case-fold-search nil) | |
864 (lim (or lim (c-point 'bod))) | |
865 (here (point)) | |
866 foundp) | |
867 (while (not (zerop do-level)) | |
868 ;; we protect this call because trying to execute this when the | |
869 ;; while is not associated with a do will throw an error | |
870 (condition-case nil | |
871 (progn | |
24282 | 872 (c-backward-sexp 1) |
18720 | 873 (cond |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
874 ;; break infloop for illegal C code |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
875 ((bobp) (setq do-level 0)) |
18720 | 876 ((memq (c-in-literal lim) '(c c++))) |
877 ((looking-at "while\\b[^_]") | |
878 (setq do-level (1+ do-level))) | |
879 ((looking-at "do\\b[^_]") | |
880 (if (zerop (setq do-level (1- do-level))) | |
881 (setq foundp t))) | |
882 ((<= (point) lim) | |
883 (setq do-level 0) | |
884 (goto-char lim)))) | |
885 (error | |
886 (goto-char lim) | |
887 (setq do-level 0)))) | |
888 (if (not foundp) | |
889 (goto-char here)) | |
890 foundp)) | |
891 | |
892 (defun c-backward-to-start-of-if (&optional lim) | |
893 ;; Move to the start of the last "unbalanced" if and return t. If | |
894 ;; none is found, and we are looking at an if clause, nil is | |
895 ;; returned. If none is found and we are looking at an else clause, | |
896 ;; an error is thrown. | |
897 (let ((if-level 1) | |
898 (here (c-point 'bol)) | |
899 (case-fold-search nil) | |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
900 (lim (or (and (>= (point) lim) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
901 lim) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
902 (c-point 'bod))) |
18720 | 903 (at-if (looking-at "if\\b[^_]"))) |
904 (catch 'orphan-if | |
905 (while (and (not (bobp)) | |
906 (not (zerop if-level))) | |
907 (c-backward-syntactic-ws) | |
908 (condition-case nil | |
24282 | 909 (c-backward-sexp 1) |
18720 | 910 (error |
911 (if at-if | |
912 (throw 'orphan-if nil) | |
913 (error "No matching `if' found for `else' on line %d." | |
914 (1+ (count-lines 1 here)))))) | |
915 (cond | |
916 ((looking-at "else\\b[^_]") | |
917 (setq if-level (1+ if-level))) | |
918 ((looking-at "if\\b[^_]") | |
919 ;; check for else if... skip over | |
920 (let ((here (point))) | |
24282 | 921 (c-safe (c-forward-sexp -1)) |
18720 | 922 (if (looking-at "\\<else\\>[ \t]+\\<if\\>") |
923 nil | |
924 (setq if-level (1- if-level)) | |
925 (goto-char here)))) | |
926 ((< (point) lim) | |
927 (setq if-level 0) | |
928 (goto-char lim)) | |
929 )) | |
930 t))) | |
931 | |
932 (defun c-skip-conditional () | |
933 ;; skip forward over conditional at point, including any predicate | |
934 ;; statements in parentheses. No error checking is performed. | |
24282 | 935 (c-forward-sexp (cond |
936 ;; else if() | |
937 ((looking-at "\\<else\\>[ \t]+\\<if\\>") 3) | |
938 ;; do, else, try, finally | |
939 ((looking-at "\\<\\(do\\|else\\|try\\|finally\\)\\>") 1) | |
940 ;; for, if, while, switch, catch, synchronized | |
941 (t 2)))) | |
18720 | 942 |
943 (defun c-skip-case-statement-forward (state &optional lim) | |
944 ;; skip forward over case/default bodies, with optional maximal | |
945 ;; limit. if no next case body is found, nil is returned and point | |
946 ;; is not moved | |
947 (let ((lim (or lim (point-max))) | |
948 (here (point)) | |
949 donep foundp bufpos | |
950 (safepos (point)) | |
951 (balanced (car state))) | |
952 ;; search until we've passed the limit, or we've found our match | |
953 (while (and (< (point) lim) | |
954 (not donep)) | |
955 (setq safepos (point)) | |
956 ;; see if we can find a case statement, not in a literal | |
957 (if (and (re-search-forward c-switch-label-key lim 'move) | |
958 (setq bufpos (match-beginning 0)) | |
959 (not (c-in-literal safepos)) | |
960 (/= bufpos here)) | |
961 ;; if we crossed into a balanced sexp, we know the case is | |
962 ;; not part of our switch statement, so just bound over the | |
963 ;; sexp and keep looking. | |
964 (if (and (consp balanced) | |
965 (> bufpos (car balanced)) | |
966 (< bufpos (cdr balanced))) | |
967 (goto-char (cdr balanced)) | |
968 (goto-char bufpos) | |
969 (setq donep t | |
970 foundp t)))) | |
971 (if (not foundp) | |
972 (goto-char here)) | |
973 foundp)) | |
974 | |
975 (defun c-search-uplist-for-classkey (brace-state) | |
976 ;; search for the containing class, returning a 2 element vector if | |
24282 | 977 ;; found. aref 0 contains the bufpos of the boi of the class key |
978 ;; line, and aref 1 contains the bufpos of the open brace. | |
18720 | 979 (if (null brace-state) |
980 ;; no brace-state means we cannot be inside a class | |
981 nil | |
982 (let ((carcache (car brace-state)) | |
983 search-start search-end) | |
984 (if (consp carcache) | |
985 ;; a cons cell in the first element means that there is some | |
986 ;; balanced sexp before the current bufpos. this we can | |
987 ;; ignore. the nth 1 and nth 2 elements define for us the | |
988 ;; search boundaries | |
989 (setq search-start (nth 2 brace-state) | |
990 search-end (nth 1 brace-state)) | |
991 ;; if the car was not a cons cell then nth 0 and nth 1 define | |
992 ;; for us the search boundaries | |
993 (setq search-start (nth 1 brace-state) | |
994 search-end (nth 0 brace-state))) | |
995 ;; search-end cannot be a cons cell | |
996 (and (consp search-end) | |
997 (error "consp search-end: %s" search-end)) | |
998 ;; if search-end is nil, or if the search-end character isn't an | |
999 ;; open brace, we are definitely not in a class | |
1000 (if (or (not search-end) | |
1001 (< search-end (point-min)) | |
1002 (not (eq (char-after search-end) ?{))) | |
1003 nil | |
1004 ;; now, we need to look more closely at search-start. if | |
1005 ;; search-start is nil, then our start boundary is really | |
1006 ;; point-min. | |
1007 (if (not search-start) | |
1008 (setq search-start (point-min)) | |
1009 ;; if search-start is a cons cell, then we can start | |
1010 ;; searching from the end of the balanced sexp just ahead of | |
1011 ;; us | |
1012 (if (consp search-start) | |
1013 (setq search-start (cdr search-start)))) | |
1014 ;; now we can do a quick regexp search from search-start to | |
1015 ;; search-end and see if we can find a class key. watch for | |
1016 ;; class like strings in literals | |
1017 (save-excursion | |
1018 (save-restriction | |
1019 (goto-char search-start) | |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1020 (let ((search-key (concat c-class-key "\\|" c-extra-toplevel-key)) |
18720 | 1021 foundp class match-end) |
24282 | 1022 (if c-inexpr-class-key |
1023 (setq search-key (concat search-key "\\|" | |
1024 c-inexpr-class-key))) | |
18720 | 1025 (while (and (not foundp) |
1026 (progn | |
1027 (c-forward-syntactic-ws) | |
1028 (> search-end (point))) | |
1029 (re-search-forward search-key search-end t)) | |
1030 (setq class (match-beginning 0) | |
1031 match-end (match-end 0)) | |
1032 (if (c-in-literal search-start) | |
1033 nil ; its in a comment or string, ignore | |
1034 (goto-char class) | |
1035 (skip-chars-forward " \t\n") | |
1036 (setq foundp (vector (c-point 'boi) search-end)) | |
1037 (cond | |
1038 ;; check for embedded keywords | |
1039 ((let ((char (char-after (1- class)))) | |
1040 (and char | |
1041 (memq (char-syntax char) '(?w ?_)))) | |
1042 (goto-char match-end) | |
1043 (setq foundp nil)) | |
1044 ;; make sure we're really looking at the start of a | |
1045 ;; class definition, and not a forward decl, return | |
1046 ;; arg, template arg list, or an ObjC or Java method. | |
1047 ((and c-method-key | |
24282 | 1048 (re-search-forward c-method-key search-end t) |
1049 (not (c-in-literal class))) | |
18720 | 1050 (setq foundp nil)) |
24282 | 1051 ;; Check if this is an anonymous inner class. |
1052 ((and c-inexpr-class-key | |
1053 (looking-at c-inexpr-class-key)) | |
1054 (while (and (= (c-forward-token-1 1 t) 0) | |
1055 (looking-at "(\\|\\w\\|\\s_\\|\\."))) | |
1056 (if (eq (point) search-end) | |
1057 ;; We're done. Just trap this case in the cond. | |
1058 nil | |
1059 ;; False alarm; all conditions aren't satisfied. | |
1060 (setq foundp nil))) | |
18720 | 1061 ;; Its impossible to define a regexp for this, and |
1062 ;; nearly so to do it programmatically. | |
1063 ;; | |
1064 ;; ; picks up forward decls | |
1065 ;; = picks up init lists | |
1066 ;; ) picks up return types | |
1067 ;; > picks up templates, but remember that we can | |
1068 ;; inherit from templates! | |
1069 ((let ((skipchars "^;=)")) | |
1070 ;; try to see if we found the `class' keyword | |
1071 ;; inside a template arg list | |
1072 (save-excursion | |
1073 (skip-chars-backward "^<>" search-start) | |
1074 (if (eq (char-before) ?<) | |
1075 (setq skipchars (concat skipchars ">")))) | |
24282 | 1076 (while (progn |
1077 (skip-chars-forward skipchars search-end) | |
1078 (c-in-literal class)) | |
1079 (forward-char)) | |
18720 | 1080 (/= (point) search-end)) |
1081 (setq foundp nil)) | |
1082 ))) | |
1083 foundp)) | |
1084 ))))) | |
1085 | |
1086 (defun c-inside-bracelist-p (containing-sexp brace-state) | |
1087 ;; return the buffer position of the beginning of the brace list | |
1088 ;; statement if we're inside a brace list, otherwise return nil. | |
1089 ;; CONTAINING-SEXP is the buffer pos of the innermost containing | |
1090 ;; paren. BRACE-STATE is the remainder of the state of enclosing braces | |
1091 ;; | |
1092 ;; N.B.: This algorithm can potentially get confused by cpp macros | |
1093 ;; places in inconvenient locations. Its a trade-off we make for | |
1094 ;; speed. | |
1095 (or | |
1096 ;; this will pick up enum lists | |
21106
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
1097 (c-safe |
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
1098 (save-excursion |
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
1099 (goto-char containing-sexp) |
24282 | 1100 (c-forward-sexp -1) |
21106
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
1101 (let (bracepos) |
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
1102 (if (and (or (looking-at "enum[\t\n ]+") |
24282 | 1103 (progn (c-forward-sexp -1) |
21106
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
1104 (looking-at "enum[\t\n ]+"))) |
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
1105 (setq bracepos (c-safe (scan-lists (point) 1 -1))) |
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
1106 (not (c-crosses-statement-barrier-p (point) |
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
1107 (- bracepos 2)))) |
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
1108 (point))))) |
18720 | 1109 ;; this will pick up array/aggregate init lists, even if they are nested. |
1110 (save-excursion | |
24282 | 1111 (let ((class-key |
1112 ;; Pike can have class definitions anywhere, so we must | |
1113 ;; check for the class key here. | |
1114 (and (c-major-mode-is 'pike-mode) | |
1115 (concat c-class-key "\\|" c-extra-toplevel-key))) | |
1116 bufpos lim braceassignp) | |
18720 | 1117 (while (and (not bufpos) |
1118 containing-sexp) | |
1119 (if (consp containing-sexp) | |
1120 (setq containing-sexp (car brace-state) | |
1121 brace-state (cdr brace-state)) | |
1122 (goto-char containing-sexp) | |
24282 | 1123 (if (c-looking-at-inexpr-block) |
1124 ;; We're in an in-expression block of some kind. Do | |
1125 ;; not check nesting. | |
1126 (setq containing-sexp nil) | |
1127 ;; see if the open brace is preceded by = or [...] in | |
1128 ;; this statement, but watch out for operator= | |
1129 (setq lim (if (consp (car brace-state)) | |
1130 (cdr (car brace-state)) | |
1131 (car brace-state)) | |
1132 braceassignp 'dontknow) | |
25178
1dc57e616e8d
(c-inside-bracelist-p): Tighter test for
Richard M. Stallman <rms@gnu.org>
parents:
24335
diff
changeset
|
1133 (c-backward-token-1 1 t lim) |
1dc57e616e8d
(c-inside-bracelist-p): Tighter test for
Richard M. Stallman <rms@gnu.org>
parents:
24335
diff
changeset
|
1134 ;; Checks to do only on the first sexp before the brace. |
1dc57e616e8d
(c-inside-bracelist-p): Tighter test for
Richard M. Stallman <rms@gnu.org>
parents:
24335
diff
changeset
|
1135 (when (and (c-major-mode-is 'java-mode) |
1dc57e616e8d
(c-inside-bracelist-p): Tighter test for
Richard M. Stallman <rms@gnu.org>
parents:
24335
diff
changeset
|
1136 (eq (char-after) ?\[)) |
1dc57e616e8d
(c-inside-bracelist-p): Tighter test for
Richard M. Stallman <rms@gnu.org>
parents:
24335
diff
changeset
|
1137 ;; In Java, an initialization brace list may follow |
1dc57e616e8d
(c-inside-bracelist-p): Tighter test for
Richard M. Stallman <rms@gnu.org>
parents:
24335
diff
changeset
|
1138 ;; directly after "new Foo[]", so check for a "new" |
1dc57e616e8d
(c-inside-bracelist-p): Tighter test for
Richard M. Stallman <rms@gnu.org>
parents:
24335
diff
changeset
|
1139 ;; earlier. |
1dc57e616e8d
(c-inside-bracelist-p): Tighter test for
Richard M. Stallman <rms@gnu.org>
parents:
24335
diff
changeset
|
1140 (while (eq braceassignp 'dontknow) |
1dc57e616e8d
(c-inside-bracelist-p): Tighter test for
Richard M. Stallman <rms@gnu.org>
parents:
24335
diff
changeset
|
1141 (setq braceassignp |
1dc57e616e8d
(c-inside-bracelist-p): Tighter test for
Richard M. Stallman <rms@gnu.org>
parents:
24335
diff
changeset
|
1142 (cond ((/= (c-backward-token-1 1 t lim) 0) nil) |
1dc57e616e8d
(c-inside-bracelist-p): Tighter test for
Richard M. Stallman <rms@gnu.org>
parents:
24335
diff
changeset
|
1143 ((looking-at "new\\>") t) |
1dc57e616e8d
(c-inside-bracelist-p): Tighter test for
Richard M. Stallman <rms@gnu.org>
parents:
24335
diff
changeset
|
1144 ((looking-at "\\sw\\|\\s_\\|[.[]") |
1dc57e616e8d
(c-inside-bracelist-p): Tighter test for
Richard M. Stallman <rms@gnu.org>
parents:
24335
diff
changeset
|
1145 ;; Carry on looking if this is an |
1dc57e616e8d
(c-inside-bracelist-p): Tighter test for
Richard M. Stallman <rms@gnu.org>
parents:
24335
diff
changeset
|
1146 ;; identifier (may contain "." in Java) |
1dc57e616e8d
(c-inside-bracelist-p): Tighter test for
Richard M. Stallman <rms@gnu.org>
parents:
24335
diff
changeset
|
1147 ;; or another "[]" sexp. |
1dc57e616e8d
(c-inside-bracelist-p): Tighter test for
Richard M. Stallman <rms@gnu.org>
parents:
24335
diff
changeset
|
1148 'dontknow) |
1dc57e616e8d
(c-inside-bracelist-p): Tighter test for
Richard M. Stallman <rms@gnu.org>
parents:
24335
diff
changeset
|
1149 (t nil))))) |
1dc57e616e8d
(c-inside-bracelist-p): Tighter test for
Richard M. Stallman <rms@gnu.org>
parents:
24335
diff
changeset
|
1150 ;; Checks to do on all sexps before the brace, up to the |
1dc57e616e8d
(c-inside-bracelist-p): Tighter test for
Richard M. Stallman <rms@gnu.org>
parents:
24335
diff
changeset
|
1151 ;; beginning of the statement. |
1dc57e616e8d
(c-inside-bracelist-p): Tighter test for
Richard M. Stallman <rms@gnu.org>
parents:
24335
diff
changeset
|
1152 (while (eq braceassignp 'dontknow) |
24282 | 1153 (cond ((eq (char-after) ?\;) |
1154 (setq braceassignp nil)) | |
1155 ((and class-key | |
1156 (looking-at class-key)) | |
1157 (setq braceassignp nil)) | |
1158 ((eq (char-after) ?=) | |
1159 ;; We've seen a =, but must check earlier tokens so | |
1160 ;; that it isn't something that should be ignored. | |
1161 (setq braceassignp 'maybe) | |
1162 (while (and (eq braceassignp 'maybe) | |
1163 (zerop (c-backward-token-1 1 t lim))) | |
1164 (setq braceassignp | |
1165 (cond | |
1166 ;; Check for operator = | |
1167 ((looking-at "operator\\>") nil) | |
1168 ;; Check for `<opchar>= (Pike) | |
1169 ((eq (char-after) ?`) nil) | |
1170 ((looking-at "\\s.") 'maybe) | |
1171 ;; make sure we're not in a C++ template | |
1172 ;; argument assignment | |
1173 ((save-excursion | |
1174 (let ((here (point)) | |
1175 (pos< (progn | |
1176 (skip-chars-backward "^<") | |
1177 (point)))) | |
1178 (and (c-major-mode-is 'c++-mode) | |
1179 (eq (char-before) ?<) | |
1180 (not (c-crosses-statement-barrier-p | |
25178
1dc57e616e8d
(c-inside-bracelist-p): Tighter test for
Richard M. Stallman <rms@gnu.org>
parents:
24335
diff
changeset
|
1181 pos< here)) |
24282 | 1182 (not (c-in-literal)) |
1183 ))) | |
1184 nil) | |
25178
1dc57e616e8d
(c-inside-bracelist-p): Tighter test for
Richard M. Stallman <rms@gnu.org>
parents:
24335
diff
changeset
|
1185 (t t)))))) |
1dc57e616e8d
(c-inside-bracelist-p): Tighter test for
Richard M. Stallman <rms@gnu.org>
parents:
24335
diff
changeset
|
1186 (if (and (eq braceassignp 'dontknow) |
1dc57e616e8d
(c-inside-bracelist-p): Tighter test for
Richard M. Stallman <rms@gnu.org>
parents:
24335
diff
changeset
|
1187 (/= (c-backward-token-1 1 t lim) 0)) |
1dc57e616e8d
(c-inside-bracelist-p): Tighter test for
Richard M. Stallman <rms@gnu.org>
parents:
24335
diff
changeset
|
1188 (setq braceassignp nil))) |
1dc57e616e8d
(c-inside-bracelist-p): Tighter test for
Richard M. Stallman <rms@gnu.org>
parents:
24335
diff
changeset
|
1189 (if (not braceassignp) |
24282 | 1190 (if (eq (char-after) ?\;) |
1191 ;; Brace lists can't contain a semicolon, so we're done. | |
1192 (setq containing-sexp nil) | |
1193 ;; lets see if we're nested. find the most nested | |
1194 ;; containing brace | |
1195 (setq containing-sexp (car brace-state) | |
1196 brace-state (cdr brace-state))) | |
1197 ;; we've hit the beginning of the aggregate list | |
1198 (c-beginning-of-statement-1 | |
1199 (c-most-enclosing-brace brace-state)) | |
1200 (setq bufpos (point)))) | |
18720 | 1201 )) |
1202 bufpos)) | |
1203 )) | |
1204 | |
24282 | 1205 (defun c-looking-at-special-brace-list (&optional lim) |
1206 ;; If we're looking at the start of a pike-style list, ie `({ })', | |
1207 ;; `([ ])', `(< >)' etc, a cons of a cons its starting and ending | |
1208 ;; positions and its entry in c-special-brace-lists is returned, nil | |
1209 ;; otherwise. The ending position is nil if the list is still open. | |
1210 ;; LIM is the limit for forward search. The point may either be at | |
1211 ;; the `(' or at the following paren character. Tries to check the | |
1212 ;; matching closer, but assumes it's correct if no balanced paren is | |
1213 ;; found (i.e. the case `({ ... } ... )' is detected as _not_ being | |
1214 ;; a special brace list). | |
1215 (if c-special-brace-lists | |
1216 (condition-case () | |
1217 (save-excursion | |
1218 (let ((beg (point)) | |
1219 end type) | |
1220 (c-forward-syntactic-ws) | |
1221 (if (eq (char-after) ?\() | |
1222 (progn | |
1223 (forward-char 1) | |
1224 (c-forward-syntactic-ws) | |
1225 (setq type (assq (char-after) c-special-brace-lists))) | |
1226 (if (setq type (assq (char-after) c-special-brace-lists)) | |
1227 (progn | |
1228 (c-backward-syntactic-ws) | |
1229 (forward-char -1) | |
1230 (setq beg (if (eq (char-after) ?\() | |
1231 (point) | |
1232 nil))))) | |
1233 (if (and beg type) | |
1234 (if (and (c-safe (goto-char beg) | |
1235 (c-forward-sexp 1) | |
1236 (setq end (point)) | |
1237 (= (char-before) ?\))) | |
1238 (c-safe (goto-char beg) | |
1239 (forward-char 1) | |
1240 (c-forward-sexp 1) | |
1241 ;; Kludges needed to handle inner | |
1242 ;; chars both with and without | |
1243 ;; paren syntax. | |
1244 (or (/= (char-syntax (char-before)) ?\)) | |
1245 (= (char-before) (cdr type))))) | |
1246 (if (or (/= (char-syntax (char-before)) ?\)) | |
1247 (= (progn | |
1248 (c-forward-syntactic-ws) | |
1249 (point)) | |
1250 (1- end))) | |
1251 (cons (cons beg end) type)) | |
1252 (cons (list beg) type))))) | |
1253 (error nil)))) | |
1254 | |
1255 (defun c-looking-at-inexpr-block (&optional lim) | |
1256 ;; Returns non-nil if we're looking at the beginning of a block | |
1257 ;; inside an expression. The value returned is actually a cons of | |
1258 ;; either 'inlambda, 'inexpr-statement or 'inexpr-class and the | |
1259 ;; position of the beginning of the construct. LIM limits the | |
1260 ;; backward search. | |
1261 (save-excursion | |
1262 (or lim (setq lim (point-min))) | |
26817 | 1263 (let ((block-follows (eq (char-after) ?{))) |
1264 ;; Look at the character after point only as a last resort when | |
1265 ;; we can't disambiguate. | |
1266 (if (and block-follows | |
1267 (progn (c-backward-syntactic-ws) (> (point) lim)) | |
1268 (eq (char-before) ?\() | |
1269 (not (and c-special-brace-lists | |
1270 (c-looking-at-special-brace-list)))) | |
1271 (cons 'inexpr-statement (point)) | |
1272 (let (res) | |
1273 (while (and (not res) | |
1274 (= (c-backward-token-1 1 t lim) 0) | |
1275 (>= (point) lim) | |
1276 (looking-at "(\\|\\w\\|\\s_\\|\\.")) | |
1277 (setq res | |
1278 (cond ((and block-follows | |
1279 c-inexpr-class-key | |
1280 (looking-at c-inexpr-class-key)) | |
1281 (cons 'inexpr-class (point))) | |
1282 ((and c-inexpr-block-key | |
1283 (looking-at c-inexpr-block-key)) | |
1284 (cons 'inexpr-statement (point))) | |
1285 ((and c-lambda-key | |
1286 (looking-at c-lambda-key)) | |
1287 (cons 'inlambda (point)))))) | |
1288 res))))) | |
24282 | 1289 |
1290 (defun c-looking-at-inexpr-block-backward (&optional lim) | |
1291 ;; Returns non-nil if we're looking at the end of an in-expression | |
1292 ;; block, otherwise the same as `c-looking-at-inexpr-block'. | |
1293 (save-excursion | |
1294 (let ((lim (or lim (c-point 'bod)))) | |
1295 (c-safe | |
1296 (c-backward-syntactic-ws lim) | |
1297 (if (eq (char-before) ?}) ; Recognize only a block currently. | |
1298 (progn | |
1299 (c-forward-sexp -1) | |
1300 (if (>= (point) lim) | |
1301 (c-looking-at-inexpr-block lim)))))))) | |
1302 | |
18720 | 1303 |
1304 (defun c-most-enclosing-brace (state) | |
1305 ;; return the bufpos of the most enclosing brace that hasn't been | |
1306 ;; narrowed out by any enclosing class, or nil if none was found | |
1307 (let (enclosingp) | |
1308 (while (and state (not enclosingp)) | |
1309 (setq enclosingp (car state) | |
1310 state (cdr state)) | |
1311 (if (consp enclosingp) | |
1312 (setq enclosingp nil) | |
1313 (if (> (point-min) enclosingp) | |
1314 (setq enclosingp nil)) | |
1315 (setq state nil))) | |
1316 enclosingp)) | |
1317 | |
1318 (defun c-least-enclosing-brace (state) | |
1319 ;; return the bufpos of the least (highest) enclosing brace that | |
1320 ;; hasn't been narrowed out by any enclosing class, or nil if none | |
1321 ;; was found. | |
1322 (c-most-enclosing-brace (nreverse state))) | |
1323 | |
1324 (defun c-safe-position (bufpos state) | |
1325 ;; return the closest known safe position higher up than point | |
1326 (let ((safepos nil)) | |
1327 (while state | |
1328 (setq safepos | |
1329 (if (consp (car state)) | |
1330 (cdr (car state)) | |
1331 (car state))) | |
1332 (if (< safepos bufpos) | |
1333 (setq state nil) | |
1334 (setq state (cdr state)))) | |
1335 safepos)) | |
1336 | |
1337 (defun c-narrow-out-enclosing-class (state lim) | |
1338 ;; narrow the buffer so that the enclosing class is hidden | |
1339 (let (inclass-p) | |
1340 (and state | |
1341 (setq inclass-p (c-search-uplist-for-classkey state)) | |
1342 (narrow-to-region | |
1343 (progn | |
1344 (goto-char (1+ (aref inclass-p 1))) | |
1345 (skip-chars-forward " \t\n" lim) | |
1346 ;; if point is now left of the class opening brace, we're | |
1347 ;; hosed, so try a different tact | |
1348 (if (<= (point) (aref inclass-p 1)) | |
1349 (progn | |
1350 (goto-char (1+ (aref inclass-p 1))) | |
1351 (c-forward-syntactic-ws lim))) | |
1352 (point)) | |
1353 ;; end point is the end of the current line | |
1354 (progn | |
1355 (goto-char lim) | |
1356 (c-point 'eol)))) | |
1357 ;; return the class vector | |
1358 inclass-p)) | |
1359 | |
1360 | |
1361 ;; This function implements the main decision tree for determining the | |
1362 ;; syntactic analysis of the current line of code. Yes, it's huge and | |
1363 ;; bloated! | |
1364 | |
1365 (defun c-guess-basic-syntax () | |
1366 (save-excursion | |
1367 (save-restriction | |
1368 (beginning-of-line) | |
1369 (let* ((indent-point (point)) | |
1370 (case-fold-search nil) | |
1371 (fullstate (c-parse-state)) | |
1372 (state fullstate) | |
24282 | 1373 (in-method-intro-p (and (c-major-mode-is 'objc-mode) |
18720 | 1374 c-method-key |
1375 (looking-at c-method-key))) | |
1376 literal containing-sexp char-before-ip char-after-ip lim | |
1377 syntax placeholder c-in-literal-cache inswitch-p | |
24282 | 1378 tmpsymbol keyword injava-inher special-brace-list |
18720 | 1379 ;; narrow out any enclosing class or extern "C" block |
1380 (inclass-p (c-narrow-out-enclosing-class state indent-point)) | |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1381 inenclosing-p) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1382 ;; check for meta top-level enclosing constructs, possible |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1383 ;; extern language definitions, possibly (in C++) namespace |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1384 ;; definitions. |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1385 (save-excursion |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1386 (save-restriction |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1387 (widen) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1388 (if (and inclass-p |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1389 (progn |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1390 (goto-char (aref inclass-p 0)) |
24282 | 1391 (looking-at (concat c-extra-toplevel-key "[^_]")))) |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1392 (let ((enclosing (match-string 1))) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1393 (cond |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1394 ((string-equal enclosing "extern") |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1395 (setq inenclosing-p 'extern)) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1396 ((string-equal enclosing "namespace") |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1397 (setq inenclosing-p 'namespace)) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1398 ))))) |
18720 | 1399 ;; get the buffer position of the most nested opening brace, |
1400 ;; if there is one, and it hasn't been narrowed out | |
1401 (save-excursion | |
1402 (goto-char indent-point) | |
1403 (skip-chars-forward " \t}") | |
1404 (skip-chars-backward " \t") | |
1405 (while (and state | |
1406 (not in-method-intro-p) | |
1407 (not containing-sexp)) | |
1408 (setq containing-sexp (car state) | |
1409 state (cdr state)) | |
1410 (if (consp containing-sexp) | |
1411 ;; if cdr == point, then containing sexp is the brace | |
1412 ;; that opens the sexp we close | |
1413 (if (= (cdr containing-sexp) (point)) | |
1414 (setq containing-sexp (car containing-sexp)) | |
1415 ;; otherwise, ignore this element | |
1416 (setq containing-sexp nil)) | |
1417 ;; ignore the bufpos if its been narrowed out by the | |
1418 ;; containing class | |
1419 (if (<= containing-sexp (point-min)) | |
1420 (setq containing-sexp nil))))) | |
1421 | |
1422 ;; set the limit on the farthest back we need to search | |
1423 (setq lim (or containing-sexp | |
1424 (if (consp (car fullstate)) | |
1425 (cdr (car fullstate)) | |
1426 nil) | |
1427 (point-min))) | |
1428 | |
1429 ;; cache char before and after indent point, and move point to | |
1430 ;; the most likely position to perform the majority of tests | |
1431 (goto-char indent-point) | |
1432 (skip-chars-forward " \t") | |
1433 (setq char-after-ip (char-after)) | |
1434 (c-backward-syntactic-ws lim) | |
1435 (setq char-before-ip (char-before)) | |
1436 (goto-char indent-point) | |
1437 (skip-chars-forward " \t") | |
1438 | |
1439 ;; are we in a literal? | |
1440 (setq literal (c-in-literal lim)) | |
1441 | |
1442 ;; now figure out syntactic qualities of the current line | |
1443 (cond | |
1444 ;; CASE 1: in a string. | |
1445 ((memq literal '(string)) | |
1446 (c-add-syntax 'string (c-point 'bopl))) | |
1447 ;; CASE 2: in a C or C++ style comment. | |
1448 ((memq literal '(c c++)) | |
26817 | 1449 (c-add-syntax literal (car (c-literal-limits lim)))) |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1450 ;; CASE 3: in a cpp preprocessor macro |
18720 | 1451 ((eq literal 'pound) |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1452 (let ((boi (c-point 'boi)) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1453 (macrostart (progn (c-beginning-of-macro lim) (point)))) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1454 (setq tmpsymbol (if (= boi macrostart) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1455 'cpp-macro |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1456 'cpp-macro-cont)) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1457 (c-add-syntax tmpsymbol macrostart))) |
18720 | 1458 ;; CASE 4: in an objective-c method intro |
1459 (in-method-intro-p | |
1460 (c-add-syntax 'objc-method-intro (c-point 'boi))) | |
1461 ;; CASE 5: Line is at top level. | |
1462 ((null containing-sexp) | |
1463 (cond | |
24282 | 1464 ;; CASE 5A: we are looking at a defun, brace list, class, |
1465 ;; or inline-inclass method opening brace | |
1466 ((setq special-brace-list | |
1467 (or (and c-special-brace-lists | |
1468 (c-looking-at-special-brace-list)) | |
1469 (eq char-after-ip ?{))) | |
18720 | 1470 (cond |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1471 ;; CASE 5A.1: extern language or namespace construct |
18720 | 1472 ((save-excursion |
1473 (goto-char indent-point) | |
1474 (skip-chars-forward " \t") | |
24282 | 1475 (and (c-safe (progn (c-backward-sexp 2) t)) |
1476 (looking-at (concat c-extra-toplevel-key "[^_]")) | |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1477 (setq keyword (match-string 1) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1478 placeholder (point)) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1479 (or (and (string-equal keyword "namespace") |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1480 (setq tmpsymbol 'namespace-open)) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1481 (and (string-equal keyword "extern") |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1482 (progn |
24282 | 1483 (c-forward-sexp 1) |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1484 (c-forward-syntactic-ws) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1485 (eq (char-after) ?\")) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1486 (setq tmpsymbol 'extern-lang-open))) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1487 )) |
18720 | 1488 (goto-char placeholder) |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1489 (c-add-syntax tmpsymbol (c-point 'boi))) |
18720 | 1490 ;; CASE 5A.2: we are looking at a class opening brace |
1491 ((save-excursion | |
1492 (goto-char indent-point) | |
1493 (skip-chars-forward " \t{") | |
1494 ;; TBD: watch out! there could be a bogus | |
1495 ;; c-state-cache in place when we get here. we have | |
1496 ;; to go through much chicanery to ignore the cache. | |
1497 ;; But of course, there may not be! BLECH! BOGUS! | |
1498 (let ((decl | |
1499 (if (boundp 'c-state-cache) | |
1500 (let ((old-cache c-state-cache)) | |
1501 (prog2 | |
1502 (makunbound 'c-state-cache) | |
1503 (c-search-uplist-for-classkey (c-parse-state)) | |
1504 (setq c-state-cache old-cache))) | |
1505 (c-search-uplist-for-classkey (c-parse-state)) | |
1506 ))) | |
1507 (and decl | |
1508 (setq placeholder (aref decl 0))) | |
1509 )) | |
1510 (c-add-syntax 'class-open placeholder)) | |
1511 ;; CASE 5A.3: brace list open | |
1512 ((save-excursion | |
1513 (c-beginning-of-statement-1 lim) | |
1514 ;; c-b-o-s could have left us at point-min | |
1515 (and (bobp) | |
1516 (c-forward-syntactic-ws indent-point)) | |
1517 (if (looking-at "typedef[^_]") | |
24282 | 1518 (progn (c-forward-sexp 1) |
18720 | 1519 (c-forward-syntactic-ws indent-point))) |
1520 (setq placeholder (c-point 'boi)) | |
24282 | 1521 (or (consp special-brace-list) |
1522 (and (or (looking-at "enum[ \t\n]+") | |
1523 (save-excursion | |
1524 (goto-char indent-point) | |
1525 (while (and (> (point) placeholder) | |
1526 (= (c-backward-token-1 1 t) 0) | |
1527 (/= (char-after) ?=))) | |
1528 (eq (char-after) ?=))) | |
21106
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
1529 (save-excursion |
24282 | 1530 (while (and (< (point) indent-point) |
1531 (= (c-forward-token-1 1 t) 0) | |
1532 (not (memq (char-after) '(?\; ?\())))) | |
1533 (not (memq (char-after) '(?\; ?\())) | |
1534 )))) | |
18720 | 1535 (c-add-syntax 'brace-list-open placeholder)) |
1536 ;; CASE 5A.4: inline defun open | |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1537 ((and inclass-p (not inenclosing-p)) |
18720 | 1538 (c-add-syntax 'inline-open) |
24282 | 1539 (c-add-class-syntax 'inclass inclass-p)) |
18720 | 1540 ;; CASE 5A.5: ordinary defun open |
1541 (t | |
1542 (goto-char placeholder) | |
21106
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
1543 (if inclass-p |
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
1544 (c-add-syntax 'defun-open (c-point 'boi)) |
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
1545 (c-add-syntax 'defun-open (c-point 'bol))) |
18720 | 1546 ))) |
1547 ;; CASE 5B: first K&R arg decl or member init | |
1548 ((c-just-after-func-arglist-p) | |
1549 (cond | |
1550 ;; CASE 5B.1: a member init | |
1551 ((or (eq char-before-ip ?:) | |
1552 (eq char-after-ip ?:)) | |
1553 ;; this line should be indented relative to the beginning | |
1554 ;; of indentation for the topmost-intro line that contains | |
1555 ;; the prototype's open paren | |
1556 ;; TBD: is the following redundant? | |
1557 (if (eq char-before-ip ?:) | |
1558 (forward-char -1)) | |
1559 (c-backward-syntactic-ws lim) | |
1560 ;; TBD: is the preceding redundant? | |
1561 (if (eq (char-before) ?:) | |
1562 (progn (forward-char -1) | |
1563 (c-backward-syntactic-ws lim))) | |
1564 (if (eq (char-before) ?\)) | |
24282 | 1565 (c-backward-sexp 1)) |
18720 | 1566 (setq placeholder (point)) |
1567 (save-excursion | |
24282 | 1568 (and (c-safe (c-backward-sexp 1) t) |
18720 | 1569 (looking-at "throw[^_]") |
24282 | 1570 (c-safe (c-backward-sexp 1) t) |
18720 | 1571 (setq placeholder (point)))) |
1572 (goto-char placeholder) | |
1573 (c-add-syntax 'member-init-intro (c-point 'boi)) | |
1574 ;; we don't need to add any class offset since this | |
1575 ;; should be relative to the ctor's indentation | |
1576 ) | |
1577 ;; CASE 5B.2: K&R arg decl intro | |
1578 (c-recognize-knr-p | |
1579 (c-add-syntax 'knr-argdecl-intro (c-point 'boi)) | |
24282 | 1580 (if inclass-p (c-add-class-syntax 'inclass inclass-p))) |
18720 | 1581 ;; CASE 5B.3: Nether region after a C++ or Java func |
1582 ;; decl, which could include a `throws' declaration. | |
1583 (t | |
1584 (c-beginning-of-statement-1 lim) | |
1585 (c-add-syntax 'func-decl-cont (c-point 'boi)) | |
1586 ))) | |
1587 ;; CASE 5C: inheritance line. could be first inheritance | |
1588 ;; line, or continuation of a multiple inheritance | |
1589 ((or (and c-baseclass-key (looking-at c-baseclass-key)) | |
1590 (and (or (eq char-before-ip ?:) | |
1591 ;; watch out for scope operator | |
1592 (save-excursion | |
1593 (and (eq char-after-ip ?:) | |
1594 (c-safe (progn (forward-char 1) t)) | |
1595 (not (eq (char-after) ?:)) | |
1596 ))) | |
1597 (save-excursion | |
1598 (c-backward-syntactic-ws lim) | |
1599 (if (eq char-before-ip ?:) | |
1600 (progn | |
1601 (forward-char -1) | |
1602 (c-backward-syntactic-ws lim))) | |
1603 (back-to-indentation) | |
1604 (looking-at c-class-key))) | |
1605 ;; for Java | |
24282 | 1606 (and (c-major-mode-is 'java-mode) |
18720 | 1607 (let ((fence (save-excursion |
1608 (c-beginning-of-statement-1 lim) | |
1609 (point))) | |
1610 cont done) | |
1611 (save-excursion | |
1612 (while (not done) | |
1613 (cond ((looking-at c-Java-special-key) | |
1614 (setq injava-inher (cons cont (point)) | |
1615 done t)) | |
24282 | 1616 ((or (not (c-safe (c-forward-sexp -1) t)) |
18720 | 1617 (<= (point) fence)) |
1618 (setq done t)) | |
1619 ) | |
1620 (setq cont t))) | |
1621 injava-inher) | |
1622 (not (c-crosses-statement-barrier-p (cdr injava-inher) | |
1623 (point))) | |
1624 )) | |
1625 (cond | |
1626 ;; CASE 5C.1: non-hanging colon on an inher intro | |
1627 ((eq char-after-ip ?:) | |
1628 (c-backward-syntactic-ws lim) | |
1629 (c-add-syntax 'inher-intro (c-point 'boi)) | |
1630 ;; don't add inclass symbol since relative point already | |
1631 ;; contains any class offset | |
1632 ) | |
1633 ;; CASE 5C.2: hanging colon on an inher intro | |
1634 ((eq char-before-ip ?:) | |
1635 (c-add-syntax 'inher-intro (c-point 'boi)) | |
24282 | 1636 (if inclass-p (c-add-class-syntax 'inclass inclass-p))) |
18720 | 1637 ;; CASE 5C.3: in a Java implements/extends |
1638 (injava-inher | |
1639 (let ((where (cdr injava-inher)) | |
1640 (cont (car injava-inher))) | |
1641 (goto-char where) | |
1642 (cond ((looking-at "throws[ \t\n]") | |
1643 (c-add-syntax 'func-decl-cont | |
1644 (progn (c-beginning-of-statement-1 lim) | |
1645 (c-point 'boi)))) | |
1646 (cont (c-add-syntax 'inher-cont where)) | |
1647 (t (c-add-syntax 'inher-intro | |
1648 (progn (goto-char (cdr injava-inher)) | |
1649 (c-beginning-of-statement-1 lim) | |
1650 (point)))) | |
1651 ))) | |
1652 ;; CASE 5C.4: a continued inheritance line | |
1653 (t | |
1654 (c-beginning-of-inheritance-list lim) | |
1655 (c-add-syntax 'inher-cont (point)) | |
1656 ;; don't add inclass symbol since relative point already | |
1657 ;; contains any class offset | |
1658 ))) | |
26817 | 1659 ;; CASE 5D: this could be a top-level compound statement, a |
1660 ;; member init list continuation, or a template argument | |
1661 ;; list continuation. | |
1662 ((c-with-syntax-table (if (c-major-mode-is 'c++-mode) | |
1663 c++-template-syntax-table | |
1664 (syntax-table)) | |
1665 (save-excursion | |
1666 (while (and (= (c-backward-token-1 1 t lim) 0) | |
1667 (not (looking-at "[;{<,]")))) | |
1668 (eq (char-after) ?,))) | |
18720 | 1669 (goto-char indent-point) |
1670 (c-backward-syntactic-ws lim) | |
1671 (while (and (< lim (point)) | |
1672 (eq (char-before) ?,)) | |
1673 ;; this will catch member inits with multiple | |
1674 ;; line arglists | |
1675 (forward-char -1) | |
1676 (c-backward-syntactic-ws (c-point 'bol)) | |
1677 (if (eq (char-before) ?\)) | |
24282 | 1678 (c-backward-sexp 2) |
1679 (c-backward-sexp 1)) | |
18720 | 1680 ;; now continue checking |
1681 (c-backward-syntactic-ws lim)) | |
1682 (cond | |
1683 ;; CASE 5D.1: hanging member init colon, but watch out | |
1684 ;; for bogus matches on access specifiers inside classes. | |
24282 | 1685 ((and (save-excursion |
1686 ;; There might be member inits on the first line too. | |
1687 (while (and (> (point) lim) | |
1688 (eq (char-before) ?,) | |
1689 (= (c-backward-token-1 2 t lim) 0) | |
1690 (eq (char-after) ?\() | |
1691 (= (c-backward-token-1 1 t lim) 0)) | |
1692 (c-backward-syntactic-ws lim)) | |
1693 (setq placeholder (point)) | |
26817 | 1694 (c-backward-token-1 1 t lim) |
1695 (and (eq (char-after) ?:) | |
1696 (not (eq (char-before) ?:)))) | |
18720 | 1697 (save-excursion |
24282 | 1698 (goto-char placeholder) |
1699 (back-to-indentation) | |
1700 (and | |
26817 | 1701 (if c-access-key (not (looking-at c-access-key)) t) |
1702 (not (looking-at c-class-key)) | |
1703 (if c-bitfield-key (not (looking-at c-bitfield-key)) t)) | |
24282 | 1704 )) |
1705 (goto-char placeholder) | |
1706 (c-forward-syntactic-ws) | |
1707 (c-add-syntax 'member-init-cont (point)) | |
18720 | 1708 ;; we do not need to add class offset since relative |
1709 ;; point is the member init above us | |
1710 ) | |
1711 ;; CASE 5D.2: non-hanging member init colon | |
1712 ((progn | |
1713 (c-forward-syntactic-ws indent-point) | |
1714 (eq (char-after) ?:)) | |
1715 (skip-chars-forward " \t:") | |
1716 (c-add-syntax 'member-init-cont (point))) | |
1717 ;; CASE 5D.3: perhaps a multiple inheritance line? | |
24282 | 1718 ((save-excursion |
1719 (c-beginning-of-statement-1 lim) | |
1720 (setq placeholder (point)) | |
1721 (looking-at c-inher-key)) | |
1722 (goto-char placeholder) | |
18720 | 1723 (c-add-syntax 'inher-cont (c-point 'boi))) |
1724 ;; CASE 5D.4: perhaps a template list continuation? | |
1725 ((save-excursion | |
19301
c4d7dd15f7d5
(c-guess-basic-syntax): CASE 5D.4: template argument continuation
Richard M. Stallman <rms@gnu.org>
parents:
19251
diff
changeset
|
1726 (goto-char indent-point) |
18720 | 1727 (skip-chars-backward "^<" lim) |
1728 ;; not sure if this is the right test, but it should | |
1729 ;; be fast and mostly accurate. | |
24282 | 1730 (setq placeholder (point)) |
18720 | 1731 (and (eq (char-before) ?<) |
1732 (not (c-in-literal lim)))) | |
19301
c4d7dd15f7d5
(c-guess-basic-syntax): CASE 5D.4: template argument continuation
Richard M. Stallman <rms@gnu.org>
parents:
19251
diff
changeset
|
1733 ;; we can probably indent it just like an arglist-cont |
24282 | 1734 (goto-char placeholder) |
1735 (c-beginning-of-statement-1 lim) | |
26817 | 1736 (c-add-syntax 'template-args-cont (c-point 'boi))) |
18720 | 1737 ;; CASE 5D.5: perhaps a top-level statement-cont |
1738 (t | |
1739 (c-beginning-of-statement-1 lim) | |
1740 ;; skip over any access-specifiers | |
1741 (and inclass-p c-access-key | |
1742 (while (looking-at c-access-key) | |
1743 (forward-line 1))) | |
1744 ;; skip over comments, whitespace | |
1745 (c-forward-syntactic-ws indent-point) | |
1746 (c-add-syntax 'statement-cont (c-point 'boi))) | |
1747 )) | |
1748 ;; CASE 5E: we are looking at a access specifier | |
1749 ((and inclass-p | |
1750 c-access-key | |
1751 (looking-at c-access-key)) | |
1752 (c-add-syntax 'access-label (c-point 'bonl)) | |
24282 | 1753 (c-add-class-syntax 'inclass inclass-p)) |
21106
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
1754 ;; CASE 5F: extern-lang-close or namespace-close? |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1755 ((and inenclosing-p |
18720 | 1756 (eq char-after-ip ?})) |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1757 (setq tmpsymbol (if (eq inenclosing-p 'extern) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1758 'extern-lang-close |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1759 'namespace-close)) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1760 (c-add-syntax tmpsymbol (aref inclass-p 0))) |
18720 | 1761 ;; CASE 5G: we are looking at the brace which closes the |
1762 ;; enclosing nested class decl | |
1763 ((and inclass-p | |
1764 (eq char-after-ip ?}) | |
1765 (save-excursion | |
1766 (save-restriction | |
1767 (widen) | |
1768 (forward-char 1) | |
24282 | 1769 (and (c-safe (progn (c-backward-sexp 1) t)) |
1770 (= (point) (aref inclass-p 1)) | |
1771 )))) | |
1772 (c-add-class-syntax 'class-close inclass-p)) | |
18720 | 1773 ;; CASE 5H: we could be looking at subsequent knr-argdecls |
1774 ((and c-recognize-knr-p | |
1775 ;; here we essentially use the hack that is used in | |
1776 ;; Emacs' c-mode.el to limit how far back we should | |
1777 ;; look. The assumption is made that argdecls are | |
1778 ;; indented at least one space and that function | |
1779 ;; headers are not indented. | |
1780 (let ((limit (save-excursion | |
1781 (re-search-backward "^[^ \^L\t\n#]" nil 'move) | |
1782 (point)))) | |
1783 (save-excursion | |
1784 (c-backward-syntactic-ws limit) | |
1785 (setq placeholder (point)) | |
1786 (while (and (memq (char-before) '(?\; ?,)) | |
1787 (> (point) limit)) | |
1788 (beginning-of-line) | |
1789 (setq placeholder (point)) | |
1790 (c-backward-syntactic-ws limit)) | |
1791 (and (eq (char-before) ?\)) | |
1792 (or (not c-method-key) | |
1793 (progn | |
24282 | 1794 (c-forward-sexp -1) |
18720 | 1795 (forward-char -1) |
1796 (c-backward-syntactic-ws) | |
1797 (not (or (memq (char-before) '(?- ?+)) | |
1798 ;; or a class category | |
1799 (progn | |
24282 | 1800 (c-forward-sexp -2) |
18720 | 1801 (looking-at c-class-key)) |
1802 ))))) | |
1803 )) | |
1804 (save-excursion | |
1805 (c-beginning-of-statement-1) | |
1806 (not (looking-at "typedef[ \t\n]+")))) | |
1807 (goto-char placeholder) | |
1808 (c-add-syntax 'knr-argdecl (c-point 'boi))) | |
1809 ;; CASE 5I: we are at the topmost level, make sure we skip | |
1810 ;; back past any access specifiers | |
1811 ((progn | |
1812 (c-backward-syntactic-ws lim) | |
1813 (while (and inclass-p | |
1814 c-access-key | |
1815 (not (bobp)) | |
1816 (save-excursion | |
24282 | 1817 (c-safe (progn (c-backward-sexp 1) t)) |
18720 | 1818 (looking-at c-access-key))) |
24282 | 1819 (c-backward-sexp 1) |
18720 | 1820 (c-backward-syntactic-ws lim)) |
1821 (or (bobp) | |
1822 (memq (char-before) '(?\; ?\})))) | |
1823 ;; real beginning-of-line could be narrowed out due to | |
1824 ;; enclosure in a class block | |
1825 (save-restriction | |
1826 (widen) | |
1827 (c-add-syntax 'topmost-intro (c-point 'bol)) | |
1828 (if inclass-p | |
1829 (progn | |
1830 (goto-char (aref inclass-p 1)) | |
19251
6a7d40ec4b29
(c-beginning-of-statement-1): When checking for bare semi, don't match
Richard M. Stallman <rms@gnu.org>
parents:
18844
diff
changeset
|
1831 (or (= (point) (c-point 'boi)) |
6a7d40ec4b29
(c-beginning-of-statement-1): When checking for bare semi, don't match
Richard M. Stallman <rms@gnu.org>
parents:
18844
diff
changeset
|
1832 (goto-char (aref inclass-p 0))) |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1833 (cond |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1834 ((eq inenclosing-p 'extern) |
21106
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
1835 (c-add-syntax 'inextern-lang (c-point 'boi))) |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1836 ((eq inenclosing-p 'namespace) |
21106
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
1837 (c-add-syntax 'innamespace (c-point 'boi))) |
24282 | 1838 (t (c-add-class-syntax 'inclass inclass-p))) |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1839 )) |
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1840 )) |
18720 | 1841 ;; CASE 5J: we are at an ObjC or Java method definition |
1842 ;; continuation line. | |
1843 ((and c-method-key | |
1844 (progn | |
1845 (c-beginning-of-statement-1 lim) | |
1846 (beginning-of-line) | |
1847 (looking-at c-method-key))) | |
1848 (c-add-syntax 'objc-method-args-cont (point))) | |
26817 | 1849 ;; CASE 5K: we are at the first argument of a template |
1850 ;; arglist that begins on the previous line. | |
1851 ((eq (char-before) ?<) | |
1852 (c-beginning-of-statement-1 lim) | |
1853 (c-forward-syntactic-ws) | |
1854 (c-add-syntax 'template-args-cont (c-point 'boi))) | |
1855 ;; CASE 5L: we are at a topmost continuation line | |
18720 | 1856 (t |
1857 (c-beginning-of-statement-1 lim) | |
1858 (c-forward-syntactic-ws) | |
1859 (c-add-syntax 'topmost-intro-cont (c-point 'boi))) | |
1860 )) ; end CASE 5 | |
24282 | 1861 ;; CASE 6: In-expression statement. |
1862 ((and (or c-inexpr-class-key c-inexpr-block-key c-lambda-key) | |
1863 (setq placeholder (c-looking-at-inexpr-block))) | |
1864 (setq tmpsymbol (assq (car placeholder) | |
1865 '((inexpr-class . class-open) | |
1866 (inexpr-statement . block-open)))) | |
1867 (if tmpsymbol | |
1868 ;; It's a statement block or an anonymous class. | |
1869 (setq tmpsymbol (cdr tmpsymbol)) | |
1870 ;; It's a Pike lambda. Check whether we are between the | |
1871 ;; lambda keyword and the argument list or at the defun | |
1872 ;; opener. | |
26817 | 1873 (setq tmpsymbol (if (eq char-after-ip ?{) |
1874 'inline-open | |
1875 'lambda-intro-cont))) | |
24282 | 1876 (goto-char (cdr placeholder)) |
1877 (c-add-syntax tmpsymbol (c-point 'boi)) | |
1878 (c-add-syntax (car placeholder))) | |
1879 ;; CASE 7: line is an expression, not a statement. Most | |
18720 | 1880 ;; likely we are either in a function prototype or a function |
1881 ;; call argument list | |
24282 | 1882 ((not (or (and c-special-brace-lists |
1883 (save-excursion | |
1884 (goto-char containing-sexp) | |
1885 (c-looking-at-special-brace-list))) | |
1886 (eq (char-after containing-sexp) ?{))) | |
18720 | 1887 (c-backward-syntactic-ws containing-sexp) |
1888 (cond | |
24282 | 1889 ;; CASE 7A: we are looking at the arglist closing paren |
26817 | 1890 ((and (or (c-major-mode-is 'pike-mode) |
1891 ;; Don't check this in Pike since it allows a | |
1892 ;; comma after the last arg. | |
1893 (not (eq char-before-ip ?,))) | |
18720 | 1894 (memq char-after-ip '(?\) ?\]))) |
1895 (goto-char containing-sexp) | |
1896 (c-add-syntax 'arglist-close (c-point 'boi))) | |
24282 | 1897 ;; CASE 7B: Looking at the opening brace of an |
1898 ;; in-expression block or brace list. | |
1899 ((eq char-after-ip ?{) | |
1900 (goto-char indent-point) | |
1901 (setq placeholder (c-point 'boi)) | |
1902 (goto-char containing-sexp) | |
1903 (if (c-inside-bracelist-p placeholder | |
1904 (cons containing-sexp state)) | |
1905 (progn | |
1906 (c-add-syntax 'brace-list-open (c-point 'boi)) | |
1907 (c-add-syntax 'inexpr-class)) | |
1908 (c-add-syntax 'block-open (c-point 'boi)) | |
1909 (c-add-syntax 'inexpr-statement))) | |
1910 ;; CASE 7C: we are looking at the first argument in an empty | |
18720 | 1911 ;; argument list. Use arglist-close if we're actually |
1912 ;; looking at a close paren or bracket. | |
1913 ((memq char-before-ip '(?\( ?\[)) | |
1914 (goto-char containing-sexp) | |
1915 (c-add-syntax 'arglist-intro (c-point 'boi))) | |
24282 | 1916 ;; CASE 7D: we are inside a conditional test clause. treat |
18720 | 1917 ;; these things as statements |
1918 ((save-excursion | |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1919 (goto-char containing-sexp) |
24282 | 1920 (and (c-safe (progn (c-forward-sexp -1) t)) |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
1921 (looking-at "\\<for\\>[^_]"))) |
18720 | 1922 (goto-char (1+ containing-sexp)) |
1923 (c-forward-syntactic-ws indent-point) | |
1924 (c-beginning-of-statement-1 containing-sexp) | |
1925 (if (eq char-before-ip ?\;) | |
1926 (c-add-syntax 'statement (point)) | |
1927 (c-add-syntax 'statement-cont (point)) | |
1928 )) | |
24282 | 1929 ;; CASE 7E: maybe a continued method call. This is the case |
18720 | 1930 ;; when we are inside a [] bracketed exp, and what precede |
1931 ;; the opening bracket is not an identifier. | |
1932 ((and c-method-key | |
1933 (eq (char-after containing-sexp) ?\[) | |
1934 (save-excursion | |
1935 (goto-char (1- containing-sexp)) | |
1936 (c-backward-syntactic-ws (c-point 'bod)) | |
1937 (if (not (looking-at c-symbol-key)) | |
1938 (c-add-syntax 'objc-method-call-cont containing-sexp)) | |
1939 ))) | |
24282 | 1940 ;; CASE 7F: we are looking at an arglist continuation line, |
18720 | 1941 ;; but the preceding argument is on the same line as the |
1942 ;; opening paren. This case includes multi-line | |
1943 ;; mathematical paren groupings, but we could be on a | |
1944 ;; for-list continuation line | |
1945 ((and (save-excursion | |
1946 (goto-char (1+ containing-sexp)) | |
1947 (skip-chars-forward " \t") | |
1948 (not (eolp))) | |
1949 (save-excursion | |
1950 (c-beginning-of-statement-1 lim) | |
1951 (skip-chars-backward " \t([") | |
1952 (<= (point) containing-sexp))) | |
1953 (goto-char containing-sexp) | |
1954 (c-add-syntax 'arglist-cont-nonempty (c-point 'boi))) | |
24282 | 1955 ;; CASE 7G: we are looking at just a normal arglist |
18720 | 1956 ;; continuation line |
1957 (t (c-beginning-of-statement-1 containing-sexp) | |
1958 (forward-char 1) | |
1959 (c-forward-syntactic-ws indent-point) | |
1960 (c-add-syntax 'arglist-cont (c-point 'boi))) | |
1961 )) | |
24282 | 1962 ;; CASE 8: func-local multi-inheritance line |
18720 | 1963 ((and c-baseclass-key |
1964 (save-excursion | |
1965 (goto-char indent-point) | |
1966 (skip-chars-forward " \t") | |
1967 (looking-at c-baseclass-key))) | |
1968 (goto-char indent-point) | |
1969 (skip-chars-forward " \t") | |
1970 (cond | |
24282 | 1971 ;; CASE 8A: non-hanging colon on an inher intro |
18720 | 1972 ((eq char-after-ip ?:) |
1973 (c-backward-syntactic-ws lim) | |
1974 (c-add-syntax 'inher-intro (c-point 'boi))) | |
24282 | 1975 ;; CASE 8B: hanging colon on an inher intro |
18720 | 1976 ((eq char-before-ip ?:) |
1977 (c-add-syntax 'inher-intro (c-point 'boi))) | |
24282 | 1978 ;; CASE 8C: a continued inheritance line |
18720 | 1979 (t |
1980 (c-beginning-of-inheritance-list lim) | |
1981 (c-add-syntax 'inher-cont (point)) | |
1982 ))) | |
24282 | 1983 ;; CASE 9: we are inside a brace-list |
1984 ((setq special-brace-list | |
1985 (or (and c-special-brace-lists | |
1986 (save-excursion | |
1987 (goto-char containing-sexp) | |
1988 (c-looking-at-special-brace-list))) | |
1989 (c-inside-bracelist-p containing-sexp state))) | |
18720 | 1990 (cond |
24282 | 1991 ;; CASE 9A: In the middle of a special brace list opener. |
1992 ((and (consp special-brace-list) | |
1993 (eq char-after-ip (car (cdr special-brace-list)))) | |
1994 (goto-char (car (car special-brace-list))) | |
26817 | 1995 (skip-chars-backward " \t") |
1996 (if (bolp) | |
1997 (setq syntax (c-guess-basic-syntax)) | |
1998 (c-beginning-of-statement-1 lim) | |
1999 (c-forward-token-1 0) | |
2000 (if (looking-at "typedef\\>") (c-forward-token-1 1)) | |
2001 (c-add-syntax 'brace-list-open (c-point 'boi)))) | |
24282 | 2002 ;; CASE 9B: brace-list-close brace |
2003 ((if (consp special-brace-list) | |
2004 ;; Check special brace list closer. | |
2005 (progn | |
2006 (goto-char (car (car special-brace-list))) | |
2007 (save-excursion | |
2008 (goto-char indent-point) | |
2009 (back-to-indentation) | |
2010 (or | |
2011 ;; We were between the special close char and the `)'. | |
2012 (and (eq (char-after) ?\)) | |
2013 (eq (1+ (point)) (cdr (car special-brace-list)))) | |
2014 ;; We were before the special close char. | |
2015 (and (eq (char-after) (cdr (cdr special-brace-list))) | |
2016 (= (c-forward-token-1) 0) | |
2017 (eq (1+ (point)) (cdr (car special-brace-list))))))) | |
2018 ;; Normal brace list check. | |
2019 (and (eq char-after-ip ?}) | |
2020 (c-safe (progn (forward-char 1) | |
2021 (c-backward-sexp 1) | |
2022 t)) | |
2023 (= (point) containing-sexp))) | |
18720 | 2024 (c-add-syntax 'brace-list-close (c-point 'boi))) |
24282 | 2025 (t |
2026 ;; Prepare for the rest of the cases below by going to the | |
2027 ;; token following the opening brace | |
2028 (if (consp special-brace-list) | |
2029 (progn | |
2030 (goto-char (car (car special-brace-list))) | |
2031 (c-forward-token-1 1 nil indent-point)) | |
2032 (goto-char containing-sexp)) | |
2033 (forward-char) | |
2034 (let ((start (point))) | |
18720 | 2035 (c-forward-syntactic-ws indent-point) |
24282 | 2036 (goto-char (max start (c-point 'bol)))) |
2037 (skip-chars-forward " \t\n\r" indent-point) | |
2038 (cond | |
2039 ;; CASE 9C: we're looking at the first line in a brace-list | |
2040 ((= (point) indent-point) | |
2041 (goto-char containing-sexp) | |
2042 (c-add-syntax 'brace-list-intro (c-point 'boi)) | |
2043 ) ; end CASE 9C | |
2044 ;; CASE 9D: this is just a later brace-list-entry or | |
2045 ;; brace-entry-open | |
2046 (t (if (or (eq char-after-ip ?{) | |
2047 (and c-special-brace-lists | |
2048 (save-excursion | |
2049 (goto-char indent-point) | |
2050 (c-forward-syntactic-ws (c-point 'eol)) | |
2051 (c-looking-at-special-brace-list (point))))) | |
2052 (c-add-syntax 'brace-entry-open (point)) | |
2053 (c-add-syntax 'brace-list-entry (point)) | |
2054 )) ; end CASE 9D | |
2055 )))) ; end CASE 9 | |
2056 ;; CASE 10: A continued statement | |
2057 ((and (not (memq char-before-ip '(?\; ?:))) | |
2058 (or (not (eq char-before-ip ?})) | |
2059 (c-looking-at-inexpr-block-backward containing-sexp)) | |
18720 | 2060 (> (point) |
2061 (save-excursion | |
2062 (c-beginning-of-statement-1 containing-sexp) | |
24282 | 2063 (c-forward-syntactic-ws) |
18720 | 2064 (setq placeholder (point)))) |
2065 (/= placeholder containing-sexp)) | |
2066 (goto-char indent-point) | |
2067 (skip-chars-forward " \t") | |
2068 (let ((after-cond-placeholder | |
2069 (save-excursion | |
2070 (goto-char placeholder) | |
26817 | 2071 (if (and c-conditional-key (looking-at c-conditional-key)) |
18720 | 2072 (progn |
2073 (c-safe (c-skip-conditional)) | |
2074 (c-forward-syntactic-ws) | |
2075 (if (eq (char-after) ?\;) | |
2076 (progn | |
2077 (forward-char 1) | |
2078 (c-forward-syntactic-ws))) | |
2079 (point)) | |
2080 nil)))) | |
2081 (cond | |
24282 | 2082 ;; CASE 10A: substatement |
18720 | 2083 ((and after-cond-placeholder |
2084 (>= after-cond-placeholder indent-point)) | |
2085 (goto-char placeholder) | |
2086 (if (eq char-after-ip ?{) | |
2087 (c-add-syntax 'substatement-open (c-point 'boi)) | |
2088 (c-add-syntax 'substatement (c-point 'boi)))) | |
24282 | 2089 ;; CASE 10B: open braces for class or brace-lists |
2090 ((setq special-brace-list | |
2091 (or (and c-special-brace-lists | |
2092 (c-looking-at-special-brace-list)) | |
2093 (eq char-after-ip ?{))) | |
18720 | 2094 (cond |
24282 | 2095 ;; CASE 10B.1: class-open |
18720 | 2096 ((save-excursion |
2097 (goto-char indent-point) | |
2098 (skip-chars-forward " \t{") | |
2099 (let ((decl (c-search-uplist-for-classkey (c-parse-state)))) | |
2100 (and decl | |
2101 (setq placeholder (aref decl 0))) | |
2102 )) | |
2103 (c-add-syntax 'class-open placeholder)) | |
24282 | 2104 ;; CASE 10B.2: brace-list-open |
2105 ((or (consp special-brace-list) | |
2106 (save-excursion | |
18720 | 2107 (goto-char placeholder) |
2108 (looking-at "\\<enum\\>")) | |
21106
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
2109 (save-excursion |
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
2110 (goto-char indent-point) |
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
2111 (while (and (> (point) placeholder) |
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
2112 (= (c-backward-token-1 1 t) 0) |
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
2113 (/= (char-after) ?=))) |
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
2114 (eq (char-after) ?=))) |
26817 | 2115 ;; The most semantically accurate symbol here is |
2116 ;; brace-list-open, but we report it simply as a | |
2117 ;; statement-cont. The reason is that one normally | |
2118 ;; adjusts brace-list-open for brace lists as | |
2119 ;; top-level constructs, and brace lists inside | |
2120 ;; statements is a completely different context. | |
2121 (goto-char placeholder) | |
2122 (c-add-syntax 'statement-cont (c-point 'boi))) | |
24282 | 2123 ;; CASE 10B.3: catch-all for unknown construct. |
18720 | 2124 (t |
2125 ;; Can and should I add an extensibility hook here? | |
2126 ;; Something like c-recognize-hook so support for | |
2127 ;; unknown constructs could be added. It's probably a | |
2128 ;; losing proposition, so I dunno. | |
2129 (goto-char placeholder) | |
2130 (c-add-syntax 'statement-cont (c-point 'boi)) | |
2131 (c-add-syntax 'block-open)) | |
2132 )) | |
24282 | 2133 ;; CASE 10C: iostream insertion or extraction operator |
18720 | 2134 ((looking-at "<<\\|>>") |
2135 (goto-char placeholder) | |
2136 (and after-cond-placeholder | |
2137 (goto-char after-cond-placeholder)) | |
2138 (while (and (re-search-forward "<<\\|>>" indent-point 'move) | |
2139 (c-in-literal placeholder))) | |
2140 ;; if we ended up at indent-point, then the first | |
2141 ;; streamop is on a separate line. Indent the line like | |
2142 ;; a statement-cont instead | |
2143 (if (/= (point) indent-point) | |
2144 (c-add-syntax 'stream-op (c-point 'boi)) | |
2145 (c-backward-syntactic-ws lim) | |
2146 (c-add-syntax 'statement-cont (c-point 'boi)))) | |
24282 | 2147 ;; CASE 10D: continued statement. find the accurate |
18720 | 2148 ;; beginning of statement or substatement |
2149 (t | |
2150 (c-beginning-of-statement-1 after-cond-placeholder) | |
2151 ;; KLUDGE ALERT! c-beginning-of-statement-1 can leave | |
2152 ;; us before the lim we're passing in. It should be | |
2153 ;; fixed, but I'm worried about side-effects at this | |
2154 ;; late date. Fix for v5. | |
2155 (goto-char (or (and after-cond-placeholder | |
2156 (max after-cond-placeholder (point))) | |
2157 (point))) | |
2158 (c-add-syntax 'statement-cont (point))) | |
2159 ))) | |
24282 | 2160 ;; CASE 11: an else clause? |
18720 | 2161 ((looking-at "\\<else\\>[^_]") |
2162 (c-backward-to-start-of-if containing-sexp) | |
2163 (c-add-syntax 'else-clause (c-point 'boi))) | |
24282 | 2164 ;; CASE 12: Statement. But what kind? Lets see if its a |
18720 | 2165 ;; while closure of a do/while construct |
2166 ((progn | |
2167 (goto-char indent-point) | |
2168 (skip-chars-forward " \t") | |
2169 (and (looking-at "while\\b[^_]") | |
2170 (save-excursion | |
2171 (c-backward-to-start-of-do containing-sexp) | |
2172 (setq placeholder (point)) | |
2173 (looking-at "do\\b[^_]")) | |
2174 )) | |
26817 | 2175 (goto-char placeholder) |
2176 (c-add-syntax 'do-while-closure (c-point 'boi))) | |
24282 | 2177 ;; CASE 13: A catch or finally clause? This case is simpler |
2178 ;; than if-else and do-while, because a block is required | |
2179 ;; after every try, catch and finally. | |
2180 ((save-excursion | |
2181 (and (cond ((c-major-mode-is 'c++-mode) | |
2182 (looking-at "\\<catch\\>[^_]")) | |
2183 ((c-major-mode-is 'java-mode) | |
2184 (looking-at "\\<\\(catch\\|finally\\)\\>[^_]"))) | |
2185 (c-safe (c-backward-sexp) t) | |
2186 (eq (char-after) ?{) | |
2187 (c-safe (c-backward-sexp) t) | |
2188 (if (eq (char-after) ?\() | |
2189 (c-safe (c-backward-sexp) t) | |
2190 t) | |
2191 (looking-at "\\<\\(try\\|catch\\)\\>[^_]") | |
2192 (setq placeholder (c-point 'boi)))) | |
2193 (c-add-syntax 'catch-clause placeholder)) | |
2194 ;; CASE 14: A case or default label | |
18720 | 2195 ((looking-at c-switch-label-key) |
2196 (goto-char containing-sexp) | |
2197 ;; check for hanging braces | |
2198 (if (/= (point) (c-point 'boi)) | |
24282 | 2199 (c-forward-sexp -1)) |
18720 | 2200 (c-add-syntax 'case-label (c-point 'boi))) |
24282 | 2201 ;; CASE 15: any other label |
18720 | 2202 ((looking-at c-label-key) |
2203 (goto-char containing-sexp) | |
24282 | 2204 ;; check for hanging braces |
2205 (if (/= (point) (c-point 'boi)) | |
2206 (c-forward-sexp -1)) | |
18720 | 2207 (c-add-syntax 'label (c-point 'boi))) |
24282 | 2208 ;; CASE 16: block close brace, possibly closing the defun or |
18720 | 2209 ;; the class |
2210 ((eq char-after-ip ?}) | |
2211 (let* ((lim (c-safe-position containing-sexp fullstate)) | |
2212 (relpos (save-excursion | |
2213 (goto-char containing-sexp) | |
2214 (if (/= (point) (c-point 'boi)) | |
2215 (c-beginning-of-statement-1 lim)) | |
2216 (c-point 'boi)))) | |
2217 (cond | |
24282 | 2218 ;; CASE 16A: closing a lambda defun or an in-expression |
2219 ;; block? | |
2220 ((save-excursion | |
2221 (goto-char containing-sexp) | |
2222 (setq placeholder (c-looking-at-inexpr-block))) | |
2223 (setq tmpsymbol (if (eq (car placeholder) 'inlambda) | |
2224 'inline-close | |
2225 'block-close)) | |
2226 (goto-char containing-sexp) | |
2227 (back-to-indentation) | |
2228 (if (= containing-sexp (point)) | |
2229 (c-add-syntax tmpsymbol (point)) | |
2230 (goto-char (cdr placeholder)) | |
2231 (c-add-syntax tmpsymbol (c-point 'boi)) | |
2232 (c-add-syntax (car placeholder)))) | |
2233 ;; CASE 16B: does this close an inline or a function in | |
21106
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
2234 ;; an extern block or namespace? |
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
2235 ((progn |
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
2236 (goto-char containing-sexp) |
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
2237 (setq placeholder (c-search-uplist-for-classkey state))) |
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
2238 (goto-char (aref placeholder 0)) |
24282 | 2239 (if (looking-at (concat c-extra-toplevel-key "[^_]")) |
21106
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
2240 (c-add-syntax 'defun-close relpos) |
5e5fa0a34cb0
(c-inside-bracelist-p): Fix for enum test.
Richard M. Stallman <rms@gnu.org>
parents:
20914
diff
changeset
|
2241 (c-add-syntax 'inline-close relpos))) |
24282 | 2242 ;; CASE 16C: if there an enclosing brace that hasn't |
18720 | 2243 ;; been narrowed out by a class, then this is a |
2244 ;; block-close | |
20914
8f189ffad604
(c-forward-syntactic-ws, c-backward-syntactic-ws):
Richard M. Stallman <rms@gnu.org>
parents:
20142
diff
changeset
|
2245 ((and (not inenclosing-p) |
18720 | 2246 (c-most-enclosing-brace state)) |
2247 (c-add-syntax 'block-close relpos)) | |
24282 | 2248 ;; CASE 16D: find out whether we're closing a top-level |
18720 | 2249 ;; class or a defun |
2250 (t | |
2251 (save-restriction | |
2252 (narrow-to-region (point-min) indent-point) | |
2253 (let ((decl (c-search-uplist-for-classkey (c-parse-state)))) | |
2254 (if decl | |
24282 | 2255 (c-add-class-syntax 'class-close decl) |
18720 | 2256 (c-add-syntax 'defun-close relpos))))) |
2257 ))) | |
24282 | 2258 ;; CASE 17: statement catchall |
18720 | 2259 (t |
2260 ;; we know its a statement, but we need to find out if it is | |
2261 ;; the first statement in a block | |
2262 (goto-char containing-sexp) | |
2263 (forward-char 1) | |
2264 (c-forward-syntactic-ws indent-point) | |
2265 ;; now skip forward past any case/default clauses we might find. | |
2266 (while (or (c-skip-case-statement-forward fullstate indent-point) | |
2267 (and (looking-at c-switch-label-key) | |
2268 (not inswitch-p))) | |
2269 (setq inswitch-p t)) | |
2270 ;; we want to ignore non-case labels when skipping forward | |
2271 (while (and (looking-at c-label-key) | |
2272 (goto-char (match-end 0))) | |
2273 (c-forward-syntactic-ws indent-point)) | |
2274 (cond | |
24282 | 2275 ;; CASE 17A: we are inside a case/default clause inside a |
18720 | 2276 ;; switch statement. find out if we are at the statement |
2277 ;; just after the case/default label. | |
2278 ((and inswitch-p | |
2279 (progn | |
2280 (goto-char indent-point) | |
2281 (c-backward-syntactic-ws containing-sexp) | |
2282 (back-to-indentation) | |
2283 (setq placeholder (point)) | |
2284 (looking-at c-switch-label-key))) | |
2285 (goto-char indent-point) | |
2286 (skip-chars-forward " \t") | |
2287 (if (eq (char-after) ?{) | |
2288 (c-add-syntax 'statement-case-open placeholder) | |
2289 (c-add-syntax 'statement-case-intro placeholder))) | |
24282 | 2290 ;; CASE 17B: continued statement |
18720 | 2291 ((eq char-before-ip ?,) |
2292 (c-add-syntax 'statement-cont (c-point 'boi))) | |
24282 | 2293 ;; CASE 17C: a question/colon construct? But make sure |
18720 | 2294 ;; what came before was not a label, and what comes after |
2295 ;; is not a globally scoped function call! | |
2296 ((or (and (memq char-before-ip '(?: ??)) | |
2297 (save-excursion | |
2298 (goto-char indent-point) | |
2299 (c-backward-syntactic-ws lim) | |
2300 (back-to-indentation) | |
2301 (not (looking-at c-label-key)))) | |
2302 (and (memq char-after-ip '(?: ??)) | |
2303 (save-excursion | |
2304 (goto-char indent-point) | |
2305 (skip-chars-forward " \t") | |
2306 ;; watch out for scope operator | |
2307 (not (looking-at "::"))))) | |
2308 (c-add-syntax 'statement-cont (c-point 'boi))) | |
24282 | 2309 ;; CASE 17D: any old statement |
18720 | 2310 ((< (point) indent-point) |
2311 (let ((safepos (c-most-enclosing-brace fullstate)) | |
2312 relpos done) | |
2313 (goto-char indent-point) | |
2314 (c-beginning-of-statement-1 safepos) | |
2315 ;; It is possible we're on the brace that opens a nested | |
2316 ;; function. | |
2317 (if (and (eq (char-after) ?{) | |
2318 (save-excursion | |
2319 (c-backward-syntactic-ws safepos) | |
2320 (not (eq (char-before) ?\;)))) | |
2321 (c-beginning-of-statement-1 safepos)) | |
2322 (if (and inswitch-p | |
2323 (looking-at c-switch-label-key)) | |
2324 (progn | |
2325 (goto-char placeholder) | |
2326 (end-of-line) | |
24282 | 2327 (c-forward-sexp -1))) |
18720 | 2328 (setq relpos (c-point 'boi)) |
2329 (while (and (not done) | |
2330 (<= safepos (point)) | |
2331 (/= relpos (point))) | |
2332 (c-beginning-of-statement-1 safepos) | |
2333 (if (= relpos (c-point 'boi)) | |
2334 (setq done t)) | |
2335 (setq relpos (c-point 'boi))) | |
2336 (c-add-syntax 'statement relpos) | |
2337 (if (eq char-after-ip ?{) | |
2338 (c-add-syntax 'block-open)))) | |
24282 | 2339 ;; CASE 17E: first statement in an in-expression block |
2340 ((setq placeholder | |
2341 (save-excursion | |
2342 (goto-char containing-sexp) | |
2343 (c-looking-at-inexpr-block))) | |
2344 (goto-char containing-sexp) | |
2345 (back-to-indentation) | |
2346 (if (= containing-sexp (point)) | |
2347 (c-add-syntax 'statement-block-intro (point)) | |
2348 (goto-char (cdr placeholder)) | |
2349 (c-add-syntax 'statement-block-intro (c-point 'boi)) | |
2350 (c-add-syntax (car placeholder))) | |
2351 (if (eq char-after-ip ?{) | |
2352 (c-add-syntax 'block-open))) | |
2353 ;; CASE 17F: first statement in an inline, or first | |
18720 | 2354 ;; statement in a top-level defun. we can tell this is it |
2355 ;; if there are no enclosing braces that haven't been | |
2356 ;; narrowed out by a class (i.e. don't use bod here!) | |
2357 ((save-excursion | |
2358 (save-restriction | |
2359 (widen) | |
2360 (goto-char containing-sexp) | |
2361 (c-narrow-out-enclosing-class state containing-sexp) | |
2362 (not (c-most-enclosing-brace state)))) | |
2363 (goto-char containing-sexp) | |
2364 ;; if not at boi, then defun-opening braces are hung on | |
2365 ;; right side, so we need a different relpos | |
2366 (if (/= (point) (c-point 'boi)) | |
2367 (progn | |
2368 (c-backward-syntactic-ws) | |
24282 | 2369 (c-safe (c-forward-sexp (if (eq (char-before) ?\)) |
2370 -1 -2))) | |
18720 | 2371 ;; looking at a Java throws clause following a |
2372 ;; method's parameter list | |
2373 (c-beginning-of-statement-1) | |
2374 )) | |
2375 (c-add-syntax 'defun-block-intro (c-point 'boi))) | |
24282 | 2376 ;; CASE 17G: first statement in a block |
18720 | 2377 (t (goto-char containing-sexp) |
2378 (if (/= (point) (c-point 'boi)) | |
2379 (c-beginning-of-statement-1 | |
2380 (if (= (point) lim) | |
2381 (c-safe-position (point) state) lim))) | |
2382 (c-add-syntax 'statement-block-intro (c-point 'boi)) | |
2383 (if (eq char-after-ip ?{) | |
2384 (c-add-syntax 'block-open))) | |
2385 )) | |
2386 ) | |
2387 | |
2388 ;; now we need to look at any modifiers | |
2389 (goto-char indent-point) | |
2390 (skip-chars-forward " \t") | |
2391 ;; are we looking at a comment only line? | |
2392 (if (looking-at c-comment-start-regexp) | |
2393 (c-add-syntax 'comment-intro)) | |
2394 ;; we might want to give additional offset to friends (in C++). | |
24282 | 2395 (if (and (c-major-mode-is 'c++-mode) |
18720 | 2396 (looking-at c-C++-friend-key)) |
2397 (c-add-syntax 'friend)) | |
2398 ;; return the syntax | |
2399 syntax)))) | |
2400 | |
2401 | |
2402 (defun c-echo-parsing-error () | |
2403 (if (not c-parsing-error) | |
2404 nil | |
2405 (message "unbalanced close brace at bufpos %d -- INDENTATION IS SUSPECT!" | |
2406 c-parsing-error) | |
2407 (ding)) | |
2408 c-parsing-error) | |
2409 | |
2410 ;; indent via syntactic language elements | |
2411 (defun c-indent-line (&optional syntax) | |
2412 ;; indent the current line as C/C++/ObjC code. Optional SYNTAX is the | |
2413 ;; syntactic information for the current line. Returns the amount of | |
24282 | 2414 ;; indentation change (in columns). |
18720 | 2415 (let* ((c-syntactic-context (or syntax (c-guess-basic-syntax))) |
2416 (pos (- (point-max) (point))) | |
2417 (indent (apply '+ (mapcar 'c-get-offset c-syntactic-context))) | |
2418 (shift-amt (- (current-indentation) indent))) | |
2419 (and c-echo-syntactic-information-p | |
2420 (not (c-echo-parsing-error)) | |
2421 (message "syntax: %s, indent= %d" c-syntactic-context indent)) | |
2422 (if (zerop shift-amt) | |
2423 nil | |
2424 (delete-region (c-point 'bol) (c-point 'boi)) | |
2425 (beginning-of-line) | |
2426 (indent-to indent)) | |
2427 (if (< (point) (c-point 'boi)) | |
2428 (back-to-indentation) | |
2429 ;; If initial point was within line's indentation, position after | |
2430 ;; the indentation. Else stay at same point in text. | |
2431 (if (> (- (point-max) pos) (point)) | |
2432 (goto-char (- (point-max) pos))) | |
2433 ) | |
2434 (run-hooks 'c-special-indent-hook) | |
2435 shift-amt)) | |
2436 | |
2437 (defun c-show-syntactic-information (arg) | |
2438 "Show syntactic information for current line. | |
2439 With universal argument, inserts the analysis as a comment on that line." | |
2440 (interactive "P") | |
2441 (let ((syntax (c-guess-basic-syntax))) | |
2442 (if (not (consp arg)) | |
2443 (if (not (c-echo-parsing-error)) | |
2444 (message "syntactic analysis: %s" syntax)) | |
2445 (indent-for-comment) | |
2446 (insert (format "%s" syntax)) | |
2447 )) | |
2448 (c-keep-region-active)) | |
2449 | |
26817 | 2450 (defun c-syntactic-information-on-region (from to) |
2451 "Inserts a comment with the syntactic analysis on every line in the region." | |
2452 (interactive "*r") | |
2453 (save-excursion | |
2454 (save-restriction | |
2455 (narrow-to-region from to) | |
2456 (goto-char (point-min)) | |
2457 (while (not (eobp)) | |
2458 (c-show-syntactic-information '(0)) | |
2459 (forward-line))))) | |
2460 | |
18720 | 2461 |
2462 (provide 'cc-engine) | |
2463 ;;; cc-engine.el ends here |