branch: master
commit 5f664e28b6761dfea14af706e2123ddb7e421032
Author: rocky <[email protected]>
Commit: rocky <[email protected]>
Python trepan debuggers include instruction offset in location
---
realgud/debugger/trepan2/init.el | 2 +-
realgud/lang/python.el | 4 ++--
test/test-regexp-trepan2.el | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/realgud/debugger/trepan2/init.el b/realgud/debugger/trepan2/init.el
index 87d1306..1972035 100644
--- a/realgud/debugger/trepan2/init.el
+++ b/realgud/debugger/trepan2/init.el
@@ -26,7 +26,7 @@ realgud-loc-pat struct")
;; before a command prompt.
;;
;; For example:
-;; (/usr/bin/zonetab2pot.py:15): <module>
+;; (/usr/bin/zonetab2pot.py:15 @3): <module>
;; (/usr/bin/zonetab2pot.py:15 remapped <string>): <module>
;; or MS Windows:
;; (c:\\mydirectory\\gcd.py:10): <module>
diff --git a/realgud/lang/python.el b/realgud/lang/python.el
index d94fb35..21190c7 100644
--- a/realgud/lang/python.el
+++ b/realgud/lang/python.el
@@ -40,14 +40,14 @@ traceback) line." )
;; before a command prompt.
;;
;; For example:
-;; (/usr/bin/zonetab2pot.py:15): <module>
+;; (/usr/bin/zonetab2pot.py:15 @10): <module>
;; (/usr/bin/zonetab2pot.py:15 remapped <string>): <module>
;; or MS Windows:
;; (c:\\mydirectory\\gcd.py:10): <module>
(defconst realgud:python-trepan-loc-pat
(make-realgud-loc-pat
- :regexp "^(\\(\\(?:[a-zA-Z]:\\)?[-a-zA-Z0-9_/.\\\\
]+\\):\\([0-9]+\\)\\(?: remapped .*?\\)?): \\(?:<module>\\)?\\(?:\n.. [0-9]+
\\(.*?\\)\n\\)?"
+ :regexp "^(\\(\\(?:[a-zA-Z]:\\)?[-a-zA-Z0-9_/.\\\\
]+\\):\\([0-9]+\\)\\(?: @[0-9]+\\)?\\(?: remapped .*?\\)?):
\\(?:<module>\\)?\\(?:\n.. [0-9]+ \\(.*?\\)\n\\)?"
:file-group 1
:line-group 2
:text-group 3
diff --git a/test/test-regexp-trepan2.el b/test/test-regexp-trepan2.el
index 2e3811d..0c1b3d1 100644
--- a/test/test-regexp-trepan2.el
+++ b/test/test-regexp-trepan2.el
@@ -126,7 +126,7 @@
(match-string (realgud-loc-pat-line-group helper-loc)
test-s1) "extract line number")
-(setq test-s1 "(/usr/bin/ipython:24): <module>")
+(setq test-s1 "(/usr/bin/ipython:24 @31): <module>")
(assert-t (numberp (loc-match test-s1 helper-loc))
"position location")
(assert-equal "/usr/bin/ipython"
