# HG changeset patch
# User Nick Roberts <nickrob@snap.net.nz>
# Date 1157510703 0
# Node ID 5a0fb2945b4613b246346ce1be419e760df65a41
# Parent  9ccb9c2fe66edd1f4c457785074a0b0988174f12
(gdb-var-list-children-regexp)
(gdb-var-list-children-regexp-1): Tweak regexps to catch full
string values.

diff -r 9ccb9c2fe66e -r 5a0fb2945b46 lisp/progmodes/gdb-ui.el
--- a/lisp/progmodes/gdb-ui.el	Wed Sep 06 02:43:00 2006 +0000
+++ b/lisp/progmodes/gdb-ui.el	Wed Sep 06 02:45:03 2006 +0000
@@ -782,7 +782,7 @@
 
 (defconst gdb-var-list-children-regexp
  "child={.*?name=\"\\(.*?\\)\",.*?exp=\"\\(.*?\\)\",.*?\
-numchild=\"\\(.*?\\)\".*?\\(,type=\"\\(.*?\\)\"\\)?.*?}")
+numchild=\"\\(.*?\\)\"\\(}\\|,.*?\\(type=\"\\(.*?\\)\"\\)?.*?}\\)")
 
 (defun gdb-var-list-children-handler (varnum)
   (goto-char (point-min))
@@ -796,7 +796,7 @@
 		(let ((varchild (list (match-string 1)
 				      (match-string 2)
 				      (match-string 3)
-				      (match-string 5)
+				      (match-string 6)
 				      nil nil)))
 		  (if (assoc (car varchild) gdb-var-list)
 		      (throw 'child-already-watched nil))
@@ -3346,7 +3346,8 @@
 
 (defconst gdb-var-list-children-regexp-1
   "child={.*?name=\"\\(.+?\\)\",.*?exp=\"\\(.+?\\)\",.*?\
-numchild=\"\\(.+?\\)\",.*?value=\\(\".*?\"\\).*?\\(,type=\"\\(.+?\\)\"\\)?.*?}")
+numchild=\"\\(.+?\\)\",.*?value=\\(\".*?\"\\)\
+\\(}\\|,.*?\\(type=\"\\(.+?\\)\"\\)?.*?}\\)")
 
 (defun gdb-var-list-children-handler-1 (varnum)
   (goto-char (point-min))
@@ -3360,7 +3361,7 @@
 		(let ((varchild (list (match-string 1)
 				      (match-string 2)
 				      (match-string 3)
-				      (match-string 6)
+				      (match-string 7)
 				      (read (match-string 4))
 				      nil)))
 		  (if (assoc (car varchild) gdb-var-list)