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/UseGrammar | |
| parent | 24d5b025239f22d53e21fbce7658d034e22682a9 (diff) | |
BinTree vs. FiniteMap
Diffstat (limited to 'src/GF/UseGrammar')
| -rw-r--r-- | src/GF/UseGrammar/Generate.hs | 10 | ||||
| -rw-r--r-- | src/GF/UseGrammar/Information.hs | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/GF/UseGrammar/Generate.hs b/src/GF/UseGrammar/Generate.hs index ee7419fb5..c19435410 100644 --- a/src/GF/UseGrammar/Generate.hs +++ b/src/GF/UseGrammar/Generate.hs @@ -5,9 +5,9 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/04/21 16:23:46 $ --- > CVS $Author: bringert $ --- > CVS $Revision: 1.14 $ +-- > CVS $Date: 2005/05/30 18:39:44 $ +-- > CVS $Author: aarne $ +-- > CVS $Revision: 1.15 $ -- -- Generate all trees of given category and depth. AR 30\/4\/2004 -- @@ -101,7 +101,7 @@ generate gr ifm cat i mn mt = case mt of allTrees = genAll i -- dynamic generation - genAll :: Int -> BinTree (SCat,[[STree]]) + genAll :: Int -> BinTree SCat [[STree]] genAll i = iter i genNext (mapTree (\ (c,_) -> (c,[[]])) gr) iter 0 f tr = tr @@ -126,7 +126,7 @@ generate gr ifm cat i mn mt = case mt of SMeta k -> gen k _ -> [t] -type SGrammar = BinTree (SCat,[SRule]) +type SGrammar = BinTree SCat [SRule] type SIdent = String type SRule = (SFun,SType) type SType = ([SCat],SCat) diff --git a/src/GF/UseGrammar/Information.hs b/src/GF/UseGrammar/Information.hs index 37cacbb1a..446173aa2 100644 --- a/src/GF/UseGrammar/Information.hs +++ b/src/GF/UseGrammar/Information.hs @@ -5,9 +5,9 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/04/21 16:23:47 $ --- > CVS $Author: bringert $ --- > CVS $Revision: 1.5 $ +-- > CVS $Date: 2005/05/30 18:39:45 $ +-- > CVS $Author: aarne $ +-- > CVS $Revision: 1.6 $ -- -- information on module, category, function, operation, parameter,... -- AR 16\/9\/2003. @@ -135,7 +135,7 @@ getInformation opts st c = allChecks $ [ cs = [(i,m) | (i,ModMod m) <- modules can] cf = concatMap ruleGroupsOfCF $ map snd $ cfs st -ownConstants :: BinTree (Ident, Info) -> [Ident] +ownConstants :: BinTree Ident Info -> [Ident] ownConstants = map fst . filter isOwn . tree2list where isOwn (c,i) = case i of AnyInd _ _ -> False |