diff options
| author | Nick Roberts | 2006-09-05 03:41:24 +0000 |
|---|---|---|
| committer | Nick Roberts | 2006-09-05 03:41:24 +0000 |
| commit | ce22ee0163ab291b755d1429f01fbece3c1fb137 (patch) | |
| tree | e0f4d3e2b00a99f25c37592989a9886836d5e56c | |
| parent | d4bc9efd83527ce44804817ac0b36b458d005593 (diff) | |
| download | emacs-ce22ee0163ab291b755d1429f01fbece3c1fb137.tar.gz emacs-ce22ee0163ab291b755d1429f01fbece3c1fb137.zip | |
(gdb-var-list-children-regexp)
(gdb-var-list-children-regexp): Make type field optional.
| -rw-r--r-- | lisp/progmodes/gdb-ui.el | 8 |
1 files 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." | |||
| 782 | 782 | ||
| 783 | (defconst gdb-var-list-children-regexp | 783 | (defconst gdb-var-list-children-regexp |
| 784 | "child={.*?name=\"\\(.*?\\)\",.*?exp=\"\\(.*?\\)\",.*?\ | 784 | "child={.*?name=\"\\(.*?\\)\",.*?exp=\"\\(.*?\\)\",.*?\ |
| 785 | numchild=\"\\(.*?\\)\",.*?type=\"\\(.*?\\)\".*?}") | 785 | numchild=\"\\(.*?\\)\".*?\\(,type=\"\\(.*?\\)\"\\)?.*?}") |
| 786 | 786 | ||
| 787 | (defun gdb-var-list-children-handler (varnum) | 787 | (defun gdb-var-list-children-handler (varnum) |
| 788 | (goto-char (point-min)) | 788 | (goto-char (point-min)) |
| @@ -796,7 +796,7 @@ numchild=\"\\(.*?\\)\",.*?type=\"\\(.*?\\)\".*?}") | |||
| 796 | (let ((varchild (list (match-string 1) | 796 | (let ((varchild (list (match-string 1) |
| 797 | (match-string 2) | 797 | (match-string 2) |
| 798 | (match-string 3) | 798 | (match-string 3) |
| 799 | (match-string 4) | 799 | (match-string 5) |
| 800 | nil nil))) | 800 | nil nil))) |
| 801 | (if (assoc (car varchild) gdb-var-list) | 801 | (if (assoc (car varchild) gdb-var-list) |
| 802 | (throw 'child-already-watched nil)) | 802 | (throw 'child-already-watched nil)) |
| @@ -3346,7 +3346,7 @@ is set in them." | |||
| 3346 | 3346 | ||
| 3347 | (defconst gdb-var-list-children-regexp-1 | 3347 | (defconst gdb-var-list-children-regexp-1 |
| 3348 | "child={.*?name=\"\\(.+?\\)\",.*?exp=\"\\(.+?\\)\",.*?\ | 3348 | "child={.*?name=\"\\(.+?\\)\",.*?exp=\"\\(.+?\\)\",.*?\ |
| 3349 | numchild=\"\\(.+?\\)\",.*?value=\\(\".*?\"\\),.*?type=\"\\(.+?\\)\".*?}") | 3349 | numchild=\"\\(.+?\\)\",.*?value=\\(\".*?\"\\).*?\\(,type=\"\\(.+?\\)\"\\)?.*?}") |
| 3350 | 3350 | ||
| 3351 | (defun gdb-var-list-children-handler-1 (varnum) | 3351 | (defun gdb-var-list-children-handler-1 (varnum) |
| 3352 | (goto-char (point-min)) | 3352 | (goto-char (point-min)) |
| @@ -3360,7 +3360,7 @@ numchild=\"\\(.+?\\)\",.*?value=\\(\".*?\"\\),.*?type=\"\\(.+?\\)\".*?}") | |||
| 3360 | (let ((varchild (list (match-string 1) | 3360 | (let ((varchild (list (match-string 1) |
| 3361 | (match-string 2) | 3361 | (match-string 2) |
| 3362 | (match-string 3) | 3362 | (match-string 3) |
| 3363 | (match-string 5) | 3363 | (match-string 6) |
| 3364 | (read (match-string 4)) | 3364 | (read (match-string 4)) |
| 3365 | nil))) | 3365 | nil))) |
| 3366 | (if (assoc (car varchild) gdb-var-list) | 3366 | (if (assoc (car varchild) gdb-var-list) |