180c96f · typeable/pandoc · git.iko.soy

git.iko.soy/typeable/pandoc

on master help sign in

Move extension-adding to applyDefaults

180c96fJohn MacFarlane7 years ago

src/Text/Pandoc/App/CommandLineOptions.hs+5−6

compare with master

@@ -161,11 +161,7 @@ options =

161

161

162 , Option "d" ["defaults"]

162 , Option "d" ["defaults"]

163 (ReqArg

163 (ReqArg

164− (\arg opt -> do

165− let fp' = if null (takeExtension arg)

166− then addExtension arg "yaml"

167− else arg

168− foldM applyDefaults opt [fp']

164+ (\arg opt -> applyDefaults opt arg

169 )

165 )

170 "FILE")

166 "FILE")

171 ""

167 ""

@@ -982,7 +978,10 @@ splitField s =

982

978

983-- | Apply defaults from --defaults file.

979-- | Apply defaults from --defaults file.

984applyDefaults :: Opt -> FilePath -> IO Opt

980applyDefaults :: Opt -> FilePath -> IO Opt

985−applyDefaults opt fp = runIOorExplode $ do

981+applyDefaults opt file = runIOorExplode $ do

982+ let fp = if null (takeExtension file)

983+ then addExtension file "yaml"

984+ else file

986 setVerbosity $ optVerbosity opt

985 setVerbosity $ optVerbosity opt

987 dataDirs <- liftIO defaultUserDataDirs

986 dataDirs <- liftIO defaultUserDataDirs

988 let fps = case optDataDir opt of

987 let fps = case optDataDir opt of