branch: elpa/d-mode
commit 546cc28b1b46b43d019dc3218aa89c0a017cd47a
Author: Vladimir Panteleev <[email protected]>
Commit: Vladimir Panteleev <[email protected]>
Fix parsing of block-less conditional declarations
A declaration may follow ")" (as in "version(xxx)").
---
d-mode.el | 5 ++++-
tests/fonts.d | 2 ++
tests/fonts.d.html | 2 ++
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/d-mode.el b/d-mode.el
index b214fdca..c91d92d 100644
--- a/d-mode.el
+++ b/d-mode.el
@@ -7,7 +7,7 @@
;; Maintainer: Russel Winder <[email protected]>
;; Vladimir Panteleev <[email protected]>
;; Created: March 2007
-;; Version: 201909091759
+;; Version: 201909091921
;; Keywords: D programming language emacs cc-mode
;; Package-Requires: ((emacs "25.1"))
@@ -128,6 +128,9 @@
(c-lang-defconst c-opt-type-suffix-key
d "\\(\\[[^]]*\\]\\|\\.\\.\\.\\|\\*\\)")
+(c-lang-defconst c-decl-prefix-re
+ d "\\([{}();:,]+\\)")
+
(c-lang-defconst c-identifier-ops
;; For recognizing "~this", ".foo", and "foo.bar.baz" as identifiers
d '((left-assoc ".")))
diff --git a/tests/fonts.d b/tests/fonts.d
index a9b6ee8..faaecff 100644
--- a/tests/fonts.d
+++ b/tests/fonts.d
@@ -11,3 +11,5 @@ void main()
run(a ~ b);
}
+
+version(none) string readLink();
diff --git a/tests/fonts.d.html b/tests/fonts.d.html
index 27a9b4d..214d0e3 100644
--- a/tests/fonts.d.html
+++ b/tests/fonts.d.html
@@ -11,3 +11,5 @@
run(a ~ b);
}
+
+<span class="keyword">version</span>(none) <span class="type">string</span>
<span class="function-name">readLink</span>();
