1
0
forked from GitHub/gf-rgl

Make summary more explicit as it was a bit misleading

This commit is contained in:
John J. Camilleri
2018-08-06 21:28:29 +02:00
parent bd636d805a
commit bad78999dc

15
Make.hs
View File

@@ -172,10 +172,10 @@ rglCommands =
run_gfc bi [if infoVerbose bi then "--verbose" else "--quiet", "--gfo-dir="++dst, mfull] run_gfc bi [if infoVerbose bi then "--verbose" else "--quiet", "--gfo-dir="++dst, mfull]
, RGLCommand "parse" False $ \modes args bi -> do , RGLCommand "parse" False $ \modes args bi -> do
langs <- loadLangs langsAll <- loadLangs
let langsParse = \l -> langCode l `elem` ["Eng"] let langsParse = \l -> langCode l `elem` ["Eng"]
let mylangs = (optml AllTenses langsParse args) langs let langs = (optml AllTenses langsParse args) langsAll
gfc bi modes (summary parse) (map parse mylangs) gfc bi modes (summary parse langs) (map parse langs)
] ]
where where
gfcp :: [Mode -> [String] -> (LangInfo -> FilePath,[LangInfo] -> [LangInfo])] -> [Mode] -> [String] -> Info -> IO () gfcp :: [Mode -> [String] -> (LangInfo -> FilePath,[LangInfo] -> [LangInfo])] -> [Mode] -> [String] -> Info -> IO ()
@@ -183,12 +183,13 @@ rglCommands =
gfcp' :: Info -> Mode -> [String] -> [Mode -> [String] -> (LangInfo -> FilePath,[LangInfo] -> [LangInfo])] -> IO () gfcp' :: Info -> Mode -> [String] -> [Mode -> [String] -> (LangInfo -> FilePath,[LangInfo] -> [LangInfo])] -> IO ()
gfcp' bi mode args cs = do gfcp' bi mode args cs = do
langs <- loadLangs langsAll <- loadLangs
let (ss,fss) = unzip [ (summary f,map f (as langs)) | c<-cs, let (f,as) = c mode args] let (ss,fss) = unzip [ (summary f langs,map f langs) | c<-cs, let (f,as) = c mode args, let langs = as langsAll]
gfcn bi mode (unwords ss) (concat fss) gfcn bi mode (unwords ss) (concat fss)
summary :: (LangInfo -> FilePath) -> FilePath summary :: (LangInfo -> FilePath) -> [LangInfo] -> String
summary f = f (LangInfo "*" "*" Nothing Nothing False False False False) summary f langs = unwords (map (drop (length sourceDir + 1) . f) langs)
-- summary f _ = f (LangInfo "*" "*" Nothing Nothing False False False False)
l mode args = (lang,optml mode (const True) args) l mode args = (lang,optml mode (const True) args)
s mode args = (symbol,optml mode langAPI args) s mode args = (symbol,optml mode langAPI args)