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

imp: journal: ignore commodity subdirectives other than format

Browse Source
This commit is contained in:
Simon Michael 2022-12-21 22:01:11 -10:00
parent a454b47ad9
commit bf6a2a7ccf
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hledger-lib/Hledger/Read/JournalReader.hs
View File

@ -79,7 +79,7 @@ import Control.Monad.Except (ExceptT(..), runExceptT)
import Control.Monad.State.Strict (evalStateT,get,modify',put) import Control.Monad.State.Strict (evalStateT,get,modify',put)
import Control.Monad.Trans.Class (lift) import Control.Monad.Trans.Class (lift)
import Data.Char (toLower) import Data.Char (toLower)
import Data.Either (isRight) import Data.Either (isRight, lefts)
import qualified Data.Map.Strict as M import qualified Data.Map.Strict as M
import Data.Text (Text) import Data.Text (Text)
import Data.String import Data.String
@ -489,7 +489,9 @@ commoditydirectivemultilinep = do
lift skipNonNewlineSpaces1 lift skipNonNewlineSpaces1
sym <- lift commoditysymbolp sym <- lift commoditysymbolp
_ <- lift followingcommentp _ <- lift followingcommentp
mfmt <- lastMay <$> many (indented $ formatdirectivep sym) -- read all subdirectives, saving format subdirectives as Lefts
subdirectives <- many $ indented (eitherP (formatdirectivep sym) (lift restofline))
let mfmt = lastMay $ lefts subdirectives
let comm = Commodity{csymbol=sym, cformat=mfmt} let comm = Commodity{csymbol=sym, cformat=mfmt}
modify' (\j -> j{jcommodities=M.insert sym comm $ jcommodities j}) modify' (\j -> j{jcommodities=M.insert sym comm $ jcommodities j})
where where

2
hledger/hledger.m4.md
View File

@ -2186,6 +2186,8 @@ commodity INR
format INR 1,00,00,000.00 format INR 1,00,00,000.00
``` ```
Any indented subdirectives other than `format` are currently ignored.
Remember that if the commodity symbol contains spaces, numbers, or Remember that if the commodity symbol contains spaces, numbers, or
punctuation, it must be enclosed in double quotes (cf [Commodity](#commodity)). punctuation, it must be enclosed in double quotes (cf [Commodity](#commodity)).

13
hledger/test/journal/directive-commodity.test
View File

@ -64,10 +64,13 @@ $ hledger -f - commodities
>2 /unexpected 'f'/ >2 /unexpected 'f'/
>=1 >=1
# 10 it rejects unrecognised subdirectives (should be permissive like account, TODO) # 10 it ignores unrecognised subdirectives
< <
commodity A commodity USD
note a a note American Dollars
format USD 1,000.00
nomarket
alias DOLLARS
default
$ hledger -f - commodities $ hledger -f - commodities
>2 /expecting "format"/ USD
>=1