projects
/
barrelfish
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(parent:
f87cb61
)
TreeDB merge operation
author
David Cock
<david.cock@inf.ethz.ch>
Mon, 24 Aug 2015 08:23:18 +0000 (10:23 +0200)
committer
David Cock
<david.cock@inf.ethz.ch>
Mon, 24 Aug 2015 08:23:18 +0000 (10:23 +0200)
Signed-off-by: David Cock <david.cock@inf.ethz.ch>
hake/TreeDB.hs
patch
|
blob
|
history
diff --git
a/hake/TreeDB.hs
b/hake/TreeDB.hs
index
1114123
..
9ee61f9
100644
(file)
--- a/
hake/TreeDB.hs
+++ b/
hake/TreeDB.hs
@@
-4,7
+4,7
@@
module TreeDB(
TreeDB,
tdbEmpty, tdbByDir, tdbAdd, tdbAddDir,
- tdbBuild,
+ tdbBuild, tdbMerge,
tdbByDirExt, tdbByDirExts
)
@@
-100,6
+100,9
@@
tdbAddDir dir files treeDB
tdbBuild :: [FilePath] -> TreeDB
tdbBuild files = foldr tdbAdd tdbEmpty files
+tdbMerge :: TreeDB -> TreeDB -> TreeDB
+tdbMerge = T.unionL
+
--
-- Combined queries
--