summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2016-11-17 18:12:22 -0500
committerKyle Meyer <kyle@kyleam.com>2016-11-17 18:12:22 -0500
commitb4be5e8072478a9c916add695acdbf6e8ea4fe45 (patch)
treed233a8a3ff75c643719a3ca0ad6d1b499fcfcc8c
parent867ebed8cb2bdc0d0a925f2509812b0216e7b09b (diff)
downloadsnakemake-mode-b4be5e8072478a9c916add695acdbf6e8ea4fe45.tar.gz
snakemake-rx-constituents: Replace sm-func with sm-builtin
The sm-builtin regexp will be extended to support built-in Snakemake objects like "input" and "output", at which point "function" will no longer be an accurate description.
-rw-r--r--snakemake-mode.el20
1 files changed, 11 insertions, 9 deletions
diff --git a/snakemake-mode.el b/snakemake-mode.el
index 9471965..448a4af 100644
--- a/snakemake-mode.el
+++ b/snakemake-mode.el
@@ -111,14 +111,16 @@
"wildcard_constraints"
"workdir")
symbol-end))
- (sm-func . ,(rx symbol-start
- (or "dynamic"
- "expand"
- "protected"
- "shell"
- "temp"
- "touch")
- symbol-end)))
+ (sm-builtin . ,(rx symbol-start
+ (or "dynamic"
+ "expand"
+ "protected"
+ "shell"
+ "temp"
+ "touch")
+ symbol-end))
+ ;; Deprecated. Use `sm-builtin' instead.
+ (sm-func . sm-builtin))
"Snakemake-specific sexps for `snakemake-rx'.")
(defmacro snakemake-rx (&rest regexps)
@@ -414,7 +416,7 @@ embedded R, you need to set mmm-global-mode to a non-nil value such as 'maybe.")
(1 font-lock-keyword-face nil 'lax)
(2 font-lock-function-name-face nil 'lax)
(3 font-lock-keyword-face nil 'lax))
- (,(snakemake-rx (group sm-func) (zero-or-more space) "(")
+ (,(snakemake-rx (group sm-builtin) (zero-or-more space) "(")
1 font-lock-builtin-face)
(,(snakemake-rx line-start (one-or-more space)
(group field-key)