[Lldb-commits] [lldb] r122020 - /lldb/trunk/utils/emacs/gud.el

[Johnny Chen]

Author: johnny
Date: Thu Dec 16 19:35:41 2010
New Revision: 122020

URL: http://llvm.org/viewvc/llvm-project?rev=122020&view=rev
Log:
Modify the regexp to match the debugger output of the 'Up Stack' and 'Down Stack'
gud commands in order to more reliably locate the program counter and to display
the file-and-line.

Modified:
    lldb/trunk/utils/emacs/gud.el

Modified: lldb/trunk/utils/emacs/gud.el
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/utils/emacs/gud.el?rev=122020&r1=122019&r2=122020&view=diff
==============================================================================
--- lldb/trunk/utils/emacs/gud.el (original)
+++ lldb/trunk/utils/emacs/gud.el Thu Dec 16 19:35:41 2010
@@ -945,6 +945,7 @@
 
 (defun lldb-extract-breakpoint-id (string)
   ;; Search for "Breakpoint created: \\([^:\n]*\\):" pattern.
+  ;(message "gud-marker-acc string is: |%s|" string)
   (if (string-match "Breakpoint created: \\([^:\n]*\\):" string)
       (progn
         (setq gud-breakpoint-id (match-string 1 string))
@@ -966,8 +967,9 @@
                           gud-marker-acc start)
             ;; (lldb) frame select -r 1
             ;; frame #1: 0x0000000100000e09 a.out`main + 25 at main.c:44
-            (string-match "\nframe.* at \\([^:\n]*\\):\\([0-9]*\\)\n"
+            (string-match "^frame.* at \\([^:\n]*\\):\\([0-9]*\\)\n"
                            gud-marker-acc start))
+      ;(message "gud-marker-acc matches our pattern....")
       (setq gud-last-frame
             (cons (match-string 1 gud-marker-acc)
                   (string-to-number (match-string 2 gud-marker-acc)))