on master help sign in
Get rid of fromFile / have the caller do that
commit12386076af3e1f11c481e89e2dae8c870839e6ad authorEvan Czaplicki <evancz@users.noreply.github.com> dateTue 16 Apr 2019, 15:02 (8 years ago) parent886b167
1 file changed+8−8
compiler/src/Elm/Kernel.hs+8−8
compiler/src/Elm/Kernel.hs+8−8
@@ -3,7 +3,7 @@
33module Elm.Kernel
44 ( Content(..)
55 , Chunk(..)
6− , fromFile
6+ , fromByteString
77 , countFields
88 )
99 where
@@ -11,6 +11,7 @@ module Elm.Kernel
1111
1212import Control.Monad (liftM, liftM2)
1313import Data.Binary (Binary, get, put, getWord8, putWord8)
14+import qualified Data.ByteString as BS
1415import Data.Coerce (coerce)
1516import qualified Data.List as List
1617import qualified Data.Map as Map
@@ -25,7 +26,7 @@ import qualified Elm.Package as Pkg
2526import qualified Parse.Module as Module
2627import qualified Parse.Variable as Var
2728import Parse.Utils
28−import Parse.Primitives hiding (Parser, fromFile)
29+import Parse.Primitives hiding (Parser, fromByteString)
2930import qualified Parse.Primitives as P
3031import qualified Reporting.Annotation as A
3132import qualified Reporting.Error.Syntax as E
@@ -83,12 +84,11 @@ type Foreigns =
8384 Map.Map ModuleName.Raw Pkg.Name
8485
8586
86−fromFile :: Pkg.Name -> Foreigns -> FilePath -> IO (Maybe Content)
87−fromFile pkg foreigns path =
88− do result <- P.fromFile (parser pkg foreigns) path
89− case result of
90− P.Ok content _ -> return (Just content)
91− P.Err _ _ _ _ -> return Nothing
87+fromByteString :: Pkg.Name -> Foreigns -> BS.ByteString -> Maybe Content
88+fromByteString pkg foreigns bytes =
89+ case P.fromByteString (parser pkg foreigns) bytes of
90+ P.Ok content _ -> Just content
91+ P.Err _ _ _ _ -> Nothing
9292
9393
9494parser :: Pkg.Name -> Foreigns -> Parser Content