More regex fine tuning

This commit is contained in:
Craig Earls 2013-04-10 15:48:39 -07:00
parent 9b5289c3e9
commit 15e84cbb18

View file

@ -32,10 +32,10 @@
;; form the regex and list of elements ;; form the regex and list of elements
(defconst indent-string "\\(^[ \t]+\\)") (defconst indent-string "\\(^[ \t]+\\)")
(defconst status-string "\\([*! ]?\\)") (defconst status-string "\\([*! ]?\\)")
(defconst account-string "[\\[(]?\\(.*?\\)[])]?[ \t]\\{2\\}") (defconst account-string "[\\[(]?\\(.*?\\)[])]?")
(defconst amount-string "[ \t]?\\(-?[0-9]+\\.[0-9]*\\)") (defconst amount-string "[ \t]?\\(-?[0-9]+\\.[0-9]*\\)")
(defconst comment-string "[ \t]*;[ \t]*\\(.*?\\)") (defconst comment-string "[ \t]*;[ \t]*\\(.*?\\)")
(defconst nil-string "[ \t]+") (defconst nil-string "\\([ \t]+\\)")
(defconst commodity-string "\\(.+?\\)") (defconst commodity-string "\\(.+?\\)")
(defconst date-string "^\\(\\([0-9]\\{4\\}[/-]\\)?[01]?[0-9][/-][0123]?[0-9]\\)") (defconst date-string "^\\(\\([0-9]\\{4\\}[/-]\\)?[01]?[0-9][/-][0123]?[0-9]\\)")
(defconst code-string "\\((\\(.*\\))\\)?") (defconst code-string "\\((\\(.*\\))\\)?")
@ -70,12 +70,12 @@
(list (list 'xact (list (single-line-config date nil status nil nil code payee comment) (list (list 'xact (list (single-line-config date nil status nil nil code payee comment)
(single-line-config date nil status nil nil code payee))) (single-line-config date nil status nil nil code payee)))
(list 'acct-transaction (list (single-line-config indent comment) (list 'acct-transaction (list (single-line-config indent comment)
(single-line-config indent status account commodity amount nil comment) (single-line-config indent status account nil commodity amount nil comment)
(single-line-config indent status account commodity amount) (single-line-config indent status account nil commodity amount)
(single-line-config indent status account amount nil commodity comment) (single-line-config indent status account nil amount nil commodity comment)
(single-line-config indent status account amount nil commodity) (single-line-config indent status account nil amount nil commodity)
(single-line-config indent status account amount) (single-line-config indent status account nil amount)
(single-line-config indent status account comment) (single-line-config indent status account nil comment)
(single-line-config indent status account))))) (single-line-config indent status account)))))
(defun ledger-extract-context-info (line-type pos) (defun ledger-extract-context-info (line-type pos)