mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-13 09:30:24 -08:00
Code Issues Projects Releases Wiki Activity

(gdb-var-create-handler)

Browse source 
(gdb-var-evaluate-expression-handler): Handle strings properly.
(gdb-var-list-children-regexp, gdb-var-list-children-handler):
Handle strings properly.  Move "type" field into regexp.
This commit is contained in:
Nick Roberts 2005-11-12 21:21:51 +00:00
parent e79b7435ac
commit 47b3cf39b4
2 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/ChangeLog
View file

@ -4,10 +4,11 @@
selected window. This still doesn't work for speedbar. selected window. This still doesn't work for speedbar.
(gud-speedbar-buttons): Handle strings properly. (gud-speedbar-buttons): Handle strings properly.
* progmodes/gdb-ui.el (gdb-var-create-handler) * progmodes/gdb-ui.el (gdb-var-evaluate-expression-handler)
(gdb-var-evaluate-expression-handler): Handle strings properly. (gdb-var-create-handler): Handle string expressions properly.
(gdb-var-list-children-regexp, gdb-var-list-children-handler): (gdb-var-list-children-regexp, gdb-var-list-children-handler):
Handle strings properly. Move "type" field into regexp. Handle string expressions properly. Move "type" field into
regexp.
2005-11-12 Karl Fogel <kfogel@red-bean.com> 2005-11-12 Karl Fogel <kfogel@red-bean.com>

20
lisp/progmodes/gdb-ui.el
View file

@ -491,7 +491,9 @@ With arg, use separate IO iff arg is positive."
(unless (string-equal (unless (string-equal
speedbar-initial-expansion-list-name "GUD") speedbar-initial-expansion-list-name "GUD")
(speedbar-change-initial-expansion-list "GUD")) (speedbar-change-initial-expansion-list "GUD"))
(if (equal (nth 2 var) "0") (if (or (equal (nth 2 var) "0")
(and (equal (nth 2 var) "1")
(equal (nth 3 var) "char *")))
(gdb-enqueue-input (gdb-enqueue-input
(list (list
(if (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer) (if (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer)
@ -509,14 +511,14 @@ With arg, use separate IO iff arg is positive."
(defun gdb-var-evaluate-expression-handler (varnum changed) (defun gdb-var-evaluate-expression-handler (varnum changed)
(with-current-buffer (gdb-get-create-buffer 'gdb-partial-output-buffer) (with-current-buffer (gdb-get-create-buffer 'gdb-partial-output-buffer)
(goto-char (point-min)) (goto-char (point-min))
(re-search-forward ".*value=\"\\(.*?\\)\"" nil t) (re-search-forward ".*value=\\(\".+\"\\)" nil t)
(catch 'var-found (catch 'var-found
(let ((num 0)) (let ((num 0))
(dolist (var gdb-var-list) (dolist (var gdb-var-list)
(if (string-equal varnum (cadr var)) (if (string-equal varnum (cadr var))
(progn (progn
(if changed (setcar (nthcdr 5 var) t)) (if changed (setcar (nthcdr 5 var) t))
(setcar (nthcdr 4 var) (match-string 1)) (setcar (nthcdr 4 var) (read (match-string 1)))
(setcar (nthcdr num gdb-var-list) var) (setcar (nthcdr num gdb-var-list) var)
(throw 'var-found nil))) (throw 'var-found nil)))
(setq num (+ num 1)))))) (setq num (+ num 1))))))
@ -528,7 +530,8 @@ With arg, use separate IO iff arg is positive."
`(lambda () (gdb-var-list-children-handler ,varnum))))) `(lambda () (gdb-var-list-children-handler ,varnum)))))
(defconst gdb-var-list-children-regexp (defconst gdb-var-list-children-regexp
"name=\"\\(.*?\\)\",exp=\"\\(.*?\\)\",numchild=\"\\(.*?\\)\"") "name=\"\\(.*?\\)\",exp=\"\\(.*?\\)\",numchild=\"\\(.*?\\)\",\
type=\"\\(.*?\\)\"")
(defun gdb-var-list-children-handler (varnum) (defun gdb-var-list-children-handler (varnum)
(with-current-buffer (gdb-get-create-buffer 'gdb-partial-output-buffer) (with-current-buffer (gdb-get-create-buffer 'gdb-partial-output-buffer)
@ -543,14 +546,15 @@ With arg, use separate IO iff arg is positive."
(let ((varchild (list (match-string 2) (let ((varchild (list (match-string 2)
(match-string 1) (match-string 1)
(match-string 3) (match-string 3)
nil nil nil))) (match-string 4)
(if (looking-at ",type=\"\\(.*?\\)\"") nil nil)))
(setcar (nthcdr 3 varchild) (match-string 1)))
(dolist (var1 gdb-var-list) (dolist (var1 gdb-var-list)
(if (string-equal (cadr var1) (cadr varchild)) (if (string-equal (cadr var1) (cadr varchild))
(throw 'child-already-watched nil))) (throw 'child-already-watched nil)))
(push varchild var-list) (push varchild var-list)
(if (equal (nth 2 varchild) "0") (if (or (equal (nth 2 varchild) "0")
(and (equal (nth 2 varchild) "1")
(equal (nth 3 varchild) "char *")))
(gdb-enqueue-input (gdb-enqueue-input
(list (list
(concat (concat