ghc-insert-module now uses ghc-modi.
This commit is contained in:
parent
d6d50cff1e
commit
dc6424454e
@ -1,4 +1,4 @@
|
|||||||
SRCS = ghc.el ghc-func.el ghc-doc.el ghc-comp.el ghc-check.el \
|
SRCS = ghc.el ghc-func.el ghc-doc.el ghc-comp.el ghc-check.el ghc-process.el \
|
||||||
ghc-command.el ghc-info.el ghc-ins-mod.el ghc-indent.el
|
ghc-command.el ghc-info.el ghc-ins-mod.el ghc-indent.el
|
||||||
EMACS = emacs
|
EMACS = emacs
|
||||||
DETECT = xemacs
|
DETECT = xemacs
|
||||||
|
@ -13,6 +13,7 @@
|
|||||||
;; * multiple Mains in the same directory
|
;; * multiple Mains in the same directory
|
||||||
|
|
||||||
(require 'ghc-func)
|
(require 'ghc-func)
|
||||||
|
(require 'ghc-process)
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
|
|
||||||
@ -35,65 +36,18 @@
|
|||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
|
|
||||||
(defvar-local ghc-check-running nil)
|
(defun ghc-check-syntax ()
|
||||||
(defvar-local ghc-check-process-name nil)
|
(interactive)
|
||||||
(defvar-local ghc-check-original-buffer nil)
|
(ghc-with-process 'ghc-check-send 'ghc-check-callback))
|
||||||
(defvar-local ghc-check-original-file nil)
|
|
||||||
|
|
||||||
(ghc-defstruct hilit-info file line col msg)
|
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
|
|
||||||
(defun ghc-check-syntax ()
|
(ghc-defstruct hilit-info file line col msg)
|
||||||
(unless ghc-check-process-name
|
|
||||||
(setq ghc-check-process-name (ghc-check-get-process-name)))
|
|
||||||
(if (null ghc-check-process-name)
|
|
||||||
(message "Can't check")
|
|
||||||
(let* ((cbuf (current-buffer))
|
|
||||||
(name ghc-check-process-name)
|
|
||||||
(buf (get-buffer-create (concat " ghc-modi:" name)))
|
|
||||||
(file (buffer-file-name))
|
|
||||||
(cpro (get-process name)))
|
|
||||||
(with-current-buffer buf
|
|
||||||
(unless ghc-check-running
|
|
||||||
(setq ghc-check-running t)
|
|
||||||
(setq ghc-check-original-buffer cbuf)
|
|
||||||
(setq ghc-check-original-file file)
|
|
||||||
(erase-buffer)
|
|
||||||
(let ((pro (ghc-check-get-process cpro name buf)))
|
|
||||||
(process-send-string pro (concat "check " file "\n"))))))))
|
|
||||||
|
|
||||||
(defun ghc-check-get-process-name ()
|
(defun ghc-check-send ()
|
||||||
(let ((file (buffer-file-name)))
|
(concat "check " ghc-process-original-file "\n"))
|
||||||
(with-temp-buffer
|
|
||||||
(ghc-call-process ghc-module-command nil t nil "root" file)
|
|
||||||
(goto-char (point-min))
|
|
||||||
(when (looking-at "^\\(.*\\)$")
|
|
||||||
(match-string-no-properties 1)))))
|
|
||||||
|
|
||||||
(defun ghc-check-get-process (cpro name buf)
|
(defun ghc-check-callback ()
|
||||||
(cond
|
|
||||||
((not cpro)
|
|
||||||
(ghc-check-start-process name buf))
|
|
||||||
((not (eq (process-status cpro) 'run))
|
|
||||||
(delete-process cpro)
|
|
||||||
(ghc-check-start-process name buf))
|
|
||||||
(t cpro)))
|
|
||||||
|
|
||||||
(defun ghc-check-start-process (name buf)
|
|
||||||
(let ((pro (start-file-process name buf "ghc-modi")))
|
|
||||||
(set-process-filter pro 'ghc-check-process-filter)
|
|
||||||
(set-process-sentinel pro 'ghc-check-process-sentinel)
|
|
||||||
(set-process-query-on-exit-flag pro nil)
|
|
||||||
pro))
|
|
||||||
|
|
||||||
(defun ghc-check-process-filter (process string)
|
|
||||||
(with-current-buffer (process-buffer process)
|
|
||||||
(goto-char (point-max))
|
|
||||||
(insert string)
|
|
||||||
(forward-line -1)
|
|
||||||
(when (looking-at "^\\(OK\\|NG\\)$")
|
|
||||||
(goto-char (point-min))
|
|
||||||
(let ((regex "^\\([^\n\0]*\\):\\([0-9]+\\):\\([0-9]+\\): *\\(.+\\)")
|
(let ((regex "^\\([^\n\0]*\\):\\([0-9]+\\):\\([0-9]+\\): *\\(.+\\)")
|
||||||
info infos)
|
info infos)
|
||||||
(while (re-search-forward regex nil t)
|
(while (re-search-forward regex nil t)
|
||||||
@ -106,18 +60,12 @@
|
|||||||
(setq infos (nreverse infos))
|
(setq infos (nreverse infos))
|
||||||
(cond
|
(cond
|
||||||
(infos
|
(infos
|
||||||
(let ((file ghc-check-original-file)
|
(let ((file ghc-process-original-file)
|
||||||
(buf ghc-check-original-buffer))
|
(buf ghc-process-original-buffer))
|
||||||
(ghc-check-highlight-original-buffer file buf infos)))
|
(ghc-check-highlight-original-buffer file buf infos)))
|
||||||
(t
|
(t
|
||||||
(with-current-buffer ghc-check-original-buffer
|
(with-current-buffer ghc-process-original-buffer
|
||||||
(remove-overlays (point-min) (point-max) 'ghc-check t))))
|
(remove-overlays (point-min) (point-max) 'ghc-check t))))))
|
||||||
(setq ghc-check-running nil)))))
|
|
||||||
|
|
||||||
(defun ghc-check-process-sentinel (process event)
|
|
||||||
)
|
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
||||||
|
|
||||||
(defun ghc-check-highlight-original-buffer (ofile buf infos)
|
(defun ghc-check-highlight-original-buffer (ofile buf infos)
|
||||||
(with-current-buffer buf
|
(with-current-buffer buf
|
||||||
|
@ -1,233 +0,0 @@
|
|||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
||||||
;;;
|
|
||||||
;;; ghc-flymake.el
|
|
||||||
;;;
|
|
||||||
|
|
||||||
;; Author: Kazu Yamamoto <Kazu@Mew.org>
|
|
||||||
;; Created: Mar 12, 2010
|
|
||||||
|
|
||||||
;;; Code:
|
|
||||||
|
|
||||||
(require 'flymake)
|
|
||||||
(require 'ghc-func)
|
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
||||||
|
|
||||||
(defvar ghc-hlint-options nil "*Hlint options")
|
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
||||||
|
|
||||||
(defconst ghc-flymake-allowed-file-name-masks
|
|
||||||
'("\\.l?hs$" ghc-flymake-init nil ghc-emacs23-later-hack))
|
|
||||||
|
|
||||||
(defconst ghc-flymake-err-line-patterns
|
|
||||||
'("^\\(.*\\):\\([0-9]+\\):\\([0-9]+\\):[ ]*\\(.+\\)" 1 2 3 4))
|
|
||||||
|
|
||||||
(add-to-list 'flymake-allowed-file-name-masks
|
|
||||||
ghc-flymake-allowed-file-name-masks)
|
|
||||||
|
|
||||||
(add-to-list 'flymake-err-line-patterns
|
|
||||||
ghc-flymake-err-line-patterns)
|
|
||||||
|
|
||||||
;; flymake of Emacs 23 or later does not display errors
|
|
||||||
;; if they occurred in other files. So, let's cheat flymake.
|
|
||||||
(defun ghc-emacs23-later-hack (tmp-file)
|
|
||||||
(let ((real-name (flymake-get-real-file-name tmp-file))
|
|
||||||
(hack-name (flymake-get-real-file-name buffer-file-name)))
|
|
||||||
(unless (string= real-name hack-name)
|
|
||||||
;; Change the local variable, line-err-info,
|
|
||||||
;; in flymake-parse-err-lines.
|
|
||||||
(when (boundp 'line-err-info)
|
|
||||||
(setq line-err-info
|
|
||||||
(flymake-ler-make-ler
|
|
||||||
nil
|
|
||||||
1
|
|
||||||
(flymake-ler-type line-err-info)
|
|
||||||
(concat real-name ": " (flymake-ler-text line-err-info))
|
|
||||||
(flymake-ler-full-file line-err-info)))))
|
|
||||||
hack-name))
|
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
||||||
|
|
||||||
(defun ghc-flymake-init ()
|
|
||||||
(list ghc-module-command (ghc-flymake-command (flymake-init-create-temp-buffer-copy 'flymake-create-temp-inplace))))
|
|
||||||
|
|
||||||
(defvar ghc-flymake-command nil) ;; nil: check, t: lint
|
|
||||||
|
|
||||||
(defun ghc-flymake-command (file)
|
|
||||||
(if ghc-flymake-command
|
|
||||||
(let ((hopts (ghc-mapconcat (lambda (x) (list "-h" x)) ghc-hlint-options)))
|
|
||||||
`(,@hopts "lint" ,file))
|
|
||||||
`(,@(ghc-make-ghc-options) "check" ,file)))
|
|
||||||
|
|
||||||
(defun ghc-flymake-toggle-command ()
|
|
||||||
(interactive)
|
|
||||||
(setq ghc-flymake-command (not ghc-flymake-command))
|
|
||||||
(if ghc-flymake-command
|
|
||||||
(message "Syntax check with hlint")
|
|
||||||
(message "Syntax check with GHC")))
|
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
||||||
|
|
||||||
(defun ghc-flymake-display-errors ()
|
|
||||||
(interactive)
|
|
||||||
(if (not (ghc-flymake-have-errs-p))
|
|
||||||
(message "No errors or warnings")
|
|
||||||
(let ((title (ghc-flymake-err-title))
|
|
||||||
(errs (ghc-flymake-err-list)))
|
|
||||||
(ghc-display
|
|
||||||
nil
|
|
||||||
(lambda ()
|
|
||||||
(insert title "\n\n")
|
|
||||||
(mapc (lambda (x) (insert x "\n")) errs))))))
|
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
||||||
|
|
||||||
(defun ghc-flymake-jump ()
|
|
||||||
(interactive)
|
|
||||||
(if (not (ghc-flymake-have-errs-p))
|
|
||||||
(message "No errors or warnings")
|
|
||||||
(let* ((acts (ghc-flymake-act-list))
|
|
||||||
(act (car acts)))
|
|
||||||
(if (not act)
|
|
||||||
(message "No destination")
|
|
||||||
(eval act)))))
|
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
||||||
|
|
||||||
(defun ghc-extract-type (str)
|
|
||||||
(with-temp-buffer
|
|
||||||
(insert str)
|
|
||||||
(goto-char (point-min))
|
|
||||||
(when (re-search-forward "Inferred type: \\|no type signature:\\( \\|\0 +\\)?" nil t)
|
|
||||||
(delete-region (point-min) (point)))
|
|
||||||
(when (re-search-forward " forall [^.]+\\." nil t)
|
|
||||||
(replace-match ""))
|
|
||||||
(while (re-search-forward "\0 +" nil t)
|
|
||||||
(replace-match " "))
|
|
||||||
(goto-char (point-min))
|
|
||||||
(while (re-search-forward "\\[Char\\]" nil t)
|
|
||||||
(replace-match "String"))
|
|
||||||
(re-search-forward "\0" nil t)
|
|
||||||
(buffer-substring-no-properties (point-min) (1- (point)))))
|
|
||||||
|
|
||||||
(defun ghc-flymake-insert-from-warning ()
|
|
||||||
(interactive)
|
|
||||||
(dolist (data (ghc-flymake-err-list))
|
|
||||||
(save-excursion
|
|
||||||
(cond
|
|
||||||
((string-match "Inferred type: \\|no type signature:" data)
|
|
||||||
(beginning-of-line)
|
|
||||||
(insert (ghc-extract-type data) "\n"))
|
|
||||||
((string-match "lacks an accompanying binding" data)
|
|
||||||
(beginning-of-line)
|
|
||||||
(when (looking-at "^\\([^ ]+\\) *::")
|
|
||||||
(save-match-data
|
|
||||||
(forward-line)
|
|
||||||
(if (not (bolp)) (insert "\n")))
|
|
||||||
(insert (match-string 1) " = undefined\n")))
|
|
||||||
((string-match "Not in scope: `\\([^']+\\)'" data)
|
|
||||||
(save-match-data
|
|
||||||
(unless (re-search-forward "^$" nil t)
|
|
||||||
(goto-char (point-max))
|
|
||||||
(insert "\n")))
|
|
||||||
(insert "\n" (match-string 1 data) " = undefined\n"))
|
|
||||||
((string-match "Pattern match(es) are non-exhaustive" data)
|
|
||||||
(let* ((fn (ghc-get-function-name))
|
|
||||||
(arity (ghc-get-function-arity fn)))
|
|
||||||
(ghc-insert-underscore fn arity)))
|
|
||||||
((string-match "Found:\0[ ]*\\([^\0]+\\)\0Why not:\0[ ]*\\([^\0]+\\)" data)
|
|
||||||
(let ((old (match-string 1 data))
|
|
||||||
(new (match-string 2 data)))
|
|
||||||
(beginning-of-line)
|
|
||||||
(when (search-forward old nil t)
|
|
||||||
(let ((end (point)))
|
|
||||||
(search-backward old nil t)
|
|
||||||
(delete-region (point) end))
|
|
||||||
(insert new))))))))
|
|
||||||
|
|
||||||
(defun ghc-get-function-name ()
|
|
||||||
(save-excursion
|
|
||||||
(beginning-of-line)
|
|
||||||
(when (looking-at "\\([^ ]+\\) ")
|
|
||||||
(match-string 1))))
|
|
||||||
|
|
||||||
(defun ghc-get-function-arity (fn)
|
|
||||||
(when fn
|
|
||||||
(save-excursion
|
|
||||||
(let ((regex (format "^%s *::" (regexp-quote fn))))
|
|
||||||
(when (re-search-backward regex nil t)
|
|
||||||
(ghc-get-function-arity0))))))
|
|
||||||
|
|
||||||
(defun ghc-get-function-arity0 ()
|
|
||||||
(let ((end (save-excursion (end-of-line) (point)))
|
|
||||||
(arity 0))
|
|
||||||
(while (search-forward "->" end t)
|
|
||||||
(setq arity (1+ arity)))
|
|
||||||
arity))
|
|
||||||
|
|
||||||
(defun ghc-insert-underscore (fn ar)
|
|
||||||
(when fn
|
|
||||||
(let ((arity (or ar 1)))
|
|
||||||
(save-excursion
|
|
||||||
(goto-char (point-max))
|
|
||||||
(re-search-backward (format "^%s *::" (regexp-quote fn)))
|
|
||||||
(forward-line)
|
|
||||||
(re-search-forward "^$" nil t)
|
|
||||||
(insert fn)
|
|
||||||
(dotimes (i arity)
|
|
||||||
(insert " _"))
|
|
||||||
(insert " = error \"" fn "\"")))))
|
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
||||||
|
|
||||||
(defun ghc-flymake-err-get-title (x) (nth 0 x))
|
|
||||||
(defun ghc-flymake-err-get-errs (x) (nth 1 x))
|
|
||||||
|
|
||||||
(defun ghc-flymake-err-get-err-msg (x) (nth 0 x))
|
|
||||||
(defun ghc-flymake-err-get-err-act (x) (nth 1 x))
|
|
||||||
|
|
||||||
(defalias 'ghc-flymake-have-errs-p 'ghc-flymake-data)
|
|
||||||
|
|
||||||
(defun ghc-flymake-data ()
|
|
||||||
(let* ((line-no (line-number-at-pos))
|
|
||||||
(info (nth 0 (flymake-find-err-info flymake-err-info line-no))))
|
|
||||||
(flymake-make-err-menu-data-stolen line-no info)))
|
|
||||||
|
|
||||||
(defun flymake-make-err-menu-data-stolen (line-no line-err-info-list)
|
|
||||||
"Make a (menu-title (item-title item-action)*) list with errors/warnings from LINE-ERR-INFO-LIST."
|
|
||||||
(let* ((menu-items nil))
|
|
||||||
(when line-err-info-list
|
|
||||||
(let* ((count (length line-err-info-list))
|
|
||||||
(menu-item-text nil))
|
|
||||||
(while (> count 0)
|
|
||||||
(setq menu-item-text (flymake-ler-text (nth (1- count) line-err-info-list)))
|
|
||||||
(let* ((file (flymake-ler-file (nth (1- count) line-err-info-list)))
|
|
||||||
(full-file (flymake-ler-full-file (nth (1- count) line-err-info-list)))
|
|
||||||
(line (flymake-ler-line (nth (1- count) line-err-info-list))))
|
|
||||||
(if file
|
|
||||||
(setq menu-item-text (concat menu-item-text " - " file "(" (format "%d" line) ")")))
|
|
||||||
(setq menu-items (cons (list menu-item-text
|
|
||||||
(if file (list 'flymake-goto-file-and-line full-file line) nil))
|
|
||||||
menu-items)))
|
|
||||||
(setq count (1- count)))
|
|
||||||
(flymake-log 3 "created menu-items with %d item(s)" (length menu-items))))
|
|
||||||
(if menu-items
|
|
||||||
(let* ((menu-title (format "Line %d: %d error(s), %d warning(s)" line-no
|
|
||||||
(flymake-get-line-err-count line-err-info-list "e")
|
|
||||||
(flymake-get-line-err-count line-err-info-list "w"))))
|
|
||||||
(list menu-title menu-items))
|
|
||||||
nil)))
|
|
||||||
|
|
||||||
(defun ghc-flymake-err-title ()
|
|
||||||
(ghc-flymake-err-get-title (ghc-flymake-data)))
|
|
||||||
|
|
||||||
(defun ghc-flymake-err-list ()
|
|
||||||
(mapcar 'ghc-flymake-err-get-err-msg (ghc-flymake-err-get-errs (ghc-flymake-data))))
|
|
||||||
|
|
||||||
(defun ghc-flymake-act-list ()
|
|
||||||
(mapcar 'ghc-flymake-err-get-err-act (ghc-flymake-err-get-errs (ghc-flymake-data))))
|
|
||||||
|
|
||||||
(provide 'ghc-flymake)
|
|
@ -8,23 +8,27 @@
|
|||||||
|
|
||||||
;;; Code:
|
;;; Code:
|
||||||
|
|
||||||
(defvar ghc-hoogle-command "hoogle")
|
(defvar ghc-ins-mod-rendezvous nil)
|
||||||
|
|
||||||
(defun ghc-insert-module ()
|
(defun ghc-insert-module ()
|
||||||
(interactive)
|
(interactive)
|
||||||
(ghc-executable-find ghc-hoogle-command
|
|
||||||
(let* ((expr0 (ghc-things-at-point))
|
(let* ((expr0 (ghc-things-at-point))
|
||||||
(expr (ghc-read-expression expr0)))
|
(expr (ghc-read-expression expr0)))
|
||||||
(let ((mods (ghc-function-to-modules expr)))
|
(let ((mods (ghc-function-to-modules expr)))
|
||||||
(if (null mods)
|
(if (null mods)
|
||||||
(message "No module guessed")
|
(message "No module guessed")
|
||||||
(let* ((first (car mods))
|
(let ((mod (ghc-completing-read "Module name (%s): " mods)))
|
||||||
(mod (if (= (length mods) 1)
|
|
||||||
first
|
|
||||||
(completing-read "Module name: " mods nil t first))))
|
|
||||||
(save-excursion
|
(save-excursion
|
||||||
(ghc-goto-module-position)
|
(ghc-goto-module-position)
|
||||||
(insert "import " mod "\n"))))))))
|
(if (string-match "^[a-zA-Z0-9_]$" expr)
|
||||||
|
(insert "import " mod " (" expr ")\n")
|
||||||
|
(insert "import " mod " ((" expr "))\n"))))))))
|
||||||
|
|
||||||
|
(defun ghc-completing-read (fmt lst)
|
||||||
|
(let* ((def (car lst))
|
||||||
|
(prompt (format fmt def))
|
||||||
|
(inp (completing-read prompt lst)))
|
||||||
|
(if (string= inp "") def inp)))
|
||||||
|
|
||||||
(defun ghc-goto-module-position ()
|
(defun ghc-goto-module-position ()
|
||||||
(goto-char (point-max))
|
(goto-char (point-max))
|
||||||
@ -38,25 +42,27 @@
|
|||||||
(unless (re-search-forward "^$" nil t)
|
(unless (re-search-forward "^$" nil t)
|
||||||
(forward-line)))
|
(forward-line)))
|
||||||
|
|
||||||
;; To avoid Data.Functor
|
(defun ghc-function-to-modules (fun)
|
||||||
(defvar ghc-applicative-operators '("<$>" "<$" "<*>" "<**>" "<*" "*>" "<|>"))
|
(setq ghc-ins-mod-rendezvous nil)
|
||||||
|
(ghc-with-process
|
||||||
|
(lambda () (ghc-ins-mod-send fun))
|
||||||
|
'ghc-ins-mod-callback)
|
||||||
|
(while (null ghc-ins-mod-rendezvous)
|
||||||
|
(sit-for 0.01))
|
||||||
|
ghc-ins-mod-rendezvous)
|
||||||
|
|
||||||
(defun ghc-function-to-modules (fn)
|
(defun ghc-ins-mod-send (fun)
|
||||||
(if (member fn ghc-applicative-operators)
|
(concat "find " fun "\n"))
|
||||||
'("Control.Applicative")
|
|
||||||
(ghc-function-to-modules-hoogle fn)))
|
|
||||||
|
|
||||||
(defun ghc-function-to-modules-hoogle (fn)
|
(defun ghc-ins-mod-callback ()
|
||||||
(with-temp-buffer
|
(let (lines line beg)
|
||||||
(let* ((fn1 (if (string-match "^[a-zA-Z0-9'_]+$" fn)
|
(while (not (eobp))
|
||||||
fn
|
(setq beg (point))
|
||||||
(concat "(" fn ")")))
|
(forward-line)
|
||||||
(regex (concat "^\\([a-zA-Z0-9.]+\\) " fn1 " "))
|
(setq line (buffer-substring-no-properties beg (1- (point))))
|
||||||
ret)
|
(setq lines (cons line lines)))
|
||||||
(ghc-call-process ghc-hoogle-command nil t nil "search" fn1)
|
(with-current-buffer ghc-process-original-buffer
|
||||||
(goto-char (point-min))
|
(setq ghc-ins-mod-rendezvous
|
||||||
(while (re-search-forward regex nil t)
|
(nreverse (cdr lines)))))) ;; removing "OK"
|
||||||
(setq ret (cons (match-string 1) ret)))
|
|
||||||
(nreverse ret))))
|
|
||||||
|
|
||||||
(provide 'ghc-ins-mod)
|
(provide 'ghc-ins-mod)
|
||||||
|
81
elisp/ghc-process.el
Normal file
81
elisp/ghc-process.el
Normal file
@ -0,0 +1,81 @@
|
|||||||
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
|
;;;
|
||||||
|
;;; ghc-process.el
|
||||||
|
;;;
|
||||||
|
|
||||||
|
;; Author: Kazu Yamamoto <Kazu@Mew.org>
|
||||||
|
;; Created: Mar 9, 2014
|
||||||
|
|
||||||
|
;;; Code:
|
||||||
|
|
||||||
|
(require 'ghc-func)
|
||||||
|
|
||||||
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
|
|
||||||
|
(defvar-local ghc-process-running nil)
|
||||||
|
(defvar-local ghc-process-process-name nil)
|
||||||
|
(defvar-local ghc-process-original-buffer nil)
|
||||||
|
(defvar-local ghc-process-original-file nil)
|
||||||
|
(defvar-local ghc-process-callback nil)
|
||||||
|
|
||||||
|
(defvar ghc-interactive-command "ghc-modi")
|
||||||
|
|
||||||
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
|
|
||||||
|
(defun ghc-get-process-name ()
|
||||||
|
(let ((file (buffer-file-name)))
|
||||||
|
(with-temp-buffer
|
||||||
|
(ghc-call-process ghc-module-command nil t nil "root" file)
|
||||||
|
(goto-char (point-min))
|
||||||
|
(when (looking-at "^\\(.*\\)$")
|
||||||
|
(match-string-no-properties 1)))))
|
||||||
|
|
||||||
|
(defun ghc-with-process (send callback)
|
||||||
|
(unless ghc-process-process-name
|
||||||
|
(setq ghc-process-process-name (ghc-get-process-name)))
|
||||||
|
(when ghc-process-process-name
|
||||||
|
(let* ((cbuf (current-buffer))
|
||||||
|
(name ghc-process-process-name)
|
||||||
|
(buf (get-buffer-create (concat " ghc-modi:" name)))
|
||||||
|
(file (buffer-file-name))
|
||||||
|
(cpro (get-process name)))
|
||||||
|
(with-current-buffer buf
|
||||||
|
(unless ghc-process-running
|
||||||
|
(setq ghc-process-running t)
|
||||||
|
(setq ghc-process-original-buffer cbuf)
|
||||||
|
(setq ghc-process-original-file file)
|
||||||
|
(setq ghc-process-callback callback)
|
||||||
|
(erase-buffer)
|
||||||
|
(let ((pro (ghc-get-process cpro name buf)))
|
||||||
|
(process-send-string pro (funcall send))))))))
|
||||||
|
|
||||||
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
|
|
||||||
|
(defun ghc-get-process (cpro name buf)
|
||||||
|
(cond
|
||||||
|
((not cpro)
|
||||||
|
(ghc-start-process name buf))
|
||||||
|
((not (eq (process-status cpro) 'run))
|
||||||
|
(delete-process cpro)
|
||||||
|
(ghc-start-process name buf))
|
||||||
|
(t cpro)))
|
||||||
|
|
||||||
|
(defun ghc-start-process (name buf)
|
||||||
|
(let ((pro (start-file-process name buf ghc-interactive-command)))
|
||||||
|
(set-process-filter pro 'ghc-process-filter)
|
||||||
|
(set-process-query-on-exit-flag pro nil)
|
||||||
|
pro))
|
||||||
|
|
||||||
|
(defun ghc-process-filter (process string)
|
||||||
|
(with-current-buffer (process-buffer process)
|
||||||
|
(goto-char (point-max))
|
||||||
|
(insert string)
|
||||||
|
(forward-line -1)
|
||||||
|
(when (looking-at "^\\(OK\\|NG\\)$")
|
||||||
|
(goto-char (point-min))
|
||||||
|
(funcall ghc-process-callback)
|
||||||
|
(setq ghc-process-running nil))))
|
||||||
|
|
||||||
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
|
|
||||||
|
(provide 'ghc-process)
|
@ -21,7 +21,7 @@ Cabal-Version: >= 1.10
|
|||||||
Build-Type: Simple
|
Build-Type: Simple
|
||||||
Data-Dir: elisp
|
Data-Dir: elisp
|
||||||
Data-Files: Makefile ghc.el ghc-func.el ghc-doc.el ghc-comp.el
|
Data-Files: Makefile ghc.el ghc-func.el ghc-doc.el ghc-comp.el
|
||||||
ghc-flymake.el ghc-command.el ghc-info.el
|
ghc-check.el ghc-process.el ghc-command.el ghc-info.el
|
||||||
ghc-ins-mod.el ghc-indent.el ghc-pkg.el
|
ghc-ins-mod.el ghc-indent.el ghc-pkg.el
|
||||||
Extra-Source-Files: ChangeLog
|
Extra-Source-Files: ChangeLog
|
||||||
test/data/*.cabal
|
test/data/*.cabal
|
||||||
|
Loading…
Reference in New Issue
Block a user