emacs-mode: Prefix every function/variable/macro with ledger-.

This is the common convention in Emacs Lisp. Not following it might
cause problems with other packages as functions/variables/macros are
always visible to other modules.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
This commit is contained in:
Moritz Ulrich 2013-12-29 22:56:45 +01:00
parent c0812b91bf
commit 15b94e8f44
2 changed files with 32 additions and 31 deletions

View file

@ -28,29 +28,30 @@
(eval-when-compile (eval-when-compile
(require 'cl)) (require 'cl))
;; *-string constants are assembled in the single-line-config macro to ;; ledger-*-string constants are assembled in the
;; form the regex and list of elements ;; `ledger-single-line-config' macro to form the regex and list of
(defconst indent-string "\\(^[ \t]+\\)") ;; elements
(defconst status-string "\\([*! ]?\\)") (defconst ledger-indent-string "\\(^[ \t]+\\)")
(defconst account-string "[\\[(]?\\(.*?\\)[])]?") (defconst ledger-status-string "\\([*! ]?\\)")
(defconst amount-string "[ \t]?\\(-?[0-9]+\\.[0-9]*\\)") (defconst ledger-account-string "[\\[(]?\\(.*?\\)[])]?")
(defconst comment-string "[ \t]*;[ \t]*\\(.*?\\)") (defconst ledger-amount-string "[ \t]?\\(-?[0-9]+\\.[0-9]*\\)")
(defconst nil-string "\\([ \t]+\\)") (defconst ledger-comment-string "[ \t]*;[ \t]*\\(.*?\\)")
(defconst commodity-string "\\(.+?\\)") (defconst ledger-nil-string "\\([ \t]+\\)")
(defconst date-string "^\\([0-9]\\{4\\}[/-][01]?[0-9][/-][0123]?[0-9]\\)") (defconst ledger-commodity-string "\\(.+?\\)")
(defconst code-string "\\((.*)\\)?") (defconst ledger-date-string "^\\([0-9]\\{4\\}[/-][01]?[0-9][/-][0123]?[0-9]\\)")
(defconst payee-string "\\(.*\\)") (defconst ledger-code-string "\\((.*)\\)?")
(defconst ledger-payee-string "\\(.*\\)")
(defmacro line-regex (&rest elements) (defmacro ledger-line-regex (&rest elements)
(let (regex-string) (let (regex-string)
(concat (dolist (e elements regex-string) (concat (dolist (e elements regex-string)
(setq regex-string (setq regex-string
(concat regex-string (concat regex-string
(eval (eval
(intern (intern
(concat (symbol-name e) "-string")))))) "[ \t]*$"))) (concat "ledger-" (symbol-name e) "-string")))))) "[ \t]*$")))
(defmacro single-line-config2 (&rest elements) (defmacro ledger-single-line-config2 (&rest elements)
"Take list of ELEMENTS and return regex and element list for use in context-at-point" "Take list of ELEMENTS and return regex and element list for use in context-at-point"
(let (regex-string) (let (regex-string)
`'(,(concat (dolist (e elements regex-string) `'(,(concat (dolist (e elements regex-string)
@ -58,26 +59,26 @@
(concat regex-string (concat regex-string
(eval (eval
(intern (intern
(concat (symbol-name e) "-string")))))) "[ \t]*$") (concat "ledger-" (symbol-name e) "-string")))))) "[ \t]*$")
,elements))) ,elements)))
(defmacro single-line-config (&rest elements) (defmacro ledger-single-line-config (&rest elements)
"Take list of ELEMENTS and return regex and element list for use in context-at-point" "Take list of ELEMENTS and return regex and element list for use in context-at-point"
`'(,(eval `(line-regex ,@elements)) `'(,(eval `(ledger-line-regex ,@elements))
,elements)) ,elements))
(defconst ledger-line-config (defconst ledger-line-config
(list (list 'xact (list (single-line-config date nil status nil code nil payee nil comment) (list (list 'xact (list (ledger-single-line-config date nil status nil code nil payee nil comment)
(single-line-config date nil status nil code nil payee) (ledger-single-line-config date nil status nil code nil payee)
(single-line-config date nil status nil payee))) (ledger-single-line-config date nil status nil payee)))
(list 'acct-transaction (list (single-line-config indent comment) (list 'acct-transaction (list (ledger-single-line-config indent comment)
(single-line-config2 indent status account nil commodity amount nil comment) (ledger-single-line-config2 indent status account nil commodity amount nil comment)
(single-line-config2 indent status account nil commodity amount) (ledger-single-line-config2 indent status account nil commodity amount)
(single-line-config2 indent status account nil amount nil commodity comment) (ledger-single-line-config2 indent status account nil amount nil commodity comment)
(single-line-config2 indent status account nil amount nil commodity) (ledger-single-line-config2 indent status account nil amount nil commodity)
(single-line-config2 indent status account nil amount) (ledger-single-line-config2 indent status account nil amount)
(single-line-config2 indent status account nil comment) (ledger-single-line-config2 indent status account nil comment)
(single-line-config2 indent status account))))) (ledger-single-line-config2 indent status account)))))
(defun ledger-extract-context-info (line-type pos) (defun ledger-extract-context-info (line-type pos)
"Get context info for current line with LINE-TYPE. "Get context info for current line with LINE-TYPE.

View file

@ -109,7 +109,7 @@ And calculate the target-delta of the account being reconciled."
(message "Pending balance: %s" (message "Pending balance: %s"
(ledger-commodity-to-string pending)))))) (ledger-commodity-to-string pending))))))
(defun is-stdin (file) (defun ledger-is-stdin (file)
"True if ledger FILE is standard input." "True if ledger FILE is standard input."
(or (or
(equal file "") (equal file "")
@ -279,7 +279,7 @@ and exit reconcile mode"
(defun ledger-marker-where-xact-is (emacs-xact posting) (defun ledger-marker-where-xact-is (emacs-xact posting)
"Find the position of the EMACS-XACT in the `ledger-buf'. "Find the position of the EMACS-XACT in the `ledger-buf'.
POSTING is used in `ledger-clear-whole-transactions' is nil." POSTING is used in `ledger-clear-whole-transactions' is nil."
(let ((buf (if (is-stdin (nth 0 emacs-xact)) (let ((buf (if (ledger-is-stdin (nth 0 emacs-xact))
ledger-buf ledger-buf
(find-file-noselect (nth 0 emacs-xact))))) (find-file-noselect (nth 0 emacs-xact)))))
(cons (cons