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/Rename.hs | |
| parent | 24d5b025239f22d53e21fbce7658d034e22682a9 (diff) | |
BinTree vs. FiniteMap
Diffstat (limited to 'src/GF/Compile/Rename.hs')
| -rw-r--r-- | src/GF/Compile/Rename.hs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/GF/Compile/Rename.hs b/src/GF/Compile/Rename.hs index 94680a165..d38b897a7 100644 --- a/src/GF/Compile/Rename.hs +++ b/src/GF/Compile/Rename.hs @@ -5,9 +5,9 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/04/21 16:21:46 $ --- > CVS $Author: bringert $ --- > CVS $Revision: 1.18 $ +-- > CVS $Date: 2005/05/30 18:39:44 $ +-- > CVS $Author: aarne $ +-- > CVS $Revision: 1.19 $ -- -- AR 14\/5\/2003 -- The top-level function 'renameGrammar' does several things: @@ -61,7 +61,7 @@ renameModule ms (name,mod) = errIn ("renaming module" +++ prt name) $ case mod o type Status = (StatusTree, [(OpenSpec Ident, StatusTree)]) -type StatusTree = BinTree (Ident,StatusInfo) +type StatusTree = BinTree Ident StatusInfo type StatusInfo = Ident -> Term @@ -114,7 +114,7 @@ info2status mq (c,i) = (c, case i of _ -> maybe Cn Q mq ) -tree2status :: OpenSpec Ident -> BinTree (Ident,Info) -> BinTree (Ident,StatusInfo) +tree2status :: OpenSpec Ident -> BinTree Ident Info -> BinTree Ident StatusInfo tree2status o = case o of OSimple _ i -> mapTree (info2status (Just i)) OQualif _ i j -> mapTree (info2status (Just j)) @@ -127,7 +127,7 @@ buildStatus gr c mo = let mo' = self2status c mo in case mo of mods <- mapM (lookupModule gr1 . openedModule) ops let sts = map modInfo2status $ zip ops mods return $ if isModCnc m - then (NT, reverse sts) -- the module itself does not define any names + then (emptyBinTree, reverse sts) -- the module itself does not define any names else (mo',reverse sts) -- so the empty ident is not needed modInfo2status :: (OpenSpec Ident,SourceModInfo) -> (OpenSpec Ident, StatusTree) |