diff options
| author | Jakob L. Kreuze <zerodaysfordays@sdf.lonestar.org> | 2019-12-25 16:20:18 -0500 |
|---|---|---|
| committer | Jakob L. Kreuze <zerodaysfordays@sdf.lonestar.org> | 2019-12-25 16:20:18 -0500 |
| commit | 51c0a2cb9dfc9526cd47e71313f5a745c99cadcc (patch) | |
| tree | 1a1d70546982809fa31b0c7adce67ec4090bd40f | |
| parent | eb319320fe5069fc12d5d67eedfe077a1aac2783 (diff) | |
| -rw-r--r-- | myrddin-mode.el | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/myrddin-mode.el b/myrddin-mode.el index 8ac1862..4e38c2f 100644 --- a/myrddin-mode.el +++ b/myrddin-mode.el @@ -119,12 +119,12 @@ (defvar myrddin-mode-type-specification-regexp (rx - (and (or ?{ "const" "var" "generic") - (zero-or-more (not newline)) - (eval myrddin-mode-identifier-rx) - (zero-or-more whitespace) - ?: - (zero-or-more whitespace) + (and (or (and "->" + (zero-or-more whitespace)) + (and (eval myrddin-mode-identifier-rx) + (zero-or-more whitespace) + ?: + (zero-or-more whitespace))) (group symbol-start (eval myrddin-mode-type-name-rx) @@ -137,7 +137,8 @@ `((,(regexp-opt myrddin-mode-keywords 'symbols) . font-lock-keyword-face) (,(regexp-opt myrddin-mode-constants 'symbols) . font-lock-constant-face) (,myrddin-mode-label-regexp . font-lock-constant-face) - (,myrddin-mode-type-specification-regexp 1 font-lock-type-face) + (,(rx (or ?{ "const" "var" "generic")) ,myrddin-mode-type-specification-regexp + nil nil (1 font-lock-type-face)) (,myrddin-mode-variable-declaration-regexp 1 font-lock-variable-name-face))) |