branch: elpa/haskell-mode
commit 6dd373811bcf573ae116e2c2b5cbc001515d4ed5
Author: Matija Obid <matija.o...@posteo.net>
Commit: Matija Obid <matija.o...@posteo.net>
fixed stop-at regex
---
haskell-debug.el | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/haskell-debug.el b/haskell-debug.el
index baacf75db2..d47cc5290a 100644
--- a/haskell-debug.el
+++ b/haskell-debug.el
@@ -531,15 +531,13 @@ some old history, then display that."
(point-max)))))))))
(defun haskell-debug-parse-stopped-at (string)
- "Parse the location stopped at from the given string.
+ "Parse the location stopped at from the given STRING.
-For example:
+For examples:
Stopped at /home/foo/project/src/x.hs:6:25-36
-
-"
- (let ((index (string-match "Stopped at \\([^:]+\\):\\(.+\\)\n?"
- string)))
+Stopped in X.test, /home/foo/project/src/x.hs:6:25-36"
+ (let ((index (string-match "Stopped \\(?:at\\|in [^,]+,\\)
\\([^:]+\\):\\(.+\\)\n?" string)))
(when index
(list :path (match-string 1 string)
:span (haskell-debug-parse-span (match-string 2 string))
