Use real filePathMap

garyb · garyb · commit 3ee0fa556be0 · 2015-05-13T20:39:24.000+01:00
diff --git a/psc-make/Main.hs b/psc-make/Main.hs
@@ -12,7 +12,10 @@
 --
 -----------------------------------------------------------------------------
 
-{-# LANGUAGE DataKinds, GeneralizedNewtypeDeriving, TupleSections, RecordWildCards #-}
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE TupleSections #-}
+{-# LANGUAGE RecordWildCards #-}
 
 module Main where
 
@@ -91,11 +94,10 @@ compile :: PSCMakeOptions -> IO ()
 compile (PSCMakeOptions input outputDir opts usePrefix) = do
   modules <- P.parseModulesFromFiles (either (const "") id) <$> readInput (InputOptions (P.optionsNoPrelude opts) input)
   case modules of
-    Left err -> do
-      print err
-      exitFailure
+    Left err -> print err >> exitFailure
     Right ms -> do
-      e <- runMake opts $ P.make getInputTimestamp getOutputTimestamp readExterns codegen ms
+      let filePathMap = M.fromList $ map (\(fp, P.Module _ mn _ _) -> (mn, fp)) ms
+      e <- runMake opts $ P.make (getInputTimestamp filePathMap) getOutputTimestamp readExterns codegen ms
       case e of
         Left errs -> do
           putStrLn (P.prettyPrintMultipleErrors (P.optionsVerboseErrors opts) errs)
@@ -105,16 +107,11 @@ compile (PSCMakeOptions input outputDir opts usePrefix) = do
             putStrLn (P.prettyPrintMultipleWarnings (P.optionsVerboseErrors opts) warnings)
           exitSuccess
   where
-  prefix = if usePrefix
-           then ["Generated by psc-make version " ++ showVersion Paths.version]
-           else []
 
-  filePathMap = M.empty -- M.fromList (map (\(fp, Module _ mn _ _) -> (mn, fp)) ms)
-
-  getInputTimestamp :: P.ModuleName -> Make (Either P.RebuildPolicy (Maybe UTCTime))
-  getInputTimestamp mn = do
-    let inputFile = fromMaybe (error "Module has no filename in 'make'") $ M.lookup mn filePathMap
-    traverseEither P.getTimestamp inputFile
+  getInputTimestamp :: M.Map P.ModuleName (Either P.RebuildPolicy String) -> P.ModuleName -> Make (Either P.RebuildPolicy (Maybe UTCTime))
+  getInputTimestamp filePathMap mn = do
+    let path = fromMaybe (error "Module has no filename in 'make'") $ M.lookup mn filePathMap
+    traverseEither P.getTimestamp path
 
   getOutputTimestamp :: P.ModuleName -> Make (Maybe UTCTime)
   getOutputTimestamp mn = do
@@ -129,12 +126,13 @@ compile (PSCMakeOptions input outputDir opts usePrefix) = do
     (path, ) <$> P.readTextFile path
 
   codegen :: CoreFn.Module CoreFn.Ann -> String -> P.Environment -> Integer -> Make ()
-  codegen m exts env nextVar = do
+  codegen m exts _ nextVar = do
+    pjs <- P.evalSupplyT nextVar $ P.prettyPrintJS <$> J.moduleToJs m Nothing
     let filePath = P.runModuleName $ CoreFn.moduleName m
         jsFile = outputDir </> filePath </> "index.js"
         externsFile = outputDir </> filePath </> "externs.purs"
-    pjs <- P.evalSupplyT nextVar $ P.prettyPrintJS <$> J.moduleToJs m Nothing
-    let js = unlines $ map ("// " ++) prefix ++ [pjs]
+        prefix = ["Generated by psc-make version " ++ showVersion Paths.version | usePrefix]
+        js = unlines $ map ("// " ++) prefix ++ [pjs]
     P.writeTextFile jsFile js
     P.writeTextFile externsFile exts
 
