sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes to ledger-mode regexps

Browse source
This commit is contained in:
John Wiegley 2010-04-12 22:30:42 -04:00
parent 2af1360042
commit 2f2340d0ac
1 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
lisp/ldg-regex.el
View file

@ -125,7 +125,7 @@
"Match the transaction code.") "Match the transaction code.")
(ledger-define-regexp long-space (ledger-define-regexp long-space
(rx (and (*? space) (rx (and (*? blank)
(or (and ? (or ? ?\t)) ?\t))) (or (and ? (or ? ?\t)) ?\t)))
"Match a \"long space\".") "Match a \"long space\".")
@ -141,7 +141,7 @@
(ledger-define-regexp full-note (ledger-define-regexp full-note
(macroexpand (macroexpand
`(rx (and line-start (+ space) `(rx (and line-start (+ blank)
?\; (regexp ,ledger-note-regexp)))) ?\; (regexp ,ledger-note-regexp))))
"") "")
@ -149,9 +149,9 @@
(macroexpand (macroexpand
`(rx (and line-start `(rx (and line-start
(regexp ,ledger-full-date-regexp) (regexp ,ledger-full-date-regexp)
(? (and (+ space) (regexp ,ledger-state-regexp))) (? (and (+ blank) (regexp ,ledger-state-regexp)))
(? (and (+ space) (regexp ,ledger-code-regexp))) (? (and (+ blank) (regexp ,ledger-code-regexp)))
(+ space) (+? nonl) (+ blank) (+? nonl)
(? (regexp ,ledger-end-note-regexp)) (? (regexp ,ledger-end-note-regexp))
line-end))) line-end)))
"Match a transaction's first line (and optional notes)." "Match a transaction's first line (and optional notes)."
@ -162,11 +162,11 @@
(note end-note)) (note end-note))
(ledger-define-regexp account (ledger-define-regexp account
(rx (group (and (not (any ?:)) (*? nonl)))) (rx (group (and (not (any blank ?\[ ?\( ?: ?\;)) (*? nonl))))
"") "")
(ledger-define-regexp account-kind (ledger-define-regexp account-kind
(rx (group (? (any ?\[ ?\))))) (rx (group (? (any ?\[ ?\())))
"") "")
(ledger-define-regexp full-account (ledger-define-regexp full-account
@ -181,7 +181,7 @@
(ledger-define-regexp commodity (ledger-define-regexp commodity
(rx (group (rx (group
(or (and ?\" (+ (not (any ?\"))) ?\") (or (and ?\" (+ (not (any ?\"))) ?\")
(not (any space ?\n (not (any blank ?\n
digit digit
?- ?\[ ?\] ?- ?\[ ?\]
?. ?, ?\; ?+ ?* ?/ ?^ ?? ?: ?& ?| ?! ?= ?. ?, ?\; ?+ ?* ?/ ?^ ?? ?: ?& ?| ?! ?=
@ -200,16 +200,16 @@
(macroexpand (macroexpand
`(rx (group `(rx (group
(or (and (regexp ,ledger-commodity-regexp) (or (and (regexp ,ledger-commodity-regexp)
(*? space) (*? blank)
(regexp ,ledger-amount-regexp)) (regexp ,ledger-amount-regexp))
(and (regexp ,ledger-amount-regexp) (and (regexp ,ledger-amount-regexp)
(*? space) (*? blank)
(regexp ,ledger-commodity-regexp)))))) (regexp ,ledger-commodity-regexp))))))
"") "")
(ledger-define-regexp commodity-annotations (ledger-define-regexp commodity-annotations
(macroexpand (macroexpand
`(rx (* (+ space) `(rx (* (+ blank)
(or (and ?\{ (regexp ,ledger-commoditized-amount-regexp) ?\}) (or (and ?\{ (regexp ,ledger-commoditized-amount-regexp) ?\})
(and ?\[ (regexp ,ledger-date-regexp) ?\]) (and ?\[ (regexp ,ledger-date-regexp) ?\])
(and ?\( (not (any ?\))) ?\)))))) (and ?\( (not (any ?\))) ?\))))))
@ -217,13 +217,13 @@
(ledger-define-regexp cost (ledger-define-regexp cost
(macroexpand (macroexpand
`(rx (and (or "@" "@@") (+ space) `(rx (and (or "@" "@@") (+ blank)
(regexp ,ledger-commoditized-amount-regexp)))) (regexp ,ledger-commoditized-amount-regexp))))
"") "")
(ledger-define-regexp balance-assertion (ledger-define-regexp balance-assertion
(macroexpand (macroexpand
`(rx (and ?= (+ space) `(rx (and ?= (+ blank)
(regexp ,ledger-commoditized-amount-regexp)))) (regexp ,ledger-commoditized-amount-regexp))))
"") "")
@ -233,16 +233,17 @@
(ledger-define-regexp post-line (ledger-define-regexp post-line
(macroexpand (macroexpand
`(rx (and line-start `(rx (and line-start (+ blank)
(? (and (+ space) (regexp ,ledger-state-regexp))) (? (and (regexp ,ledger-state-regexp) (* blank)))
(+ space) (regexp ,ledger-full-account-regexp) (regexp ,ledger-full-account-regexp)
(+ space) (regexp ,ledger-full-amount-regexp) (? (and (regexp ,ledger-long-space-regexp)
(regexp ,ledger-full-amount-regexp)))
(? (regexp ,ledger-end-note-regexp)) (? (regexp ,ledger-end-note-regexp))
line-end))) line-end)))
"" ""
state state
(account-kind full-account kind) (account-kind full-account kind)
(account-name full-account name) (account full-account name)
(amount full-amount) (amount full-amount)
(note end-note)) (note end-note))