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

fix: Ensure head and tail are not called on empty account names.

Browse Source
This commit is contained in:
Stephen Morgan 2021-12-15 15:58:27 +11:00 committed by Simon Michael
parent 88f34063c7
commit e9dd77e82b
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hledger-lib/Hledger/Data/Posting.hs
View File

@ -404,8 +404,8 @@ accountNamePostingType a
accountNameWithoutPostingType :: AccountName -> AccountName accountNameWithoutPostingType :: AccountName -> AccountName
accountNameWithoutPostingType a = case accountNamePostingType a of accountNameWithoutPostingType a = case accountNamePostingType a of
BalancedVirtualPosting -> T.init $ T.tail a BalancedVirtualPosting -> textUnbracket a
VirtualPosting -> T.init $ T.tail a VirtualPosting -> textUnbracket a
RegularPosting -> a RegularPosting -> a
accountNameWithPostingType :: PostingType -> AccountName -> AccountName accountNameWithPostingType :: PostingType -> AccountName -> AccountName

8
hledger-lib/Hledger/Utils/Text.hs
View File

@ -169,15 +169,17 @@ stripquotes s = if isSingleQuoted s || isDoubleQuoted s then T.init $ T.tail s e
isSingleQuoted :: Text -> Bool isSingleQuoted :: Text -> Bool
isSingleQuoted s = isSingleQuoted s =
T.length (T.take 2 s) == 2 && T.head s == '\'' && T.last s == '\'' T.length s >= 2 && T.head s == '\'' && T.last s == '\''
isDoubleQuoted :: Text -> Bool isDoubleQuoted :: Text -> Bool
isDoubleQuoted s = isDoubleQuoted s =
T.length (T.take 2 s) == 2 && T.head s == '"' && T.last s == '"' T.length s >= 2 && T.head s == '"' && T.last s == '"'
textUnbracket :: Text -> Text textUnbracket :: Text -> Text
textUnbracket s textUnbracket s
| (T.head s == '[' && T.last s == ']') || (T.head s == '(' && T.last s == ')') = T.init $ T.tail s | T.null s = s
| T.head s == '[' && T.last s == ']' = T.init $ T.tail s
| T.head s == '(' && T.last s == ')' = T.init $ T.tail s
| otherwise = s | otherwise = s
-- | Join several multi-line strings as side-by-side rectangular strings of the same height, top-padded. -- | Join several multi-line strings as side-by-side rectangular strings of the same height, top-padded.