summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob L. Kreuze <zerodaysfordays@sdf.lonestar.org>2019-12-25 14:56:18 -0500
committerJakob L. Kreuze <zerodaysfordays@sdf.lonestar.org>2019-12-25 15:44:08 -0500
commitbcd03d1e7c82911da065422630ec78156ace3773 (patch)
tree58ee655789ec13bdabfe8328022a1da1aa475164
parent9b8515bb95a314e536693d42dabe1888e0fee131 (diff)
Fix regex for type specifiers.
-rw-r--r--myrddin-mode.el14
1 files changed, 9 insertions, 5 deletions
diff --git a/myrddin-mode.el b/myrddin-mode.el
index 5c45610..e7fe7f5 100644
--- a/myrddin-mode.el
+++ b/myrddin-mode.el
@@ -119,12 +119,16 @@
(defvar myrddin-mode-type-specification-regexp
(rx
- (and (or ?: "->")
+ (and (or ?{ "const" "var" "generic")
+ (zero-or-more (not newline))
+ (eval myrddin-mode-identifier-rx)
(zero-or-more whitespace)
- (group (or alpha ?_)
- (one-or-more (or alnum ?_))
- (optional (or (and ?\[ (zero-or-more any) ?\])
- ?#))))))
+ ?:
+ (zero-or-more whitespace)
+ (group
+ symbol-start
+ (eval myrddin-mode-type-name-rx)
+ symbol-end))))
(defvar myrddin-mode-label-regexp
(rx (and ?: (or alpha ?_) (one-or-more (or alnum ?_)) symbol-end)))