From 20b39a5dd0e3d3d1889e0dd6a3d40858f5847d13 Mon Sep 17 00:00:00 2001 From: Stephen Morgan Date: Mon, 31 Aug 2020 20:03:34 +1000 Subject: [PATCH] lib: Remove unused --display code. This was dropped back in 2014, and getting rid of this removes a use of regular expressions. --- hledger-lib/Hledger/Reports/PostingsReport.hs | 2 +- hledger-lib/Hledger/Reports/ReportOptions.hs | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/hledger-lib/Hledger/Reports/PostingsReport.hs b/hledger-lib/Hledger/Reports/PostingsReport.hs index dadb7b699..b70c6eb4f 100644 --- a/hledger-lib/Hledger/Reports/PostingsReport.hs +++ b/hledger-lib/Hledger/Reports/PostingsReport.hs @@ -373,7 +373,7 @@ tests_PostingsReport = tests "PostingsReport" [ j <- samplejournal let gives displayexpr = (registerdates (postingsReportAsText opts $ postingsReport opts (queryFromOpts date1 opts) j) `is`) - where opts = defreportopts{display_=Just displayexpr} + where opts = defreportopts "d<[2008/6/2]" `gives` ["2008/01/01","2008/06/01"] "d<=[2008/6/2]" `gives` ["2008/01/01","2008/06/01","2008/06/02"] "d=[2008/6/2]" `gives` ["2008/06/02"] diff --git a/hledger-lib/Hledger/Reports/ReportOptions.hs b/hledger-lib/Hledger/Reports/ReportOptions.hs index 2ce27dd20..a1731647b 100644 --- a/hledger-lib/Hledger/Reports/ReportOptions.hs +++ b/hledger-lib/Hledger/Reports/ReportOptions.hs @@ -98,7 +98,6 @@ data ReportOpts = ReportOpts { ,value_ :: Maybe ValuationType -- ^ What value should amounts be converted to ? ,infer_value_ :: Bool -- ^ Infer market prices from transactions ? ,depth_ :: Maybe Int - ,display_ :: Maybe DisplayExp -- XXX unused ? ,date2_ :: Bool ,empty_ :: Bool ,no_elide_ :: Bool @@ -172,7 +171,6 @@ defreportopts = ReportOpts def def def - def rawOptsToReportOpts :: RawOpts -> IO ReportOpts rawOptsToReportOpts rawopts = checkReportOpts <$> do @@ -189,7 +187,6 @@ rawOptsToReportOpts rawopts = checkReportOpts <$> do ,value_ = valuationTypeFromRawOpts rawopts' ,infer_value_ = boolopt "infer-value" rawopts' ,depth_ = maybeposintopt "depth" rawopts' - ,display_ = maybedisplayopt d rawopts' ,date2_ = boolopt "date2" rawopts' ,empty_ = boolopt "empty" rawopts' ,no_elide_ = boolopt "no-elide" rawopts' @@ -416,15 +413,6 @@ valuationTypeIsDefaultValue ropts = Just (AtDefault _) -> True _ -> False -type DisplayExp = String - -maybedisplayopt :: Day -> RawOpts -> Maybe DisplayExp -maybedisplayopt d rawopts = - maybe Nothing (Just . replaceAllBy (toRegex' "\\[.+?\\]") fixbracketeddatestr) $ maybestringopt "display" rawopts - where - fixbracketeddatestr "" = "" - fixbracketeddatestr s = "[" ++ fixSmartDateStr d (T.pack $ init $ tail s) ++ "]" - -- | Select the Transaction date accessor based on --date2. transactionDateFn :: ReportOpts -> (Transaction -> Day) transactionDateFn ReportOpts{..} = if date2_ then transactionDate2 else tdate