emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] master fe811c0 5/8: Fix up some backtrace regexps


From: Rocky Bernstein
Subject: [elpa] master fe811c0 5/8: Fix up some backtrace regexps
Date: Mon, 20 May 2019 07:33:33 -0400 (EDT)

branch: master
commit fe811c0360938172fd213a6f2004222bfa90b4c0
Author: rocky <address@hidden>
Commit: rocky <address@hidden>

    Fix up some backtrace regexps
---
 realgud-node-inspect/init.el | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/realgud-node-inspect/init.el b/realgud-node-inspect/init.el
index af3901d..e1ad6cd 100644
--- a/realgud-node-inspect/init.el
+++ b/realgud-node-inspect/init.el
@@ -83,28 +83,27 @@ realgud-loc-pat struct")
 (defconst realgud:node-inspect-frame-start-regexp  "\\(?:^\\|\n\\)\\(?:#\\)")
 (defconst realgud:node-inspect-frame-num-regexp    realgud:regexp-captured-num)
 (defconst realgud:node-inspect-frame-module-regexp "[^ \t\n]+")
-(defconst realgud:node-inspect-frame-file-regexp   "\\(?:file://\)?[^ \t\n]+")
+(defconst realgud:node-inspect-frame-file-regexp   "[^ \t\n]+")
 
-;; Regular expression that describes a node-inspect location generally shown
 ;; Regular expression that describes a debugger "backtrace" command line.
 ;; For example:
 ;; #0 module.js:380:17
 ;; #1 dbgtest.js:3:9
 ;; #2 Module._compile module.js:456:26
-;; #3 Module._extensions..js module.js:474:10
-;; #4 Module.load module.js:356:32
-;; #5 Module._load module.js:312:12
-;; #6 Module.runMain module.js:497:10
-; ;#7 timers.js:110:15
+;;
+;; and with a newer node inspect:
+;;
+;; #0 file:///tmp/module.js:380:17
+;; #1 file:///tmp/dbgtest.js:3:9
+;; #2 Module._compile file:///tmpmodule.js:456:26
 (setf (gethash "debugger-backtrace" realgud:node-inspect-pat-hash)
       (make-realgud-loc-pat
-       :regexp         (concat realgud:node-inspect-frame-start-regexp
-                       realgud:node-inspect-frame-num-regexp " "
-                       "\\(?:" realgud:node-inspect-frame-module-regexp " \\)?"
-                       "\\(" realgud:node-inspect-frame-file-regexp "\\)"
-                       ":"
+       :regexp         (format "%s%s\\(?: %s\\)? 
\\(?:file://\\)?\\(%s\\):%s:%s"
+                       realgud:node-inspect-frame-start-regexp
+                       realgud:node-inspect-frame-num-regexp
+                       realgud:node-inspect-frame-module-regexp
+                       realgud:node-inspect-frame-file-regexp
                        realgud:regexp-captured-num
-                       ":"
                        realgud:regexp-captured-num
                        )
        :num 1



reply via email to

[Prev in Thread] Current Thread [Next in Thread]