Mercurial > emacs
annotate lisp/emacs-lisp/cl-indent.el @ 26940:f1998d661bc2
Remove conditional definition of eval-when-compile. Don't specify abs,
expt, gethash, hash-table-count, hash-table-p as side-effect-free here.
(cl-emacs-type): Don't declare.
(cl-compile-time-init): Remove Emacs 18 compiler patch.
(cl-parse-loop-clause): Remove compatibility code.
author | Dave Love <fx@gnu.org> |
---|---|
date | Sat, 18 Dec 1999 17:10:56 +0000 |
parents | e6efd0ace0f3 |
children | e9725bb98b6e |
rev | line source |
---|---|
662
8a533acedb77
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
257
diff
changeset
|
1 ;;; cl-indent.el --- enhanced lisp-indent mode |
8a533acedb77
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
257
diff
changeset
|
2 |
257 | 3 ;; Copyright (C) 1987 Free Software Foundation, Inc. |
2307
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
845
diff
changeset
|
4 |
14040 | 5 ;; Author: Richard Mlynarik <mly@eddie.mit.edu> |
2307
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
845
diff
changeset
|
6 ;; Created: July 1987 |
845 | 7 ;; Maintainer: FSF |
8 ;; Keywords: lisp, tools | |
9 | |
257 | 10 ;; This file is part of GNU Emacs. |
11 | |
12 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
13 ;; it under the terms of the GNU General Public License as published by | |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
662
diff
changeset
|
14 ;; the Free Software Foundation; either version 2, or (at your option) |
257 | 15 ;; any later version. |
16 | |
17 ;; GNU Emacs is distributed in the hope that it will be useful, | |
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
20 ;; GNU General Public License for more details. | |
21 | |
22 ;; You should have received a copy of the GNU General Public License | |
14169 | 23 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
24 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
25 ;; Boston, MA 02111-1307, USA. | |
257 | 26 |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
662
diff
changeset
|
27 ;;; Commentary: |
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
662
diff
changeset
|
28 |
2307
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
845
diff
changeset
|
29 ;; This package supplies a single entry point, common-lisp-indent-function, |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
845
diff
changeset
|
30 ;; which performs indentation in the preferred style for Common Lisp code. |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
845
diff
changeset
|
31 ;; To enable it: |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
845
diff
changeset
|
32 ;; |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
845
diff
changeset
|
33 ;; (setq lisp-indent-function 'common-lisp-indent-function) |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
845
diff
changeset
|
34 |
257 | 35 ;;>> TODO |
36 ;; :foo | |
37 ;; bar | |
38 ;; :baz | |
39 ;; zap | |
40 ;; &key (like &body)?? | |
41 | |
42 ;; &rest 1 in lambda-lists doesn't work | |
43 ;; -- really want (foo bar | |
44 ;; baz) | |
45 ;; not (foo bar | |
46 ;; baz) | |
47 ;; Need something better than &rest for such cases | |
48 | |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
662
diff
changeset
|
49 ;;; Code: |
257 | 50 |
17413
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
51 (defgroup lisp-indent nil |
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
52 "Indentation in Lisp" |
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
53 :group 'lisp) |
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
54 |
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
55 |
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
56 (defcustom lisp-indent-maximum-backtracking 3 |
257 | 57 "*Maximum depth to backtrack out from a sublist for structured indentation. |
58 If this variable is 0, no backtracking will occur and forms such as flet | |
17413
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
59 may not be correctly indented." |
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
60 :type 'integer |
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
61 :group 'lisp-indent) |
257 | 62 |
17413
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
63 (defcustom lisp-tag-indentation 1 |
257 | 64 "*Indentation of tags relative to containing list. |
17413
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
65 This variable is used by the function `lisp-indent-tagbody'." |
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
66 :type 'integer |
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
67 :group 'lisp-indent) |
257 | 68 |
17413
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
69 (defcustom lisp-tag-body-indentation 3 |
257 | 70 "*Indentation of non-tagged lines relative to containing list. |
71 This variable is used by the function `lisp-indent-tagbody' to indent normal | |
72 lines (lines without tags). | |
73 The indentation is relative to the indentation of the parenthesis enclosing | |
74 the special form. If the value is t, the body of tags will be indented | |
75 as a block at the same indentation as the first s-expression following | |
76 the tag. In this case, any forms before the first tag are indented | |
17413
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
77 by `lisp-body-indent'." |
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
78 :type 'integer |
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
79 :group 'lisp-indent) |
257 | 80 |
81 | |
22212
b95ba3830bc9
(lisp-indent-error-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22180
diff
changeset
|
82 (defvar lisp-indent-error-function) |
22858
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
83 (defvar lisp-indent-defun-method '(4 &lambda &body)) |
22212
b95ba3830bc9
(lisp-indent-error-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22180
diff
changeset
|
84 |
257 | 85 ;;;###autoload |
86 (defun common-lisp-indent-function (indent-point state) | |
87 (let ((normal-indent (current-column))) | |
88 ;; Walk up list levels until we see something | |
89 ;; which does special things with subforms. | |
90 (let ((depth 0) | |
91 ;; Path describes the position of point in terms of | |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
2307
diff
changeset
|
92 ;; list-structure with respect to containing lists. |
257 | 93 ;; `foo' has a path of (0 4 1) in `((a b c (d foo) f) g)' |
94 (path ()) | |
95 ;; set non-nil when somebody works out the indentation to use | |
96 calculated | |
97 (last-point indent-point) | |
98 ;; the position of the open-paren of the innermost containing list | |
99 (containing-form-start (elt state 1)) | |
100 ;; the column of the above | |
101 sexp-column) | |
102 ;; Move to start of innermost containing list | |
103 (goto-char containing-form-start) | |
104 (setq sexp-column (current-column)) | |
105 ;; Look over successively less-deep containing forms | |
106 (while (and (not calculated) | |
107 (< depth lisp-indent-maximum-backtracking)) | |
108 (let ((containing-sexp (point))) | |
109 (forward-char 1) | |
110 (parse-partial-sexp (point) indent-point 1 t) | |
111 ;; Move to the car of the relevant containing form | |
112 (let (tem function method) | |
113 (if (not (looking-at "\\sw\\|\\s_")) | |
114 ;; This form doesn't seem to start with a symbol | |
115 (setq function nil method nil) | |
116 (setq tem (point)) | |
117 (forward-sexp 1) | |
22858
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
118 (setq function (downcase (buffer-substring-no-properties |
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
119 tem (point)))) |
257 | 120 (goto-char tem) |
121 (setq tem (intern-soft function) | |
122 method (get tem 'common-lisp-indent-function)) | |
123 (cond ((and (null method) | |
124 (string-match ":[^:]+" function)) | |
125 ;; The pleblisp package feature | |
126 (setq function (substring function | |
127 (1+ (match-beginning 0))) | |
128 method (get (intern-soft function) | |
129 'common-lisp-indent-function))) | |
130 ((and (null method)) | |
131 ;; backwards compatibility | |
132 (setq method (get tem 'lisp-indent-function))))) | |
133 (let ((n 0)) | |
134 ;; How far into the containing form is the current form? | |
135 (if (< (point) indent-point) | |
136 (while (condition-case () | |
137 (progn | |
138 (forward-sexp 1) | |
139 (if (>= (point) indent-point) | |
140 nil | |
141 (parse-partial-sexp (point) | |
142 indent-point 1 t) | |
143 (setq n (1+ n)) | |
144 t)) | |
145 (error nil)))) | |
146 (setq path (cons n path))) | |
147 | |
148 ;; backwards compatibility. | |
149 (cond ((null function)) | |
150 ((null method) | |
22858
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
151 (when (null (cdr path)) |
257 | 152 ;; (package prefix was stripped off above) |
153 (setq method (cond ((string-match "\\`def" | |
154 function) | |
22858
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
155 lisp-indent-defun-method) |
257 | 156 ((string-match "\\`\\(with\\|do\\)-" |
157 function) | |
22858
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
158 '(&lambda &body)))))) |
257 | 159 ;; backwards compatibility. Bletch. |
160 ((eq method 'defun) | |
22858
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
161 (setq method lisp-indent-defun-method))) |
257 | 162 |
163 (cond ((and (memq (char-after (1- containing-sexp)) '(?\' ?\`)) | |
26047
e6efd0ace0f3
(common-lisp-indent-function): Use `eq' instead of `eql'.
Gerd Moellmann <gerd@gnu.org>
parents:
23725
diff
changeset
|
164 (not (eq (char-after (- containing-sexp 2)) ?\#))) |
257 | 165 ;; No indentation for "'(...)" elements |
166 (setq calculated (1+ sexp-column))) | |
26047
e6efd0ace0f3
(common-lisp-indent-function): Use `eq' instead of `eql'.
Gerd Moellmann <gerd@gnu.org>
parents:
23725
diff
changeset
|
167 ((or (eq (char-after (1- containing-sexp)) ?\,) |
e6efd0ace0f3
(common-lisp-indent-function): Use `eq' instead of `eql'.
Gerd Moellmann <gerd@gnu.org>
parents:
23725
diff
changeset
|
168 (and (eq (char-after (1- containing-sexp)) ?\@) |
e6efd0ace0f3
(common-lisp-indent-function): Use `eq' instead of `eql'.
Gerd Moellmann <gerd@gnu.org>
parents:
23725
diff
changeset
|
169 (eq (char-after (- containing-sexp 2)) ?\,))) |
257 | 170 ;; ",(...)" or ",@(...)" |
171 (setq calculated normal-indent)) | |
26047
e6efd0ace0f3
(common-lisp-indent-function): Use `eq' instead of `eql'.
Gerd Moellmann <gerd@gnu.org>
parents:
23725
diff
changeset
|
172 ((eq (char-after (1- containing-sexp)) ?\#) |
257 | 173 ;; "#(...)" |
174 (setq calculated (1+ sexp-column))) | |
175 ((null method)) | |
176 ((integerp method) | |
177 ;; convenient top-level hack. | |
178 ;; (also compatible with lisp-indent-function) | |
179 ;; The number specifies how many `distinguished' | |
180 ;; forms there are before the body starts | |
181 ;; Equivalent to (4 4 ... &body) | |
182 (setq calculated (cond ((cdr path) | |
183 normal-indent) | |
184 ((<= (car path) method) | |
185 ;; `distinguished' form | |
186 (list (+ sexp-column 4) | |
187 containing-form-start)) | |
188 ((= (car path) (1+ method)) | |
189 ;; first body form. | |
190 (+ sexp-column lisp-body-indent)) | |
191 (t | |
192 ;; other body form | |
193 normal-indent)))) | |
194 ((symbolp method) | |
22212
b95ba3830bc9
(lisp-indent-error-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22180
diff
changeset
|
195 (let ((lisp-indent-error-function function)) |
b95ba3830bc9
(lisp-indent-error-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22180
diff
changeset
|
196 (setq calculated (funcall method |
b95ba3830bc9
(lisp-indent-error-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22180
diff
changeset
|
197 path state indent-point |
b95ba3830bc9
(lisp-indent-error-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22180
diff
changeset
|
198 sexp-column normal-indent)))) |
257 | 199 (t |
22212
b95ba3830bc9
(lisp-indent-error-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22180
diff
changeset
|
200 (let ((lisp-indent-error-function function)) |
b95ba3830bc9
(lisp-indent-error-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22180
diff
changeset
|
201 (setq calculated (lisp-indent-259 |
b95ba3830bc9
(lisp-indent-error-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22180
diff
changeset
|
202 method path state indent-point |
b95ba3830bc9
(lisp-indent-error-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22180
diff
changeset
|
203 sexp-column normal-indent)))))) |
257 | 204 (goto-char containing-sexp) |
205 (setq last-point containing-sexp) | |
22858
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
206 (unless calculated |
257 | 207 (condition-case () |
208 (progn (backward-up-list 1) | |
209 (setq depth (1+ depth))) | |
210 (error (setq depth lisp-indent-maximum-backtracking)))))) | |
211 calculated))) | |
212 | |
213 | |
214 (defun lisp-indent-report-bad-format (m) | |
215 (error "%s has a badly-formed %s property: %s" | |
216 ;; Love those free variable references!! | |
22212
b95ba3830bc9
(lisp-indent-error-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22180
diff
changeset
|
217 lisp-indent-error-function 'common-lisp-indent-function m)) |
257 | 218 |
219 ;; Blame the crufty control structure on dynamic scoping | |
220 ;; -- not on me! | |
221 (defun lisp-indent-259 (method path state indent-point | |
222 sexp-column normal-indent) | |
223 (catch 'exit | |
224 (let ((p path) | |
225 (containing-form-start (elt state 1)) | |
226 n tem tail) | |
227 ;; Isn't tail-recursion wonderful? | |
228 (while p | |
229 ;; This while loop is for destructuring. | |
230 ;; p is set to (cdr p) each iteration. | |
231 (if (not (consp method)) (lisp-indent-report-bad-format method)) | |
232 (setq n (1- (car p)) | |
233 p (cdr p) | |
234 tail nil) | |
235 (while n | |
236 ;; This while loop is for advancing along a method | |
237 ;; until the relevant (possibly &rest/&body) pattern | |
238 ;; is reached. | |
239 ;; n is set to (1- n) and method to (cdr method) | |
240 ;; each iteration. | |
241 (setq tem (car method)) | |
242 | |
243 (or (eq tem 'nil) ;default indentation | |
22858
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
244 (eq tem '&lambda) ;lambda list |
257 | 245 (and (eq tem '&body) (null (cdr method))) |
246 (and (eq tem '&rest) | |
22858
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
247 (consp (cdr method)) (null (cddr method))) |
257 | 248 (integerp tem) ;explicit indentation specified |
249 (and (consp tem) ;destructuring | |
250 (eq (car tem) '&whole) | |
22858
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
251 (or (symbolp (cadr tem)) |
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
252 (integerp (cadr tem)))) |
257 | 253 (and (symbolp tem) ;a function to call to do the work. |
254 (null (cdr method))) | |
255 (lisp-indent-report-bad-format method)) | |
256 | |
257 (cond ((and tail (not (consp tem))) | |
258 ;; indent tail of &rest in same way as first elt of rest | |
259 (throw 'exit normal-indent)) | |
260 ((eq tem '&body) | |
261 ;; &body means (&rest <lisp-body-indent>) | |
262 (throw 'exit | |
263 (if (and (= n 0) ;first body form | |
264 (null p)) ;not in subforms | |
265 (+ sexp-column | |
266 lisp-body-indent) | |
267 normal-indent))) | |
268 ((eq tem '&rest) | |
269 ;; this pattern holds for all remaining forms | |
270 (setq tail (> n 0) | |
271 n 0 | |
272 method (cdr method))) | |
273 ((> n 0) | |
274 ;; try next element of pattern | |
275 (setq n (1- n) | |
276 method (cdr method)) | |
277 (if (< n 0) | |
278 ;; Too few elements in pattern. | |
279 (throw 'exit normal-indent))) | |
280 ((eq tem 'nil) | |
281 (throw 'exit (list normal-indent containing-form-start))) | |
22858
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
282 ((eq tem '&lambda) |
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
283 (throw 'exit |
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
284 (cond ((null p) |
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
285 (list (+ sexp-column 4) containing-form-start)) |
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
286 ((null (cdr p)) |
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
287 (+ sexp-column 1)) |
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
288 (t normal-indent)))) |
257 | 289 ((integerp tem) |
290 (throw 'exit | |
291 (if (null p) ;not in subforms | |
292 (list (+ sexp-column tem) containing-form-start) | |
293 normal-indent))) | |
294 ((symbolp tem) ;a function to call | |
295 (throw 'exit | |
296 (funcall tem path state indent-point | |
297 sexp-column normal-indent))) | |
298 (t | |
299 ;; must be a destructing frob | |
300 (if (not (null p)) | |
301 ;; descend | |
22858
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
302 (setq method (cddr tem) |
257 | 303 n nil) |
22858
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
304 (setq tem (cadr tem)) |
257 | 305 (throw 'exit |
306 (cond (tail | |
307 normal-indent) | |
308 ((eq tem 'nil) | |
309 (list normal-indent | |
310 containing-form-start)) | |
311 ((integerp tem) | |
312 (list (+ sexp-column tem) | |
313 containing-form-start)) | |
314 (t | |
315 (funcall tem path state indent-point | |
316 sexp-column normal-indent)))))))))))) | |
317 | |
318 (defun lisp-indent-tagbody (path state indent-point sexp-column normal-indent) | |
319 (if (not (null (cdr path))) | |
320 normal-indent | |
321 (save-excursion | |
322 (goto-char indent-point) | |
323 (beginning-of-line) | |
324 (skip-chars-forward " \t") | |
325 (list (cond ((looking-at "\\sw\\|\\s_") | |
326 ;; a tagbody tag | |
327 (+ sexp-column lisp-tag-indentation)) | |
328 ((integerp lisp-tag-body-indentation) | |
329 (+ sexp-column lisp-tag-body-indentation)) | |
330 ((eq lisp-tag-body-indentation 't) | |
331 (condition-case () | |
332 (progn (backward-sexp 1) (current-column)) | |
333 (error (1+ sexp-column)))) | |
334 (t (+ sexp-column lisp-body-indent))) | |
335 ; (cond ((integerp lisp-tag-body-indentation) | |
336 ; (+ sexp-column lisp-tag-body-indentation)) | |
337 ; ((eq lisp-tag-body-indentation 't) | |
338 ; normal-indent) | |
339 ; (t | |
340 ; (+ sexp-column lisp-body-indent))) | |
341 (elt state 1) | |
342 )))) | |
343 | |
344 (defun lisp-indent-do (path state indent-point sexp-column normal-indent) | |
345 (if (>= (car path) 3) | |
346 (let ((lisp-tag-body-indentation lisp-body-indent)) | |
347 (funcall (function lisp-indent-tagbody) | |
348 path state indent-point sexp-column normal-indent)) | |
349 (funcall (function lisp-indent-259) | |
350 '((&whole nil &rest | |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
2307
diff
changeset
|
351 ;; the following causes weird indentation |
257 | 352 ;;(&whole 1 1 2 nil) |
353 ) | |
354 (&whole nil &rest 1)) | |
355 path state indent-point sexp-column normal-indent))) | |
356 | |
357 (defun lisp-indent-function-lambda-hack (path state indent-point | |
358 sexp-column normal-indent) | |
359 ;; indent (function (lambda () <newline> <body-forms>)) kludgily. | |
360 (if (or (cdr path) ; wtf? | |
361 (> (car path) 3)) | |
362 ;; line up under previous body form | |
363 normal-indent | |
364 ;; line up under function rather than under lambda in order to | |
365 ;; conserve horizontal space. (Which is what #' is for.) | |
366 (condition-case () | |
367 (save-excursion | |
368 (backward-up-list 2) | |
369 (forward-char 1) | |
370 (if (looking-at "\\(lisp:+\\)?function\\(\\Sw\\|\\S_\\)") | |
371 (+ lisp-body-indent -1 (current-column)) | |
372 (+ sexp-column lisp-body-indent))) | |
373 (error (+ sexp-column lisp-body-indent))))) | |
374 | |
375 | |
376 (let ((l '((block 1) | |
20954 | 377 (case (4 &rest (&whole 2 &rest 1))) |
378 (ccase . case) (ecase . case) | |
379 (typecase . case) (etypecase . case) (ctypecase . case) | |
380 (catch 1) | |
381 (cond (&rest (&whole 2 &rest 1))) | |
382 (defvar (4 2 2)) | |
21102 | 383 (defconstant . defvar) |
22858
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
384 (defcustom (4 2 2 2)) |
21102 | 385 (defparameter . defvar) |
20954 | 386 (define-modify-macro |
257 | 387 (4 &body)) |
22858
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
388 (defsetf (4 &lambda 4 &body)) |
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
389 (defun (4 &lambda &body)) |
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
390 (define-setf-method . defun) |
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
391 (define-setf-expander . defun) |
22913
edbc56db94ee
(top-level let): add defsubst.
Richard M. Stallman <rms@gnu.org>
parents:
22858
diff
changeset
|
392 (defmacro . defun) (defsubst . defun) (deftype . defun) |
21750
e152a39f074f
Indent defpackage correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21102
diff
changeset
|
393 (defpackage (4 2)) |
20954 | 394 (defstruct ((&whole 4 &rest (&whole 2 &rest 1)) |
395 &rest (&whole 2 &rest 1))) | |
396 (destructuring-bind | |
397 ((&whole 6 &rest 1) 4 &body)) | |
398 (do lisp-indent-do) | |
399 (do* . do) | |
400 (dolist ((&whole 4 2 1) &body)) | |
401 (dotimes . dolist) | |
402 (eval-when 1) | |
22858
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
403 (flet ((&whole 4 &rest (&whole 1 &lambda &body)) &body)) |
20954 | 404 (labels . flet) |
405 (macrolet . flet) | |
22858
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
406 (handler-case (4 &rest (&whole 2 &lambda &body))) |
22756
6103b46f200a
Indent `restart-case', `handler-bind' and `restart-bind' correctly.
Richard M. Stallman <rms@gnu.org>
parents:
22731
diff
changeset
|
407 (restart-case . handler-case) |
20954 | 408 ;; `else-body' style |
409 (if (nil nil &body)) | |
410 ;; single-else style (then and else equally indented) | |
411 (if (&rest nil)) | |
22858
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
412 (lambda (&lambda &rest lisp-indent-function-lambda-hack)) |
20954 | 413 (let ((&whole 4 &rest (&whole 1 1 2)) &body)) |
414 (let* . let) | |
415 (compiler-let . let) ;barf | |
22756
6103b46f200a
Indent `restart-case', `handler-bind' and `restart-bind' correctly.
Richard M. Stallman <rms@gnu.org>
parents:
22731
diff
changeset
|
416 (handler-bind . let) (restart-bind . let) |
20954 | 417 (locally 1) |
418 ;(loop ...) | |
21102 | 419 (multiple-value-bind |
420 ((&whole 6 &rest 1) 4 &body)) | |
421 (multiple-value-call | |
422 (4 &body)) | |
20954 | 423 (multiple-value-prog1 1) |
21102 | 424 (multiple-value-setq |
425 (4 2)) | |
20954 | 426 (multiple-value-setf . multiple-value-setq) |
427 ;; Combines the worst features of BLOCK, LET and TAGBODY | |
22858
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
428 (prog (&lambda &rest lisp-indent-tagbody)) |
20954 | 429 (prog* . prog) |
430 (prog1 1) | |
431 (prog2 2) | |
432 (progn 0) | |
433 (progv (4 4 &body)) | |
434 (return 0) | |
435 (return-from (nil &body)) | |
436 (tagbody lisp-indent-tagbody) | |
437 (throw 1) | |
438 (unless 1) | |
439 (unwind-protect (5 &body)) | |
22180
485917486caf
Indent `with-standard-io-syntax' correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21750
diff
changeset
|
440 (when 1) |
23725
222d58586999
indent `with-output-to-string' as a CL
Karl Heuer <kwzh@gnu.org>
parents:
22913
diff
changeset
|
441 (with-output-to-string (4 2)) |
22180
485917486caf
Indent `with-standard-io-syntax' correctly.
Richard M. Stallman <rms@gnu.org>
parents:
21750
diff
changeset
|
442 (with-standard-io-syntax (2))))) |
257 | 443 (while l |
22858
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
444 (put (caar l) 'common-lisp-indent-function |
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
445 (if (symbolp (cdar l)) |
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
446 (get (cdar l) 'common-lisp-indent-function) |
77090a500417
(lisp-indent-defun-method): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22756
diff
changeset
|
447 (car (cdar l)))) |
257 | 448 (setq l (cdr l)))) |
449 | |
450 | |
451 ;(defun foo (x) | |
452 ; (tagbody | |
453 ; foo | |
454 ; (bar) | |
455 ; baz | |
456 ; (when (losing) | |
457 ; (with-big-loser | |
458 ; (yow) | |
459 ; ((lambda () | |
460 ; foo) | |
461 ; big))) | |
462 ; (flet ((foo (bar baz zap) | |
463 ; (zip)) | |
464 ; (zot () | |
465 ; quux)) | |
466 ; (do () | |
467 ; ((lose) | |
468 ; (foo 1)) | |
469 ; (quux) | |
470 ; foo | |
471 ; (lose)) | |
472 ; (cond ((x) | |
473 ; (win 1 2 | |
474 ; (foo))) | |
475 ; (t | |
476 ; (lose | |
477 ; 3)))))) | |
478 | |
479 | |
480 ;(put 'while 'common-lisp-indent-function 1) | |
481 ;(put 'defwrapper'common-lisp-indent-function ...) | |
482 ;(put 'def 'common-lisp-indent-function ...) | |
483 ;(put 'defflavor 'common-lisp-indent-function ...) | |
484 ;(put 'defsubst 'common-lisp-indent-function ...) | |
485 | |
486 ;(put 'with-restart 'common-lisp-indent-function '((1 4 ((* 1))) (2 &body))) | |
487 ;(put 'restart-case 'common-lisp-indent-function '((1 4) (* 2 ((0 1) (* 1))))) | |
488 ;(put 'define-condition 'common-lisp-indent-function '((1 6) (2 6 ((* 1))) (3 4 ((* 1))) (4 &body))) | |
489 ;(put 'with-condition-handler 'common-lisp-indent-function '((1 4 ((* 1))) (2 &body))) | |
490 ;(put 'condition-case 'common-lisp-indent-function '((1 4) (* 2 ((0 1) (1 3) (2 &body))))) | |
491 | |
662
8a533acedb77
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
257
diff
changeset
|
492 ;;; cl-indent.el ends here |