Skip to content

Added support to align amounts that are an expression. #161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added support to align amounts that are an expression. #161

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 30 additions & 13 deletions ledger-regex.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,36 @@
(require 'cl-lib)

(defconst ledger-amount-regex
(concat "\\( \\|\t\\| \t\\)[ \t]*-?"
"\\([A-Z$€£₹_(]+ *\\)?"
;; We either match just a number after the commodity with no
;; decimal or thousand separators or a number with thousand
;; separators. If we have a decimal part starting with `,'
;; or `.', because the match is non-greedy, it must leave at
;; least one of those symbols for the following capture
;; group, which then finishes the decimal part.
"\\(-?\\(?:[0-9]+\\|[0-9,.]+?\\)\\)"
"\\([,.][0-9)]+\\)?"
"\\( *[[:word:]€£₹_\"]+\\)?"
"\\([ \t]*[@={]@?[^\n;]+?\\)?"
"\\([ \t]+;.+?\\|[ \t]*\\)?$"))

(let ((prefix-commodity-re "[A-Z$€£₹_(]+ *")
(suffix-commodity-re " *[[:word:]€£₹_\"]+")
(value-re "-?\\(?:[0-9]+\\|[0-9,.]+?\\)")
(decimal-re "[,.][0-9)]+"))
(concat "\\( \\|\t\\| \t\\)[ \t]*-?"
"(?[ \t]*"

;; If it's an expression pick the last value.
"\\(?:"
"\\(?:" prefix-commodity-re "\\)?"
"\\(?:" value-re "\\)"
"\\(?:" decimal-re "\\)?"
"\\(?:" suffix-commodity-re "\\)?"
"\\(?:[ \t]*[+*/-][ \t]*\\)?"
"\\)*?"

"\\(" prefix-commodity-re "\\)?"
;; We either match just a number after the commodity with no
;; decimal or thousand separators or a number with thousand
;; separators. If we have a decimal part starting with `,'
;; or `.', because the match is non-greedy, it must leave at
;; least one of those symbols for the following capture
;; group, which then finishes the decimal part.
"\\(" value-re "\\)"
"\\(" decimal-re "\\)?"
"\\(" suffix-commodity-re "\\)?"
"[ \t]*)?"
"\\([ \t]*[@={]@?[^\n;]+?\\)?"
"\\([ \t]+;.+?\\|[ \t]*\\)?$")))

(defconst ledger-amount-decimal-comma-regex
"-?[1-9][0-9.]*[,]?[0-9]*")
Expand Down