Mercurial > emacs
annotate lisp/progmodes/cplus-md.el @ 12689:83ef0f002ecf
(pascal-mode): Added imenu support.
(pascal-imenu-generic-expression): New variable.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Thu, 27 Jul 1995 18:50:02 +0000 |
parents | 8c1c47eb351a |
children | bbd37ab04957 |
rev | line source |
---|---|
3806
d43666cf0dbb
Comment changes for renaming from c++-mode.el to cplus-md.el.
Richard M. Stallman <rms@gnu.org>
parents:
3627
diff
changeset
|
1 ;;; cplus-md.el --- C++ code editing commands for Emacs |
11234 | 2 ;;; Copyright (C) 1985, 1992, 1994, 1995 Free Software Foundation, Inc. |
896 | 3 |
4 ;; This file is part of GNU Emacs. | |
11455 | 5 ;; Keywords: c languages oop |
662
8a533acedb77
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
257
diff
changeset
|
6 |
896 | 7 ;; GNU Emacs is free software; you can redistribute it and/or modify |
8 ;; it under the terms of the GNU General Public License as published by | |
9 ;; the Free Software Foundation; either version 2, or (at your option) | |
10 ;; any later version. | |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
11 |
896 | 12 ;; GNU Emacs is distributed in the hope that it will be useful, |
13 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
15 ;; GNU General Public License for more details. | |
16 | |
17 ;; You should have received a copy of the GNU General Public License | |
18 ;; along with GNU Emacs; see the file COPYING. If not, write to | |
19 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. | |
798
b7932f859d4e
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
662
diff
changeset
|
20 ;; Maintainer: Dave Detlefs <dld@cs.cmu.edu> |
b7932f859d4e
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
662
diff
changeset
|
21 ;; Keywords: c |
b7932f859d4e
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
662
diff
changeset
|
22 |
b7932f859d4e
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
662
diff
changeset
|
23 ;;; Commentary: |
b7932f859d4e
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
662
diff
changeset
|
24 |
2307
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
896
diff
changeset
|
25 ;; 1987 Dave Detlefs <dld@cs.cmu.edu> |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
896
diff
changeset
|
26 ;; and Stewart Clamen <clamen@cs.cmu.edu>. |
257 | 27 ;; Done by fairly faithful modification of: |
2307
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
896
diff
changeset
|
28 |
798
b7932f859d4e
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
662
diff
changeset
|
29 ;;; Change Log: |
b7932f859d4e
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
662
diff
changeset
|
30 |
257 | 31 ;; Feb, 1990 (Dave Detlefs, dld@cs.cmu.edu) |
32 ;; Fixed electric-c++-terminator to handle double colons, at the | |
33 ;; request of John Hagerman. | |
34 ;; | |
35 ;; Jan, 1990 (Doug Lea, dl@oswego.edu) | |
36 ;; Replaced c++-comment-region and c++-uncomment-region with | |
37 ;; versions from Igor Metz that avoid potential infinite loops. | |
38 ;; | |
39 ;; Oct, 1989 (Dave Detlefs, dld@cs.cmu.edu) | |
40 ;; Added contribution from Igor Metz <metz@iam.unibe.ch>: | |
41 ;; functions c++-comment-region and c++-uncomment-region and | |
42 ;; corresponding key-binding. | |
43 ;; Also fixed bug in indentation of second line after an empty | |
44 ;; arglist with empty-arglist non-null. | |
45 ;; | |
46 ;; Sept, 1989 (Glen Ditchfield, gjditchfield@violet.uwaterloo.ca): | |
47 ;; Textual changes to more closely imitate Emacs 18.55's c-mode. | |
48 ;; Fixed handling of "default:", where ":" was the last character in the | |
49 ;; buffer. Fixed indentation of comments starting in column 0, and when | |
50 ;; previous line contained more than one comment start string. Fixed | |
5300
954744cd720f
(c++-indent-line, calculate-c++-indent):
Richard M. Stallman <rms@gnu.org>
parents:
4308
diff
changeset
|
51 ;; handling of "friend". |
257 | 52 ;; |
53 ;; Aug 7, 1989; John Hagerman (hagerman@ece.cmu.edu): | |
54 ;; Changed calculate-c++-indent to handle member initializations | |
55 ;; more flexibly. Two new variables are used to control behavior: | |
56 ;; c++-member-init-indent and c++-continued-member-init-offset. | |
57 ;; Note the assumption that member initializations and argument | |
58 ;; declarations are not mixed in one function definition. | |
59 ;; | |
60 ;; June 1989 (Dave Detlefs, dld@cs.cmu.edu) | |
61 ;; Fixed calculate-c++-indent to handle continued lines ending in | |
62 ;; {'s. (I wasn't following C-mode closely enough, or C-mode | |
63 ;; changed.) Made ' a quote character, at the behest of someone | |
64 ;; whose mail I apparently deleted (if they send me mail I'll credit | |
65 ;; them here in a future revision.) | |
66 ;; Dan Weinreb (dlw@odi.com) pointed out that 'c++-mode successively | |
67 ;; bound c++-indent-exp and c++-indent-defun to ESC-^q. ESC-^q is | |
68 ;; now bound to c++-indent-exp, while, c++-indent-defun is invoked | |
69 ;; with ESC-^x. | |
70 | |
71 ;; February 1989 (Dave Detlefs, dld@cs.cmu.edu) | |
72 ;; Fixed some errors in c++-indent-defun, as pointed out by Sam | |
73 ;; Haradhvala (odi!sam@talcott.harvard.edu). | |
74 ;; October 1988 (Dave Detlefs, dld@cs.cmu.edu) | |
75 ;; It turns out I had only *thought* I had made | |
76 ;; beginning(end)-of-defun work. It should work better now -- you | |
77 ;; can either attempt to match defun headers "strongly," using a | |
78 ;; very complicated regexp, or "weakly," using a simple one. This | |
79 ;; is settable by a variable; the default is the cheaper weak | |
80 ;; method. (Stewart Clamen was intimately involved in this, too.) | |
81 ;; | |
82 ;; I made "'" *not* be a string delimiter, because that was causing | |
83 ;; comments containing contractions to ("// don't") to mess up paren | |
84 ;; balancing. | |
85 ;; | |
86 ;; I also incorporated another slight indentation fix from Glen | |
87 ;; Ditchfield. | |
88 ;; | |
89 ;; We hope this is will make into version 19 of gnu-emacs. | |
90 ;; | |
91 ;; September 1988: incorporated changes from Fred Calm at Schlumberger. | |
92 ;; Also, made beginning(end)-of-defun, indent-defun work. | |
93 ;; | |
94 ;; August 1987: incorporated changes done by Glen Ditchfield of Waterloo. | |
95 | |
798
b7932f859d4e
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
662
diff
changeset
|
96 ;;; Code: |
b7932f859d4e
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
662
diff
changeset
|
97 |
257 | 98 (defvar c++-mode-abbrev-table nil |
99 "Abbrev table used in C++ mode.") | |
100 (define-abbrev-table 'c++-mode-abbrev-table ()) | |
101 | |
102 (defvar c++-mode-map () | |
103 "Keymap used in C++ mode.") | |
104 (if c++-mode-map | |
105 () | |
106 (setq c++-mode-map (make-sparse-keymap)) | |
107 (define-key c++-mode-map "\C-j" 'reindent-then-newline-and-indent) | |
108 (define-key c++-mode-map "{" 'electric-c++-brace) | |
109 (define-key c++-mode-map "}" 'electric-c++-brace) | |
110 (define-key c++-mode-map ";" 'electric-c++-semi) | |
111 (define-key c++-mode-map "\e\C-h" 'mark-c-function) | |
112 (define-key c++-mode-map "\e\C-q" 'indent-c++-exp) | |
113 (define-key c++-mode-map "\177" 'backward-delete-char-untabify) | |
114 (define-key c++-mode-map "\t" 'c++-indent-command) | |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
115 ;; (define-key c++-mode-map "\C-c\C-i" 'c++-insert-header) |
861
345296f94a1e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
116 (define-key c++-mode-map "\C-c\C-\\" 'c-backslash-region)) |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
117 ;; (define-key c++-mode-map "\e\C-a" 'c++-beginning-of-defun) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
118 ;; (define-key c++-mode-map "\e\C-e" 'c++-end-of-defun) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
119 ;; (define-key c++-mode-map "\e\C-x" 'c++-indent-defun)) |
257 | 120 |
121 (defvar c++-mode-syntax-table nil | |
122 "Syntax table used in C++ mode.") | |
123 | |
124 (if c++-mode-syntax-table | |
125 () | |
126 (setq c++-mode-syntax-table (copy-syntax-table c-mode-syntax-table)) | |
4285
37dded875497
(c++-mode-syntax-table): Handle C-style comments.
Richard M. Stallman <rms@gnu.org>
parents:
3806
diff
changeset
|
127 (modify-syntax-entry ?* ". 23b" c++-mode-syntax-table) |
37dded875497
(c++-mode-syntax-table): Handle C-style comments.
Richard M. Stallman <rms@gnu.org>
parents:
3806
diff
changeset
|
128 (modify-syntax-entry ?/ ". 124" c++-mode-syntax-table) |
8326
57533025d628
(c++-mode-syntax-table): Give RET the same syntax as newline.
Richard M. Stallman <rms@gnu.org>
parents:
7300
diff
changeset
|
129 (modify-syntax-entry ?\n ">" c++-mode-syntax-table) |
57533025d628
(c++-mode-syntax-table): Give RET the same syntax as newline.
Richard M. Stallman <rms@gnu.org>
parents:
7300
diff
changeset
|
130 (modify-syntax-entry ?\^m ">" c++-mode-syntax-table)) |
257 | 131 |
132 (defvar c++-continued-member-init-offset nil | |
133 "*Extra indent for continuation lines of member inits; | |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
134 nil means to align with previous initializations rather than |
257 | 135 with the colon on the first line.") |
136 (defvar c++-member-init-indent 0 | |
137 "*Indentation level of member initializations in function declarations.") | |
138 (defvar c++-friend-offset -4 | |
5300
954744cd720f
(c++-indent-line, calculate-c++-indent):
Richard M. Stallman <rms@gnu.org>
parents:
4308
diff
changeset
|
139 "*Offset of C++ friend declarations relative to member declarations.") |
257 | 140 (defvar c++-electric-colon t |
141 "*If t, colon is an electric terminator.") | |
142 (defvar c++-empty-arglist-indent nil | |
143 "*Indicates how far to indent an line following an empty argument | |
144 list. Nil indicates to just after the paren.") | |
145 | |
146 | |
147 ;;;###autoload | |
148 (defun c++-mode () | |
149 "Major mode for editing C++ code. Very much like editing C code. | |
150 Expression and list commands understand all C++ brackets. | |
151 Tab at left margin indents for C++ code | |
152 Comments are delimited with /* ... */ {or with // ... <newline>} | |
153 Paragraphs are separated by blank lines only. | |
154 Delete converts tabs to spaces as it moves back. | |
155 \\{c++-mode-map} | |
156 Variables controlling indentation style: | |
157 c-tab-always-indent | |
158 Non-nil means TAB in C mode should always reindent the current line, | |
159 regardless of where in the line point is when the TAB command is used. | |
160 Default is t. | |
161 c-auto-newline | |
162 Non-nil means automatically newline before and after braces, | |
163 and after colons and semicolons, inserted in C code. | |
164 c-indent-level | |
165 Indentation of C statements within surrounding block. | |
166 The surrounding block's indentation is the indentation | |
167 of the line on which the open-brace appears. | |
168 c-continued-statement-offset | |
169 Extra indentation given to a substatement, such as the | |
170 then-clause of an if or body of a while. | |
171 c-continued-brace-offset | |
172 Extra indentation given to a brace that starts a substatement. | |
173 This is in addition to c-continued-statement-offset. | |
174 c-brace-offset | |
175 Extra indentation for line if it starts with an open brace. | |
176 c-brace-imaginary-offset | |
177 An open brace following other text is treated as if it were | |
178 this far to the right of the start of its line. | |
179 c-argdecl-indent | |
180 Indentation level of declarations of C function arguments. | |
181 c-label-offset | |
182 Extra indentation for line that is a label, or case or ``default:'', or | |
183 ``public:'' or ``private:'', or ``protected:''. | |
184 c++-electric-colon | |
185 If non-nil at invocation of c++-mode (t is the default) colon electricly | |
186 indents. | |
187 c++-empty-arglist-indent | |
188 If non-nil, a function declaration or invocation which ends a line with a | |
189 left paren is indented this many extra spaces, instead of flush with the | |
190 left paren. | |
191 c++-friend-offset | |
5300
954744cd720f
(c++-indent-line, calculate-c++-indent):
Richard M. Stallman <rms@gnu.org>
parents:
4308
diff
changeset
|
192 Offset of C++ friend declarations relative to member declarations. |
257 | 193 c++-member-init-indent |
194 Indentation level of member initializations in function declarations, | |
195 if they are on a separate line beginning with a colon. | |
196 c++-continued-member-init-offset | |
197 Extra indentation for continuation lines of member initializations; NIL | |
198 means to align with previous initializations rather than with the colon. | |
199 | |
200 Settings for K&R, BSD, and Stroustrup indentation styles are | |
201 c-indent-level 5 8 4 | |
202 c-continued-statement-offset 5 8 4 | |
203 c-continued-brace-offset 0 | |
204 c-brace-offset -5 -8 0 | |
205 c-brace-imaginary-offset 0 | |
206 c-argdecl-indent 0 8 4 | |
207 c-label-offset -5 -8 -4 | |
208 c++-empty-arglist-indent 4 | |
209 c++-friend-offset 0 | |
210 | |
211 Turning on C++ mode calls the value of the variable `c++-mode-hook' with | |
212 no args if that value is non-nil." | |
213 (interactive) | |
214 (kill-all-local-variables) | |
215 (use-local-map c++-mode-map) | |
216 (set-syntax-table c++-mode-syntax-table) | |
217 (setq major-mode 'c++-mode | |
218 mode-name "C++" | |
219 comment-column 32 | |
220 local-abbrev-table c++-mode-abbrev-table) | |
221 (set (make-local-variable 'indent-line-function) 'c++-indent-line) | |
222 (set (make-local-variable 'comment-start) "// ") | |
223 (set (make-local-variable 'comment-end) "") | |
224 (set (make-local-variable 'comment-start-skip) "/\\*+ *\\|// *") | |
2307
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
896
diff
changeset
|
225 (set (make-local-variable 'comment-indent-function) 'c++-comment-indent) |
10871
77c4e66af25a
(c++-mode): Remove ^ from paragraph-start & paragraph-separate.
Boris Goldowsky <boris@gnu.org>
parents:
10829
diff
changeset
|
226 (set (make-local-variable 'paragraph-start) (concat "$\\|" page-delimiter)) |
257 | 227 (set (make-local-variable 'paragraph-separate) paragraph-start) |
228 (set (make-local-variable 'paragraph-ignore-fill-prefix) t) | |
229 (set (make-local-variable 'require-final-newline) t) | |
5957
334f7ce7c8db
(c++-mode): Set parse-sexp-ignore-comments to t.
Richard M. Stallman <rms@gnu.org>
parents:
5300
diff
changeset
|
230 (set (make-local-variable 'parse-sexp-ignore-comments) t) |
257 | 231 (run-hooks 'c++-mode-hook) |
232 (if c++-electric-colon | |
233 (define-key c++-mode-map ":" 'electric-c++-terminator))) | |
234 | |
235 ;; This is used by indent-for-comment | |
236 ;; to decide how much to indent a comment in C++ code | |
237 ;; based on its context. | |
238 (defun c++-comment-indent () | |
239 (if (looking-at "^\\(/\\*\\|//\\)") | |
240 0 ; Existing comment at bol stays there. | |
241 (save-excursion | |
242 (skip-chars-backward " \t") | |
243 (max | |
244 ;; leave at least one space on non-empty lines. | |
245 (if (zerop (current-column)) 0 (1+ (current-column))) | |
246 (let ((cur-pt (point))) | |
247 (beginning-of-line 0) | |
248 ;; If previous line had a comment, use it's indent | |
249 (if (re-search-forward comment-start-skip cur-pt t) | |
250 (progn | |
251 (goto-char (match-beginning 0)) | |
252 (current-column)) | |
253 comment-column)))))) ; otherwise indent at comment column. | |
254 | |
255 (defun electric-c++-brace (arg) | |
256 "Insert character and correct line's indentation." | |
257 (interactive "P") | |
258 (let (insertpos) | |
259 (if (and (not arg) | |
260 (eolp) | |
261 (or (save-excursion | |
262 (skip-chars-backward " \t") | |
263 (bolp)) | |
264 (if c-auto-newline (progn (c++-indent-line) (newline) t)))) | |
265 (progn | |
266 (insert last-command-char) | |
267 (c++-indent-line) | |
268 (if c-auto-newline | |
269 (progn | |
270 (newline) | |
271 ;; (newline) may have done auto-fill | |
272 (setq insertpos (- (point) 2)) | |
273 (c++-indent-line))) | |
274 (save-excursion | |
275 (if insertpos (goto-char (1+ insertpos))) | |
276 (delete-char -1)))) | |
277 (if insertpos | |
278 (save-excursion | |
279 (goto-char insertpos) | |
280 (self-insert-command (prefix-numeric-value arg))) | |
281 (self-insert-command (prefix-numeric-value arg))))) | |
282 | |
283 (defun electric-c++-semi (arg) | |
284 "Insert character and correct line's indentation." | |
285 (interactive "P") | |
286 (if c-auto-newline | |
287 (electric-c++-terminator arg) | |
288 (self-insert-command (prefix-numeric-value arg)))) | |
289 | |
290 (defun electric-c++-terminator (arg) | |
291 "Insert character and correct line's indentation." | |
292 (interactive "P") | |
293 (let (insertpos (end (point))) | |
294 (if (and (not arg) (eolp) | |
295 (not (save-excursion | |
296 (beginning-of-line) | |
297 (skip-chars-forward " \t") | |
298 (or (= (following-char) ?#) | |
299 ;; Colon is special only after a label, or | |
300 ;; case, or another colon. | |
301 ;; So quickly rule out most other uses of colon | |
302 ;; and do no indentation for them. | |
303 (and (eq last-command-char ?:) | |
12416
8c1c47eb351a
(electric-c++-terminator): Fix logic for handling colon.
Richard M. Stallman <rms@gnu.org>
parents:
11455
diff
changeset
|
304 (or (not (or (looking-at "case[ \t]") |
8c1c47eb351a
(electric-c++-terminator): Fix logic for handling colon.
Richard M. Stallman <rms@gnu.org>
parents:
11455
diff
changeset
|
305 (save-excursion |
8c1c47eb351a
(electric-c++-terminator): Fix logic for handling colon.
Richard M. Stallman <rms@gnu.org>
parents:
11455
diff
changeset
|
306 (forward-word 1) |
8c1c47eb351a
(electric-c++-terminator): Fix logic for handling colon.
Richard M. Stallman <rms@gnu.org>
parents:
11455
diff
changeset
|
307 (skip-chars-forward " \t") |
8c1c47eb351a
(electric-c++-terminator): Fix logic for handling colon.
Richard M. Stallman <rms@gnu.org>
parents:
11455
diff
changeset
|
308 (>= (point) end)))) |
8c1c47eb351a
(electric-c++-terminator): Fix logic for handling colon.
Richard M. Stallman <rms@gnu.org>
parents:
11455
diff
changeset
|
309 ;; Do re-indent double colons |
8c1c47eb351a
(electric-c++-terminator): Fix logic for handling colon.
Richard M. Stallman <rms@gnu.org>
parents:
11455
diff
changeset
|
310 (save-excursion |
8c1c47eb351a
(electric-c++-terminator): Fix logic for handling colon.
Richard M. Stallman <rms@gnu.org>
parents:
11455
diff
changeset
|
311 (end-of-line 1) |
8c1c47eb351a
(electric-c++-terminator): Fix logic for handling colon.
Richard M. Stallman <rms@gnu.org>
parents:
11455
diff
changeset
|
312 (looking-at ":")))) |
257 | 313 (progn |
314 (beginning-of-defun) | |
315 (let ((pps (parse-partial-sexp (point) end))) | |
316 (or (nth 3 pps) (nth 4 pps) (nth 5 pps)))))))) | |
317 (progn | |
318 (insert last-command-char) | |
319 (c++-indent-line) | |
320 (and c-auto-newline | |
321 (not (c-inside-parens-p)) | |
322 (progn | |
323 ;; the new marker object, used to be just an integer | |
324 (setq insertpos (make-marker)) | |
325 ;; changed setq to set-marker | |
326 (set-marker insertpos (1- (point))) | |
327 ;; do this before the newline, since in auto fill can break | |
328 (newline) | |
329 (c-indent-line))) | |
330 (save-excursion | |
331 (if insertpos (goto-char (1+ insertpos))) | |
332 (delete-char -1)))) | |
333 (if insertpos | |
334 (save-excursion | |
335 (goto-char insertpos) | |
336 (self-insert-command (prefix-numeric-value arg))) | |
337 (self-insert-command (prefix-numeric-value arg))))) | |
338 | |
339 (defun c++-indent-command (&optional whole-exp) | |
340 "Indent current line as C++ code, or in some cases insert a tab character. | |
341 If `c-tab-always-indent' is non-nil (the default), always indent current | |
342 line. Otherwise, indent the current line only if point is at the left | |
343 margin or in the line's indentation; otherwise insert a tab. | |
344 | |
345 A numeric argument, regardless of its value, means indent rigidly all means | |
346 indent rigidly all the lines of the expression starting after point so that | |
347 this line becomes properly indented. The relative indentation among the | |
348 lines of the expression are preserved." | |
349 (interactive "P") | |
350 (if whole-exp | |
351 ;; If arg, always indent this line as C | |
352 ;; and shift remaining lines of expression the same amount. | |
353 (let ((shift-amt (c++-indent-line)) | |
354 beg end) | |
355 (save-excursion | |
356 (if c-tab-always-indent | |
357 (beginning-of-line)) | |
358 (setq beg (point)) | |
359 (forward-sexp 1) | |
360 (setq end (point)) | |
361 (goto-char beg) | |
362 (forward-line 1) | |
363 (setq beg (point))) | |
364 (if (> end beg) | |
365 (indent-code-rigidly beg end shift-amt "#"))) | |
366 (if (and (not c-tab-always-indent) | |
367 (save-excursion | |
368 (skip-chars-backward " \t") | |
369 (not (bolp)))) | |
370 (insert-tab) | |
371 (c++-indent-line)))) | |
372 | |
373 (defun c++-indent-line () | |
374 "Indent current line as C++ code. | |
375 Return the amount the indentation changed by." | |
376 (let ((indent (calculate-c++-indent nil)) | |
377 beg shift-amt | |
378 (case-fold-search nil) | |
379 (pos (- (point-max) (point)))) | |
380 (beginning-of-line) | |
381 (setq beg (point)) | |
382 (cond ((eq indent nil) | |
383 (setq indent (current-indentation))) | |
384 ((eq indent t) | |
385 (setq indent (calculate-c-indent-within-comment))) | |
386 ((looking-at "[ \t]*#") | |
387 (setq indent 0)) | |
388 (t | |
389 (skip-chars-forward " \t") | |
390 (if (listp indent) (setq indent (car indent))) | |
391 (cond ((looking-at "\\(default\\|public\\|private\\|protected\\):") | |
392 (setq indent (+ indent c-label-offset))) | |
393 ((or (looking-at "case\\b") | |
394 (and (looking-at "[A-Za-z]") | |
395 (save-excursion | |
396 (forward-sexp 1) | |
397 (looking-at ":[^:]")))) | |
398 (setq indent (max 1 (+ indent c-label-offset)))) | |
399 ((and (looking-at "else\\b") | |
400 (not (looking-at "else\\s_"))) | |
401 (setq indent (save-excursion | |
402 (c-backward-to-start-of-if) | |
403 (current-indentation)))) | |
5300
954744cd720f
(c++-indent-line, calculate-c++-indent):
Richard M. Stallman <rms@gnu.org>
parents:
4308
diff
changeset
|
404 ((looking-at "friend\[ \t]") |
257 | 405 (setq indent (+ indent c++-friend-offset))) |
406 ((= (following-char) ?}) | |
407 (setq indent (- indent c-indent-level))) | |
408 ((= (following-char) ?{) | |
409 (setq indent (+ indent c-brace-offset)))))) | |
410 (skip-chars-forward " \t") | |
411 (setq shift-amt (- indent (current-column))) | |
412 (if (zerop shift-amt) | |
413 (if (> (- (point-max) pos) (point)) | |
414 (goto-char (- (point-max) pos))) | |
415 (delete-region beg (point)) | |
416 (indent-to indent) | |
417 ;; If initial point was within line's indentation, | |
418 ;; position after the indentation. Else stay at same point in text. | |
419 (if (> (- (point-max) pos) (point)) | |
420 (goto-char (- (point-max) pos)))) | |
421 shift-amt)) | |
422 | |
423 (defun calculate-c++-indent (&optional parse-start) | |
424 "Return appropriate indentation for current line as C++ code. | |
425 In usual case returns an integer: the column to indent to. | |
426 Returns nil if line starts inside a string, t if in a comment." | |
427 (save-excursion | |
428 (beginning-of-line) | |
429 (let ((indent-point (point)) | |
430 (case-fold-search nil) | |
431 state | |
432 containing-sexp) | |
433 (if parse-start | |
434 (goto-char parse-start) | |
435 (beginning-of-defun)) | |
436 (while (< (point) indent-point) | |
437 (setq parse-start (point)) | |
438 (setq state (parse-partial-sexp (point) indent-point 0)) | |
439 (setq containing-sexp (car (cdr state)))) | |
440 (cond ((or (nth 3 state) (nth 4 state)) | |
441 ;; return nil or t if should not change this line | |
442 (nth 4 state)) | |
443 ((null containing-sexp) | |
444 ;; Line is at top level. May be data or function definition, or | |
445 ;; may be function argument declaration or member initialization. | |
446 ;; Indent like the previous top level line unless | |
447 ;; (1) the previous line ends in a closeparen without semicolon, | |
448 ;; in which case this line is the first argument declaration or | |
449 ;; member initialization, or | |
450 ;; (2) the previous line begins with a colon, | |
451 ;; in which case this is the second line of member inits. | |
452 ;; It is assumed that arg decls and member inits are not mixed. | |
453 (goto-char indent-point) | |
454 (skip-chars-forward " \t") | |
455 (if (= (following-char) ?{) | |
456 0 ; Unless it starts a function body | |
457 (c++-backward-to-noncomment (or parse-start (point-min))) | |
458 (if (= (preceding-char) ?\)) | |
459 (progn ; first arg decl or member init | |
460 (goto-char indent-point) | |
461 (skip-chars-forward " \t") | |
462 (if (= (following-char) ?:) | |
463 c++-member-init-indent | |
464 c-argdecl-indent)) | |
465 (if (= (preceding-char) ?\;) | |
466 (backward-char 1)) | |
467 (if (= (preceding-char) ?}) | |
468 0 | |
469 (beginning-of-line) ; continued arg decls or member inits | |
470 (skip-chars-forward " \t") | |
471 (if (= (following-char) ?:) | |
472 (if c++-continued-member-init-offset | |
473 (+ (current-indentation) | |
474 c++-continued-member-init-offset) | |
475 (progn | |
476 (forward-char 1) | |
477 (skip-chars-forward " \t") | |
478 (current-column))) | |
479 (current-indentation))) | |
480 ))) | |
481 ((/= (char-after containing-sexp) ?{) | |
482 ;; line is expression, not statement: | |
483 ;; indent to just after the surrounding open -- unless | |
484 ;; empty arg list, in which case we do what | |
485 ;; c++-empty-arglist-indent says to do. | |
486 (if (and c++-empty-arglist-indent | |
487 (or (null (nth 2 state)) ;; indicates empty arg | |
488 ;; list. | |
489 ;; Use a heuristic: if the first | |
490 ;; non-whitespace following left paren on | |
491 ;; same line is not a comment, | |
492 ;; is not an empty arglist. | |
493 (save-excursion | |
494 (goto-char (1+ containing-sexp)) | |
495 (not | |
496 (looking-at "\\( \\|\t\\)*[^/\n]"))))) | |
497 (progn | |
498 (goto-char containing-sexp) | |
499 (beginning-of-line) | |
500 (skip-chars-forward " \t") | |
501 (goto-char (min (+ (point) c++-empty-arglist-indent) | |
502 (1+ containing-sexp))) | |
503 (current-column)) | |
504 ;; In C-mode, we would always indent to one after the | |
505 ;; left paren. Here, though, we may have an | |
506 ;; empty-arglist, so we'll indent to the min of that | |
507 ;; and the beginning of the first argument. | |
508 (goto-char (1+ containing-sexp)) | |
509 (current-column))) | |
510 (t | |
511 ;; Statement. Find previous non-comment character. | |
512 (goto-char indent-point) | |
513 (c++-backward-to-noncomment containing-sexp) | |
514 (if (not (memq (preceding-char) '(nil ?\, ?\; ?} ?: ?\{))) | |
515 ;; This line is continuation of preceding line's statement; | |
516 ;; indent c-continued-statement-offset more than the | |
517 ;; previous line of the statement. | |
518 (progn | |
519 (c-backward-to-start-of-continued-exp containing-sexp) | |
3627
6895c2df25a6
(calculate-c++-indent): Respect
Richard M. Stallman <rms@gnu.org>
parents:
3591
diff
changeset
|
520 (+ c-continued-statement-offset (current-column) |
6895c2df25a6
(calculate-c++-indent): Respect
Richard M. Stallman <rms@gnu.org>
parents:
3591
diff
changeset
|
521 (if (save-excursion (goto-char indent-point) |
6895c2df25a6
(calculate-c++-indent): Respect
Richard M. Stallman <rms@gnu.org>
parents:
3591
diff
changeset
|
522 (skip-chars-forward " \t") |
6895c2df25a6
(calculate-c++-indent): Respect
Richard M. Stallman <rms@gnu.org>
parents:
3591
diff
changeset
|
523 (eq (following-char) ?{)) |
6895c2df25a6
(calculate-c++-indent): Respect
Richard M. Stallman <rms@gnu.org>
parents:
3591
diff
changeset
|
524 c-continued-brace-offset 0))) |
257 | 525 ;; This line starts a new statement. |
526 ;; Position following last unclosed open. | |
527 (goto-char containing-sexp) | |
528 ;; Is line first statement after an open-brace? | |
529 (or | |
530 ;; If no, find that first statement and indent like it. | |
531 (save-excursion | |
532 (forward-char 1) | |
11128
291aaa280603
(calculate-c++-indent): Copy colon-line-end code from calculate-c-indent.
Richard M. Stallman <rms@gnu.org>
parents:
10871
diff
changeset
|
533 (let ((colon-line-end 0)) |
291aaa280603
(calculate-c++-indent): Copy colon-line-end code from calculate-c-indent.
Richard M. Stallman <rms@gnu.org>
parents:
10871
diff
changeset
|
534 (while (progn (skip-chars-forward " \t\n") |
291aaa280603
(calculate-c++-indent): Copy colon-line-end code from calculate-c-indent.
Richard M. Stallman <rms@gnu.org>
parents:
10871
diff
changeset
|
535 (looking-at |
291aaa280603
(calculate-c++-indent): Copy colon-line-end code from calculate-c-indent.
Richard M. Stallman <rms@gnu.org>
parents:
10871
diff
changeset
|
536 (concat |
291aaa280603
(calculate-c++-indent): Copy colon-line-end code from calculate-c-indent.
Richard M. Stallman <rms@gnu.org>
parents:
10871
diff
changeset
|
537 "#\\|/\\*\\|//" |
291aaa280603
(calculate-c++-indent): Copy colon-line-end code from calculate-c-indent.
Richard M. Stallman <rms@gnu.org>
parents:
10871
diff
changeset
|
538 "\\|case[ \t]" |
291aaa280603
(calculate-c++-indent): Copy colon-line-end code from calculate-c-indent.
Richard M. Stallman <rms@gnu.org>
parents:
10871
diff
changeset
|
539 "\\|[a-zA-Z0-9_$]*:[^:]" |
291aaa280603
(calculate-c++-indent): Copy colon-line-end code from calculate-c-indent.
Richard M. Stallman <rms@gnu.org>
parents:
10871
diff
changeset
|
540 "\\|friend[ \t]"))) |
291aaa280603
(calculate-c++-indent): Copy colon-line-end code from calculate-c-indent.
Richard M. Stallman <rms@gnu.org>
parents:
10871
diff
changeset
|
541 ;; Skip over comments and labels following openbrace. |
291aaa280603
(calculate-c++-indent): Copy colon-line-end code from calculate-c-indent.
Richard M. Stallman <rms@gnu.org>
parents:
10871
diff
changeset
|
542 (cond ((= (following-char) ?\#) |
291aaa280603
(calculate-c++-indent): Copy colon-line-end code from calculate-c-indent.
Richard M. Stallman <rms@gnu.org>
parents:
10871
diff
changeset
|
543 (forward-line 1)) |
291aaa280603
(calculate-c++-indent): Copy colon-line-end code from calculate-c-indent.
Richard M. Stallman <rms@gnu.org>
parents:
10871
diff
changeset
|
544 ((looking-at "/\\*") |
291aaa280603
(calculate-c++-indent): Copy colon-line-end code from calculate-c-indent.
Richard M. Stallman <rms@gnu.org>
parents:
10871
diff
changeset
|
545 (search-forward "*/" nil 'move)) |
291aaa280603
(calculate-c++-indent): Copy colon-line-end code from calculate-c-indent.
Richard M. Stallman <rms@gnu.org>
parents:
10871
diff
changeset
|
546 ((looking-at "//\\|friend[ \t]") |
291aaa280603
(calculate-c++-indent): Copy colon-line-end code from calculate-c-indent.
Richard M. Stallman <rms@gnu.org>
parents:
10871
diff
changeset
|
547 (forward-line 1)) |
291aaa280603
(calculate-c++-indent): Copy colon-line-end code from calculate-c-indent.
Richard M. Stallman <rms@gnu.org>
parents:
10871
diff
changeset
|
548 (t |
291aaa280603
(calculate-c++-indent): Copy colon-line-end code from calculate-c-indent.
Richard M. Stallman <rms@gnu.org>
parents:
10871
diff
changeset
|
549 (save-excursion (end-of-line) |
291aaa280603
(calculate-c++-indent): Copy colon-line-end code from calculate-c-indent.
Richard M. Stallman <rms@gnu.org>
parents:
10871
diff
changeset
|
550 (setq colon-line-end (point))) |
291aaa280603
(calculate-c++-indent): Copy colon-line-end code from calculate-c-indent.
Richard M. Stallman <rms@gnu.org>
parents:
10871
diff
changeset
|
551 (search-forward ":")))) |
291aaa280603
(calculate-c++-indent): Copy colon-line-end code from calculate-c-indent.
Richard M. Stallman <rms@gnu.org>
parents:
10871
diff
changeset
|
552 ;; The first following code counts |
291aaa280603
(calculate-c++-indent): Copy colon-line-end code from calculate-c-indent.
Richard M. Stallman <rms@gnu.org>
parents:
10871
diff
changeset
|
553 ;; if it is before the line we want to indent. |
291aaa280603
(calculate-c++-indent): Copy colon-line-end code from calculate-c-indent.
Richard M. Stallman <rms@gnu.org>
parents:
10871
diff
changeset
|
554 (and (< (point) indent-point) |
291aaa280603
(calculate-c++-indent): Copy colon-line-end code from calculate-c-indent.
Richard M. Stallman <rms@gnu.org>
parents:
10871
diff
changeset
|
555 (- |
291aaa280603
(calculate-c++-indent): Copy colon-line-end code from calculate-c-indent.
Richard M. Stallman <rms@gnu.org>
parents:
10871
diff
changeset
|
556 (if (> colon-line-end (point)) |
291aaa280603
(calculate-c++-indent): Copy colon-line-end code from calculate-c-indent.
Richard M. Stallman <rms@gnu.org>
parents:
10871
diff
changeset
|
557 (- (current-indentation) c-label-offset) |
291aaa280603
(calculate-c++-indent): Copy colon-line-end code from calculate-c-indent.
Richard M. Stallman <rms@gnu.org>
parents:
10871
diff
changeset
|
558 (current-column)) |
291aaa280603
(calculate-c++-indent): Copy colon-line-end code from calculate-c-indent.
Richard M. Stallman <rms@gnu.org>
parents:
10871
diff
changeset
|
559 ;; If prev stmt starts with open-brace, that |
291aaa280603
(calculate-c++-indent): Copy colon-line-end code from calculate-c-indent.
Richard M. Stallman <rms@gnu.org>
parents:
10871
diff
changeset
|
560 ;; open brace was offset by c-brace-offset. |
291aaa280603
(calculate-c++-indent): Copy colon-line-end code from calculate-c-indent.
Richard M. Stallman <rms@gnu.org>
parents:
10871
diff
changeset
|
561 ;; Compensate to get the column where |
291aaa280603
(calculate-c++-indent): Copy colon-line-end code from calculate-c-indent.
Richard M. Stallman <rms@gnu.org>
parents:
10871
diff
changeset
|
562 ;; an ordinary statement would start. |
291aaa280603
(calculate-c++-indent): Copy colon-line-end code from calculate-c-indent.
Richard M. Stallman <rms@gnu.org>
parents:
10871
diff
changeset
|
563 (if (= (following-char) ?\{) c-brace-offset 0))))) |
257 | 564 ;; If no previous statement, |
565 ;; indent it relative to line brace is on. | |
566 ;; For open brace in column zero, don't let statement | |
567 ;; start there too. If c-indent-offset is zero, | |
568 ;; use c-brace-offset + c-continued-statement-offset instead. | |
569 ;; For open-braces not the first thing in a line, | |
570 ;; add in c-brace-imaginary-offset. | |
571 (+ (if (and (bolp) (zerop c-indent-level)) | |
572 (+ c-brace-offset c-continued-statement-offset) | |
573 c-indent-level) | |
574 ;; Move back over whitespace before the openbrace. | |
575 ;; If openbrace is not first nonwhite thing on the line, | |
576 ;; add the c-brace-imaginary-offset. | |
577 (progn (skip-chars-backward " \t") | |
578 (if (bolp) 0 c-brace-imaginary-offset)) | |
579 ;; If the openbrace is preceded by a parenthesized exp, | |
580 ;; move to the beginning of that; | |
581 ;; possibly a different line | |
582 (progn | |
583 (if (eq (preceding-char) ?\)) | |
584 (forward-sexp -1)) | |
585 ;; Get initial indentation of the line we are on. | |
586 (current-indentation)))))))))) | |
587 | |
588 (defun c++-backward-to-noncomment (lim) | |
589 (let (opoint stop) | |
590 (while (not stop) | |
591 (skip-chars-backward " \t\n\r\f" lim) | |
592 (setq opoint (point)) | |
593 (cond ((and (>= (point) (+ 2 lim)) | |
594 (save-excursion | |
595 (forward-char -2) | |
596 (looking-at "\\*/"))) | |
597 (search-backward "/*" lim 'move)) | |
598 ((and | |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
599 (search-backward "//" (max (c++-point-bol) lim) 'move) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
600 (not (c++-within-string-p (point) opoint)))) |
10829
135ef978d711
(c++-backward-to-noncomment): Don't loop forever
Richard M. Stallman <rms@gnu.org>
parents:
10409
diff
changeset
|
601 ;; No comment to be found. |
135ef978d711
(c++-backward-to-noncomment): Don't loop forever
Richard M. Stallman <rms@gnu.org>
parents:
10409
diff
changeset
|
602 ;; If there's a # command on this line, |
135ef978d711
(c++-backward-to-noncomment): Don't loop forever
Richard M. Stallman <rms@gnu.org>
parents:
10409
diff
changeset
|
603 ;; move back to it. |
135ef978d711
(c++-backward-to-noncomment): Don't loop forever
Richard M. Stallman <rms@gnu.org>
parents:
10409
diff
changeset
|
604 (t (beginning-of-line) |
135ef978d711
(c++-backward-to-noncomment): Don't loop forever
Richard M. Stallman <rms@gnu.org>
parents:
10409
diff
changeset
|
605 (skip-chars-forward " \t") |
135ef978d711
(c++-backward-to-noncomment): Don't loop forever
Richard M. Stallman <rms@gnu.org>
parents:
10409
diff
changeset
|
606 ;; But don't get fooled if we are already before the #. |
135ef978d711
(c++-backward-to-noncomment): Don't loop forever
Richard M. Stallman <rms@gnu.org>
parents:
10409
diff
changeset
|
607 (if (and (looking-at "#") (< (point) opoint)) |
135ef978d711
(c++-backward-to-noncomment): Don't loop forever
Richard M. Stallman <rms@gnu.org>
parents:
10409
diff
changeset
|
608 (setq stop (<= (point) lim)) |
135ef978d711
(c++-backward-to-noncomment): Don't loop forever
Richard M. Stallman <rms@gnu.org>
parents:
10409
diff
changeset
|
609 (setq stop t) |
135ef978d711
(c++-backward-to-noncomment): Don't loop forever
Richard M. Stallman <rms@gnu.org>
parents:
10409
diff
changeset
|
610 (goto-char opoint))))))) |
257 | 611 |
612 (defun indent-c++-exp () | |
613 "Indent each line of the C++ grouping following point." | |
614 (interactive) | |
615 (let ((indent-stack (list nil)) | |
616 (contain-stack (list (point))) | |
617 (case-fold-search nil) | |
618 restart outer-loop-done inner-loop-done state ostate | |
861
345296f94a1e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
619 this-indent last-sexp last-depth |
257 | 620 at-else at-brace |
621 (opoint (point)) | |
622 (next-depth 0)) | |
623 (save-excursion | |
624 (forward-sexp 1)) | |
625 (save-excursion | |
626 (setq outer-loop-done nil) | |
627 (while (and (not (eobp)) (not outer-loop-done)) | |
628 (setq last-depth next-depth) | |
629 ;; Compute how depth changes over this line | |
630 ;; plus enough other lines to get to one that | |
631 ;; does not end inside a comment or string. | |
632 ;; Meanwhile, do appropriate indentation on comment lines. | |
861
345296f94a1e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
633 (setq inner-loop-done nil) |
345296f94a1e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
634 (while (and (not inner-loop-done) |
257 | 635 (not (and (eobp) (setq outer-loop-done t)))) |
636 (setq ostate state) | |
637 (setq state (parse-partial-sexp (point) (progn (end-of-line) (point)) | |
638 nil nil state)) | |
639 (setq next-depth (car state)) | |
640 (if (and (car (cdr (cdr state))) | |
641 (>= (car (cdr (cdr state))) 0)) | |
642 (setq last-sexp (car (cdr (cdr state))))) | |
643 (if (or (nth 4 ostate)) | |
644 (c++-indent-line)) | |
645 (if (or (nth 3 state)) | |
646 (forward-line 1) | |
861
345296f94a1e
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
647 (setq inner-loop-done t))) |
257 | 648 (if (<= next-depth 0) |
649 (setq outer-loop-done t)) | |
650 (if outer-loop-done | |
651 nil | |
652 ;; If this line had ..))) (((.. in it, pop out of the levels | |
653 ;; that ended anywhere in this line, even if the final depth | |
654 ;; doesn't indicate that they ended. | |
655 (while (> last-depth (nth 6 state)) | |
656 (setq indent-stack (cdr indent-stack) | |
657 contain-stack (cdr contain-stack) | |
658 last-depth (1- last-depth))) | |
659 (if (/= last-depth next-depth) | |
660 (setq last-sexp nil)) | |
661 ;; Add levels for any parens that were started in this line. | |
662 (while (< last-depth next-depth) | |
663 (setq indent-stack (cons nil indent-stack) | |
664 contain-stack (cons nil contain-stack) | |
665 last-depth (1+ last-depth))) | |
666 (if (null (car contain-stack)) | |
667 (setcar contain-stack (or (car (cdr state)) | |
668 (save-excursion (forward-sexp -1) | |
669 (point))))) | |
670 (forward-line 1) | |
671 (skip-chars-forward " \t") | |
672 (if (eolp) | |
673 nil | |
674 (if (and (car indent-stack) | |
675 (>= (car indent-stack) 0)) | |
676 ;; Line is on an existing nesting level. | |
677 ;; Lines inside parens are handled specially. | |
10409
0e814787d3be
(indent-c++-exp): Handle `{ if (x)\n foo;\n bar;' case.
Richard M. Stallman <rms@gnu.org>
parents:
9219
diff
changeset
|
678 nil |
257 | 679 ;; Just started a new nesting level. |
680 ;; Compute the standard indent for this level. | |
10409
0e814787d3be
(indent-c++-exp): Handle `{ if (x)\n foo;\n bar;' case.
Richard M. Stallman <rms@gnu.org>
parents:
9219
diff
changeset
|
681 (let (val) |
0e814787d3be
(indent-c++-exp): Handle `{ if (x)\n foo;\n bar;' case.
Richard M. Stallman <rms@gnu.org>
parents:
9219
diff
changeset
|
682 (if (= (char-after (car contain-stack)) ?{) |
0e814787d3be
(indent-c++-exp): Handle `{ if (x)\n foo;\n bar;' case.
Richard M. Stallman <rms@gnu.org>
parents:
9219
diff
changeset
|
683 (save-excursion |
0e814787d3be
(indent-c++-exp): Handle `{ if (x)\n foo;\n bar;' case.
Richard M. Stallman <rms@gnu.org>
parents:
9219
diff
changeset
|
684 (goto-char (car contain-stack)) |
0e814787d3be
(indent-c++-exp): Handle `{ if (x)\n foo;\n bar;' case.
Richard M. Stallman <rms@gnu.org>
parents:
9219
diff
changeset
|
685 (setq val (+ c-indent-level (current-column)))) |
0e814787d3be
(indent-c++-exp): Handle `{ if (x)\n foo;\n bar;' case.
Richard M. Stallman <rms@gnu.org>
parents:
9219
diff
changeset
|
686 (setq val (calculate-c++-indent |
0e814787d3be
(indent-c++-exp): Handle `{ if (x)\n foo;\n bar;' case.
Richard M. Stallman <rms@gnu.org>
parents:
9219
diff
changeset
|
687 (if (car indent-stack) |
0e814787d3be
(indent-c++-exp): Handle `{ if (x)\n foo;\n bar;' case.
Richard M. Stallman <rms@gnu.org>
parents:
9219
diff
changeset
|
688 (- (car indent-stack)))))) |
0e814787d3be
(indent-c++-exp): Handle `{ if (x)\n foo;\n bar;' case.
Richard M. Stallman <rms@gnu.org>
parents:
9219
diff
changeset
|
689 (setcar indent-stack val))) |
0e814787d3be
(indent-c++-exp): Handle `{ if (x)\n foo;\n bar;' case.
Richard M. Stallman <rms@gnu.org>
parents:
9219
diff
changeset
|
690 ;; Adjust line indentation according to its predecessor. |
0e814787d3be
(indent-c++-exp): Handle `{ if (x)\n foo;\n bar;' case.
Richard M. Stallman <rms@gnu.org>
parents:
9219
diff
changeset
|
691 (if (/= (char-after (car contain-stack)) ?\{) |
0e814787d3be
(indent-c++-exp): Handle `{ if (x)\n foo;\n bar;' case.
Richard M. Stallman <rms@gnu.org>
parents:
9219
diff
changeset
|
692 (setq this-indent (car indent-stack)) |
0e814787d3be
(indent-c++-exp): Handle `{ if (x)\n foo;\n bar;' case.
Richard M. Stallman <rms@gnu.org>
parents:
9219
diff
changeset
|
693 ;; Line is at statement level. |
0e814787d3be
(indent-c++-exp): Handle `{ if (x)\n foo;\n bar;' case.
Richard M. Stallman <rms@gnu.org>
parents:
9219
diff
changeset
|
694 ;; Is it a new statement? Is it an else? |
0e814787d3be
(indent-c++-exp): Handle `{ if (x)\n foo;\n bar;' case.
Richard M. Stallman <rms@gnu.org>
parents:
9219
diff
changeset
|
695 ;; Find last non-comment character before this line |
0e814787d3be
(indent-c++-exp): Handle `{ if (x)\n foo;\n bar;' case.
Richard M. Stallman <rms@gnu.org>
parents:
9219
diff
changeset
|
696 (save-excursion |
0e814787d3be
(indent-c++-exp): Handle `{ if (x)\n foo;\n bar;' case.
Richard M. Stallman <rms@gnu.org>
parents:
9219
diff
changeset
|
697 (setq at-else (looking-at "else\\W")) |
0e814787d3be
(indent-c++-exp): Handle `{ if (x)\n foo;\n bar;' case.
Richard M. Stallman <rms@gnu.org>
parents:
9219
diff
changeset
|
698 (setq at-brace (= (following-char) ?\{)) |
0e814787d3be
(indent-c++-exp): Handle `{ if (x)\n foo;\n bar;' case.
Richard M. Stallman <rms@gnu.org>
parents:
9219
diff
changeset
|
699 (c++-backward-to-noncomment opoint) |
0e814787d3be
(indent-c++-exp): Handle `{ if (x)\n foo;\n bar;' case.
Richard M. Stallman <rms@gnu.org>
parents:
9219
diff
changeset
|
700 (if (not (memq (preceding-char) '(nil ?\, ?\; ?\} ?: ?\{))) |
0e814787d3be
(indent-c++-exp): Handle `{ if (x)\n foo;\n bar;' case.
Richard M. Stallman <rms@gnu.org>
parents:
9219
diff
changeset
|
701 ;; Preceding line did not end in comma or semi; |
0e814787d3be
(indent-c++-exp): Handle `{ if (x)\n foo;\n bar;' case.
Richard M. Stallman <rms@gnu.org>
parents:
9219
diff
changeset
|
702 ;; indent this line c-continued-statement-offset |
0e814787d3be
(indent-c++-exp): Handle `{ if (x)\n foo;\n bar;' case.
Richard M. Stallman <rms@gnu.org>
parents:
9219
diff
changeset
|
703 ;; more than previous. |
0e814787d3be
(indent-c++-exp): Handle `{ if (x)\n foo;\n bar;' case.
Richard M. Stallman <rms@gnu.org>
parents:
9219
diff
changeset
|
704 (progn |
0e814787d3be
(indent-c++-exp): Handle `{ if (x)\n foo;\n bar;' case.
Richard M. Stallman <rms@gnu.org>
parents:
9219
diff
changeset
|
705 (c-backward-to-start-of-continued-exp |
0e814787d3be
(indent-c++-exp): Handle `{ if (x)\n foo;\n bar;' case.
Richard M. Stallman <rms@gnu.org>
parents:
9219
diff
changeset
|
706 (car contain-stack)) |
0e814787d3be
(indent-c++-exp): Handle `{ if (x)\n foo;\n bar;' case.
Richard M. Stallman <rms@gnu.org>
parents:
9219
diff
changeset
|
707 (setq this-indent |
0e814787d3be
(indent-c++-exp): Handle `{ if (x)\n foo;\n bar;' case.
Richard M. Stallman <rms@gnu.org>
parents:
9219
diff
changeset
|
708 (+ c-continued-statement-offset |
0e814787d3be
(indent-c++-exp): Handle `{ if (x)\n foo;\n bar;' case.
Richard M. Stallman <rms@gnu.org>
parents:
9219
diff
changeset
|
709 (current-column) |
0e814787d3be
(indent-c++-exp): Handle `{ if (x)\n foo;\n bar;' case.
Richard M. Stallman <rms@gnu.org>
parents:
9219
diff
changeset
|
710 (if at-brace c-continued-brace-offset 0)))) |
0e814787d3be
(indent-c++-exp): Handle `{ if (x)\n foo;\n bar;' case.
Richard M. Stallman <rms@gnu.org>
parents:
9219
diff
changeset
|
711 ;; Preceding line ended in comma or semi; |
0e814787d3be
(indent-c++-exp): Handle `{ if (x)\n foo;\n bar;' case.
Richard M. Stallman <rms@gnu.org>
parents:
9219
diff
changeset
|
712 ;; use the standard indent for this level. |
0e814787d3be
(indent-c++-exp): Handle `{ if (x)\n foo;\n bar;' case.
Richard M. Stallman <rms@gnu.org>
parents:
9219
diff
changeset
|
713 (if at-else |
0e814787d3be
(indent-c++-exp): Handle `{ if (x)\n foo;\n bar;' case.
Richard M. Stallman <rms@gnu.org>
parents:
9219
diff
changeset
|
714 (progn (c-backward-to-start-of-if opoint) |
0e814787d3be
(indent-c++-exp): Handle `{ if (x)\n foo;\n bar;' case.
Richard M. Stallman <rms@gnu.org>
parents:
9219
diff
changeset
|
715 (setq this-indent (current-indentation))) |
0e814787d3be
(indent-c++-exp): Handle `{ if (x)\n foo;\n bar;' case.
Richard M. Stallman <rms@gnu.org>
parents:
9219
diff
changeset
|
716 (setq this-indent (car indent-stack)))))) |
257 | 717 ;; Adjust line indentation according to its contents |
718 (if (looking-at "\\(public\\|private\\|protected\\):") | |
9219
c57babb0ebd5
(indent-c++-exp): For public/private/protected,
Richard M. Stallman <rms@gnu.org>
parents:
8326
diff
changeset
|
719 (setq this-indent (- this-indent c-indent-level)) |
c57babb0ebd5
(indent-c++-exp): For public/private/protected,
Richard M. Stallman <rms@gnu.org>
parents:
8326
diff
changeset
|
720 (if (or (looking-at "case[ \t]") |
c57babb0ebd5
(indent-c++-exp): For public/private/protected,
Richard M. Stallman <rms@gnu.org>
parents:
8326
diff
changeset
|
721 (and (looking-at "[A-Za-z]") |
c57babb0ebd5
(indent-c++-exp): For public/private/protected,
Richard M. Stallman <rms@gnu.org>
parents:
8326
diff
changeset
|
722 (save-excursion |
c57babb0ebd5
(indent-c++-exp): For public/private/protected,
Richard M. Stallman <rms@gnu.org>
parents:
8326
diff
changeset
|
723 (forward-sexp 1) |
c57babb0ebd5
(indent-c++-exp): For public/private/protected,
Richard M. Stallman <rms@gnu.org>
parents:
8326
diff
changeset
|
724 (looking-at ":[^:]")))) |
c57babb0ebd5
(indent-c++-exp): For public/private/protected,
Richard M. Stallman <rms@gnu.org>
parents:
8326
diff
changeset
|
725 (setq this-indent (max 1 (+ this-indent c-label-offset))))) |
5300
954744cd720f
(c++-indent-line, calculate-c++-indent):
Richard M. Stallman <rms@gnu.org>
parents:
4308
diff
changeset
|
726 (if (looking-at "friend[ \t]") |
257 | 727 (setq this-indent (+ this-indent c++-friend-offset))) |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
728 (if (= (following-char) ?\}) |
257 | 729 (setq this-indent (- this-indent c-indent-level))) |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
730 (if (= (following-char) ?\{) |
257 | 731 (setq this-indent (+ this-indent c-brace-offset))) |
732 ;; Put chosen indentation into effect. | |
733 (or (= (current-column) this-indent) | |
734 (= (following-char) ?\#) | |
735 (progn | |
736 (delete-region (point) (progn (beginning-of-line) (point))) | |
737 (indent-to this-indent))) | |
738 ;; Indent any comment following the text. | |
739 (or (looking-at comment-start-skip) | |
740 (if (re-search-forward comment-start-skip | |
741 (save-excursion (end-of-line) | |
742 (point)) t) | |
743 (progn | |
744 (indent-for-comment) | |
745 (beginning-of-line)))))))))) | |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
746 |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
747 (defun fill-c++-comment () |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
748 "Fill a comment contained in consecutive lines containing point. |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
749 The fill lines remain a comment." |
257 | 750 (interactive) |
751 (save-excursion | |
752 (let ((save fill-prefix)) | |
753 (beginning-of-line 1) | |
754 (save-excursion | |
755 (re-search-forward comment-start-skip | |
756 (save-excursion (end-of-line) (point)) | |
757 t) | |
758 (goto-char (match-end 0)) | |
759 (set-fill-prefix)) | |
760 (while (looking-at fill-prefix) | |
761 (previous-line 1)) | |
762 (next-line 1) | |
763 (insert-string "\n") | |
764 (fill-paragraph nil) | |
765 (delete-char -1) | |
766 (setq fill-prefix save)))) | |
767 | |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
768 (defun c++-point-bol () |
257 | 769 "Returns the value of the point at the beginning of the current line." |
770 (save-excursion | |
771 (beginning-of-line) | |
772 (point))) | |
773 | |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
774 ;; (defun c++-insert-header () |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
775 ;; "Insert header denoting C++ code at top of buffer." |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
776 ;; (interactive) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
777 ;; (save-excursion |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
778 ;; (goto-char (point-min)) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
779 ;; (insert "// " |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
780 ;; "This may look like C code, but it is really " |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
781 ;; "-*- C++ -*-" |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
782 ;; "\n\n"))) |
257 | 783 |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
784 (defun c++-within-string-p (point1 point2) |
257 | 785 "Returns true if number of double quotes between two points is odd." |
786 (let ((s (buffer-substring point1 point2))) | |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
787 (not (zerop (% (c++-count-char-in-string ?\" s) 2))))) |
257 | 788 |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
789 (defun c++-count-char-in-string (c s) |
257 | 790 (let ((count 0) |
791 (pos 0)) | |
792 (while (< pos (length s)) | |
793 (setq count (+ count (if (\= (aref s pos) c) 1 0))) | |
794 (setq pos (1+ pos))) | |
795 count)) | |
796 | |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
797 ;; rms: This page is creeping featurism, and not worth having. |
257 | 798 |
799 ;;; Below are two regular expressions that attempt to match defuns | |
800 ;;; "strongly" and "weakly." The strong one almost reconstructs the | |
801 ;;; grammar of C++; the weak one just figures anything id or curly on | |
802 ;;; the left begins a defun. The constant "c++-match-header-strongly" | |
803 ;;; determines which to use; the default is the weak one. | |
804 | |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
805 ;; (defvar c++-match-header-strongly nil |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
806 ;; "*If nil, use `c++-defun-header-weak' to identify beginning of definitions. |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
807 ;; If non-nil, use `c++-defun-header-strong'.") |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
808 ;; |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
809 ;; (defvar c++-defun-header-strong-struct-equivs "\\(class\\|struct\\|enum\\)" |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
810 ;; "Regexp to match names of structure declaration blocks in C++.") |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
811 ;; |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
812 ;; (defconst c++-defun-header-strong |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
813 ;; (let* |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
814 ;; (; valid identifiers |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
2307
diff
changeset
|
815 ;; ;; There's a real weirdness here -- if I switch the below |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
816 ;; (id "\\(\\w\\|_\\)+") |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
817 ;; ;; to be |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
818 ;; ;; (id "\\(_\\|\\w\\)+") |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
819 ;; ;; things no longer work right. Try it and see! |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
820 ;; |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
821 ;; ; overloadable operators |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
822 ;; (op-sym1 |
6309
9217f29851c2
Don't use triple-hyphen in a character class.
Karl Heuer <kwzh@gnu.org>
parents:
5957
diff
changeset
|
823 ;; "[-+*/%^&|~!=<>]\\|[-+*/%^&|<>=!]=\\|<<=?\\|>>=?") |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
824 ;; (op-sym2 |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
825 ;; "&&\\|||\\|\\+\\+\\|--\\|()\\|\\[\\]") |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
826 ;; (op-sym (concat "\\(" op-sym1 "\\|" op-sym2 "\\)")) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
827 ;; ; whitespace |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
828 ;; (middle "[^\\*]*\\(\\*+[^/\\*][^\\*]*\\)*") |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
829 ;; (c-comment (concat "/\\*" middle "\\*+/")) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
830 ;; (wh (concat "\\(\\s \\|\n\\|//.*$\\|" c-comment "\\)")) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
831 ;; (wh-opt (concat wh "*")) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
832 ;; (wh-nec (concat wh "+")) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
833 ;; (oper (concat "\\(" "operator" "\\(" |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
834 ;; wh-opt op-sym "\\|" wh-nec id "\\)" "\\)")) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
835 ;; (dcl-list "([^():]*)") |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
836 ;; (func-name (concat "\\(" oper "\\|" id "::" id "\\|" id "\\)")) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
837 ;; (inits |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
838 ;; (concat "\\(:" |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
839 ;; "\\(" wh-opt id "(.*\\()" wh-opt "," "\\)\\)*" |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
840 ;; wh-opt id "(.*)" wh-opt "{" |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
841 ;; "\\|" wh-opt "{\\)")) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
842 ;; (type-name (concat |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
843 ;; "\\(" c++-defun-header-strong-struct-equivs wh-nec "\\)?" |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
844 ;; id)) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
845 ;; (type (concat "\\(const" wh-nec "\\)?" |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
846 ;; "\\(" type-name "\\|" type-name wh-opt "\\*+" "\\|" |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
847 ;; type-name wh-opt "&" "\\)")) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
848 ;; (modifier "\\(inline\\|virtual\\|overload\\|auto\\|static\\)") |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
849 ;; (modifiers (concat "\\(" modifier wh-nec "\\)*")) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
850 ;; (func-header |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
851 ;; ;; type arg-dcl |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
852 ;; (concat modifiers type wh-nec func-name wh-opt dcl-list wh-opt inits)) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
853 ;; (inherit (concat "\\(:" wh-opt "\\(public\\|private\\)?" |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
854 ;; wh-nec id "\\)")) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
855 ;; (cs-header (concat |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
856 ;; c++-defun-header-strong-struct-equivs |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
857 ;; wh-nec id wh-opt inherit "?" wh-opt "{"))) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
858 ;; (concat "^\\(" func-header "\\|" cs-header "\\)")) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
859 ;; "Strongly-defined regexp to match beginning of structure or function def.") |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
860 ;; |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
861 ;; |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
862 ;; ;; This part has to do with recognizing defuns. |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
863 ;; |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
864 ;; ;; The weak convention we will use is that a defun begins any time |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
865 ;; ;; there is a left curly brace, or some identifier on the left margin, |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
866 ;; ;; followed by a left curly somewhere on the line. (This will also |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
867 ;; ;; incorrectly match some continued strings, but this is after all |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
868 ;; ;; just a weak heuristic.) Suggestions for improvement (short of the |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
869 ;; ;; strong scheme shown above) are welcomed. |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
870 ;; |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
871 ;; (defconst c++-defun-header-weak "^{\\|^[_a-zA-Z].*{" |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
872 ;; "Weakly-defined regexp to match beginning of structure or function def.") |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
873 ;; |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
874 ;; (defun c++-beginning-of-defun (arg) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
875 ;; (interactive "p") |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
876 ;; (let ((c++-defun-header (if c++-match-header-strongly |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
877 ;; c++-defun-header-strong |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
878 ;; c++-defun-header-weak))) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
879 ;; (cond ((or (= arg 0) (and (> arg 0) (bobp))) nil) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
880 ;; ((and (not (looking-at c++-defun-header)) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
881 ;; (let ((curr-pos (point)) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
882 ;; (open-pos (if (search-forward "{" nil 'move) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
883 ;; (point))) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
884 ;; (beg-pos |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
885 ;; (if (re-search-backward c++-defun-header nil 'move) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
886 ;; (match-beginning 0)))) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
887 ;; (if (and open-pos beg-pos |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
888 ;; (< beg-pos curr-pos) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
889 ;; (> open-pos curr-pos)) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
890 ;; (progn |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
891 ;; (goto-char beg-pos) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
892 ;; (if (= arg 1) t nil));; Are we done? |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
893 ;; (goto-char curr-pos) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
894 ;; nil)))) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
895 ;; (t |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
896 ;; (if (and (looking-at c++-defun-header) (not (bobp))) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
897 ;; (forward-char (if (< arg 0) 1 -1))) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
898 ;; (and (re-search-backward c++-defun-header nil 'move (or arg 1)) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
899 ;; (goto-char (match-beginning 0))))))) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
900 ;; |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
901 ;; |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
902 ;; (defun c++-end-of-defun (arg) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
903 ;; (interactive "p") |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
904 ;; (let ((c++-defun-header (if c++-match-header-strongly |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
905 ;; c++-defun-header-strong |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
906 ;; c++-defun-header-weak))) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
907 ;; (if (and (eobp) (> arg 0)) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
908 ;; nil |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
909 ;; (if (and (> arg 0) (looking-at c++-defun-header)) (forward-char 1)) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
910 ;; (let ((pos (point))) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
911 ;; (c++-beginning-of-defun |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
912 ;; (if (< arg 0) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
913 ;; (- (- arg (if (eobp) 0 1))) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
914 ;; arg)) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
915 ;; (if (and (< arg 0) (bobp)) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
916 ;; t |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
917 ;; (if (re-search-forward c++-defun-header nil 'move) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
918 ;; (progn (forward-char -1) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
919 ;; (forward-sexp) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
920 ;; (beginning-of-line 2))) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
921 ;; (if (and (= pos (point)) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
922 ;; (re-search-forward c++-defun-header nil 'move)) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
923 ;; (c++-end-of-defun 1)))) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
924 ;; t))) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
925 ;; |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
926 ;; (defun c++-indent-defun () |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
927 ;; "Indents the current function definition, struct or class declaration." |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
928 ;; (interactive) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
929 ;; (let ((restore (point))) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
930 ;; (c++-end-of-defun 1) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
931 ;; (beginning-of-line 1) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
932 ;; (let ((end (point))) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
933 ;; (c++-beginning-of-defun 1) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
934 ;; (while (<= (point) end) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
935 ;; (c++-indent-line) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
936 ;; (next-line 1) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
937 ;; (beginning-of-line 1))) |
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
798
diff
changeset
|
938 ;; (goto-char restore))) |
662
8a533acedb77
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
257
diff
changeset
|
939 |
3806
d43666cf0dbb
Comment changes for renaming from c++-mode.el to cplus-md.el.
Richard M. Stallman <rms@gnu.org>
parents:
3627
diff
changeset
|
940 ;;; cplus-md.el ends here |