Mercurial > emacs
annotate lisp/emacs-lisp/edebug.el @ 21689:95c0fe8d25a7
(easy-menu-do-add-item):
Do the right thing when nil is specified as criterion for activeness.
Fix string used to report an invalid item.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Tue, 21 Apr 1998 04:54:46 +0000 |
parents | 475d7e2df534 |
children | 02b32ae7e637 |
rev | line source |
---|---|
14846 | 1 ;;; edebug.el --- a source-level debugger for Emacs Lisp |
2 | |
20832 | 3 ;; Copyright (C) 1988, 89, 90, 91, 92, 93, 94, 95, 1997 |
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 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
60 (require 'backquote) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
61 |
14846 | 62 ;; Emacs 18 doesn't have defalias. |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
63 (eval-and-compile |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
64 (or (fboundp 'defalias) (fset 'defalias 'fset))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
65 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
66 |
14846 | 67 ;;; Bug reporting |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
68 |
20832 | 69 (defconst edebug-maintainer-address "bug-gnu-emacs@gnu.org") |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
70 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
71 (defun edebug-submit-bug-report () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
72 "Submit, via mail, a bug report on edebug." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
73 (interactive) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
74 (require 'reporter) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
75 (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
|
76 (reporter-submit-bug-report |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
77 edebug-maintainer-address |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
78 (concat "edebug.el " edebug-version) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
79 (list 'edebug-setup-hook |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
80 'edebug-all-defs |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
81 'edebug-all-forms |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
82 'edebug-eval-macro-args |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
83 'edebug-save-windows |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
84 'edebug-save-displayed-buffer-points |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
85 'edebug-initial-mode |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
86 'edebug-trace |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
87 'edebug-test-coverage |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
88 'edebug-continue-kbd-macro |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
89 'edebug-print-length |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
90 'edebug-print-level |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
91 'edebug-print-circle |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
92 )))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
93 |
14846 | 94 ;;; Options |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
95 |
17414
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
96 (defgroup edebug nil |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
97 "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
|
98 :group 'lisp) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
99 |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
100 |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
101 (defcustom edebug-setup-hook nil |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
102 "*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
|
103 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
|
104 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
|
105 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
|
106 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
|
107 :type 'hook |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
108 :group 'edebug) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
109 |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
110 (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
|
111 "*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
|
112 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
|
113 `eval-current-buffer'. `eval-region' is also called by |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
114 `eval-last-sexp', and `eval-print-last-sexp'. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
115 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
116 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
|
117 variable. You may wish to make it local to each buffer with |
14846 | 118 \(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
|
119 `emacs-lisp-mode-hook'." |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
120 :type 'boolean |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
121 :group 'edebug) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
122 |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
123 (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
|
124 "*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
|
125 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
|
126 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
|
127 :type 'boolean |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
128 :group 'edebug) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
129 |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
130 (defcustom edebug-eval-macro-args nil |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
131 "*Non-nil means all macro call arguments may be evaluated. |
14846 | 132 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
|
133 macro call arguments as if they will be evaluated. |
14846 | 134 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
|
135 So to specify exceptions for macros that have some arguments evaluated |
20832 | 136 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
|
137 :type 'boolean |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
138 :group 'edebug) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
139 |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
140 (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
|
141 "*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
|
142 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
|
143 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
|
144 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
145 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
|
146 restored. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
147 |
17414
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
148 `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
|
149 :type '(choice boolean (repeat string)) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
150 :group 'edebug) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
151 |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
152 (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
|
153 "*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
|
154 |
f1d73d12436e
checked in with -k by liberte at 1994/04/09 20:57:56
Daniel LaLiberte <liberte@gnu.org>
parents:
6732
diff
changeset
|
155 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
|
156 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
|
157 in a non-selected window. If Edebug or the user then selects the |
661 | 158 window, the buffer's point will be changed to the window's point. |
159 | |
6761
f1d73d12436e
checked in with -k by liberte at 1994/04/09 20:57:56
Daniel LaLiberte <liberte@gnu.org>
parents:
6732
diff
changeset
|
160 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
|
161 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
|
162 it." |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
163 :type 'boolean |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
164 :group 'edebug) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
165 |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
166 (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
|
167 "*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
|
168 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
|
169 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
|
170 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
|
171 :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
|
172 (const Go-nonstop) (const trace) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
173 (const Trace-fast) (const continue) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
174 (const continue-fast)) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
175 :group 'edebug) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
176 |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
177 (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
|
178 "*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
|
179 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
|
180 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
|
181 |
f1d73d12436e
checked in with -k by liberte at 1994/04/09 20:57:56
Daniel LaLiberte <liberte@gnu.org>
parents:
6732
diff
changeset
|
182 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
|
183 and `edebug-print-trace-after'." |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
184 :type 'boolean |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
185 :group 'edebug) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
186 |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
187 (defcustom edebug-test-coverage nil |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
188 "*If non-nil, Edebug tests coverage of all expressions debugged. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
189 This is done by comparing the result of each expression |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
190 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
|
191 results are found. |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
192 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
193 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
|
194 coverage information for a definition." |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
195 :type 'boolean |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
196 :group 'edebug) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
197 |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
198 (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
|
199 "*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
|
200 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
|
201 :type 'boolean |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
202 :group 'edebug) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
203 |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
204 |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
205 (defcustom edebug-print-length 50 |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
206 "*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
|
207 :type 'integer |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
208 :group 'edebug) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
209 (defcustom edebug-print-level 50 |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
210 "*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
|
211 :type 'integer |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
212 :group 'edebug) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
213 (defcustom edebug-print-circle t |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
214 "*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
|
215 :type 'boolean |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
216 :group 'edebug) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
217 |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
218 (defcustom edebug-unwrap-results nil |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
219 "*Non-nil if Edebug should unwrap results of expressions. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
220 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
|
221 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
|
222 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
|
223 :type 'boolean |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
224 :group 'edebug) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
225 |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
226 (defcustom edebug-on-error t |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
227 "*Value bound to `debug-on-error' while Edebug is active. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
228 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
229 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
|
230 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
231 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
|
232 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
|
233 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
|
234 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
|
235 After execution is resumed, the error is signaled again." |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
236 :type '(choice boolean (repeat string)) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
237 :group 'edebug) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
238 |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
239 (defcustom edebug-on-quit t |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
240 "*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
|
241 :type 'boolean |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
242 :group 'edebug) |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
243 |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
244 (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
|
245 "*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
|
246 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
|
247 :type 'sexp |
f967f12c8ec8
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16744
diff
changeset
|
248 :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
|
249 |
18376
9ae76ef113f6
(edebug-sit-for-seconds): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18017
diff
changeset
|
250 (defcustom edebug-sit-for-seconds 1 |
9ae76ef113f6
(edebug-sit-for-seconds): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18017
diff
changeset
|
251 "*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
|
252 :type 'number |
9ae76ef113f6
(edebug-sit-for-seconds): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18017
diff
changeset
|
253 :group 'edebug) |
9ae76ef113f6
(edebug-sit-for-seconds): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18017
diff
changeset
|
254 |
14846 | 255 ;;; Form spec utilities. |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
256 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
257 ;;;###autoload |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
258 (defmacro def-edebug-spec (symbol spec) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
259 "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
|
260 Both SYMBOL and SPEC are unevaluated. The SPEC can be 0, t, a symbol |
14846 | 261 \(naming a function), or a list." |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
262 (` (put (quote (, symbol)) 'edebug-form-spec (quote (, spec))))) |
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 (defmacro def-edebug-form-spec (symbol spec-form) |
14846 | 265 "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
|
266 (message "Obsolete: use def-edebug-spec instead.") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
267 (def-edebug-spec symbol (eval spec-form))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
268 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
269 (defun get-edebug-spec (symbol) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
270 ;; Get the spec of symbol resolving all indirection. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
271 (let ((edebug-form-spec (get symbol 'edebug-form-spec)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
272 indirect) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
273 (while (and (symbolp edebug-form-spec) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
274 (setq indirect (get edebug-form-spec 'edebug-form-spec))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
275 ;; (edebug-trace "indirection: %s" edebug-form-spec) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
276 (setq edebug-form-spec indirect)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
277 edebug-form-spec |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
278 )) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
279 |
14846 | 280 ;;; Utilities |
281 | |
282 ;; Define edebug-gensym - from old cl.el | |
283 (defvar edebug-gensym-index 0 | |
284 "Integer used by `edebug-gensym' to produce new names.") | |
285 | |
286 (defun edebug-gensym (&optional prefix) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
287 "Generate a fresh uninterned symbol. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
288 There is an optional argument, PREFIX. PREFIX is the |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
289 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
|
290 except when debugging needs suggest otherwise." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
291 (if (null prefix) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
292 (setq prefix "G")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
293 (let ((newsymbol nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
294 (newname "")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
295 (while (not newsymbol) |
14846 | 296 (setq newname (concat prefix (int-to-string edebug-gensym-index))) |
297 (setq edebug-gensym-index (+ edebug-gensym-index 1)) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
298 (if (not (intern-soft newname)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
299 (setq newsymbol (make-symbol newname)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
300 newsymbol)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
301 |
6761
f1d73d12436e
checked in with -k by liberte at 1994/04/09 20:57:56
Daniel LaLiberte <liberte@gnu.org>
parents:
6732
diff
changeset
|
302 ;; Only used by CL-like code. |
14846 | 303 (defun edebug-keywordp (object) |
304 "Return t if OBJECT is a keyword. | |
305 A keyword is a symbol that starts with `:'." | |
306 (and (symbolp object) | |
307 (= ?: (aref (symbol-name object) 0)))) | |
308 | |
309 (defun edebug-lambda-list-keywordp (object) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
310 "Return t if OBJECT is a lambda list keyword. |
14846 | 311 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
|
312 (and (symbolp object) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
313 (= ?& (aref (symbol-name object) 0)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
314 |
661 | 315 |
316 (defun edebug-last-sexp () | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
317 ;; Return the last sexp before point in current buffer. |
14846 | 318 ;; Assumes Emacs Lisp syntax is active. |
661 | 319 (car |
320 (read-from-string | |
321 (buffer-substring | |
322 (save-excursion | |
323 (forward-sexp -1) | |
324 (point)) | |
325 (point))))) | |
326 | |
327 (defun edebug-window-list () | |
14846 | 328 "Return a list of windows, in order of `next-window'." |
329 ;; This doesn't work for epoch. | |
661 | 330 (let* ((first-window (selected-window)) |
331 (window-list (list first-window)) | |
332 (next (next-window first-window))) | |
333 (while (not (eq next first-window)) | |
334 (setq window-list (cons next window-list)) | |
335 (setq next (next-window next))) | |
336 (nreverse window-list))) | |
337 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
338 (defun edebug-window-live-p (window) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
339 "Return non-nil if WINDOW is visible." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
340 (let* ((first-window (selected-window)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
341 (next (next-window first-window t))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
342 (while (not (or (eq next window) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
343 (eq next first-window))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
344 (setq next (next-window next t))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
345 (eq next window))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
346 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
347 ;; Not used. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
348 '(defun edebug-two-window-p () |
661 | 349 "Return t if there are two windows." |
350 (and (not (one-window-p)) | |
351 (eq (selected-window) | |
352 (next-window (next-window (selected-window)))))) | |
353 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
354 (defsubst edebug-lookup-function (object) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
355 (while (and (symbolp object) (fboundp object)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
356 (setq object (symbol-function object))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
357 object) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
358 |
661 | 359 (defun edebug-macrop (object) |
360 "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
|
361 (setq object (edebug-lookup-function object)) |
661 | 362 (if (and (listp object) |
363 (eq 'macro (car object)) | |
364 (edebug-functionp (cdr object))) | |
365 object)) | |
366 | |
367 (defun edebug-functionp (object) | |
368 "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
|
369 (setq object (edebug-lookup-function object)) |
661 | 370 (if (or (subrp object) |
14846 | 371 (byte-code-function-p object) |
661 | 372 (and (listp object) |
373 (eq (car object) 'lambda) | |
374 (listp (car (cdr object))))) | |
375 object)) | |
376 | |
377 (defun edebug-sort-alist (alist function) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
378 ;; Return the ALIST sorted with comparison function FUNCTION. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
379 ;; This uses 'sort so the sorting is destructive. |
661 | 380 (sort alist (function |
381 (lambda (e1 e2) | |
382 (funcall function (car e1) (car e2)))))) | |
383 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
384 ;;(def-edebug-spec edebug-save-restriction t) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
385 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
386 ;; 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
|
387 '(defmacro edebug-save-restriction (&rest body) |
661 | 388 "Evaluate BODY while saving the current buffers restriction. |
389 BODY may change buffer outside of current restriction, unlike | |
390 save-restriction. BODY may change the current buffer, | |
391 and the restriction will be restored to the original buffer, | |
392 and the current buffer remains current. | |
393 Return the result of the last expression in BODY." | |
394 (` (let ((edebug:s-r-beg (point-min-marker)) | |
395 (edebug:s-r-end (point-max-marker))) | |
396 (unwind-protect | |
397 (progn (,@ body)) | |
398 (save-excursion | |
399 (set-buffer (marker-buffer edebug:s-r-beg)) | |
400 (narrow-to-region edebug:s-r-beg edebug:s-r-end)))))) | |
401 | |
14846 | 402 ;;; Display |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
403 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
404 (defconst edebug-trace-buffer "*edebug-trace*" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
405 "Name of the buffer to put trace info in.") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
406 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
407 (defun edebug-pop-to-buffer (buffer &optional window) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
408 ;; 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
|
409 ;; Select WINDOW if it provided and it still exists. Otherwise, |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
410 ;; if buffer is currently shown in several windows, choose one. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
411 ;; Otherwise, find a new window, possibly splitting one. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
412 (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
|
413 (eq (window-buffer window) buffer)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
414 window |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
415 (if (eq (window-buffer (selected-window)) buffer) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
416 (selected-window) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
417 (edebug-get-buffer-window buffer)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
418 (if window |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
419 (select-window window) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
420 (if (one-window-p) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
421 (split-window)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
422 ;; (message "next window: %s" (next-window)) (sit-for 1) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
423 (if (eq (get-buffer-window edebug-trace-buffer) (next-window)) |
14846 | 424 ;; Don't select trace window |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
425 nil |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
426 (select-window (next-window)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
427 (set-window-buffer (selected-window) buffer) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
428 (set-window-hscroll (selected-window) 0);; should this be?? |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
429 ;; 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
|
430 ;;(set-buffer buffer) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
431 ) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
432 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
433 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
434 (defun edebug-get-displayed-buffer-points () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
435 ;; 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
|
436 (save-excursion |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
437 (let* ((first-window (selected-window)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
438 (next (next-window first-window)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
439 (buffer-point-list nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
440 buffer) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
441 (while (not (eq next first-window)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
442 (set-buffer (setq buffer (window-buffer next))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
443 (setq buffer-point-list |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
444 (cons (cons buffer (point)) buffer-point-list)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
445 (setq next (next-window next))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
446 buffer-point-list))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
447 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
448 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
449 (defun edebug-set-buffer-points (buffer-points) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
450 ;; 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
|
451 (let ((current-buffer (current-buffer))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
452 (mapcar (function (lambda (buf-point) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
453 (if (buffer-name (car buf-point)) ; still exists |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
454 (progn |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
455 (set-buffer (car buf-point)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
456 (goto-char (cdr buf-point)))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
457 buffer-points) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
458 (set-buffer current-buffer))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
459 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
460 (defun edebug-current-windows (which-windows) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
461 ;; Get either a full window configuration or some window information. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
462 (if (listp which-windows) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
463 (mapcar (function (lambda (window) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
464 (if (edebug-window-live-p window) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
465 (list window |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
466 (window-buffer window) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
467 (window-point window) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
468 (window-start window) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
469 (window-hscroll window))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
470 which-windows) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
471 (current-window-configuration))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
472 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
473 (defun edebug-set-windows (window-info) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
474 ;; Set either a full window configuration or some window information. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
475 (if (listp window-info) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
476 (mapcar (function |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
477 (lambda (one-window-info) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
478 (if one-window-info |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
479 (apply (function |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
480 (lambda (window buffer point start hscroll) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
481 (if (edebug-window-live-p window) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
482 (progn |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
483 (set-window-buffer window buffer) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
484 (set-window-point window point) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
485 (set-window-start window start) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
486 (set-window-hscroll window hscroll))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
487 one-window-info)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
488 window-info) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
489 (set-window-configuration window-info))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
490 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
491 (defalias 'edebug-get-buffer-window 'get-buffer-window) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
492 (defalias 'edebug-sit-for 'sit-for) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
493 (defalias 'edebug-input-pending-p 'input-pending-p) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
494 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
495 |
14846 | 496 ;;; Redefine read and eval functions |
497 ;; read is redefined to maybe instrument forms. | |
498 ;; eval-defun is redefined to check edebug-all-forms and edebug-all-defs. | |
499 | |
500 ;; Use the Lisp version of eval-region. | |
501 (require 'eval-reg "eval-reg") | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
502 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
503 ;; Save the original read function |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
504 (or (fboundp 'edebug-original-read) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
505 (defalias 'edebug-original-read (symbol-function 'read))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
506 |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
507 (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
|
508 "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
|
509 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
|
510 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
|
511 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
|
512 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
|
513 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
|
514 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
|
515 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
|
516 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
|
517 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
518 This version, from Edebug, maybe instruments the expression. But the |
14846 | 519 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
|
520 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
|
521 `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
|
522 (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
|
523 (if (eq stream (current-buffer)) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
524 (edebug-read-and-maybe-wrap-form) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
525 (edebug-original-read stream))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
526 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
527 (or (fboundp 'edebug-original-eval-defun) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
528 (defalias 'edebug-original-eval-defun (symbol-function 'eval-defun))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
529 |
14846 | 530 ;; We should somehow arrange to be able to do this |
531 ;; without actually replacing the eval-defun command. | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
532 (defun edebug-eval-defun (edebug-it) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
533 "Evaluate the top-level form containing point, or after point. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
534 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
535 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
|
536 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
|
537 non-nil, then the code is instrumented *unless* there is a prefix |
14846 | 538 argument. If instrumenting, it prints: `Edebug: FUNCTIONNAME'. |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
539 Otherwise, it prints in the minibuffer." |
661 | 540 (interactive "P") |
14846 | 541 (let* ((edebugging (not (eq (not edebug-it) (not edebug-all-defs)))) |
542 (edebug-result) | |
543 (form | |
544 (let ((edebug-all-forms edebugging) | |
545 (edebug-all-defs (eq edebug-all-defs (not edebug-it)))) | |
546 (edebug-read-top-level-form)))) | |
547 (if (and (eq (car form) 'defvar) | |
548 (cdr-safe (cdr-safe form))) | |
549 (setq form (cons 'defconst (cdr form)))) | |
550 (setq edebug-result (eval form)) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
551 (if (not edebugging) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
552 (princ edebug-result) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
553 edebug-result))) |
661 | 554 |
555 | |
727 | 556 ;;;###autoload |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
557 (defalias 'edebug-defun 'edebug-eval-top-level-form) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
558 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
559 ;;;###autoload |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
560 (defun edebug-eval-top-level-form () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
561 "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
|
562 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
|
563 Print its name in the minibuffer and leave point where it is, |
14846 | 564 or if an error occurs, leave point after it with mark at the original point." |
661 | 565 (interactive) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
566 (eval |
14846 | 567 ;; 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
|
568 ;; 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
|
569 (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
|
570 (edebug-all-defs t)) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
571 (edebug-read-top-level-form)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
572 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
573 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
574 (defun edebug-read-top-level-form () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
575 (let ((starting-point (point))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
576 (end-of-defun) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
577 (beginning-of-defun) |
661 | 578 (prog1 |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
579 (edebug-read-and-maybe-wrap-form) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
580 ;; Recover point, but only if no error occurred. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
581 (goto-char starting-point)))) |
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 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
584 ;; Compatibility with old versions. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
585 (defalias 'edebug-all-defuns 'edebug-all-defs) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
586 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
587 (defun edebug-all-defs () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
588 "Toggle edebugging of all definitions." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
589 (interactive) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
590 (setq edebug-all-defs (not edebug-all-defs)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
591 (message "Edebugging all definitions is %s." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
592 (if edebug-all-defs "on" "off"))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
593 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
594 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
595 (defun edebug-all-forms () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
596 "Toggle edebugging of all forms." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
597 (interactive) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
598 (setq edebug-all-forms (not edebug-all-forms)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
599 (message "Edebugging all forms is %s." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
600 (if edebug-all-forms "on" "off"))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
601 |
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 (defun edebug-install-read-eval-functions () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
604 (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
|
605 ;; Don't install if already installed. |
14846 | 606 (if (eq (symbol-function 'read) 'edebug-read) 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
|
607 (elisp-eval-region-install) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
608 (defalias 'read 'edebug-read) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
609 (defalias 'eval-defun 'edebug-eval-defun))) |
6512
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 (defun edebug-uninstall-read-eval-functions () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
612 (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
|
613 (elisp-eval-region-uninstall) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
614 (defalias 'read (symbol-function 'edebug-original-read)) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
615 (defalias 'eval-defun (symbol-function 'edebug-original-eval-defun))) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
616 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
617 |
14846 | 618 ;;; Edebug internal data |
619 | |
620 ;; The internal data that is needed for edebugging is kept in the | |
621 ;; buffer-local variable `edebug-form-data'. | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
622 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
623 (make-variable-buffer-local 'edebug-form-data) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
624 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
625 (defconst edebug-form-data nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
626 ;; A list of entries associating symbols with buffer regions. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
627 ;; 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
|
628 ;; @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
|
629 ;; 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
|
630 ;; 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
|
631 ;; property list. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
632 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
633 ;; 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
|
634 ;; 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
|
635 ;; list of a symbol. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
636 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
637 (defun edebug-make-form-data-entry (symbol begin end) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
638 (list symbol begin end)) |
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 (defsubst edebug-form-data-name (entry) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
641 (car entry)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
642 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
643 (defsubst edebug-form-data-begin (entry) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
644 (nth 1 entry)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
645 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
646 (defsubst edebug-form-data-end (entry) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
647 (nth 2 entry)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
648 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
649 (defsubst edebug-set-form-data-entry (entry name begin end) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
650 (setcar entry name);; in case name is changed |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
651 (set-marker (nth 1 entry) begin) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
652 (set-marker (nth 2 entry) end)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
653 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
654 (defun edebug-get-form-data-entry (pnt &optional end-point) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
655 ;; 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
|
656 ;; If END-POINT is supplied, match must be exact. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
657 ;; Return `nil' if none found. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
658 (let ((rest edebug-form-data) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
659 closest-entry |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
660 (closest-dist 999999)) ;; need maxint here |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
661 (while (and rest (< 0 closest-dist)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
662 (let* ((entry (car rest)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
663 (begin (edebug-form-data-begin entry)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
664 (dist (- pnt begin))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
665 (setq rest (cdr rest)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
666 (if (and (<= 0 dist) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
667 (< dist closest-dist) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
668 (or (not end-point) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
669 (= end-point (edebug-form-data-end entry))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
670 (<= pnt (edebug-form-data-end entry))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
671 (setq closest-dist dist |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
672 closest-entry entry)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
673 closest-entry)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
674 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
675 ;; Also need to find all contained entries, |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
676 ;; 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
|
677 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
678 (defun edebug-form-data-symbol () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
679 ;; 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
|
680 ;; If point is not inside a edebuggable form, cause error. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
681 (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
|
682 (error "Not inside instrumented form"))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
683 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
684 (defun edebug-make-top-form-data-entry (new-entry) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
685 ;; 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
|
686 (edebug-clear-form-data-entry new-entry) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
687 (setq edebug-form-data (cons new-entry edebug-form-data))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
688 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
689 (defun edebug-clear-form-data-entry (entry) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
690 ;; If non-nil, clear ENTRY out of the form data. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
691 ;; 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
|
692 (if entry |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
693 (progn |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
694 ;; Instead of this, we could just find all contained forms. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
695 ;; (put (car entry) 'edebug nil) ; |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
696 ;; (mapcar 'edebug-clear-form-data-entry ; dangerous |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
697 ;; (get (car entry) 'edebug-dependents)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
698 ;; (set-marker (nth 1 entry) nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
699 ;; (set-marker (nth 2 entry) nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
700 (setq edebug-form-data (delq entry edebug-form-data))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
701 |
14846 | 702 ;;; Parser utilities |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
703 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
704 (defun edebug-syntax-error (&rest args) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
705 ;; Signal an invalid-read-syntax with ARGS. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
706 (signal 'invalid-read-syntax args)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
707 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
708 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
709 (defconst edebug-read-syntax-table |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
710 ;; Lookup table for significant characters indicating the class of the |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
711 ;; token that follows. This is not a \"real\" syntax table. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
712 (let ((table (make-vector 256 'symbol)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
713 (i 0)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
714 (while (< i ?!) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
715 (aset table i 'space) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
716 (setq i (1+ i))) |
661 | 717 (aset table ?\( 'lparen) |
718 (aset table ?\) 'rparen) | |
719 (aset table ?\' 'quote) | |
14846 | 720 (aset table ?\` 'backquote) |
721 (aset table ?\, 'comma) | |
661 | 722 (aset table ?\" 'string) |
723 (aset table ?\? 'char) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
724 (aset table ?\[ 'lbracket) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
725 (aset table ?\] 'rbracket) |
661 | 726 (aset table ?\. 'dot) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
727 (aset table ?\# 'hash) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
728 ;; We treat numbers as symbols, because of confusion with -, -1, and 1-. |
14846 | 729 ;; 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
|
730 table)) |
661 | 731 |
732 (defun edebug-next-token-class () | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
733 ;; Move to the next token and return its class. We only care about |
14846 | 734 ;; lparen, rparen, dot, quote, backquote, comma, string, char, vector, |
735 ;; or symbol. | |
661 | 736 (edebug-skip-whitespace) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
737 (aref edebug-read-syntax-table (following-char))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
738 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
739 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
740 (defun edebug-skip-whitespace () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
741 ;; 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
|
742 (skip-chars-forward " \t\r\n\f") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
743 (while (= (following-char) ?\;) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
744 ;; \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
|
745 (skip-chars-forward "^\n\r") ; skip the comment |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
746 (skip-chars-forward " \t\r\n\f"))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
747 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
748 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
749 ;; Mostly obsolete reader; still used in one case. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
750 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
751 (defun edebug-read-sexp () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
752 ;; Read one sexp from the current buffer starting at point. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
753 ;; 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
|
754 ;; 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
|
755 ;; This works for reading anything legitimate, but it |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
756 ;; is gummed up by parser inconsistencies (bugs?) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
757 (let ((class (edebug-next-token-class))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
758 (cond |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
759 ;; 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
|
760 ;; 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
|
761 ((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
|
762 ((eq class 'string) (edebug-original-read (current-buffer))) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
763 ((eq class 'quote) (forward-char 1) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
764 (list 'quote (edebug-read-sexp))) |
14846 | 765 ((eq class 'backquote) |
766 (list '\` (edebug-read-sexp))) | |
767 ((eq class 'comma) | |
768 (list '\, (edebug-read-sexp))) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
769 (t ; anything else, just read it. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
770 (edebug-original-read (current-buffer)))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
771 |
14846 | 772 ;;; Offsets for reader |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
773 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
774 ;; Define a structure to represent offset positions of expressions. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
775 ;; Each offset structure looks like: (before . after) for constituents, |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
776 ;; or for structures that have elements: (before <subexpressions> . after) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
777 ;; where the <subexpressions> are the offset structures for subexpressions |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
778 ;; including the head of a list. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
779 (defconst edebug-offsets nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
780 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
781 ;; Stack of offset structures in reverse order of the nesting. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
782 ;; This is used to get back to previous levels. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
783 (defconst edebug-offsets-stack nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
784 (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
|
785 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
786 ;; 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
|
787 ;; 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
|
788 ;; must also be condensed. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
789 (defconst edebug-read-dotted-list nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
790 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
791 (defsubst edebug-initialize-offsets () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
792 ;; Reinitialize offset recording. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
793 (setq edebug-current-offset nil)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
794 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
795 (defun edebug-store-before-offset (point) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
796 ;; 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
|
797 (let ((new-offset (list point))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
798 (if edebug-current-offset |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
799 (setcdr edebug-current-offset |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
800 (cons new-offset (cdr edebug-current-offset))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
801 ;; Otherwise, we are at the top level, so initialize. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
802 (setq edebug-offsets new-offset |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
803 edebug-offsets-stack nil |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
804 edebug-read-dotted-list nil)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
805 ;; Cons the new offset to the front of the stack. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
806 (setq edebug-offsets-stack (cons new-offset edebug-offsets-stack) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
807 edebug-current-offset new-offset) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
808 )) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
809 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
810 (defun edebug-store-after-offset (point) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
811 ;; Finalize the current offset struct by reversing it and |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
812 ;; store POINT as the after offset. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
813 (if (not edebug-read-dotted-list) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
814 ;; Just reverse the offsets of all subexpressions. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
815 (setcdr edebug-current-offset (nreverse (cdr edebug-current-offset))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
816 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
817 ;; 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
|
818 (setq edebug-read-dotted-list nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
819 ;; Drop the corresponding offset pair. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
820 ;; 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
|
821 ;; with the cdr of last offset. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
822 (setcdr edebug-current-offset |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
823 (nconc (nreverse (cdr (cdr edebug-current-offset))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
824 (cdr (car (cdr edebug-current-offset)))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
825 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
826 ;; Now append the point using nconc. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
827 (setq edebug-current-offset (nconc edebug-current-offset point)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
828 ;; Pop the stack. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
829 (setq edebug-offsets-stack (cdr edebug-offsets-stack) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
830 edebug-current-offset (car edebug-offsets-stack))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
831 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
832 (defun edebug-ignore-offset () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
833 ;; Ignore the last created offset pair. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
834 (setcdr edebug-current-offset (cdr (cdr edebug-current-offset)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
835 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
836 (def-edebug-spec edebug-storing-offsets (form body)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
837 (put 'edebug-storing-offsets 'lisp-indent-hook 1) |
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 (defmacro edebug-storing-offsets (point &rest body) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
840 (` (unwind-protect |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
841 (progn |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
842 (edebug-store-before-offset (, point)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
843 (,@ body)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
844 (edebug-store-after-offset (point))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
845 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
846 |
14846 | 847 ;;; Reader for Emacs Lisp. |
848 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
849 ;; Uses edebug-next-token-class (and edebug-skip-whitespace) above. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
850 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
851 (defconst edebug-read-alist |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
852 '((symbol . edebug-read-symbol) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
853 (lparen . edebug-read-list) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
854 (string . edebug-read-string) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
855 (quote . edebug-read-quote) |
14846 | 856 (backquote . edebug-read-backquote) |
857 (comma . edebug-read-comma) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
858 (lbracket . edebug-read-vector) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
859 (hash . edebug-read-function) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
860 )) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
861 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
862 (defun edebug-read-storing-offsets (stream) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
863 (let ((class (edebug-next-token-class)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
864 func |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
865 edebug-read-dotted-list) ; see edebug-store-after-offset |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
866 (edebug-storing-offsets (point) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
867 (if (setq func (assq class edebug-read-alist)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
868 (funcall (cdr func) stream) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
869 ;; anything else, just read it. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
870 (edebug-original-read stream)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
871 ))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
872 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
873 (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
|
874 (edebug-original-read stream)) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
875 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
876 (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
|
877 (edebug-original-read stream)) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
878 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
879 (defun edebug-read-quote (stream) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
880 ;; Turn 'thing into (quote thing) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
881 (forward-char 1) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
882 (list |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
883 (edebug-storing-offsets (point) 'quote) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
884 (edebug-read-storing-offsets stream))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
885 |
14846 | 886 (defun edebug-read-backquote (stream) |
887 ;; Turn `thing into (\` thing) | |
888 (let ((opoint (point))) | |
889 (forward-char 1) | |
890 ;; Generate the same structure of offsets we would have | |
891 ;; if the resulting list appeared verbatim in the input text. | |
892 (edebug-storing-offsets opoint | |
893 (list | |
894 (edebug-storing-offsets opoint '\`) | |
895 (edebug-read-storing-offsets stream))))) | |
896 | |
897 (defvar edebug-read-backquote-new nil | |
898 "Non-nil if reading the inside of a new-style backquote with no parens around it. | |
899 Value of nil means reading the inside of an old-style backquote construct | |
900 which is surrounded by an extra set of parentheses. | |
901 This controls how we read comma constructs.") | |
902 | |
903 (defun edebug-read-comma (stream) | |
904 ;; Turn ,thing into (\, thing). Handle ,@ and ,. also. | |
905 (let ((opoint (point))) | |
906 (forward-char 1) | |
907 (let ((symbol '\,)) | |
908 (cond ((eq (following-char) ?\.) | |
909 (setq symbol '\,\.) | |
910 (forward-char 1)) | |
911 ((eq (following-char) ?\@) | |
912 (setq symbol '\,@) | |
913 (forward-char 1))) | |
914 ;; Generate the same structure of offsets we would have | |
915 ;; if the resulting list appeared verbatim in the input text. | |
916 (if edebug-read-backquote-new | |
917 (list | |
918 (edebug-storing-offsets opoint symbol) | |
919 (edebug-read-storing-offsets stream)) | |
920 (edebug-storing-offsets opoint symbol))))) | |
921 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
922 (defun edebug-read-function (stream) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
923 ;; Turn #'thing into (function thing) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
924 (forward-char 1) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
925 (if (/= ?\' (following-char)) (edebug-syntax-error "Bad char")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
926 (forward-char 1) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
927 (list |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
928 (edebug-storing-offsets (point) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
929 (if (featurep 'cl) 'function* 'function)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
930 (edebug-read-storing-offsets stream))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
931 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
932 (defun edebug-read-list (stream) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
933 (forward-char 1) ; skip \( |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
934 (prog1 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
935 (let ((elements)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
936 (while (not (memq (edebug-next-token-class) '(rparen dot))) |
14846 | 937 (if (eq (edebug-next-token-class) 'backquote) |
938 (let ((edebug-read-backquote-new (not (null elements))) | |
939 (opoint (point))) | |
940 (if edebug-read-backquote-new | |
941 (setq elements (cons (edebug-read-backquote stream) elements)) | |
942 (forward-char 1) ; Skip backquote. | |
943 ;; Call edebug-storing-offsets here so that we | |
944 ;; produce the same offsets we would have had | |
945 ;; if the backquote were an ordinary symbol. | |
946 (setq elements (cons (edebug-storing-offsets opoint '\`) | |
947 elements)))) | |
948 (setq elements (cons (edebug-read-storing-offsets stream) elements)))) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
949 (setq elements (nreverse elements)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
950 (if (eq 'dot (edebug-next-token-class)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
951 (let (dotted-form) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
952 (forward-char 1) ; skip \. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
953 (setq dotted-form (edebug-read-storing-offsets stream)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
954 elements (nconc elements dotted-form) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
955 (if (not (eq (edebug-next-token-class) 'rparen)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
956 (edebug-syntax-error "Expected `)'")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
957 (setq edebug-read-dotted-list (listp dotted-form)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
958 )) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
959 elements) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
960 (forward-char 1) ; skip \) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
961 )) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
962 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
963 (defun edebug-read-vector (stream) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
964 (forward-char 1) ; skip \[ |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
965 (prog1 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
966 (let ((elements)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
967 (while (not (eq 'rbracket (edebug-next-token-class))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
968 (setq elements (cons (edebug-read-storing-offsets stream) elements))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
969 (apply 'vector (nreverse elements))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
970 (forward-char 1) ; skip \] |
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 |
14846 | 973 ;;; 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
|
974 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
975 (defvar edebug-dotted-spec nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
976 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
977 (defun edebug-new-cursor (expressions offsets) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
978 ;; Return a new cursor for EXPRESSIONS with OFFSETS. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
979 (if (vectorp expressions) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
980 (setq expressions (append expressions nil))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
981 (cons expressions offsets)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
982 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
983 (defsubst edebug-set-cursor (cursor expressions offsets) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
984 ;; Set the CURSOR's EXPRESSIONS and OFFSETS to the given. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
985 ;; Return the cursor. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
986 (setcar cursor expressions) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
987 (setcdr cursor offsets) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
988 cursor) |
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-copy-cursor (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
991 ;; Copy the cursor using the same object and offsets. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
992 (cons (car cursor) (cdr cursor))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
993 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
994 (defsubst edebug-cursor-expressions (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
995 (car cursor)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
996 (defsubst edebug-cursor-offsets (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
997 (cdr cursor)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
998 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
999 (defsubst edebug-empty-cursor (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1000 ;; 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
|
1001 (null (car 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 (defsubst edebug-top-element (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1004 ;; Return the top element at the cursor. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1005 ;; Assumes not empty. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1006 (car (car cursor))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1007 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1008 (defun edebug-top-element-required (cursor &rest error) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1009 ;; Check if a dotted form is required. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1010 (if edebug-dotted-spec (edebug-no-match cursor "Dot expected.")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1011 ;; Check if there is at least one more argument. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1012 (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
|
1013 ;; Return that top element. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1014 (edebug-top-element 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-offset (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1017 ;; Return the top offset pair corresponding to the top element. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1018 (car (cdr cursor))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1019 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1020 (defun edebug-move-cursor (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1021 ;; 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
|
1022 ;; throw no-match if empty before moving. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1023 ;; This is a violation of the cursor encapsulation, but |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1024 ;; there is plenty of that going on while matching. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1025 ;; The following test should always fail. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1026 (if (edebug-empty-cursor cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1027 (edebug-no-match cursor "Not enough arguments.")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1028 (setcar cursor (cdr (car cursor))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1029 (setcdr cursor (cdr (cdr cursor))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1030 cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1031 |
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-before-offset (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1034 ;; Return the before offset of the cursor. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1035 ;; If there is nothing left in the offsets, |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1036 ;; return one less than the offset itself, |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1037 ;; which is the after offset for a list. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1038 (let ((offset (edebug-cursor-offsets cursor))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1039 (if (consp offset) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1040 (car (car offset)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1041 (1- offset)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1042 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1043 (defun edebug-after-offset (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1044 ;; Return the after offset of the cursor object. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1045 (let ((offset (edebug-top-offset cursor))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1046 (while (consp offset) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1047 (setq offset (cdr offset))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1048 offset)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1049 |
14846 | 1050 ;;; The Parser |
1051 | |
1052 ;; The top level function for parsing forms is | |
1053 ;; edebug-read-and-maybe-wrap-form; it calls all the rest. It checks the | |
1054 ;; syntax a bit and leaves point at any error it finds, but otherwise | |
1055 ;; should appear to work like eval-defun. | |
1056 | |
1057 ;; The basic plan is to surround each expression with a call to | |
1058 ;; the edebug debugger together with indexes into a table of positions of | |
1059 ;; all expressions. Thus an expression "exp" becomes: | |
1060 | |
1061 ;; (edebug-after (edebug-before 1) 2 exp) | |
1062 | |
1063 ;; When this is evaluated, first point is moved to the beginning of | |
1064 ;; exp at offset 1 of the current function. The expression is | |
1065 ;; evaluated, which may cause more edebug calls, and then point is | |
1066 ;; moved to offset 2 after the end of exp. | |
1067 | |
1068 ;; The highest level expressions of the function are wrapped in a call to | |
1069 ;; edebug-enter, which supplies the function name and the actual | |
1070 ;; arguments to the function. See functions edebug-enter, edebug-before, | |
1071 ;; and edebug-after for more details. | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1072 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1073 ;; Dynamically bound vars, left unbound, but globally declared. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1074 ;; This is to quiet the byte compiler. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1075 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1076 ;; Window data of the highest definition being wrapped. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1077 ;; This data is shared by all embedded definitions. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1078 (defvar edebug-top-window-data) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1079 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1080 (defvar edebug-&optional) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1081 (defvar edebug-&rest) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1082 (defvar edebug-gate nil) ;; whether no-match forces an error. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1083 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1084 (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
|
1085 (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
|
1086 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1087 (defconst edebug-error-point nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1088 (defconst edebug-best-error nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1089 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1090 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1091 (defun edebug-read-and-maybe-wrap-form () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1092 ;; 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
|
1093 ;; 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
|
1094 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1095 ;; Run the setup hook. |
17458
eeff371bfe78
(edebug-read-and-maybe-wrap-form): Protect
Richard M. Stallman <rms@gnu.org>
parents:
17414
diff
changeset
|
1096 ;; 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
|
1097 (let ((temp-hook edebug-setup-hook)) |
eeff371bfe78
(edebug-read-and-maybe-wrap-form): Protect
Richard M. Stallman <rms@gnu.org>
parents:
17414
diff
changeset
|
1098 (setq edebug-setup-hook nil) |
eeff371bfe78
(edebug-read-and-maybe-wrap-form): Protect
Richard M. Stallman <rms@gnu.org>
parents:
17414
diff
changeset
|
1099 (run-hooks 'temp-hook)) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1100 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1101 (let (result |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1102 edebug-top-window-data |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1103 edebug-def-name;; make sure it is locally nil |
14846 | 1104 ;; I don't like these here!! |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1105 edebug-&optional |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1106 edebug-&rest |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1107 edebug-gate |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1108 edebug-best-error |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1109 edebug-error-point |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1110 no-match |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1111 ;; Do this once here instead of several times. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1112 (max-lisp-eval-depth (+ 800 max-lisp-eval-depth)) |
14846 | 1113 (max-specpdl-size (+ 2000 max-specpdl-size))) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1114 (setq no-match |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1115 (catch 'no-match |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1116 (setq result (edebug-read-and-maybe-wrap-form1)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1117 nil)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1118 (if no-match |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1119 (apply 'edebug-syntax-error no-match)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1120 result)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1121 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1122 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1123 (defun edebug-read-and-maybe-wrap-form1 () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1124 (let (spec |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1125 def-kind |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1126 defining-form-p |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1127 def-name |
14846 | 1128 ;; 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
|
1129 ;; calls to edebug-read, they need to be here. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1130 edebug-offsets |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1131 edebug-offsets-stack |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1132 edebug-current-offset ; reset to nil |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1133 ) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1134 (save-excursion |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1135 (if (and (eq 'lparen (edebug-next-token-class)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1136 (eq 'symbol (progn (forward-char 1) (edebug-next-token-class)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1137 ;; 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
|
1138 (setq def-kind (edebug-original-read (current-buffer)) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1139 spec (and (symbolp def-kind) (get-edebug-spec def-kind)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1140 defining-form-p (and (listp spec) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1141 (eq '&define (car spec))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1142 ;; 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
|
1143 def-name (if (and defining-form-p |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1144 (eq 'name (car (cdr spec))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1145 (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
|
1146 (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
|
1147 ;;;(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
|
1148 (cond |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1149 (defining-form-p |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1150 (if (or edebug-all-defs edebug-all-forms) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1151 ;; 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
|
1152 ;; then let edebug-list-form start it. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1153 (let ((cursor (edebug-new-cursor |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1154 (list (edebug-read-storing-offsets (current-buffer))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1155 (list edebug-offsets)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1156 (car |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1157 (edebug-make-form-wrapper |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1158 cursor |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1159 (edebug-before-offset cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1160 (1- (edebug-after-offset cursor)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1161 (list (cons (symbol-name def-kind) (cdr spec)))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1162 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1163 ;; Not edebugging this form, so reset the symbol's edebug |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1164 ;; 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
|
1165 ;; This only works for defs with simple names. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1166 (put def-name 'edebug (point-marker)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1167 ;; Also nil out dependent defs. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1168 '(mapcar (function |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1169 (lambda (def) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1170 (put def-name 'edebug nil))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1171 (get def-name 'edebug-dependents)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1172 (edebug-read-sexp))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1173 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1174 ;; If all forms are being edebugged, explicitly wrap it. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1175 (edebug-all-forms |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1176 (let ((cursor (edebug-new-cursor |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1177 (list (edebug-read-storing-offsets (current-buffer))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1178 (list edebug-offsets)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1179 (edebug-make-form-wrapper |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1180 cursor |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1181 (edebug-before-offset cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1182 (edebug-after-offset cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1183 nil))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1184 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1185 ;; Not a defining form, and not edebugging. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1186 (t (edebug-read-sexp))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1187 )) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1188 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1189 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1190 (defvar edebug-def-args) ; args of defining form. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1191 (defvar edebug-def-interactive) ; is it an emacs interactive function? |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1192 (defvar edebug-inside-func) ;; whether code is inside function context. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1193 ;; 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
|
1194 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1195 (defun edebug-interactive-p-name () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1196 ;; 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
|
1197 ;; status of interactive-p for this function. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1198 (intern (format "edebug-%s-interactive-p" edebug-def-name))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1199 |
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 (defun edebug-wrap-def-body (forms) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1202 "Wrap the FORMS of a definition body." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1203 (if edebug-def-interactive |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1204 (` (let (((, (edebug-interactive-p-name)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1205 (interactive-p))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1206 (, (edebug-make-enter-wrapper forms)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1207 (edebug-make-enter-wrapper forms))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1208 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1209 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1210 (defun edebug-make-enter-wrapper (forms) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1211 ;; Generate the enter wrapper for some forms of a definition. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1212 ;; 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
|
1213 ;; 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
|
1214 ;; 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
|
1215 ;; Do this after parsing since that may find a name. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1216 (setq edebug-def-name |
14846 | 1217 (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
|
1218 (` (edebug-enter |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1219 (quote (, edebug-def-name)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1220 (, (if edebug-inside-func |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1221 (` (list (,@ |
14846 | 1222 ;; Doesn't work with more than one def-body!! |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1223 ;; But the list will just be reversed. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1224 (nreverse edebug-def-args)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1225 'nil)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1226 (function (lambda () (,@ forms))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1227 ))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1228 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1229 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1230 (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
|
1231 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1232 (defvar edebug-offset-index) ; the next available offset index. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1233 (defvar edebug-offset-list) ; the list of offset positions. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1234 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1235 (defun edebug-inc-offset (offset) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1236 ;; modifies edebug-offset-index and edebug-offset-list |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1237 ;; accesses edebug-func-marc and buffer point |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1238 (prog1 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1239 edebug-offset-index |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1240 (setq edebug-offset-list (cons (- offset edebug-form-begin-marker) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1241 edebug-offset-list) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1242 edebug-offset-index (1+ edebug-offset-index)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1243 |
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 (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
|
1246 ;; 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
|
1247 ;; given FORM. Looks like: |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1248 ;; (edebug-after (edebug-before BEFORE-INDEX) AFTER-INDEX FORM) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1249 ;; Also increment the offset index for subsequent use. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1250 (list 'edebug-after |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1251 (list 'edebug-before before-index) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1252 after-index form)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1253 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1254 (defun edebug-make-after-form (form after-index) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1255 ;; Like edebug-make-before-and-after-form, but only after. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1256 (list 'edebug-after 0 after-index form)) |
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 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1259 (defun edebug-unwrap (sexp) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1260 "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
|
1261 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
|
1262 expressions; a `progn' form will be returned enclosing these forms." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1263 (if (consp sexp) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1264 (cond |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1265 ((eq 'edebug-after (car sexp)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1266 (nth 3 sexp)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1267 ((eq 'edebug-enter (car sexp)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1268 (let ((forms (nthcdr 2 (nth 1 (nth 3 sexp))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1269 (if (> (length forms) 1) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1270 (cons 'progn forms) ;; could return (values forms) instead. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1271 (car forms)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1272 (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
|
1273 ) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1274 sexp)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1275 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1276 (defun edebug-unwrap* (sexp) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1277 "Return the sexp recursively unwrapped." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1278 (let ((new-sexp (edebug-unwrap sexp))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1279 (while (not (eq sexp new-sexp)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1280 (setq sexp new-sexp |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1281 new-sexp (edebug-unwrap sexp))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1282 (if (consp new-sexp) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1283 (mapcar 'edebug-unwrap* new-sexp) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1284 new-sexp))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1285 |
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 (defun edebug-defining-form (cursor form-begin form-end speclist) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1288 ;; Process the defining form, starting outside the form. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1289 ;; The speclist is a generated list spec that looks like: |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1290 ;; (("def-symbol" defining-form-spec-sans-&define)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1291 ;; Skip the first offset. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1292 (edebug-set-cursor cursor (edebug-cursor-expressions cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1293 (cdr (edebug-cursor-offsets cursor))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1294 (edebug-make-form-wrapper |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1295 cursor |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1296 form-begin (1- form-end) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1297 speclist)) |
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 (defun edebug-make-form-wrapper (cursor form-begin form-end |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1300 &optional speclist) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1301 ;; 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
|
1302 ;; 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
|
1303 ;; 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
|
1304 ;; 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
|
1305 (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
|
1306 ;; Set this marker before parsing. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1307 (edebug-form-begin-marker |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1308 (if form-data-entry |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1309 (edebug-form-data-begin form-data-entry) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1310 ;; Buffer must be current-buffer for this to work: |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1311 (set-marker (make-marker) form-begin)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1312 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1313 (let (edebug-offset-list |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1314 (edebug-offset-index 0) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1315 result |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1316 ;; For definitions. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1317 ;; (edebug-containing-def-name edebug-def-name) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1318 ;; Get name from form-data, if any. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1319 (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
|
1320 edebug-def-name |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1321 edebug-def-args |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1322 edebug-def-interactive |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1323 edebug-inside-func;; whether wrapped code executes inside a function. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1324 ) |
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 (setq result |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1327 (if speclist |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1328 (edebug-match cursor speclist) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1329 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1330 ;; else wrap as an enter-form. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1331 (edebug-make-enter-wrapper (list (edebug-form cursor))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1332 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1333 ;; 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
|
1334 (setq edebug-def-name |
14846 | 1335 (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
|
1336 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1337 ;; Add this def as a dependent of containing def. Buggy. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1338 '(if (and edebug-containing-def-name |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1339 (not (get edebug-containing-def-name 'edebug-dependents))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1340 (put edebug-containing-def-name 'edebug-dependents |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1341 (cons edebug-def-name |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1342 (get edebug-containing-def-name |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1343 'edebug-dependents)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1344 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1345 ;; 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
|
1346 ;; In the latter case, pointers to the entry remain eq. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1347 (if (not form-data-entry) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1348 (setq form-data-entry |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1349 (edebug-make-form-data-entry |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1350 edebug-def-name |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1351 edebug-form-begin-marker |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1352 ;; Buffer must be current-buffer. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1353 (set-marker (make-marker) form-end) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1354 )) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1355 (edebug-set-form-data-entry |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1356 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
|
1357 form-begin form-end)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1358 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1359 ;; (message "defining: %s" edebug-def-name) (sit-for 2) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1360 (edebug-make-top-form-data-entry form-data-entry) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1361 (message "Edebug: %s" edebug-def-name) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1362 ;;(debug edebug-def-name) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1363 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1364 ;; Destructively reverse edebug-offset-list and make vector from it. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1365 (setq edebug-offset-list (vconcat (nreverse edebug-offset-list))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1366 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1367 ;; Side effects on the property list of edebug-def-name. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1368 (edebug-clear-frequency-count edebug-def-name) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1369 (edebug-clear-coverage edebug-def-name) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1370 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1371 ;; Set up the initial window data. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1372 (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
|
1373 (let ((window ;; Find the best window for this buffer. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1374 (or (get-buffer-window (current-buffer)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1375 (selected-window)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1376 (setq edebug-top-window-data |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1377 (cons window (window-start window))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1378 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1379 ;; Store the edebug data in symbol's property list. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1380 (put edebug-def-name 'edebug |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1381 ;; A struct or vector would be better here!! |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1382 (list edebug-form-begin-marker |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1383 nil ; clear breakpoints |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1384 edebug-offset-list |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1385 edebug-top-window-data |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1386 )) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1387 result |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1388 ))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1389 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1390 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1391 (defun edebug-clear-frequency-count (name) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1392 ;; Create initial frequency count vector. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1393 ;; 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
|
1394 (put name 'edebug-freq-count |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1395 (make-vector (length edebug-offset-list) 0))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1396 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1397 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1398 (defun edebug-clear-coverage (name) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1399 ;; Create initial coverage vector. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1400 ;; 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
|
1401 (put name 'edebug-coverage |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1402 (make-vector (length edebug-offset-list) 'unknown))) |
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 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1405 (defun edebug-form (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1406 ;; Return the instrumented form for the following form. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1407 ;; 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
|
1408 (let* ((form (edebug-top-element-required cursor "Expected form")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1409 (offset (edebug-top-offset cursor))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1410 (prog1 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1411 (cond |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1412 ((consp form) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1413 ;; 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
|
1414 (if (eq 'quote (car form)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1415 form |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1416 (let* ((head (car form)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1417 (spec (and (symbolp head) (get-edebug-spec head))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1418 (new-cursor (edebug-new-cursor form offset))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1419 ;; 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
|
1420 ;; An indirect spec would not work here, yet. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1421 (if (and (consp spec) (eq '&define (car spec))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1422 (edebug-defining-form |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1423 new-cursor |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1424 (car offset);; before the form |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1425 (edebug-after-offset cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1426 (cons (symbol-name head) (cdr spec))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1427 ;; Wrap a regular form. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1428 (edebug-make-before-and-after-form |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1429 (edebug-inc-offset (car offset)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1430 (edebug-list-form new-cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1431 ;; After processing the list form, the new-cursor is left |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1432 ;; with the offset after the form. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1433 (edebug-inc-offset (edebug-cursor-offsets new-cursor)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1434 ))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1435 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1436 ((symbolp form) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1437 (cond |
14846 | 1438 ;; Check for constant symbols that don't get wrapped. |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1439 ((or (memq form '(t nil)) |
14846 | 1440 (and (fboundp 'edebug-keywordp) (edebug-keywordp form))) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1441 form) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1442 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1443 (t ;; just a variable |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1444 (edebug-make-after-form form (edebug-inc-offset (cdr offset)))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1445 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1446 ;; Anything else is self-evaluating. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1447 (t form)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1448 (edebug-move-cursor cursor)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1449 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1450 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1451 (defsubst edebug-forms (cursor) (edebug-match cursor '(&rest form))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1452 (defsubst edebug-sexps (cursor) (edebug-match cursor '(&rest sexp))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1453 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1454 (defsubst edebug-list-form-args (head cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1455 ;; 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
|
1456 ;; Helper for edebug-list-form |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1457 (let ((spec (get-edebug-spec head))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1458 (cond |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1459 (spec |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1460 (cond |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1461 ((consp spec) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1462 ;; It is a speclist. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1463 (let (edebug-best-error |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1464 edebug-error-point);; This may not be needed. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1465 (edebug-match-sublist cursor spec))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1466 ((eq t spec) (edebug-forms cursor)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1467 ((eq 0 spec) (edebug-sexps cursor)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1468 ((symbolp spec) (funcall spec cursor));; Not used by edebug, |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1469 ; but leave it in for compatibility. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1470 )) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1471 ;; No edebug-form-spec provided. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1472 ((edebug-macrop head) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1473 (if edebug-eval-macro-args |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1474 (edebug-forms cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1475 (edebug-sexps cursor))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1476 (t ;; Otherwise it is a function call. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1477 (edebug-forms cursor))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1478 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1479 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1480 (defun edebug-list-form (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1481 ;; Return an instrumented form built from the list form. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1482 ;; 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
|
1483 (let ((head (edebug-top-element-required cursor "Expected elements")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1484 ;; Prevent backtracking whenever instrumenting. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1485 (edebug-gate t) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1486 ;; A list form is never optional because it matches anything. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1487 (edebug-&optional nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1488 (edebug-&rest nil)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1489 ;; Skip the first offset. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1490 (edebug-set-cursor cursor (edebug-cursor-expressions cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1491 (cdr (edebug-cursor-offsets cursor))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1492 (cond |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1493 ((null head) nil) ; () is legal. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1494 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1495 ((symbolp head) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1496 (cond |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1497 ((null head) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1498 (edebug-syntax-error "nil head")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1499 ((eq head 'interactive-p) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1500 ;; Special case: replace (interactive-p) with variable |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1501 (setq edebug-def-interactive 'check-it) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1502 (edebug-move-cursor cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1503 (edebug-interactive-p-name)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1504 (t |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1505 (cons head (edebug-list-form-args |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1506 head (edebug-move-cursor cursor)))))) |
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 ((consp head) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1509 (if (and (listp head) (eq (car head) ',)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1510 (edebug-match cursor '(("," def-form) body)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1511 ;; Process anonymous function and args. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1512 ;; This assumes no anonymous macros. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1513 (edebug-match-specs cursor '(lambda-expr body) 'edebug-match-specs))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1514 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1515 (t (edebug-syntax-error |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1516 "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
|
1517 )) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1518 |
14846 | 1519 ;;; Matching of specs. |
6512
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 (defvar edebug-after-dotted-spec nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1522 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1523 (defvar edebug-matching-depth 0) ;; initial value |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1524 (defconst edebug-max-depth 150) ;; maximum number of matching recursions. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1525 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1526 |
14846 | 1527 ;;; Failure to match |
1528 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1529 ;; This throws to no-match, if there are higher alternatives. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1530 ;; 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
|
1531 ;; with the two before- and after-offset functions. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1532 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1533 (defun edebug-no-match (cursor &rest edebug-args) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1534 ;; 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
|
1535 ;; 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
|
1536 (setq edebug-error-point (or edebug-error-point |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1537 (edebug-before-offset cursor)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1538 edebug-best-error (or edebug-best-error edebug-args)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1539 (if (and edebug-gate (not edebug-&optional)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1540 (progn |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1541 (if edebug-error-point |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1542 (goto-char edebug-error-point)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1543 (apply 'edebug-syntax-error edebug-args)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1544 (funcall 'throw 'no-match edebug-args))) |
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 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1547 (defun edebug-match (cursor specs) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1548 ;; Top level spec matching function. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1549 ;; Used also at each lower level of specs. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1550 (let (edebug-&optional |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1551 edebug-&rest |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1552 edebug-best-error |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1553 edebug-error-point |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1554 (edebug-gate edebug-gate) ;; locally bound to limit effect |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1555 ) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1556 (edebug-match-specs cursor specs 'edebug-match-specs))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1557 |
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 (defun edebug-match-one-spec (cursor spec) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1560 ;; Match one spec, which is not a keyword &-spec. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1561 (cond |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1562 ((symbolp spec) (edebug-match-symbol cursor spec)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1563 ((vectorp spec) (edebug-match cursor (append spec nil))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1564 ((stringp spec) (edebug-match-string cursor spec)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1565 ((listp spec) (edebug-match-list cursor spec)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1566 )) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1567 |
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 (defun edebug-match-specs (cursor specs remainder-handler) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1570 ;; Append results of matching the list of specs. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1571 ;; 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
|
1572 (let ((edebug-matching-depth |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1573 (if (> edebug-matching-depth edebug-max-depth) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1574 (error "too deep - perhaps infinite loop in spec?") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1575 (1+ edebug-matching-depth)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1576 (cond |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1577 ((null specs) nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1578 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1579 ;; Is the spec dotted? |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1580 ((atom specs) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1581 (let ((edebug-dotted-spec t));; Containing spec list was dotted. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1582 (edebug-match-specs cursor (list specs) remainder-handler))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1583 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1584 ;; Is the form dotted? |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1585 ((not (listp (edebug-cursor-expressions cursor)));; allow nil |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1586 (if (not edebug-dotted-spec) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1587 (edebug-no-match cursor "Dotted spec required.")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1588 ;; Cancel dotted spec and dotted form. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1589 (let ((edebug-dotted-spec) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1590 (this-form (edebug-cursor-expressions cursor)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1591 (this-offset (edebug-cursor-offsets cursor))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1592 ;; Wrap the form in a list, (by changing the cursor??)... |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1593 (edebug-set-cursor cursor (list this-form) this-offset) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1594 ;; and process normally, then unwrap the result. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1595 (car (edebug-match-specs cursor 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 (t;; Process normally. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1598 (let* ((spec (car specs)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1599 (rest) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1600 (first-char (and (symbolp spec) (aref (symbol-name spec) 0)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1601 ;;(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
|
1602 (nconc |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1603 (cond |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1604 ((eq ?& first-char);; "&" symbols take all following specs. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1605 (funcall (get-edebug-spec spec) cursor (cdr specs))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1606 ((eq ?: first-char);; ":" symbols take one following spec. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1607 (setq rest (cdr (cdr specs))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1608 (funcall (get-edebug-spec spec) cursor (car (cdr specs)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1609 (t;; Any other normal spec. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1610 (setq rest (cdr specs)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1611 (edebug-match-one-spec cursor spec))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1612 (funcall remainder-handler cursor rest remainder-handler))))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1613 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1614 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1615 ;; Define specs for all the symbol specs with functions used to process them. |
14846 | 1616 ;; 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
|
1617 ;; 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
|
1618 ;; We could use an internal obarray for these primitive specs. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1619 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1620 (mapcar |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1621 (function (lambda (pair) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1622 (put (car pair) 'edebug-form-spec (cdr pair)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1623 '((&optional . edebug-match-&optional) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1624 (&rest . edebug-match-&rest) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1625 (&or . edebug-match-&or) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1626 (form . edebug-match-form) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1627 (sexp . edebug-match-sexp) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1628 (body . edebug-match-body) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1629 (&define . edebug-match-&define) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1630 (name . edebug-match-name) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1631 (:name . edebug-match-colon-name) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1632 (arg . edebug-match-arg) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1633 (def-body . edebug-match-def-body) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1634 (def-form . edebug-match-def-form) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1635 ;; Less frequently used: |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1636 ;; (function . edebug-match-function) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1637 (lambda-expr . edebug-match-lambda-expr) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1638 (¬ . edebug-match-¬) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1639 (&key . edebug-match-&key) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1640 (place . edebug-match-place) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1641 (gate . edebug-match-gate) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1642 ;; (nil . edebug-match-nil) not this one - special case it. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1643 )) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1644 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1645 (defun edebug-match-symbol (cursor symbol) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1646 ;; Match a symbol spec. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1647 (let* ((spec (get-edebug-spec symbol))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1648 (cond |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1649 (spec |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1650 (if (consp spec) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1651 ;; It is an indirect spec. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1652 (edebug-match cursor spec) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1653 ;; Otherwise it should be the symbol name of a function. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1654 ;; 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
|
1655 (funcall spec cursor))) |
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 ((null symbol) ;; special case this. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1658 (edebug-match-nil cursor)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1659 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1660 ((fboundp symbol) ; is it a predicate? |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1661 (let ((sexp (edebug-top-element-required cursor "Expected" symbol))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1662 ;; Special case for edebug-`. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1663 (if (and (listp sexp) (eq (car sexp) ',)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1664 (edebug-match cursor '(("," def-form))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1665 (if (not (funcall symbol sexp)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1666 (edebug-no-match cursor symbol "failed")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1667 (edebug-move-cursor cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1668 (list sexp)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1669 (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
|
1670 ))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1671 |
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 (defun edebug-match-sexp (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1674 (list (prog1 (edebug-top-element-required cursor "Expected sexp") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1675 (edebug-move-cursor cursor)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1676 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1677 (defun edebug-match-form (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1678 (list (edebug-form cursor))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1679 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1680 (defalias 'edebug-match-place 'edebug-match-form) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1681 ;; Currently identical to edebug-match-form. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1682 ;; This is for common lisp setf-style place arguments. |
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 (defsubst edebug-match-body (cursor) (edebug-forms cursor)) |
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-&optional (cursor specs) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1687 ;; Keep matching until one spec fails. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1688 (edebug-&optional-wrapper cursor specs 'edebug-&optional-wrapper)) |
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-&optional-wrapper (cursor specs remainder-handler) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1691 (let (result |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1692 (edebug-&optional specs) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1693 (edebug-gate nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1694 (this-form (edebug-cursor-expressions cursor)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1695 (this-offset (edebug-cursor-offsets cursor))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1696 (if (null (catch 'no-match |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1697 (setq result |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1698 (edebug-match-specs cursor specs remainder-handler)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1699 ;; Returning nil means no no-match was thrown. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1700 nil)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1701 result |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1702 ;; 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
|
1703 (edebug-set-cursor cursor this-form this-offset) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1704 nil))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1705 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1706 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1707 (defun edebug-&rest-wrapper (cursor specs remainder-handler) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1708 (if (null specs) (setq specs edebug-&rest)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1709 ;; Reuse the &optional handler with this as the remainder handler. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1710 (edebug-&optional-wrapper cursor specs remainder-handler)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1711 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1712 (defun edebug-match-&rest (cursor specs) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1713 ;; Repeatedly use specs until failure. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1714 (let ((edebug-&rest specs) ;; remember these |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1715 edebug-best-error |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1716 edebug-error-point) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1717 (edebug-&rest-wrapper cursor specs 'edebug-&rest-wrapper))) |
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-match-&or (cursor specs) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1721 ;; Keep matching until one spec succeeds, and return its results. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1722 ;; If none match, fail. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1723 ;; 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
|
1724 (let ((original-specs specs) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1725 (this-form (edebug-cursor-expressions cursor)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1726 (this-offset (edebug-cursor-offsets cursor))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1727 (catch 'matched |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1728 (while specs |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1729 (catch 'no-match |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1730 (throw 'matched |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1731 (let (edebug-gate ;; only while matching each spec |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1732 edebug-best-error |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1733 edebug-error-point) |
14846 | 1734 ;; Doesn't support e.g. &or symbolp &rest form |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1735 (edebug-match-one-spec cursor (car specs))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1736 ;; Match failed, so reset and try again. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1737 (setq specs (cdr specs)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1738 ;; Reset the cursor for the next match. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1739 (edebug-set-cursor cursor this-form this-offset)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1740 ;; All failed. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1741 (apply 'edebug-no-match cursor "Expected one of" original-specs)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1742 )) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1743 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1744 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1745 (defun edebug-match-¬ (cursor specs) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1746 ;; If any specs match, then fail |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1747 (if (null (catch 'no-match |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1748 (let ((edebug-gate nil)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1749 (save-excursion |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1750 (edebug-match-&or cursor specs))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1751 nil)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1752 ;; This means something matched, so it is a no match. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1753 (edebug-no-match cursor "Unexpected")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1754 ;; This means nothing matched, so it is OK. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1755 nil) ;; So, return nothing |
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 (def-edebug-spec &key edebug-match-&key) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1759 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1760 (defun edebug-match-&key (cursor specs) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1761 ;; Following specs must look like (<name> <spec>) ... |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1762 ;; where <name> is the name of a keyword, and spec is its spec. |
14846 | 1763 ;; 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
|
1764 (edebug-match-&rest |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1765 cursor |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1766 (cons '&or |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1767 (mapcar (function (lambda (pair) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1768 (vector (format ":%s" (car pair)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1769 (car (cdr pair))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1770 specs)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1771 |
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-gate (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1774 ;; Simply set the gate to prevent backtracking at this level. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1775 (setq edebug-gate t) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1776 nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1777 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1778 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1779 (defun edebug-match-list (cursor specs) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1780 ;; 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
|
1781 (if edebug-dotted-spec |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1782 ;; After dotted spec but form did not contain dot, |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1783 ;; so match list spec elements as if spliced in. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1784 (prog1 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1785 (let ((edebug-dotted-spec)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1786 (edebug-match-specs cursor specs 'edebug-match-specs)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1787 ;; If it matched, really clear the dotted-spec flag. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1788 (setq edebug-dotted-spec nil)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1789 (let ((spec (car specs)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1790 (form (edebug-top-element-required cursor "Expected" specs))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1791 (cond |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1792 ((eq 'quote spec) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1793 (let ((spec (car (cdr specs)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1794 (cond |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1795 ((symbolp spec) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1796 ;; Special case: spec quotes a symbol to match. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1797 ;; Change in future. Use "..." instead. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1798 (if (not (eq spec form)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1799 (edebug-no-match cursor "Expected" spec)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1800 (edebug-move-cursor cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1801 (setq edebug-gate t) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1802 form) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1803 (t |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1804 (error "Bad spec: %s" specs))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1805 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1806 ((listp form) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1807 (prog1 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1808 (list (edebug-match-sublist |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1809 ;; First offset is for the list form itself. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1810 ;; Treat nil as empty list. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1811 (edebug-new-cursor form (cdr (edebug-top-offset cursor))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1812 specs)) |
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 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1815 ((and (eq 'vector spec) (vectorp form)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1816 ;; Special case: match a vector with the specs. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1817 (let ((result (edebug-match-sublist |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1818 (edebug-new-cursor |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1819 form (cdr (edebug-top-offset cursor))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1820 (cdr specs)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1821 (edebug-move-cursor cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1822 (list (apply 'vector result)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1823 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1824 (t (edebug-no-match cursor "Expected" specs))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1825 ))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1826 |
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 (defun edebug-match-sublist (cursor specs) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1829 ;; Match a sublist of specs. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1830 (let (edebug-&optional |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1831 ;;edebug-best-error |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1832 ;;edebug-error-point |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1833 ) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1834 (prog1 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1835 ;; 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
|
1836 (edebug-match-specs cursor specs 'edebug-match-specs) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1837 (if (not (edebug-empty-cursor cursor)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1838 (if edebug-best-error |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1839 (apply 'edebug-no-match cursor edebug-best-error) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1840 ;; A failed &rest or &optional spec may leave some args. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1841 (edebug-no-match cursor "Failed matching" specs) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1842 ))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1843 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1844 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1845 (defun edebug-match-string (cursor spec) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1846 (let ((sexp (edebug-top-element-required cursor "Expected" spec))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1847 (if (not (eq (intern spec) sexp)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1848 (edebug-no-match cursor "Expected" spec) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1849 ;; Since it matched, failure means immediate error, unless &optional. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1850 (setq edebug-gate t) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1851 (edebug-move-cursor cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1852 (list sexp) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1853 ))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1854 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1855 (defun edebug-match-nil (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1856 ;; There must be nothing left to match a nil. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1857 (if (not (edebug-empty-cursor cursor)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1858 (edebug-no-match cursor "Unmatched argument(s)") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1859 nil)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1860 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1861 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1862 (defun edebug-match-function (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1863 (error "Use function-form instead of function in edebug spec")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1864 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1865 (defun edebug-match-&define (cursor specs) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1866 ;; Match a defining form. |
14846 | 1867 ;; Normally, &define is interpreted specially other places. |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1868 ;; 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
|
1869 ;; 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
|
1870 (edebug-make-form-wrapper |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1871 cursor |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1872 (edebug-before-offset cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1873 ;; Find the last offset in the list. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1874 (let ((offsets (edebug-cursor-offsets cursor))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1875 (while (consp offsets) (setq offsets (cdr offsets))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1876 offsets) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1877 specs)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1878 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1879 (defun edebug-match-lambda-expr (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1880 ;; The expression must be a function. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1881 ;; 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
|
1882 ;; that has an edebug-form-spec beginning with &define. In |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1883 ;; practice, only lambda expressions should be used. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1884 ;; I could add a &lambda specification to avoid confusion. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1885 (let* ((sexp (edebug-top-element-required |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1886 cursor "Expected lambda expression")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1887 (offset (edebug-top-offset cursor)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1888 (head (and (consp sexp) (car sexp))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1889 (spec (and (symbolp head) (get-edebug-spec head))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1890 (edebug-inside-func nil)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1891 ;; 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
|
1892 (if (and (consp spec) (eq '&define (car spec))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1893 (prog1 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1894 (list |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1895 (edebug-defining-form |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1896 (edebug-new-cursor sexp offset) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1897 (car offset);; before the sexp |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1898 (edebug-after-offset cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1899 (cons (symbol-name head) (cdr spec)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1900 (edebug-move-cursor cursor)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1901 (edebug-no-match cursor "Expected lambda expression") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1902 ))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1903 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1904 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1905 (defun edebug-match-name (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1906 ;; Set the edebug-def-name bound in edebug-defining-form. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1907 (let ((name (edebug-top-element-required cursor "Expected name"))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1908 ;; Maybe strings and numbers could be used. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1909 (if (not (symbolp name)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1910 (edebug-no-match cursor "Symbol expected for name of definition")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1911 (setq edebug-def-name |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1912 (if edebug-def-name |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1913 ;; Construct a new name by appending to previous name. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1914 (intern (format "%s@%s" edebug-def-name name)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1915 name)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1916 (edebug-move-cursor cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1917 (list name))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1918 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1919 (defun edebug-match-colon-name (cursor spec) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1920 ;; Set the edebug-def-name to the spec. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1921 (setq edebug-def-name |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1922 (if edebug-def-name |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1923 ;; Construct a new name by appending to previous name. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1924 (intern (format "%s@%s" edebug-def-name spec)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1925 spec)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1926 nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1927 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1928 (defun edebug-match-arg (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1929 ;; set the def-args bound in edebug-defining-form |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1930 (let ((edebug-arg (edebug-top-element-required cursor "Expected arg"))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1931 (if (or (not (symbolp edebug-arg)) |
14846 | 1932 (edebug-lambda-list-keywordp edebug-arg)) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1933 (edebug-no-match cursor "Bad argument:" edebug-arg)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1934 (edebug-move-cursor cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1935 (setq edebug-def-args (cons edebug-arg edebug-def-args)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1936 (list edebug-arg))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1937 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1938 (defun edebug-match-def-form (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1939 ;; 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
|
1940 ;; 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
|
1941 ;; 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
|
1942 ;; Not to be used otherwise. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1943 (let ((edebug-inside-func nil)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1944 (list (edebug-make-enter-wrapper (list (edebug-form cursor)))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1945 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1946 (defun edebug-match-def-body (cursor) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1947 ;; Like body but body is wrapped in edebug-enter form. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1948 ;; 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
|
1949 ;; Not to be used otherwise. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1950 (let ((edebug-inside-func t)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1951 (list (edebug-wrap-def-body (edebug-forms cursor))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1952 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1953 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1954 ;;;; Edebug Form Specs |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1955 ;;; ========================================================== |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1956 ;;; See cl-specs.el for common lisp specs. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1957 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1958 ;;;;* Spec for def-edebug-spec |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1959 ;;; Out of date. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1960 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1961 (defun edebug-spec-p (object) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1962 "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
|
1963 (and (symbolp object) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1964 (get object 'edebug-form-spec))) |
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 (def-edebug-spec def-edebug-spec |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1967 ;; Top level is different from lower levels. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1968 (&define :name edebug-spec name |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1969 &or "nil" edebug-spec-p "t" "0" (&rest edebug-spec))) |
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 (def-edebug-spec edebug-spec-list |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1972 ;; 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
|
1973 ((edebug-spec . [&or nil edebug-spec]))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1974 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1975 (def-edebug-spec edebug-spec |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1976 (&or |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1977 (vector &rest edebug-spec) ; matches a vector |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1978 ("vector" &rest edebug-spec) ; matches a vector spec |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1979 ("quote" symbolp) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1980 edebug-spec-list |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1981 stringp |
14846 | 1982 [edebug-lambda-list-keywordp &rest edebug-spec] |
1983 ;; [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
|
1984 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
|
1985 symbolp;; a predicate |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1986 )) |
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 |
14846 | 1989 ;;;* Emacs special forms and some functions. |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1990 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1991 ;; quote expects only one argument, although it allows any number. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1992 (def-edebug-spec quote sexp) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1993 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1994 ;; The standard defining forms. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1995 (def-edebug-spec defconst defvar) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1996 (def-edebug-spec defvar (symbolp &optional form stringp)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1997 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1998 (def-edebug-spec defun |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
1999 (&define name lambda-list |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2000 [&optional stringp] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2001 [&optional ("interactive" interactive)] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2002 def-body)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2003 (def-edebug-spec defmacro |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2004 (&define name lambda-list def-body)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2005 |
14846 | 2006 (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
|
2007 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2008 (def-edebug-spec lambda-list |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2009 (([&rest arg] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2010 [&optional ["&optional" arg &rest arg]] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2011 &optional ["&rest" arg] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2012 ))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2013 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2014 (def-edebug-spec interactive |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2015 (&optional &or stringp def-form)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2016 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2017 ;; 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
|
2018 ;; This specially recognizes anonymous functions quoted with quote. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2019 (def-edebug-spec function-form |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2020 ;; form at the end could also handle "function", |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2021 ;; but recognize it specially to avoid wrapping function forms. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2022 (&or ([&or "quote" "function"] &or symbolp lambda-expr) form)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2023 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2024 ;; function expects a symbol or a lambda or macro expression |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2025 ;; A macro is allowed by Emacs. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2026 (def-edebug-spec function (&or symbolp lambda-expr)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2027 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2028 ;; lambda is a macro in emacs 19. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2029 (def-edebug-spec lambda (&define lambda-list |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2030 [&optional stringp] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2031 [&optional ("interactive" interactive)] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2032 def-body)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2033 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2034 ;; A macro expression is a lambda expression with "macro" prepended. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2035 (def-edebug-spec macro (&define "lambda" lambda-list def-body)) |
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 ;; (def-edebug-spec anonymous-form ((&or ["lambda" lambda] ["macro" macro]))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2038 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2039 ;; Standard functions that take function-forms arguments. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2040 (def-edebug-spec mapcar (function-form form)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2041 (def-edebug-spec mapconcat (function-form form form)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2042 (def-edebug-spec mapatoms (function-form &optional form)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2043 (def-edebug-spec apply (function-form &rest form)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2044 (def-edebug-spec funcall (function-form &rest form)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2045 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2046 (def-edebug-spec let |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2047 ((&rest &or (symbolp &optional form) symbolp) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2048 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 let* let) |
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 (def-edebug-spec setq (&rest symbolp form)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2053 (def-edebug-spec setq-default setq) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2054 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2055 (def-edebug-spec cond (&rest (&rest form))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2056 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2057 (def-edebug-spec condition-case |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2058 (symbolp |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2059 form |
18729
43149745d126
(condition-case): Fix edebug-form-spec to
Richard M. Stallman <rms@gnu.org>
parents:
18399
diff
changeset
|
2060 &rest ([&or symbolp (&rest symbolp)] body))) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2061 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2062 |
14846 | 2063 (def-edebug-spec \` (backquote-form)) |
6512
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 ;; Supports quotes inside backquotes, |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2066 ;; but only at the top level inside unquotes. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2067 (def-edebug-spec backquote-form |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2068 (&or |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2069 ([&or "," ",@"] &or ("quote" backquote-form) form) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2070 (backquote-form &rest backquote-form) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2071 ;; 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
|
2072 ;; 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
|
2073 ;; (backquote-form . [&or nil backquote-form]) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2074 (vector &rest backquote-form) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2075 sexp)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2076 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2077 ;; Special version of backquote that instruments backquoted forms |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2078 ;; destined to be evaluated, usually as the result of a |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2079 ;; macroexpansion. Backquoted code can only have unquotes (, and ,@) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2080 ;; 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
|
2081 ;; 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
|
2082 ;; 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
|
2083 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2084 ;; 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
|
2085 ;; 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
|
2086 ;; are defined with edebug-` but this would be expensive. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2087 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2088 ;; ,@ might have some problems. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2089 |
14846 | 2090 (defalias 'edebug-\` '\`) ;; same macro as regular backquote. |
2091 (def-edebug-spec edebug-\` (def-form)) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2092 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2093 ;; 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
|
2094 (def-edebug-spec , (&or ("quote" edebug-`) def-form)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2095 (def-edebug-spec ,@ (&define ;; so (,@ form) is never wrapped. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2096 &or ("quote" edebug-`) def-form)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2097 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2098 ;; New byte compiler. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2099 (def-edebug-spec defsubst defun) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2100 (def-edebug-spec dont-compile t) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2101 (def-edebug-spec eval-when-compile t) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2102 (def-edebug-spec eval-and-compile t) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2103 |
16374
b3b88a1ee6aa
(save-selected-window, save-current-buffer)
Richard M. Stallman <rms@gnu.org>
parents:
16308
diff
changeset
|
2104 (def-edebug-spec save-selected-window t) |
b3b88a1ee6aa
(save-selected-window, save-current-buffer)
Richard M. Stallman <rms@gnu.org>
parents:
16308
diff
changeset
|
2105 (def-edebug-spec save-current-buffer t) |
b3b88a1ee6aa
(save-selected-window, save-current-buffer)
Richard M. Stallman <rms@gnu.org>
parents:
16308
diff
changeset
|
2106 (def-edebug-spec save-match-data t) |
b3b88a1ee6aa
(save-selected-window, save-current-buffer)
Richard M. Stallman <rms@gnu.org>
parents:
16308
diff
changeset
|
2107 (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
|
2108 (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
|
2109 (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
|
2110 (def-edebug-spec with-temp-file t) |
b3b88a1ee6aa
(save-selected-window, save-current-buffer)
Richard M. Stallman <rms@gnu.org>
parents:
16308
diff
changeset
|
2111 (def-edebug-spec with-temp-buffer t) |
b3b88a1ee6aa
(save-selected-window, save-current-buffer)
Richard M. Stallman <rms@gnu.org>
parents:
16308
diff
changeset
|
2112 |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2113 ;; Anything else? |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2114 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2115 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2116 ;; Some miscellaneous specs for macros in public packages. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2117 ;; Send me yours. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2118 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2119 ;; advice.el by Hans Chalupsky (hans@cs.buffalo.edu) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2120 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2121 (def-edebug-spec ad-dolist ((symbolp form &optional form) body)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2122 (def-edebug-spec defadvice |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2123 (&define name ;; thing being advised. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2124 (name ;; class is [&or "before" "around" "after" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2125 ;; "activation" "deactivation"] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2126 name ;; name of advice |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2127 &rest sexp ;; optional position and flags |
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 [&optional stringp] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2130 [&optional ("interactive" interactive)] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2131 def-body)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2132 |
14846 | 2133 ;;; The debugger itself |
6512
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 (defvar edebug-active nil) ;; Non-nil when edebug is active |
661 | 2136 |
2137 ;;; add minor-mode-alist entry | |
2138 (or (assq 'edebug-active minor-mode-alist) | |
2139 (setq minor-mode-alist (cons (list 'edebug-active " *Debugging*") | |
2140 minor-mode-alist))) | |
2141 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2142 (defvar edebug-stack nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2143 ;; Stack of active functions evaluated via edebug. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2144 ;; Should be nil at the top level. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2145 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2146 (defvar edebug-stack-depth -1) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2147 ;; Index of last edebug-stack item. |
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-offset-indices nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2150 ;; Stack of offset indices of visited edebug sexps. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2151 ;; Should be nil at the top level. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2152 ;; Each function adds one cons. Top is modified with setcar. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2153 |
661 | 2154 |
2155 (defvar edebug-entered nil | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2156 ;; 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
|
2157 ;; This should stay nil at the top level. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2158 ) |
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 ;; Should these be options? |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2161 (defconst edebug-debugger 'edebug |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2162 ;; 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
|
2163 ;; Set this to 'debug if you want to debug edebug. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2164 ) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2165 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2166 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2167 ;; Dynamically bound variables, declared globally but left unbound. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2168 (defvar edebug-function) ; the function being executed. change name!! |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2169 (defvar edebug-args) ; the arguments of the function |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2170 (defvar edebug-data) ; the edebug data for the function |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2171 (defvar edebug-value) ; the result of the expression |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2172 (defvar edebug-after-index) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2173 (defvar edebug-def-mark) ; the mark for the definition |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2174 (defvar edebug-freq-count) ; the count of expression visits. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2175 (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
|
2176 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2177 (defvar edebug-buffer) ; which buffer the function is in. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2178 (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
|
2179 (defvar edebug-outside-executing-macro) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2180 (defvar edebug-outside-defining-kbd-macro) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2181 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2182 (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
|
2183 (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
|
2184 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2185 (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
|
2186 (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
|
2187 |
19930
1e0f347ee021
(edebug-enter): Save, and bind to nil,
Richard M. Stallman <rms@gnu.org>
parents:
18729
diff
changeset
|
2188 (defvar edebug-outside-overriding-local-map) |
1e0f347ee021
(edebug-enter): Save, and bind to nil,
Richard M. Stallman <rms@gnu.org>
parents:
18729
diff
changeset
|
2189 (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
|
2190 |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2191 (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
|
2192 (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
|
2193 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2194 (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
|
2195 |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2196 ;;; Handling signals |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2197 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2198 (defun edebug-signal (edebug-signal-name edebug-signal-data) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2199 "Signal an error. Args are SIGNAL-NAME, and associated DATA. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2200 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
|
2201 that is a list of condition names. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2202 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
|
2203 The symbol `error' should always be one of them. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2204 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2205 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
|
2206 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
|
2207 See `condition-case'. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2208 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2209 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
|
2210 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
|
2211 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
|
2212 error is signaled again." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2213 (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
|
2214 (edebug 'error (cons edebug-signal-name edebug-signal-data))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2215 ;; 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
|
2216 ;; 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
|
2217 ;; Avoid infinite recursion. |
4c3a2b58fd72
(edebug-signal): Avoid infinite recursion.
Richard M. Stallman <rms@gnu.org>
parents:
17650
diff
changeset
|
2218 (let ((signal-hook-function nil)) |
4c3a2b58fd72
(edebug-signal): Avoid infinite recursion.
Richard M. Stallman <rms@gnu.org>
parents:
17650
diff
changeset
|
2219 (signal edebug-signal-name edebug-signal-data))) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2220 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2221 ;;; Entering Edebug |
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 (defun edebug-enter (edebug-function edebug-args edebug-body) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2224 ;; 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
|
2225 ;; Setup edebug variables and evaluate BODY. This function is called |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2226 ;; 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
|
2227 ;; Return the result of BODY. |
661 | 2228 |
2229 ;; Is this the first time we are entering edebug since | |
2230 ;; lower-level recursive-edit command? | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2231 ;; More precisely, this tests whether Edebug is currently active. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2232 (if (not edebug-entered) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2233 (let ((edebug-entered t) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2234 ;; 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
|
2235 ;; 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
|
2236 ;; 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
|
2237 (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
|
2238 (max-specpdl-size (+ 200 max-specpdl-size)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2239 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2240 (debugger edebug-debugger) ; only while edebug is active. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2241 (edebug-outside-debug-on-error debug-on-error) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2242 (edebug-outside-debug-on-quit debug-on-quit) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2243 ;; Binding these may not be the right thing to do. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2244 ;; We want to allow the global values to be changed. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2245 (debug-on-error (or debug-on-error edebug-on-error)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2246 (debug-on-quit edebug-on-quit) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2247 |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2248 ;; 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
|
2249 (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
|
2250 |
19930
1e0f347ee021
(edebug-enter): Save, and bind to nil,
Richard M. Stallman <rms@gnu.org>
parents:
18729
diff
changeset
|
2251 (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
|
2252 (edebug-outside-overriding-terminal-local-map |
1e0f347ee021
(edebug-enter): Save, and bind to nil,
Richard M. Stallman <rms@gnu.org>
parents:
18729
diff
changeset
|
2253 overriding-terminal-local-map) |
1e0f347ee021
(edebug-enter): Save, and bind to nil,
Richard M. Stallman <rms@gnu.org>
parents:
18729
diff
changeset
|
2254 |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2255 ;; 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
|
2256 (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
|
2257 (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
|
2258 (edebug-outside-post-command-hook post-command-hook)) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2259 (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
|
2260 (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
|
2261 ;; 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
|
2262 ;; 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
|
2263 (executing-kbd-macro |
c23c9712ef5c
Use executing-kbd-macro, not executing-macro.
Karl Heuer <kwzh@gnu.org>
parents:
14846
diff
changeset
|
2264 (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
|
2265 |
19930
1e0f347ee021
(edebug-enter): Save, and bind to nil,
Richard M. Stallman <rms@gnu.org>
parents:
18729
diff
changeset
|
2266 ;; 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
|
2267 (overriding-local-map nil) |
1e0f347ee021
(edebug-enter): Save, and bind to nil,
Richard M. Stallman <rms@gnu.org>
parents:
18729
diff
changeset
|
2268 (overriding-terminal-local-map nil) |
1e0f347ee021
(edebug-enter): Save, and bind to nil,
Richard M. Stallman <rms@gnu.org>
parents:
18729
diff
changeset
|
2269 |
16308
2334a3d634c0
(edebug-original-signal): Don't define it.
Richard M. Stallman <rms@gnu.org>
parents:
16299
diff
changeset
|
2270 (signal-hook-function 'edebug-signal) |
2334a3d634c0
(edebug-original-signal): Don't define it.
Richard M. Stallman <rms@gnu.org>
parents:
16299
diff
changeset
|
2271 |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2272 ;; 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
|
2273 ;; 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
|
2274 ;; 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
|
2275 (pre-command-hook nil) |
16299
0e4f99bad2ec
(pre-command-hook, post-command-hook): Defvars deleted.
Richard M. Stallman <rms@gnu.org>
parents:
15782
diff
changeset
|
2276 (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
|
2277 (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
|
2278 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
|
2279 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
|
2280 edebug-next-execution-mode nil) |
16308
2334a3d634c0
(edebug-original-signal): Don't define it.
Richard M. Stallman <rms@gnu.org>
parents:
16299
diff
changeset
|
2281 (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
|
2282 ;; 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
|
2283 (setq executing-kbd-macro edebug-outside-executing-macro |
14846 | 2284 pre-command-hook edebug-outside-pre-command-hook |
2285 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
|
2286 ))) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2287 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2288 (let* ((edebug-data (get edebug-function 'edebug)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2289 (edebug-def-mark (car edebug-data)) ; mark at def start |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2290 (edebug-freq-count (get edebug-function 'edebug-freq-count)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2291 (edebug-coverage (get edebug-function 'edebug-coverage)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2292 (edebug-buffer (marker-buffer edebug-def-mark)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2293 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2294 (edebug-stack (cons edebug-function edebug-stack)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2295 (edebug-offset-indices (cons 0 edebug-offset-indices)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2296 ) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2297 (if (get edebug-function 'edebug-on-entry) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2298 (progn |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2299 (setq edebug-execution-mode 'step) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2300 (if (eq (get edebug-function 'edebug-on-entry) 'temp) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2301 (put edebug-function 'edebug-on-entry nil)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2302 (if edebug-trace |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2303 (edebug-enter-trace edebug-body) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2304 (funcall edebug-body)) |
661 | 2305 ))) |
2306 | |
6512
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 (defun edebug-enter-trace (edebug-body) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2309 (let ((edebug-stack-depth (1+ edebug-stack-depth)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2310 edebug-result) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2311 (edebug-print-trace-before |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2312 (format "%s args: %s" edebug-function edebug-args)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2313 (prog1 (setq edebug-result (funcall edebug-body)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2314 (edebug-print-trace-after |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2315 (format "%s result: %s" edebug-function edebug-result))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2316 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2317 (def-edebug-spec edebug-tracing (form body)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2318 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2319 (defmacro edebug-tracing (msg &rest body) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2320 "Print MSG in *edebug-trace* before and after evaluating BODY. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2321 The result of BODY is also printed." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2322 (` (let ((edebug-stack-depth (1+ edebug-stack-depth)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2323 edebug-result) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2324 (edebug-print-trace-before (, msg)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2325 (prog1 (setq edebug-result (progn (,@ body))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2326 (edebug-print-trace-after |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2327 (format "%s result: %s" (, msg) edebug-result)))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2328 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2329 (defun edebug-print-trace-before (msg) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2330 "Function called to print trace info before expression evaluation. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2331 MSG is printed after `::::{ '." |
661 | 2332 (edebug-trace-display |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2333 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
|
2334 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2335 (defun edebug-print-trace-after (msg) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2336 "Function called to print trace info after expression evaluation. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2337 MSG is printed after `::::} '." |
661 | 2338 (edebug-trace-display |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2339 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
|
2340 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2341 |
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-slow-before (edebug-before-index) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2344 ;; Debug current function given BEFORE position. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2345 ;; Called from functions compiled with edebug-eval-top-level-form. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2346 ;; Return the before index. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2347 (setcar edebug-offset-indices edebug-before-index) |
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 ;; Increment frequency count |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2350 (aset edebug-freq-count edebug-before-index |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2351 (1+ (aref edebug-freq-count edebug-before-index))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2352 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2353 (if (or (not (memq edebug-execution-mode '(Go-nonstop next))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2354 (edebug-input-pending-p)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2355 (edebug-debugger edebug-before-index 'before nil)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2356 edebug-before-index) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2357 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2358 (defun edebug-fast-before (edebug-before-index) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2359 ;; Do nothing. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2360 ) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2361 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2362 (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
|
2363 ;; Debug current function given AFTER position and VALUE. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2364 ;; Called from functions compiled with edebug-eval-top-level-form. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2365 ;; Return VALUE. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2366 (setcar edebug-offset-indices edebug-after-index) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2367 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2368 ;; Increment frequency count |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2369 (aset edebug-freq-count edebug-after-index |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2370 (1+ (aref edebug-freq-count edebug-after-index))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2371 (if edebug-test-coverage (edebug-update-coverage)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2372 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2373 (if (and (eq edebug-execution-mode 'Go-nonstop) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2374 (not (edebug-input-pending-p))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2375 ;; Just return result. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2376 edebug-value |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2377 (edebug-debugger edebug-after-index 'after edebug-value) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2378 )) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2379 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2380 (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
|
2381 ;; Do nothing but return the value. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2382 edebug-value) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2383 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2384 (defun edebug-run-slow () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2385 (defalias 'edebug-before 'edebug-slow-before) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2386 (defalias 'edebug-after 'edebug-slow-after)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2387 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2388 ;; This is not used, yet. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2389 (defun edebug-run-fast () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2390 (defalias 'edebug-before 'edebug-fast-before) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2391 (defalias 'edebug-after 'edebug-fast-after)) |
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 (edebug-run-slow) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2394 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2395 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2396 (defun edebug-update-coverage () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2397 (let ((old-result (aref edebug-coverage edebug-after-index))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2398 (cond |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2399 ((eq 'ok-coverage old-result)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2400 ((eq 'unknown old-result) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2401 (aset edebug-coverage edebug-after-index edebug-value)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2402 ;; Test if a different result. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2403 ((not (eq edebug-value old-result)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2404 (aset edebug-coverage edebug-after-index 'ok-coverage))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2405 |
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 ;; Dynamically declared unbound variables. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2408 (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
|
2409 (defvar edebug-breakpoints) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2410 (defvar edebug-break-data) ; break data for current function. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2411 (defvar edebug-break) ; whether a break occurred. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2412 (defvar edebug-global-break) ; whether a global break occurred. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2413 (defvar edebug-break-condition) ; whether the breakpoint is conditional. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2414 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2415 (defvar edebug-break-result nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2416 (defvar edebug-global-break-result nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2417 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2418 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2419 (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
|
2420 ;; Check breakpoints and pending input. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2421 ;; If edebug display should be updated, call edebug-display. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2422 ;; Return edebug-value. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2423 (let* (;; This needs to be here since breakpoints may be changed. |
661 | 2424 (edebug-breakpoints (car (cdr edebug-data))) ; list of breakpoints |
2425 (edebug-break-data (assq edebug-offset-index edebug-breakpoints)) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2426 (edebug-break-condition (car (cdr edebug-break-data))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2427 (edebug-global-break |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2428 (if edebug-global-break-condition |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2429 (condition-case nil |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2430 (setq edebug-global-break-result |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2431 (eval edebug-global-break-condition)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2432 (error nil)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2433 (edebug-break)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2434 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2435 ;;; (edebug-trace "exp: %s" edebug-value) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2436 ;; Test whether we should break. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2437 (setq edebug-break |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2438 (or edebug-global-break |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2439 (and edebug-break-data |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2440 (or (not edebug-break-condition) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2441 (setq edebug-break-result |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2442 (eval edebug-break-condition)))))) |
661 | 2443 (if (and edebug-break |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2444 (nth 2 edebug-break-data)) ; is it temporary? |
661 | 2445 ;; Delete the breakpoint. |
2446 (setcdr edebug-data | |
2447 (cons (delq edebug-break-data edebug-breakpoints) | |
2448 (cdr (cdr edebug-data))))) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2449 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2450 ;; Display if mode is not go, continue, or Continue-fast |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2451 ;; or break, or input is pending, |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2452 (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
|
2453 edebug-break |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2454 (edebug-input-pending-p)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2455 (edebug-display)) ; <--------------- display |
661 | 2456 |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2457 edebug-value |
661 | 2458 )) |
2459 | |
2460 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2461 ;; window-start now stored with each function. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2462 ;;(defvar edebug-window-start nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2463 ;; Remember where each buffers' window starts between edebug calls. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2464 ;; This is to avoid spurious recentering. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2465 ;; Does this still need to be buffer-local?? |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2466 ;;(setq-default edebug-window-start nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2467 ;;(make-variable-buffer-local 'edebug-window-start) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2468 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2469 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2470 ;; Dynamically declared unbound vars |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2471 (defvar edebug-point) ; the point in edebug buffer |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2472 (defvar edebug-outside-buffer) ; the current-buffer outside of edebug |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2473 (defvar edebug-outside-point) ; the point outside of edebug |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2474 (defvar edebug-outside-mark) ; the mark outside of edebug |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2475 (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
|
2476 (defvar edebug-outside-windows) ; outside window configuration |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2477 (defvar edebug-eval-buffer) ; for the evaluation list. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2478 (defvar edebug-outside-o-a-p) ; outside overlay-arrow-position |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2479 (defvar edebug-outside-o-a-s) ; outside overlay-arrow-string |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2480 (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
|
2481 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2482 (defvar edebug-eval-list nil) ;; List of expressions to evaluate. |
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 (defvar edebug-previous-result nil) ;; Last result returned. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2485 |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2486 ;; 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
|
2487 (defalias 'edebug-mark 'mark) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2488 (defalias 'edebug-mark-marker 'mark-marker) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2489 |
661 | 2490 |
2491 (defun edebug-display () | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2492 ;; Setup windows for edebug, determine mode, maybe enter recursive-edit. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2493 ;; Uses local variables of edebug-enter, edebug-before, edebug-after |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2494 ;; and edebug-debugger. |
661 | 2495 (let ((edebug-active t) ; for minor mode alist |
2496 edebug-stop ; should we enter recursive-edit | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2497 (edebug-point (+ edebug-def-mark |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2498 (aref (nth 2 edebug-data) edebug-offset-index))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2499 edebug-buffer-outside-point ; current point in edebug-buffer |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2500 ;; window displaying edebug-buffer |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2501 (edebug-window-data (nth 3 edebug-data)) |
661 | 2502 (edebug-outside-window (selected-window)) |
2503 (edebug-outside-buffer (current-buffer)) | |
2504 (edebug-outside-point (point)) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2505 (edebug-outside-mark (edebug-mark)) |
661 | 2506 edebug-outside-windows ; window or screen configuration |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2507 edebug-buffer-points |
661 | 2508 |
2509 edebug-eval-buffer ; declared here so we can kill it below | |
2510 (edebug-eval-result-list (and edebug-eval-list | |
2511 (edebug-eval-result-list))) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2512 edebug-trace-window |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2513 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
|
2514 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2515 (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
|
2516 (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
|
2517 (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
|
2518 (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
|
2519 (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
|
2520 (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
|
2521 (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
|
2522 ;; 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
|
2523 ) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2524 (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
|
2525 (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
|
2526 (error "Buffer defining %s not found" edebug-function))) |
661 | 2527 |
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 (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
|
2529 ;; 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
|
2530 (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
|
2531 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2532 (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
|
2533 ;; 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
|
2534 (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
|
2535 (edebug-current-windows edebug-save-windows))) |
661 | 2536 |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2537 (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
|
2538 (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
|
2539 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2540 ;; First move the edebug buffer point to edebug-point |
14846 | 2541 ;; so that window start doesn't get changed when we display it. |
2542 ;; 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
|
2543 ;;(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
|
2544 ;;(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
|
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-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
|
2547 ;; 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
|
2548 (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
|
2549 (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
|
2550 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2551 ;; 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
|
2552 ;; 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
|
2553 ;; 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
|
2554 (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
|
2555 ;; 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
|
2556 (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
|
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 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2559 (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
|
2560 (goto-char edebug-point) |
661 | 2561 |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2562 (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
|
2563 ;; 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
|
2564 ;; 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
|
2565 (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
|
2566 (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
|
2567 (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
|
2568 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
|
2569 ))) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2570 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2571 (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
|
2572 (edebug-adjust-window (cdr edebug-window-data))) |
661 | 2573 |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2574 ;; 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
|
2575 (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
|
2576 (progn |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2577 (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
|
2578 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
|
2579 (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
|
2580 ;; (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
|
2581 )) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2582 ;; 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
|
2583 (edebug-overlay-arrow) |
661 | 2584 |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2585 (cond |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2586 ((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
|
2587 ;; 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
|
2588 (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
|
2589 (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
|
2590 (beep) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2591 (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
|
2592 (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
|
2593 (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
|
2594 (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
|
2595 (cond |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2596 (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
|
2597 (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
|
2598 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
|
2599 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
|
2600 (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
|
2601 (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
|
2602 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
|
2603 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
|
2604 ((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
|
2605 (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
|
2606 (t))) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2607 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2608 (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
|
2609 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2610 (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
|
2611 (progn |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2612 ;; 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
|
2613 (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
|
2614 (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
|
2615 (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
|
2616 (edebug-previous-result))) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2617 |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2618 (cond |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2619 (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
|
2620 (cond |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2621 ((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
|
2622 ((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
|
2623 (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
|
2624 ;; 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
|
2625 ((eq edebug-execution-mode 'trace) |
18376
9ae76ef113f6
(edebug-sit-for-seconds): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18017
diff
changeset
|
2626 (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
|
2627 ((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
|
2628 (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
|
2629 ) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2630 |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2631 (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
|
2632 (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
|
2633 (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
|
2634 (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
|
2635 (progn |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2636 ;; (setq edebug-execution-mode 'step) |
14846 | 2637 ;; (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
|
2638 (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
|
2639 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2640 ;; 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
|
2641 (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
|
2642 (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
|
2643 (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
|
2644 ;; 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
|
2645 (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
|
2646 (progn |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2647 (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
|
2648 (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
|
2649 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2650 ;; 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
|
2651 ;; 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
|
2652 (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
|
2653 (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
|
2654 (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
|
2655 (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
|
2656 (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
|
2657 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2658 ;; 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
|
2659 (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
|
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 (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
|
2662 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2663 ;; 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
|
2664 ;; 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
|
2665 ;; 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
|
2666 (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
|
2667 (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
|
2668 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2669 ;; 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
|
2670 (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
|
2671 (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
|
2672 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
|
2673 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2674 ;; 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
|
2675 (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
|
2676 (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
|
2677 (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
|
2678 (progn |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2679 (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
|
2680 '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
|
2681 ;; 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
|
2682 ;; Needed in addition to setting the buffer point |
14846 | 2683 ;; - 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
|
2684 ;; 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
|
2685 ;; 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
|
2686 ;; (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
|
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 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2689 ;; 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
|
2690 ;; (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
|
2691 ) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2692 ;; 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
|
2693 ;; 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
|
2694 ;; 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
|
2695 (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
|
2696 (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
|
2697 ) ; 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
|
2698 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2699 ;; 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
|
2700 (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
|
2701 ;; 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
|
2702 ;; Needed even if restoring windows because |
14846 | 2703 ;; that doesn't restore point and mark in the current buffer. |
2704 ;; 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
|
2705 (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
|
2706 (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
|
2707 (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
|
2708 ;; 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
|
2709 (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
|
2710 ) ; 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
|
2711 ;; 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
|
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 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
|
2714 ;; (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
|
2715 ;; 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
|
2716 (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
|
2717 (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
|
2718 (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
|
2719 (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
|
2720 ;; ... 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
|
2721 ) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2722 ;; 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
|
2723 (setq |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2724 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
|
2725 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
|
2726 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
|
2727 ))) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2728 |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2729 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2730 (defvar edebug-number-of-recursions 0) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2731 ;; Number of recursive edits started by edebug. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2732 ;; Should be 0 at the top level. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2733 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2734 (defvar edebug-recursion-depth 0) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2735 ;; Value of recursion-depth when edebug was called. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2736 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2737 ;; Dynamically declared unbound vars |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2738 (defvar edebug-outside-match-data) ; match data outside of edebug |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2739 (defvar edebug-backtrace-buffer) ; each recursive edit gets its own |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2740 (defvar edebug-inside-windows) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2741 (defvar edebug-interactive-p) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2742 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2743 (defvar edebug-outside-map) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2744 (defvar edebug-outside-standard-output) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2745 (defvar edebug-outside-standard-input) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2746 (defvar edebug-outside-last-command-char) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2747 (defvar edebug-outside-last-command) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2748 (defvar edebug-outside-this-command) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2749 (defvar edebug-outside-last-input-char) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2750 |
6671
5b26038687ed
(edebug-emacs-19-specific): Renamed from edebug-fsf19-specific.
Richard M. Stallman <rms@gnu.org>
parents:
6666
diff
changeset
|
2751 ;; 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
|
2752 ;; 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
|
2753 ;; 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
|
2754 ;; 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
|
2755 |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2756 ;; Emacs 18 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2757 (defvar edebug-outside-unread-command-char) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2758 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2759 ;; Lucid Emacs |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2760 (defvar edebug-outside-unread-command-event) ;; like unread-command-events |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2761 (defvar unread-command-event nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2762 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2763 ;; Emacs 19. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2764 (defvar edebug-outside-last-command-event) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2765 (defvar edebug-outside-unread-command-events) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2766 (defvar edebug-outside-last-input-event) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2767 (defvar edebug-outside-last-event-frame) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2768 (defvar edebug-outside-last-nonmenu-event) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2769 (defvar edebug-outside-track-mouse) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2770 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2771 ;; Disable byte compiler warnings about unread-command-char and -event |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2772 ;; (maybe works with byte-compile-version 2.22 at least) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2773 (defvar edebug-unread-command-char-warning) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2774 (defvar edebug-unread-command-event-warning) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2775 (eval-when-compile |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2776 (setq edebug-unread-command-char-warning |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2777 (get 'unread-command-char 'byte-obsolete-variable)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2778 (put 'unread-command-char 'byte-obsolete-variable nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2779 (setq edebug-unread-command-event-warning |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2780 (get 'unread-command-event 'byte-obsolete-variable)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2781 (put 'unread-command-event 'byte-obsolete-variable nil)) |
661 | 2782 |
2783 (defun edebug-recursive-edit () | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2784 ;; Start up a recursive edit inside of edebug. |
661 | 2785 ;; 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
|
2786 ;; Assume that none of the variables below are buffer-local. |
661 | 2787 (let ((edebug-buffer-read-only buffer-read-only) |
2788 ;; match-data must be done in the outside buffer | |
2789 (edebug-outside-match-data | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2790 (save-excursion ; might be unnecessary now?? |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2791 (set-buffer edebug-outside-buffer) ; in case match buffer different |
661 | 2792 (match-data))) |
2793 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2794 ;;(edebug-number-of-recursions (1+ edebug-number-of-recursions)) |
661 | 2795 (edebug-recursion-depth (recursion-depth)) |
2796 edebug-entered ; bind locally to nil | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2797 (edebug-interactive-p nil) ; again non-interactive |
661 | 2798 edebug-backtrace-buffer ; each recursive edit gets its own |
2799 ;; The window configuration may be saved and restored | |
2800 ;; during a recursive-edit | |
2801 edebug-inside-windows | |
2802 | |
2803 (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
|
2804 |
661 | 2805 (edebug-outside-standard-output standard-output) |
2806 (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
|
2807 (edebug-outside-defining-kbd-macro defining-kbd-macro) |
661 | 2808 |
2809 (edebug-outside-last-command-char last-command-char) | |
2810 (edebug-outside-last-command last-command) | |
2811 (edebug-outside-this-command this-command) | |
2812 (edebug-outside-last-input-char last-input-char) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2813 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2814 (edebug-outside-unread-command-char unread-command-char) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2815 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2816 (edebug-outside-last-input-event last-input-event) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2817 (edebug-outside-last-command-event last-command-event) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2818 (edebug-outside-unread-command-event unread-command-event) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2819 (edebug-outside-unread-command-events unread-command-events) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2820 (edebug-outside-last-event-frame last-event-frame) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2821 (edebug-outside-last-nonmenu-event last-nonmenu-event) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2822 (edebug-outside-track-mouse track-mouse) |
661 | 2823 ) |
2824 | |
2825 (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
|
2826 (let ( |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2827 ;; 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
|
2828 ;; 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
|
2829 (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
|
2830 (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
|
2831 (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
|
2832 (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
|
2833 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2834 ;; 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
|
2835 (unread-command-char -1) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2836 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2837 ;; 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
|
2838 (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
|
2839 (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
|
2840 (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
|
2841 (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
|
2842 (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
|
2843 (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
|
2844 (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
|
2845 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2846 ;; 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
|
2847 (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
|
2848 (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
|
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 ;; 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
|
2851 (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
|
2852 (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
|
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 ;; others?? |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2855 ) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2856 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2857 (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
|
2858 (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
|
2859 (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
|
2860 (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
|
2861 (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
|
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 (setq buffer-read-only t) |
16308
2334a3d634c0
(edebug-original-signal): Don't define it.
Richard M. Stallman <rms@gnu.org>
parents:
16299
diff
changeset
|
2864 (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
|
2865 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2866 (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
|
2867 (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
|
2868 (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
|
2869 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2870 ;; 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
|
2871 (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
|
2872 (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
|
2873 (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
|
2874 ;; 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
|
2875 (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
|
2876 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2877 ;; 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
|
2878 ;; (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
|
2879 |
21162
6c70fa8e1a5d
(edebug-recursive-edit)
Richard M. Stallman <rms@gnu.org>
parents:
20832
diff
changeset
|
2880 (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
|
2881 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2882 ;; 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
|
2883 ;; 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
|
2884 (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
|
2885 (progn |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2886 (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
|
2887 (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
|
2888 (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
|
2889 (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
|
2890 (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
|
2891 ) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2892 ;; 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
|
2893 (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
|
2894 ));; 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
|
2895 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2896 ;; 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
|
2897 (setq |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2898 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
|
2899 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
|
2900 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
|
2901 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
|
2902 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
|
2903 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
|
2904 unread-command-events edebug-outside-unread-command-events |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2905 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
|
2906 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
|
2907 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
|
2908 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
|
2909 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
|
2910 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2911 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
|
2912 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
|
2913 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
|
2914 )) |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
2915 )) |
661 | 2916 |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2917 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2918 ;;; Display related functions |
661 | 2919 |
2920 (defun edebug-adjust-window (old-start) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2921 ;; 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
|
2922 ;;; (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
|
2923 ;;; (selected-window) old-start (window-start) (point)) (sit-for 5) |
661 | 2924 (if (not (pos-visible-in-window-p)) |
2925 (progn | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2926 ;; First try old-start |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2927 (if old-start |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2928 (set-window-start (selected-window) old-start)) |
661 | 2929 (if (not (pos-visible-in-window-p)) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2930 (progn |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2931 ;; (message "resetting window start") (sit-for 2) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2932 (set-window-start |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2933 (selected-window) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2934 (save-excursion |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2935 (forward-line |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2936 (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
|
2937 (- (/ (window-height) 2)) ; center the line moving forward |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2938 )) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2939 (beginning-of-line) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2940 (point))))))) |
661 | 2941 (window-start)) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2942 |
661 | 2943 |
2944 | |
2945 (defconst edebug-arrow-alist | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2946 '((Continue-fast . "=") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2947 (Trace-fast . "-") |
661 | 2948 (continue . ">") |
2949 (trace . "->") | |
2950 (step . "=>") | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2951 (next . "=>") |
661 | 2952 (go . "<>") |
2953 (Go-nonstop . "..") ; not used | |
2954 ) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2955 "Association list of arrows for each edebug mode.") |
661 | 2956 |
2957 (defun edebug-overlay-arrow () | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2958 ;; 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
|
2959 ;; The arrow string is derived from edebug-arrow-alist and |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2960 ;; 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
|
2961 (let ((pos (save-excursion (beginning-of-line) (point)))) |
661 | 2962 (setq overlay-arrow-string |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2963 (cdr (assq edebug-execution-mode edebug-arrow-alist))) |
661 | 2964 (setq overlay-arrow-position (make-marker)) |
2965 (set-marker overlay-arrow-position pos (current-buffer)))) | |
2966 | |
2967 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2968 (defun edebug-toggle-save-all-windows () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2969 "Toggle the saving and restoring of all windows. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2970 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
|
2971 configurations become the same as the current configuration." |
661 | 2972 (interactive) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2973 (setq edebug-save-windows (not edebug-save-windows)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2974 (if edebug-save-windows |
661 | 2975 (setq edebug-inside-windows |
2976 (setq edebug-outside-windows | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2977 (edebug-current-windows |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2978 edebug-save-windows)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2979 (message "Window saving is %s for all windows." |
661 | 2980 (if edebug-save-windows "on" "off"))) |
2981 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2982 (defmacro edebug-changing-windows (&rest body) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2983 (` (let ((window (selected-window))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2984 (setq edebug-inside-windows (edebug-current-windows t)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2985 (edebug-set-windows edebug-outside-windows) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2986 (,@ body) ;; Code to change edebug-save-windows |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2987 (setq edebug-outside-windows (edebug-current-windows |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2988 edebug-save-windows)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2989 ;; Problem: what about outside windows that are deleted inside? |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2990 (edebug-set-windows edebug-inside-windows)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2991 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2992 (defun edebug-toggle-save-selected-window () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2993 "Toggle the saving and restoring of the selected window. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2994 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
|
2995 configurations become the same as the current configuration." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2996 (interactive) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2997 (cond |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2998 ((eq t edebug-save-windows) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
2999 ;; Save all outside windows except the selected one. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3000 ;; Remove (selected-window) from outside-windows. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3001 (edebug-changing-windows |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3002 (setq edebug-save-windows (delq window (edebug-window-list))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3003 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3004 ((memq (selected-window) edebug-save-windows) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3005 (setq edebug-outside-windows |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3006 (delq (assq (selected-window) edebug-outside-windows) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3007 edebug-outside-windows)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3008 (setq edebug-save-windows |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3009 (delq (selected-window) edebug-save-windows))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3010 (t ; Save a new window. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3011 (edebug-changing-windows |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3012 (setq edebug-save-windows (cons window edebug-save-windows))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3013 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3014 (message "Window saving is %s for %s." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3015 (if (memq (selected-window) edebug-save-windows) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3016 "on" "off") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3017 (selected-window))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3018 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3019 (defun edebug-toggle-save-windows (arg) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3020 "Toggle the saving and restoring of windows. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3021 With prefix, toggle for just the selected window. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3022 Otherwise, toggle for all windows." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3023 (interactive "P") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3024 (if arg |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3025 (edebug-toggle-save-selected-window) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3026 (edebug-toggle-save-all-windows))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3027 |
661 | 3028 |
3029 (defun edebug-where () | |
3030 "Show the debug windows and where we stopped in the program." | |
3031 (interactive) | |
3032 (if (not edebug-active) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3033 (error "Edebug is not active")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3034 ;; Restore the window configuration to what it last was inside. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3035 ;; But it is not always set. - experiment |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3036 ;;(if edebug-inside-windows |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3037 ;; (edebug-set-windows edebug-inside-windows)) |
661 | 3038 (edebug-pop-to-buffer edebug-buffer) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3039 (goto-char edebug-point)) |
661 | 3040 |
3041 (defun edebug-view-outside () | |
3042 "Change to the outside window configuration." | |
3043 (interactive) | |
3044 (if (not edebug-active) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3045 (error "Edebug is not active")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3046 (setq edebug-inside-windows |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3047 (edebug-current-windows edebug-save-windows)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3048 (edebug-set-windows edebug-outside-windows) |
661 | 3049 (goto-char edebug-outside-point) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3050 (message "Window configuration outside of Edebug. Return with %s" |
661 | 3051 (substitute-command-keys "\\<global-map>\\[edebug-where]"))) |
3052 | |
3053 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3054 (defun edebug-bounce-point (arg) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3055 "Bounce the point in the outside current buffer. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3056 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
|
3057 The default is one second." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3058 (interactive "p") |
661 | 3059 (if (not edebug-active) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3060 (error "Edebug is not active")) |
661 | 3061 (save-excursion |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3062 ;; If the buffer's currently displayed, avoid set-window-configuration. |
661 | 3063 (save-window-excursion |
3064 (edebug-pop-to-buffer edebug-outside-buffer) | |
3065 (goto-char edebug-outside-point) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3066 (message "Current buffer: %s Point: %s Mark: %s" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3067 (current-buffer) (point) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3068 (if (marker-buffer (edebug-mark-marker)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3069 (marker-position (edebug-mark-marker)) "<not set>")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3070 (edebug-sit-for arg) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3071 (edebug-pop-to-buffer edebug-buffer (car edebug-window-data))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3072 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3073 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3074 ;; 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
|
3075 ;; 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
|
3076 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3077 '(defvar edebug-display-buffer-list nil |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3078 "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
|
3079 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3080 '(defun edebug-display-buffer (buffer) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3081 "Toggle display of a buffer inside of edebug." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3082 (interactive "bBuffer: ") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3083 (let ((already-displaying (memq buffer edebug-display-buffer-list))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3084 (setq edebug-display-buffer-list |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3085 (if already-displaying |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3086 (delq buffer edebug-display-buffer-list) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3087 (cons buffer edebug-display-buffer-list))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3088 (message "Displaying %s %s" buffer |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3089 (if already-displaying "off" "on")))) |
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 ;;; Breakpoint related functions |
661 | 3092 |
3093 (defun edebug-find-stop-point () | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3094 ;; Return (function . index) of the nearest edebug stop point. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3095 (let* ((edebug-def-name (edebug-form-data-symbol)) |
661 | 3096 (edebug-data |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3097 (let ((data (get edebug-def-name 'edebug))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3098 (if (or (null data) (markerp data)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3099 (error "%s is not instrumented for Edebug" edebug-def-name)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3100 data)) ; we could do it automatically, if data is a marker. |
661 | 3101 ;; pull out parts of edebug-data. |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3102 (edebug-def-mark (car edebug-data)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3103 ;; (edebug-breakpoints (car (cdr edebug-data))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3104 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3105 (offset-vector (nth 2 edebug-data)) |
661 | 3106 (offset (- (save-excursion |
3107 (if (looking-at "[ \t]") | |
3108 ;; skip backwards until non-whitespace, or bol | |
3109 (skip-chars-backward " \t")) | |
3110 (point)) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3111 edebug-def-mark)) |
661 | 3112 len i) |
3113 ;; the offsets are in order so we can do a linear search | |
3114 (setq len (length offset-vector)) | |
3115 (setq i 0) | |
3116 (while (and (< i len) (> offset (aref offset-vector i))) | |
3117 (setq i (1+ i))) | |
3118 (if (and (< i len) | |
3119 (<= offset (aref offset-vector i))) | |
3120 ;; return the relevant info | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3121 (cons edebug-def-name i) |
661 | 3122 (message "Point is not on an expression in %s." |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3123 edebug-def-name) |
661 | 3124 ))) |
3125 | |
3126 | |
3127 (defun edebug-next-breakpoint () | |
3128 "Move point to the next breakpoint, or first if none past point." | |
3129 (interactive) | |
3130 (let ((edebug-stop-point (edebug-find-stop-point))) | |
3131 (if edebug-stop-point | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3132 (let* ((edebug-def-name (car edebug-stop-point)) |
661 | 3133 (index (cdr edebug-stop-point)) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3134 (edebug-data (get edebug-def-name 'edebug)) |
661 | 3135 |
3136 ;; pull out parts of edebug-data | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3137 (edebug-def-mark (car edebug-data)) |
661 | 3138 (edebug-breakpoints (car (cdr edebug-data))) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3139 (offset-vector (nth 2 edebug-data)) |
661 | 3140 breakpoint) |
3141 (if (not edebug-breakpoints) | |
3142 (message "No breakpoints in this function.") | |
3143 (let ((breaks edebug-breakpoints)) | |
3144 (while (and breaks | |
3145 (<= (car (car breaks)) index)) | |
3146 (setq breaks (cdr breaks))) | |
3147 (setq breakpoint | |
3148 (if breaks | |
3149 (car breaks) | |
3150 ;; goto the first breakpoint | |
3151 (car edebug-breakpoints))) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3152 (goto-char (+ edebug-def-mark |
661 | 3153 (aref offset-vector (car breakpoint)))) |
3154 | |
14846 | 3155 (message "%s" |
3156 (concat (if (nth 2 breakpoint) | |
661 | 3157 "Temporary " "") |
3158 (if (car (cdr breakpoint)) | |
3159 (format "Condition: %s" | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3160 (edebug-safe-prin1-to-string |
661 | 3161 (car (cdr breakpoint)))) |
3162 ""))) | |
3163 )))))) | |
3164 | |
3165 | |
3166 (defun edebug-modify-breakpoint (flag &optional condition temporary) | |
3167 "Modify the breakpoint for the form at point or after it according | |
3168 to FLAG: set if t, clear if nil. Then move to that point. | |
3169 If CONDITION or TEMPORARY are non-nil, add those attributes to | |
3170 the breakpoint. " | |
3171 (let ((edebug-stop-point (edebug-find-stop-point))) | |
3172 (if edebug-stop-point | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3173 (let* ((edebug-def-name (car edebug-stop-point)) |
661 | 3174 (index (cdr edebug-stop-point)) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3175 (edebug-data (get edebug-def-name 'edebug)) |
661 | 3176 |
3177 ;; pull out parts of edebug-data | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3178 (edebug-def-mark (car edebug-data)) |
661 | 3179 (edebug-breakpoints (car (cdr edebug-data))) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3180 (offset-vector (nth 2 edebug-data)) |
661 | 3181 present) |
3182 ;; delete it either way | |
3183 (setq present (assq index edebug-breakpoints)) | |
3184 (setq edebug-breakpoints (delq present edebug-breakpoints)) | |
3185 (if flag | |
3186 (progn | |
3187 ;; add it to the list and resort | |
3188 (setq edebug-breakpoints | |
3189 (edebug-sort-alist | |
3190 (cons | |
3191 (list index condition temporary) | |
3192 edebug-breakpoints) '<)) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3193 (if condition |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3194 (message "Breakpoint set in %s with condition: %s" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3195 edebug-def-name condition) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3196 (message "Breakpoint set in %s" edebug-def-name))) |
661 | 3197 (if present |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3198 (message "Breakpoint unset in %s" edebug-def-name) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3199 (message "No breakpoint here"))) |
661 | 3200 |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3201 (setcar (cdr edebug-data) edebug-breakpoints) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3202 (goto-char (+ edebug-def-mark (aref offset-vector index))) |
661 | 3203 )))) |
3204 | |
3205 (defun edebug-set-breakpoint (arg) | |
3206 "Set the breakpoint of nearest sexp. | |
3207 With prefix argument, make it a temporary breakpoint." | |
3208 (interactive "P") | |
3209 (edebug-modify-breakpoint t nil arg)) | |
3210 | |
3211 (defun edebug-unset-breakpoint () | |
3212 "Clear the breakpoint of nearest sexp." | |
3213 (interactive) | |
3214 (edebug-modify-breakpoint nil)) | |
3215 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3216 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3217 ;; For emacs 18, no read-expression-history |
661 | 3218 (defun edebug-set-conditional-breakpoint (arg condition) |
3219 "Set a conditional breakpoint at nearest sexp. | |
3220 The condition is evaluated in the outside context. | |
3221 With prefix argument, make it a temporary breakpoint." | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3222 ;; (interactive "P\nxCondition: ") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3223 (interactive |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3224 (list |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3225 current-prefix-arg |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3226 ;; Edit previous condition as follows, but it is cumbersome: |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3227 (let ((edebug-stop-point (edebug-find-stop-point))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3228 (if edebug-stop-point |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3229 (let* ((edebug-def-name (car edebug-stop-point)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3230 (index (cdr edebug-stop-point)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3231 (edebug-data (get edebug-def-name 'edebug)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3232 (edebug-breakpoints (car (cdr edebug-data))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3233 (edebug-break-data (assq index edebug-breakpoints)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3234 (edebug-break-condition (car (cdr edebug-break-data)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3235 (read-minibuffer |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3236 (format "Condition in %s: " edebug-def-name) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3237 (if edebug-break-condition |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3238 (format "%s" edebug-break-condition) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3239 (format "")))))))) |
661 | 3240 (edebug-modify-breakpoint t condition arg)) |
3241 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3242 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3243 (defun edebug-set-global-break-condition (expression) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3244 (interactive (list (read-minibuffer |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3245 "Global Condition: " |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3246 (format "%s" edebug-global-break-condition)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3247 (setq edebug-global-break-condition expression)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3248 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3249 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3250 ;;; Mode switching functions |
661 | 3251 |
3252 (defun edebug-set-mode (mode shortmsg msg) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3253 ;; Set the edebug mode to MODE. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3254 ;; Display SHORTMSG, or MSG if not within edebug. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3255 (if (eq (1+ edebug-recursion-depth) (recursion-depth)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3256 (progn |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3257 (setq edebug-execution-mode mode) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3258 (message shortmsg) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3259 ;; Continue execution |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3260 (exit-recursive-edit)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3261 ;; This is not terribly useful!! |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3262 (setq edebug-next-execution-mode mode) |
661 | 3263 (message msg))) |
3264 | |
3265 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3266 (defalias 'edebug-step-through-mode 'edebug-step-mode) |
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 (defun edebug-step-mode () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3269 "Proceed to next stop point." |
661 | 3270 (interactive) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3271 (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
|
3272 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3273 (defun edebug-next-mode () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3274 "Proceed to next `after' stop point." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3275 (interactive) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3276 (edebug-set-mode 'next "" "Edebug will stop after next eval.")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3277 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3278 (defun edebug-go-mode (arg) |
661 | 3279 "Go, evaluating until break. |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3280 With prefix ARG, set temporary break at current point and go." |
661 | 3281 (interactive "P") |
3282 (if arg | |
3283 (edebug-set-breakpoint t)) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3284 (edebug-set-mode 'go "Go..." "Edebug will go until break.")) |
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-Go-nonstop-mode () |
661 | 3287 "Go, evaluating without debugging." |
3288 (interactive) | |
3289 (edebug-set-mode 'Go-nonstop "Go-Nonstop..." | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3290 "Edebug will not stop at breaks.")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3291 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3292 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3293 (defun edebug-trace-mode () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3294 "Begin trace mode." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3295 (interactive) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3296 (edebug-set-mode 'trace "Tracing..." "Edebug will trace with pause.")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3297 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3298 (defun edebug-Trace-fast-mode () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3299 "Trace with no wait at each step." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3300 (interactive) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3301 (edebug-set-mode 'Trace-fast |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3302 "Trace fast..." "Edebug will trace without pause.")) |
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-continue-mode () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3305 "Begin continue mode." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3306 (interactive) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3307 (edebug-set-mode 'continue "Continue..." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3308 "Edebug will pause at breakpoints.")) |
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 (defun edebug-Continue-fast-mode () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3311 "Trace with no wait at each step." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3312 (interactive) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3313 (edebug-set-mode 'Continue-fast "Continue fast..." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3314 "Edebug will stop and go at breakpoints.")) |
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 ;; ------------------------------------------------------------ |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3317 ;; The following use the mode changing commands and breakpoints. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3318 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3319 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3320 (defun edebug-goto-here () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3321 "Proceed to this stop point." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3322 (interactive) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3323 (edebug-go-mode t)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3324 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3325 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3326 (defun edebug-stop () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3327 "Stop execution and do not continue. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3328 Useful for exiting from trace or continue loop." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3329 (interactive) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3330 (message "Stop")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3331 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3332 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3333 '(defun edebug-forward () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3334 "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
|
3335 (interactive) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3336 (edebug-set-mode |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3337 'forward "Forward" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3338 "Edebug will stop after exiting the next expression.")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3339 |
661 | 3340 |
3341 (defun edebug-forward-sexp (arg) | |
3342 "Proceed from the current point to the end of the ARGth sexp ahead. | |
3343 If there are not ARG sexps ahead, then do edebug-step-out." | |
3344 (interactive "p") | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3345 (condition-case nil |
661 | 3346 (let ((parse-sexp-ignore-comments t)) |
3347 ;; Call forward-sexp repeatedly until done or failure. | |
3348 (forward-sexp arg) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3349 (edebug-go-mode t)) |
661 | 3350 (error |
3351 (edebug-step-out) | |
3352 ))) | |
3353 | |
3354 (defun edebug-step-out () | |
3355 "Proceed from the current point to the end of the containing sexp. | |
3356 If there is no containing sexp that is not the top level defun, | |
3357 go to the end of the last sexp, or if that is the same point, then step." | |
3358 (interactive) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3359 (condition-case nil |
661 | 3360 (let ((parse-sexp-ignore-comments t)) |
3361 (up-list 1) | |
3362 (save-excursion | |
3363 ;; Is there still a containing expression? | |
3364 (up-list 1)) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3365 (edebug-go-mode t)) |
661 | 3366 (error |
3367 ;; At top level - 1, so first check if there are more sexps at this level. | |
3368 (let ((start-point (point))) | |
3369 ;; (up-list 1) | |
3370 (down-list -1) | |
3371 (if (= (point) start-point) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3372 (edebug-step-mode) ; No more at this level, so step. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3373 (edebug-go-mode t) |
661 | 3374 ))))) |
3375 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3376 (defun edebug-instrument-function (func) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3377 ;; Func should be a function symbol. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3378 ;; Return the function symbol, or nil if not instrumented. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3379 (let ((func-marker)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3380 (setq func-marker (get func 'edebug)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3381 (cond |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3382 ((markerp func-marker) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3383 ;; It is uninstrumented, so instrument it. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3384 (save-excursion |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3385 (set-buffer (marker-buffer func-marker)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3386 (goto-char func-marker) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3387 (edebug-eval-top-level-form) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3388 func)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3389 ((consp func-marker) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3390 (message "%s is already instrumented." func) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3391 func) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3392 (t |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3393 ;; We could try harder, e.g. do a tags search. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3394 (error "Don't know where %s is defined" func) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3395 nil)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3396 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3397 (defun edebug-instrument-callee () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3398 "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
|
3399 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
|
3400 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
|
3401 function or macro is called, Edebug will be called there as well." |
661 | 3402 (interactive) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3403 (if (not (looking-at "\(")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3404 (error "You must be before a list form") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3405 (let ((func |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3406 (save-excursion |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3407 (down-list 1) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3408 (if (looking-at "\(") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3409 (edebug-form-data-name |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3410 (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
|
3411 (edebug-original-read (current-buffer)))))) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3412 (edebug-instrument-function func)))) |
661 | 3413 |
3414 | |
3415 (defun edebug-step-in () | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3416 "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
|
3417 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
|
3418 instrumented. Then it does `edebug-on-entry' and switches to `go' mode." |
661 | 3419 (interactive) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3420 (let ((func (edebug-instrument-callee))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3421 (if func |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3422 (progn |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3423 (edebug-on-entry func 'temp) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3424 (edebug-go-mode nil))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3425 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3426 (defun edebug-on-entry (function &optional flag) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3427 "Cause Edebug to stop when FUNCTION is called. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3428 With prefix argument, make this temporary so it is automatically |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3429 cancelled the first time the function is entered." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3430 (interactive "aEdebug on entry to: \nP") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3431 ;; Could store this in the edebug data instead. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3432 (put function 'edebug-on-entry (if flag 'temp t))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3433 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3434 (defun cancel-edebug-on-entry (function) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3435 (interactive "aEdebug on entry to: ") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3436 (put function 'edebug-on-entry nil)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3437 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3438 |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
3439 (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
|
3440 (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
|
3441 '(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
|
3442 ;; Also need edebug-cancel-debug-on-entry |
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-debug-on-entry (function) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3445 "Request FUNCTION to invoke debugger each time it is called. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3446 If the user continues, FUNCTION's execution proceeds. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3447 Works by modifying the definition of FUNCTION, |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3448 which must be written in Lisp, not predefined. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3449 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
|
3450 Redefining FUNCTION also does that. |
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 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
|
3453 Edebug, it calls `edebug-on-entry'" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3454 (interactive "aDebug on entry (to function): ") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3455 (let ((func-data (get function 'edebug))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3456 (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
|
3457 (edebug-original-debug-on-entry function) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3458 (edebug-on-entry function)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3459 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3460 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3461 (defun edebug-top-level-nonstop () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3462 "Set mode to Go-nonstop, and exit to top-level. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3463 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
|
3464 (interactive) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3465 (setq edebug-execution-mode 'Go-nonstop) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3466 (top-level)) |
661 | 3467 |
3468 | |
3469 ;;(defun edebug-exit-out () | |
3470 ;; "Go until the current function exits." | |
3471 ;; (interactive) | |
3472 ;; (edebug-set-mode 'exiting "Exit...")) | |
3473 | |
3474 | |
3475 ;;; The following initial mode setting definitions are not used yet. | |
3476 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3477 '(defconst edebug-initial-mode-alist |
661 | 3478 '((edebug-Continue-fast . Continue-fast) |
3479 (edebug-Trace-fast . Trace-fast) | |
3480 (edebug-continue . continue) | |
3481 (edebug-trace . trace) | |
3482 (edebug-go . go) | |
3483 (edebug-step-through . step) | |
3484 (edebug-Go-nonstop . Go-nonstop) | |
3485 ) | |
3486 "Association list between commands and the modes they set.") | |
3487 | |
3488 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3489 '(defun edebug-set-initial-mode () |
661 | 3490 "Ask for the initial mode of the enclosing function. |
3491 The mode is requested via the key that would be used to set the mode in | |
3492 edebug-mode." | |
3493 (interactive) | |
3494 (let* ((this-function (edebug-which-function)) | |
3495 (keymap (if (eq edebug-mode-map (current-local-map)) | |
3496 edebug-mode-map)) | |
3497 (old-mode (or (get this-function 'edebug-initial-mode) | |
3498 edebug-initial-mode)) | |
3499 (key (read-key-sequence | |
3500 (format | |
3501 "Change initial edebug mode for %s from %s (%s) to (enter key): " | |
3502 this-function | |
3503 old-mode | |
3504 (where-is-internal | |
3505 (car (rassq old-mode edebug-initial-mode-alist)) | |
3506 keymap 'firstonly | |
3507 )))) | |
3508 (mode (cdr (assq (key-binding key) edebug-initial-mode-alist))) | |
3509 ) | |
3510 (if (and mode | |
3511 (or (get this-function 'edebug-initial-mode) | |
3512 (not (eq mode edebug-initial-mode)))) | |
3513 (progn | |
3514 (put this-function 'edebug-initial-mode mode) | |
3515 (message "Initial mode for %s is now: %s" | |
3516 this-function mode)) | |
5126
30682388c4cf
Delete periods from error messages.
Richard M. Stallman <rms@gnu.org>
parents:
5125
diff
changeset
|
3517 (error "Key must map to one of the mode changing commands") |
661 | 3518 ))) |
3519 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3520 ;;; Evaluation of expressions |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3521 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3522 (def-edebug-spec edebug-outside-excursion t) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3523 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3524 (defmacro edebug-outside-excursion (&rest body) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3525 "Evaluate an expression list in the outside context. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3526 Return the result of the last expression." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3527 (` (save-excursion ; of current-buffer |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3528 (if edebug-save-windows |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3529 (progn |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3530 ;; After excursion, we will |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3531 ;; restore to current window configuration. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3532 (setq edebug-inside-windows |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3533 (edebug-current-windows edebug-save-windows)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3534 ;; Restore outside windows. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3535 (edebug-set-windows edebug-outside-windows))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3536 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3537 (set-buffer edebug-buffer) ; why? |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3538 ;; (use-local-map edebug-outside-map) |
21162
6c70fa8e1a5d
(edebug-recursive-edit)
Richard M. Stallman <rms@gnu.org>
parents:
20832
diff
changeset
|
3539 (set-match-data edebug-outside-match-data) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3540 ;; Restore outside context. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3541 (let (;; (edebug-inside-map (current-local-map)) ;; restore map?? |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3542 (last-command-char edebug-outside-last-command-char) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3543 (last-command-event edebug-outside-last-command-event) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3544 (last-command edebug-outside-last-command) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3545 (this-command edebug-outside-this-command) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3546 (unread-command-char edebug-outside-unread-command-char) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3547 (unread-command-event edebug-outside-unread-command-event) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3548 (unread-command-events edebug-outside-unread-command-events) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3549 (last-input-char edebug-outside-last-input-char) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3550 (last-input-event edebug-outside-last-input-event) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3551 (last-event-frame edebug-outside-last-event-frame) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3552 (last-nonmenu-event edebug-outside-last-nonmenu-event) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3553 (track-mouse edebug-outside-track-mouse) |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
3554 (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
|
3555 (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
|
3556 |
15302
c23c9712ef5c
Use executing-kbd-macro, not executing-macro.
Karl Heuer <kwzh@gnu.org>
parents:
14846
diff
changeset
|
3557 (executing-kbd-macro edebug-outside-executing-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
|
3558 (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
|
3559 (pre-command-hook 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
|
3560 (post-command-hook 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
|
3561 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
3562 ;; See edebug-display |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3563 (overlay-arrow-position edebug-outside-o-a-p) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3564 (overlay-arrow-string edebug-outside-o-a-s) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3565 (cursor-in-echo-area edebug-outside-c-i-e-a) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3566 ) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3567 (unwind-protect |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3568 (save-excursion ; of edebug-buffer |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3569 (set-buffer edebug-outside-buffer) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3570 (goto-char edebug-outside-point) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3571 (if (marker-buffer (edebug-mark-marker)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3572 (set-marker (edebug-mark-marker) edebug-outside-mark)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3573 (,@ body)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3574 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3575 ;; Back to edebug-buffer. Restore rest of inside context. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3576 ;; (use-local-map edebug-inside-map) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3577 (if edebug-save-windows |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3578 ;; Restore inside windows. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3579 (edebug-set-windows edebug-inside-windows)) |
6666
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
3580 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
3581 ;; Save values that may 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
|
3582 (setq |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
3583 edebug-outside-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
|
3584 edebug-outside-last-command-event 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
|
3585 edebug-outside-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
|
3586 edebug-outside-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
|
3587 edebug-outside-unread-command-char 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
|
3588 edebug-outside-unread-command-event 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
|
3589 edebug-outside-unread-command-events unread-command-events |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
3590 edebug-outside-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
|
3591 edebug-outside-last-input-event 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
|
3592 edebug-outside-last-event-frame 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
|
3593 edebug-outside-last-nonmenu-event 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
|
3594 edebug-outside-track-mouse 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
|
3595 edebug-outside-standard-output 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
|
3596 edebug-outside-standard-input 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
|
3597 |
15302
c23c9712ef5c
Use executing-kbd-macro, not executing-macro.
Karl Heuer <kwzh@gnu.org>
parents:
14846
diff
changeset
|
3598 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
|
3599 edebug-outside-defining-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
|
3600 edebug-outside-pre-command-hook 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
|
3601 edebug-outside-post-command-hook 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
|
3602 |
c6430bc570f9
Numerous changes and bug fixes to bring it up to version 3.5.
Daniel LaLiberte <liberte@gnu.org>
parents:
6512
diff
changeset
|
3603 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
|
3604 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
|
3605 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
|
3606 ))) ; let |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3607 ))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3608 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3609 (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
|
3610 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3611 (defun edebug-eval (edebug-expr) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3612 ;; Are there cl lexical variables active? |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3613 (if cl-debug-env |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3614 (eval (cl-macroexpand-all edebug-expr cl-debug-env)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3615 (eval edebug-expr))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3616 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3617 (defun edebug-safe-eval (edebug-expr) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3618 ;; Evaluate EXPR safely. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3619 ;; 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
|
3620 (condition-case edebug-err |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3621 (edebug-eval edebug-expr) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3622 (error (edebug-format "%s: %s" ;; could |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3623 (get (car edebug-err) 'error-message) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3624 (car (cdr edebug-err)))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3625 |
14846 | 3626 ;;; Printing |
3627 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3628 ;; Replace printing functions. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3629 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3630 ;; obsolete names |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3631 (defalias 'edebug-install-custom-print-funcs 'edebug-install-custom-print) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3632 (defalias 'edebug-reset-print-funcs 'edebug-uninstall-custom-print) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3633 (defalias 'edebug-uninstall-custom-print-funcs 'edebug-uninstall-custom-print) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3634 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3635 (defun edebug-install-custom-print () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3636 "Replace print functions used by Edebug with custom versions." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3637 ;; Modifying the custom print functions, or changing print-length, |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3638 ;; 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
|
3639 ;; have immediate effect. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3640 (interactive) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3641 (require 'cust-print) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3642 (defalias 'edebug-prin1 'custom-prin1) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3643 (defalias 'edebug-print 'custom-print) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3644 (defalias 'edebug-prin1-to-string 'custom-prin1-to-string) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3645 (defalias 'edebug-format 'custom-format) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3646 (defalias 'edebug-message 'custom-message) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3647 "Installed") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3648 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3649 (eval-and-compile |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3650 (defun edebug-uninstall-custom-print () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3651 "Replace edebug custom print functions with internal versions." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3652 (interactive) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3653 (defalias 'edebug-prin1 'prin1) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3654 (defalias 'edebug-print 'print) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3655 (defalias 'edebug-prin1-to-string 'prin1-to-string) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3656 (defalias 'edebug-format 'format) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3657 (defalias 'edebug-message 'message) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3658 "Uninstalled") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3659 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3660 ;; Default print functions are the same as Emacs'. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3661 (edebug-uninstall-custom-print)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3662 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3663 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3664 (defun edebug-report-error (edebug-value) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3665 ;; Print an error message like command level does. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3666 ;; 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
|
3667 (message "%s: %s" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3668 (or (get (car edebug-value) 'error-message) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3669 (format "peculiar error (%s)" (car edebug-value))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3670 (mapconcat (function (lambda (edebug-arg) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3671 ;; continuing after an error may |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3672 ;; complain about edebug-arg. why?? |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3673 (prin1-to-string edebug-arg))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3674 (cdr edebug-value) ", "))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3675 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3676 ;; Define here in case they are not already defined. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3677 (defvar print-level nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3678 (defvar print-circle nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3679 (defvar print-readably) ;; defined by lemacs |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3680 ;; 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
|
3681 ;; 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
|
3682 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3683 (defun edebug-safe-prin1-to-string (value) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3684 (let ((print-escape-newlines t) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3685 (print-length (or edebug-print-length print-length)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3686 (print-level (or edebug-print-level print-level)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3687 (print-circle (or edebug-print-circle print-circle)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3688 (print-readably nil)) ;; lemacs uses this. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3689 (edebug-prin1-to-string value))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3690 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3691 (defun edebug-compute-previous-result (edebug-previous-value) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3692 (setq edebug-previous-result |
21643
475d7e2df534
(edebug-compute-previous-result):
Richard M. Stallman <rms@gnu.org>
parents:
21162
diff
changeset
|
3693 (if (and (integerp edebug-previous-value) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3694 (< edebug-previous-value 256) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3695 (>= edebug-previous-value 0)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3696 (format "Result: %s = %s" edebug-previous-value |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3697 (single-key-description edebug-previous-value)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3698 (if edebug-unwrap-results |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3699 (setq edebug-previous-value |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3700 (edebug-unwrap* edebug-previous-value))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3701 (concat "Result: " |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3702 (edebug-safe-prin1-to-string edebug-previous-value))))) |
661 | 3703 |
3704 (defun edebug-previous-result () | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3705 "Print the previous result." |
661 | 3706 (interactive) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3707 (message "%s" edebug-previous-result)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3708 |
14846 | 3709 ;;; Read, Eval and Print |
6512
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-eval-expression (edebug-expr) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3712 "Evaluate an expression in the outside environment. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3713 If interactive, prompt for the expression. |
661 | 3714 Print result in minibuffer." |
3715 (interactive "xEval: ") | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3716 (princ |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3717 (edebug-outside-excursion |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3718 (setq values (cons (edebug-eval edebug-expr) values)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3719 (edebug-safe-prin1-to-string (car values))))) |
661 | 3720 |
3721 (defun edebug-eval-last-sexp () | |
3722 "Evaluate sexp before point in the outside environment; | |
3723 print value in minibuffer." | |
3724 (interactive) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3725 (edebug-eval-expression (edebug-last-sexp))) |
661 | 3726 |
3727 (defun edebug-eval-print-last-sexp () | |
3728 "Evaluate sexp before point in the outside environment; | |
3729 print value into current buffer." | |
3730 (interactive) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3731 (let* ((edebug-form (edebug-last-sexp)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3732 (edebug-result-string |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3733 (edebug-outside-excursion |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3734 (edebug-safe-prin1-to-string (edebug-safe-eval edebug-form)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3735 (standard-output (current-buffer))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3736 (princ "\n") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3737 ;; princ the string to get rid of quotes. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3738 (princ edebug-result-string) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3739 (princ "\n") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3740 )) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3741 |
14846 | 3742 ;;; Edebug Minor Mode |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3743 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3744 ;; Global GUD bindings for all emacs-lisp-mode buffers. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3745 (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
|
3746 (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
|
3747 (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
|
3748 (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
|
3749 |
661 | 3750 |
3751 (defvar edebug-mode-map nil) | |
3752 (if edebug-mode-map | |
3753 nil | |
3754 (progn | |
3755 (setq edebug-mode-map (copy-keymap emacs-lisp-mode-map)) | |
3756 ;; control | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3757 (define-key edebug-mode-map " " 'edebug-step-mode) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3758 (define-key edebug-mode-map "n" 'edebug-next-mode) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3759 (define-key edebug-mode-map "g" 'edebug-go-mode) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3760 (define-key edebug-mode-map "G" 'edebug-Go-nonstop-mode) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3761 (define-key edebug-mode-map "t" 'edebug-trace-mode) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3762 (define-key edebug-mode-map "T" 'edebug-Trace-fast-mode) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3763 (define-key edebug-mode-map "c" 'edebug-continue-mode) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3764 (define-key edebug-mode-map "C" 'edebug-Continue-fast-mode) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3765 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3766 ;;(define-key edebug-mode-map "f" 'edebug-forward) not implemented |
661 | 3767 (define-key edebug-mode-map "f" 'edebug-forward-sexp) |
3768 (define-key edebug-mode-map "h" 'edebug-goto-here) | |
3769 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3770 (define-key edebug-mode-map "I" 'edebug-instrument-callee) |
661 | 3771 (define-key edebug-mode-map "i" 'edebug-step-in) |
3772 (define-key edebug-mode-map "o" 'edebug-step-out) | |
3773 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3774 ;; quitting and stopping |
661 | 3775 (define-key edebug-mode-map "q" 'top-level) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3776 (define-key edebug-mode-map "Q" 'edebug-top-level-nonstop) |
661 | 3777 (define-key edebug-mode-map "a" 'abort-recursive-edit) |
3778 (define-key edebug-mode-map "S" 'edebug-stop) | |
3779 | |
3780 ;; breakpoints | |
3781 (define-key edebug-mode-map "b" 'edebug-set-breakpoint) | |
3782 (define-key edebug-mode-map "u" 'edebug-unset-breakpoint) | |
3783 (define-key edebug-mode-map "B" 'edebug-next-breakpoint) | |
3784 (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
|
3785 (define-key edebug-mode-map "X" 'edebug-set-global-break-condition) |
661 | 3786 |
3787 ;; evaluation | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3788 (define-key edebug-mode-map "r" 'edebug-previous-result) |
661 | 3789 (define-key edebug-mode-map "e" 'edebug-eval-expression) |
3790 (define-key edebug-mode-map "\C-x\C-e" 'edebug-eval-last-sexp) | |
3791 (define-key edebug-mode-map "E" 'edebug-visit-eval-list) | |
3792 | |
3793 ;; views | |
3794 (define-key edebug-mode-map "w" 'edebug-where) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3795 (define-key edebug-mode-map "v" 'edebug-view-outside) ;; maybe obsolete?? |
661 | 3796 (define-key edebug-mode-map "p" 'edebug-bounce-point) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3797 (define-key edebug-mode-map "P" 'edebug-view-outside) ;; same as v |
661 | 3798 (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
|
3799 |
661 | 3800 ;; misc |
3801 (define-key edebug-mode-map "?" 'edebug-help) | |
3802 (define-key edebug-mode-map "d" 'edebug-backtrace) | |
3803 | |
3804 (define-key edebug-mode-map "-" 'negative-argument) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3805 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3806 ;; statistics |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3807 (define-key edebug-mode-map "=" 'edebug-temp-display-freq-count) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3808 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3809 ;; GUD bindings |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3810 (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
|
3811 (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
|
3812 (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
|
3813 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3814 (define-key edebug-mode-map "\C-x " 'edebug-set-breakpoint) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3815 (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
|
3816 (define-key edebug-mode-map "\C-c\C-t" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3817 (function (lambda () (edebug-set-breakpoint t)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3818 (define-key edebug-mode-map "\C-c\C-l" 'edebug-where) |
661 | 3819 )) |
3820 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3821 ;; Autoloading these global bindings doesn't make sense because |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3822 ;; 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
|
3823 |
661 | 3824 (defvar global-edebug-prefix "\^XX" |
3825 "Prefix key for global edebug commands, available from any buffer.") | |
3826 | |
3827 (defvar global-edebug-map nil | |
3828 "Global map of edebug commands, available from any buffer.") | |
3829 | |
3830 (if global-edebug-map | |
3831 nil | |
3832 (setq global-edebug-map (make-sparse-keymap)) | |
3833 | |
3834 (global-unset-key global-edebug-prefix) | |
3835 (global-set-key global-edebug-prefix global-edebug-map) | |
3836 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3837 (define-key global-edebug-map " " 'edebug-step-mode) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3838 (define-key global-edebug-map "g" 'edebug-go-mode) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3839 (define-key global-edebug-map "G" 'edebug-Go-nonstop-mode) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3840 (define-key global-edebug-map "t" 'edebug-trace-mode) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3841 (define-key global-edebug-map "T" 'edebug-Trace-fast-mode) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3842 (define-key global-edebug-map "c" 'edebug-continue-mode) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3843 (define-key global-edebug-map "C" 'edebug-Continue-fast-mode) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3844 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3845 ;; breakpoints |
661 | 3846 (define-key global-edebug-map "b" 'edebug-set-breakpoint) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3847 (define-key global-edebug-map "u" 'edebug-unset-breakpoint) |
661 | 3848 (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
|
3849 (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
|
3850 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3851 ;; views |
661 | 3852 (define-key global-edebug-map "w" 'edebug-where) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3853 (define-key global-edebug-map "W" 'edebug-toggle-save-windows) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3854 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3855 ;; quitting |
661 | 3856 (define-key global-edebug-map "q" 'top-level) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3857 (define-key global-edebug-map "Q" 'edebug-top-level-nonstop) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3858 (define-key global-edebug-map "a" 'abort-recursive-edit) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3859 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3860 ;; statistics |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3861 (define-key global-edebug-map "=" 'edebug-display-freq-count) |
661 | 3862 ) |
3863 | |
3864 (defun edebug-help () | |
3865 (interactive) | |
3866 (describe-function 'edebug-mode)) | |
3867 | |
3868 (defun edebug-mode () | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3869 "Mode for Emacs Lisp buffers while in Edebug. |
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 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
|
3872 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
|
3873 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
|
3874 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
|
3875 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3876 Also see bindings for the eval list buffer, *edebug*. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3877 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3878 The edebug buffer commands: |
661 | 3879 \\{edebug-mode-map} |
3880 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3881 Global commands prefixed by `global-edebug-prefix': |
661 | 3882 \\{global-edebug-map} |
3883 | |
3884 Options: | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3885 edebug-setup-hook |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3886 edebug-all-defs |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3887 edebug-all-forms |
661 | 3888 edebug-save-windows |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3889 edebug-save-displayed-buffer-points |
661 | 3890 edebug-initial-mode |
3891 edebug-trace | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3892 edebug-test-coverage |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3893 edebug-continue-kbd-macro |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3894 edebug-print-length |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3895 edebug-print-level |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3896 edebug-print-circle |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3897 edebug-on-error |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3898 edebug-on-quit |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3899 edebug-on-signal |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3900 edebug-unwrap-results |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3901 edebug-global-break-condition |
661 | 3902 " |
3903 (use-local-map edebug-mode-map)) | |
3904 | |
14846 | 3905 ;;; edebug eval list mode |
3906 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3907 ;; A list of expressions and their evaluations is displayed in *edebug*. |
661 | 3908 |
3909 (defun edebug-eval-result-list () | |
3910 "Return a list of evaluations of edebug-eval-list" | |
3911 ;; 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
|
3912 ;; 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
|
3913 (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
|
3914 (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
|
3915 (mapcar 'edebug-safe-eval edebug-eval-list))) |
661 | 3916 |
3917 (defun edebug-eval-display-list (edebug-eval-result-list) | |
3918 ;; Assumes edebug-eval-buffer exists. | |
3919 (let ((edebug-eval-list-temp edebug-eval-list) | |
3920 (standard-output edebug-eval-buffer) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3921 (edebug-comment-line |
661 | 3922 (format ";%s\n" (make-string (- (window-width) 2) ?-)))) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3923 (set-buffer edebug-eval-buffer) |
661 | 3924 (erase-buffer) |
3925 (while edebug-eval-list-temp | |
3926 (prin1 (car edebug-eval-list-temp)) (terpri) | |
3927 (prin1 (car edebug-eval-result-list)) (terpri) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
3928 (princ edebug-comment-line) |
661 | 3929 (setq edebug-eval-list-temp (cdr edebug-eval-list-temp)) |
3930 (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
|
3931 (edebug-pop-to-buffer edebug-eval-buffer) |
661 | 3932 )) |
3933 | |
3934 (defun edebug-create-eval-buffer () | |
3935 (if (not (and edebug-eval-buffer (buffer-name edebug-eval-buffer))) | |
3936 (progn | |
3937 (set-buffer (setq edebug-eval-buffer (get-buffer-create "*edebug*"))) | |
3938 (edebug-eval-mode)))) | |
3939 | |
3940 ;; Should generalize this to be callable outside of edebug | |
3941 ;; with calls in user functions, e.g. (edebug-eval-display) | |
3942 | |
3943 (defun edebug-eval-display (edebug-eval-result-list) | |
3944 "Display expressions and evaluations in EVAL-LIST. | |
3945 It modifies the context by popping up the eval display." | |
3946 (if edebug-eval-result-list | |
3947 (progn | |
3948 (edebug-create-eval-buffer) | |
3949 (edebug-eval-display-list edebug-eval-result-list) | |
3950 ))) | |
3951 | |
3952 (defun edebug-eval-redisplay () | |
3953 "Redisplay eval list in outside environment. | |
3954 May only be called from within edebug-recursive-edit." | |
3955 (edebug-create-eval-buffer) | |
3956 (edebug-outside-excursion | |
3957 (edebug-eval-display-list (edebug-eval-result-list)) | |
3958 )) | |
3959 | |
3960 (defun edebug-visit-eval-list () | |
3961 (interactive) | |
3962 (edebug-eval-redisplay) | |
3963 (edebug-pop-to-buffer edebug-eval-buffer)) | |
3964 | |
3965 | |
3966 (defun edebug-update-eval-list () | |
3967 "Replace the evaluation list with the sexps now in the eval buffer." | |
3968 (interactive) | |
3969 (let ((starting-point (point)) | |
3970 new-list) | |
3971 (goto-char (point-min)) | |
3972 ;; get the first expression | |
3973 (edebug-skip-whitespace) | |
3974 (if (not (eobp)) | |
3975 (progn | |
3976 (forward-sexp 1) | |
3977 (setq new-list (cons (edebug-last-sexp) new-list)))) | |
3978 | |
3979 (while (re-search-forward "^;" nil t) | |
3980 (forward-line 1) | |
3981 (skip-chars-forward " \t\n\r") | |
3982 (if (and (/= ?\; (following-char)) | |
3983 (not (eobp))) | |
3984 (progn | |
3985 (forward-sexp 1) | |
3986 (setq new-list (cons (edebug-last-sexp) new-list))))) | |
3987 | |
3988 (setq edebug-eval-list (nreverse new-list)) | |
3989 (edebug-eval-redisplay) | |
3990 (goto-char starting-point))) | |
3991 | |
3992 | |
3993 (defun edebug-delete-eval-item () | |
3994 "Delete the item under point and redisplay." | |
3995 ;; could add arg to do repeatedly | |
3996 (interactive) | |
3997 (if (re-search-backward "^;" nil 'nofail) | |
3998 (forward-line 1)) | |
3999 (delete-region | |
4000 (point) (progn (re-search-forward "^;" nil 'nofail) | |
4001 (beginning-of-line) | |
4002 (point))) | |
4003 (edebug-update-eval-list)) | |
4004 | |
4005 | |
4006 | |
4007 (defvar edebug-eval-mode-map nil | |
20078
0fc1437e7427
(edebug-eval-mode): Nicer mode-name value.
Karl Heuer <kwzh@gnu.org>
parents:
19930
diff
changeset
|
4008 "Keymap for Edebug Eval mode. Superset of Lisp Interaction mode.") |
661 | 4009 |
4010 (if edebug-eval-mode-map | |
4011 nil | |
4012 (setq edebug-eval-mode-map (copy-keymap lisp-interaction-mode-map)) | |
4013 | |
4014 (define-key edebug-eval-mode-map "\C-c\C-w" 'edebug-where) | |
4015 (define-key edebug-eval-mode-map "\C-c\C-d" 'edebug-delete-eval-item) | |
4016 (define-key edebug-eval-mode-map "\C-c\C-u" 'edebug-update-eval-list) | |
4017 (define-key edebug-eval-mode-map "\C-x\C-e" 'edebug-eval-last-sexp) | |
4018 (define-key edebug-eval-mode-map "\C-j" 'edebug-eval-print-last-sexp) | |
4019 ) | |
4020 | |
17650
dbcf0b5d5265
(edebug-eval-mode): Add a mode-class property.
Richard M. Stallman <rms@gnu.org>
parents:
17458
diff
changeset
|
4021 (put 'edebug-eval-mode 'mode-class 'special) |
661 | 4022 |
4023 (defun edebug-eval-mode () | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4024 "Mode for evaluation list buffer while in Edebug. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4025 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4026 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
|
4027 global key bindings to several Edebug specific commands. E.g. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4028 `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
|
4029 buffer and \\<global-map>\\[edebug-step-mode] in any buffer. |
661 | 4030 |
4031 Eval list buffer commands: | |
4032 \\{edebug-eval-mode-map} | |
4033 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4034 Global commands prefixed by global-edebug-prefix: |
661 | 4035 \\{global-edebug-map} |
4036 " | |
4037 (lisp-interaction-mode) | |
4038 (setq major-mode 'edebug-eval-mode) | |
20078
0fc1437e7427
(edebug-eval-mode): Nicer mode-name value.
Karl Heuer <kwzh@gnu.org>
parents:
19930
diff
changeset
|
4039 (setq mode-name "Edebug Eval") |
661 | 4040 (use-local-map edebug-eval-mode-map)) |
4041 | |
14846 | 4042 ;;; Interface with standard debugger. |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4043 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4044 ;; (setq debugger 'edebug) ; to use the edebug debugger |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4045 ;; (setq debugger 'debug) ; use the standard debugger |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4046 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4047 ;; 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
|
4048 ;; 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
|
4049 ;; edebug is not dependent on this, yet. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4050 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4051 (defun edebug (&optional edebug-arg-mode &rest debugger-args) |
661 | 4052 "Replacement for debug. |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4053 If we are running an edebugged function, |
661 | 4054 show where we last were. Otherwise call debug normally." |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4055 ;; (message "entered: %s depth: %s edebug-recursion-depth: %s" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4056 ;; edebug-entered (recursion-depth) edebug-recursion-depth) (sit-for 1) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4057 (if (and edebug-entered ; anything active? |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4058 (eq (recursion-depth) edebug-recursion-depth)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4059 (let (;; Where were we before the error occurred? |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4060 (edebug-offset-index (car edebug-offset-indices)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4061 ;; Bind variables required by edebug-display |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4062 (edebug-value (car debugger-args)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4063 edebug-breakpoints |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4064 edebug-break-data |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4065 edebug-break-condition |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4066 edebug-global-break |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4067 (edebug-break (null edebug-arg-mode)) ;; if called explicitly |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4068 ) |
661 | 4069 (edebug-display) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4070 (if (eq edebug-arg-mode 'error) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4071 nil |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4072 edebug-value)) |
661 | 4073 |
4074 ;; Otherwise call debug normally. | |
4075 ;; Still need to remove extraneous edebug calls from stack. | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4076 (apply 'debug edebug-arg-mode debugger-args) |
661 | 4077 )) |
4078 | |
4079 | |
4080 (defun edebug-backtrace () | |
4081 "Display a non-working backtrace. Better than nothing..." | |
4082 (interactive) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4083 (if (or (not edebug-backtrace-buffer) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4084 (null (buffer-name edebug-backtrace-buffer))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4085 (setq edebug-backtrace-buffer |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4086 (generate-new-buffer "*Backtrace*")) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4087 ;; else, could just display edebug-backtrace-buffer |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4088 ) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4089 (with-output-to-temp-buffer (buffer-name edebug-backtrace-buffer) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4090 (setq edebug-backtrace-buffer standard-output) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4091 (let ((print-escape-newlines t) |
661 | 4092 (print-length 50) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4093 last-ok-point) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4094 (backtrace) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4095 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4096 ;; Clean up the backtrace. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4097 ;; Not quite right for current edebug scheme. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4098 (set-buffer edebug-backtrace-buffer) |
661 | 4099 (setq truncate-lines t) |
4100 (goto-char (point-min)) | |
4101 (setq last-ok-point (point)) | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4102 (if t (progn |
661 | 4103 |
4104 ;; Delete interspersed edebug internals. | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4105 (while (re-search-forward "^ \(?edebug" nil t) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4106 (beginning-of-line) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4107 (cond |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4108 ((looking-at "^ \(edebug-after") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4109 ;; Previous lines may contain code, so just delete this line |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4110 (setq last-ok-point (point)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4111 (forward-line 1) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4112 (delete-region last-ok-point (point))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4113 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4114 ((looking-at "^ edebug") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4115 (forward-line 1) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4116 (delete-region last-ok-point (point)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4117 ))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4118 ))))) |
661 | 4119 |
4120 | |
14846 | 4121 ;;; Trace display |
661 | 4122 |
4123 (defun edebug-trace-display (buf-name fmt &rest args) | |
4124 "In buffer BUF-NAME, display FMT and ARGS at the end and make it visible. | |
4125 The buffer is created if it does not exist. | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4126 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
|
4127 ;; e.g. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4128 ;; (edebug-trace-display "*trace-point*" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4129 ;; "saving: point = %s window-start = %s" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4130 ;; (point) (window-start)) |
15782
096142df0b36
(edebug-trace-display): Save and restore current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
15302
diff
changeset
|
4131 (let* ((oldbuf (current-buffer)) |
096142df0b36
(edebug-trace-display): Save and restore current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
15302
diff
changeset
|
4132 (selected-window (selected-window)) |
661 | 4133 (buffer (get-buffer-create buf-name)) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4134 buf-window) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4135 ;; (message "before pop-to-buffer") (sit-for 1) |
661 | 4136 (edebug-pop-to-buffer buffer) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4137 (setq truncate-lines t) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4138 (setq buf-window (selected-window)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4139 (goto-char (point-max)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4140 (insert (apply 'edebug-format fmt args) "\n") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4141 ;; Make it visible. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4142 (vertical-motion (- 1 (window-height))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4143 (set-window-start buf-window (point)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4144 (goto-char (point-max)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4145 ;; (set-window-point buf-window (point)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4146 ;; (edebug-sit-for 0) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4147 (bury-buffer buffer) |
15782
096142df0b36
(edebug-trace-display): Save and restore current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
15302
diff
changeset
|
4148 (select-window selected-window) |
096142df0b36
(edebug-trace-display): Save and restore current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
15302
diff
changeset
|
4149 (set-buffer oldbuf)) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4150 buf-name) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4151 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4152 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4153 (defun edebug-trace (fmt &rest args) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4154 "Convenience call to edebug-trace-display using edebug-trace-buffer" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4155 (apply 'edebug-trace-display edebug-trace-buffer fmt args)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4156 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4157 |
14846 | 4158 ;;; Frequency count and coverage |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4159 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4160 (defun edebug-display-freq-count () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4161 "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
|
4162 definition. The frequency counts are inserted as comment lines after |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4163 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
|
4164 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4165 The counts are inserted starting under the `(' before an expression |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4166 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
|
4167 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
|
4168 the same line. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4169 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4170 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
|
4171 are `eq', the char `=' will be appended after the count |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4172 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
|
4173 expression only evaluated once. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4174 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4175 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
|
4176 reinstrument it." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4177 (interactive) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4178 (let* ((function (edebug-form-data-symbol)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4179 (counts (get function 'edebug-freq-count)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4180 (coverages (get function 'edebug-coverage)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4181 (data (get function 'edebug)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4182 (def-mark (car data)) ; mark at def start |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4183 (edebug-points (nth 2 data)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4184 (i (1- (length edebug-points))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4185 (last-index) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4186 (first-index) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4187 (start-of-line) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4188 (start-of-count-line) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4189 (last-count) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4190 ) |
661 | 4191 (save-excursion |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4192 ;; Traverse in reverse order so offsets are correct. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4193 (while (<= 0 i) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4194 ;; Start at last expression in line. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4195 (goto-char (+ def-mark (aref edebug-points i))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4196 (beginning-of-line) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4197 (setq start-of-line (- (point) def-mark) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4198 last-index i) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4199 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4200 ;; Find all indexes on same line. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4201 (while (and (<= 0 (setq i (1- i))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4202 (<= start-of-line (aref edebug-points i)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4203 ;; Insert all the indices for this line. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4204 (forward-line 1) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4205 (setq start-of-count-line (point) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4206 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
|
4207 last-count -1) ; cause first count to always appear. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4208 (insert ";#") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4209 ;; i == first-index still |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4210 (while (<= (setq i (1+ i)) last-index) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4211 (let ((count (aref counts i)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4212 (coverage (aref coverages i)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4213 (col (save-excursion |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4214 (goto-char (+ (aref edebug-points i) def-mark)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4215 (- (current-column) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4216 (if (= ?\( (following-char)) 0 1))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4217 (insert (make-string |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4218 (max 0 (- col (- (point) start-of-count-line))) ?\ ) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4219 (if (and (< 0 count) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4220 (not (memq coverage |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4221 '(unknown ok-coverage)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4222 "=" "") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4223 (if (= count last-count) "" (int-to-string count)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4224 " ") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4225 (setq last-count count))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4226 (insert "\n") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4227 (setq i first-index))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4228 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4229 (defun edebug-temp-display-freq-count () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4230 "Temporarily display the frequency count data for the current definition. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4231 It is removed when you hit any char." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4232 ;; 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
|
4233 (interactive) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4234 (let ((buffer-read-only nil)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4235 (undo-boundary) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4236 (edebug-display-freq-count) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4237 (setq unread-command-char (read-char)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4238 (undo))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4239 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4240 |
14846 | 4241 ;;; Menus |
6512
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 (defun edebug-toggle (variable) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4244 (set variable (not (eval variable))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4245 (message "%s: %s" variable (eval variable))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4246 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4247 ;; 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
|
4248 ;; the easy-menu-define macro call is compiled correctly. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4249 (require 'easymenu) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4250 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4251 (defconst edebug-mode-menus |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4252 '("Edebug" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4253 "----" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4254 ["Stop" edebug-stop t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4255 ["Step" edebug-step-mode t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4256 ["Next" edebug-next-mode t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4257 ["Trace" edebug-trace-mode t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4258 ["Trace Fast" edebug-Trace-fast-mode t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4259 ["Continue" edebug-continue-mode t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4260 ["Continue Fast" edebug-Continue-fast-mode t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4261 ["Go" edebug-go-mode t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4262 ["Go Nonstop" edebug-Go-nonstop-mode t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4263 "----" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4264 ["Help" edebug-help t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4265 ["Abort" abort-recursive-edit t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4266 ["Quit to Top Level" top-level t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4267 ["Quit Nonstop" edebug-top-level-nonstop t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4268 "----" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4269 ("Jumps" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4270 ["Forward Sexp" edebug-forward-sexp t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4271 ["Step In" edebug-step-in t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4272 ["Step Out" edebug-step-out t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4273 ["Goto Here" edebug-goto-here t]) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4274 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4275 ("Breaks" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4276 ["Set Breakpoint" edebug-set-breakpoint t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4277 ["Unset Breakpoint" edebug-unset-breakpoint t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4278 ["Set Conditional Breakpoint" edebug-set-conditional-breakpoint t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4279 ["Set Global Break Condition" edebug-set-global-break-condition t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4280 ["Show Next Breakpoint" edebug-next-breakpoint t]) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4281 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4282 ("Views" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4283 ["Where am I?" edebug-where t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4284 ["Bounce to Current Point" edebug-bounce-point t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4285 ["View Outside Windows" edebug-view-outside t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4286 ["Previous Result" edebug-previous-result t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4287 ["Show Backtrace" edebug-backtrace t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4288 ["Display Freq Count" edebug-display-freq-count t]) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4289 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4290 ("Eval" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4291 ["Expression" edebug-eval-expression t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4292 ["Last Sexp" edebug-eval-last-sexp t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4293 ["Visit Eval List" edebug-visit-eval-list 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 ("Options" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4296 ["Edebug All Defs" edebug-all-defs t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4297 ["Edebug All Forms" edebug-all-forms t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4298 "----" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4299 ["Toggle Tracing" (edebug-toggle 'edebug-trace) t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4300 ["Toggle Coverage Testing" (edebug-toggle 'edebug-test-coverage) t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4301 ["Toggle Window Saving" edebug-toggle-save-windows t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4302 ["Toggle Point Saving" |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4303 (edebug-toggle 'edebug-save-displayed-buffer-points) t] |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4304 )) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4305 "Lemacs style menus for Edebug.") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4306 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4307 |
14846 | 4308 ;;; Emacs version specific code |
4309 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4310 ;;; 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
|
4311 ;;; 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
|
4312 ;;; change once most people are using Emacs 19 or derivatives. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4313 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4314 ;; 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
|
4315 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4316 ;; 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
|
4317 ;; to functions like mark and read-from-minibuffer. These warnings |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4318 ;; 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
|
4319 |
6671
5b26038687ed
(edebug-emacs-19-specific): Renamed from edebug-fsf19-specific.
Richard M. Stallman <rms@gnu.org>
parents:
6666
diff
changeset
|
4320 (defun edebug-emacs-19-specific () |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4321 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4322 (defalias 'edebug-window-live-p 'window-live-p) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4323 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4324 ;; Mark takes an argument in Emacs 19. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4325 (defun edebug-mark () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4326 (mark t));; Does this work for lemacs too? |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4327 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4328 (defun edebug-set-conditional-breakpoint (arg condition) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4329 "Set a conditional breakpoint at nearest sexp. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4330 The condition is evaluated in the outside context. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4331 With prefix argument, make it a temporary breakpoint." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4332 ;; (interactive "P\nxCondition: ") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4333 (interactive |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4334 (list |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4335 current-prefix-arg |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4336 ;; Read condition as follows; getting previous condition is cumbersome: |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4337 (let ((edebug-stop-point (edebug-find-stop-point))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4338 (if edebug-stop-point |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4339 (let* ((edebug-def-name (car edebug-stop-point)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4340 (index (cdr edebug-stop-point)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4341 (edebug-data (get edebug-def-name 'edebug)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4342 (edebug-breakpoints (car (cdr edebug-data))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4343 (edebug-break-data (assq index edebug-breakpoints)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4344 (edebug-break-condition (car (cdr edebug-break-data))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4345 (edebug-expression-history |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4346 ;; Prepend the current condition, if any. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4347 (if edebug-break-condition |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4348 (cons edebug-break-condition read-expression-history) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4349 read-expression-history))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4350 (prog1 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4351 (read-from-minibuffer |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4352 "Condition: " nil read-expression-map t |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4353 'edebug-expression-history) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4354 (setq read-expression-history edebug-expression-history) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4355 )))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4356 (edebug-modify-breakpoint t condition arg)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4357 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4358 (defun edebug-eval-expression (edebug-expr) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4359 "Evaluate an expression in the outside environment. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4360 If interactive, prompt for the expression. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4361 Print result in minibuffer." |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4362 (interactive (list (read-from-minibuffer |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4363 "Eval: " nil read-expression-map t |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4364 'read-expression-history))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4365 (princ |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4366 (edebug-outside-excursion |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4367 (setq values (cons (edebug-eval edebug-expr) values)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4368 (edebug-safe-prin1-to-string (car values))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4369 |
14846 | 4370 (easy-menu-define edebug-menu edebug-mode-map "Edebug menus" edebug-mode-menus) |
4371 (if window-system | |
4372 (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
|
4373 ) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4374 |
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 (defun edebug-lemacs-specific () |
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 ;; 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
|
4379 ;; `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
|
4380 ;; 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
|
4381 ;; executing a command. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4382 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4383 (defvar zmacs-regions) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4384 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4385 (defun edebug-mark () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4386 (let ((zmacs-regions nil)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4387 (mark))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4388 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4389 (defun edebug-mark-marker () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4390 (let ((zmacs-regions nil));; for lemacs |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4391 (mark-marker))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4392 |
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 (defun edebug-mode-menu (event) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4395 (interactive "@event") |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4396 (popup-menu edebug-mode-menus)) |
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 (define-key edebug-mode-map 'button3 'edebug-mode-menu) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4399 ) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4400 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4401 (defun edebug-emacs-version-specific () |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4402 (cond |
6671
5b26038687ed
(edebug-emacs-19-specific): Renamed from edebug-fsf19-specific.
Richard M. Stallman <rms@gnu.org>
parents:
6666
diff
changeset
|
4403 ((string-match "Lucid" emacs-version);; Lucid Emacs |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4404 (edebug-lemacs-specific)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4405 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4406 ((and (boundp 'epoch::version) epoch::version) |
6671
5b26038687ed
(edebug-emacs-19-specific): Renamed from edebug-fsf19-specific.
Richard M. Stallman <rms@gnu.org>
parents:
6666
diff
changeset
|
4407 (require 'edebug-epoch)) |
5b26038687ed
(edebug-emacs-19-specific): Renamed from edebug-fsf19-specific.
Richard M. Stallman <rms@gnu.org>
parents:
6666
diff
changeset
|
4408 |
5b26038687ed
(edebug-emacs-19-specific): Renamed from edebug-fsf19-specific.
Richard M. Stallman <rms@gnu.org>
parents:
6666
diff
changeset
|
4409 ((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
|
4410 (edebug-emacs-19-specific)))) |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4411 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4412 (edebug-emacs-version-specific) |
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 |
14846 | 4415 ;;; Byte-compiler |
4416 | |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4417 ;; Extension for bytecomp to resolve undefined function references. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4418 ;; Requires new byte compiler. |
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 ;; Reenable byte compiler warnings about unread-command-char and -event. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4421 ;; Disabled before edebug-recursive-edit. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4422 (eval-when-compile |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4423 (if edebug-unread-command-char-warning |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4424 (put 'unread-command-char 'byte-obsolete-variable |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4425 edebug-unread-command-char-warning)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4426 (if edebug-unread-command-event-warning |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4427 (put 'unread-command-event 'byte-obsolete-variable |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4428 edebug-unread-command-event-warning))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4429 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4430 (eval-when-compile |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4431 ;; 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
|
4432 ;; We only want to evaluate when actually byte compiling. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4433 ;; 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
|
4434 (if (featurep 'byte-compile) (progn |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4435 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4436 (defun byte-compile-resolve-functions (funcs) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4437 "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
|
4438 (mapcar |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4439 (function |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4440 (lambda (func) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4441 (setq byte-compile-unresolved-functions |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4442 (delq (assq func byte-compile-unresolved-functions) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4443 byte-compile-unresolved-functions)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4444 funcs) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4445 nil) |
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 '(defun byte-compile-resolve-free-references (vars) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4448 "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
|
4449 (mapcar |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4450 (function |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4451 (lambda (var) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4452 (setq byte-compile-free-references |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4453 (delq var byte-compile-free-references)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4454 vars) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4455 nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4456 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4457 '(defun byte-compile-resolve-free-assignments (vars) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4458 "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
|
4459 (mapcar |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4460 (function |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4461 (lambda (var) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4462 (setq byte-compile-free-assignments |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4463 (delq var byte-compile-free-assignments)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4464 vars) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4465 nil) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4466 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4467 (byte-compile-resolve-functions |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4468 '(reporter-submit-bug-report |
14846 | 4469 edebug-gensym ;; also in cl.el |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4470 ;; Interfaces to standard functions. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4471 edebug-original-eval-defun |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4472 edebug-original-read |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4473 edebug-get-buffer-window |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4474 edebug-mark |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4475 edebug-mark-marker |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4476 edebug-input-pending-p |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4477 edebug-sit-for |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4478 edebug-prin1-to-string |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4479 edebug-format |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4480 ;; lemacs |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4481 zmacs-deactivate-region |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4482 popup-menu |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4483 ;; CL |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4484 cl-macroexpand-all |
14846 | 4485 ;; 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
|
4486 byte-compile-resolve-functions |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4487 )) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4488 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4489 '(byte-compile-resolve-free-references |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4490 '(read-expression-history |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4491 read-expression-map)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4492 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4493 '(byte-compile-resolve-free-assignments |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4494 '(read-expression-history)) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4495 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4496 ))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4497 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4498 |
14846 | 4499 ;;; Autoloading of Edebug accessories |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4500 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4501 (if (featurep 'cl) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4502 (add-hook 'edebug-setup-hook |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4503 (function (lambda () (require 'cl-specs)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4504 ;; 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
|
4505 (add-hook 'cl-load-hook |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4506 (function (lambda () (require 'cl-specs))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4507 |
14846 | 4508 ;;; 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
|
4509 (if (featurep 'cl-read) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4510 (add-hook 'edebug-setup-hook |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4511 (function (lambda () (require 'edebug-cl-read)))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4512 ;; 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
|
4513 (add-hook 'cl-read-load-hooks |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4514 (function (lambda () (require 'edebug-cl-read))))) |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4515 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4516 |
14846 | 4517 ;;; Finalize Loading |
6512
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4518 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4519 ;;; Finally, hook edebug into the rest of Emacs. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4520 ;;; There are probably some other things that could go here. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4521 |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4522 ;; Install edebug read and eval functions. |
c79a6bf75daa
New version from author.
Daniel LaLiberte <liberte@gnu.org>
parents:
6226
diff
changeset
|
4523 (edebug-install-read-eval-functions) |
661 | 4524 |
3350 | 4525 (provide 'edebug) |
4526 | |
661 | 4527 ;;; edebug.el ends here |