X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=distrib%2Fcompare%2FBuildInfo.hs;h=1101bf450d011866fac2c7ddd3ba3b3d5413b6d7;hb=5fddd81f04e9f9df37da19148c8e4262ea381bf8;hp=d71eeb4777c09c798b747b35f9fc1581c5a184c6;hpb=5c538c457d1215d7f5b5107ac808a24af805f870;p=ghc-hetmet.git diff --git a/distrib/compare/BuildInfo.hs b/distrib/compare/BuildInfo.hs index d71eeb4..1101bf4 100644 --- a/distrib/compare/BuildInfo.hs +++ b/distrib/compare/BuildInfo.hs @@ -8,7 +8,7 @@ type BIMonad = StateT BuildInfo Maybe data BuildInfo = BuildInfo { biThingVersionMap :: ThingVersionMap, biThingHashMap :: ThingHashMap, - biWays :: Ways + biMaybeWays :: Maybe Ways } deriving Show @@ -22,12 +22,12 @@ type ThingHashMap = ThingMap -- ["v", "p", "dyn"] => we have ".depend-v-p-dyn.haskell" files type Ways = [String] -emptyBuildInfo :: Ways -> BuildInfo -emptyBuildInfo ways = BuildInfo { - biThingVersionMap = [], - biThingHashMap = [], - biWays = ways - } +emptyBuildInfo :: Maybe Ways -> BuildInfo +emptyBuildInfo mWays = BuildInfo { + biThingVersionMap = [], + biThingHashMap = [], + biMaybeWays = mWays + } addThingMap :: ThingMap -> String -> String -> Maybe ThingMap addThingMap mapping thing str @@ -39,9 +39,9 @@ addThingMap mapping thing str Nothing -> Just ((thing, str) : mapping) -getWays :: BIMonad Ways -getWays = do st <- get - return $ biWays st +getMaybeWays :: BIMonad (Maybe Ways) +getMaybeWays = do st <- get + return $ biMaybeWays st haveThingVersion :: String -> String -> BIMonad () haveThingVersion thing thingVersion @@ -57,7 +57,3 @@ haveThingHash thing thingHash Nothing -> fail "Inconsistent hash" Just thm -> put $ st { biThingHashMap = thm } -putWays :: Ways -> BIMonad () -putWays ws = do st <- get - put $ st { biWays = ws } -