From ce22ee0163ab291b755d1429f01fbece3c1fb137 Mon Sep 17 00:00:00 2001 From: Nick Roberts Date: Tue, 5 Sep 2006 03:41:24 +0000 Subject: [PATCH] (gdb-var-list-children-regexp) (gdb-var-list-children-regexp): Make type field optional. --- lisp/progmodes/gdb-ui.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el index f45bb2fe524..3c0a968f554 100644 --- a/lisp/progmodes/gdb-ui.el +++ b/lisp/progmodes/gdb-ui.el @@ -782,7 +782,7 @@ With arg, enter name of variable to be watched in the minibuffer." (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 @@ numchild=\"\\(.*?\\)\",.*?type=\"\\(.*?\\)\".*?}") (let ((varchild (list (match-string 1) (match-string 2) (match-string 3) - (match-string 4) + (match-string 5) nil nil))) (if (assoc (car varchild) gdb-var-list) (throw 'child-already-watched nil)) @@ -3346,7 +3346,7 @@ is set in them." (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 +3360,7 @@ numchild=\"\\(.+?\\)\",.*?value=\\(\".*?\"\\),.*?type=\"\\(.+?\\)\".*?}") (let ((varchild (list (match-string 1) (match-string 2) (match-string 3) - (match-string 5) + (match-string 6) (read (match-string 4)) nil))) (if (assoc (car varchild) gdb-var-list) -- 2.39.2