[Emacs-diffs] Changes to emacs/lisp/gdb-ui.el

[Nick Roberts]

Index: emacs/lisp/gdb-ui.el
diff -c emacs/lisp/gdb-ui.el:1.49 emacs/lisp/gdb-ui.el:1.50
*** emacs/lisp/gdb-ui.el:1.49   Sat Nov 22 19:27:38 2003
--- emacs/lisp/gdb-ui.el        Sat Nov 29 10:51:24 2003
***************
*** 185,191 ****
        (dolist (var gdb-var-list)
        (if (string-equal expr (car var)) (throw 'already-watched nil)))
        (gdb-enqueue-input
!        (list (concat "interpreter mi \"-var-create - * "  expr "\"\n")
             `(lambda () (gdb-var-create-handler ,expr))))))
    (select-window (get-buffer-window gud-comint-buffer)))
  
--- 185,191 ----
        (dolist (var gdb-var-list)
        (if (string-equal expr (car var)) (throw 'already-watched nil)))
        (gdb-enqueue-input
!        (list (concat "server interpreter mi \"-var-create - * "  expr "\"\n")
             `(lambda () (gdb-var-create-handler ,expr))))))
    (select-window (get-buffer-window gud-comint-buffer)))
  
***************
*** 205,211 ****
          (speedbar 1)
          (if (equal (nth 2 var) "0")
              (gdb-enqueue-input
!              (list (concat "interpreter mi \"-var-evaluate-expression " 
                             (nth 1 var) "\"\n") 
                     `(lambda () (gdb-var-evaluate-expression-handler 
                                  ,(nth 1 var)))))
--- 205,211 ----
          (speedbar 1)
          (if (equal (nth 2 var) "0")
              (gdb-enqueue-input
!              (list (concat "server interpreter mi \"-var-evaluate-expression 
" 
                             (nth 1 var) "\"\n") 
                     `(lambda () (gdb-var-evaluate-expression-handler 
                                  ,(nth 1 var)))))
***************
*** 223,230 ****
        (dolist (var gdb-var-list)
          (if (string-equal varnum (cadr var))
              (progn
!               (setcar (nthcdr 4 var) 
!                       (match-string-no-properties 1))
                (setcar (nthcdr num gdb-var-list) var)
                (throw 'var-found nil)))
          (setq num (+ num 1))))))
--- 223,229 ----
        (dolist (var gdb-var-list)
          (if (string-equal varnum (cadr var))
              (progn
!               (setcar (nthcdr 4 var) (match-string-no-properties 1))
                (setcar (nthcdr num gdb-var-list) var)
                (throw 'var-found nil)))
          (setq num (+ num 1))))))
***************
*** 232,238 ****
  
  (defun gdb-var-list-children (varnum)
    (gdb-enqueue-input
!    (list (concat "interpreter mi \"-var-list-children "  varnum "\"\n")
             `(lambda () (gdb-var-list-children-handler ,varnum)))))
  
  (defconst gdb-var-list-children-regexp
--- 231,237 ----
  
  (defun gdb-var-list-children (varnum)
    (gdb-enqueue-input
!    (list (concat "server interpreter mi \"-var-list-children "  varnum "\"\n")
             `(lambda () (gdb-var-list-children-handler ,varnum)))))
  
  (defconst gdb-var-list-children-regexp
***************
*** 260,266 ****
                   (if (equal (nth 2 varchild) "0")
                       (gdb-enqueue-input
                        (list 
!                        (concat "interpreter mi \"-var-evaluate-expression "
                                 (nth 1 varchild) "\"\n") 
                         `(lambda () (gdb-var-evaluate-expression-handler 
                                      ,(nth 1 varchild)))))))))
--- 259,266 ----
                   (if (equal (nth 2 varchild) "0")
                       (gdb-enqueue-input
                        (list 
!                        (concat 
!                         "server interpreter mi \"-var-evaluate-expression "
                                 (nth 1 varchild) "\"\n") 
                         `(lambda () (gdb-var-evaluate-expression-handler 
                                      ,(nth 1 varchild)))))))))
***************
*** 283,289 ****
      (while (re-search-forward gdb-var-update-regexp nil t)
        (let ((varnum (match-string-no-properties 1)))
          (gdb-enqueue-input
!          (list (concat "interpreter mi \"-var-evaluate-expression " 
                         varnum "\"\n") 
                     `(lambda () (gdb-var-evaluate-expression-handler 
                                  ,varnum)))))))
--- 283,289 ----
      (while (re-search-forward gdb-var-update-regexp nil t)
        (let ((varnum (match-string-no-properties 1)))
          (gdb-enqueue-input
!          (list (concat "server interpreter mi \"-var-evaluate-expression " 
                         varnum "\"\n") 
                     `(lambda () (gdb-var-evaluate-expression-handler 
                                  ,varnum)))))))
***************
*** 299,305 ****
           (var (assoc expr gdb-var-list))
           (varnum (cadr var)))
        (gdb-enqueue-input
!        (list (concat "interpreter mi \"-var-delete "  varnum "\"\n")
             'ignore))
        (setq gdb-var-list (delq var gdb-var-list))
        (dolist (varchild gdb-var-list)
--- 299,305 ----
           (var (assoc expr gdb-var-list))
           (varnum (cadr var)))
        (gdb-enqueue-input
!        (list (concat "server interpreter mi \"-var-delete "  varnum "\"\n")
             'ignore))
        (setq gdb-var-list (delq var gdb-var-list))
        (dolist (varchild gdb-var-list)