(gdb-var-list-children-regexp)
(gdb-var-list-children-regexp-1): Tweak regexps to catch full string values.
This commit is contained in:
parent
588daab2ea
commit
8687849bab
1 changed files with 5 additions and 4 deletions
|
@ -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 5)
|
||||
(match-string 6)
|
||||
nil nil)))
|
||||
(if (assoc (car varchild) gdb-var-list)
|
||||
(throw 'child-already-watched nil))
|
||||
|
@ -3346,7 +3346,8 @@ 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 +3361,7 @@ numchild=\"\\(.+?\\)\",.*?value=\\(\".*?\"\\).*?\\(,type=\"\\(.+?\\)\"\\)?.*?}")
|
|||
(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)
|
||||
|
|
Loading…
Add table
Reference in a new issue