From bcd03d1e7c82911da065422630ec78156ace3773 Mon Sep 17 00:00:00 2001
From: "Jakob L. Kreuze" <zerodaysfordays@sdf.lonestar.org>
Date: Wed, 25 Dec 2019 14:56:18 -0500
Subject: Fix regex for type specifiers.

---
 myrddin-mode.el | 14 +++++++++-----
 1 file 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)))
-- 
cgit v1.3