Commit ce22ee01 authored by Nick Roberts's avatar Nick Roberts
Browse files

(gdb-var-list-children-regexp)

(gdb-var-list-children-regexp): Make type field optional.
parent d4bc9efd
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment