diff options
| author | aarne <unknown> | 2005-05-30 17:39:43 +0000 |
|---|---|---|
| committer | aarne <unknown> | 2005-05-30 17:39:43 +0000 |
| commit | 5bf9a7fe706e4e2d45f148dddf591c34ed1b72b3 (patch) | |
| tree | e10199915d0aee40dd732083b005ee29882a3288 /src/GF/Compile/Rebuild.hs | |
| parent | 24d5b025239f22d53e21fbce7658d034e22682a9 (diff) | |
BinTree vs. FiniteMap
Diffstat (limited to 'src/GF/Compile/Rebuild.hs')
| -rw-r--r-- | src/GF/Compile/Rebuild.hs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/GF/Compile/Rebuild.hs b/src/GF/Compile/Rebuild.hs index 46230df7f..2e7bdd65d 100644 --- a/src/GF/Compile/Rebuild.hs +++ b/src/GF/Compile/Rebuild.hs @@ -5,9 +5,9 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/04/21 16:21:44 $ --- > CVS $Author: bringert $ --- > CVS $Revision: 1.12 $ +-- > CVS $Date: 2005/05/30 18:39:44 $ +-- > CVS $Author: aarne $ +-- > CVS $Revision: 1.13 $ -- -- Rebuild a source module from incomplete and its with-instance. ----------------------------------------------------------------------------- @@ -51,8 +51,8 @@ rebuildModule ms mo@(i,mi) = do [] -> return $ replaceJudgements m js' j0:jj -> do m0 <- lookupModMod gr j0 - let notInM0 c = not $ isInBinTree (fst c) $ mapTree fst $ jments m0 - let js2 = sorted2tree $ filter notInM0 $ tree2list js' + let notInM0 c _ = not $ isInBinTree c $ jments m0 + let js2 = filterBinTree notInM0 js' if null jj then return $ replaceJudgements m js2 else Bad "FIXME: handle multiple inheritance in instance" @@ -84,7 +84,7 @@ checkCompleteInstance abs cnc = ifNull (return ()) (Bad . unlines) $ checkComplete [f | (f, ResOper (Yes _) _) <- abs'] cnc' where abs' = tree2list $ jments abs - cnc' = mapTree fst $ jments cnc + cnc' = jments cnc checkComplete sought given = foldr ckOne [] sought where ckOne f = if isInBinTree f given |