giving up loading Data.ByteString.
This commit is contained in:
@@ -30,7 +30,7 @@ unloaded modules are loaded")
|
||||
;; must be sorted
|
||||
(defconst ghc-reserved-keyword '("case" "deriving" "do" "else" "if" "in" "let" "module" "of" "then" "where"))
|
||||
|
||||
(defconst ghc-extra-keywords '()) ;; was '("ByteString")
|
||||
(defconst ghc-extra-keywords '("ByteString" "Text"))
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;;;
|
||||
@@ -58,12 +58,9 @@ unloaded modules are loaded")
|
||||
(defvar ghc-keyword-Control.Applicative nil)
|
||||
(defvar ghc-keyword-Control.Exception nil)
|
||||
(defvar ghc-keyword-Control.Monad nil)
|
||||
(defvar ghc-keyword-Data.ByteString nil)
|
||||
(defvar ghc-keyword-Data.Char nil)
|
||||
(defvar ghc-keyword-Data.List nil)
|
||||
(defvar ghc-keyword-Data.Maybe nil)
|
||||
(defvar ghc-keyword-System.Directory nil)
|
||||
(defvar ghc-keyword-System.FilePath nil)
|
||||
(defvar ghc-keyword-System.IO nil)
|
||||
|
||||
(defvar ghc-loaded-module nil)
|
||||
@@ -77,12 +74,9 @@ unloaded modules are loaded")
|
||||
ghc-keyword-Control.Applicative
|
||||
ghc-keyword-Control.Exception
|
||||
ghc-keyword-Control.Monad
|
||||
ghc-keyword-Data.ByteString
|
||||
ghc-keyword-Data.Char
|
||||
ghc-keyword-Data.List
|
||||
ghc-keyword-Data.Maybe
|
||||
ghc-keyword-System.Directory
|
||||
ghc-keyword-System.FilePath
|
||||
ghc-keyword-System.IO))
|
||||
(vals (ghc-boot (length syms))))
|
||||
(ghc-set syms vals))
|
||||
@@ -93,12 +87,9 @@ unloaded modules are loaded")
|
||||
"Control.Applicative"
|
||||
"Control.Exception"
|
||||
"Control.Monad"
|
||||
"Data.ByteString"
|
||||
"Data.Char"
|
||||
"Data.List"
|
||||
"Data.Maybe"
|
||||
"System.Directory"
|
||||
"System.FilePath"
|
||||
"System.IO")))
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
@@ -114,7 +105,10 @@ unloaded modules are loaded")
|
||||
|
||||
(defun ghc-load-modules (mods)
|
||||
(if mods
|
||||
(mapcar 'ghc-load-module mods)
|
||||
(prog2
|
||||
(message "Loading symbols...")
|
||||
(mapcar 'ghc-load-module mods)
|
||||
(message "Loading symbols...done"))
|
||||
(message "No new modules")
|
||||
nil))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user