slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

;dev: commodityStyleFromRawOpts: cleanup

Browse Source
This commit is contained in:
Simon Michael 2025-06-09 23:34:01 -10:00
parent 21d403d45d
commit 442bd24bc5
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hledger-lib/Hledger/Read/Common.hs
View File

@ -262,17 +262,17 @@ forecastPeriodFromRawOpts d rawopts = do
_ -> usageError $ "--forecast's argument should not contain a report interval (" _ -> usageError $ "--forecast's argument should not contain a report interval ("
++ show interval ++ " in \"" ++ arg ++ "\")" ++ show interval ++ " in \"" ++ arg ++ "\")"
-- | Given the name of the option and the raw options, returns either -- | Given the raw options, return either
-- | * a map of successfully parsed commodity styles, if all options where successfully parsed -- * if all options were successfully parsed: a map of successfully parsed commodity styles,
-- | * the first option which failed to parse, if one or more options failed to parse -- * if one or more options failed to parse: the first option which failed to parse
commodityStyleFromRawOpts :: RawOpts -> Either String (M.Map CommoditySymbol AmountStyle) commodityStyleFromRawOpts :: RawOpts -> Either String (M.Map CommoditySymbol AmountStyle)
commodityStyleFromRawOpts rawOpts = commodityStyleFromRawOpts rawOpts =
foldM (\r -> fmap (\(c,a) -> M.insert c a r) . parseCommodity) mempty optList foldM (\r -> fmap (\(c,a) -> M.insert c a r) . parseCommodity) mempty optList
where where
optList = listofstringopt "commodity-style" rawOpts optList = listofstringopt "commodity-style" rawOpts
parseCommodity optStr = case parseamount optStr of parseCommodity optStr = case parseamount optStr of
Left _ -> Left optStr Left _ -> Left optStr
Right (Amount acommodity _ astyle _) -> Right (acommodity, astyle) Right (Amount acommodity _ astyle _) -> Right (acommodity, astyle)
-- | Given a parser to ParsedJournal, input options, file path and -- | Given a parser to ParsedJournal, input options, file path and
-- content: run the parser on the content, and finalise the result to -- content: run the parser on the content, and finalise the result to