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

imp: improve bad regexp error message

Browse Source 
Eg '(?:foo)' is not malformed, it's just not supported.
https://hledger.org/hledger.html#hledgers-regular-expressions
This commit is contained in:
Simon Michael 2024-07-24 11:06:13 +01:00
parent fa8d223858
commit d19b353bfb
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hledger-lib/Hledger/Reports/ReportOptions.hs
View File

@ -817,7 +817,7 @@ makeHledgerClassyLenses ''ReportSpec
-- >>> _rsQuery <$> setEither querystring ["assets"] defreportspec -- >>> _rsQuery <$> setEither querystring ["assets"] defreportspec
-- Right (Acct (RegexpCI "assets")) -- Right (Acct (RegexpCI "assets"))
-- >>> _rsQuery <$> setEither querystring ["(assets"] defreportspec -- >>> _rsQuery <$> setEither querystring ["(assets"] defreportspec
-- Left "This regular expression is malformed, please correct it:\n(assets" -- Left "This regular expression is invalid or unsupported, please correct it:\n(assets"
-- >>> _rsQuery $ set querystring ["assets"] defreportspec -- >>> _rsQuery $ set querystring ["assets"] defreportspec
-- Acct (RegexpCI "assets") -- Acct (RegexpCI "assets")
-- >>> _rsQuery $ set querystring ["(assets"] defreportspec -- >>> _rsQuery $ set querystring ["(assets"] defreportspec

2
hledger-lib/Hledger/Utils/Regex.hs
View File

@ -136,7 +136,7 @@ toRegexCI = memo $ \s -> mkRegexErr s (RegexpCI s <$> makeRegexOptsM defaultComp
-- | Make a nice error message for a regexp error. -- | Make a nice error message for a regexp error.
mkRegexErr :: Text -> Maybe a -> Either RegexError a mkRegexErr :: Text -> Maybe a -> Either RegexError a
mkRegexErr s = maybe (Left errmsg) Right mkRegexErr s = maybe (Left errmsg) Right
where errmsg = T.unpack $ "This regular expression is malformed, please correct it:\n" <> s where errmsg = T.unpack $ "This regular expression is invalid or unsupported, please correct it:\n" <> s
-- Convert a Regexp string to a compiled Regex, throw an error -- Convert a Regexp string to a compiled Regex, throw an error
toRegex' :: Text -> Regexp toRegex' :: Text -> Regexp

2
hledger/test/errors/README.md
View File

@ -268,7 +268,7 @@ hledger: Error: /Users/simon/src/hledger/hledger/test/errors/./parseable-regexps
3 | alias /(/ = a 3 | alias /(/ = a
| ^ | ^
This regular expression is malformed, please correct it: This regular expression is invalid or unsupported, please correct it:
( (
``` ```

2
hledger/test/errors/parseable-regexps.test
View File

@ -4,7 +4,7 @@ $$$ hledger check -f parseable-regexps.j
3 \| alias \/\(\/ = a 3 \| alias \/\(\/ = a
\| \^ \| \^
This regular expression is malformed, please correct it: This regular expression is invalid or unsupported, please correct it:
\( \(
/ /

2
hledger/test/query-expr.test
View File

@ -130,7 +130,7 @@ $ hledger -f - print expr:"not tag:transactiontag=B"
# ** 9. Having parentheses directly follow 'not' sees 'not' as part of a query. # ** 9. Having parentheses directly follow 'not' sees 'not' as part of a query.
$ hledger -f - print expr:"not(tag:transactiontag=B)" $ hledger -f - print expr:"not(tag:transactiontag=B)"
>2 >2
hledger: Error: This regular expression is malformed, please correct it: hledger: Error: This regular expression is invalid or unsupported, please correct it:
not(tag:transactiontag=B not(tag:transactiontag=B
>=1 >=1