[elpa] externals/realgud-trepan-ni df6bce1 04/25: Track recent trepan-ni backtrace format change

[Rocky Bernstein]

branch: externals/realgud-trepan-ni
commit df6bce1c213c991148db16dd29ff5e12b996c6b2
Author: rocky <address@hidden>
Commit: rocky <address@hidden>

    Track recent trepan-ni backtrace format change
---
 test/test-trepan-ni.inspect.el | 10 +++++-----
 trepan-ni/init.el              | 18 +++++++++---------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/test/test-trepan-ni.inspect.el b/test/test-trepan-ni.inspect.el
index 72d53d0..4e62d1c 100644
--- a/test/test-trepan-ni.inspect.el
+++ b/test/test-trepan-ni.inspect.el
@@ -6,9 +6,9 @@
 
 (eval-when-compile (defvar test:run-process-save))
 
-(declare-function nodejs-parse-cmd-args 'realgud:nodejs)
-(declare-function nodejs                'realgud:nodejs)
-(declare-function __FILE__              'load-relative)
+(declare-function trepan-ni-parse-cmd-args 'realgud:trepan-ni-core)
+(declare-function trepan-ni                'realgud:trepan-ni)
+(declare-function __FILE__                 'load-relative)
 
 (test-simple-start)
 
@@ -25,8 +25,8 @@
     ))
 
 (note "trepan-ni-parse-cmd-args")
-(assert-equal (list '("node" "inspect") nil '("foo"))
-             (nodejs-parse-cmd-args '("node" "inspect" "foo")))
+(assert-equal '(("trepan-ni")  nil  ("foo"))
+             (trepan-ni-parse-cmd-args '("trepan-ni" "foo")))
 
 ;; FIXME: need to mock remove-ansi-schmutz in realgud:nodejs
 ;; (realgud:nodejs "node inspect ./gcd.js 3 5")
diff --git a/trepan-ni/init.el b/trepan-ni/init.el
index 9b6ca95..9c00408 100644
--- a/trepan-ni/init.el
+++ b/trepan-ni/init.el
@@ -83,7 +83,7 @@ realgud-loc-pat struct")
        :num 1))
 
 
-(defconst realgud:trepan-ni-frame-start-regexp  "\\(?:^\\|\n\\)\\(?:#\\)")
+(defconst realgud:trepan-ni-frame-start-regexp  "\\(?:^\\|\n\\)\\(?:##\|->\)")
 (defconst realgud:trepan-ni-frame-num-regexp    realgud:regexp-captured-num)
 (defconst realgud:trepan-ni-frame-module-regexp "[^ \t\n]+")
 (defconst realgud:trepan-ni-frame-file-regexp   "[^ \t\n]+")
@@ -124,22 +124,22 @@ realgud-loc-pat struct")
 (setf (gethash "font-lock-keywords" realgud:trepan-ni-pat-hash)
       '(
        ;; The frame number and first type name, if present.
-       ;; E.g. ->0 in file `/etc/init.d/apparmor' at line 35
+       ;; E.g. ->0 (anonymous) tmp/gcd.js:2:11
        ;;      --^-
        ("^\\(->\\|##\\)\\([0-9]+\\) "
         (2 realgud-backtrace-number-face))
 
        ;; File name.
-       ;; E.g. ->0 in file `/etc/init.d/apparmor' at line 35
-       ;;          ---------^^^^^^^^^^^^^^^^^^^^-
-       ("[ \t]+\\(in\\|from\\) file `\\(.+\\)'"
+       ;; E.g. ->0 (anonymous) tmp/gcd.js:2:11
+       ;;          ------------^^^^^^^^^^
+       ("\\(?:.*\\)[ \t]+\\([^:]+\\):"
         (2 realgud-file-name-face))
 
-       ;; File name.
-       ;; E.g. ->0 in file `/etc/init.d/apparmor' at line 35
-       ;;                                         --------^^
+       ;; Line Number
+       ;; E.g. ->0 (anonymous) tmp/gcd.js:2:11
+       ;;                                 ^
        ;; Line number.
-       ("[ \t]+at line \\([0-9]+\\)$"
+       ("\\([0-9]+\\)"
         (1 realgud-line-number-face))
        ))