From 2357a7a7502a4ecbeda88ac77267ec066090ef2c Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Wed, 21 Dec 2022 23:38:27 -1000 Subject: [PATCH] dev: journal: ignore CLI flags in journal --- hledger-lib/Hledger/Read/JournalReader.hs | 4 +++- hledger/hledger.m4.md | 1 + .../ledger-compat/syntax/hledger-ledger-unsupported.test | 7 ------- hledger/test/ledger-compat/syntax/hledger-other.test | 2 ++ 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/hledger-lib/Hledger/Read/JournalReader.hs b/hledger-lib/Hledger/Read/JournalReader.hs index c6fe74d92..e32eb2694 100644 --- a/hledger-lib/Hledger/Read/JournalReader.hs +++ b/hledger-lib/Hledger/Read/JournalReader.hs @@ -244,6 +244,7 @@ directivep = (do ,bucketdirectivep ,capturedirectivep ,checkdirectivep + ,commandlineflagdirectivep ,commoditydirectivep ,commodityconversiondirectivep ,definedirectivep @@ -525,7 +526,7 @@ formatdirectivep expectedsym = do -- More Ledger directives, ignore for now: -- apply fixed, apply tag, assert, bucket, A, capture, check, define, expr applyfixeddirectivep, applytagdirectivep, assertdirectivep, bucketdirectivep, capturedirectivep, - checkdirectivep, definedirectivep, exprdirectivep :: JournalParser m () + checkdirectivep, definedirectivep, exprdirectivep, commandlineflagdirectivep :: JournalParser m () applyfixeddirectivep = do string "apply fixed" >> lift restofline >> return () applytagdirectivep = do string "apply tag" >> lift restofline >> return () assertdirectivep = do string "assert" >> lift restofline >> return () @@ -534,6 +535,7 @@ capturedirectivep = do string "capture" >> lift restofline >> return () checkdirectivep = do string "check" >> lift restofline >> return () definedirectivep = do string "define" >> lift restofline >> return () exprdirectivep = do string "expr" >> lift restofline >> return () +commandlineflagdirectivep = do string "--" >> lift restofline >> return () keywordp :: String -> JournalParser m () keywordp = void . string . fromString diff --git a/hledger/hledger.m4.md b/hledger/hledger.m4.md index 94ee4fe48..7f08694c7 100644 --- a/hledger/hledger.m4.md +++ b/hledger/hledger.m4.md @@ -2749,6 +2749,7 @@ capture ACCT REGEX check EXPR define VAR=EXPR expr EXPR +--command-line-flag ``` # CSV diff --git a/hledger/test/ledger-compat/syntax/hledger-ledger-unsupported.test b/hledger/test/ledger-compat/syntax/hledger-ledger-unsupported.test index 9de1e5cf7..a5e18c21b 100644 --- a/hledger/test/ledger-compat/syntax/hledger-ledger-unsupported.test +++ b/hledger/test/ledger-compat/syntax/hledger-ledger-unsupported.test @@ -49,10 +49,3 @@ $ hledger -f- check $ hledger -f- check >2// >=1 - -# command line options -< ---strict -$ hledger -f- check ->2// ->=1 diff --git a/hledger/test/ledger-compat/syntax/hledger-other.test b/hledger/test/ledger-compat/syntax/hledger-other.test index 75f8a858d..8f5b007c2 100644 --- a/hledger/test/ledger-compat/syntax/hledger-other.test +++ b/hledger/test/ledger-compat/syntax/hledger-other.test @@ -55,4 +55,6 @@ check 1 define var_name=$100 expr 1 N USD +--command-line-flag + $ hledger -f- check