GitHub/gf-rgl
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-rgl.git synced 2026-05-27 17:08:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

(Morphodict) use Safe's read for better error msg

Browse Source
This commit is contained in:
Inari Listenmaa
2021-06-04 11:04:22 +08:00
parent 0a84fbaf5d
commit 7c79aae07f
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/morphodict/MkMorphodict.hs
View File

@@ -41,7 +41,7 @@ main = do
rawdata <- case mode of rawdata <- case mode of
"pgf" -> pgfFile2rawData config datafile "pgf" -> pgfFile2rawData config datafile
"raw" -> readFile datafile >>= return . map getRawData . filter (not . null) . lines "raw" -> readFile datafile >>= return . map getRawData . filter (not . null) . lines
_ -> putStrLn $ "Expected mode (pgf|raw), got " ++ mode _ -> error $ "Expected mode (pgf|raw), got " ++ mode
rawdata2gf config rawdata outfile rawdata2gf config rawdata outfile
@@ -94,8 +94,9 @@ mkConfig ls = M.fromList [(c,i) | Left (c,i) <- map mkOne (lines ls)]
cat:":":tcat:oper:ints -> Left (cat,(tcat,oper,mkArgs ints)) cat:":":tcat:oper:ints -> Left (cat,(tcat,oper,mkArgs ints))
_ -> Right s _ -> Right s
mkArgs ints = case break (=="#") ints of mkArgs ints = case break (=="#") ints of
(ss,[]) -> (map read ss, []) (ss,[]) -> (map read' ss, [])
(ss,_:fs) -> (map read ss, map read fs) (ss,_:fs) -> (map read' ss, map read' fs)
read' a = readNote [] a -- Safe.readNote provides better error message
getRawData s = case words s of getRawData s = case words s of
c:cs -> (c,cs) c:cs -> (c,cs)