branch: externals/realgud
commit bab9fb9c91414d7b3de8fc28707b2ea4a8bd3109
Author: rocky <ro...@gnu.org>
Commit: rocky <ro...@gnu.org>
DRY a js regexp by hoisting it to lang/js.el
---
realgud-recursive-autoloads.el | 2 +-
realgud/debugger/trepanjs/init.el | 10 +++++-----
realgud/lang/js.el | 4 ++++
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/realgud-recursive-autoloads.el b/realgud-recursive-autoloads.el
index 63539c5..6f64525 100644
--- a/realgud-recursive-autoloads.el
+++ b/realgud-recursive-autoloads.el
@@ -1088,7 +1088,7 @@ fringe and marginal icons.
;;;;;; (0 0 0 0))
;;; Generated autoloads from realgud/debugger/trepanjs/init.el
-(if (fboundp 'register-definition-prefixes) (register-definition-prefixes
"realgud/debugger/trepanjs/init" '("realgud:trepanjs-frame-"
"realgud:trepanjs-pat-hash" "realgud:trepanjs-file-regexp"
"realgud:trepanjs-debugger-name" "realgud:trepanjs-command-hash")))
+(if (fboundp 'register-definition-prefixes) (register-definition-prefixes
"realgud/debugger/trepanjs/init" '("realgud:trepanjs-frame-"
"realgud:trepanjs-pat-hash" "realgud:js-file-regexp"
"realgud:trepanjs-debugger-name" "realgud:trepanjs-command-hash")))
;;;***
diff --git a/realgud/debugger/trepanjs/init.el
b/realgud/debugger/trepanjs/init.el
index 881fcff..765472c 100644
--- a/realgud/debugger/trepanjs/init.el
+++ b/realgud/debugger/trepanjs/init.el
@@ -32,8 +32,6 @@ realgud-loc-pat struct")
(declare-function make-realgud-loc-pat (realgud-loc))
-(defconst realgud:trepanjs-file-regexp "\\([^ \t\n]+\\)\\(?: \\[.*\\]\\)?")
-
;; realgud-loc-pat that describes a trepanjs location generally shown
;; before a command prompt.
;; For example:
@@ -43,7 +41,7 @@ realgud-loc-pat struct")
(make-realgud-loc-pat
:regexp (format
"\\(?:%s\\)*\\(?:break\\|exception\\|call\\) in %s at line
%s:%s"
- realgud:js-term-escape realgud:trepanjs-file-regexp
+ realgud:js-term-escape realgud:js-file-regexp
realgud:regexp-captured-num
realgud:regexp-captured-num)
:file-group 1
@@ -51,6 +49,8 @@ realgud-loc-pat struct")
:char-offset-group 3
))
+(setf (gethash "file-line" realgud:trepanjs-pat-hash)
realgud:js-file-line-loc-pat)
+
;; realgud-loc-pat that describes a trepanjs command prompt
;; For example:
;; (trepanjs):
@@ -67,7 +67,7 @@ realgud-loc-pat struct")
(make-realgud-loc-pat
:regexp (format "^Breakpoint %s set in file %s, line %s.\n"
realgud:regexp-captured-num
- realgud:trepanjs-file-regexp
+ realgud:js-file-regexp
realgud:regexp-captured-num)
:num 1
:file-group 2
@@ -113,7 +113,7 @@ realgud-loc-pat struct")
:regexp (concat realgud:trepanjs-frame-start-regexp " "
realgud:regexp-captured-num " "
"\\(?:" realgud:trepanjs-frame-module-regexp "[
\t\n]+called from file "
- realgud:trepanjs-file-regexp
+ realgud:js-file-regexp
"\\)\\| in file "
realgud:regexp-captured-num
"\\)"
diff --git a/realgud/lang/js.el b/realgud/lang/js.el
index 6ef388b..adda84e 100644
--- a/realgud/lang/js.el
+++ b/realgud/lang/js.el
@@ -25,6 +25,10 @@
"Escape sequence regular expression pattern trepanjs often puts
in around prompts")
+(defconst realgud:js-file-regexp "\\([^ \t\n]+\\)\\(?: \\[.*\\]\\)?")
+
+
+
(declare-function realgud-goto-line-for-pt 'realgud-track)
;; Regular expression that describes a Perl Carp backtrace line.
