hasufell/ghc-mod
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Data.ByteString cannot be loaded if not specified in cabal file.

Browse Source
This commit is contained in:
Kazu Yamamoto 2014-03-27 14:24:38 +09:00
parent cb9db4fd1a
commit d3d9eb1e2c
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Language/Haskell/GhcMod/.ErrMsg.hs.swp
View File

Binary file not shown.

6
elisp/ghc-comp.el
View File

@ -30,6 +30,8 @@ unloaded modules are loaded")
;; must be sorted ;; must be sorted
(defconst ghc-reserved-keyword '("case" "deriving" "do" "else" "if" "in" "let" "module" "of" "then" "where")) (defconst ghc-reserved-keyword '("case" "deriving" "do" "else" "if" "in" "let" "module" "of" "then" "where"))
(defconst ghc-extra-keywords '("ByteString"))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; ;;;
;;; Local Variables ;;; Local Variables
@ -73,7 +75,6 @@ unloaded modules are loaded")
ghc-keyword-Control.Applicative ghc-keyword-Control.Applicative
ghc-keyword-Control.Monad ghc-keyword-Control.Monad
ghc-keyword-Control.Exception ghc-keyword-Control.Exception
ghc-keyword-Data.ByteString
ghc-keyword-Data.Char ghc-keyword-Data.Char
ghc-keyword-Data.List ghc-keyword-Data.List
ghc-keyword-Data.Maybe ghc-keyword-Data.Maybe
@ -87,7 +88,6 @@ unloaded modules are loaded")
"Control.Applicative" "Control.Applicative"
"Control.Monad" "Control.Monad"
"Control.Exception" "Control.Exception"
"Data.ByteString"
"Data.Char" "Data.Char"
"Data.List" "Data.List"
"Data.Maybe" "Data.Maybe"
@ -261,7 +261,7 @@ unloaded modules are loaded")
(defun ghc-merge-keywords (mods) (defun ghc-merge-keywords (mods)
(setq ghc-loaded-module (append mods ghc-loaded-module)) (setq ghc-loaded-module (append mods ghc-loaded-module))
(let* ((modkeys (mapcar 'ghc-module-keyword ghc-loaded-module)) (let* ((modkeys (mapcar 'ghc-module-keyword ghc-loaded-module))
(keywords (cons ghc-reserved-keyword modkeys)) (keywords (cons ghc-extra-keywords (cons ghc-reserved-keyword modkeys)))
(uniq-sorted (sort (ghc-uniq-lol keywords) 'string<))) (uniq-sorted (sort (ghc-uniq-lol keywords) 'string<)))
(setq ghc-merged-keyword uniq-sorted))) (setq ghc-merged-keyword uniq-sorted)))

1
src/GHCMod.hs
View File

@ -160,7 +160,6 @@ preBrowsedModules = [
, "Control.Applicative" , "Control.Applicative"
, "Control.Monad" , "Control.Monad"
, "Control.Exception" , "Control.Exception"
, "Data.ByteString"
, "Data.Char" , "Data.Char"
, "Data.List" , "Data.List"
, "Data.Maybe" , "Data.Maybe"