Add preludeFilename to Language.PureScript

mpietrzak · mpietrzak · commit 3cc2cb4568bd · 2014-08-22T18:16:38.000+02:00
diff --git a/psc-make/Main.hs b/psc-make/Main.hs
@@ -34,9 +34,6 @@ import qualified Language.PureScript as P
 import qualified Paths_purescript as Paths
 import qualified System.IO.UTF8 as U
 
-preludeFilename :: IO FilePath
-preludeFilename = Paths.getDataFileName "prelude/prelude.purs"
-
 readInput :: [FilePath] -> IO (Either ParseError [(FilePath, P.Module)])
 readInput input = fmap collect $ forM input $ \inputFile -> do
   text <- U.readFile inputFile
@@ -141,5 +138,5 @@ termInfo = defTI
 
 main :: IO ()
 main = do
-  prelude <- preludeFilename
+  prelude <- P.preludeFilename
   run (term prelude, termInfo)
diff --git a/psc/Main.hs b/psc/Main.hs
@@ -33,9 +33,6 @@ import qualified Language.PureScript as P
 import qualified Paths_purescript as Paths
 import qualified System.IO.UTF8 as U
 
-preludeFilename :: IO FilePath
-preludeFilename = Paths.getDataFileName "prelude/prelude.purs"
-
 readInput :: Maybe [FilePath] -> IO (Either ParseError [(FilePath, P.Module)])
 readInput Nothing = do
   text <- getContents
@@ -149,6 +146,6 @@ termInfo = defTI
 
 main :: IO ()
 main = do
-  prelude <- preludeFilename
+  prelude <- P.preludeFilename
   run (term prelude, termInfo)
 
diff --git a/psci/Main.hs b/psci/Main.hs
@@ -116,12 +116,6 @@ findNodeProcess = runMaybeT . msum $ map (MaybeT . findExecutable) names
 getHistoryFilename :: IO FilePath
 getHistoryFilename = getUserConfigFile "purescript" "psci_history"
 
--- |
--- Grabs the filename where prelude is.
---
-getPreludeFilename :: IO FilePath
-getPreludeFilename = Paths.getDataFileName "prelude/prelude.purs"
-
 -- |
 -- Loads a file for use with imports.
 --
@@ -400,7 +394,7 @@ loadUserConfig = do
 loop :: [FilePath] -> IO ()
 loop files = do
   config <- loadUserConfig
-  preludeFilename <- getPreludeFilename
+  preludeFilename <- P.preludeFilename
   filesAndModules <- mapM (\file -> fmap (fmap (map ((,) file))) . loadModule $ file) (preludeFilename : files)
   let modulesOrFirstError = fmap concat $ sequence filesAndModules
   case modulesOrFirstError of
diff --git a/purescript.cabal b/purescript.cabal
@@ -88,7 +88,7 @@ library
     exposed: True
     buildable: True
     hs-source-dirs: src
-    other-modules:
+    other-modules: Paths_purescript
     ghc-options: -Wall -O2
 
 executable psc
diff --git a/src/Language/PureScript.hs b/src/Language/PureScript.hs
@@ -13,7 +13,7 @@
 --
 -----------------------------------------------------------------------------
 
-module Language.PureScript (module P, compile, compile', MonadMake(..), make) where
+module Language.PureScript (module P, compile, compile', MonadMake(..), make, preludeFilename) where
 
 import Language.PureScript.Types as P
 import Language.PureScript.Kinds as P
@@ -34,6 +34,7 @@ import Language.PureScript.Supply as P
 import Language.PureScript.Renamer as P
 
 import qualified Language.PureScript.Constants as C
+import qualified Paths_purescript as Paths
 
 import Data.List (find, sortBy, groupBy, intercalate)
 import Data.Time.Clock
@@ -261,3 +262,6 @@ importPrim = addDefaultImport (ModuleName [ProperName C.prim])
 
 importPrelude :: Module -> Module
 importPrelude = addDefaultImport (ModuleName [ProperName C.prelude])
+
+preludeFilename :: IO FilePath
+preludeFilename = Paths.getDataFileName "prelude/prelude.purs"
diff --git a/tests/Main.hs b/tests/Main.hs
@@ -27,12 +27,8 @@ import System.Process
 import System.FilePath (pathSeparator)
 import System.Directory (getCurrentDirectory, getTemporaryDirectory, getDirectoryContents, findExecutable)
 import Text.Parsec (ParseError)
-import qualified Paths_purescript as Paths
 import qualified System.IO.UTF8 as U
 
-preludeFilename :: IO FilePath
-preludeFilename = Paths.getDataFileName "prelude/prelude.purs"
-
 readInput :: [FilePath] -> IO (Either ParseError [P.Module])
 readInput inputFiles = fmap (fmap concat . sequence) $ forM inputFiles $ \inputFile -> do
   text <- U.readFile inputFile
@@ -80,7 +76,7 @@ findNodeProcess = runMaybeT . msum $ map (MaybeT . findExecutable) names
 
 main :: IO ()
 main = do
-  prelude <- preludeFilename
+  prelude <- P.preludeFilename
   putStrLn "Compiling Prelude"
   preludeResult <- compile (P.defaultOptions { P.optionsBrowserNamespace = Just "Tests" }) [prelude]
   case preludeResult of
