Mercurial > emacs
annotate lisp/emacs-lisp/edebug.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 | 2cca1ed12a51 |
children | 6a6b75706812 |
rev | line source |
---|---|
14846 | 1 ;;; edebug.el --- a source-level debugger for Emacs Lisp |
2 | |
24024
2981304f5015
(edebug-eval-defun): Deal with defcustom
Dave Love <fx@gnu.org>
parents:
23587
diff
changeset
|
3 ;; Copyright (C) 1988, 89, 90, 91, 92, 93, 94, 95, 97, 1999 |
20832 | 4 ;; Free Software Foundation, Inc. |
661 | 5 |
20078
0fc1437e7427
(edebug-eval-mode): Nicer mode-name value.
Karl Heuer <kwzh@gnu.org>
parents:
19930
diff
changeset
|
6 ;; Author: Daniel LaLiberte <dlaliberte@gte.com> |
20832 | 7 ;; Maintainer: FSF |
2247
2c7997f249eb
Add or correct keywords
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1821
diff
changeset
|
8 ;; Keywords: lisp, tools, maint |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
778
diff
changeset
|
9 |
661 | 10 ;; This file is part of GNU Emacs. |
11 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
12 ;; GNU Emacs is free software; you can redistribute it and/or modify |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
13 ;; it under the terms of the GNU General Public License as published by |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
14 ;; the Free Software Foundation; either version 2, or (at your option) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
15 ;; any later version. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
16 |
661 | 17 ;; GNU Emacs is distributed in the hope that it will be useful, |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
20 ;; GNU General Public License for more details. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
21 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
22 ;; You should have received a copy of the GNU General Public License |
14846 | 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. | |
26 | |
27 ;;; Commentary: | |
28 | |
29 ;; This minor mode allows programmers to step through Emacs Lisp | |
30 ;; source code while executing functions. You can also set | |
31 ;; breakpoints, trace (stopping at each expression), evaluate | |
32 ;; expressions as if outside Edebug, reevaluate and display a list of | |
33 ;; expressions, trap errors normally caught by debug, and display a | |
34 ;; debug style backtrace. | |
35 | |
20078
0fc1437e7427
(edebug-eval-mode): Nicer mode-name value.
Karl Heuer <kwzh@gnu.org>
parents:
19930
diff
changeset
|
36 ;;; Minimal Instructions |
0fc1437e7427
(edebug-eval-mode): Nicer mode-name value.
Karl Heuer <kwzh@gnu.org>
parents:
19930
diff
changeset
|
37 ;; ===================== |
0fc1437e7427
(edebug-eval-mode): Nicer mode-name value.
Karl Heuer <kwzh@gnu.org>
parents:
19930
diff
changeset
|
38 |
0fc1437e7427
(edebug-eval-mode): Nicer mode-name value.
Karl Heuer <kwzh@gnu.org>
parents:
19930
diff
changeset
|
39 ;; First evaluate a defun with C-M-x, then run the function. Step |
0fc1437e7427
(edebug-eval-mode): Nicer mode-name value.
Karl Heuer <kwzh@gnu.org>
parents:
19930
diff
changeset
|
40 ;; through the code with SPC, mark breakpoints with b, go until a |
0fc1437e7427
(edebug-eval-mode): Nicer mode-name value.
Karl Heuer <kwzh@gnu.org>
parents:
19930
diff
changeset
|
41 ;; breakpoint is reached with g, and quit execution with q. Use the |
0fc1437e7427
(edebug-eval-mode): Nicer mode-name value.
Karl Heuer <kwzh@gnu.org>
parents:
19930
diff
changeset
|
42 ;; "?" command in edebug to describe other commands. |
20832 | 43 ;; See the Emacs Lisp Reference Manual for more details. |
14846 | 44 |
45 ;; If you wish to change the default edebug global command prefix, change: | |
46 ;; (setq edebug-global-prefix "\C-xX") | |
47 | |
20832 | 48 ;; Edebug was written by |
49 ;; Daniel LaLiberte | |
20078
0fc1437e7427
(edebug-eval-mode): Nicer mode-name value.
Karl Heuer <kwzh@gnu.org>
parents:
19930
diff
changeset
|
50 ;; GTE Labs |
0fc1437e7427
(edebug-eval-mode): Nicer mode-name value.
Karl Heuer <kwzh@gnu.org>
parents:
19930
diff
changeset
|
51 ;; 40 Sylvan Rd |
0fc1437e7427
(edebug-eval-mode): Nicer mode-name value.
Karl Heuer <kwzh@gnu.org>
parents:
19930
diff
changeset
|
52 ;; Waltham, MA 02254 |
0fc1437e7427
(edebug-eval-mode): Nicer mode-name value.
Karl Heuer <kwzh@gnu.org>
parents:
19930
diff
changeset
|
53 ;; dlaliberte@gte.com |
14846 | 54 |
55 ;;; Code: | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
56 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
57 (defconst edebug-version |
18399
feed0e356d1b
(edebug-version): Use the Emacs version.
Richard M. Stallman <rms@gnu.org>
parents:
18376
diff
changeset
|
58 (concat "In Emacs version " emacs-version)) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
59 |
14846 | 60 ;;; Bug reporting |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
61 |
20832 | 62 (defconst edebug-maintainer-address "bug-gnu-emacs@gnu.org") |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
63 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
64 (defun edebug-submit-bug-report () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
65 "Submit, via mail, a bug report on edebug." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
66 (interactive) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
67 (require 'reporter) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
68 (and (y-or-n-p "Do you really want to submit a report on edebug? ") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
69 (reporter-submit-bug-report |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
70 edebug-maintainer-address |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
71 (concat "edebug.el " edebug-version) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
72 (list 'edebug-setup-hook |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
73 'edebug-all-defs |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
74 'edebug-all-forms |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
75 'edebug-eval-macro-args |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
76 'edebug-save-windows |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
77 'edebug-save-displayed-buffer-points |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
78 'edebug-initial-mode |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
79 'edebug-trace |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
80 'edebug-test-coverage |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
81 'edebug-continue-kbd-macro |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
82 'edebug-print-length |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
83 'edebug-print-level |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
84 'edebug-print-circle |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
85 )))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
86 |
14846 | 87 ;;; Options |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
88 |
17414
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
89 (defgroup edebug nil |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
90 "A source-level debugger for Emacs Lisp" |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
91 :group 'lisp) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
92 |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
93 |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
94 (defcustom edebug-setup-hook nil |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
95 "*Functions to call before edebug is used. |
6761
f1d73d12436e
checked in with -k by liberte at 1994/04/09 20:57:56
Daniel LaLiberte <liberte@gnu.org>
parents:
6732
diff
changeset
|
96 Each time it is set to a new value, Edebug will call those functions |
f1d73d12436e
checked in with -k by liberte at 1994/04/09 20:57:56
Daniel LaLiberte <liberte@gnu.org>
parents:
6732
diff
changeset
|
97 once and then `edebug-setup-hook' is reset to nil. You could use this |
f1d73d12436e
checked in with -k by liberte at 1994/04/09 20:57:56
Daniel LaLiberte <liberte@gnu.org>
parents:
6732
diff
changeset
|
98 to load up Edebug specifications associated with a package you are |
17414
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
99 using but only when you also use Edebug." |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
100 :type 'hook |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
101 :group 'edebug) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
102 |
21990
02b32ae7e637
(edebug-all-forms): Add autoload cookie.
Richard M. Stallman <rms@gnu.org>
parents:
21643
diff
changeset
|
103 ;; edebug-all-defs and edebug-all-forms need to be autoloaded |
02b32ae7e637
(edebug-all-forms): Add autoload cookie.
Richard M. Stallman <rms@gnu.org>
parents:
21643
diff
changeset
|
104 ;; because the byte compiler binds them; as a result, if edebug |
02b32ae7e637
(edebug-all-forms): Add autoload cookie.
Richard M. Stallman <rms@gnu.org>
parents:
21643
diff
changeset
|
105 ;; is first loaded for a require in a compilation, they will be left unbound. |
02b32ae7e637
(edebug-all-forms): Add autoload cookie.
Richard M. Stallman <rms@gnu.org>
parents:
21643
diff
changeset
|
106 |
02b32ae7e637
(edebug-all-forms): Add autoload cookie.
Richard M. Stallman <rms@gnu.org>
parents:
21643
diff
changeset
|
107 ;;;###autoload |
17414
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
108 (defcustom edebug-all-defs nil |
6761
f1d73d12436e
checked in with -k by liberte at 1994/04/09 20:57:56
Daniel LaLiberte <liberte@gnu.org>
parents:
6732
diff
changeset
|
109 "*If non-nil, evaluation of any defining forms will instrument for Edebug. |
f1d73d12436e
checked in with -k by liberte at 1994/04/09 20:57:56
Daniel LaLiberte <liberte@gnu.org>
parents:
6732
diff
changeset
|
110 This applies to `eval-defun', `eval-region', `eval-buffer', and |
f1d73d12436e
checked in with -k by liberte at 1994/04/09 20:57:56
Daniel LaLiberte <liberte@gnu.org>
parents:
6732
diff
changeset
|
111 `eval-current-buffer'. `eval-region' is also called by |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
112 `eval-last-sexp', and `eval-print-last-sexp'. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
113 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
114 You can use the command `edebug-all-defs' to toggle the value of this |
6761
f1d73d12436e
checked in with -k by liberte at 1994/04/09 20:57:56
Daniel LaLiberte <liberte@gnu.org>
parents:
6732
diff
changeset
|
115 variable. You may wish to make it local to each buffer with |
14846 | 116 \(make-local-variable 'edebug-all-defs) in your |
17414
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
117 `emacs-lisp-mode-hook'." |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
118 :type 'boolean |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
119 :group 'edebug) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
120 |
21990
02b32ae7e637
(edebug-all-forms): Add autoload cookie.
Richard M. Stallman <rms@gnu.org>
parents:
21643
diff
changeset
|
121 ;; edebug-all-defs and edebug-all-forms need to be autoloaded |
02b32ae7e637
(edebug-all-forms): Add autoload cookie.
Richard M. Stallman <rms@gnu.org>
parents:
21643
diff
changeset
|
122 ;; because the byte compiler binds them; as a result, if edebug |
02b32ae7e637
(edebug-all-forms): Add autoload cookie.
Richard M. Stallman <rms@gnu.org>
parents:
21643
diff
changeset
|
123 ;; is first loaded for a require in a compilation, they will be left unbound. |
02b32ae7e637
(edebug-all-forms): Add autoload cookie.
Richard M. Stallman <rms@gnu.org>
parents:
21643
diff
changeset
|
124 |
02b32ae7e637
(edebug-all-forms): Add autoload cookie.
Richard M. Stallman <rms@gnu.org>
parents:
21643
diff
changeset
|
125 ;;;###autoload |
17414
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
126 (defcustom edebug-all-forms nil |
6761
f1d73d12436e
checked in with -k by liberte at 1994/04/09 20:57:56
Daniel LaLiberte <liberte@gnu.org>
parents:
6732
diff
changeset
|
127 "*Non-nil evaluation of all forms will instrument for Edebug. |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
128 This doesn't apply to loading or evaluations in the minibuffer. |
17414
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
129 Use the command `edebug-all-forms' to toggle the value of this option." |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
130 :type 'boolean |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
131 :group 'edebug) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
132 |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
133 (defcustom edebug-eval-macro-args nil |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
134 "*Non-nil means all macro call arguments may be evaluated. |
14846 | 135 If this variable is nil, the default, Edebug will *not* wrap |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
136 macro call arguments as if they will be evaluated. |
14846 | 137 For each macro, a `edebug-form-spec' overrides this option. |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
138 So to specify exceptions for macros that have some arguments evaluated |
20832 | 139 and some not, you should specify an `edebug-form-spec'." |
17414
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
140 :type 'boolean |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
141 :group 'edebug) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
142 |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
143 (defcustom edebug-save-windows t |
6761
f1d73d12436e
checked in with -k by liberte at 1994/04/09 20:57:56
Daniel LaLiberte <liberte@gnu.org>
parents:
6732
diff
changeset
|
144 "*If non-nil, Edebug saves and restores the window configuration. |
f1d73d12436e
checked in with -k by liberte at 1994/04/09 20:57:56
Daniel LaLiberte <liberte@gnu.org>
parents:
6732
diff
changeset
|
145 That takes some time, so if your program does not care what happens to |
f1d73d12436e
checked in with -k by liberte at 1994/04/09 20:57:56
Daniel LaLiberte <liberte@gnu.org>
parents:
6732
diff
changeset
|
146 the window configurations, it is better to set this variable to nil. |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
147 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
148 If the value is a list, only the listed windows are saved and |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
149 restored. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
150 |
17414
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
151 `edebug-toggle-save-windows' may be used to change this variable." |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
152 :type '(choice boolean (repeat string)) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
153 :group 'edebug) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
154 |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
155 (defcustom edebug-save-displayed-buffer-points nil |
6761
f1d73d12436e
checked in with -k by liberte at 1994/04/09 20:57:56
Daniel LaLiberte <liberte@gnu.org>
parents:
6732
diff
changeset
|
156 "*If non-nil, save and restore point in all displayed buffers. |
f1d73d12436e
checked in with -k by liberte at 1994/04/09 20:57:56
Daniel LaLiberte <liberte@gnu.org>
parents:
6732
diff
changeset
|
157 |
f1d73d12436e
checked in with -k by liberte at 1994/04/09 20:57:56
Daniel LaLiberte <liberte@gnu.org>
parents:
6732
diff
changeset
|
158 Saving and restoring point in other buffers is necessary if you are |
f1d73d12436e
checked in with -k by liberte at 1994/04/09 20:57:56
Daniel LaLiberte <liberte@gnu.org>
parents:
6732
diff
changeset
|
159 debugging code that changes the point of a buffer which is displayed |
f1d73d12436e
checked in with -k by liberte at 1994/04/09 20:57:56
Daniel LaLiberte <liberte@gnu.org>
parents:
6732
diff
changeset
|
160 in a non-selected window. If Edebug or the user then selects the |
661 | 161 window, the buffer's point will be changed to the window's point. |
162 | |
6761
f1d73d12436e
checked in with -k by liberte at 1994/04/09 20:57:56
Daniel LaLiberte <liberte@gnu.org>
parents:
6732
diff
changeset
|
163 Saving and restoring point in all buffers is expensive, since it |
f1d73d12436e
checked in with -k by liberte at 1994/04/09 20:57:56
Daniel LaLiberte <liberte@gnu.org>
parents:
6732
diff
changeset
|
164 requires selecting each window twice, so enable this only if you need |
17414
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
165 it." |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
166 :type 'boolean |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
167 :group 'edebug) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
168 |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
169 (defcustom edebug-initial-mode 'step |
6761
f1d73d12436e
checked in with -k by liberte at 1994/04/09 20:57:56
Daniel LaLiberte <liberte@gnu.org>
parents:
6732
diff
changeset
|
170 "*Initial execution mode for Edebug, if non-nil. If this variable |
f1d73d12436e
checked in with -k by liberte at 1994/04/09 20:57:56
Daniel LaLiberte <liberte@gnu.org>
parents:
6732
diff
changeset
|
171 is non-@code{nil}, it specifies the initial execution mode for Edebug |
f1d73d12436e
checked in with -k by liberte at 1994/04/09 20:57:56
Daniel LaLiberte <liberte@gnu.org>
parents:
6732
diff
changeset
|
172 when it is first activated. Possible values are step, next, go, |
17414
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
173 Go-nonstop, trace, Trace-fast, continue, and Continue-fast." |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
174 :type '(choice (const step) (const next) (const go) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
175 (const Go-nonstop) (const trace) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
176 (const Trace-fast) (const continue) |
23587
26749ef98f6c
(edebug-initial-mode): Fix customize type.
Andreas Schwab <schwab@suse.de>
parents:
21990
diff
changeset
|
177 (const Continue-fast)) |
17414
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
178 :group 'edebug) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
179 |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
180 (defcustom edebug-trace nil |
6761
f1d73d12436e
checked in with -k by liberte at 1994/04/09 20:57:56
Daniel LaLiberte <liberte@gnu.org>
parents:
6732
diff
changeset
|
181 "*Non-nil means display a trace of function entry and exit. |
f1d73d12436e
checked in with -k by liberte at 1994/04/09 20:57:56
Daniel LaLiberte <liberte@gnu.org>
parents:
6732
diff
changeset
|
182 Tracing output is displayed in a buffer named `*edebug-trace*', one |
f1d73d12436e
checked in with -k by liberte at 1994/04/09 20:57:56
Daniel LaLiberte <liberte@gnu.org>
parents:
6732
diff
changeset
|
183 function entry or exit per line, indented by the recursion level. |
f1d73d12436e
checked in with -k by liberte at 1994/04/09 20:57:56
Daniel LaLiberte <liberte@gnu.org>
parents:
6732
diff
changeset
|
184 |
f1d73d12436e
checked in with -k by liberte at 1994/04/09 20:57:56
Daniel LaLiberte <liberte@gnu.org>
parents:
6732
diff
changeset
|
185 You can customize by replacing functions `edebug-print-trace-before' |
17414
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
186 and `edebug-print-trace-after'." |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
187 :type 'boolean |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
188 :group 'edebug) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
189 |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
190 (defcustom edebug-test-coverage nil |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
191 "*If non-nil, Edebug tests coverage of all expressions debugged. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
192 This is done by comparing the result of each expression |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
193 with the previous result. Coverage is considered OK if two different |
6761
f1d73d12436e
checked in with -k by liberte at 1994/04/09 20:57:56
Daniel LaLiberte <liberte@gnu.org>
parents:
6732
diff
changeset
|
194 results are found. |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
195 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
196 Use `edebug-display-freq-count' to display the frequency count and |
17414
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
197 coverage information for a definition." |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
198 :type 'boolean |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
199 :group 'edebug) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
200 |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
201 (defcustom edebug-continue-kbd-macro nil |
6761
f1d73d12436e
checked in with -k by liberte at 1994/04/09 20:57:56
Daniel LaLiberte <liberte@gnu.org>
parents:
6732
diff
changeset
|
202 "*If non-nil, continue defining or executing any keyboard macro. |
17414
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
203 Use this with caution since it is not debugged." |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
204 :type 'boolean |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
205 :group 'edebug) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
206 |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
207 |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
208 (defcustom edebug-print-length 50 |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
209 "*Default value of `print-length' to use while printing results in Edebug." |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
210 :type 'integer |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
211 :group 'edebug) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
212 (defcustom edebug-print-level 50 |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
213 "*Default value of `print-level' to use while printing results in Edebug." |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
214 :type 'integer |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
215 :group 'edebug) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
216 (defcustom edebug-print-circle t |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
217 "*Default value of `print-circle' to use while printing results in Edebug." |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
218 :type 'boolean |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
219 :group 'edebug) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
220 |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
221 (defcustom edebug-unwrap-results nil |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
222 "*Non-nil if Edebug should unwrap results of expressions. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
223 This is useful when debugging macros where the results of expressions |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
224 are instrumented expressions. But don't do this when results might be |
17414
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
225 circular or an infinite loop will result." |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
226 :type 'boolean |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
227 :group 'edebug) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
228 |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
229 (defcustom edebug-on-error t |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
230 "*Value bound to `debug-on-error' while Edebug is active. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
231 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
232 If `debug-on-error' is non-nil, that value is still used. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
233 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
234 If the value is a list of signal names, Edebug will stop when any of |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
235 these errors are signaled from Lisp code whether or not the signal is |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
236 handled by a `condition-case'. This option is useful for debugging |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
237 signals that *are* handled since they would otherwise be missed. |
17414
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
238 After execution is resumed, the error is signaled again." |
23587
26749ef98f6c
(edebug-initial-mode): Fix customize type.
Andreas Schwab <schwab@suse.de>
parents:
21990
diff
changeset
|
239 :type '(choice (const :tag "off") |
26749ef98f6c
(edebug-initial-mode): Fix customize type.
Andreas Schwab <schwab@suse.de>
parents:
21990
diff
changeset
|
240 (repeat :menu-tag "When" |
26749ef98f6c
(edebug-initial-mode): Fix customize type.
Andreas Schwab <schwab@suse.de>
parents:
21990
diff
changeset
|
241 :value (nil) |
26749ef98f6c
(edebug-initial-mode): Fix customize type.
Andreas Schwab <schwab@suse.de>
parents:
21990
diff
changeset
|
242 (symbol :format "%v")) |
26749ef98f6c
(edebug-initial-mode): Fix customize type.
Andreas Schwab <schwab@suse.de>
parents:
21990
diff
changeset
|
243 (const :tag "always" t)) |
17414
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
244 :group 'edebug) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
245 |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
246 (defcustom edebug-on-quit t |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
247 "*Value bound to `debug-on-quit' while Edebug is active." |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
248 :type 'boolean |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
249 :group 'edebug) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
250 |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
251 (defcustom edebug-global-break-condition nil |
6761
f1d73d12436e
checked in with -k by liberte at 1994/04/09 20:57:56
Daniel LaLiberte <liberte@gnu.org>
parents:
6732
diff
changeset
|
252 "*If non-nil, an expression to test for at every stop point. |
17414
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
253 If the result is non-nil, then break. Errors are ignored." |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
254 :type 'sexp |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
255 :group 'edebug) |
6761
f1d73d12436e
checked in with -k by liberte at 1994/04/09 20:57:56
Daniel LaLiberte <liberte@gnu.org>
parents:
6732
diff
changeset
|
256 |
18376
9ae76ef113f6
(edebug-sit-for-seconds): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18017
diff
changeset
|
257 (defcustom edebug-sit-for-seconds 1 |
9ae76ef113f6
(edebug-sit-for-seconds): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18017
diff
changeset
|
258 "*Number of seconds to pause when execution mode is `trace'." |
9ae76ef113f6
(edebug-sit-for-seconds): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18017
diff
changeset
|
259 :type 'number |
9ae76ef113f6
(edebug-sit-for-seconds): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18017
diff
changeset
|
260 :group 'edebug) |
9ae76ef113f6
(edebug-sit-for-seconds): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18017
diff
changeset
|
261 |
14846 | 262 ;;; Form spec utilities. |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
263 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
264 ;;;###autoload |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
265 (defmacro def-edebug-spec (symbol spec) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
266 "Set the edebug-form-spec property of SYMBOL according to SPEC. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
267 Both SYMBOL and SPEC are unevaluated. The SPEC can be 0, t, a symbol |
14846 | 268 \(naming a function), or a list." |
26519 | 269 `(put (quote ,symbol) 'edebug-form-spec (quote ,spec))) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
270 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
271 (defmacro def-edebug-form-spec (symbol spec-form) |
14846 | 272 "For compatibility with old version. Use `def-edebug-spec' instead." |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
273 (message "Obsolete: use def-edebug-spec instead.") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
274 (def-edebug-spec symbol (eval spec-form))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
275 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
276 (defun get-edebug-spec (symbol) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
277 ;; Get the spec of symbol resolving all indirection. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
278 (let ((edebug-form-spec (get symbol 'edebug-form-spec)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
279 indirect) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
280 (while (and (symbolp edebug-form-spec) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
281 (setq indirect (get edebug-form-spec 'edebug-form-spec))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
282 ;; (edebug-trace "indirection: %s" edebug-form-spec) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
283 (setq edebug-form-spec indirect)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
284 edebug-form-spec |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
285 )) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
286 |
14846 | 287 ;;; Utilities |
288 | |
289 ;; Define edebug-gensym - from old cl.el | |
290 (defvar edebug-gensym-index 0 | |
291 "Integer used by `edebug-gensym' to produce new names.") | |
292 | |
293 (defun edebug-gensym (&optional prefix) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
294 "Generate a fresh uninterned symbol. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
295 There is an optional argument, PREFIX. PREFIX is the |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
296 string that begins the new name. Most people take just the default, |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
297 except when debugging needs suggest otherwise." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
298 (if (null prefix) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
299 (setq prefix "G")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
300 (let ((newsymbol nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
301 (newname "")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
302 (while (not newsymbol) |
14846 | 303 (setq newname (concat prefix (int-to-string edebug-gensym-index))) |
304 (setq edebug-gensym-index (+ edebug-gensym-index 1)) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
305 (if (not (intern-soft newname)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
306 (setq newsymbol (make-symbol newname)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
307 newsymbol)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
308 |
6761
f1d73d12436e
checked in with -k by liberte at 1994/04/09 20:57:56
Daniel LaLiberte <liberte@gnu.org>
parents:
6732
diff
changeset
|
309 ;; Only used by CL-like code. |
14846 | 310 (defun edebug-keywordp (object) |
311 "Return t if OBJECT is a keyword. | |
312 A keyword is a symbol that starts with `:'." | |
313 (and (symbolp object) | |
314 (= ?: (aref (symbol-name object) 0)))) | |
315 | |
316 (defun edebug-lambda-list-keywordp (object) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
317 "Return t if OBJECT is a lambda list keyword. |
14846 | 318 A lambda list keyword is a symbol that starts with `&'." |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
319 (and (symbolp object) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
320 (= ?& (aref (symbol-name object) 0)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
321 |
661 | 322 |
323 (defun edebug-last-sexp () | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
324 ;; Return the last sexp before point in current buffer. |
14846 | 325 ;; Assumes Emacs Lisp syntax is active. |
661 | 326 (car |
327 (read-from-string | |
328 (buffer-substring | |
329 (save-excursion | |
330 (forward-sexp -1) | |
331 (point)) | |
332 (point))))) | |
333 | |
334 (defun edebug-window-list () | |
14846 | 335 "Return a list of windows, in order of `next-window'." |
336 ;; This doesn't work for epoch. | |
661 | 337 (let* ((first-window (selected-window)) |
338 (window-list (list first-window)) | |
339 (next (next-window first-window))) | |
340 (while (not (eq next first-window)) | |
341 (setq window-list (cons next window-list)) | |
342 (setq next (next-window next))) | |
343 (nreverse window-list))) | |
344 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
345 (defun edebug-window-live-p (window) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
346 "Return non-nil if WINDOW is visible." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
347 (let* ((first-window (selected-window)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
348 (next (next-window first-window t))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
349 (while (not (or (eq next window) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
350 (eq next first-window))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
351 (setq next (next-window next t))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
352 (eq next window))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
353 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
354 ;; Not used. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
355 '(defun edebug-two-window-p () |
661 | 356 "Return t if there are two windows." |
357 (and (not (one-window-p)) | |
358 (eq (selected-window) | |
359 (next-window (next-window (selected-window)))))) | |
360 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
361 (defsubst edebug-lookup-function (object) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
362 (while (and (symbolp object) (fboundp object)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
363 (setq object (symbol-function object))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
364 object) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
365 |
661 | 366 (defun edebug-macrop (object) |
367 "Return the macro named by OBJECT, or nil if it is not a macro." | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
368 (setq object (edebug-lookup-function object)) |
661 | 369 (if (and (listp object) |
370 (eq 'macro (car object)) | |
371 (edebug-functionp (cdr object))) | |
372 object)) | |
373 | |
374 (defun edebug-functionp (object) | |
375 "Returns the function named by OBJECT, or nil if it is not a function." | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
376 (setq object (edebug-lookup-function object)) |
661 | 377 (if (or (subrp object) |
14846 | 378 (byte-code-function-p object) |
661 | 379 (and (listp object) |
380 (eq (car object) 'lambda) | |
381 (listp (car (cdr object))))) | |
382 object)) | |
383 | |
384 (defun edebug-sort-alist (alist function) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
385 ;; Return the ALIST sorted with comparison function FUNCTION. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
386 ;; This uses 'sort so the sorting is destructive. |
661 | 387 (sort alist (function |
388 (lambda (e1 e2) | |
389 (funcall function (car e1) (car e2)))))) | |
390 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
391 ;;(def-edebug-spec edebug-save-restriction t) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
392 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
393 ;; Not used. If it is used, def-edebug-spec must be defined before use. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
394 '(defmacro edebug-save-restriction (&rest body) |
661 | 395 "Evaluate BODY while saving the current buffers restriction. |
396 BODY may change buffer outside of current restriction, unlike | |
397 save-restriction. BODY may change the current buffer, | |
398 and the restriction will be restored to the original buffer, | |
399 and the current buffer remains current. | |
400 Return the result of the last expression in BODY." | |
26519 | 401 `(let ((edebug:s-r-beg (point-min-marker)) |
402 (edebug:s-r-end (point-max-marker))) | |
403 (unwind-protect | |
404 (progn ,@body) | |
405 (save-excursion | |
406 (set-buffer (marker-buffer edebug:s-r-beg)) | |
407 (narrow-to-region edebug:s-r-beg edebug:s-r-end))))) | |
661 | 408 |
14846 | 409 ;;; Display |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
410 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
411 (defconst edebug-trace-buffer "*edebug-trace*" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
412 "Name of the buffer to put trace info in.") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
413 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
414 (defun edebug-pop-to-buffer (buffer &optional window) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
415 ;; Like pop-to-buffer, but select window where BUFFER was last shown. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
416 ;; Select WINDOW if it provided and it still exists. Otherwise, |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
417 ;; if buffer is currently shown in several windows, choose one. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
418 ;; Otherwise, find a new window, possibly splitting one. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
419 (setq window (if (and (windowp window) (edebug-window-live-p window) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
420 (eq (window-buffer window) buffer)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
421 window |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
422 (if (eq (window-buffer (selected-window)) buffer) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
423 (selected-window) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
424 (edebug-get-buffer-window buffer)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
425 (if window |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
426 (select-window window) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
427 (if (one-window-p) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
428 (split-window)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
429 ;; (message "next window: %s" (next-window)) (sit-for 1) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
430 (if (eq (get-buffer-window edebug-trace-buffer) (next-window)) |
14846 | 431 ;; Don't select trace window |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
432 nil |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
433 (select-window (next-window)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
434 (set-window-buffer (selected-window) buffer) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
435 (set-window-hscroll (selected-window) 0);; should this be?? |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
436 ;; Selecting the window does not set the buffer until command loop. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
437 ;;(set-buffer buffer) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
438 ) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
439 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
440 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
441 (defun edebug-get-displayed-buffer-points () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
442 ;; Return a list of buffer point pairs, for all displayed buffers. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
443 (save-excursion |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
444 (let* ((first-window (selected-window)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
445 (next (next-window first-window)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
446 (buffer-point-list nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
447 buffer) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
448 (while (not (eq next first-window)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
449 (set-buffer (setq buffer (window-buffer next))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
450 (setq buffer-point-list |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
451 (cons (cons buffer (point)) buffer-point-list)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
452 (setq next (next-window next))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
453 buffer-point-list))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
454 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
455 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
456 (defun edebug-set-buffer-points (buffer-points) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
457 ;; Restore the buffer-points created by edebug-get-displayed-buffer-points. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
458 (let ((current-buffer (current-buffer))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
459 (mapcar (function (lambda (buf-point) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
460 (if (buffer-name (car buf-point)) ; still exists |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
461 (progn |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
462 (set-buffer (car buf-point)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
463 (goto-char (cdr buf-point)))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
464 buffer-points) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
465 (set-buffer current-buffer))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
466 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
467 (defun edebug-current-windows (which-windows) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
468 ;; Get either a full window configuration or some window information. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
469 (if (listp which-windows) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
470 (mapcar (function (lambda (window) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
471 (if (edebug-window-live-p window) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
472 (list window |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
473 (window-buffer window) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
474 (window-point window) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
475 (window-start window) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
476 (window-hscroll window))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
477 which-windows) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
478 (current-window-configuration))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
479 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
480 (defun edebug-set-windows (window-info) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
481 ;; Set either a full window configuration or some window information. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
482 (if (listp window-info) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
483 (mapcar (function |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
484 (lambda (one-window-info) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
485 (if one-window-info |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
486 (apply (function |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
487 (lambda (window buffer point start hscroll) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
488 (if (edebug-window-live-p window) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
489 (progn |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
490 (set-window-buffer window buffer) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
491 (set-window-point window point) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
492 (set-window-start window start) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
493 (set-window-hscroll window hscroll))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
494 one-window-info)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
495 window-info) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
496 (set-window-configuration window-info))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
497 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
498 (defalias 'edebug-get-buffer-window 'get-buffer-window) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
499 (defalias 'edebug-sit-for 'sit-for) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
500 (defalias 'edebug-input-pending-p 'input-pending-p) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
501 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
502 |
14846 | 503 ;;; Redefine read and eval functions |
504 ;; read is redefined to maybe instrument forms. | |
505 ;; eval-defun is redefined to check edebug-all-forms and edebug-all-defs. | |
506 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
507 ;; Save the original read function |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
508 (or (fboundp 'edebug-original-read) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
509 (defalias 'edebug-original-read (symbol-function 'read))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
510 |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
511 (defun edebug-read (&optional stream) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
512 "Read one Lisp expression as text from STREAM, return as Lisp object. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
513 If STREAM is nil, use the value of `standard-input' (which see). |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
514 STREAM or the value of `standard-input' may be: |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
515 a buffer (read from point and advance it) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
516 a marker (read from where it points and advance it) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
517 a function (call it with no arguments for each character, |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
518 call it with a char as argument to push a char back) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
519 a string (takes text from string, starting at the beginning) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
520 t (read text line using minibuffer and use it). |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
521 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
522 This version, from Edebug, maybe instruments the expression. But the |
14846 | 523 STREAM must be the current buffer to do so. Whether it instruments is |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
524 also dependent on the values of `edebug-all-defs' and |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
525 `edebug-all-forms'." |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
526 (or stream (setq stream standard-input)) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
527 (if (eq stream (current-buffer)) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
528 (edebug-read-and-maybe-wrap-form) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
529 (edebug-original-read stream))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
530 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
531 (or (fboundp 'edebug-original-eval-defun) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
532 (defalias 'edebug-original-eval-defun (symbol-function 'eval-defun))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
533 |
14846 | 534 ;; We should somehow arrange to be able to do this |
535 ;; without actually replacing the eval-defun command. | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
536 (defun edebug-eval-defun (edebug-it) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
537 "Evaluate the top-level form containing point, or after point. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
538 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
539 This version, from Edebug, has the following differences: With a |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
540 prefix argument instrument the code for Edebug. If `edebug-all-defs' is |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
541 non-nil, then the code is instrumented *unless* there is a prefix |
14846 | 542 argument. If instrumenting, it prints: `Edebug: FUNCTIONNAME'. |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
543 Otherwise, it prints in the minibuffer." |
661 | 544 (interactive "P") |
14846 | 545 (let* ((edebugging (not (eq (not edebug-it) (not edebug-all-defs)))) |
546 (edebug-result) | |
547 (form | |
548 (let ((edebug-all-forms edebugging) | |
549 (edebug-all-defs (eq edebug-all-defs (not edebug-it)))) | |
550 (edebug-read-top-level-form)))) | |
24024
2981304f5015
(edebug-eval-defun): Deal with defcustom
Dave Love <fx@gnu.org>
parents:
23587
diff
changeset
|
551 (cond ((and (eq (car form) 'defvar) |
2981304f5015
(edebug-eval-defun): Deal with defcustom
Dave Love <fx@gnu.org>
parents:
23587
diff
changeset
|
552 (cdr-safe (cdr-safe form))) |
2981304f5015
(edebug-eval-defun): Deal with defcustom
Dave Love <fx@gnu.org>
parents:
23587
diff
changeset
|
553 ;; Force variable to be bound. |
2981304f5015
(edebug-eval-defun): Deal with defcustom
Dave Love <fx@gnu.org>
parents:
23587
diff
changeset
|
554 (setq form (cons 'defconst (cdr form)))) |
2981304f5015
(edebug-eval-defun): Deal with defcustom
Dave Love <fx@gnu.org>
parents:
23587
diff
changeset
|
555 ((and (eq (car form) 'defcustom) |
2981304f5015
(edebug-eval-defun): Deal with defcustom
Dave Love <fx@gnu.org>
parents:
23587
diff
changeset
|
556 (default-boundp (nth 1 form))) |
2981304f5015
(edebug-eval-defun): Deal with defcustom
Dave Love <fx@gnu.org>
parents:
23587
diff
changeset
|
557 ;; Force variable to be bound. |
2981304f5015
(edebug-eval-defun): Deal with defcustom
Dave Love <fx@gnu.org>
parents:
23587
diff
changeset
|
558 (set-default (nth 1 form) (eval (nth 2 form))))) |
14846 | 559 (setq edebug-result (eval form)) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
560 (if (not edebugging) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
561 (princ edebug-result) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
562 edebug-result))) |
661 | 563 |
564 | |
727 | 565 ;;;###autoload |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
566 (defalias 'edebug-defun 'edebug-eval-top-level-form) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
567 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
568 ;;;###autoload |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
569 (defun edebug-eval-top-level-form () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
570 "Evaluate a top level form, such as a defun or defmacro. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
571 This is like `eval-defun', but the code is always instrumented for Edebug. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
572 Print its name in the minibuffer and leave point where it is, |
14846 | 573 or if an error occurs, leave point after it with mark at the original point." |
661 | 574 (interactive) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
575 (eval |
14846 | 576 ;; Bind edebug-all-forms only while reading, not while evalling |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
577 ;; but this causes problems while edebugging edebug. |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
578 (let ((edebug-all-forms t) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
579 (edebug-all-defs t)) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
580 (edebug-read-top-level-form)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
581 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
582 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
583 (defun edebug-read-top-level-form () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
584 (let ((starting-point (point))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
585 (end-of-defun) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
586 (beginning-of-defun) |
661 | 587 (prog1 |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
588 (edebug-read-and-maybe-wrap-form) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
589 ;; Recover point, but only if no error occurred. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
590 (goto-char starting-point)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
591 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
592 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
593 ;; Compatibility with old versions. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
594 (defalias 'edebug-all-defuns 'edebug-all-defs) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
595 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
596 (defun edebug-all-defs () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
597 "Toggle edebugging of all definitions." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
598 (interactive) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
599 (setq edebug-all-defs (not edebug-all-defs)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
600 (message "Edebugging all definitions is %s." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
601 (if edebug-all-defs "on" "off"))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
602 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
603 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
604 (defun edebug-all-forms () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
605 "Toggle edebugging of all forms." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
606 (interactive) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
607 (setq edebug-all-forms (not edebug-all-forms)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
608 (message "Edebugging all forms is %s." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
609 (if edebug-all-forms "on" "off"))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
610 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
611 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
612 (defun edebug-install-read-eval-functions () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
613 (interactive) |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
614 ;; Don't install if already installed. |
26049
e7c4cf80a64a
(edebug-install-read-eval-functions)
Dave Love <fx@gnu.org>
parents:
25812
diff
changeset
|
615 (unless load-read-function |
e7c4cf80a64a
(edebug-install-read-eval-functions)
Dave Love <fx@gnu.org>
parents:
25812
diff
changeset
|
616 (setq load-read-function 'edebug-read) |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
617 (defalias 'eval-defun 'edebug-eval-defun))) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
618 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
619 (defun edebug-uninstall-read-eval-functions () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
620 (interactive) |
26049
e7c4cf80a64a
(edebug-install-read-eval-functions)
Dave Love <fx@gnu.org>
parents:
25812
diff
changeset
|
621 (setq load-read-function nil) |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
622 (defalias 'eval-defun (symbol-function 'edebug-original-eval-defun))) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
623 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
624 |
14846 | 625 ;;; Edebug internal data |
626 | |
627 ;; The internal data that is needed for edebugging is kept in the | |
628 ;; buffer-local variable `edebug-form-data'. | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
629 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
630 (make-variable-buffer-local 'edebug-form-data) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
631 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
632 (defconst edebug-form-data nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
633 ;; A list of entries associating symbols with buffer regions. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
634 ;; This is an automatic buffer local variable. Each entry looks like: |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
635 ;; @code{(@var{symbol} @var{begin-marker} @var{end-marker}). The markers |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
636 ;; are at the beginning and end of an entry level form and @var{symbol} is |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
637 ;; a symbol that holds all edebug related information for the form on its |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
638 ;; property list. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
639 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
640 ;; In the future, the symbol will be irrelevant and edebug data will |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
641 ;; be stored in the definitions themselves rather than in the property |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
642 ;; list of a symbol. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
643 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
644 (defun edebug-make-form-data-entry (symbol begin end) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
645 (list symbol begin end)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
646 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
647 (defsubst edebug-form-data-name (entry) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
648 (car entry)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
649 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
650 (defsubst edebug-form-data-begin (entry) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
651 (nth 1 entry)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
652 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
653 (defsubst edebug-form-data-end (entry) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
654 (nth 2 entry)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
655 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
656 (defsubst edebug-set-form-data-entry (entry name begin end) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
657 (setcar entry name);; in case name is changed |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
658 (set-marker (nth 1 entry) begin) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
659 (set-marker (nth 2 entry) end)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
660 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
661 (defun edebug-get-form-data-entry (pnt &optional end-point) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
662 ;; Find the edebug form data entry which is closest to PNT. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
663 ;; If END-POINT is supplied, match must be exact. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
664 ;; Return `nil' if none found. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
665 (let ((rest edebug-form-data) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
666 closest-entry |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
667 (closest-dist 999999)) ;; need maxint here |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
668 (while (and rest (< 0 closest-dist)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
669 (let* ((entry (car rest)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
670 (begin (edebug-form-data-begin entry)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
671 (dist (- pnt begin))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
672 (setq rest (cdr rest)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
673 (if (and (<= 0 dist) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
674 (< dist closest-dist) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
675 (or (not end-point) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
676 (= end-point (edebug-form-data-end entry))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
677 (<= pnt (edebug-form-data-end entry))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
678 (setq closest-dist dist |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
679 closest-entry entry)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
680 closest-entry)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
681 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
682 ;; Also need to find all contained entries, |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
683 ;; and find an entry given a symbol, which should be just assq. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
684 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
685 (defun edebug-form-data-symbol () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
686 ;; Return the edebug data symbol of the form where point is in. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
687 ;; If point is not inside a edebuggable form, cause error. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
688 (or (edebug-form-data-name (edebug-get-form-data-entry (point))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
689 (error "Not inside instrumented form"))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
690 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
691 (defun edebug-make-top-form-data-entry (new-entry) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
692 ;; Make NEW-ENTRY the first element in the `edebug-form-data' list. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
693 (edebug-clear-form-data-entry new-entry) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
694 (setq edebug-form-data (cons new-entry edebug-form-data))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
695 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
696 (defun edebug-clear-form-data-entry (entry) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
697 ;; If non-nil, clear ENTRY out of the form data. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
698 ;; Maybe clear the markers and delete the symbol's edebug property? |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
699 (if entry |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
700 (progn |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
701 ;; Instead of this, we could just find all contained forms. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
702 ;; (put (car entry) 'edebug nil) ; |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
703 ;; (mapcar 'edebug-clear-form-data-entry ; dangerous |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
704 ;; (get (car entry) 'edebug-dependents)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
705 ;; (set-marker (nth 1 entry) nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
706 ;; (set-marker (nth 2 entry) nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
707 (setq edebug-form-data (delq entry edebug-form-data))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
708 |
14846 | 709 ;;; Parser utilities |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
710 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
711 (defun edebug-syntax-error (&rest args) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
712 ;; Signal an invalid-read-syntax with ARGS. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
713 (signal 'invalid-read-syntax args)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
714 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
715 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
716 (defconst edebug-read-syntax-table |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
717 ;; Lookup table for significant characters indicating the class of the |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
718 ;; token that follows. This is not a \"real\" syntax table. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
719 (let ((table (make-vector 256 'symbol)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
720 (i 0)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
721 (while (< i ?!) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
722 (aset table i 'space) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
723 (setq i (1+ i))) |
661 | 724 (aset table ?\( 'lparen) |
725 (aset table ?\) 'rparen) | |
726 (aset table ?\' 'quote) | |
14846 | 727 (aset table ?\` 'backquote) |
728 (aset table ?\, 'comma) | |
661 | 729 (aset table ?\" 'string) |
730 (aset table ?\? 'char) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
731 (aset table ?\[ 'lbracket) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
732 (aset table ?\] 'rbracket) |
661 | 733 (aset table ?\. 'dot) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
734 (aset table ?\# 'hash) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
735 ;; We treat numbers as symbols, because of confusion with -, -1, and 1-. |
14846 | 736 ;; We don't care about any other chars since they won't be seen. |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
737 table)) |
661 | 738 |
739 (defun edebug-next-token-class () | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
740 ;; Move to the next token and return its class. We only care about |
14846 | 741 ;; lparen, rparen, dot, quote, backquote, comma, string, char, vector, |
742 ;; or symbol. | |
661 | 743 (edebug-skip-whitespace) |
25056 | 744 (if (and (eq (following-char) ?.) |
745 (save-excursion | |
746 (forward-char 1) | |
747 (and (>= (following-char) ?0) | |
748 (<= (following-char) ?9)))) | |
749 'symbol | |
750 (aref edebug-read-syntax-table (following-char)))) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
751 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
752 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
753 (defun edebug-skip-whitespace () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
754 ;; Leave point before the next token, skipping white space and comments. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
755 (skip-chars-forward " \t\r\n\f") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
756 (while (= (following-char) ?\;) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
757 ;; \r is counted as a comment terminator to support selective display. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
758 (skip-chars-forward "^\n\r") ; skip the comment |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
759 (skip-chars-forward " \t\r\n\f"))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
760 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
761 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
762 ;; Mostly obsolete reader; still used in one case. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
763 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
764 (defun edebug-read-sexp () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
765 ;; Read one sexp from the current buffer starting at point. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
766 ;; Leave point immediately after it. A sexp can be a list or atom. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
767 ;; An atom is a symbol (or number), character, string, or vector. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
768 ;; This works for reading anything legitimate, but it |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
769 ;; is gummed up by parser inconsistencies (bugs?) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
770 (let ((class (edebug-next-token-class))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
771 (cond |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
772 ;; read goes one too far if a (possibly quoted) string or symbol |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
773 ;; is immediately followed by non-whitespace. |
16744
b91256aecd79
(edebug-read-symbol, edebug-read-string): Don't back up after reading.
Richard M. Stallman <rms@gnu.org>
parents:
16550
diff
changeset
|
774 ((eq class 'symbol) (edebug-original-read (current-buffer))) |
b91256aecd79
(edebug-read-symbol, edebug-read-string): Don't back up after reading.
Richard M. Stallman <rms@gnu.org>
parents:
16550
diff
changeset
|
775 ((eq class 'string) (edebug-original-read (current-buffer))) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
776 ((eq class 'quote) (forward-char 1) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
777 (list 'quote (edebug-read-sexp))) |
14846 | 778 ((eq class 'backquote) |
779 (list '\` (edebug-read-sexp))) | |
780 ((eq class 'comma) | |
781 (list '\, (edebug-read-sexp))) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
782 (t ; anything else, just read it. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
783 (edebug-original-read (current-buffer)))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
784 |
14846 | 785 ;;; Offsets for reader |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
786 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
787 ;; Define a structure to represent offset positions of expressions. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
788 ;; Each offset structure looks like: (before . after) for constituents, |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
789 ;; or for structures that have elements: (before <subexpressions> . after) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
790 ;; where the <subexpressions> are the offset structures for subexpressions |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
791 ;; including the head of a list. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
792 (defconst edebug-offsets nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
793 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
794 ;; Stack of offset structures in reverse order of the nesting. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
795 ;; This is used to get back to previous levels. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
796 (defconst edebug-offsets-stack nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
797 (defconst edebug-current-offset nil) ; Top of the stack, for convenience. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
798 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
799 ;; We must store whether we just read a list with a dotted form that |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
800 ;; is itself a list. This structure will be condensed, so the offsets |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
801 ;; must also be condensed. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
802 (defconst edebug-read-dotted-list nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
803 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
804 (defsubst edebug-initialize-offsets () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
805 ;; Reinitialize offset recording. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
806 (setq edebug-current-offset nil)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
807 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
808 (defun edebug-store-before-offset (point) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
809 ;; Add a new offset pair with POINT as the before offset. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
810 (let ((new-offset (list point))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
811 (if edebug-current-offset |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
812 (setcdr edebug-current-offset |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
813 (cons new-offset (cdr edebug-current-offset))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
814 ;; Otherwise, we are at the top level, so initialize. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
815 (setq edebug-offsets new-offset |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
816 edebug-offsets-stack nil |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
817 edebug-read-dotted-list nil)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
818 ;; Cons the new offset to the front of the stack. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
819 (setq edebug-offsets-stack (cons new-offset edebug-offsets-stack) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
820 edebug-current-offset new-offset) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
821 )) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
822 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
823 (defun edebug-store-after-offset (point) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
824 ;; Finalize the current offset struct by reversing it and |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
825 ;; store POINT as the after offset. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
826 (if (not edebug-read-dotted-list) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
827 ;; Just reverse the offsets of all subexpressions. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
828 (setcdr edebug-current-offset (nreverse (cdr edebug-current-offset))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
829 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
830 ;; We just read a list after a dot, which will be abbreviated out. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
831 (setq edebug-read-dotted-list nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
832 ;; Drop the corresponding offset pair. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
833 ;; That is, nconc the reverse of the rest of the offsets |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
834 ;; with the cdr of last offset. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
835 (setcdr edebug-current-offset |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
836 (nconc (nreverse (cdr (cdr edebug-current-offset))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
837 (cdr (car (cdr edebug-current-offset)))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
838 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
839 ;; Now append the point using nconc. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
840 (setq edebug-current-offset (nconc edebug-current-offset point)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
841 ;; Pop the stack. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
842 (setq edebug-offsets-stack (cdr edebug-offsets-stack) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
843 edebug-current-offset (car edebug-offsets-stack))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
844 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
845 (defun edebug-ignore-offset () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
846 ;; Ignore the last created offset pair. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
847 (setcdr edebug-current-offset (cdr (cdr edebug-current-offset)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
848 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
849 (def-edebug-spec edebug-storing-offsets (form body)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
850 (put 'edebug-storing-offsets 'lisp-indent-hook 1) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
851 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
852 (defmacro edebug-storing-offsets (point &rest body) |
26519 | 853 `(unwind-protect |
854 (progn | |
855 (edebug-store-before-offset ,point) | |
856 ,@body) | |
857 (edebug-store-after-offset (point)))) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
858 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
859 |
14846 | 860 ;;; Reader for Emacs Lisp. |
861 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
862 ;; Uses edebug-next-token-class (and edebug-skip-whitespace) above. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
863 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
864 (defconst edebug-read-alist |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
865 '((symbol . edebug-read-symbol) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
866 (lparen . edebug-read-list) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
867 (string . edebug-read-string) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
868 (quote . edebug-read-quote) |
14846 | 869 (backquote . edebug-read-backquote) |
870 (comma . edebug-read-comma) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
871 (lbracket . edebug-read-vector) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
872 (hash . edebug-read-function) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
873 )) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
874 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
875 (defun edebug-read-storing-offsets (stream) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
876 (let ((class (edebug-next-token-class)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
877 func |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
878 edebug-read-dotted-list) ; see edebug-store-after-offset |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
879 (edebug-storing-offsets (point) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
880 (if (setq func (assq class edebug-read-alist)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
881 (funcall (cdr func) stream) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
882 ;; anything else, just read it. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
883 (edebug-original-read stream)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
884 ))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
885 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
886 (defun edebug-read-symbol (stream) |
16744
b91256aecd79
(edebug-read-symbol, edebug-read-string): Don't back up after reading.
Richard M. Stallman <rms@gnu.org>
parents:
16550
diff
changeset
|
887 (edebug-original-read stream)) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
888 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
889 (defun edebug-read-string (stream) |
16744
b91256aecd79
(edebug-read-symbol, edebug-read-string): Don't back up after reading.
Richard M. Stallman <rms@gnu.org>
parents:
16550
diff
changeset
|
890 (edebug-original-read stream)) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
891 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
892 (defun edebug-read-quote (stream) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
893 ;; Turn 'thing into (quote thing) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
894 (forward-char 1) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
895 (list |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
896 (edebug-storing-offsets (point) 'quote) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
897 (edebug-read-storing-offsets stream))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
898 |
14846 | 899 (defun edebug-read-backquote (stream) |
900 ;; Turn `thing into (\` thing) | |
901 (let ((opoint (point))) | |
902 (forward-char 1) | |
903 ;; Generate the same structure of offsets we would have | |
904 ;; if the resulting list appeared verbatim in the input text. | |
905 (edebug-storing-offsets opoint | |
906 (list | |
907 (edebug-storing-offsets opoint '\`) | |
908 (edebug-read-storing-offsets stream))))) | |
909 | |
910 (defvar edebug-read-backquote-new nil | |
911 "Non-nil if reading the inside of a new-style backquote with no parens around it. | |
912 Value of nil means reading the inside of an old-style backquote construct | |
913 which is surrounded by an extra set of parentheses. | |
914 This controls how we read comma constructs.") | |
915 | |
916 (defun edebug-read-comma (stream) | |
917 ;; Turn ,thing into (\, thing). Handle ,@ and ,. also. | |
918 (let ((opoint (point))) | |
919 (forward-char 1) | |
920 (let ((symbol '\,)) | |
921 (cond ((eq (following-char) ?\.) | |
922 (setq symbol '\,\.) | |
923 (forward-char 1)) | |
924 ((eq (following-char) ?\@) | |
925 (setq symbol '\,@) | |
926 (forward-char 1))) | |
927 ;; Generate the same structure of offsets we would have | |
928 ;; if the resulting list appeared verbatim in the input text. | |
929 (if edebug-read-backquote-new | |
930 (list | |
931 (edebug-storing-offsets opoint symbol) | |
932 (edebug-read-storing-offsets stream)) | |
933 (edebug-storing-offsets opoint symbol))))) | |
934 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
935 (defun edebug-read-function (stream) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
936 ;; Turn #'thing into (function thing) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
937 (forward-char 1) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
938 (if (/= ?\' (following-char)) (edebug-syntax-error "Bad char")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
939 (forward-char 1) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
940 (list |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
941 (edebug-storing-offsets (point) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
942 (if (featurep 'cl) 'function* 'function)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
943 (edebug-read-storing-offsets stream))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
944 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
945 (defun edebug-read-list (stream) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
946 (forward-char 1) ; skip \( |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
947 (prog1 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
948 (let ((elements)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
949 (while (not (memq (edebug-next-token-class) '(rparen dot))) |
14846 | 950 (if (eq (edebug-next-token-class) 'backquote) |
951 (let ((edebug-read-backquote-new (not (null elements))) | |
952 (opoint (point))) | |
953 (if edebug-read-backquote-new | |
954 (setq elements (cons (edebug-read-backquote stream) elements)) | |
955 (forward-char 1) ; Skip backquote. | |
956 ;; Call edebug-storing-offsets here so that we | |
957 ;; produce the same offsets we would have had | |
958 ;; if the backquote were an ordinary symbol. | |
959 (setq elements (cons (edebug-storing-offsets opoint '\`) | |
960 elements)))) | |
961 (setq elements (cons (edebug-read-storing-offsets stream) elements)))) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
962 (setq elements (nreverse elements)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
963 (if (eq 'dot (edebug-next-token-class)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
964 (let (dotted-form) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
965 (forward-char 1) ; skip \. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
966 (setq dotted-form (edebug-read-storing-offsets stream)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
967 elements (nconc elements dotted-form) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
968 (if (not (eq (edebug-next-token-class) 'rparen)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
969 (edebug-syntax-error "Expected `)'")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
970 (setq edebug-read-dotted-list (listp dotted-form)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
971 )) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
972 elements) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
973 (forward-char 1) ; skip \) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
974 )) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
975 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
976 (defun edebug-read-vector (stream) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
977 (forward-char 1) ; skip \[ |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
978 (prog1 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
979 (let ((elements)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
980 (while (not (eq 'rbracket (edebug-next-token-class))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
981 (setq elements (cons (edebug-read-storing-offsets stream) elements))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
982 (apply 'vector (nreverse elements))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
983 (forward-char 1) ; skip \] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
984 )) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
985 |
14846 | 986 ;;; Cursors for traversal of list and vector elements with offsets. |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
987 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
988 (defvar edebug-dotted-spec nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
989 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
990 (defun edebug-new-cursor (expressions offsets) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
991 ;; Return a new cursor for EXPRESSIONS with OFFSETS. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
992 (if (vectorp expressions) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
993 (setq expressions (append expressions nil))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
994 (cons expressions offsets)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
995 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
996 (defsubst edebug-set-cursor (cursor expressions offsets) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
997 ;; Set the CURSOR's EXPRESSIONS and OFFSETS to the given. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
998 ;; Return the cursor. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
999 (setcar cursor expressions) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1000 (setcdr cursor offsets) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1001 cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1002 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1003 '(defun edebug-copy-cursor (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1004 ;; Copy the cursor using the same object and offsets. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1005 (cons (car cursor) (cdr cursor))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1006 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1007 (defsubst edebug-cursor-expressions (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1008 (car cursor)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1009 (defsubst edebug-cursor-offsets (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1010 (cdr cursor)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1011 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1012 (defsubst edebug-empty-cursor (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1013 ;; Return non-nil if CURSOR is empty - meaning no more elements. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1014 (null (car cursor))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1015 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1016 (defsubst edebug-top-element (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1017 ;; Return the top element at the cursor. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1018 ;; Assumes not empty. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1019 (car (car cursor))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1020 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1021 (defun edebug-top-element-required (cursor &rest error) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1022 ;; Check if a dotted form is required. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1023 (if edebug-dotted-spec (edebug-no-match cursor "Dot expected.")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1024 ;; Check if there is at least one more argument. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1025 (if (edebug-empty-cursor cursor) (apply 'edebug-no-match cursor error)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1026 ;; Return that top element. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1027 (edebug-top-element cursor)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1028 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1029 (defsubst edebug-top-offset (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1030 ;; Return the top offset pair corresponding to the top element. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1031 (car (cdr cursor))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1032 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1033 (defun edebug-move-cursor (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1034 ;; Advance and return the cursor to the next element and offset. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1035 ;; throw no-match if empty before moving. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1036 ;; This is a violation of the cursor encapsulation, but |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1037 ;; there is plenty of that going on while matching. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1038 ;; The following test should always fail. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1039 (if (edebug-empty-cursor cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1040 (edebug-no-match cursor "Not enough arguments.")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1041 (setcar cursor (cdr (car cursor))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1042 (setcdr cursor (cdr (cdr cursor))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1043 cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1044 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1045 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1046 (defun edebug-before-offset (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1047 ;; Return the before offset of the cursor. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1048 ;; If there is nothing left in the offsets, |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1049 ;; return one less than the offset itself, |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1050 ;; which is the after offset for a list. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1051 (let ((offset (edebug-cursor-offsets cursor))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1052 (if (consp offset) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1053 (car (car offset)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1054 (1- offset)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1055 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1056 (defun edebug-after-offset (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1057 ;; Return the after offset of the cursor object. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1058 (let ((offset (edebug-top-offset cursor))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1059 (while (consp offset) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1060 (setq offset (cdr offset))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1061 offset)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1062 |
14846 | 1063 ;;; The Parser |
1064 | |
1065 ;; The top level function for parsing forms is | |
1066 ;; edebug-read-and-maybe-wrap-form; it calls all the rest. It checks the | |
1067 ;; syntax a bit and leaves point at any error it finds, but otherwise | |
1068 ;; should appear to work like eval-defun. | |
1069 | |
1070 ;; The basic plan is to surround each expression with a call to | |
1071 ;; the edebug debugger together with indexes into a table of positions of | |
1072 ;; all expressions. Thus an expression "exp" becomes: | |
1073 | |
1074 ;; (edebug-after (edebug-before 1) 2 exp) | |
1075 | |
1076 ;; When this is evaluated, first point is moved to the beginning of | |
1077 ;; exp at offset 1 of the current function. The expression is | |
1078 ;; evaluated, which may cause more edebug calls, and then point is | |
1079 ;; moved to offset 2 after the end of exp. | |
1080 | |
1081 ;; The highest level expressions of the function are wrapped in a call to | |
1082 ;; edebug-enter, which supplies the function name and the actual | |
1083 ;; arguments to the function. See functions edebug-enter, edebug-before, | |
1084 ;; and edebug-after for more details. | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1085 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1086 ;; Dynamically bound vars, left unbound, but globally declared. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1087 ;; This is to quiet the byte compiler. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1088 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1089 ;; Window data of the highest definition being wrapped. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1090 ;; This data is shared by all embedded definitions. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1091 (defvar edebug-top-window-data) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1092 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1093 (defvar edebug-&optional) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1094 (defvar edebug-&rest) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1095 (defvar edebug-gate nil) ;; whether no-match forces an error. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1096 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1097 (defconst edebug-def-name nil) ; name of definition, used by interactive-form |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1098 (defconst edebug-old-def-name nil) ; previous name of containing definition. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1099 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1100 (defconst edebug-error-point nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1101 (defconst edebug-best-error nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1102 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1103 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1104 (defun edebug-read-and-maybe-wrap-form () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1105 ;; Read a form and wrap it with edebug calls, if the conditions are right. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1106 ;; Here we just catch any no-match not caught below and signal an error. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1107 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1108 ;; Run the setup hook. |
17458
eeff371bfe78
(edebug-read-and-maybe-wrap-form): Protect
Richard M. Stallman <rms@gnu.org>
parents:
17414
diff
changeset
|
1109 ;; If it gets an error, make it nil. |
eeff371bfe78
(edebug-read-and-maybe-wrap-form): Protect
Richard M. Stallman <rms@gnu.org>
parents:
17414
diff
changeset
|
1110 (let ((temp-hook edebug-setup-hook)) |
eeff371bfe78
(edebug-read-and-maybe-wrap-form): Protect
Richard M. Stallman <rms@gnu.org>
parents:
17414
diff
changeset
|
1111 (setq edebug-setup-hook nil) |
eeff371bfe78
(edebug-read-and-maybe-wrap-form): Protect
Richard M. Stallman <rms@gnu.org>
parents:
17414
diff
changeset
|
1112 (run-hooks 'temp-hook)) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1113 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1114 (let (result |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1115 edebug-top-window-data |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1116 edebug-def-name;; make sure it is locally nil |
14846 | 1117 ;; I don't like these here!! |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1118 edebug-&optional |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1119 edebug-&rest |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1120 edebug-gate |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1121 edebug-best-error |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1122 edebug-error-point |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1123 no-match |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1124 ;; Do this once here instead of several times. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1125 (max-lisp-eval-depth (+ 800 max-lisp-eval-depth)) |
14846 | 1126 (max-specpdl-size (+ 2000 max-specpdl-size))) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1127 (setq no-match |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1128 (catch 'no-match |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1129 (setq result (edebug-read-and-maybe-wrap-form1)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1130 nil)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1131 (if no-match |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1132 (apply 'edebug-syntax-error no-match)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1133 result)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1134 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1135 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1136 (defun edebug-read-and-maybe-wrap-form1 () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1137 (let (spec |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1138 def-kind |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1139 defining-form-p |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1140 def-name |
14846 | 1141 ;; These offset things don't belong here, but to support recursive |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1142 ;; calls to edebug-read, they need to be here. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1143 edebug-offsets |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1144 edebug-offsets-stack |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1145 edebug-current-offset ; reset to nil |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1146 ) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1147 (save-excursion |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1148 (if (and (eq 'lparen (edebug-next-token-class)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1149 (eq 'symbol (progn (forward-char 1) (edebug-next-token-class)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1150 ;; Find out if this is a defining form from first symbol |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
1151 (setq def-kind (edebug-original-read (current-buffer)) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1152 spec (and (symbolp def-kind) (get-edebug-spec def-kind)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1153 defining-form-p (and (listp spec) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1154 (eq '&define (car spec))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1155 ;; This is incorrect in general!! But OK most of the time. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1156 def-name (if (and defining-form-p |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1157 (eq 'name (car (cdr spec))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1158 (eq 'symbol (edebug-next-token-class))) |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
1159 (edebug-original-read (current-buffer)))))) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
1160 ;;;(message "all defs: %s all forms: %s" edebug-all-defs edebug-all-forms) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1161 (cond |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1162 (defining-form-p |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1163 (if (or edebug-all-defs edebug-all-forms) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1164 ;; If it is a defining form and we are edebugging defs, |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1165 ;; then let edebug-list-form start it. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1166 (let ((cursor (edebug-new-cursor |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1167 (list (edebug-read-storing-offsets (current-buffer))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1168 (list edebug-offsets)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1169 (car |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1170 (edebug-make-form-wrapper |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1171 cursor |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1172 (edebug-before-offset cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1173 (1- (edebug-after-offset cursor)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1174 (list (cons (symbol-name def-kind) (cdr spec)))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1175 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1176 ;; Not edebugging this form, so reset the symbol's edebug |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1177 ;; property to be just a marker at the definition's source code. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1178 ;; This only works for defs with simple names. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1179 (put def-name 'edebug (point-marker)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1180 ;; Also nil out dependent defs. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1181 '(mapcar (function |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1182 (lambda (def) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1183 (put def-name 'edebug nil))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1184 (get def-name 'edebug-dependents)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1185 (edebug-read-sexp))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1186 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1187 ;; If all forms are being edebugged, explicitly wrap it. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1188 (edebug-all-forms |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1189 (let ((cursor (edebug-new-cursor |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1190 (list (edebug-read-storing-offsets (current-buffer))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1191 (list edebug-offsets)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1192 (edebug-make-form-wrapper |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1193 cursor |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1194 (edebug-before-offset cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1195 (edebug-after-offset cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1196 nil))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1197 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1198 ;; Not a defining form, and not edebugging. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1199 (t (edebug-read-sexp))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1200 )) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1201 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1202 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1203 (defvar edebug-def-args) ; args of defining form. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1204 (defvar edebug-def-interactive) ; is it an emacs interactive function? |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1205 (defvar edebug-inside-func) ;; whether code is inside function context. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1206 ;; Currently def-form sets this to nil; def-body sets it to t. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1207 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1208 (defun edebug-interactive-p-name () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1209 ;; Return a unique symbol for the variable used to store the |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1210 ;; status of interactive-p for this function. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1211 (intern (format "edebug-%s-interactive-p" edebug-def-name))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1212 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1213 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1214 (defun edebug-wrap-def-body (forms) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1215 "Wrap the FORMS of a definition body." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1216 (if edebug-def-interactive |
26519 | 1217 `(let ((,(edebug-interactive-p-name) |
1218 (interactive-p))) | |
1219 ,(edebug-make-enter-wrapper forms)) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1220 (edebug-make-enter-wrapper forms))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1221 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1222 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1223 (defun edebug-make-enter-wrapper (forms) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1224 ;; Generate the enter wrapper for some forms of a definition. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1225 ;; This is not to be used for the body of other forms, e.g. `while', |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1226 ;; since it wraps the list of forms with a call to `edebug-enter'. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1227 ;; Uses the dynamically bound vars edebug-def-name and edebug-def-args. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1228 ;; Do this after parsing since that may find a name. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1229 (setq edebug-def-name |
14846 | 1230 (or edebug-def-name edebug-old-def-name (edebug-gensym "edebug-anon"))) |
26519 | 1231 `(edebug-enter |
1232 (quote ,edebug-def-name) | |
1233 ,(if edebug-inside-func | |
26648
2cca1ed12a51
(edebug-make-enter-wrapper): Correct
Gerd Moellmann <gerd@gnu.org>
parents:
26519
diff
changeset
|
1234 `(list |
2cca1ed12a51
(edebug-make-enter-wrapper): Correct
Gerd Moellmann <gerd@gnu.org>
parents:
26519
diff
changeset
|
1235 ;; Doesn't work with more than one def-body!! |
2cca1ed12a51
(edebug-make-enter-wrapper): Correct
Gerd Moellmann <gerd@gnu.org>
parents:
26519
diff
changeset
|
1236 ;; But the list will just be reversed. |
2cca1ed12a51
(edebug-make-enter-wrapper): Correct
Gerd Moellmann <gerd@gnu.org>
parents:
26519
diff
changeset
|
1237 ,@(nreverse edebug-def-args)) |
26519 | 1238 'nil) |
1239 (function (lambda () ,@forms)) | |
1240 )) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1241 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1242 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1243 (defvar edebug-form-begin-marker) ; the mark for def being instrumented |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1244 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1245 (defvar edebug-offset-index) ; the next available offset index. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1246 (defvar edebug-offset-list) ; the list of offset positions. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1247 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1248 (defun edebug-inc-offset (offset) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1249 ;; modifies edebug-offset-index and edebug-offset-list |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1250 ;; accesses edebug-func-marc and buffer point |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1251 (prog1 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1252 edebug-offset-index |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1253 (setq edebug-offset-list (cons (- offset edebug-form-begin-marker) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1254 edebug-offset-list) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1255 edebug-offset-index (1+ edebug-offset-index)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1256 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1257 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1258 (defun edebug-make-before-and-after-form (before-index form after-index) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1259 ;; Return the edebug form for the current function at offset BEFORE-INDEX |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1260 ;; given FORM. Looks like: |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1261 ;; (edebug-after (edebug-before BEFORE-INDEX) AFTER-INDEX FORM) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1262 ;; Also increment the offset index for subsequent use. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1263 (list 'edebug-after |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1264 (list 'edebug-before before-index) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1265 after-index form)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1266 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1267 (defun edebug-make-after-form (form after-index) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1268 ;; Like edebug-make-before-and-after-form, but only after. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1269 (list 'edebug-after 0 after-index form)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1270 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1271 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1272 (defun edebug-unwrap (sexp) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1273 "Return the unwrapped SEXP or return it as is if it is not wrapped. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1274 The SEXP might be the result of wrapping a body, which is a list of |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1275 expressions; a `progn' form will be returned enclosing these forms." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1276 (if (consp sexp) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1277 (cond |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1278 ((eq 'edebug-after (car sexp)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1279 (nth 3 sexp)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1280 ((eq 'edebug-enter (car sexp)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1281 (let ((forms (nthcdr 2 (nth 1 (nth 3 sexp))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1282 (if (> (length forms) 1) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1283 (cons 'progn forms) ;; could return (values forms) instead. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1284 (car forms)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1285 (t sexp);; otherwise it is not wrapped, so just return it. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1286 ) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1287 sexp)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1288 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1289 (defun edebug-unwrap* (sexp) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1290 "Return the sexp recursively unwrapped." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1291 (let ((new-sexp (edebug-unwrap sexp))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1292 (while (not (eq sexp new-sexp)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1293 (setq sexp new-sexp |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1294 new-sexp (edebug-unwrap sexp))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1295 (if (consp new-sexp) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1296 (mapcar 'edebug-unwrap* new-sexp) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1297 new-sexp))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1298 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1299 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1300 (defun edebug-defining-form (cursor form-begin form-end speclist) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1301 ;; Process the defining form, starting outside the form. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1302 ;; The speclist is a generated list spec that looks like: |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1303 ;; (("def-symbol" defining-form-spec-sans-&define)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1304 ;; Skip the first offset. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1305 (edebug-set-cursor cursor (edebug-cursor-expressions cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1306 (cdr (edebug-cursor-offsets cursor))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1307 (edebug-make-form-wrapper |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1308 cursor |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1309 form-begin (1- form-end) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1310 speclist)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1311 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1312 (defun edebug-make-form-wrapper (cursor form-begin form-end |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1313 &optional speclist) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1314 ;; Wrap a form, usually a defining form, but any evaluated one. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1315 ;; If speclist is non-nil, this is being called by edebug-defining-form. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1316 ;; Otherwise it is being called from edebug-read-and-maybe-wrap-form1. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1317 ;; This is a hack, but I havent figured out a simpler way yet. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1318 (let* ((form-data-entry (edebug-get-form-data-entry form-begin form-end)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1319 ;; Set this marker before parsing. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1320 (edebug-form-begin-marker |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1321 (if form-data-entry |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1322 (edebug-form-data-begin form-data-entry) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1323 ;; Buffer must be current-buffer for this to work: |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1324 (set-marker (make-marker) form-begin)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1325 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1326 (let (edebug-offset-list |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1327 (edebug-offset-index 0) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1328 result |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1329 ;; For definitions. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1330 ;; (edebug-containing-def-name edebug-def-name) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1331 ;; Get name from form-data, if any. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1332 (edebug-old-def-name (edebug-form-data-name form-data-entry)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1333 edebug-def-name |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1334 edebug-def-args |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1335 edebug-def-interactive |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1336 edebug-inside-func;; whether wrapped code executes inside a function. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1337 ) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1338 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1339 (setq result |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1340 (if speclist |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1341 (edebug-match cursor speclist) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1342 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1343 ;; else wrap as an enter-form. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1344 (edebug-make-enter-wrapper (list (edebug-form cursor))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1345 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1346 ;; Set the name here if it was not set by edebug-make-enter-wrapper. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1347 (setq edebug-def-name |
14846 | 1348 (or edebug-def-name edebug-old-def-name (edebug-gensym "edebug-anon"))) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1349 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1350 ;; Add this def as a dependent of containing def. Buggy. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1351 '(if (and edebug-containing-def-name |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1352 (not (get edebug-containing-def-name 'edebug-dependents))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1353 (put edebug-containing-def-name 'edebug-dependents |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1354 (cons edebug-def-name |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1355 (get edebug-containing-def-name |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1356 'edebug-dependents)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1357 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1358 ;; Create a form-data-entry or modify existing entry's markers. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1359 ;; In the latter case, pointers to the entry remain eq. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1360 (if (not form-data-entry) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1361 (setq form-data-entry |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1362 (edebug-make-form-data-entry |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1363 edebug-def-name |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1364 edebug-form-begin-marker |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1365 ;; Buffer must be current-buffer. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1366 (set-marker (make-marker) form-end) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1367 )) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1368 (edebug-set-form-data-entry |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1369 form-data-entry edebug-def-name ;; in case name is changed |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1370 form-begin form-end)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1371 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1372 ;; (message "defining: %s" edebug-def-name) (sit-for 2) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1373 (edebug-make-top-form-data-entry form-data-entry) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1374 (message "Edebug: %s" edebug-def-name) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1375 ;;(debug edebug-def-name) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1376 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1377 ;; Destructively reverse edebug-offset-list and make vector from it. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1378 (setq edebug-offset-list (vconcat (nreverse edebug-offset-list))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1379 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1380 ;; Side effects on the property list of edebug-def-name. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1381 (edebug-clear-frequency-count edebug-def-name) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1382 (edebug-clear-coverage edebug-def-name) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1383 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1384 ;; Set up the initial window data. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1385 (if (not edebug-top-window-data) ;; if not already set, do it now. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1386 (let ((window ;; Find the best window for this buffer. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1387 (or (get-buffer-window (current-buffer)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1388 (selected-window)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1389 (setq edebug-top-window-data |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1390 (cons window (window-start window))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1391 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1392 ;; Store the edebug data in symbol's property list. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1393 (put edebug-def-name 'edebug |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1394 ;; A struct or vector would be better here!! |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1395 (list edebug-form-begin-marker |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1396 nil ; clear breakpoints |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1397 edebug-offset-list |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1398 edebug-top-window-data |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1399 )) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1400 result |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1401 ))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1402 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1403 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1404 (defun edebug-clear-frequency-count (name) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1405 ;; Create initial frequency count vector. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1406 ;; For each stop point, the counter is incremented each time it is visited. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1407 (put name 'edebug-freq-count |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1408 (make-vector (length edebug-offset-list) 0))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1409 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1410 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1411 (defun edebug-clear-coverage (name) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1412 ;; Create initial coverage vector. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1413 ;; Only need one per expression, but it is simpler to use stop points. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1414 (put name 'edebug-coverage |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1415 (make-vector (length edebug-offset-list) 'unknown))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1416 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1417 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1418 (defun edebug-form (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1419 ;; Return the instrumented form for the following form. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1420 ;; Add the point offsets to the edebug-offset-list for the form. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1421 (let* ((form (edebug-top-element-required cursor "Expected form")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1422 (offset (edebug-top-offset cursor))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1423 (prog1 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1424 (cond |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1425 ((consp form) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1426 ;; The first offset for a list form is for the list form itself. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1427 (if (eq 'quote (car form)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1428 form |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1429 (let* ((head (car form)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1430 (spec (and (symbolp head) (get-edebug-spec head))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1431 (new-cursor (edebug-new-cursor form offset))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1432 ;; Find out if this is a defining form from first symbol. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1433 ;; An indirect spec would not work here, yet. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1434 (if (and (consp spec) (eq '&define (car spec))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1435 (edebug-defining-form |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1436 new-cursor |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1437 (car offset);; before the form |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1438 (edebug-after-offset cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1439 (cons (symbol-name head) (cdr spec))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1440 ;; Wrap a regular form. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1441 (edebug-make-before-and-after-form |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1442 (edebug-inc-offset (car offset)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1443 (edebug-list-form new-cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1444 ;; After processing the list form, the new-cursor is left |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1445 ;; with the offset after the form. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1446 (edebug-inc-offset (edebug-cursor-offsets new-cursor)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1447 ))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1448 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1449 ((symbolp form) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1450 (cond |
14846 | 1451 ;; Check for constant symbols that don't get wrapped. |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1452 ((or (memq form '(t nil)) |
14846 | 1453 (and (fboundp 'edebug-keywordp) (edebug-keywordp form))) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1454 form) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1455 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1456 (t ;; just a variable |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1457 (edebug-make-after-form form (edebug-inc-offset (cdr offset)))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1458 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1459 ;; Anything else is self-evaluating. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1460 (t form)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1461 (edebug-move-cursor cursor)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1462 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1463 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1464 (defsubst edebug-forms (cursor) (edebug-match cursor '(&rest form))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1465 (defsubst edebug-sexps (cursor) (edebug-match cursor '(&rest sexp))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1466 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1467 (defsubst edebug-list-form-args (head cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1468 ;; Process the arguments of a list form given that head of form is a symbol. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1469 ;; Helper for edebug-list-form |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1470 (let ((spec (get-edebug-spec head))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1471 (cond |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1472 (spec |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1473 (cond |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1474 ((consp spec) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1475 ;; It is a speclist. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1476 (let (edebug-best-error |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1477 edebug-error-point);; This may not be needed. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1478 (edebug-match-sublist cursor spec))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1479 ((eq t spec) (edebug-forms cursor)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1480 ((eq 0 spec) (edebug-sexps cursor)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1481 ((symbolp spec) (funcall spec cursor));; Not used by edebug, |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1482 ; but leave it in for compatibility. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1483 )) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1484 ;; No edebug-form-spec provided. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1485 ((edebug-macrop head) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1486 (if edebug-eval-macro-args |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1487 (edebug-forms cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1488 (edebug-sexps cursor))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1489 (t ;; Otherwise it is a function call. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1490 (edebug-forms cursor))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1491 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1492 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1493 (defun edebug-list-form (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1494 ;; Return an instrumented form built from the list form. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1495 ;; The after offset will be left in the cursor after processing the form. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1496 (let ((head (edebug-top-element-required cursor "Expected elements")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1497 ;; Prevent backtracking whenever instrumenting. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1498 (edebug-gate t) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1499 ;; A list form is never optional because it matches anything. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1500 (edebug-&optional nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1501 (edebug-&rest nil)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1502 ;; Skip the first offset. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1503 (edebug-set-cursor cursor (edebug-cursor-expressions cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1504 (cdr (edebug-cursor-offsets cursor))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1505 (cond |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1506 ((null head) nil) ; () is legal. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1507 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1508 ((symbolp head) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1509 (cond |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1510 ((null head) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1511 (edebug-syntax-error "nil head")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1512 ((eq head 'interactive-p) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1513 ;; Special case: replace (interactive-p) with variable |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1514 (setq edebug-def-interactive 'check-it) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1515 (edebug-move-cursor cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1516 (edebug-interactive-p-name)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1517 (t |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1518 (cons head (edebug-list-form-args |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1519 head (edebug-move-cursor cursor)))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1520 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1521 ((consp head) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1522 (if (and (listp head) (eq (car head) ',)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1523 (edebug-match cursor '(("," def-form) body)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1524 ;; Process anonymous function and args. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1525 ;; This assumes no anonymous macros. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1526 (edebug-match-specs cursor '(lambda-expr body) 'edebug-match-specs))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1527 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1528 (t (edebug-syntax-error |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1529 "Head of list form must be a symbol or lambda expression."))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1530 )) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1531 |
14846 | 1532 ;;; Matching of specs. |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1533 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1534 (defvar edebug-after-dotted-spec nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1535 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1536 (defvar edebug-matching-depth 0) ;; initial value |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1537 (defconst edebug-max-depth 150) ;; maximum number of matching recursions. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1538 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1539 |
14846 | 1540 ;;; Failure to match |
1541 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1542 ;; This throws to no-match, if there are higher alternatives. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1543 ;; Otherwise it signals an error. The place of the error is found |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1544 ;; with the two before- and after-offset functions. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1545 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1546 (defun edebug-no-match (cursor &rest edebug-args) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1547 ;; Throw a no-match, or signal an error immediately if gate is active. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1548 ;; Remember this point in case we need to report this error. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1549 (setq edebug-error-point (or edebug-error-point |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1550 (edebug-before-offset cursor)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1551 edebug-best-error (or edebug-best-error edebug-args)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1552 (if (and edebug-gate (not edebug-&optional)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1553 (progn |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1554 (if edebug-error-point |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1555 (goto-char edebug-error-point)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1556 (apply 'edebug-syntax-error edebug-args)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1557 (funcall 'throw 'no-match edebug-args))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1558 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1559 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1560 (defun edebug-match (cursor specs) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1561 ;; Top level spec matching function. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1562 ;; Used also at each lower level of specs. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1563 (let (edebug-&optional |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1564 edebug-&rest |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1565 edebug-best-error |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1566 edebug-error-point |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1567 (edebug-gate edebug-gate) ;; locally bound to limit effect |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1568 ) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1569 (edebug-match-specs cursor specs 'edebug-match-specs))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1570 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1571 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1572 (defun edebug-match-one-spec (cursor spec) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1573 ;; Match one spec, which is not a keyword &-spec. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1574 (cond |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1575 ((symbolp spec) (edebug-match-symbol cursor spec)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1576 ((vectorp spec) (edebug-match cursor (append spec nil))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1577 ((stringp spec) (edebug-match-string cursor spec)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1578 ((listp spec) (edebug-match-list cursor spec)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1579 )) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1580 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1581 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1582 (defun edebug-match-specs (cursor specs remainder-handler) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1583 ;; Append results of matching the list of specs. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1584 ;; The first spec is handled and the remainder-handler handles the rest. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1585 (let ((edebug-matching-depth |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1586 (if (> edebug-matching-depth edebug-max-depth) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1587 (error "too deep - perhaps infinite loop in spec?") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1588 (1+ edebug-matching-depth)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1589 (cond |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1590 ((null specs) nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1591 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1592 ;; Is the spec dotted? |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1593 ((atom specs) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1594 (let ((edebug-dotted-spec t));; Containing spec list was dotted. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1595 (edebug-match-specs cursor (list specs) remainder-handler))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1596 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1597 ;; Is the form dotted? |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1598 ((not (listp (edebug-cursor-expressions cursor)));; allow nil |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1599 (if (not edebug-dotted-spec) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1600 (edebug-no-match cursor "Dotted spec required.")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1601 ;; Cancel dotted spec and dotted form. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1602 (let ((edebug-dotted-spec) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1603 (this-form (edebug-cursor-expressions cursor)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1604 (this-offset (edebug-cursor-offsets cursor))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1605 ;; Wrap the form in a list, (by changing the cursor??)... |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1606 (edebug-set-cursor cursor (list this-form) this-offset) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1607 ;; and process normally, then unwrap the result. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1608 (car (edebug-match-specs cursor specs remainder-handler)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1609 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1610 (t;; Process normally. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1611 (let* ((spec (car specs)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1612 (rest) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1613 (first-char (and (symbolp spec) (aref (symbol-name spec) 0)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1614 ;;(message "spec = %s first char = %s" spec first-char) (sit-for 1) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1615 (nconc |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1616 (cond |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1617 ((eq ?& first-char);; "&" symbols take all following specs. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1618 (funcall (get-edebug-spec spec) cursor (cdr specs))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1619 ((eq ?: first-char);; ":" symbols take one following spec. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1620 (setq rest (cdr (cdr specs))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1621 (funcall (get-edebug-spec spec) cursor (car (cdr specs)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1622 (t;; Any other normal spec. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1623 (setq rest (cdr specs)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1624 (edebug-match-one-spec cursor spec))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1625 (funcall remainder-handler cursor rest remainder-handler))))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1626 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1627 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1628 ;; Define specs for all the symbol specs with functions used to process them. |
14846 | 1629 ;; Perhaps we shouldn't be doing this with edebug-form-specs since the |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1630 ;; user may want to define macros or functions with the same names. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1631 ;; We could use an internal obarray for these primitive specs. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1632 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1633 (mapcar |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1634 (function (lambda (pair) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1635 (put (car pair) 'edebug-form-spec (cdr pair)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1636 '((&optional . edebug-match-&optional) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1637 (&rest . edebug-match-&rest) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1638 (&or . edebug-match-&or) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1639 (form . edebug-match-form) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1640 (sexp . edebug-match-sexp) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1641 (body . edebug-match-body) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1642 (&define . edebug-match-&define) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1643 (name . edebug-match-name) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1644 (:name . edebug-match-colon-name) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1645 (arg . edebug-match-arg) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1646 (def-body . edebug-match-def-body) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1647 (def-form . edebug-match-def-form) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1648 ;; Less frequently used: |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1649 ;; (function . edebug-match-function) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1650 (lambda-expr . edebug-match-lambda-expr) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1651 (¬ . edebug-match-¬) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1652 (&key . edebug-match-&key) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1653 (place . edebug-match-place) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1654 (gate . edebug-match-gate) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1655 ;; (nil . edebug-match-nil) not this one - special case it. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1656 )) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1657 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1658 (defun edebug-match-symbol (cursor symbol) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1659 ;; Match a symbol spec. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1660 (let* ((spec (get-edebug-spec symbol))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1661 (cond |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1662 (spec |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1663 (if (consp spec) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1664 ;; It is an indirect spec. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1665 (edebug-match cursor spec) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1666 ;; Otherwise it should be the symbol name of a function. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1667 ;; There could be a bug here - maybe need to do edebug-match bindings. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1668 (funcall spec cursor))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1669 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1670 ((null symbol) ;; special case this. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1671 (edebug-match-nil cursor)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1672 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1673 ((fboundp symbol) ; is it a predicate? |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1674 (let ((sexp (edebug-top-element-required cursor "Expected" symbol))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1675 ;; Special case for edebug-`. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1676 (if (and (listp sexp) (eq (car sexp) ',)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1677 (edebug-match cursor '(("," def-form))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1678 (if (not (funcall symbol sexp)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1679 (edebug-no-match cursor symbol "failed")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1680 (edebug-move-cursor cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1681 (list sexp)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1682 (t (error "%s is not a form-spec or function" symbol)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1683 ))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1684 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1685 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1686 (defun edebug-match-sexp (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1687 (list (prog1 (edebug-top-element-required cursor "Expected sexp") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1688 (edebug-move-cursor cursor)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1689 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1690 (defun edebug-match-form (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1691 (list (edebug-form cursor))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1692 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1693 (defalias 'edebug-match-place 'edebug-match-form) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1694 ;; Currently identical to edebug-match-form. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1695 ;; This is for common lisp setf-style place arguments. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1696 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1697 (defsubst edebug-match-body (cursor) (edebug-forms cursor)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1698 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1699 (defun edebug-match-&optional (cursor specs) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1700 ;; Keep matching until one spec fails. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1701 (edebug-&optional-wrapper cursor specs 'edebug-&optional-wrapper)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1702 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1703 (defun edebug-&optional-wrapper (cursor specs remainder-handler) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1704 (let (result |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1705 (edebug-&optional specs) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1706 (edebug-gate nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1707 (this-form (edebug-cursor-expressions cursor)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1708 (this-offset (edebug-cursor-offsets cursor))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1709 (if (null (catch 'no-match |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1710 (setq result |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1711 (edebug-match-specs cursor specs remainder-handler)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1712 ;; Returning nil means no no-match was thrown. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1713 nil)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1714 result |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1715 ;; no-match, but don't fail; just reset cursor and return nil. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1716 (edebug-set-cursor cursor this-form this-offset) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1717 nil))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1718 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1719 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1720 (defun edebug-&rest-wrapper (cursor specs remainder-handler) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1721 (if (null specs) (setq specs edebug-&rest)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1722 ;; Reuse the &optional handler with this as the remainder handler. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1723 (edebug-&optional-wrapper cursor specs remainder-handler)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1724 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1725 (defun edebug-match-&rest (cursor specs) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1726 ;; Repeatedly use specs until failure. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1727 (let ((edebug-&rest specs) ;; remember these |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1728 edebug-best-error |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1729 edebug-error-point) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1730 (edebug-&rest-wrapper cursor specs 'edebug-&rest-wrapper))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1731 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1732 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1733 (defun edebug-match-&or (cursor specs) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1734 ;; Keep matching until one spec succeeds, and return its results. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1735 ;; If none match, fail. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1736 ;; This needs to be optimized since most specs spend time here. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1737 (let ((original-specs specs) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1738 (this-form (edebug-cursor-expressions cursor)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1739 (this-offset (edebug-cursor-offsets cursor))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1740 (catch 'matched |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1741 (while specs |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1742 (catch 'no-match |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1743 (throw 'matched |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1744 (let (edebug-gate ;; only while matching each spec |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1745 edebug-best-error |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1746 edebug-error-point) |
14846 | 1747 ;; Doesn't support e.g. &or symbolp &rest form |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1748 (edebug-match-one-spec cursor (car specs))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1749 ;; Match failed, so reset and try again. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1750 (setq specs (cdr specs)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1751 ;; Reset the cursor for the next match. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1752 (edebug-set-cursor cursor this-form this-offset)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1753 ;; All failed. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1754 (apply 'edebug-no-match cursor "Expected one of" original-specs)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1755 )) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1756 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1757 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1758 (defun edebug-match-¬ (cursor specs) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1759 ;; If any specs match, then fail |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1760 (if (null (catch 'no-match |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1761 (let ((edebug-gate nil)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1762 (save-excursion |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1763 (edebug-match-&or cursor specs))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1764 nil)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1765 ;; This means something matched, so it is a no match. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1766 (edebug-no-match cursor "Unexpected")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1767 ;; This means nothing matched, so it is OK. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1768 nil) ;; So, return nothing |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1769 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1770 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1771 (def-edebug-spec &key edebug-match-&key) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1772 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1773 (defun edebug-match-&key (cursor specs) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1774 ;; Following specs must look like (<name> <spec>) ... |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1775 ;; where <name> is the name of a keyword, and spec is its spec. |
14846 | 1776 ;; This really doesn't save much over the expanded form and takes time. |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1777 (edebug-match-&rest |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1778 cursor |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1779 (cons '&or |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1780 (mapcar (function (lambda (pair) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1781 (vector (format ":%s" (car pair)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1782 (car (cdr pair))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1783 specs)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1784 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1785 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1786 (defun edebug-match-gate (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1787 ;; Simply set the gate to prevent backtracking at this level. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1788 (setq edebug-gate t) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1789 nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1790 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1791 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1792 (defun edebug-match-list (cursor specs) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1793 ;; The spec is a list, but what kind of list, and what context? |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1794 (if edebug-dotted-spec |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1795 ;; After dotted spec but form did not contain dot, |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1796 ;; so match list spec elements as if spliced in. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1797 (prog1 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1798 (let ((edebug-dotted-spec)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1799 (edebug-match-specs cursor specs 'edebug-match-specs)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1800 ;; If it matched, really clear the dotted-spec flag. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1801 (setq edebug-dotted-spec nil)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1802 (let ((spec (car specs)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1803 (form (edebug-top-element-required cursor "Expected" specs))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1804 (cond |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1805 ((eq 'quote spec) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1806 (let ((spec (car (cdr specs)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1807 (cond |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1808 ((symbolp spec) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1809 ;; Special case: spec quotes a symbol to match. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1810 ;; Change in future. Use "..." instead. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1811 (if (not (eq spec form)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1812 (edebug-no-match cursor "Expected" spec)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1813 (edebug-move-cursor cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1814 (setq edebug-gate t) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1815 form) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1816 (t |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1817 (error "Bad spec: %s" specs))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1818 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1819 ((listp form) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1820 (prog1 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1821 (list (edebug-match-sublist |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1822 ;; First offset is for the list form itself. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1823 ;; Treat nil as empty list. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1824 (edebug-new-cursor form (cdr (edebug-top-offset cursor))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1825 specs)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1826 (edebug-move-cursor cursor))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1827 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1828 ((and (eq 'vector spec) (vectorp form)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1829 ;; Special case: match a vector with the specs. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1830 (let ((result (edebug-match-sublist |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1831 (edebug-new-cursor |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1832 form (cdr (edebug-top-offset cursor))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1833 (cdr specs)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1834 (edebug-move-cursor cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1835 (list (apply 'vector result)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1836 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1837 (t (edebug-no-match cursor "Expected" specs))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1838 ))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1839 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1840 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1841 (defun edebug-match-sublist (cursor specs) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1842 ;; Match a sublist of specs. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1843 (let (edebug-&optional |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1844 ;;edebug-best-error |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1845 ;;edebug-error-point |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1846 ) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1847 (prog1 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1848 ;; match with edebug-match-specs so edebug-best-error is not bound. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1849 (edebug-match-specs cursor specs 'edebug-match-specs) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1850 (if (not (edebug-empty-cursor cursor)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1851 (if edebug-best-error |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1852 (apply 'edebug-no-match cursor edebug-best-error) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1853 ;; A failed &rest or &optional spec may leave some args. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1854 (edebug-no-match cursor "Failed matching" specs) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1855 ))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1856 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1857 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1858 (defun edebug-match-string (cursor spec) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1859 (let ((sexp (edebug-top-element-required cursor "Expected" spec))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1860 (if (not (eq (intern spec) sexp)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1861 (edebug-no-match cursor "Expected" spec) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1862 ;; Since it matched, failure means immediate error, unless &optional. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1863 (setq edebug-gate t) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1864 (edebug-move-cursor cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1865 (list sexp) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1866 ))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1867 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1868 (defun edebug-match-nil (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1869 ;; There must be nothing left to match a nil. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1870 (if (not (edebug-empty-cursor cursor)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1871 (edebug-no-match cursor "Unmatched argument(s)") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1872 nil)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1873 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1874 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1875 (defun edebug-match-function (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1876 (error "Use function-form instead of function in edebug spec")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1877 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1878 (defun edebug-match-&define (cursor specs) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1879 ;; Match a defining form. |
14846 | 1880 ;; Normally, &define is interpreted specially other places. |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1881 ;; This should only be called inside of a spec list to match the remainder |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1882 ;; of the current list. e.g. ("lambda" &define args def-body) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1883 (edebug-make-form-wrapper |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1884 cursor |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1885 (edebug-before-offset cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1886 ;; Find the last offset in the list. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1887 (let ((offsets (edebug-cursor-offsets cursor))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1888 (while (consp offsets) (setq offsets (cdr offsets))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1889 offsets) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1890 specs)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1891 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1892 (defun edebug-match-lambda-expr (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1893 ;; The expression must be a function. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1894 ;; This will match any list form that begins with a symbol |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1895 ;; that has an edebug-form-spec beginning with &define. In |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1896 ;; practice, only lambda expressions should be used. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1897 ;; I could add a &lambda specification to avoid confusion. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1898 (let* ((sexp (edebug-top-element-required |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1899 cursor "Expected lambda expression")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1900 (offset (edebug-top-offset cursor)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1901 (head (and (consp sexp) (car sexp))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1902 (spec (and (symbolp head) (get-edebug-spec head))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1903 (edebug-inside-func nil)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1904 ;; Find out if this is a defining form from first symbol. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1905 (if (and (consp spec) (eq '&define (car spec))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1906 (prog1 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1907 (list |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1908 (edebug-defining-form |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1909 (edebug-new-cursor sexp offset) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1910 (car offset);; before the sexp |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1911 (edebug-after-offset cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1912 (cons (symbol-name head) (cdr spec)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1913 (edebug-move-cursor cursor)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1914 (edebug-no-match cursor "Expected lambda expression") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1915 ))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1916 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1917 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1918 (defun edebug-match-name (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1919 ;; Set the edebug-def-name bound in edebug-defining-form. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1920 (let ((name (edebug-top-element-required cursor "Expected name"))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1921 ;; Maybe strings and numbers could be used. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1922 (if (not (symbolp name)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1923 (edebug-no-match cursor "Symbol expected for name of definition")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1924 (setq edebug-def-name |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1925 (if edebug-def-name |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1926 ;; Construct a new name by appending to previous name. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1927 (intern (format "%s@%s" edebug-def-name name)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1928 name)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1929 (edebug-move-cursor cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1930 (list name))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1931 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1932 (defun edebug-match-colon-name (cursor spec) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1933 ;; Set the edebug-def-name to the spec. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1934 (setq edebug-def-name |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1935 (if edebug-def-name |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1936 ;; Construct a new name by appending to previous name. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1937 (intern (format "%s@%s" edebug-def-name spec)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1938 spec)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1939 nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1940 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1941 (defun edebug-match-arg (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1942 ;; set the def-args bound in edebug-defining-form |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1943 (let ((edebug-arg (edebug-top-element-required cursor "Expected arg"))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1944 (if (or (not (symbolp edebug-arg)) |
14846 | 1945 (edebug-lambda-list-keywordp edebug-arg)) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1946 (edebug-no-match cursor "Bad argument:" edebug-arg)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1947 (edebug-move-cursor cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1948 (setq edebug-def-args (cons edebug-arg edebug-def-args)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1949 (list edebug-arg))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1950 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1951 (defun edebug-match-def-form (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1952 ;; Like form but the form is wrapped in edebug-enter form. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1953 ;; The form is assumed to be executing outside of the function context. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1954 ;; This is a hack for now, since a def-form might execute inside as well. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1955 ;; Not to be used otherwise. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1956 (let ((edebug-inside-func nil)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1957 (list (edebug-make-enter-wrapper (list (edebug-form cursor)))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1958 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1959 (defun edebug-match-def-body (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1960 ;; Like body but body is wrapped in edebug-enter form. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1961 ;; The body is assumed to be executing inside of the function context. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1962 ;; Not to be used otherwise. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1963 (let ((edebug-inside-func t)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1964 (list (edebug-wrap-def-body (edebug-forms cursor))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1965 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1966 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1967 ;;;; Edebug Form Specs |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1968 ;;; ========================================================== |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1969 ;;; See cl-specs.el for common lisp specs. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1970 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1971 ;;;;* Spec for def-edebug-spec |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1972 ;;; Out of date. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1973 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1974 (defun edebug-spec-p (object) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1975 "Return non-nil if OBJECT is a symbol with an edebug-form-spec property." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1976 (and (symbolp object) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1977 (get object 'edebug-form-spec))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1978 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1979 (def-edebug-spec def-edebug-spec |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1980 ;; Top level is different from lower levels. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1981 (&define :name edebug-spec name |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1982 &or "nil" edebug-spec-p "t" "0" (&rest edebug-spec))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1983 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1984 (def-edebug-spec edebug-spec-list |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1985 ;; A list must have something in it, or it is nil, a symbolp |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1986 ((edebug-spec . [&or nil edebug-spec]))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1987 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1988 (def-edebug-spec edebug-spec |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1989 (&or |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1990 (vector &rest edebug-spec) ; matches a vector |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1991 ("vector" &rest edebug-spec) ; matches a vector spec |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1992 ("quote" symbolp) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1993 edebug-spec-list |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1994 stringp |
14846 | 1995 [edebug-lambda-list-keywordp &rest edebug-spec] |
1996 ;; [edebug-keywordp gate edebug-spec] ;; need edebug-keywordp for this. | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1997 edebug-spec-p ;; Including all the special ones e.g. form. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1998 symbolp;; a predicate |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1999 )) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2000 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2001 |
14846 | 2002 ;;;* Emacs special forms and some functions. |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2003 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2004 ;; quote expects only one argument, although it allows any number. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2005 (def-edebug-spec quote sexp) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2006 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2007 ;; The standard defining forms. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2008 (def-edebug-spec defconst defvar) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2009 (def-edebug-spec defvar (symbolp &optional form stringp)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2010 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2011 (def-edebug-spec defun |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2012 (&define name lambda-list |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2013 [&optional stringp] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2014 [&optional ("interactive" interactive)] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2015 def-body)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2016 (def-edebug-spec defmacro |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2017 (&define name lambda-list def-body)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2018 |
14846 | 2019 (def-edebug-spec arglist lambda-list) ;; deprecated - use lambda-list. |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2020 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2021 (def-edebug-spec lambda-list |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2022 (([&rest arg] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2023 [&optional ["&optional" arg &rest arg]] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2024 &optional ["&rest" arg] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2025 ))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2026 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2027 (def-edebug-spec interactive |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2028 (&optional &or stringp def-form)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2029 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2030 ;; A function-form is for an argument that may be a function or a form. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2031 ;; This specially recognizes anonymous functions quoted with quote. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2032 (def-edebug-spec function-form |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2033 ;; form at the end could also handle "function", |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2034 ;; but recognize it specially to avoid wrapping function forms. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2035 (&or ([&or "quote" "function"] &or symbolp lambda-expr) form)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2036 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2037 ;; function expects a symbol or a lambda or macro expression |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2038 ;; A macro is allowed by Emacs. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2039 (def-edebug-spec function (&or symbolp lambda-expr)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2040 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2041 ;; lambda is a macro in emacs 19. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2042 (def-edebug-spec lambda (&define lambda-list |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2043 [&optional stringp] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2044 [&optional ("interactive" interactive)] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2045 def-body)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2046 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2047 ;; A macro expression is a lambda expression with "macro" prepended. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2048 (def-edebug-spec macro (&define "lambda" lambda-list def-body)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2049 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2050 ;; (def-edebug-spec anonymous-form ((&or ["lambda" lambda] ["macro" macro]))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2051 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2052 ;; Standard functions that take function-forms arguments. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2053 (def-edebug-spec mapcar (function-form form)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2054 (def-edebug-spec mapconcat (function-form form form)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2055 (def-edebug-spec mapatoms (function-form &optional form)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2056 (def-edebug-spec apply (function-form &rest form)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2057 (def-edebug-spec funcall (function-form &rest form)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2058 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2059 (def-edebug-spec let |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2060 ((&rest &or (symbolp &optional form) symbolp) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2061 body)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2062 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2063 (def-edebug-spec let* let) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2064 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2065 (def-edebug-spec setq (&rest symbolp form)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2066 (def-edebug-spec setq-default setq) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2067 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2068 (def-edebug-spec cond (&rest (&rest form))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2069 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2070 (def-edebug-spec condition-case |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2071 (symbolp |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2072 form |
18729
43149745d126
(condition-case): Fix edebug-form-spec to
Richard M. Stallman <rms@gnu.org>
parents:
18399
diff
changeset
|
2073 &rest ([&or symbolp (&rest symbolp)] body))) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2074 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2075 |
14846 | 2076 (def-edebug-spec \` (backquote-form)) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2077 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2078 ;; Supports quotes inside backquotes, |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2079 ;; but only at the top level inside unquotes. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2080 (def-edebug-spec backquote-form |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2081 (&or |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2082 ([&or "," ",@"] &or ("quote" backquote-form) form) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2083 (backquote-form &rest backquote-form) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2084 ;; If you use dotted forms in backquotes, replace the previous line |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2085 ;; with the following. This takes quite a bit more stack space, however. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2086 ;; (backquote-form . [&or nil backquote-form]) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2087 (vector &rest backquote-form) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2088 sexp)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2089 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2090 ;; Special version of backquote that instruments backquoted forms |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2091 ;; destined to be evaluated, usually as the result of a |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2092 ;; macroexpansion. Backquoted code can only have unquotes (, and ,@) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2093 ;; in places where list forms are allowed, and predicates. If the |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2094 ;; backquote is used in a macro, unquoted code that come from |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2095 ;; arguments must be instrumented, if at all, with def-form not def-body. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2096 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2097 ;; We could assume that all forms (not nested in other forms) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2098 ;; in arguments of macros should be def-forms, whether or not the macros |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2099 ;; are defined with edebug-` but this would be expensive. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2100 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2101 ;; ,@ might have some problems. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2102 |
14846 | 2103 (defalias 'edebug-\` '\`) ;; same macro as regular backquote. |
2104 (def-edebug-spec edebug-\` (def-form)) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2105 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2106 ;; Assume immediate quote in unquotes mean backquote at next higher level. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2107 (def-edebug-spec , (&or ("quote" edebug-`) def-form)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2108 (def-edebug-spec ,@ (&define ;; so (,@ form) is never wrapped. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2109 &or ("quote" edebug-`) def-form)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2110 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2111 ;; New byte compiler. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2112 (def-edebug-spec defsubst defun) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2113 (def-edebug-spec dont-compile t) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2114 (def-edebug-spec eval-when-compile t) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2115 (def-edebug-spec eval-and-compile t) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2116 |
16374
b3b88a1ee6aa
(save-selected-window, save-current-buffer)
Richard M. Stallman <rms@gnu.org>
parents:
16308
diff
changeset
|
2117 (def-edebug-spec save-selected-window t) |
b3b88a1ee6aa
(save-selected-window, save-current-buffer)
Richard M. Stallman <rms@gnu.org>
parents:
16308
diff
changeset
|
2118 (def-edebug-spec save-current-buffer t) |
b3b88a1ee6aa
(save-selected-window, save-current-buffer)
Richard M. Stallman <rms@gnu.org>
parents:
16308
diff
changeset
|
2119 (def-edebug-spec save-match-data t) |
b3b88a1ee6aa
(save-selected-window, save-current-buffer)
Richard M. Stallman <rms@gnu.org>
parents:
16308
diff
changeset
|
2120 (def-edebug-spec with-output-to-string t) |
b3b88a1ee6aa
(save-selected-window, save-current-buffer)
Richard M. Stallman <rms@gnu.org>
parents:
16308
diff
changeset
|
2121 (def-edebug-spec with-current-buffer t) |
16550
158dd5ed6ae8
(combine-after-change-calls): New def-edebug-spec.
Richard M. Stallman <rms@gnu.org>
parents:
16374
diff
changeset
|
2122 (def-edebug-spec combine-after-change-calls t) |
16374
b3b88a1ee6aa
(save-selected-window, save-current-buffer)
Richard M. Stallman <rms@gnu.org>
parents:
16308
diff
changeset
|
2123 (def-edebug-spec with-temp-file t) |
b3b88a1ee6aa
(save-selected-window, save-current-buffer)
Richard M. Stallman <rms@gnu.org>
parents:
16308
diff
changeset
|
2124 (def-edebug-spec with-temp-buffer t) |
24122
73346cd4a77e
(with-temp-message): Add def-edebug-spec call.
Richard M. Stallman <rms@gnu.org>
parents:
24024
diff
changeset
|
2125 (def-edebug-spec with-temp-message t) |
16374
b3b88a1ee6aa
(save-selected-window, save-current-buffer)
Richard M. Stallman <rms@gnu.org>
parents:
16308
diff
changeset
|
2126 |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2127 ;; Anything else? |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2128 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2129 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2130 ;; Some miscellaneous specs for macros in public packages. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2131 ;; Send me yours. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2132 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2133 ;; advice.el by Hans Chalupsky (hans@cs.buffalo.edu) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2134 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2135 (def-edebug-spec ad-dolist ((symbolp form &optional form) body)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2136 (def-edebug-spec defadvice |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2137 (&define name ;; thing being advised. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2138 (name ;; class is [&or "before" "around" "after" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2139 ;; "activation" "deactivation"] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2140 name ;; name of advice |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2141 &rest sexp ;; optional position and flags |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2142 ) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2143 [&optional stringp] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2144 [&optional ("interactive" interactive)] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2145 def-body)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2146 |
14846 | 2147 ;;; The debugger itself |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2148 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2149 (defvar edebug-active nil) ;; Non-nil when edebug is active |
661 | 2150 |
2151 ;;; add minor-mode-alist entry | |
2152 (or (assq 'edebug-active minor-mode-alist) | |
2153 (setq minor-mode-alist (cons (list 'edebug-active " *Debugging*") | |
2154 minor-mode-alist))) | |
2155 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2156 (defvar edebug-stack nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2157 ;; Stack of active functions evaluated via edebug. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2158 ;; Should be nil at the top level. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2159 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2160 (defvar edebug-stack-depth -1) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2161 ;; Index of last edebug-stack item. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2162 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2163 (defvar edebug-offset-indices nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2164 ;; Stack of offset indices of visited edebug sexps. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2165 ;; Should be nil at the top level. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2166 ;; Each function adds one cons. Top is modified with setcar. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2167 |
661 | 2168 |
2169 (defvar edebug-entered nil | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2170 ;; Non-nil if edebug has already been entered at this recursive edit level. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2171 ;; This should stay nil at the top level. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2172 ) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2173 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2174 ;; Should these be options? |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2175 (defconst edebug-debugger 'edebug |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2176 ;; Name of function to use for debugging when error or quit occurs. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2177 ;; Set this to 'debug if you want to debug edebug. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2178 ) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2179 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2180 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2181 ;; Dynamically bound variables, declared globally but left unbound. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2182 (defvar edebug-function) ; the function being executed. change name!! |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2183 (defvar edebug-args) ; the arguments of the function |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2184 (defvar edebug-data) ; the edebug data for the function |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2185 (defvar edebug-value) ; the result of the expression |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2186 (defvar edebug-after-index) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2187 (defvar edebug-def-mark) ; the mark for the definition |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2188 (defvar edebug-freq-count) ; the count of expression visits. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2189 (defvar edebug-coverage) ; the coverage results of each expression of function. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2190 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2191 (defvar edebug-buffer) ; which buffer the function is in. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2192 (defvar edebug-result) ; the result of the function call returned by body |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2193 (defvar edebug-outside-executing-macro) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2194 (defvar edebug-outside-defining-kbd-macro) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2195 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2196 (defvar edebug-execution-mode 'step) ; Current edebug mode set by user. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2197 (defvar edebug-next-execution-mode nil) ; Use once instead of initial mode. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2198 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2199 (defvar edebug-outside-debug-on-error) ; the value of debug-on-error outside |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2200 (defvar edebug-outside-debug-on-quit) ; the value of debug-on-quit outside |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2201 |
19930
1e0f347ee021
(edebug-enter): Save, and bind to nil,
Richard M. Stallman <rms@gnu.org>
parents:
18729
diff
changeset
|
2202 (defvar edebug-outside-overriding-local-map) |
1e0f347ee021
(edebug-enter): Save, and bind to nil,
Richard M. Stallman <rms@gnu.org>
parents:
18729
diff
changeset
|
2203 (defvar edebug-outside-overriding-terminal-local-map) |
1e0f347ee021
(edebug-enter): Save, and bind to nil,
Richard M. Stallman <rms@gnu.org>
parents:
18729
diff
changeset
|
2204 |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2205 (defvar edebug-outside-pre-command-hook) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2206 (defvar edebug-outside-post-command-hook) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2207 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2208 (defvar cl-lexical-debug) ;; Defined in cl.el |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2209 |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2210 ;;; Handling signals |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2211 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2212 (defun edebug-signal (edebug-signal-name edebug-signal-data) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2213 "Signal an error. Args are SIGNAL-NAME, and associated DATA. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2214 A signal name is a symbol with an `error-conditions' property |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2215 that is a list of condition names. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2216 A handler for any of those names will get to handle this signal. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2217 The symbol `error' should always be one of them. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2218 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2219 DATA should be a list. Its elements are printed as part of the error message. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2220 If the signal is handled, DATA is made available to the handler. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2221 See `condition-case'. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2222 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2223 This is the Edebug replacement for the standard `signal'. It should |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2224 only be active while Edebug is. It checks `debug-on-error' to see |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2225 whether it should call the debugger. When execution is resumed, the |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2226 error is signaled again." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2227 (if (and (listp debug-on-error) (memq edebug-signal-name debug-on-error)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2228 (edebug 'error (cons edebug-signal-name edebug-signal-data))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2229 ;; If we reach here without another non-local exit, then send signal again. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2230 ;; i.e. the signal is not continuable, yet. |
18017
4c3a2b58fd72
(edebug-signal): Avoid infinite recursion.
Richard M. Stallman <rms@gnu.org>
parents:
17650
diff
changeset
|
2231 ;; Avoid infinite recursion. |
4c3a2b58fd72
(edebug-signal): Avoid infinite recursion.
Richard M. Stallman <rms@gnu.org>
parents:
17650
diff
changeset
|
2232 (let ((signal-hook-function nil)) |
4c3a2b58fd72
(edebug-signal): Avoid infinite recursion.
Richard M. Stallman <rms@gnu.org>
parents:
17650
diff
changeset
|
2233 (signal edebug-signal-name edebug-signal-data))) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2234 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2235 ;;; Entering Edebug |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2236 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2237 (defun edebug-enter (edebug-function edebug-args edebug-body) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2238 ;; Entering FUNC. The arguments are ARGS, and the body is BODY. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2239 ;; Setup edebug variables and evaluate BODY. This function is called |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2240 ;; when a function evaluated with edebug-eval-top-level-form is entered. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2241 ;; Return the result of BODY. |
661 | 2242 |
2243 ;; Is this the first time we are entering edebug since | |
2244 ;; lower-level recursive-edit command? | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2245 ;; More precisely, this tests whether Edebug is currently active. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2246 (if (not edebug-entered) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2247 (let ((edebug-entered t) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2248 ;; Binding max-lisp-eval-depth here is OK, |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2249 ;; but not inside an unwind-protect. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2250 ;; Doing it here also keeps it from growing too large. |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2251 (max-lisp-eval-depth (+ 100 max-lisp-eval-depth)) ; too much?? |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2252 (max-specpdl-size (+ 200 max-specpdl-size)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2253 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2254 (debugger edebug-debugger) ; only while edebug is active. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2255 (edebug-outside-debug-on-error debug-on-error) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2256 (edebug-outside-debug-on-quit debug-on-quit) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2257 ;; Binding these may not be the right thing to do. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2258 ;; We want to allow the global values to be changed. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2259 (debug-on-error (or debug-on-error edebug-on-error)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2260 (debug-on-quit edebug-on-quit) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2261 |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2262 ;; Lexical bindings must be uncompiled for this to work. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2263 (cl-lexical-debug t) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2264 |
19930
1e0f347ee021
(edebug-enter): Save, and bind to nil,
Richard M. Stallman <rms@gnu.org>
parents:
18729
diff
changeset
|
2265 (edebug-outside-overriding-local-map overriding-local-map) |
1e0f347ee021
(edebug-enter): Save, and bind to nil,
Richard M. Stallman <rms@gnu.org>
parents:
18729
diff
changeset
|
2266 (edebug-outside-overriding-terminal-local-map |
1e0f347ee021
(edebug-enter): Save, and bind to nil,
Richard M. Stallman <rms@gnu.org>
parents:
18729
diff
changeset
|
2267 overriding-terminal-local-map) |
1e0f347ee021
(edebug-enter): Save, and bind to nil,
Richard M. Stallman <rms@gnu.org>
parents:
18729
diff
changeset
|
2268 |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2269 ;; Save the outside value of executing macro. (here??) |
15302
c23c9712ef5c
Use executing-kbd-macro, not executing-macro.
Karl Heuer <kwzh@gnu.org>
parents:
14846
diff
changeset
|
2270 (edebug-outside-executing-macro executing-kbd-macro) |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2271 (edebug-outside-pre-command-hook pre-command-hook) |
16299
0e4f99bad2ec
(pre-command-hook, post-command-hook): Defvars deleted.
Richard M. Stallman <rms@gnu.org>
parents:
15782
diff
changeset
|
2272 (edebug-outside-post-command-hook post-command-hook)) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2273 (unwind-protect |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2274 (let (;; Don't keep reading from an executing kbd macro |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2275 ;; within edebug unless edebug-continue-kbd-macro is |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2276 ;; non-nil. Again, local binding may not be best. |
15302
c23c9712ef5c
Use executing-kbd-macro, not executing-macro.
Karl Heuer <kwzh@gnu.org>
parents:
14846
diff
changeset
|
2277 (executing-kbd-macro |
c23c9712ef5c
Use executing-kbd-macro, not executing-macro.
Karl Heuer <kwzh@gnu.org>
parents:
14846
diff
changeset
|
2278 (if edebug-continue-kbd-macro executing-kbd-macro)) |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2279 |
19930
1e0f347ee021
(edebug-enter): Save, and bind to nil,
Richard M. Stallman <rms@gnu.org>
parents:
18729
diff
changeset
|
2280 ;; Don't get confused by the user's keymap changes. |
1e0f347ee021
(edebug-enter): Save, and bind to nil,
Richard M. Stallman <rms@gnu.org>
parents:
18729
diff
changeset
|
2281 (overriding-local-map nil) |
1e0f347ee021
(edebug-enter): Save, and bind to nil,
Richard M. Stallman <rms@gnu.org>
parents:
18729
diff
changeset
|
2282 (overriding-terminal-local-map nil) |
1e0f347ee021
(edebug-enter): Save, and bind to nil,
Richard M. Stallman <rms@gnu.org>
parents:
18729
diff
changeset
|
2283 |
16308
2334a3d634c0
(edebug-original-signal): Don't define it.
Richard M. Stallman <rms@gnu.org>
parents:
16299
diff
changeset
|
2284 (signal-hook-function 'edebug-signal) |
2334a3d634c0
(edebug-original-signal): Don't define it.
Richard M. Stallman <rms@gnu.org>
parents:
16299
diff
changeset
|
2285 |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2286 ;; Disable command hooks. This is essential when |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2287 ;; a hook function is instrumented - to avoid infinite loop. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2288 ;; This may be more than we need, however. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2289 (pre-command-hook nil) |
16299
0e4f99bad2ec
(pre-command-hook, post-command-hook): Defvars deleted.
Richard M. Stallman <rms@gnu.org>
parents:
15782
diff
changeset
|
2290 (post-command-hook nil)) |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2291 (setq edebug-execution-mode (or edebug-next-execution-mode |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2292 edebug-initial-mode |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2293 edebug-execution-mode) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2294 edebug-next-execution-mode nil) |
16308
2334a3d634c0
(edebug-original-signal): Don't define it.
Richard M. Stallman <rms@gnu.org>
parents:
16299
diff
changeset
|
2295 (edebug-enter edebug-function edebug-args edebug-body)) |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2296 ;; Reset global variables in case outside value was changed. |
15302
c23c9712ef5c
Use executing-kbd-macro, not executing-macro.
Karl Heuer <kwzh@gnu.org>
parents:
14846
diff
changeset
|
2297 (setq executing-kbd-macro edebug-outside-executing-macro |
14846 | 2298 pre-command-hook edebug-outside-pre-command-hook |
2299 post-command-hook edebug-outside-post-command-hook | |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2300 ))) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2301 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2302 (let* ((edebug-data (get edebug-function 'edebug)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2303 (edebug-def-mark (car edebug-data)) ; mark at def start |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2304 (edebug-freq-count (get edebug-function 'edebug-freq-count)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2305 (edebug-coverage (get edebug-function 'edebug-coverage)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2306 (edebug-buffer (marker-buffer edebug-def-mark)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2307 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2308 (edebug-stack (cons edebug-function edebug-stack)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2309 (edebug-offset-indices (cons 0 edebug-offset-indices)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2310 ) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2311 (if (get edebug-function 'edebug-on-entry) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2312 (progn |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2313 (setq edebug-execution-mode 'step) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2314 (if (eq (get edebug-function 'edebug-on-entry) 'temp) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2315 (put edebug-function 'edebug-on-entry nil)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2316 (if edebug-trace |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2317 (edebug-enter-trace edebug-body) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2318 (funcall edebug-body)) |
661 | 2319 ))) |
2320 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2321 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2322 (defun edebug-enter-trace (edebug-body) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2323 (let ((edebug-stack-depth (1+ edebug-stack-depth)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2324 edebug-result) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2325 (edebug-print-trace-before |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2326 (format "%s args: %s" edebug-function edebug-args)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2327 (prog1 (setq edebug-result (funcall edebug-body)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2328 (edebug-print-trace-after |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2329 (format "%s result: %s" edebug-function edebug-result))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2330 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2331 (def-edebug-spec edebug-tracing (form body)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2332 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2333 (defmacro edebug-tracing (msg &rest body) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2334 "Print MSG in *edebug-trace* before and after evaluating BODY. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2335 The result of BODY is also printed." |
26519 | 2336 `(let ((edebug-stack-depth (1+ edebug-stack-depth)) |
2337 edebug-result) | |
2338 (edebug-print-trace-before ,msg) | |
2339 (prog1 (setq edebug-result (progn ,@body)) | |
2340 (edebug-print-trace-after | |
2341 (format "%s result: %s" ,msg edebug-result))))) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2342 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2343 (defun edebug-print-trace-before (msg) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2344 "Function called to print trace info before expression evaluation. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2345 MSG is printed after `::::{ '." |
661 | 2346 (edebug-trace-display |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2347 edebug-trace-buffer "%s{ %s" (make-string edebug-stack-depth ?\:) msg)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2348 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2349 (defun edebug-print-trace-after (msg) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2350 "Function called to print trace info after expression evaluation. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2351 MSG is printed after `::::} '." |
661 | 2352 (edebug-trace-display |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2353 edebug-trace-buffer "%s} %s" (make-string edebug-stack-depth ?\:) msg)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2354 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2355 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2356 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2357 (defun edebug-slow-before (edebug-before-index) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2358 ;; Debug current function given BEFORE position. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2359 ;; Called from functions compiled with edebug-eval-top-level-form. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2360 ;; Return the before index. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2361 (setcar edebug-offset-indices edebug-before-index) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2362 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2363 ;; Increment frequency count |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2364 (aset edebug-freq-count edebug-before-index |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2365 (1+ (aref edebug-freq-count edebug-before-index))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2366 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2367 (if (or (not (memq edebug-execution-mode '(Go-nonstop next))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2368 (edebug-input-pending-p)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2369 (edebug-debugger edebug-before-index 'before nil)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2370 edebug-before-index) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2371 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2372 (defun edebug-fast-before (edebug-before-index) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2373 ;; Do nothing. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2374 ) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2375 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2376 (defun edebug-slow-after (edebug-before-index edebug-after-index edebug-value) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2377 ;; Debug current function given AFTER position and VALUE. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2378 ;; Called from functions compiled with edebug-eval-top-level-form. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2379 ;; Return VALUE. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2380 (setcar edebug-offset-indices edebug-after-index) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2381 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2382 ;; Increment frequency count |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2383 (aset edebug-freq-count edebug-after-index |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2384 (1+ (aref edebug-freq-count edebug-after-index))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2385 (if edebug-test-coverage (edebug-update-coverage)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2386 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2387 (if (and (eq edebug-execution-mode 'Go-nonstop) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2388 (not (edebug-input-pending-p))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2389 ;; Just return result. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2390 edebug-value |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2391 (edebug-debugger edebug-after-index 'after edebug-value) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2392 )) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2393 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2394 (defun edebug-fast-after (edebug-before-index edebug-after-index edebug-value) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2395 ;; Do nothing but return the value. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2396 edebug-value) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2397 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2398 (defun edebug-run-slow () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2399 (defalias 'edebug-before 'edebug-slow-before) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2400 (defalias 'edebug-after 'edebug-slow-after)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2401 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2402 ;; This is not used, yet. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2403 (defun edebug-run-fast () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2404 (defalias 'edebug-before 'edebug-fast-before) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2405 (defalias 'edebug-after 'edebug-fast-after)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2406 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2407 (edebug-run-slow) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2408 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2409 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2410 (defun edebug-update-coverage () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2411 (let ((old-result (aref edebug-coverage edebug-after-index))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2412 (cond |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2413 ((eq 'ok-coverage old-result)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2414 ((eq 'unknown old-result) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2415 (aset edebug-coverage edebug-after-index edebug-value)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2416 ;; Test if a different result. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2417 ((not (eq edebug-value old-result)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2418 (aset edebug-coverage edebug-after-index 'ok-coverage))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2419 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2420 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2421 ;; Dynamically declared unbound variables. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2422 (defvar edebug-arg-mode) ; the mode, either before, after, or error |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2423 (defvar edebug-breakpoints) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2424 (defvar edebug-break-data) ; break data for current function. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2425 (defvar edebug-break) ; whether a break occurred. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2426 (defvar edebug-global-break) ; whether a global break occurred. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2427 (defvar edebug-break-condition) ; whether the breakpoint is conditional. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2428 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2429 (defvar edebug-break-result nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2430 (defvar edebug-global-break-result nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2431 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2432 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2433 (defun edebug-debugger (edebug-offset-index edebug-arg-mode edebug-value) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2434 ;; Check breakpoints and pending input. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2435 ;; If edebug display should be updated, call edebug-display. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2436 ;; Return edebug-value. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2437 (let* (;; This needs to be here since breakpoints may be changed. |
661 | 2438 (edebug-breakpoints (car (cdr edebug-data))) ; list of breakpoints |
2439 (edebug-break-data (assq edebug-offset-index edebug-breakpoints)) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2440 (edebug-break-condition (car (cdr edebug-break-data))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2441 (edebug-global-break |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2442 (if edebug-global-break-condition |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2443 (condition-case nil |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2444 (setq edebug-global-break-result |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2445 (eval edebug-global-break-condition)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2446 (error nil)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2447 (edebug-break)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2448 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2449 ;;; (edebug-trace "exp: %s" edebug-value) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2450 ;; Test whether we should break. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2451 (setq edebug-break |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2452 (or edebug-global-break |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2453 (and edebug-break-data |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2454 (or (not edebug-break-condition) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2455 (setq edebug-break-result |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2456 (eval edebug-break-condition)))))) |
661 | 2457 (if (and edebug-break |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2458 (nth 2 edebug-break-data)) ; is it temporary? |
661 | 2459 ;; Delete the breakpoint. |
2460 (setcdr edebug-data | |
2461 (cons (delq edebug-break-data edebug-breakpoints) | |
2462 (cdr (cdr edebug-data))))) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2463 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2464 ;; Display if mode is not go, continue, or Continue-fast |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2465 ;; or break, or input is pending, |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2466 (if (or (not (memq edebug-execution-mode '(go continue Continue-fast))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2467 edebug-break |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2468 (edebug-input-pending-p)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2469 (edebug-display)) ; <--------------- display |
661 | 2470 |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2471 edebug-value |
661 | 2472 )) |
2473 | |
2474 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2475 ;; window-start now stored with each function. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2476 ;;(defvar edebug-window-start nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2477 ;; Remember where each buffers' window starts between edebug calls. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2478 ;; This is to avoid spurious recentering. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2479 ;; Does this still need to be buffer-local?? |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2480 ;;(setq-default edebug-window-start nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2481 ;;(make-variable-buffer-local 'edebug-window-start) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2482 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2483 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2484 ;; Dynamically declared unbound vars |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2485 (defvar edebug-point) ; the point in edebug buffer |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2486 (defvar edebug-outside-buffer) ; the current-buffer outside of edebug |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2487 (defvar edebug-outside-point) ; the point outside of edebug |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2488 (defvar edebug-outside-mark) ; the mark outside of edebug |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2489 (defvar edebug-window-data) ; window and window-start for current function |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2490 (defvar edebug-outside-windows) ; outside window configuration |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2491 (defvar edebug-eval-buffer) ; for the evaluation list. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2492 (defvar edebug-outside-o-a-p) ; outside overlay-arrow-position |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2493 (defvar edebug-outside-o-a-s) ; outside overlay-arrow-string |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2494 (defvar edebug-outside-c-i-e-a) ; outside cursor-in-echo-area |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2495 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2496 (defvar edebug-eval-list nil) ;; List of expressions to evaluate. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2497 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2498 (defvar edebug-previous-result nil) ;; Last result returned. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2499 |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2500 ;; Emacs 19 adds an arg to mark and mark-marker. |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2501 (defalias 'edebug-mark 'mark) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2502 (defalias 'edebug-mark-marker 'mark-marker) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2503 |
661 | 2504 |
2505 (defun edebug-display () | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2506 ;; Setup windows for edebug, determine mode, maybe enter recursive-edit. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2507 ;; Uses local variables of edebug-enter, edebug-before, edebug-after |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2508 ;; and edebug-debugger. |
661 | 2509 (let ((edebug-active t) ; for minor mode alist |
2510 edebug-stop ; should we enter recursive-edit | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2511 (edebug-point (+ edebug-def-mark |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2512 (aref (nth 2 edebug-data) edebug-offset-index))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2513 edebug-buffer-outside-point ; current point in edebug-buffer |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2514 ;; window displaying edebug-buffer |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2515 (edebug-window-data (nth 3 edebug-data)) |
661 | 2516 (edebug-outside-window (selected-window)) |
2517 (edebug-outside-buffer (current-buffer)) | |
2518 (edebug-outside-point (point)) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2519 (edebug-outside-mark (edebug-mark)) |
661 | 2520 edebug-outside-windows ; window or screen configuration |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2521 edebug-buffer-points |
661 | 2522 |
2523 edebug-eval-buffer ; declared here so we can kill it below | |
2524 (edebug-eval-result-list (and edebug-eval-list | |
2525 (edebug-eval-result-list))) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2526 edebug-trace-window |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2527 edebug-trace-window-start |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2528 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2529 (edebug-outside-o-a-p overlay-arrow-position) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2530 (edebug-outside-o-a-s overlay-arrow-string) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2531 (edebug-outside-c-i-e-a cursor-in-echo-area)) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2532 (unwind-protect |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2533 (let ((overlay-arrow-position overlay-arrow-position) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2534 (overlay-arrow-string overlay-arrow-string) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2535 (cursor-in-echo-area nil) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2536 ;; any others?? |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2537 ) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2538 (if (not (buffer-name edebug-buffer)) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2539 (let ((debug-on-error nil)) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2540 (error "Buffer defining %s not found" edebug-function))) |
661 | 2541 |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2542 (if (eq 'after edebug-arg-mode) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2543 ;; Compute result string now before windows are modified. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2544 (edebug-compute-previous-result edebug-value)) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2545 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2546 (if edebug-save-windows |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2547 ;; Save windows now before we modify them. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2548 (setq edebug-outside-windows |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2549 (edebug-current-windows edebug-save-windows))) |
661 | 2550 |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2551 (if edebug-save-displayed-buffer-points |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2552 (setq edebug-buffer-points (edebug-get-displayed-buffer-points))) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2553 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2554 ;; First move the edebug buffer point to edebug-point |
14846 | 2555 ;; so that window start doesn't get changed when we display it. |
2556 ;; I don't know if this is going to help. | |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2557 ;;(set-buffer edebug-buffer) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2558 ;;(goto-char edebug-point) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2559 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2560 ;; If edebug-buffer is not currently displayed, |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2561 ;; first find a window for it. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2562 (edebug-pop-to-buffer edebug-buffer (car edebug-window-data)) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2563 (setcar edebug-window-data (selected-window)) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2564 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2565 ;; Now display eval list, if any. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2566 ;; This is done after the pop to edebug-buffer |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2567 ;; so that buffer-window correspondence is correct after quitting. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2568 (edebug-eval-display edebug-eval-result-list) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2569 ;; The evaluation list better not have deleted edebug-window-data. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2570 (select-window (car edebug-window-data)) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2571 (set-buffer edebug-buffer) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2572 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2573 (setq edebug-buffer-outside-point (point)) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2574 (goto-char edebug-point) |
661 | 2575 |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2576 (if (eq 'before edebug-arg-mode) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2577 ;; Check whether positions are up-to-date. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2578 ;; This assumes point is never before symbol. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2579 (if (not (memq (following-char) '(?\( ?\# ?\` ))) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2580 (let ((debug-on-error nil)) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2581 (error "Source has changed - reevaluate definition of %s" |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2582 edebug-function) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2583 ))) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2584 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2585 (setcdr edebug-window-data |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2586 (edebug-adjust-window (cdr edebug-window-data))) |
661 | 2587 |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2588 ;; Test if there is input, not including keyboard macros. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2589 (if (edebug-input-pending-p) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2590 (progn |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2591 (setq edebug-execution-mode 'step |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2592 edebug-stop t) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2593 (edebug-stop) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2594 ;; (discard-input) ; is this unfriendly?? |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2595 )) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2596 ;; Now display arrow based on mode. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2597 (edebug-overlay-arrow) |
661 | 2598 |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2599 (cond |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2600 ((eq 'error edebug-arg-mode) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2601 ;; Display error message |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2602 (setq edebug-execution-mode 'step) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2603 (edebug-overlay-arrow) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2604 (beep) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2605 (if (eq 'quit (car edebug-value)) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2606 (message "Quit") |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2607 (edebug-report-error edebug-value))) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2608 (edebug-break |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2609 (cond |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2610 (edebug-global-break |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2611 (message "Global Break: %s => %s" |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2612 edebug-global-break-condition |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2613 edebug-global-break-result)) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2614 (edebug-break-condition |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2615 (message "Break: %s => %s" |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2616 edebug-break-condition |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2617 edebug-break-result)) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2618 ((not (eq edebug-execution-mode 'Continue-fast)) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2619 (message "Break")) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2620 (t))) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2621 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2622 (t (message ""))) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2623 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2624 (if (eq 'after edebug-arg-mode) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2625 (progn |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2626 ;; Display result of previous evaluation. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2627 (if (and edebug-break |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2628 (not (eq edebug-execution-mode 'Continue-fast))) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2629 (sit-for 1)) ; Show break message. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2630 (edebug-previous-result))) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2631 |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2632 (cond |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2633 (edebug-break |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2634 (cond |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2635 ((eq edebug-execution-mode 'continue) (edebug-sit-for 1)) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2636 ((eq edebug-execution-mode 'Continue-fast) (edebug-sit-for 0)) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2637 (t (setq edebug-stop t)))) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2638 ;; not edebug-break |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2639 ((eq edebug-execution-mode 'trace) |
18376
9ae76ef113f6
(edebug-sit-for-seconds): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18017
diff
changeset
|
2640 (edebug-sit-for edebug-sit-for-seconds)) ; Force update and pause. |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2641 ((eq edebug-execution-mode 'Trace-fast) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2642 (edebug-sit-for 0)) ; Force update and continue. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2643 ) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2644 |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2645 (unwind-protect |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2646 (if (or edebug-stop |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2647 (memq edebug-execution-mode '(step next)) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2648 (eq edebug-arg-mode 'error)) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2649 (progn |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2650 ;; (setq edebug-execution-mode 'step) |
14846 | 2651 ;; (edebug-overlay-arrow) ; This doesn't always show up. |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2652 (edebug-recursive-edit))) ; <---------- Recursive edit |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2653 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2654 ;; Reset the edebug-window-data to whatever it is now. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2655 (let ((window (if (eq (window-buffer) edebug-buffer) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2656 (selected-window) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2657 (edebug-get-buffer-window edebug-buffer)))) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2658 ;; Remember window-start for edebug-buffer, if still displayed. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2659 (if window |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2660 (progn |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2661 (setcar edebug-window-data window) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2662 (setcdr edebug-window-data (window-start window))))) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2663 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2664 ;; Save trace window point before restoring outside windows. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2665 ;; Could generalize this for other buffers. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2666 (setq edebug-trace-window (get-buffer-window edebug-trace-buffer)) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2667 (if edebug-trace-window |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2668 (setq edebug-trace-window-start |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2669 (and edebug-trace-window |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2670 (window-start edebug-trace-window)))) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2671 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2672 ;; Restore windows before continuing. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2673 (if edebug-save-windows |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2674 (progn |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2675 (edebug-set-windows edebug-outside-windows) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2676 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2677 ;; Restore displayed buffer points. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2678 ;; Needed even if restoring windows because |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2679 ;; window-points are not restored. (should they be??) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2680 (if edebug-save-displayed-buffer-points |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2681 (edebug-set-buffer-points edebug-buffer-points)) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2682 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2683 ;; Unrestore trace window's window-point. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2684 (if edebug-trace-window |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2685 (set-window-start edebug-trace-window |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2686 edebug-trace-window-start)) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2687 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2688 ;; Unrestore edebug-buffer's window-start, if displayed. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2689 (let ((window (car edebug-window-data))) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2690 (if (and window (edebug-window-live-p window) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2691 (eq (window-buffer) edebug-buffer)) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2692 (progn |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2693 (set-window-start window (cdr edebug-window-data) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2694 'no-force) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2695 ;; Unrestore edebug-buffer's window-point. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2696 ;; Needed in addition to setting the buffer point |
14846 | 2697 ;; - otherwise quitting doesn't leave point as is. |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2698 ;; But this causes point to not be restored at times. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2699 ;; Also, it may not be a visible window. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2700 ;; (set-window-point window edebug-point) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2701 ))) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2702 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2703 ;; Unrestore edebug-buffer's point. Rerestored below. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2704 ;; (goto-char edebug-point) ;; in edebug-buffer |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2705 ) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2706 ;; Since we may be in a save-excursion, in case of quit, |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2707 ;; reselect the outside window only. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2708 ;; Only needed if we are not recovering windows?? |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2709 (if (edebug-window-live-p edebug-outside-window) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2710 (select-window edebug-outside-window)) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2711 ) ; if edebug-save-windows |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2712 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2713 ;; Restore current buffer always, in case application needs it. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2714 (set-buffer edebug-outside-buffer) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2715 ;; Restore point, and mark. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2716 ;; Needed even if restoring windows because |
14846 | 2717 ;; that doesn't restore point and mark in the current buffer. |
2718 ;; But don't restore point if edebug-buffer is current buffer. | |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2719 (if (not (eq edebug-buffer edebug-outside-buffer)) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2720 (goto-char edebug-outside-point)) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2721 (if (marker-buffer (edebug-mark-marker)) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2722 ;; Does zmacs-regions need to be nil while doing set-marker? |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2723 (set-marker (edebug-mark-marker) edebug-outside-mark)) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2724 ) ; unwind-protect |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2725 ;; None of the following is done if quit or signal occurs. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2726 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2727 ;; Restore edebug-buffer's outside point. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2728 ;; (edebug-trace "restore edebug-buffer point: %s" |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2729 ;; edebug-buffer-outside-point) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2730 (let ((current-buffer (current-buffer))) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2731 (set-buffer edebug-buffer) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2732 (goto-char edebug-buffer-outside-point) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2733 (set-buffer current-buffer)) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2734 ;; ... nothing more. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2735 ) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2736 ;; Reset global variables to outside values in case they were changed. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2737 (setq |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2738 overlay-arrow-position edebug-outside-o-a-p |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2739 overlay-arrow-string edebug-outside-o-a-s |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2740 cursor-in-echo-area edebug-outside-c-i-e-a) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2741 ))) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2742 |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2743 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2744 (defvar edebug-number-of-recursions 0) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2745 ;; Number of recursive edits started by edebug. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2746 ;; Should be 0 at the top level. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2747 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2748 (defvar edebug-recursion-depth 0) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2749 ;; Value of recursion-depth when edebug was called. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2750 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2751 ;; Dynamically declared unbound vars |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2752 (defvar edebug-outside-match-data) ; match data outside of edebug |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2753 (defvar edebug-backtrace-buffer) ; each recursive edit gets its own |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2754 (defvar edebug-inside-windows) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2755 (defvar edebug-interactive-p) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2756 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2757 (defvar edebug-outside-map) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2758 (defvar edebug-outside-standard-output) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2759 (defvar edebug-outside-standard-input) |
25812
edf16534a337
(edebug-outside-current-prefix-arg):
Phillip Rulon <pjr@gnu.org>
parents:
25056
diff
changeset
|
2760 (defvar edebug-outside-current-prefix-arg) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2761 (defvar edebug-outside-last-command-char) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2762 (defvar edebug-outside-last-command) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2763 (defvar edebug-outside-this-command) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2764 (defvar edebug-outside-last-input-char) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2765 |
6671
5b26038687ed
(edebug-emacs-19-specific): Renamed from edebug-fsf19-specific.
Richard M. Stallman <rms@gnu.org>
parents:
6666
diff
changeset
|
2766 ;; Note: here we have defvars for variables that are |
5b26038687ed
(edebug-emacs-19-specific): Renamed from edebug-fsf19-specific.
Richard M. Stallman <rms@gnu.org>
parents:
6666
diff
changeset
|
2767 ;; built-in in certain versions. |
5b26038687ed
(edebug-emacs-19-specific): Renamed from edebug-fsf19-specific.
Richard M. Stallman <rms@gnu.org>
parents:
6666
diff
changeset
|
2768 ;; Each defvar makes a difference |
5b26038687ed
(edebug-emacs-19-specific): Renamed from edebug-fsf19-specific.
Richard M. Stallman <rms@gnu.org>
parents:
6666
diff
changeset
|
2769 ;; in versions where the variable is *not* built-in. |
5b26038687ed
(edebug-emacs-19-specific): Renamed from edebug-fsf19-specific.
Richard M. Stallman <rms@gnu.org>
parents:
6666
diff
changeset
|
2770 |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2771 ;; Emacs 18 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2772 (defvar edebug-outside-unread-command-char) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2773 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2774 ;; Lucid Emacs |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2775 (defvar edebug-outside-unread-command-event) ;; like unread-command-events |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2776 (defvar unread-command-event nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2777 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2778 ;; Emacs 19. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2779 (defvar edebug-outside-last-command-event) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2780 (defvar edebug-outside-unread-command-events) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2781 (defvar edebug-outside-last-input-event) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2782 (defvar edebug-outside-last-event-frame) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2783 (defvar edebug-outside-last-nonmenu-event) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2784 (defvar edebug-outside-track-mouse) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2785 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2786 ;; Disable byte compiler warnings about unread-command-char and -event |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2787 ;; (maybe works with byte-compile-version 2.22 at least) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2788 (defvar edebug-unread-command-char-warning) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2789 (defvar edebug-unread-command-event-warning) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2790 (eval-when-compile |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2791 (setq edebug-unread-command-char-warning |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2792 (get 'unread-command-char 'byte-obsolete-variable)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2793 (put 'unread-command-char 'byte-obsolete-variable nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2794 (setq edebug-unread-command-event-warning |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2795 (get 'unread-command-event 'byte-obsolete-variable)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2796 (put 'unread-command-event 'byte-obsolete-variable nil)) |
661 | 2797 |
2798 (defun edebug-recursive-edit () | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2799 ;; Start up a recursive edit inside of edebug. |
661 | 2800 ;; The current buffer is the edebug-buffer, which is put into edebug-mode. |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2801 ;; Assume that none of the variables below are buffer-local. |
661 | 2802 (let ((edebug-buffer-read-only buffer-read-only) |
2803 ;; match-data must be done in the outside buffer | |
2804 (edebug-outside-match-data | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2805 (save-excursion ; might be unnecessary now?? |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2806 (set-buffer edebug-outside-buffer) ; in case match buffer different |
661 | 2807 (match-data))) |
2808 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2809 ;;(edebug-number-of-recursions (1+ edebug-number-of-recursions)) |
661 | 2810 (edebug-recursion-depth (recursion-depth)) |
2811 edebug-entered ; bind locally to nil | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2812 (edebug-interactive-p nil) ; again non-interactive |
661 | 2813 edebug-backtrace-buffer ; each recursive edit gets its own |
2814 ;; The window configuration may be saved and restored | |
2815 ;; during a recursive-edit | |
2816 edebug-inside-windows | |
2817 | |
2818 (edebug-outside-map (current-local-map)) | |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2819 |
661 | 2820 (edebug-outside-standard-output standard-output) |
2821 (edebug-outside-standard-input standard-input) | |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2822 (edebug-outside-defining-kbd-macro defining-kbd-macro) |
661 | 2823 |
2824 (edebug-outside-last-command-char last-command-char) | |
2825 (edebug-outside-last-command last-command) | |
2826 (edebug-outside-this-command this-command) | |
2827 (edebug-outside-last-input-char last-input-char) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2828 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2829 (edebug-outside-unread-command-char unread-command-char) |
25812
edf16534a337
(edebug-outside-current-prefix-arg):
Phillip Rulon <pjr@gnu.org>
parents:
25056
diff
changeset
|
2830 (edebug-outside-current-prefix-arg current-prefix-arg) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2831 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2832 (edebug-outside-last-input-event last-input-event) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2833 (edebug-outside-last-command-event last-command-event) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2834 (edebug-outside-unread-command-event unread-command-event) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2835 (edebug-outside-unread-command-events unread-command-events) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2836 (edebug-outside-last-event-frame last-event-frame) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2837 (edebug-outside-last-nonmenu-event last-nonmenu-event) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2838 (edebug-outside-track-mouse track-mouse) |
661 | 2839 ) |
2840 | |
2841 (unwind-protect | |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2842 (let ( |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2843 ;; Declare global values local but using the same global value. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2844 ;; We could set these to the values for previous edebug call. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2845 (last-command-char last-command-char) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2846 (last-command last-command) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2847 (this-command this-command) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2848 (last-input-char last-input-char) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2849 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2850 ;; Assume no edebug command sets unread-command-char. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2851 (unread-command-char -1) |
25812
edf16534a337
(edebug-outside-current-prefix-arg):
Phillip Rulon <pjr@gnu.org>
parents:
25056
diff
changeset
|
2852 (current-prefix-arg nil) |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2853 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2854 ;; More for Emacs 19 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2855 (last-input-event nil) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2856 (last-command-event nil) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2857 (unread-command-event nil);; lemacs |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2858 (unread-command-events nil) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2859 (last-event-frame nil) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2860 (last-nonmenu-event nil) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2861 (track-mouse nil) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2862 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2863 ;; Bind again to outside values. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2864 (debug-on-error edebug-outside-debug-on-error) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2865 (debug-on-quit edebug-outside-debug-on-quit) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2866 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2867 ;; Don't keep defining a kbd macro. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2868 (defining-kbd-macro |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2869 (if edebug-continue-kbd-macro defining-kbd-macro)) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2870 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2871 ;; others?? |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2872 ) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2873 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2874 (if (fboundp 'zmacs-deactivate-region);; for lemacs |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2875 (zmacs-deactivate-region)) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2876 (if (and (eq edebug-execution-mode 'go) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2877 (not (memq edebug-arg-mode '(after error)))) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2878 (message "Break")) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2879 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2880 (setq buffer-read-only t) |
16308
2334a3d634c0
(edebug-original-signal): Don't define it.
Richard M. Stallman <rms@gnu.org>
parents:
16299
diff
changeset
|
2881 (setq signal-hook-function nil) |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2882 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2883 (edebug-mode) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2884 (unwind-protect |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2885 (recursive-edit) ; <<<<<<<<<< Recursive edit |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2886 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2887 ;; Do the following, even if quit occurs. |
16308
2334a3d634c0
(edebug-original-signal): Don't define it.
Richard M. Stallman <rms@gnu.org>
parents:
16299
diff
changeset
|
2888 (setq signal-hook-function 'edebug-signal) |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2889 (if edebug-backtrace-buffer |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2890 (kill-buffer edebug-backtrace-buffer)) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2891 ;; Could be an option to keep eval display up. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2892 (if edebug-eval-buffer (kill-buffer edebug-eval-buffer)) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2893 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2894 ;; Remember selected-window after recursive-edit. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2895 ;; (setq edebug-inside-window (selected-window)) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2896 |
21162
6c70fa8e1a5d
(edebug-recursive-edit)
Richard M. Stallman <rms@gnu.org>
parents:
20832
diff
changeset
|
2897 (set-match-data edebug-outside-match-data) |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2898 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2899 ;; Recursive edit may have changed buffers, |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2900 ;; so set it back before exiting let. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2901 (if (buffer-name edebug-buffer) ; if it still exists |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2902 (progn |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2903 (set-buffer edebug-buffer) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2904 (if (memq edebug-execution-mode '(go Go-nonstop)) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2905 (edebug-overlay-arrow)) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2906 (setq buffer-read-only edebug-buffer-read-only) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2907 (use-local-map edebug-outside-map) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2908 ) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2909 ;; gotta have a buffer to let its buffer local variables be set |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2910 (get-buffer-create " bogus edebug buffer")) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2911 ));; inner let |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2912 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2913 ;; Reset global vars to outside values, in case they have been changed. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2914 (setq |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2915 last-command-char edebug-outside-last-command-char |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2916 last-command-event edebug-outside-last-command-event |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2917 last-command edebug-outside-last-command |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2918 this-command edebug-outside-this-command |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2919 unread-command-char edebug-outside-unread-command-char |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2920 unread-command-event edebug-outside-unread-command-event |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2921 unread-command-events edebug-outside-unread-command-events |
25812
edf16534a337
(edebug-outside-current-prefix-arg):
Phillip Rulon <pjr@gnu.org>
parents:
25056
diff
changeset
|
2922 current-prefix-arg edebug-outside-current-prefix-arg |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2923 last-input-char edebug-outside-last-input-char |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2924 last-input-event edebug-outside-last-input-event |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2925 last-event-frame edebug-outside-last-event-frame |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2926 last-nonmenu-event edebug-outside-last-nonmenu-event |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2927 track-mouse edebug-outside-track-mouse |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2928 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2929 standard-output edebug-outside-standard-output |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2930 standard-input edebug-outside-standard-input |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2931 defining-kbd-macro edebug-outside-defining-kbd-macro |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2932 )) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2933 )) |
661 | 2934 |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2935 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2936 ;;; Display related functions |
661 | 2937 |
2938 (defun edebug-adjust-window (old-start) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2939 ;; If pos is not visible, adjust current window to fit following context. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2940 ;;; (message "window: %s old-start: %s window-start: %s pos: %s" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2941 ;;; (selected-window) old-start (window-start) (point)) (sit-for 5) |
661 | 2942 (if (not (pos-visible-in-window-p)) |
2943 (progn | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2944 ;; First try old-start |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2945 (if old-start |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2946 (set-window-start (selected-window) old-start)) |
661 | 2947 (if (not (pos-visible-in-window-p)) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2948 (progn |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2949 ;; (message "resetting window start") (sit-for 2) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2950 (set-window-start |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2951 (selected-window) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2952 (save-excursion |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2953 (forward-line |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2954 (if (< (point) (window-start)) -1 ; one line before if in back |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2955 (- (/ (window-height) 2)) ; center the line moving forward |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2956 )) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2957 (beginning-of-line) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2958 (point))))))) |
661 | 2959 (window-start)) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2960 |
661 | 2961 |
2962 | |
2963 (defconst edebug-arrow-alist | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2964 '((Continue-fast . "=") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2965 (Trace-fast . "-") |
661 | 2966 (continue . ">") |
2967 (trace . "->") | |
2968 (step . "=>") | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2969 (next . "=>") |
661 | 2970 (go . "<>") |
2971 (Go-nonstop . "..") ; not used | |
2972 ) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2973 "Association list of arrows for each edebug mode.") |
661 | 2974 |
2975 (defun edebug-overlay-arrow () | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2976 ;; Set up the overlay arrow at beginning-of-line in current buffer. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2977 ;; The arrow string is derived from edebug-arrow-alist and |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2978 ;; edebug-execution-mode. |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2979 (let ((pos (save-excursion (beginning-of-line) (point)))) |
661 | 2980 (setq overlay-arrow-string |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2981 (cdr (assq edebug-execution-mode edebug-arrow-alist))) |
661 | 2982 (setq overlay-arrow-position (make-marker)) |
2983 (set-marker overlay-arrow-position pos (current-buffer)))) | |
2984 | |
2985 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2986 (defun edebug-toggle-save-all-windows () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2987 "Toggle the saving and restoring of all windows. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2988 Also, each time you toggle it on, the inside and outside window |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2989 configurations become the same as the current configuration." |
661 | 2990 (interactive) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2991 (setq edebug-save-windows (not edebug-save-windows)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2992 (if edebug-save-windows |
661 | 2993 (setq edebug-inside-windows |
2994 (setq edebug-outside-windows | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2995 (edebug-current-windows |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2996 edebug-save-windows)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2997 (message "Window saving is %s for all windows." |
661 | 2998 (if edebug-save-windows "on" "off"))) |
2999 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3000 (defmacro edebug-changing-windows (&rest body) |
26519 | 3001 `(let ((window (selected-window))) |
3002 (setq edebug-inside-windows (edebug-current-windows t)) | |
3003 (edebug-set-windows edebug-outside-windows) | |
3004 ,@body;; Code to change edebug-save-windows | |
3005 (setq edebug-outside-windows (edebug-current-windows | |
3006 edebug-save-windows)) | |
3007 ;; Problem: what about outside windows that are deleted inside? | |
3008 (edebug-set-windows edebug-inside-windows))) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3009 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3010 (defun edebug-toggle-save-selected-window () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3011 "Toggle the saving and restoring of the selected window. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3012 Also, each time you toggle it on, the inside and outside window |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3013 configurations become the same as the current configuration." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3014 (interactive) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3015 (cond |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3016 ((eq t edebug-save-windows) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3017 ;; Save all outside windows except the selected one. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3018 ;; Remove (selected-window) from outside-windows. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3019 (edebug-changing-windows |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3020 (setq edebug-save-windows (delq window (edebug-window-list))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3021 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3022 ((memq (selected-window) edebug-save-windows) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3023 (setq edebug-outside-windows |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3024 (delq (assq (selected-window) edebug-outside-windows) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3025 edebug-outside-windows)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3026 (setq edebug-save-windows |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3027 (delq (selected-window) edebug-save-windows))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3028 (t ; Save a new window. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3029 (edebug-changing-windows |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3030 (setq edebug-save-windows (cons window edebug-save-windows))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3031 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3032 (message "Window saving is %s for %s." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3033 (if (memq (selected-window) edebug-save-windows) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3034 "on" "off") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3035 (selected-window))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3036 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3037 (defun edebug-toggle-save-windows (arg) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3038 "Toggle the saving and restoring of windows. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3039 With prefix, toggle for just the selected window. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3040 Otherwise, toggle for all windows." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3041 (interactive "P") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3042 (if arg |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3043 (edebug-toggle-save-selected-window) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3044 (edebug-toggle-save-all-windows))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3045 |
661 | 3046 |
3047 (defun edebug-where () | |
3048 "Show the debug windows and where we stopped in the program." | |
3049 (interactive) | |
3050 (if (not edebug-active) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3051 (error "Edebug is not active")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3052 ;; Restore the window configuration to what it last was inside. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3053 ;; But it is not always set. - experiment |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3054 ;;(if edebug-inside-windows |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3055 ;; (edebug-set-windows edebug-inside-windows)) |
661 | 3056 (edebug-pop-to-buffer edebug-buffer) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3057 (goto-char edebug-point)) |
661 | 3058 |
3059 (defun edebug-view-outside () | |
3060 "Change to the outside window configuration." | |
3061 (interactive) | |
3062 (if (not edebug-active) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3063 (error "Edebug is not active")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3064 (setq edebug-inside-windows |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3065 (edebug-current-windows edebug-save-windows)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3066 (edebug-set-windows edebug-outside-windows) |
661 | 3067 (goto-char edebug-outside-point) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3068 (message "Window configuration outside of Edebug. Return with %s" |
661 | 3069 (substitute-command-keys "\\<global-map>\\[edebug-where]"))) |
3070 | |
3071 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3072 (defun edebug-bounce-point (arg) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3073 "Bounce the point in the outside current buffer. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3074 If prefix arg is supplied, sit for that many seconds before returning. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3075 The default is one second." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3076 (interactive "p") |
661 | 3077 (if (not edebug-active) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3078 (error "Edebug is not active")) |
661 | 3079 (save-excursion |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3080 ;; If the buffer's currently displayed, avoid set-window-configuration. |
661 | 3081 (save-window-excursion |
3082 (edebug-pop-to-buffer edebug-outside-buffer) | |
3083 (goto-char edebug-outside-point) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3084 (message "Current buffer: %s Point: %s Mark: %s" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3085 (current-buffer) (point) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3086 (if (marker-buffer (edebug-mark-marker)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3087 (marker-position (edebug-mark-marker)) "<not set>")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3088 (edebug-sit-for arg) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3089 (edebug-pop-to-buffer edebug-buffer (car edebug-window-data))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3090 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3091 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3092 ;; Joe Wells, here is a start at your idea of adding a buffer to the internal |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3093 ;; display list. Still need to use this list in edebug-display. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3094 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3095 '(defvar edebug-display-buffer-list nil |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3096 "List of buffers that edebug will display when it is active.") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3097 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3098 '(defun edebug-display-buffer (buffer) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3099 "Toggle display of a buffer inside of edebug." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3100 (interactive "bBuffer: ") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3101 (let ((already-displaying (memq buffer edebug-display-buffer-list))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3102 (setq edebug-display-buffer-list |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3103 (if already-displaying |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3104 (delq buffer edebug-display-buffer-list) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3105 (cons buffer edebug-display-buffer-list))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3106 (message "Displaying %s %s" buffer |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3107 (if already-displaying "off" "on")))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3108 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3109 ;;; Breakpoint related functions |
661 | 3110 |
3111 (defun edebug-find-stop-point () | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3112 ;; Return (function . index) of the nearest edebug stop point. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3113 (let* ((edebug-def-name (edebug-form-data-symbol)) |
661 | 3114 (edebug-data |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3115 (let ((data (get edebug-def-name 'edebug))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3116 (if (or (null data) (markerp data)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3117 (error "%s is not instrumented for Edebug" edebug-def-name)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3118 data)) ; we could do it automatically, if data is a marker. |
661 | 3119 ;; pull out parts of edebug-data. |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3120 (edebug-def-mark (car edebug-data)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3121 ;; (edebug-breakpoints (car (cdr edebug-data))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3122 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3123 (offset-vector (nth 2 edebug-data)) |
661 | 3124 (offset (- (save-excursion |
3125 (if (looking-at "[ \t]") | |
3126 ;; skip backwards until non-whitespace, or bol | |
3127 (skip-chars-backward " \t")) | |
3128 (point)) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3129 edebug-def-mark)) |
661 | 3130 len i) |
3131 ;; the offsets are in order so we can do a linear search | |
3132 (setq len (length offset-vector)) | |
3133 (setq i 0) | |
3134 (while (and (< i len) (> offset (aref offset-vector i))) | |
3135 (setq i (1+ i))) | |
3136 (if (and (< i len) | |
3137 (<= offset (aref offset-vector i))) | |
3138 ;; return the relevant info | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3139 (cons edebug-def-name i) |
661 | 3140 (message "Point is not on an expression in %s." |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3141 edebug-def-name) |
661 | 3142 ))) |
3143 | |
3144 | |
3145 (defun edebug-next-breakpoint () | |
3146 "Move point to the next breakpoint, or first if none past point." | |
3147 (interactive) | |
3148 (let ((edebug-stop-point (edebug-find-stop-point))) | |
3149 (if edebug-stop-point | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3150 (let* ((edebug-def-name (car edebug-stop-point)) |
661 | 3151 (index (cdr edebug-stop-point)) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3152 (edebug-data (get edebug-def-name 'edebug)) |
661 | 3153 |
3154 ;; pull out parts of edebug-data | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3155 (edebug-def-mark (car edebug-data)) |
661 | 3156 (edebug-breakpoints (car (cdr edebug-data))) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3157 (offset-vector (nth 2 edebug-data)) |
661 | 3158 breakpoint) |
3159 (if (not edebug-breakpoints) | |
3160 (message "No breakpoints in this function.") | |
3161 (let ((breaks edebug-breakpoints)) | |
3162 (while (and breaks | |
3163 (<= (car (car breaks)) index)) | |
3164 (setq breaks (cdr breaks))) | |
3165 (setq breakpoint | |
3166 (if breaks | |
3167 (car breaks) | |
3168 ;; goto the first breakpoint | |
3169 (car edebug-breakpoints))) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3170 (goto-char (+ edebug-def-mark |
661 | 3171 (aref offset-vector (car breakpoint)))) |
3172 | |
14846 | 3173 (message "%s" |
3174 (concat (if (nth 2 breakpoint) | |
661 | 3175 "Temporary " "") |
3176 (if (car (cdr breakpoint)) | |
3177 (format "Condition: %s" | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3178 (edebug-safe-prin1-to-string |
661 | 3179 (car (cdr breakpoint)))) |
3180 ""))) | |
3181 )))))) | |
3182 | |
3183 | |
3184 (defun edebug-modify-breakpoint (flag &optional condition temporary) | |
3185 "Modify the breakpoint for the form at point or after it according | |
3186 to FLAG: set if t, clear if nil. Then move to that point. | |
3187 If CONDITION or TEMPORARY are non-nil, add those attributes to | |
3188 the breakpoint. " | |
3189 (let ((edebug-stop-point (edebug-find-stop-point))) | |
3190 (if edebug-stop-point | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3191 (let* ((edebug-def-name (car edebug-stop-point)) |
661 | 3192 (index (cdr edebug-stop-point)) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3193 (edebug-data (get edebug-def-name 'edebug)) |
661 | 3194 |
3195 ;; pull out parts of edebug-data | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3196 (edebug-def-mark (car edebug-data)) |
661 | 3197 (edebug-breakpoints (car (cdr edebug-data))) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3198 (offset-vector (nth 2 edebug-data)) |
661 | 3199 present) |
3200 ;; delete it either way | |
3201 (setq present (assq index edebug-breakpoints)) | |
3202 (setq edebug-breakpoints (delq present edebug-breakpoints)) | |
3203 (if flag | |
3204 (progn | |
3205 ;; add it to the list and resort | |
3206 (setq edebug-breakpoints | |
3207 (edebug-sort-alist | |
3208 (cons | |
3209 (list index condition temporary) | |
3210 edebug-breakpoints) '<)) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3211 (if condition |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3212 (message "Breakpoint set in %s with condition: %s" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3213 edebug-def-name condition) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3214 (message "Breakpoint set in %s" edebug-def-name))) |
661 | 3215 (if present |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3216 (message "Breakpoint unset in %s" edebug-def-name) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3217 (message "No breakpoint here"))) |
661 | 3218 |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3219 (setcar (cdr edebug-data) edebug-breakpoints) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3220 (goto-char (+ edebug-def-mark (aref offset-vector index))) |
661 | 3221 )))) |
3222 | |
3223 (defun edebug-set-breakpoint (arg) | |
3224 "Set the breakpoint of nearest sexp. | |
3225 With prefix argument, make it a temporary breakpoint." | |
3226 (interactive "P") | |
3227 (edebug-modify-breakpoint t nil arg)) | |
3228 | |
3229 (defun edebug-unset-breakpoint () | |
3230 "Clear the breakpoint of nearest sexp." | |
3231 (interactive) | |
3232 (edebug-modify-breakpoint nil)) | |
3233 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3234 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3235 ;; For emacs 18, no read-expression-history |
661 | 3236 (defun edebug-set-conditional-breakpoint (arg condition) |
3237 "Set a conditional breakpoint at nearest sexp. | |
3238 The condition is evaluated in the outside context. | |
3239 With prefix argument, make it a temporary breakpoint." | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3240 ;; (interactive "P\nxCondition: ") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3241 (interactive |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3242 (list |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3243 current-prefix-arg |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3244 ;; Edit previous condition as follows, but it is cumbersome: |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3245 (let ((edebug-stop-point (edebug-find-stop-point))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3246 (if edebug-stop-point |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3247 (let* ((edebug-def-name (car edebug-stop-point)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3248 (index (cdr edebug-stop-point)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3249 (edebug-data (get edebug-def-name 'edebug)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3250 (edebug-breakpoints (car (cdr edebug-data))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3251 (edebug-break-data (assq index edebug-breakpoints)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3252 (edebug-break-condition (car (cdr edebug-break-data)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3253 (read-minibuffer |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3254 (format "Condition in %s: " edebug-def-name) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3255 (if edebug-break-condition |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3256 (format "%s" edebug-break-condition) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3257 (format "")))))))) |
661 | 3258 (edebug-modify-breakpoint t condition arg)) |
3259 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3260 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3261 (defun edebug-set-global-break-condition (expression) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3262 (interactive (list (read-minibuffer |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3263 "Global Condition: " |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3264 (format "%s" edebug-global-break-condition)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3265 (setq edebug-global-break-condition expression)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3266 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3267 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3268 ;;; Mode switching functions |
661 | 3269 |
3270 (defun edebug-set-mode (mode shortmsg msg) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3271 ;; Set the edebug mode to MODE. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3272 ;; Display SHORTMSG, or MSG if not within edebug. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3273 (if (eq (1+ edebug-recursion-depth) (recursion-depth)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3274 (progn |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3275 (setq edebug-execution-mode mode) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3276 (message shortmsg) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3277 ;; Continue execution |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3278 (exit-recursive-edit)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3279 ;; This is not terribly useful!! |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3280 (setq edebug-next-execution-mode mode) |
661 | 3281 (message msg))) |
3282 | |
3283 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3284 (defalias 'edebug-step-through-mode 'edebug-step-mode) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3285 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3286 (defun edebug-step-mode () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3287 "Proceed to next stop point." |
661 | 3288 (interactive) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3289 (edebug-set-mode 'step "" "Edebug will stop at next stop point.")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3290 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3291 (defun edebug-next-mode () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3292 "Proceed to next `after' stop point." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3293 (interactive) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3294 (edebug-set-mode 'next "" "Edebug will stop after next eval.")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3295 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3296 (defun edebug-go-mode (arg) |
661 | 3297 "Go, evaluating until break. |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3298 With prefix ARG, set temporary break at current point and go." |
661 | 3299 (interactive "P") |
3300 (if arg | |
3301 (edebug-set-breakpoint t)) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3302 (edebug-set-mode 'go "Go..." "Edebug will go until break.")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3303 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3304 (defun edebug-Go-nonstop-mode () |
661 | 3305 "Go, evaluating without debugging." |
3306 (interactive) | |
3307 (edebug-set-mode 'Go-nonstop "Go-Nonstop..." | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3308 "Edebug will not stop at breaks.")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3309 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3310 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3311 (defun edebug-trace-mode () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3312 "Begin trace mode." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3313 (interactive) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3314 (edebug-set-mode 'trace "Tracing..." "Edebug will trace with pause.")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3315 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3316 (defun edebug-Trace-fast-mode () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3317 "Trace with no wait at each step." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3318 (interactive) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3319 (edebug-set-mode 'Trace-fast |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3320 "Trace fast..." "Edebug will trace without pause.")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3321 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3322 (defun edebug-continue-mode () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3323 "Begin continue mode." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3324 (interactive) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3325 (edebug-set-mode 'continue "Continue..." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3326 "Edebug will pause at breakpoints.")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3327 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3328 (defun edebug-Continue-fast-mode () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3329 "Trace with no wait at each step." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3330 (interactive) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3331 (edebug-set-mode 'Continue-fast "Continue fast..." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3332 "Edebug will stop and go at breakpoints.")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3333 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3334 ;; ------------------------------------------------------------ |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3335 ;; The following use the mode changing commands and breakpoints. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3336 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3337 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3338 (defun edebug-goto-here () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3339 "Proceed to this stop point." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3340 (interactive) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3341 (edebug-go-mode t)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3342 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3343 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3344 (defun edebug-stop () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3345 "Stop execution and do not continue. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3346 Useful for exiting from trace or continue loop." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3347 (interactive) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3348 (message "Stop")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3349 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3350 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3351 '(defun edebug-forward () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3352 "Proceed to the exit of the next expression to be evaluated." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3353 (interactive) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3354 (edebug-set-mode |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3355 'forward "Forward" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3356 "Edebug will stop after exiting the next expression.")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3357 |
661 | 3358 |
3359 (defun edebug-forward-sexp (arg) | |
3360 "Proceed from the current point to the end of the ARGth sexp ahead. | |
3361 If there are not ARG sexps ahead, then do edebug-step-out." | |
3362 (interactive "p") | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3363 (condition-case nil |
661 | 3364 (let ((parse-sexp-ignore-comments t)) |
3365 ;; Call forward-sexp repeatedly until done or failure. | |
3366 (forward-sexp arg) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3367 (edebug-go-mode t)) |
661 | 3368 (error |
3369 (edebug-step-out) | |
3370 ))) | |
3371 | |
3372 (defun edebug-step-out () | |
3373 "Proceed from the current point to the end of the containing sexp. | |
3374 If there is no containing sexp that is not the top level defun, | |
3375 go to the end of the last sexp, or if that is the same point, then step." | |
3376 (interactive) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3377 (condition-case nil |
661 | 3378 (let ((parse-sexp-ignore-comments t)) |
3379 (up-list 1) | |
3380 (save-excursion | |
3381 ;; Is there still a containing expression? | |
3382 (up-list 1)) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3383 (edebug-go-mode t)) |
661 | 3384 (error |
3385 ;; At top level - 1, so first check if there are more sexps at this level. | |
3386 (let ((start-point (point))) | |
3387 ;; (up-list 1) | |
3388 (down-list -1) | |
3389 (if (= (point) start-point) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3390 (edebug-step-mode) ; No more at this level, so step. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3391 (edebug-go-mode t) |
661 | 3392 ))))) |
3393 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3394 (defun edebug-instrument-function (func) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3395 ;; Func should be a function symbol. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3396 ;; Return the function symbol, or nil if not instrumented. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3397 (let ((func-marker)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3398 (setq func-marker (get func 'edebug)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3399 (cond |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3400 ((markerp func-marker) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3401 ;; It is uninstrumented, so instrument it. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3402 (save-excursion |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3403 (set-buffer (marker-buffer func-marker)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3404 (goto-char func-marker) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3405 (edebug-eval-top-level-form) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3406 func)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3407 ((consp func-marker) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3408 (message "%s is already instrumented." func) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3409 func) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3410 (t |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3411 ;; We could try harder, e.g. do a tags search. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3412 (error "Don't know where %s is defined" func) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3413 nil)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3414 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3415 (defun edebug-instrument-callee () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3416 "Instrument the definition of the function or macro about to be called. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3417 Do this when stopped before the form or it will be too late. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3418 One side effect of using this command is that the next time the |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3419 function or macro is called, Edebug will be called there as well." |
661 | 3420 (interactive) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3421 (if (not (looking-at "\(")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3422 (error "You must be before a list form") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3423 (let ((func |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3424 (save-excursion |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3425 (down-list 1) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3426 (if (looking-at "\(") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3427 (edebug-form-data-name |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3428 (edebug-get-form-data-entry (point))) |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
3429 (edebug-original-read (current-buffer)))))) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3430 (edebug-instrument-function func)))) |
661 | 3431 |
3432 | |
3433 (defun edebug-step-in () | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3434 "Step into the definition of the function or macro about to be called. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3435 This first does `edebug-instrument-callee' to ensure that it is |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3436 instrumented. Then it does `edebug-on-entry' and switches to `go' mode." |
661 | 3437 (interactive) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3438 (let ((func (edebug-instrument-callee))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3439 (if func |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3440 (progn |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3441 (edebug-on-entry func 'temp) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3442 (edebug-go-mode nil))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3443 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3444 (defun edebug-on-entry (function &optional flag) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3445 "Cause Edebug to stop when FUNCTION is called. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3446 With prefix argument, make this temporary so it is automatically |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3447 cancelled the first time the function is entered." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3448 (interactive "aEdebug on entry to: \nP") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3449 ;; Could store this in the edebug data instead. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3450 (put function 'edebug-on-entry (if flag 'temp t))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3451 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3452 (defun cancel-edebug-on-entry (function) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3453 (interactive "aEdebug on entry to: ") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3454 (put function 'edebug-on-entry nil)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3455 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3456 |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
3457 (if (not (fboundp 'edebug-original-debug-on-entry)) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
3458 (fset 'edebug-original-debug-on-entry (symbol-function 'debug-on-entry))) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3459 '(fset 'debug-on-entry 'edebug-debug-on-entry) ;; Should we do this? |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3460 ;; Also need edebug-cancel-debug-on-entry |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3461 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3462 '(defun edebug-debug-on-entry (function) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3463 "Request FUNCTION to invoke debugger each time it is called. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3464 If the user continues, FUNCTION's execution proceeds. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3465 Works by modifying the definition of FUNCTION, |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3466 which must be written in Lisp, not predefined. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3467 Use `cancel-debug-on-entry' to cancel the effect of this command. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3468 Redefining FUNCTION also does that. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3469 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3470 This version is from Edebug. If the function is instrumented for |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3471 Edebug, it calls `edebug-on-entry'" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3472 (interactive "aDebug on entry (to function): ") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3473 (let ((func-data (get function 'edebug))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3474 (if (or (null func-data) (markerp func-data)) |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
3475 (edebug-original-debug-on-entry function) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3476 (edebug-on-entry function)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3477 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3478 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3479 (defun edebug-top-level-nonstop () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3480 "Set mode to Go-nonstop, and exit to top-level. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3481 This is useful for exiting even if unwind-protect code may be executed." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3482 (interactive) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3483 (setq edebug-execution-mode 'Go-nonstop) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3484 (top-level)) |
661 | 3485 |
3486 | |
3487 ;;(defun edebug-exit-out () | |
3488 ;; "Go until the current function exits." | |
3489 ;; (interactive) | |
3490 ;; (edebug-set-mode 'exiting "Exit...")) | |
3491 | |
3492 | |
3493 ;;; The following initial mode setting definitions are not used yet. | |
3494 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3495 '(defconst edebug-initial-mode-alist |
661 | 3496 '((edebug-Continue-fast . Continue-fast) |
3497 (edebug-Trace-fast . Trace-fast) | |
3498 (edebug-continue . continue) | |
3499 (edebug-trace . trace) | |
3500 (edebug-go . go) | |
3501 (edebug-step-through . step) | |
3502 (edebug-Go-nonstop . Go-nonstop) | |
3503 ) | |
3504 "Association list between commands and the modes they set.") | |
3505 | |
3506 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3507 '(defun edebug-set-initial-mode () |
661 | 3508 "Ask for the initial mode of the enclosing function. |
3509 The mode is requested via the key that would be used to set the mode in | |
3510 edebug-mode." | |
3511 (interactive) | |
3512 (let* ((this-function (edebug-which-function)) | |
3513 (keymap (if (eq edebug-mode-map (current-local-map)) | |
3514 edebug-mode-map)) | |
3515 (old-mode (or (get this-function 'edebug-initial-mode) | |
3516 edebug-initial-mode)) | |
3517 (key (read-key-sequence | |
3518 (format | |
3519 "Change initial edebug mode for %s from %s (%s) to (enter key): " | |
3520 this-function | |
3521 old-mode | |
3522 (where-is-internal | |
3523 (car (rassq old-mode edebug-initial-mode-alist)) | |
3524 keymap 'firstonly | |
3525 )))) | |
3526 (mode (cdr (assq (key-binding key) edebug-initial-mode-alist))) | |
3527 ) | |
3528 (if (and mode | |
3529 (or (get this-function 'edebug-initial-mode) | |
3530 (not (eq mode edebug-initial-mode)))) | |
3531 (progn | |
3532 (put this-function 'edebug-initial-mode mode) | |
3533 (message "Initial mode for %s is now: %s" | |
3534 this-function mode)) | |
5126
30682388c4cf
Delete periods from error messages.
Richard M. Stallman <rms@gnu.org>
parents:
5125
diff
changeset
|
3535 (error "Key must map to one of the mode changing commands") |
661 | 3536 ))) |
3537 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3538 ;;; Evaluation of expressions |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3539 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3540 (def-edebug-spec edebug-outside-excursion t) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3541 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3542 (defmacro edebug-outside-excursion (&rest body) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3543 "Evaluate an expression list in the outside context. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3544 Return the result of the last expression." |
26519 | 3545 `(save-excursion ; of current-buffer |
3546 (if edebug-save-windows | |
3547 (progn | |
3548 ;; After excursion, we will | |
3549 ;; restore to current window configuration. | |
3550 (setq edebug-inside-windows | |
3551 (edebug-current-windows edebug-save-windows)) | |
3552 ;; Restore outside windows. | |
3553 (edebug-set-windows edebug-outside-windows))) | |
3554 | |
3555 (set-buffer edebug-buffer) ; why? | |
3556 ;; (use-local-map edebug-outside-map) | |
3557 (set-match-data edebug-outside-match-data) | |
3558 ;; Restore outside context. | |
3559 (let (;; (edebug-inside-map (current-local-map)) ;; restore map?? | |
3560 (last-command-char edebug-outside-last-command-char) | |
3561 (last-command-event edebug-outside-last-command-event) | |
3562 (last-command edebug-outside-last-command) | |
3563 (this-command edebug-outside-this-command) | |
3564 (unread-command-char edebug-outside-unread-command-char) | |
3565 (unread-command-event edebug-outside-unread-command-event) | |
3566 (unread-command-events edebug-outside-unread-command-events) | |
3567 (current-prefix-arg edebug-outside-current-prefix-arg) | |
3568 (last-input-char edebug-outside-last-input-char) | |
3569 (last-input-event edebug-outside-last-input-event) | |
3570 (last-event-frame edebug-outside-last-event-frame) | |
3571 (last-nonmenu-event edebug-outside-last-nonmenu-event) | |
3572 (track-mouse edebug-outside-track-mouse) | |
3573 (standard-output edebug-outside-standard-output) | |
3574 (standard-input edebug-outside-standard-input) | |
3575 | |
3576 (executing-kbd-macro edebug-outside-executing-macro) | |
3577 (defining-kbd-macro edebug-outside-defining-kbd-macro) | |
3578 (pre-command-hook edebug-outside-pre-command-hook) | |
3579 (post-command-hook edebug-outside-post-command-hook) | |
3580 | |
3581 ;; See edebug-display | |
3582 (overlay-arrow-position edebug-outside-o-a-p) | |
3583 (overlay-arrow-string edebug-outside-o-a-s) | |
3584 (cursor-in-echo-area edebug-outside-c-i-e-a) | |
3585 ) | |
3586 (unwind-protect | |
3587 (save-excursion ; of edebug-buffer | |
3588 (set-buffer edebug-outside-buffer) | |
3589 (goto-char edebug-outside-point) | |
3590 (if (marker-buffer (edebug-mark-marker)) | |
3591 (set-marker (edebug-mark-marker) edebug-outside-mark)) | |
3592 ,@body) | |
3593 | |
3594 ;; Back to edebug-buffer. Restore rest of inside context. | |
3595 ;; (use-local-map edebug-inside-map) | |
3596 (if edebug-save-windows | |
3597 ;; Restore inside windows. | |
3598 (edebug-set-windows edebug-inside-windows)) | |
3599 | |
3600 ;; Save values that may have been changed. | |
3601 (setq | |
3602 edebug-outside-last-command-char last-command-char | |
3603 edebug-outside-last-command-event last-command-event | |
3604 edebug-outside-last-command last-command | |
3605 edebug-outside-this-command this-command | |
3606 edebug-outside-unread-command-char unread-command-char | |
3607 edebug-outside-unread-command-event unread-command-event | |
3608 edebug-outside-unread-command-events unread-command-events | |
3609 edebug-outside-current-prefix-arg current-prefix-arg | |
3610 edebug-outside-last-input-char last-input-char | |
3611 edebug-outside-last-input-event last-input-event | |
3612 edebug-outside-last-event-frame last-event-frame | |
3613 edebug-outside-last-nonmenu-event last-nonmenu-event | |
3614 edebug-outside-track-mouse track-mouse | |
3615 edebug-outside-standard-output standard-output | |
3616 edebug-outside-standard-input standard-input | |
3617 | |
3618 edebug-outside-executing-macro executing-kbd-macro | |
3619 edebug-outside-defining-kbd-macro defining-kbd-macro | |
3620 edebug-outside-pre-command-hook pre-command-hook | |
3621 edebug-outside-post-command-hook post-command-hook | |
3622 | |
3623 edebug-outside-o-a-p overlay-arrow-position | |
3624 edebug-outside-o-a-s overlay-arrow-string | |
3625 edebug-outside-c-i-e-a cursor-in-echo-area | |
3626 ))) ; let | |
3627 )) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3628 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3629 (defvar cl-debug-env nil) ;; defined in cl; non-nil when lexical env used. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3630 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3631 (defun edebug-eval (edebug-expr) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3632 ;; Are there cl lexical variables active? |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3633 (if cl-debug-env |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3634 (eval (cl-macroexpand-all edebug-expr cl-debug-env)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3635 (eval edebug-expr))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3636 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3637 (defun edebug-safe-eval (edebug-expr) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3638 ;; Evaluate EXPR safely. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3639 ;; If there is an error, a string is returned describing the error. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3640 (condition-case edebug-err |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3641 (edebug-eval edebug-expr) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3642 (error (edebug-format "%s: %s" ;; could |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3643 (get (car edebug-err) 'error-message) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3644 (car (cdr edebug-err)))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3645 |
14846 | 3646 ;;; Printing |
3647 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3648 ;; Replace printing functions. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3649 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3650 ;; obsolete names |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3651 (defalias 'edebug-install-custom-print-funcs 'edebug-install-custom-print) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3652 (defalias 'edebug-reset-print-funcs 'edebug-uninstall-custom-print) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3653 (defalias 'edebug-uninstall-custom-print-funcs 'edebug-uninstall-custom-print) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3654 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3655 (defun edebug-install-custom-print () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3656 "Replace print functions used by Edebug with custom versions." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3657 ;; Modifying the custom print functions, or changing print-length, |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3658 ;; print-level, print-circle, custom-print-list or custom-print-vector |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3659 ;; have immediate effect. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3660 (interactive) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3661 (require 'cust-print) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3662 (defalias 'edebug-prin1 'custom-prin1) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3663 (defalias 'edebug-print 'custom-print) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3664 (defalias 'edebug-prin1-to-string 'custom-prin1-to-string) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3665 (defalias 'edebug-format 'custom-format) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3666 (defalias 'edebug-message 'custom-message) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3667 "Installed") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3668 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3669 (eval-and-compile |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3670 (defun edebug-uninstall-custom-print () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3671 "Replace edebug custom print functions with internal versions." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3672 (interactive) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3673 (defalias 'edebug-prin1 'prin1) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3674 (defalias 'edebug-print 'print) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3675 (defalias 'edebug-prin1-to-string 'prin1-to-string) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3676 (defalias 'edebug-format 'format) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3677 (defalias 'edebug-message 'message) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3678 "Uninstalled") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3679 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3680 ;; Default print functions are the same as Emacs'. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3681 (edebug-uninstall-custom-print)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3682 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3683 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3684 (defun edebug-report-error (edebug-value) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3685 ;; Print an error message like command level does. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3686 ;; This also prints the error name if it has no error-message. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3687 (message "%s: %s" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3688 (or (get (car edebug-value) 'error-message) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3689 (format "peculiar error (%s)" (car edebug-value))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3690 (mapconcat (function (lambda (edebug-arg) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3691 ;; continuing after an error may |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3692 ;; complain about edebug-arg. why?? |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3693 (prin1-to-string edebug-arg))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3694 (cdr edebug-value) ", "))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3695 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3696 ;; Define here in case they are not already defined. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3697 (defvar print-level nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3698 (defvar print-circle nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3699 (defvar print-readably) ;; defined by lemacs |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3700 ;; Alternatively, we could change the definition of |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
3701 ;; edebug-safe-prin1-to-string to only use these if defined. |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3702 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3703 (defun edebug-safe-prin1-to-string (value) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3704 (let ((print-escape-newlines t) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3705 (print-length (or edebug-print-length print-length)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3706 (print-level (or edebug-print-level print-level)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3707 (print-circle (or edebug-print-circle print-circle)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3708 (print-readably nil)) ;; lemacs uses this. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3709 (edebug-prin1-to-string value))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3710 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3711 (defun edebug-compute-previous-result (edebug-previous-value) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3712 (setq edebug-previous-result |
21643
475d7e2df534
(edebug-compute-previous-result):
Richard M. Stallman <rms@gnu.org>
parents:
21162
diff
changeset
|
3713 (if (and (integerp edebug-previous-value) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3714 (< edebug-previous-value 256) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3715 (>= edebug-previous-value 0)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3716 (format "Result: %s = %s" edebug-previous-value |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3717 (single-key-description edebug-previous-value)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3718 (if edebug-unwrap-results |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3719 (setq edebug-previous-value |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3720 (edebug-unwrap* edebug-previous-value))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3721 (concat "Result: " |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3722 (edebug-safe-prin1-to-string edebug-previous-value))))) |
661 | 3723 |
3724 (defun edebug-previous-result () | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3725 "Print the previous result." |
661 | 3726 (interactive) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3727 (message "%s" edebug-previous-result)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3728 |
14846 | 3729 ;;; Read, Eval and Print |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3730 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3731 (defun edebug-eval-expression (edebug-expr) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3732 "Evaluate an expression in the outside environment. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3733 If interactive, prompt for the expression. |
661 | 3734 Print result in minibuffer." |
3735 (interactive "xEval: ") | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3736 (princ |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3737 (edebug-outside-excursion |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3738 (setq values (cons (edebug-eval edebug-expr) values)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3739 (edebug-safe-prin1-to-string (car values))))) |
661 | 3740 |
3741 (defun edebug-eval-last-sexp () | |
3742 "Evaluate sexp before point in the outside environment; | |
3743 print value in minibuffer." | |
3744 (interactive) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3745 (edebug-eval-expression (edebug-last-sexp))) |
661 | 3746 |
3747 (defun edebug-eval-print-last-sexp () | |
3748 "Evaluate sexp before point in the outside environment; | |
3749 print value into current buffer." | |
3750 (interactive) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3751 (let* ((edebug-form (edebug-last-sexp)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3752 (edebug-result-string |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3753 (edebug-outside-excursion |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3754 (edebug-safe-prin1-to-string (edebug-safe-eval edebug-form)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3755 (standard-output (current-buffer))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3756 (princ "\n") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3757 ;; princ the string to get rid of quotes. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3758 (princ edebug-result-string) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3759 (princ "\n") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3760 )) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3761 |
14846 | 3762 ;;; Edebug Minor Mode |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3763 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3764 ;; Global GUD bindings for all emacs-lisp-mode buffers. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3765 (define-key emacs-lisp-mode-map "\C-x\C-a\C-s" 'edebug-step-mode) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3766 (define-key emacs-lisp-mode-map "\C-x\C-a\C-n" 'edebug-next-mode) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3767 (define-key emacs-lisp-mode-map "\C-x\C-a\C-c" 'edebug-go-mode) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3768 (define-key emacs-lisp-mode-map "\C-x\C-a\C-l" 'edebug-where) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3769 |
661 | 3770 |
3771 (defvar edebug-mode-map nil) | |
3772 (if edebug-mode-map | |
3773 nil | |
3774 (progn | |
3775 (setq edebug-mode-map (copy-keymap emacs-lisp-mode-map)) | |
3776 ;; control | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3777 (define-key edebug-mode-map " " 'edebug-step-mode) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3778 (define-key edebug-mode-map "n" 'edebug-next-mode) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3779 (define-key edebug-mode-map "g" 'edebug-go-mode) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3780 (define-key edebug-mode-map "G" 'edebug-Go-nonstop-mode) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3781 (define-key edebug-mode-map "t" 'edebug-trace-mode) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3782 (define-key edebug-mode-map "T" 'edebug-Trace-fast-mode) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3783 (define-key edebug-mode-map "c" 'edebug-continue-mode) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3784 (define-key edebug-mode-map "C" 'edebug-Continue-fast-mode) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3785 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3786 ;;(define-key edebug-mode-map "f" 'edebug-forward) not implemented |
661 | 3787 (define-key edebug-mode-map "f" 'edebug-forward-sexp) |
3788 (define-key edebug-mode-map "h" 'edebug-goto-here) | |
3789 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3790 (define-key edebug-mode-map "I" 'edebug-instrument-callee) |
661 | 3791 (define-key edebug-mode-map "i" 'edebug-step-in) |
3792 (define-key edebug-mode-map "o" 'edebug-step-out) | |
3793 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3794 ;; quitting and stopping |
661 | 3795 (define-key edebug-mode-map "q" 'top-level) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3796 (define-key edebug-mode-map "Q" 'edebug-top-level-nonstop) |
661 | 3797 (define-key edebug-mode-map "a" 'abort-recursive-edit) |
3798 (define-key edebug-mode-map "S" 'edebug-stop) | |
3799 | |
3800 ;; breakpoints | |
3801 (define-key edebug-mode-map "b" 'edebug-set-breakpoint) | |
3802 (define-key edebug-mode-map "u" 'edebug-unset-breakpoint) | |
3803 (define-key edebug-mode-map "B" 'edebug-next-breakpoint) | |
3804 (define-key edebug-mode-map "x" 'edebug-set-conditional-breakpoint) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3805 (define-key edebug-mode-map "X" 'edebug-set-global-break-condition) |
661 | 3806 |
3807 ;; evaluation | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3808 (define-key edebug-mode-map "r" 'edebug-previous-result) |
661 | 3809 (define-key edebug-mode-map "e" 'edebug-eval-expression) |
3810 (define-key edebug-mode-map "\C-x\C-e" 'edebug-eval-last-sexp) | |
3811 (define-key edebug-mode-map "E" 'edebug-visit-eval-list) | |
3812 | |
3813 ;; views | |
3814 (define-key edebug-mode-map "w" 'edebug-where) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3815 (define-key edebug-mode-map "v" 'edebug-view-outside) ;; maybe obsolete?? |
661 | 3816 (define-key edebug-mode-map "p" 'edebug-bounce-point) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3817 (define-key edebug-mode-map "P" 'edebug-view-outside) ;; same as v |
661 | 3818 (define-key edebug-mode-map "W" 'edebug-toggle-save-windows) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3819 |
661 | 3820 ;; misc |
3821 (define-key edebug-mode-map "?" 'edebug-help) | |
3822 (define-key edebug-mode-map "d" 'edebug-backtrace) | |
3823 | |
3824 (define-key edebug-mode-map "-" 'negative-argument) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3825 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3826 ;; statistics |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3827 (define-key edebug-mode-map "=" 'edebug-temp-display-freq-count) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3828 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3829 ;; GUD bindings |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3830 (define-key edebug-mode-map "\C-c\C-s" 'edebug-step-mode) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3831 (define-key edebug-mode-map "\C-c\C-n" 'edebug-next-mode) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3832 (define-key edebug-mode-map "\C-c\C-c" 'edebug-go-mode) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3833 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3834 (define-key edebug-mode-map "\C-x " 'edebug-set-breakpoint) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3835 (define-key edebug-mode-map "\C-c\C-d" 'edebug-unset-breakpoint) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3836 (define-key edebug-mode-map "\C-c\C-t" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3837 (function (lambda () (edebug-set-breakpoint t)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3838 (define-key edebug-mode-map "\C-c\C-l" 'edebug-where) |
661 | 3839 )) |
3840 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3841 ;; Autoloading these global bindings doesn't make sense because |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3842 ;; they cannot be used anyway unless Edebug is already loaded and active. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3843 |
661 | 3844 (defvar global-edebug-prefix "\^XX" |
3845 "Prefix key for global edebug commands, available from any buffer.") | |
3846 | |
3847 (defvar global-edebug-map nil | |
3848 "Global map of edebug commands, available from any buffer.") | |
3849 | |
3850 (if global-edebug-map | |
3851 nil | |
3852 (setq global-edebug-map (make-sparse-keymap)) | |
3853 | |
3854 (global-unset-key global-edebug-prefix) | |
3855 (global-set-key global-edebug-prefix global-edebug-map) | |
3856 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3857 (define-key global-edebug-map " " 'edebug-step-mode) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3858 (define-key global-edebug-map "g" 'edebug-go-mode) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3859 (define-key global-edebug-map "G" 'edebug-Go-nonstop-mode) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3860 (define-key global-edebug-map "t" 'edebug-trace-mode) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3861 (define-key global-edebug-map "T" 'edebug-Trace-fast-mode) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3862 (define-key global-edebug-map "c" 'edebug-continue-mode) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3863 (define-key global-edebug-map "C" 'edebug-Continue-fast-mode) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3864 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3865 ;; breakpoints |
661 | 3866 (define-key global-edebug-map "b" 'edebug-set-breakpoint) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3867 (define-key global-edebug-map "u" 'edebug-unset-breakpoint) |
661 | 3868 (define-key global-edebug-map "x" 'edebug-set-conditional-breakpoint) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3869 (define-key global-edebug-map "X" 'edebug-set-global-break-condition) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3870 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3871 ;; views |
661 | 3872 (define-key global-edebug-map "w" 'edebug-where) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3873 (define-key global-edebug-map "W" 'edebug-toggle-save-windows) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3874 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3875 ;; quitting |
661 | 3876 (define-key global-edebug-map "q" 'top-level) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3877 (define-key global-edebug-map "Q" 'edebug-top-level-nonstop) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3878 (define-key global-edebug-map "a" 'abort-recursive-edit) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3879 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3880 ;; statistics |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3881 (define-key global-edebug-map "=" 'edebug-display-freq-count) |
661 | 3882 ) |
3883 | |
3884 (defun edebug-help () | |
3885 (interactive) | |
3886 (describe-function 'edebug-mode)) | |
3887 | |
3888 (defun edebug-mode () | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3889 "Mode for Emacs Lisp buffers while in Edebug. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3890 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3891 In addition to all Emacs Lisp commands (except those that modify the |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3892 buffer) there are local and global key bindings to several Edebug |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3893 specific commands. E.g. `edebug-step-mode' is bound to \\[edebug-step-mode] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3894 in the Edebug buffer and \\<global-map>\\[edebug-step-mode] in any buffer. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3895 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3896 Also see bindings for the eval list buffer, *edebug*. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3897 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3898 The edebug buffer commands: |
661 | 3899 \\{edebug-mode-map} |
3900 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3901 Global commands prefixed by `global-edebug-prefix': |
661 | 3902 \\{global-edebug-map} |
3903 | |
3904 Options: | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3905 edebug-setup-hook |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3906 edebug-all-defs |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3907 edebug-all-forms |
661 | 3908 edebug-save-windows |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3909 edebug-save-displayed-buffer-points |
661 | 3910 edebug-initial-mode |
3911 edebug-trace | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3912 edebug-test-coverage |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3913 edebug-continue-kbd-macro |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3914 edebug-print-length |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3915 edebug-print-level |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3916 edebug-print-circle |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3917 edebug-on-error |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3918 edebug-on-quit |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3919 edebug-on-signal |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3920 edebug-unwrap-results |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3921 edebug-global-break-condition |
661 | 3922 " |
3923 (use-local-map edebug-mode-map)) | |
3924 | |
14846 | 3925 ;;; edebug eval list mode |
3926 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3927 ;; A list of expressions and their evaluations is displayed in *edebug*. |
661 | 3928 |
3929 (defun edebug-eval-result-list () | |
3930 "Return a list of evaluations of edebug-eval-list" | |
3931 ;; Assumes in outside environment. | |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
3932 ;; Don't do any edebug things now. |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
3933 (let ((edebug-execution-mode 'Go-nonstop) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
3934 (edebug-trace nil)) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
3935 (mapcar 'edebug-safe-eval edebug-eval-list))) |
661 | 3936 |
3937 (defun edebug-eval-display-list (edebug-eval-result-list) | |
3938 ;; Assumes edebug-eval-buffer exists. | |
3939 (let ((edebug-eval-list-temp edebug-eval-list) | |
3940 (standard-output edebug-eval-buffer) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3941 (edebug-comment-line |
661 | 3942 (format ";%s\n" (make-string (- (window-width) 2) ?-)))) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3943 (set-buffer edebug-eval-buffer) |
661 | 3944 (erase-buffer) |
3945 (while edebug-eval-list-temp | |
3946 (prin1 (car edebug-eval-list-temp)) (terpri) | |
3947 (prin1 (car edebug-eval-result-list)) (terpri) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3948 (princ edebug-comment-line) |
661 | 3949 (setq edebug-eval-list-temp (cdr edebug-eval-list-temp)) |
3950 (setq edebug-eval-result-list (cdr edebug-eval-result-list))) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3951 (edebug-pop-to-buffer edebug-eval-buffer) |
661 | 3952 )) |
3953 | |
3954 (defun edebug-create-eval-buffer () | |
3955 (if (not (and edebug-eval-buffer (buffer-name edebug-eval-buffer))) | |
3956 (progn | |
3957 (set-buffer (setq edebug-eval-buffer (get-buffer-create "*edebug*"))) | |
3958 (edebug-eval-mode)))) | |
3959 | |
3960 ;; Should generalize this to be callable outside of edebug | |
3961 ;; with calls in user functions, e.g. (edebug-eval-display) | |
3962 | |
3963 (defun edebug-eval-display (edebug-eval-result-list) | |
3964 "Display expressions and evaluations in EVAL-LIST. | |
3965 It modifies the context by popping up the eval display." | |
3966 (if edebug-eval-result-list | |
3967 (progn | |
3968 (edebug-create-eval-buffer) | |
3969 (edebug-eval-display-list edebug-eval-result-list) | |
3970 ))) | |
3971 | |
3972 (defun edebug-eval-redisplay () | |
3973 "Redisplay eval list in outside environment. | |
3974 May only be called from within edebug-recursive-edit." | |
3975 (edebug-create-eval-buffer) | |
3976 (edebug-outside-excursion | |
3977 (edebug-eval-display-list (edebug-eval-result-list)) | |
3978 )) | |
3979 | |
3980 (defun edebug-visit-eval-list () | |
3981 (interactive) | |
3982 (edebug-eval-redisplay) | |
3983 (edebug-pop-to-buffer edebug-eval-buffer)) | |
3984 | |
3985 | |
3986 (defun edebug-update-eval-list () | |
3987 "Replace the evaluation list with the sexps now in the eval buffer." | |
3988 (interactive) | |
3989 (let ((starting-point (point)) | |
3990 new-list) | |
3991 (goto-char (point-min)) | |
3992 ;; get the first expression | |
3993 (edebug-skip-whitespace) | |
3994 (if (not (eobp)) | |
3995 (progn | |
3996 (forward-sexp 1) | |
3997 (setq new-list (cons (edebug-last-sexp) new-list)))) | |
3998 | |
3999 (while (re-search-forward "^;" nil t) | |
4000 (forward-line 1) | |
4001 (skip-chars-forward " \t\n\r") | |
4002 (if (and (/= ?\; (following-char)) | |
4003 (not (eobp))) | |
4004 (progn | |
4005 (forward-sexp 1) | |
4006 (setq new-list (cons (edebug-last-sexp) new-list))))) | |
4007 | |
4008 (setq edebug-eval-list (nreverse new-list)) | |
4009 (edebug-eval-redisplay) | |
4010 (goto-char starting-point))) | |
4011 | |
4012 | |
4013 (defun edebug-delete-eval-item () | |
4014 "Delete the item under point and redisplay." | |
4015 ;; could add arg to do repeatedly | |
4016 (interactive) | |
4017 (if (re-search-backward "^;" nil 'nofail) | |
4018 (forward-line 1)) | |
4019 (delete-region | |
4020 (point) (progn (re-search-forward "^;" nil 'nofail) | |
4021 (beginning-of-line) | |
4022 (point))) | |
4023 (edebug-update-eval-list)) | |
4024 | |
4025 | |
4026 | |
4027 (defvar edebug-eval-mode-map nil | |
20078
0fc1437e7427
(edebug-eval-mode): Nicer mode-name value.
Karl Heuer <kwzh@gnu.org>
parents:
19930
diff
changeset
|
4028 "Keymap for Edebug Eval mode. Superset of Lisp Interaction mode.") |
661 | 4029 |
4030 (if edebug-eval-mode-map | |
4031 nil | |
4032 (setq edebug-eval-mode-map (copy-keymap lisp-interaction-mode-map)) | |
4033 | |
4034 (define-key edebug-eval-mode-map "\C-c\C-w" 'edebug-where) | |
4035 (define-key edebug-eval-mode-map "\C-c\C-d" 'edebug-delete-eval-item) | |
4036 (define-key edebug-eval-mode-map "\C-c\C-u" 'edebug-update-eval-list) | |
4037 (define-key edebug-eval-mode-map "\C-x\C-e" 'edebug-eval-last-sexp) | |
4038 (define-key edebug-eval-mode-map "\C-j" 'edebug-eval-print-last-sexp) | |
4039 ) | |
4040 | |
17650
dbcf0b5d5265
(edebug-eval-mode): Add a mode-class property.
Richard M. Stallman <rms@gnu.org>
parents:
17458
diff
changeset
|
4041 (put 'edebug-eval-mode 'mode-class 'special) |
661 | 4042 |
4043 (defun edebug-eval-mode () | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4044 "Mode for evaluation list buffer while in Edebug. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4045 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4046 In addition to all Interactive Emacs Lisp commands there are local and |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4047 global key bindings to several Edebug specific commands. E.g. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4048 `edebug-step-mode' is bound to \\[edebug-step-mode] in the Edebug |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4049 buffer and \\<global-map>\\[edebug-step-mode] in any buffer. |
661 | 4050 |
4051 Eval list buffer commands: | |
4052 \\{edebug-eval-mode-map} | |
4053 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4054 Global commands prefixed by global-edebug-prefix: |
661 | 4055 \\{global-edebug-map} |
4056 " | |
4057 (lisp-interaction-mode) | |
4058 (setq major-mode 'edebug-eval-mode) | |
20078
0fc1437e7427
(edebug-eval-mode): Nicer mode-name value.
Karl Heuer <kwzh@gnu.org>
parents:
19930
diff
changeset
|
4059 (setq mode-name "Edebug Eval") |
661 | 4060 (use-local-map edebug-eval-mode-map)) |
4061 | |
14846 | 4062 ;;; Interface with standard debugger. |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4063 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4064 ;; (setq debugger 'edebug) ; to use the edebug debugger |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4065 ;; (setq debugger 'debug) ; use the standard debugger |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4066 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4067 ;; Note that debug and its utilities must be byte-compiled to work, |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4068 ;; since they depend on the backtrace looking a certain way. But |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4069 ;; edebug is not dependent on this, yet. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4070 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4071 (defun edebug (&optional edebug-arg-mode &rest debugger-args) |
661 | 4072 "Replacement for debug. |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4073 If we are running an edebugged function, |
661 | 4074 show where we last were. Otherwise call debug normally." |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4075 ;; (message "entered: %s depth: %s edebug-recursion-depth: %s" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4076 ;; edebug-entered (recursion-depth) edebug-recursion-depth) (sit-for 1) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4077 (if (and edebug-entered ; anything active? |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4078 (eq (recursion-depth) edebug-recursion-depth)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4079 (let (;; Where were we before the error occurred? |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4080 (edebug-offset-index (car edebug-offset-indices)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4081 ;; Bind variables required by edebug-display |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4082 (edebug-value (car debugger-args)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4083 edebug-breakpoints |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4084 edebug-break-data |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4085 edebug-break-condition |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4086 edebug-global-break |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4087 (edebug-break (null edebug-arg-mode)) ;; if called explicitly |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4088 ) |
661 | 4089 (edebug-display) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4090 (if (eq edebug-arg-mode 'error) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4091 nil |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4092 edebug-value)) |
661 | 4093 |
4094 ;; Otherwise call debug normally. | |
4095 ;; Still need to remove extraneous edebug calls from stack. | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4096 (apply 'debug edebug-arg-mode debugger-args) |
661 | 4097 )) |
4098 | |
4099 | |
4100 (defun edebug-backtrace () | |
4101 "Display a non-working backtrace. Better than nothing..." | |
4102 (interactive) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4103 (if (or (not edebug-backtrace-buffer) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4104 (null (buffer-name edebug-backtrace-buffer))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4105 (setq edebug-backtrace-buffer |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4106 (generate-new-buffer "*Backtrace*")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4107 ;; else, could just display edebug-backtrace-buffer |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4108 ) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4109 (with-output-to-temp-buffer (buffer-name edebug-backtrace-buffer) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4110 (setq edebug-backtrace-buffer standard-output) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4111 (let ((print-escape-newlines t) |
661 | 4112 (print-length 50) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4113 last-ok-point) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4114 (backtrace) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4115 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4116 ;; Clean up the backtrace. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4117 ;; Not quite right for current edebug scheme. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4118 (set-buffer edebug-backtrace-buffer) |
661 | 4119 (setq truncate-lines t) |
4120 (goto-char (point-min)) | |
4121 (setq last-ok-point (point)) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4122 (if t (progn |
661 | 4123 |
4124 ;; Delete interspersed edebug internals. | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4125 (while (re-search-forward "^ \(?edebug" nil t) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4126 (beginning-of-line) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4127 (cond |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4128 ((looking-at "^ \(edebug-after") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4129 ;; Previous lines may contain code, so just delete this line |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4130 (setq last-ok-point (point)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4131 (forward-line 1) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4132 (delete-region last-ok-point (point))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4133 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4134 ((looking-at "^ edebug") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4135 (forward-line 1) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4136 (delete-region last-ok-point (point)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4137 ))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4138 ))))) |
661 | 4139 |
4140 | |
14846 | 4141 ;;; Trace display |
661 | 4142 |
4143 (defun edebug-trace-display (buf-name fmt &rest args) | |
4144 "In buffer BUF-NAME, display FMT and ARGS at the end and make it visible. | |
4145 The buffer is created if it does not exist. | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4146 You must include newlines in FMT to break lines, but one newline is appended." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4147 ;; e.g. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4148 ;; (edebug-trace-display "*trace-point*" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4149 ;; "saving: point = %s window-start = %s" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4150 ;; (point) (window-start)) |
15782
096142df0b36
(edebug-trace-display): Save and restore current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
15302
diff
changeset
|
4151 (let* ((oldbuf (current-buffer)) |
096142df0b36
(edebug-trace-display): Save and restore current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
15302
diff
changeset
|
4152 (selected-window (selected-window)) |
661 | 4153 (buffer (get-buffer-create buf-name)) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4154 buf-window) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4155 ;; (message "before pop-to-buffer") (sit-for 1) |
661 | 4156 (edebug-pop-to-buffer buffer) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4157 (setq truncate-lines t) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4158 (setq buf-window (selected-window)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4159 (goto-char (point-max)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4160 (insert (apply 'edebug-format fmt args) "\n") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4161 ;; Make it visible. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4162 (vertical-motion (- 1 (window-height))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4163 (set-window-start buf-window (point)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4164 (goto-char (point-max)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4165 ;; (set-window-point buf-window (point)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4166 ;; (edebug-sit-for 0) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4167 (bury-buffer buffer) |
15782
096142df0b36
(edebug-trace-display): Save and restore current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
15302
diff
changeset
|
4168 (select-window selected-window) |
096142df0b36
(edebug-trace-display): Save and restore current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
15302
diff
changeset
|
4169 (set-buffer oldbuf)) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4170 buf-name) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4171 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4172 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4173 (defun edebug-trace (fmt &rest args) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4174 "Convenience call to edebug-trace-display using edebug-trace-buffer" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4175 (apply 'edebug-trace-display edebug-trace-buffer fmt args)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4176 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4177 |
14846 | 4178 ;;; Frequency count and coverage |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4179 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4180 (defun edebug-display-freq-count () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4181 "Display the frequency count data for each line of the current |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4182 definition. The frequency counts are inserted as comment lines after |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4183 each line, and you can undo all insertions with one `undo' command. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4184 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4185 The counts are inserted starting under the `(' before an expression |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4186 or the `)' after an expression, or on the last char of a symbol. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4187 The counts are only displayed when they differ from previous counts on |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4188 the same line. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4189 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4190 If coverage is being tested, whenever all known results of an expression |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4191 are `eq', the char `=' will be appended after the count |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4192 for that expression. Note that this is always the case for an |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4193 expression only evaluated once. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4194 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4195 To clear the frequency count and coverage data for a definition, |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4196 reinstrument it." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4197 (interactive) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4198 (let* ((function (edebug-form-data-symbol)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4199 (counts (get function 'edebug-freq-count)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4200 (coverages (get function 'edebug-coverage)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4201 (data (get function 'edebug)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4202 (def-mark (car data)) ; mark at def start |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4203 (edebug-points (nth 2 data)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4204 (i (1- (length edebug-points))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4205 (last-index) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4206 (first-index) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4207 (start-of-line) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4208 (start-of-count-line) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4209 (last-count) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4210 ) |
661 | 4211 (save-excursion |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4212 ;; Traverse in reverse order so offsets are correct. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4213 (while (<= 0 i) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4214 ;; Start at last expression in line. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4215 (goto-char (+ def-mark (aref edebug-points i))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4216 (beginning-of-line) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4217 (setq start-of-line (- (point) def-mark) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4218 last-index i) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4219 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4220 ;; Find all indexes on same line. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4221 (while (and (<= 0 (setq i (1- i))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4222 (<= start-of-line (aref edebug-points i)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4223 ;; Insert all the indices for this line. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4224 (forward-line 1) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4225 (setq start-of-count-line (point) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4226 first-index i ; really last index for line above this one. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4227 last-count -1) ; cause first count to always appear. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4228 (insert ";#") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4229 ;; i == first-index still |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4230 (while (<= (setq i (1+ i)) last-index) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4231 (let ((count (aref counts i)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4232 (coverage (aref coverages i)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4233 (col (save-excursion |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4234 (goto-char (+ (aref edebug-points i) def-mark)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4235 (- (current-column) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4236 (if (= ?\( (following-char)) 0 1))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4237 (insert (make-string |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4238 (max 0 (- col (- (point) start-of-count-line))) ?\ ) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4239 (if (and (< 0 count) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4240 (not (memq coverage |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4241 '(unknown ok-coverage)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4242 "=" "") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4243 (if (= count last-count) "" (int-to-string count)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4244 " ") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4245 (setq last-count count))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4246 (insert "\n") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4247 (setq i first-index))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4248 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4249 (defun edebug-temp-display-freq-count () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4250 "Temporarily display the frequency count data for the current definition. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4251 It is removed when you hit any char." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4252 ;; This seems not to work with Emacs 18.59. It undoes too far. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4253 (interactive) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4254 (let ((buffer-read-only nil)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4255 (undo-boundary) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4256 (edebug-display-freq-count) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4257 (setq unread-command-char (read-char)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4258 (undo))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4259 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4260 |
14846 | 4261 ;;; Menus |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4262 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4263 (defun edebug-toggle (variable) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4264 (set variable (not (eval variable))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4265 (message "%s: %s" variable (eval variable))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4266 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4267 ;; We have to require easymenu (even for Emacs 18) just so |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4268 ;; the easy-menu-define macro call is compiled correctly. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4269 (require 'easymenu) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4270 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4271 (defconst edebug-mode-menus |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4272 '("Edebug" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4273 "----" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4274 ["Stop" edebug-stop t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4275 ["Step" edebug-step-mode t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4276 ["Next" edebug-next-mode t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4277 ["Trace" edebug-trace-mode t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4278 ["Trace Fast" edebug-Trace-fast-mode t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4279 ["Continue" edebug-continue-mode t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4280 ["Continue Fast" edebug-Continue-fast-mode t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4281 ["Go" edebug-go-mode t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4282 ["Go Nonstop" edebug-Go-nonstop-mode t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4283 "----" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4284 ["Help" edebug-help t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4285 ["Abort" abort-recursive-edit t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4286 ["Quit to Top Level" top-level t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4287 ["Quit Nonstop" edebug-top-level-nonstop t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4288 "----" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4289 ("Jumps" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4290 ["Forward Sexp" edebug-forward-sexp t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4291 ["Step In" edebug-step-in t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4292 ["Step Out" edebug-step-out t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4293 ["Goto Here" edebug-goto-here t]) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4294 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4295 ("Breaks" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4296 ["Set Breakpoint" edebug-set-breakpoint t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4297 ["Unset Breakpoint" edebug-unset-breakpoint t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4298 ["Set Conditional Breakpoint" edebug-set-conditional-breakpoint t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4299 ["Set Global Break Condition" edebug-set-global-break-condition t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4300 ["Show Next Breakpoint" edebug-next-breakpoint t]) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4301 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4302 ("Views" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4303 ["Where am I?" edebug-where t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4304 ["Bounce to Current Point" edebug-bounce-point t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4305 ["View Outside Windows" edebug-view-outside t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4306 ["Previous Result" edebug-previous-result t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4307 ["Show Backtrace" edebug-backtrace t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4308 ["Display Freq Count" edebug-display-freq-count t]) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4309 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4310 ("Eval" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4311 ["Expression" edebug-eval-expression t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4312 ["Last Sexp" edebug-eval-last-sexp t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4313 ["Visit Eval List" edebug-visit-eval-list t]) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4314 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4315 ("Options" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4316 ["Edebug All Defs" edebug-all-defs t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4317 ["Edebug All Forms" edebug-all-forms t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4318 "----" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4319 ["Toggle Tracing" (edebug-toggle 'edebug-trace) t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4320 ["Toggle Coverage Testing" (edebug-toggle 'edebug-test-coverage) t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4321 ["Toggle Window Saving" edebug-toggle-save-windows t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4322 ["Toggle Point Saving" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4323 (edebug-toggle 'edebug-save-displayed-buffer-points) t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4324 )) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4325 "Lemacs style menus for Edebug.") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4326 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4327 |
14846 | 4328 ;;; Emacs version specific code |
4329 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4330 ;;; The default for all above is Emacs 18, because it is easier to compile |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4331 ;;; Emacs 18 code in Emacs 19 than vice versa. This default will |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4332 ;;; change once most people are using Emacs 19 or derivatives. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4333 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4334 ;; Epoch specific code is in a separate file: edebug-epoch.el. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4335 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4336 ;; The byte-compiler will complain about changes in number of arguments |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4337 ;; to functions like mark and read-from-minibuffer. These warnings |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4338 ;; may be ignored because the right call should always be made. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4339 |
6671
5b26038687ed
(edebug-emacs-19-specific): Renamed from edebug-fsf19-specific.
Richard M. Stallman <rms@gnu.org>
parents:
6666
diff
changeset
|
4340 (defun edebug-emacs-19-specific () |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4341 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4342 (defalias 'edebug-window-live-p 'window-live-p) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4343 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4344 ;; Mark takes an argument in Emacs 19. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4345 (defun edebug-mark () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4346 (mark t));; Does this work for lemacs too? |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4347 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4348 (defun edebug-set-conditional-breakpoint (arg condition) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4349 "Set a conditional breakpoint at nearest sexp. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4350 The condition is evaluated in the outside context. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4351 With prefix argument, make it a temporary breakpoint." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4352 ;; (interactive "P\nxCondition: ") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4353 (interactive |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4354 (list |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4355 current-prefix-arg |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4356 ;; Read condition as follows; getting previous condition is cumbersome: |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4357 (let ((edebug-stop-point (edebug-find-stop-point))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4358 (if edebug-stop-point |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4359 (let* ((edebug-def-name (car edebug-stop-point)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4360 (index (cdr edebug-stop-point)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4361 (edebug-data (get edebug-def-name 'edebug)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4362 (edebug-breakpoints (car (cdr edebug-data))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4363 (edebug-break-data (assq index edebug-breakpoints)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4364 (edebug-break-condition (car (cdr edebug-break-data))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4365 (edebug-expression-history |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4366 ;; Prepend the current condition, if any. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4367 (if edebug-break-condition |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4368 (cons edebug-break-condition read-expression-history) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4369 read-expression-history))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4370 (prog1 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4371 (read-from-minibuffer |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4372 "Condition: " nil read-expression-map t |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4373 'edebug-expression-history) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4374 (setq read-expression-history edebug-expression-history) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4375 )))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4376 (edebug-modify-breakpoint t condition arg)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4377 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4378 (defun edebug-eval-expression (edebug-expr) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4379 "Evaluate an expression in the outside environment. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4380 If interactive, prompt for the expression. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4381 Print result in minibuffer." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4382 (interactive (list (read-from-minibuffer |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4383 "Eval: " nil read-expression-map t |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4384 'read-expression-history))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4385 (princ |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4386 (edebug-outside-excursion |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4387 (setq values (cons (edebug-eval edebug-expr) values)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4388 (edebug-safe-prin1-to-string (car values))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4389 |
14846 | 4390 (easy-menu-define edebug-menu edebug-mode-map "Edebug menus" edebug-mode-menus) |
4391 (if window-system | |
4392 (x-popup-menu nil (lookup-key edebug-mode-map [menu-bar Edebug]))) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4393 ) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4394 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4395 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4396 (defun edebug-lemacs-specific () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4397 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4398 ;; We need to bind zmacs-regions to nil around all calls to `mark' and |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4399 ;; `mark-marker' but don't bind it to nil before entering a recursive edit, |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4400 ;; that is, don't interfere with the binding the user might see while |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4401 ;; executing a command. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4402 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4403 (defvar zmacs-regions) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4404 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4405 (defun edebug-mark () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4406 (let ((zmacs-regions nil)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4407 (mark))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4408 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4409 (defun edebug-mark-marker () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4410 (let ((zmacs-regions nil));; for lemacs |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4411 (mark-marker))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4412 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4413 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4414 (defun edebug-mode-menu (event) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4415 (interactive "@event") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4416 (popup-menu edebug-mode-menus)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4417 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4418 (define-key edebug-mode-map 'button3 'edebug-mode-menu) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4419 ) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4420 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4421 (defun edebug-emacs-version-specific () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4422 (cond |
6671
5b26038687ed
(edebug-emacs-19-specific): Renamed from edebug-fsf19-specific.
Richard M. Stallman <rms@gnu.org>
parents:
6666
diff
changeset
|
4423 ((string-match "Lucid" emacs-version);; Lucid Emacs |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4424 (edebug-lemacs-specific)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4425 |
6671
5b26038687ed
(edebug-emacs-19-specific): Renamed from edebug-fsf19-specific.
Richard M. Stallman <rms@gnu.org>
parents:
6666
diff
changeset
|
4426 ((not (string-match "^18" emacs-version)) |
5b26038687ed
(edebug-emacs-19-specific): Renamed from edebug-fsf19-specific.
Richard M. Stallman <rms@gnu.org>
parents:
6666
diff
changeset
|
4427 (edebug-emacs-19-specific)))) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4428 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4429 (edebug-emacs-version-specific) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4430 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4431 |
14846 | 4432 ;;; Byte-compiler |
4433 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4434 ;; Extension for bytecomp to resolve undefined function references. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4435 ;; Requires new byte compiler. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4436 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4437 ;; Reenable byte compiler warnings about unread-command-char and -event. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4438 ;; Disabled before edebug-recursive-edit. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4439 (eval-when-compile |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4440 (if edebug-unread-command-char-warning |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4441 (put 'unread-command-char 'byte-obsolete-variable |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4442 edebug-unread-command-char-warning)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4443 (if edebug-unread-command-event-warning |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4444 (put 'unread-command-event 'byte-obsolete-variable |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4445 edebug-unread-command-event-warning))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4446 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4447 (eval-when-compile |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4448 ;; The body of eval-when-compile seems to get evaluated with eval-defun. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4449 ;; We only want to evaluate when actually byte compiling. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4450 ;; But it is OK to evaluate as long as byte-compiler has been loaded. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4451 (if (featurep 'byte-compile) (progn |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4452 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4453 (defun byte-compile-resolve-functions (funcs) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4454 "Say it is OK for the named functions to be unresolved." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4455 (mapcar |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4456 (function |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4457 (lambda (func) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4458 (setq byte-compile-unresolved-functions |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4459 (delq (assq func byte-compile-unresolved-functions) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4460 byte-compile-unresolved-functions)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4461 funcs) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4462 nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4463 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4464 '(defun byte-compile-resolve-free-references (vars) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4465 "Say it is OK for the named variables to be referenced." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4466 (mapcar |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4467 (function |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4468 (lambda (var) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4469 (setq byte-compile-free-references |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4470 (delq var byte-compile-free-references)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4471 vars) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4472 nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4473 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4474 '(defun byte-compile-resolve-free-assignments (vars) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4475 "Say it is OK for the named variables to be assigned." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4476 (mapcar |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4477 (function |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4478 (lambda (var) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4479 (setq byte-compile-free-assignments |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4480 (delq var byte-compile-free-assignments)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4481 vars) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4482 nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4483 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4484 (byte-compile-resolve-functions |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4485 '(reporter-submit-bug-report |
14846 | 4486 edebug-gensym ;; also in cl.el |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4487 ;; Interfaces to standard functions. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4488 edebug-original-eval-defun |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4489 edebug-original-read |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4490 edebug-get-buffer-window |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4491 edebug-mark |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4492 edebug-mark-marker |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4493 edebug-input-pending-p |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4494 edebug-sit-for |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4495 edebug-prin1-to-string |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4496 edebug-format |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4497 ;; lemacs |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4498 zmacs-deactivate-region |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4499 popup-menu |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4500 ;; CL |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4501 cl-macroexpand-all |
14846 | 4502 ;; And believe it or not, the byte compiler doesn't know about: |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4503 byte-compile-resolve-functions |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4504 )) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4505 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4506 '(byte-compile-resolve-free-references |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4507 '(read-expression-history |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4508 read-expression-map)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4509 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4510 '(byte-compile-resolve-free-assignments |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4511 '(read-expression-history)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4512 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4513 ))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4514 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4515 |
14846 | 4516 ;;; Autoloading of Edebug accessories |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4517 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4518 (if (featurep 'cl) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4519 (add-hook 'edebug-setup-hook |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4520 (function (lambda () (require 'cl-specs)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4521 ;; The following causes cl-specs to be loaded if you load cl.el. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4522 (add-hook 'cl-load-hook |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4523 (function (lambda () (require 'cl-specs))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4524 |
14846 | 4525 ;;; edebug-cl-read and cl-read are available from liberte@cs.uiuc.edu |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4526 (if (featurep 'cl-read) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4527 (add-hook 'edebug-setup-hook |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4528 (function (lambda () (require 'edebug-cl-read)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4529 ;; The following causes edebug-cl-read to be loaded when you load cl-read.el. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4530 (add-hook 'cl-read-load-hooks |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4531 (function (lambda () (require 'edebug-cl-read))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4532 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4533 |
14846 | 4534 ;;; Finalize Loading |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4535 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4536 ;;; Finally, hook edebug into the rest of Emacs. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4537 ;;; There are probably some other things that could go here. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4538 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4539 ;; Install edebug read and eval functions. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4540 (edebug-install-read-eval-functions) |
661 | 4541 |
3350 | 4542 (provide 'edebug) |
4543 | |
661 | 4544 ;;; edebug.el ends here |