GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-23 11:42:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

lookParser already returns Nothing if there is no parser. Don't generate error

Browse Source
This commit is contained in:
kr.angelov
2008-06-05 11:18:59 +00:00
parent 4803fb8052
commit 1068fbc7cf
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src-3.0/PGF/Macros.hs
View File

@@ -35,7 +35,7 @@ lookType pgf f =
fst $ lookMap (error $ "lookType " ++ show f) f (funs (abstract pgf)) fst $ lookMap (error $ "lookType " ++ show f) f (funs (abstract pgf))
lookParser :: PGF -> CId -> Maybe ParserInfo lookParser :: PGF -> CId -> Maybe ParserInfo
lookParser pgf lang = parser $ lookMap (error "no lang") lang $ concretes pgf lookParser pgf lang = Map.lookup lang (concretes pgf) >>= parser
lookFCFG :: PGF -> CId -> Maybe FGrammar lookFCFG :: PGF -> CId -> Maybe FGrammar
lookFCFG pgf lang = fmap toFGrammar $ lookParser pgf lang lookFCFG pgf lang = fmap toFGrammar $ lookParser pgf lang
@@ -106,7 +106,7 @@ kks = K . KS
-- lookup with default value -- lookup with default value
lookMap :: (Show i, Ord i) => a -> i -> Map.Map i a -> a lookMap :: (Show i, Ord i) => a -> i -> Map.Map i a -> a
lookMap d c m = maybe d id $ Map.lookup c m lookMap d c m = fromMaybe d $ Map.lookup c m
--- from Operations --- from Operations
combinations :: [[a]] -> [[a]] combinations :: [[a]] -> [[a]]