[elpa] externals/realgud-lldb 17cac00 09/56: bang on location regexps

[Rocky Bernstein]

branch: externals/realgud-lldb
commit 17cac00a14fd419daf58262375dcb7bca19c033e
Author: rocky <address@hidden>
Commit: rocky <address@hidden>

    bang on location regexps
---
 INSTALL      |  4 ++++
 lldb/init.el | 17 +++++++++--------
 lldb/lldb.el |  2 ++
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/INSTALL b/INSTALL
index d94829e..ccd926e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1 +1,5 @@
+Have realgud installed.
+From inside emacs, evaluate:
+
+  (compile (format "EMACSLOADPATH=:%s:%s ./autogen.sh" (file-name-directory 
(locate-library "test-simple.elc")) (file-name-directory (locate-library 
"realgud.elc"))))
 bash ./autogen.sh
diff --git a/lldb/init.el b/lldb/init.el
index c37933d..1c51700 100644
--- a/lldb/init.el
+++ b/lldb/init.el
@@ -36,23 +36,24 @@ realgud-loc-pat struct")
   "\\(?:^\\|\n\\)")
 
 (defconst realgud:lldb-frame-num-regexp
-  (format "#%s " realgud:regexp-captured-num))
+  (format "[ ]*frame #%s: " realgud:regexp-captured-num))
 
 ;; Regular expression that describes a lldb location generally shown
 ;; before a command prompt.
 ;; For example:
 ;; * thread #1: tid = 12866, 0x00000000004004b4 hello`main(argc=1, 
argv=0x00007fffffffd668) + 4 at hello.c:5, name = 'hello', stop reason = 
breakpoint 1.1
-;; (setf (gethash "loc" realgud:lldb-pat-hash)
-;;       (make-realgud-loc-pat
-;;        :regexp (format "^\\* thread #%s: .+ at %s, "
-;;                    realgud:regexp-captured-num 
realgud:lldb-frame-file-regexp)
-;;        :file-group 2
-;;        :line-group 3))
 (setf (gethash "loc" realgud:lldb-pat-hash)
       (make-realgud-loc-pat
+       :regexp (format "^\\* thread #%s: .+ at %s, "
+                      realgud:regexp-captured-num 
realgud:lldb-frame-file-regexp)
+       :file-group 2
+       :line-group 3))
+
+(setf (gethash "selected-frame" realgud:lldb-pat-hash)
+      (make-realgud-loc-pat
        :regexp         (concat "^" realgud:lldb-frame-start-regexp
                        realgud:lldb-frame-num-regexp
-                       "\\(?:.\\|\\(?:[\n] \\)\\)+[ ]+at "
+                       ".*[ ]+at "
                        realgud:lldb-frame-file-regexp
                        )
        :num 1
diff --git a/lldb/lldb.el b/lldb/lldb.el
index 22891f6..b7b648d 100644
--- a/lldb/lldb.el
+++ b/lldb/lldb.el
@@ -16,6 +16,8 @@
 ;;  `realgud:lldb' Main interface to lldb via Emacs
 (require 'cl)
 (require 'load-relative)
+(require 'realgud)
+(require-relative-list '("core" "track-mode") "realgud:lldb-")
 
 ;; This is needed, or at least the docstring part of it is needed to
 ;; get the customization menu to work in Emacs 24.