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

fix: bal: better fix for treeLeaves, fixing func tests (#1782)

Browse Source
This commit is contained in:
Simon Michael 2021-12-08 18:14:08 -10:00
parent 2bb309b073
commit 900e2167fc
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hledger-lib/Hledger/Utils.hs
View File

@ -59,7 +59,7 @@ import Hledger.Utils.Regex
import Hledger.Utils.String import Hledger.Utils.String
import Hledger.Utils.Text import Hledger.Utils.Text
import Hledger.Utils.Test import Hledger.Utils.Test
import Data.Tree (foldTree, Tree) import Data.Tree (foldTree, Tree (Node, subForest))
-- tuples -- tuples
@ -120,9 +120,11 @@ splitAtElement x l =
-- trees -- trees
-- | Get the leaves of this tree as a list. The root node is not counted as a leaf. -- | Get the leaves of this tree as a list.
treeLeaves :: Tree a -> [a] -- The topmost node ("root" in hledger account trees) is not counted as a leaf.
treeLeaves = drop 1 . foldTree (\a bs -> (if null bs then (a:) else id) $ concat bs) treeLeaves :: Show a => Tree a -> [a]
treeLeaves Node{subForest=[]} = []
treeLeaves t = foldTree (\a bs -> (if null bs then (a:) else id) $ concat bs) t
-- text -- text