From 48700f323fd44f602b64366f6b1a6ea2739de757 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Fri, 3 Oct 2008 12:10:05 +0000 Subject: [PATCH] move raw ledger functions to RawLedger --- Ledger/Ledger.hs | 18 ------------------ Ledger/RawLedger.hs | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/Ledger/Ledger.hs b/Ledger/Ledger.hs index be8afca94..96dec7827 100644 --- a/Ledger/Ledger.hs +++ b/Ledger/Ledger.hs @@ -287,21 +287,3 @@ pruneBoringBranches = hasbalance = (/= 0) . abalance hastxns = (> 0) . length . atransactions --- helpers - -rawLedgerTransactions :: RawLedger -> [Transaction] -rawLedgerTransactions = txns . entries - where - txns :: [Entry] -> [Transaction] - txns es = concat $ map flattenEntry $ zip es (iterate (+1) 1) - -rawLedgerAccountNamesUsed :: RawLedger -> [AccountName] -rawLedgerAccountNamesUsed = accountNamesFromTransactions . rawLedgerTransactions - -rawLedgerAccountNames :: RawLedger -> [AccountName] -rawLedgerAccountNames = sort . expandAccountNames . rawLedgerAccountNamesUsed - -rawLedgerAccountNameTree :: RawLedger -> Tree AccountName -rawLedgerAccountNameTree l = accountNameTreeFrom $ rawLedgerAccountNames l - - diff --git a/Ledger/RawLedger.hs b/Ledger/RawLedger.hs index 2cdf6f285..f89e31627 100644 --- a/Ledger/RawLedger.hs +++ b/Ledger/RawLedger.hs @@ -13,6 +13,7 @@ import Ledger.Utils import Ledger.Types import Ledger.AccountName import Ledger.Entry +import Ledger.Transaction instance Show RawLedger where @@ -20,3 +21,18 @@ instance Show RawLedger where ((length $ entries l) + (length $ modifier_entries l) + (length $ periodic_entries l)) + +rawLedgerTransactions :: RawLedger -> [Transaction] +rawLedgerTransactions = txns . entries + where + txns :: [Entry] -> [Transaction] + txns es = concat $ map flattenEntry $ zip es (iterate (+1) 1) + +rawLedgerAccountNamesUsed :: RawLedger -> [AccountName] +rawLedgerAccountNamesUsed = accountNamesFromTransactions . rawLedgerTransactions + +rawLedgerAccountNames :: RawLedger -> [AccountName] +rawLedgerAccountNames = sort . expandAccountNames . rawLedgerAccountNamesUsed + +rawLedgerAccountNameTree :: RawLedger -> Tree AccountName +rawLedgerAccountNameTree l = accountNameTreeFrom $ rawLedgerAccountNames l