diff options
| author | Nick Roberts <nickrob@snap.net.nz> | 2009-09-24 10:33:23 +0000 |
|---|---|---|
| committer | Nick Roberts <nickrob@snap.net.nz> | 2009-09-24 10:33:23 +0000 |
| commit | 8d3803dfa7baf0c2f05e39c77a3392ee8ca7d058 (patch) | |
| tree | bafb283058f3761cb7ed080d762371f0f01bb02f | |
| parent | 5463439c2085cbb445289ec9e57db6108ae51482 (diff) | |
| download | emacs-old-branches/EMACS_23_1_RC.tar.gz | |
(gdb-jsonify-buffer): Catch log stream output.old-branches/EMACS_23_1_RC
(gdb-init-2): Fortran requires list MAIN__ to find source buffer.
(gdb-jsonify-buffer): Handle case where "=" is part of value string.
| -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 d038f01b0ef..f26eff183e2 100644 --- a/lisp/progmodes/gdb-ui.el +++ b/lisp/progmodes/gdb-ui.el @@ -732,6 +732,7 @@ otherwise do not." ;; Find source file and compilation directory here. ;; Works for C, C++, Fortran and Ada but not Java (GDB 6.4) (gdb-enqueue-input (list "server list\n" 'ignore)) + (gdb-enqueue-input (list "server list MAIN__\n" 'ignore)) (gdb-enqueue-input (list "server info source\n" 'gdb-source-info))) (defun gdb-get-version () @@ -1824,7 +1825,6 @@ incompatible with GDB/MI output syntax." (save-excursion (while (re-search-forward (concat "[\\[,]\\(" fix-key "=\\)") nil t) (replace-match "" nil nil nil 1)))) - ;; Emacs bug #3794 (when fix-list (save-excursion ;; Find positions of braces which enclose broken list @@ -1842,9 +1842,9 @@ incompatible with GDB/MI output syntax." (insert "]")))))) (goto-char (point-min)) (insert "{") - ;; TODO: This breaks badly with foo= inside constants - (while (re-search-forward "\\([[:alpha:]-_]+\\)=" nil t) - (replace-match "\"\\1\":" nil nil)) + (while (re-search-forward + "\\([[:alnum:]-_]+\\)=\\(\\[\\|\"\"\\|\".*?[^\\]\"\\)" nil t) + (replace-match "\"\\1\":\\2" nil nil)) (goto-char (point-max)) (insert "}"))) |