Removed cereal from globalImports, now exported from IHaskell.Display

This commit is contained in:
Andrew Gibiansky 2013-12-13 11:25:12 -08:00
parent bae2b0446c
commit f7efb69b39
2 changed files with 8 additions and 7 deletions

View File

@ -3,10 +3,13 @@
module IHaskell.Display (
IHaskellDisplay(..),
plain,
html
html,
serializeDisplay
) where
import ClassyPrelude
import Data.Serialize as Serialize
import Data.ByteString
import Data.String.Utils (rstrip)
import IHaskell.Types
@ -22,3 +25,6 @@ plain = Display PlainText . rstrip
-- | Generate an HTML display.
html :: String -> DisplayData
html = Display MimeHtml
serializeDisplay :: [DisplayData] -> ByteString
serializeDisplay = Serialize.encode

View File

@ -98,11 +98,6 @@ type Interpreter = Ghc
globalImports :: [String]
globalImports =
[ "import Prelude"
-- IHaskell.Display must be imported in order for the IHaskellDisplay
-- data typeclass to function properly.
--, "import Data.Typeable"
, "import qualified Data.Serialize as Serialize"
, "import Data.Serialize"
, "import IHaskell.Types"
, "import IHaskell.Display"
, "import Control.Applicative ((<$>))"
@ -364,7 +359,7 @@ evalCommand (Expression expr) = do
-- attempting to do this without the serialization to binary and
-- back gives very strange errors - all the types match but it
-- refuses to decode back into a [DisplayData].
displayedBytestring <- dynCompileExpr "Serialize.encode (IHaskell.Display.display it)"
displayedBytestring <- dynCompileExpr "IHaskell.Display.serializeDisplay (IHaskell.Display.display it)"
case fromDynamic displayedBytestring of
Nothing -> error "Expecting lazy Bytestring"
Just bytestring ->