projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bindist comparison tool: Some logic improvements, and testsuite support
[ghc-hetmet.git]
/
distrib
/
compare
/
BuildInfo.hs
diff --git
a/distrib/compare/BuildInfo.hs
b/distrib/compare/BuildInfo.hs
index
d71eeb4
..
1101bf4
100644
(file)
--- 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,
data BuildInfo = BuildInfo {
biThingVersionMap :: ThingVersionMap,
biThingHashMap :: ThingHashMap,
- biWays :: Ways
+ biMaybeWays :: Maybe Ways
}
deriving Show
}
deriving Show
@@
-22,12
+22,12
@@
type ThingHashMap = ThingMap
-- ["v", "p", "dyn"] => we have ".depend-v-p-dyn.haskell" files
type Ways = [String]
-- ["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
addThingMap :: ThingMap -> String -> String -> Maybe ThingMap
addThingMap mapping thing str
@@
-39,9
+39,9
@@
addThingMap mapping thing str
Nothing ->
Just ((thing, str) : mapping)
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
haveThingVersion :: String -> String -> BIMonad ()
haveThingVersion thing thingVersion
@@
-57,7
+57,3
@@
haveThingHash thing thingHash
Nothing -> fail "Inconsistent hash"
Just thm -> put $ st { biThingHashMap = thm }
Nothing -> fail "Inconsistent hash"
Just thm -> put $ st { biThingHashMap = thm }
-putWays :: Ways -> BIMonad ()
-putWays ws = do st <- get
- put $ st { biWays = ws }
-