git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
C++: fix pcc after merge
commit8b3c035ba3aad4df75366b1a9d2076a99701c7a4 authorAndy Arvanitis <andyarvanitis@gmail.com> dateThu 10 Dec 2015, 22:12 (11 years ago) parentbf6cda5
1 file changed+3−7
pcc/Make.hs+3−7
pcc/Make.hs+3−7
@@ -35,7 +35,6 @@ import Data.String (fromString)
3535import Data.Time.Clock
3636import Data.Version (showVersion)
3737import qualified Data.Map as M
38−import qualified Data.ByteString.Lazy as BL
3938import qualified Data.ByteString.Char8 as B
4039
4140import System.Directory (doesDirectoryExist, doesFileExist, getModificationTime, createDirectoryIfMissing)
@@ -91,10 +90,10 @@ buildMakeActions outputDir filePathMap usePrefix =
9190 externsFile = outputDir </> filePath </> "externs.purs"
9291 min <$> getTimestamp srcFile <*> getTimestamp externsFile
9392
94− readExterns :: P.ModuleName -> Make (FilePath, BL.ByteString)
93+ readExterns :: P.ModuleName -> Make (FilePath, P.Externs)
9594 readExterns mn = do
9695 let path = outputDir </> (dotsTo '/' $ P.runModuleName mn) </> "externs.purs"
97− (path, ) <$> readTextFile' path
96+ (path, ) <$> readTextFile path
9897
9998 codegen :: CF.Module CF.Ann -> P.Environment -> P.Externs -> P.SupplyT Make ()
10099 codegen m env exts = do
@@ -115,7 +114,7 @@ buildMakeActions outputDir filePathMap usePrefix =
115114 lift $ do
116115 writeTextFile srcFile src
117116 writeTextFile headerFile hdr
118− writeTextFile externsFile $ B.unpack $ BL.toStrict exts
117+ writeTextFile externsFile exts
119118
120119 let supportDir = outputDir </> "PureScript"
121120 supportFilesExist <- dirExists supportDir
@@ -159,9 +158,6 @@ buildMakeActions outputDir filePathMap usePrefix =
159158 readTextFile :: FilePath -> Make String
160159 readTextFile path = makeIO (const (ErrorMessage [] $ CannotReadFile path)) $ readUTF8File path
161160
162− readTextFile' :: FilePath -> Make BL.ByteString
163− readTextFile' path = makeIO (const (ErrorMessage [] $ CannotReadFile path)) $ BL.readFile path
164−
165161 writeTextFile :: FilePath -> String -> Make ()
166162 writeTextFile path text = makeIO (const (ErrorMessage [] $ CannotWriteFile path)) $ do
167163 mkdirp path