Skip to content

Commit e29d386

Browse files
committed
simplify haskell-process-load-complete
1 parent 337c41e commit e29d386

File tree

1 file changed

+2
-32
lines changed

1 file changed

+2
-32
lines changed

haskell-load.el

+2-32
Original file line numberDiff line numberDiff line change
@@ -106,38 +106,8 @@ actual Emacs buffer of the module being loaded."
106106
(with-current-buffer (haskell-interactive-mode-splices-buffer session)
107107
(erase-buffer)))
108108
(let* ((ok (cond
109-
((haskell-process-consume
110-
process
111-
"Ok, \\(?:[0-9]+\\) modules? loaded\\.$")
112-
t)
113-
((haskell-process-consume
114-
process
115-
"Ok, \\(?:[a-z]+\\) modules? loaded\\.$") ;; for ghc 8.4
116-
t)
117-
((haskell-process-consume
118-
process
119-
"Failed, \\(?:[0-9]+\\) modules? loaded\\.$")
120-
nil)
121-
((haskell-process-consume
122-
process
123-
"Failed, \\(?:[a-z]+\\) modules? loaded\\.$") ;; ghc 8.6.3 says so
124-
nil)
125-
((haskell-process-consume
126-
process
127-
"Ok, modules loaded: \\(.+\\)\\.$")
128-
t)
129-
((haskell-process-consume
130-
process
131-
"Failed, modules loaded: \\(.+\\)\\.$")
132-
nil)
133-
((haskell-process-consume
134-
process
135-
"Failed, no modules loaded\\.$") ;; for ghc 8.4
136-
nil)
137-
((haskell-process-consume
138-
process
139-
"Failed, unloaded all modules\\.$") ;; for ghc 9.10
140-
nil)
109+
((haskell-process-consume process "Ok, .*$") t)
110+
((haskell-process-consume process "Failed, .*$") nil)
141111
(t
142112
(error (message "Unexpected response from haskell process.")))))
143113
(modules (haskell-process-extract-modules buffer))

0 commit comments

Comments
 (0)