From 01cd388c24205cffb151217c620a75c12f7e3ba4 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Sun, 12 Oct 2008 07:46:54 +0000 Subject: [PATCH] remove dead code, simplify cacheLedger again --- Ledger/Ledger.hs | 46 +++------------------------------------------ Ledger/RawLedger.hs | 4 ++-- Ledger/Types.hs | 5 +---- Tests.hs | 27 +++++++------------------- Utils.hs | 4 ++-- hledger.hs | 2 +- 6 files changed, 16 insertions(+), 72 deletions(-) diff --git a/Ledger/Ledger.hs b/Ledger/Ledger.hs index df25499e2..d95fce283 100644 --- a/Ledger/Ledger.hs +++ b/Ledger/Ledger.hs @@ -32,11 +32,10 @@ instance Show Ledger where (length $ accountnames l) (show $ accountnames l) ++ "\n" ++ (showtree $ accountnametree l) - ++ "\n" ++ (showtree $ filteredaccountnametree l) -- | Convert a raw ledger to a more efficient cached type, described above. -cacheLedger :: Regex -> RawLedger -> Ledger -cacheLedger acctpat l = +cacheLedger :: RawLedger -> Ledger +cacheLedger l = let ant = rawLedgerAccountNameTree l anames = flatten ant @@ -53,46 +52,18 @@ cacheLedger acctpat l = (Map.fromList [(a, (sumTransactions $ subtxnsof a){precision=maxprecision}) | a <- anames]) (Map.fromList [(a,nullamt) | a <- anames]) amap = Map.fromList [(a, Account a (txnmap ! a) (balmap ! a)) | a <- anames] - -- the same again, considering only accounts and transactions matching the account pattern - matchacct :: AccountName -> Bool - matchacct = containsRegex acctpat . accountLeafName - filteredant = treefilter matchacct ant - -- rebuild the tree after filtering to include all parents - filteredanames = flatten $ accountNameTreeFrom $ filter matchacct anames - filteredts = filter (matchacct . account) ts - filteredsortedts = sortBy (comparing account) filteredts - filteredgroupedts = groupBy (\t1 t2 -> account t1 == account t2) filteredsortedts - filteredtxnmap = Map.union - (Map.fromList [(account $ head g, g) | g <- filteredgroupedts]) - (Map.fromList [(a,[]) | a <- filteredanames]) - filteredtxnsof = (filteredtxnmap !) - filteredsubacctsof a = filter (isAccountNamePrefixOf a) filteredanames - filteredsubtxnsof a = concat [filteredtxnsof a | a <- [a] ++ filteredsubacctsof a] - filteredbalmap = Map.union - (Map.fromList [(a, (sumTransactions $ filteredsubtxnsof a){precision=maxprecision}) | a <- filteredanames]) - (Map.fromList [(a,nullamt) | a <- filteredanames]) - filteredamap = Map.fromList [(a, Account a (filteredtxnmap ! a) (filteredbalmap ! a)) | a <- filteredanames] - maxprecision = maximum $ map (precision . amount) ts in - Ledger l ant amap maxprecision acctpat filteredant filteredamap + Ledger l ant amap maxprecision -- | List a 'Ledger' 's account names. accountnames :: Ledger -> [AccountName] accountnames l = drop 1 $ flatten $ accountnametree l --- | List a 'Ledger' 's account names filtered by the account match pattern. -filteredaccountnames :: Ledger -> [AccountName] -filteredaccountnames l = filter (containsRegex (acctpat l) . accountLeafName) $ accountnames l - -- | Get the named account from a ledger. ledgerAccount :: Ledger -> AccountName -> Account ledgerAccount l a = (accountmap l) ! a --- | Get the named filtered account from a ledger. -ledgerFilteredAccount :: Ledger -> AccountName -> Account -ledgerFilteredAccount l a = (filteredaccountmap l) ! a - -- | List a ledger's accounts, in tree order accounts :: Ledger -> [Account] accounts l = drop 1 $ flatten $ ledgerAccountTree 9999 l @@ -141,19 +112,8 @@ instance Eq Account where ledgerAccountTreeAt :: Ledger -> Account -> Maybe (Tree Account) ledgerAccountTreeAt l acct = subtreeat acct $ ledgerAccountTree 9999 l --- | Get a ledger's tree of accounts to the specified depth, filtered by --- the account pattern. -ledgerFilteredAccountTree :: Int -> Regex -> Ledger -> Tree Account -ledgerFilteredAccountTree depth acctpat l = - addFilteredDataToAccountNameTree l $ treeprune depth $ filteredaccountnametree l - -- | Convert a tree of account names into a tree of accounts, using their -- parent ledger. addDataToAccountNameTree :: Ledger -> Tree AccountName -> Tree Account addDataToAccountNameTree = treemap . ledgerAccount --- | Convert a tree of account names into a tree of accounts, using their --- parent ledger's filtered account data. -addFilteredDataToAccountNameTree :: Ledger -> Tree AccountName -> Tree Account -addFilteredDataToAccountNameTree l = treemap (ledgerFilteredAccount l) - diff --git a/Ledger/RawLedger.hs b/Ledger/RawLedger.hs index d6e0a0804..05ffd762b 100644 --- a/Ledger/RawLedger.hs +++ b/Ledger/RawLedger.hs @@ -44,8 +44,8 @@ rawLedgerAccountNameTree l = accountNameTreeFrom $ rawLedgerAccountNames l -- | Remove ledger entries we are not interested in. -- Keep only those which fall between the begin and end dates, and match -- the description pattern. -filterRawLedgerEntries :: String -> String -> Regex -> RawLedger -> RawLedger -filterRawLedgerEntries begin end descpat = +filterRawLedger :: String -> String -> Regex -> RawLedger -> RawLedger +filterRawLedger begin end descpat = filterRawLedgerEntriesByDate begin end . filterRawLedgerEntriesByDescription descpat diff --git a/Ledger/Types.hs b/Ledger/Types.hs index 246a780ce..00539fe18 100644 --- a/Ledger/Types.hs +++ b/Ledger/Types.hs @@ -91,9 +91,6 @@ data Ledger = Ledger { rawledger :: RawLedger, accountnametree :: Tree AccountName, accountmap :: Map.Map AccountName Account, - lprecision :: Int, -- the preferred display precision - acctpat :: Regex, -- the account patterns used to filter this ledger - filteredaccountnametree :: Tree AccountName, -- account name tree filtered by acctpat - filteredaccountmap :: Map.Map AccountName Account -- accounts filtered by acctpat + lprecision :: Int -- the preferred display precision } diff --git a/Tests.hs b/Tests.hs index fd6c4c4e1..3f884ab1a 100644 --- a/Tests.hs +++ b/Tests.hs @@ -84,19 +84,11 @@ tests = (accountnames ledger7) ,"cacheLedger" ~: do - assertequal 15 (length $ Map.keys $ accountmap $ cacheLedger wildcard rawledger7 ) - --- ,"showLedgerAccounts" ~: do --- assertequal 4 (length $ lines $ showLedgerAccountBalances ledger7 1) + assertequal 15 (length $ Map.keys $ accountmap $ cacheLedger rawledger7 ) ,"ledgeramount" ~: do assertparseequal (Amount (getcurrency "$") 47.18 2) (parsewith ledgeramount " $47.18") assertparseequal (Amount (getcurrency "$") 1 0) (parsewith ledgeramount " $1.") - --- ,"pruneZeroBalanceLeaves" ~: do --- atree <- liftM (ledgerAccountTree 99) $ ledgerfromfile "sample.ledger" --- assertequal 13 (length $ flatten $ atree) --- assertequal 12 (length $ flatten $ pruneZeroBalanceLeaves $ atree) ] balancecommandtests = @@ -131,8 +123,7 @@ balancecommandtests = , "balance report with account pattern o" ~: do - rl <- rawledgerfromfile "sample.ledger" - let l = cacheLedger (mkRegex "o") $ filterRawLedgerEntries "" "" wildcard rl + l <- ledgerfromfile "sample.ledger" assertequal " $1 expenses:food\n\ \ $-2 income\n\ @@ -143,8 +134,7 @@ balancecommandtests = , "balance report with account pattern o and showsubs" ~: do - rl <- rawledgerfromfile "sample.ledger" - let l = cacheLedger (mkRegex "o") $ filterRawLedgerEntries "" "" wildcard rl + l <- ledgerfromfile "sample.ledger" assertequal " $1 expenses:food\n\ \ $-2 income\n\ @@ -157,8 +147,7 @@ balancecommandtests = , "balance report with account pattern a" ~: do - rl <- rawledgerfromfile "sample.ledger" - let l = cacheLedger (mkRegex "a") $ filterRawLedgerEntries "" "" wildcard rl + l <- ledgerfromfile "sample.ledger" assertequal " $-1 assets\n\ \ $-2 cash\n\ @@ -172,8 +161,7 @@ balancecommandtests = , "balance report with account pattern e" ~: do - rl <- rawledgerfromfile "sample.ledger" - let l = cacheLedger (mkRegex "e") $ filterRawLedgerEntries "" "" wildcard rl + l <- ledgerfromfile "sample.ledger" assertequal " $-1 assets\n\ \ $2 expenses\n\ @@ -185,8 +173,7 @@ balancecommandtests = , "balance report with unmatched parent of two matched subaccounts" ~: do - rl <- rawledgerfromfile "sample.ledger" - let l = cacheLedger (regexFor ["cash","saving"]) $ filterRawLedgerEntries "" "" wildcard rl + l <- ledgerfromfile "sample.ledger" assertequal " $-2 assets:cash\n\ \ $1 assets:saving\n\ @@ -479,7 +466,7 @@ rawledger7 = RawLedger ] "" -ledger7 = cacheLedger wildcard rawledger7 +ledger7 = cacheLedger rawledger7 timelogentry1_str = "i 2007/03/11 16:19:00 hledger\n" timelogentry1 = TimeLogEntry 'i' "2007/03/11 16:19:00" "hledger" diff --git a/Utils.hs b/Utils.hs index 3de05ecea..5620b2b99 100644 --- a/Utils.hs +++ b/Utils.hs @@ -37,7 +37,7 @@ rawledgerfromfile f = do ledgerfromfile :: FilePath -> IO Ledger ledgerfromfile f = do l <- rawledgerfromfile f - return $ cacheLedger wildcard $ filterRawLedgerEntries "" "" wildcard l + return $ cacheLedger $ filterRawLedger "" "" wildcard l -- | get a RawLedger from the file your LEDGER environment variable -- variable points to or (WARNING) an empty one if there was a problem. @@ -51,7 +51,7 @@ myrawledger = do myledger :: IO Ledger myledger = do l <- myrawledger - return $ cacheLedger wildcard $ filterRawLedgerEntries "" "" wildcard l + return $ cacheLedger $ filterRawLedger "" "" wildcard l -- | get a named account from your ledger file myaccount :: AccountName -> IO Account diff --git a/hledger.hs b/hledger.hs index 3e3999e84..ff7f81a65 100644 --- a/hledger.hs +++ b/hledger.hs @@ -44,7 +44,7 @@ parseLedgerAndDo :: [Opt] -> [String] -> ([Opt] -> [String] -> Ledger -> IO ()) parseLedgerAndDo opts args cmd = ledgerFilePathFromOpts opts >>= parseLedgerFile >>= either printParseError runthecommand where - runthecommand = cmd opts args . cacheLedger acctpat . filterRawLedgerEntries begin end descpat + runthecommand = cmd opts args . cacheLedger . filterRawLedger begin end descpat begin = beginDateFromOpts opts end = endDateFromOpts opts acctpat = regexFor acctpats