procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(gdb-var-update-regexp): Delete.

Browse source 
(gdb-var-update-handler): Use json parsing.
This commit is contained in:
Nick Roberts 2009-09-11 11:55:11 +00:00
parent ac243a4090
commit df1bfa9d00
1 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lisp/progmodes/gdb-mi.el
View file

@ -1136,29 +1136,25 @@ numchild=\"\\(.+?\\)\".*?,value=\\(\"\"\\|\".*?[^\\]\"\\)\
(list "-var-update --all-values *" 'gdb-var-update-handler)))
(gdb-add-pending 'gdb-var-update))
(defconst gdb-var-update-regexp
"{.*?name=\"\\(.*?\\)\".*?,\\(?:value=\\(\".*?\"\\),\\)?.*?\
in_scope=\"\\(.*?\\)\".*?}")
(defun gdb-var-update-handler ()
(let ((changelist (gdb-get-field (gdb-json-partial-output) 'changelist)))
(dolist (var gdb-var-list)
(setcar (nthcdr 5 var) nil))
(goto-char (point-min))
(while (re-search-forward gdb-var-update-regexp nil t)
(let* ((varnum (match-string 1))
(dolist (change changelist)
(let* ((varnum (gdb-get-field change 'name))
(var (assoc varnum gdb-var-list)))
(when var
(let ((match (match-string 3)))
(cond ((string-equal match "false")
(let ((scope (gdb-get-field change 'in_scope)))
(cond ((string-equal scope "false")
(if gdb-delete-out-of-scope
(gdb-var-delete-1 varnum)
(setcar (nthcdr 5 var) 'out-of-scope)))
((string-equal match "true")
((string-equal scope "true")
(setcar (nthcdr 5 var) 'changed)
(setcar (nthcdr 4 var)
(read (match-string 2))))
((string-equal match "invalid")
(gdb-var-delete-1 varnum)))))))
(gdb-get-field change 'value)))
((string-equal scope "invalid")
(gdb-var-delete-1 varnum))))))))
(gdb-delete-pending 'gdb-var-update)
(gdb-speedbar-update))