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