diff options
| author | kr.angelov <kr.angelov@chalmers.se> | 2008-06-05 11:18:59 +0000 |
|---|---|---|
| committer | kr.angelov <kr.angelov@chalmers.se> | 2008-06-05 11:18:59 +0000 |
| commit | 1068fbc7cfb5f5369bbc6aa24640ae12833a7b44 (patch) | |
| tree | 083d353188137db52b95eee48f05dbb70a30535e /src-3.0 | |
| parent | 4803fb8052caba0421949c9d7768d44ec28d109d (diff) | |
lookParser already returns Nothing if there is no parser. Don't generate error
Diffstat (limited to 'src-3.0')
| -rw-r--r-- | src-3.0/PGF/Macros.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src-3.0/PGF/Macros.hs b/src-3.0/PGF/Macros.hs index aaefa2ccf..86b644813 100644 --- a/src-3.0/PGF/Macros.hs +++ b/src-3.0/PGF/Macros.hs @@ -35,7 +35,7 @@ lookType pgf f = fst $ lookMap (error $ "lookType " ++ show f) f (funs (abstract pgf)) 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 lang = fmap toFGrammar $ lookParser pgf lang @@ -106,7 +106,7 @@ kks = K . KS -- lookup with default value 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 combinations :: [[a]] -> [[a]] |