[Emacs-diffs] emacs/lisp/progmodes gdb-ui.el [EMACS_23_1_RC]

[Nick Roberts]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_23_1_RC
Changes by:     Nick Roberts <nickrob>  09/09/24 10:33:23

Modified files:
        lisp/progmodes : gdb-ui.el 

Log message:
        (gdb-jsonify-buffer): Catch log stream output.
        (gdb-init-2): Fortran requires list MAIN__ to find source buffer.
        (gdb-jsonify-buffer): Handle case where "=" is part of value string.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/progmodes/gdb-ui.el?cvsroot=emacs&only_with_tag=EMACS_23_1_RC&r1=1.256.2.11&r2=1.256.2.12

Patches:
Index: gdb-ui.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/Attic/gdb-ui.el,v
retrieving revision 1.256.2.11
retrieving revision 1.256.2.12
diff -u -b -r1.256.2.11 -r1.256.2.12
--- gdb-ui.el   24 Sep 2009 01:21:56 -0000      1.256.2.11
+++ gdb-ui.el   24 Sep 2009 10:33:23 -0000      1.256.2.12
@@ -732,6 +732,7 @@
   ;; 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 @@
       (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 @@
               (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 "}")))