;partial comment cleanups
This commit is contained in:
parent
c2929939e4
commit
a9fbaaf284
@ -439,8 +439,7 @@ instance Num MixedAmount where
|
|||||||
fromInteger i = Mixed [fromInteger i]
|
fromInteger i = Mixed [fromInteger i]
|
||||||
negate (Mixed as) = Mixed $ map negate as
|
negate (Mixed as) = Mixed $ map negate as
|
||||||
(+) (Mixed as) (Mixed bs) = normaliseMixedAmount $ Mixed $ as ++ bs
|
(+) (Mixed as) (Mixed bs) = normaliseMixedAmount $ Mixed $ as ++ bs
|
||||||
-- PARTIAL:
|
(*) = error' "error, mixed amounts do not support multiplication" -- PARTIAL:
|
||||||
(*) = error' "error, mixed amounts do not support multiplication"
|
|
||||||
abs = error' "error, mixed amounts do not support abs"
|
abs = error' "error, mixed amounts do not support abs"
|
||||||
signum = error' "error, mixed amounts do not support signum"
|
signum = error' "error, mixed amounts do not support signum"
|
||||||
|
|
||||||
|
|||||||
@ -193,7 +193,7 @@ regexReplaceUnmemo re repl s = foldM (replaceMatch repl) s (reverse $ match (reC
|
|||||||
case read s of n | n `elem` indices grps -> Right $ fst (grps ! n)
|
case read s of n | n `elem` indices grps -> Right $ fst (grps ! n)
|
||||||
_ -> Left $ "no match group exists for backreference \"\\"++s++"\""
|
_ -> Left $ "no match group exists for backreference \"\\"++s++"\""
|
||||||
lookupMatchGroup _ s = Left $ "lookupMatchGroup called on non-numeric-backreference \""++s++"\", shouldn't happen"
|
lookupMatchGroup _ s = Left $ "lookupMatchGroup called on non-numeric-backreference \""++s++"\", shouldn't happen"
|
||||||
backrefRegex = toRegex' "\\\\[0-9]+" -- PARTIAL: should not happen
|
backrefRegex = toRegex' "\\\\[0-9]+" -- PARTIAL: should not fail
|
||||||
|
|
||||||
-- regexReplace' :: Regexp -> Replacement -> String -> String
|
-- regexReplace' :: Regexp -> Replacement -> String -> String
|
||||||
-- regexReplace' re repl s =
|
-- regexReplace' re repl s =
|
||||||
@ -213,7 +213,7 @@ regexReplaceUnmemo re repl s = foldM (replaceMatch repl) s (reverse $ match (reC
|
|||||||
-- -- PARTIAL:
|
-- -- PARTIAL:
|
||||||
-- _ -> error' $ "no match group exists for backreference \"\\"++s++"\""
|
-- _ -> error' $ "no match group exists for backreference \"\\"++s++"\""
|
||||||
-- lookupMatchGroup _ s = error' $ "lookupMatchGroup called on non-numeric-backreference \""++s++"\", shouldn't happen"
|
-- lookupMatchGroup _ s = error' $ "lookupMatchGroup called on non-numeric-backreference \""++s++"\", shouldn't happen"
|
||||||
-- backrefRegex = toRegex' "\\\\[0-9]+" -- PARTIAL: should not error happen
|
-- backrefRegex = toRegex' "\\\\[0-9]+" -- PARTIAL: should not fail
|
||||||
|
|
||||||
|
|
||||||
-- helpers
|
-- helpers
|
||||||
|
|||||||
@ -305,10 +305,9 @@ balancemode = hledgerCommandMode
|
|||||||
-- | The balance command, prints a balance report.
|
-- | The balance command, prints a balance report.
|
||||||
balance :: CliOpts -> Journal -> IO ()
|
balance :: CliOpts -> Journal -> IO ()
|
||||||
balance opts@CliOpts{rawopts_=rawopts,reportopts_=ropts@ReportOpts{..}} j = do
|
balance opts@CliOpts{rawopts_=rawopts,reportopts_=ropts@ReportOpts{..}} j = do
|
||||||
-- PARTIAL:
|
|
||||||
d <- getCurrentDay
|
d <- getCurrentDay
|
||||||
case lineFormatFromOpts ropts of
|
case lineFormatFromOpts ropts of
|
||||||
Left err -> error' $ unlines [err]
|
Left err -> error' $ unlines [err] -- PARTIAL:
|
||||||
Right _ -> do
|
Right _ -> do
|
||||||
let budget = boolopt "budget" rawopts
|
let budget = boolopt "budget" rawopts
|
||||||
multiperiod = interval_ /= NoInterval
|
multiperiod = interval_ /= NoInterval
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user