From 3627875fa8ec277fad0bdabb1e7d74bd66ba2c42 Mon Sep 17 00:00:00 2001 From: aarne Date: Sun, 8 Jul 2007 13:55:00 +0000 Subject: handle unknowns words graciously in parseAny --- src/GF/UseGrammar/Parsing.hs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/GF/UseGrammar') diff --git a/src/GF/UseGrammar/Parsing.hs b/src/GF/UseGrammar/Parsing.hs index 599268b1d..2ca057410 100644 --- a/src/GF/UseGrammar/Parsing.hs +++ b/src/GF/UseGrammar/Parsing.hs @@ -52,8 +52,9 @@ parseString os sg cat = liftM fst . parseStringMsg os sg cat parseStringMsg :: Options -> StateGrammar -> CFCat -> String -> Err ([Tree],String) parseStringMsg os sg cat s = do - (ts,(_,ss)) <- checkStart $ parseStringC os sg cat s - return (ts, unlines $ reverse ss) + case checkStart $ parseStringC os sg cat s of + Ok (ts,(_,ss)) -> return (ts, unlines $ reverse ss) + Bad s -> return ([],s) parseStringC :: Options -> StateGrammar -> CFCat -> String -> Check [Tree] parseStringC opts0 sg cat s @@ -92,7 +93,8 @@ parseStringC opts0 sg cat s uncap s = s case unknowns of - _:_ -> fail $ "Unknown words:" +++ unwords unknowns + _:_ | oElem (iOpt "trynextlang") opts -> return [] + _:_ -> fail $ "Unknown words:" +++ unwords unknowns _ -> do ts <- checkErr $ New.parse algorithm strategy (pInfo sg) (absId sg) cat toks -- cgit v1.2.3