# HG changeset patch
# User Nick Roberts <nickrob@snap.net.nz>
# Date 1079567580 0
# Node ID 1803acf55b4c87c14a8e49ee7072144eab7fc6d4
# Parent  3898648aa99be7b08b2b07a4942c8f58ce4eeae0
(gdb-var-list-children-handler): Handle C++ classes
properly for watching in speedbar.

diff -r 3898648aa99b -r 1803acf55b4c lisp/gdb-ui.el
--- a/lisp/gdb-ui.el	Wed Mar 17 23:52:11 2004 +0000
+++ b/lisp/gdb-ui.el	Wed Mar 17 23:53:00 2004 +0000
@@ -251,7 +251,7 @@
 	     `(lambda () (gdb-var-list-children-handler ,varnum)))))
 
 (defconst gdb-var-list-children-regexp
-"name=\"\\(.*?\\)\",exp=\"\\(.*?\\)\",numchild=\"\\(.*?\\)\",type=\"\\(.*?\\)\"")
+"name=\"\\(.*?\\)\",exp=\"\\(.*?\\)\",numchild=\"\\(.*?\\)\"")
 
 (defun gdb-var-list-children-handler (varnum)
   (with-current-buffer (gdb-get-create-buffer 'gdb-partial-output-buffer)
@@ -266,9 +266,9 @@
 		 (let ((varchild (list (match-string 2)
 				       (match-string 1)
 				       (match-string 3)
-				       (match-string 5)
-				       (match-string 4)
-				       nil)))
+				       nil nil nil)))
+		   (if (looking-at ",type=\"\\(.*?\\)\"")
+		       (setcar (nthcdr 3 varchild) (match-string 1)))
 		   (dolist (var1 gdb-var-list)
 		     (if (string-equal (cadr var1) (cadr varchild))
 			 (throw 'child-already-watched nil)))