Skip to content

Commit 6008b67

Browse files
committed
Verilog-Mode collected updates.
* lisp/progmodes/verilog-mode.el (verilog-compiler-directives): Support indenting `uselib. (verilog-read-decls): Fix AUTO* to ignore `protected regions. (verilog-read-auto-template-middle): Fix AUTO_TEMPLATEs with multiple module templates and at-REGEXPs, msg3183. Reported by Berk Akinci.
1 parent dba1be0 commit 6008b67

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

lisp/progmodes/verilog-mode.el

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
;; Keywords: languages
1010
;; The "Version" is the date followed by the decimal rendition of the Git
1111
;; commit hex.
12-
;; Version: 2019.11.21.248091482
12+
;; Version: 2019.12.17.268053413
1313

1414
;; Yoni Rabkin <[email protected]> contacted the maintainer of this
1515
;; file on 19/3/2008, and the maintainer agreed that when a bug is
@@ -124,7 +124,7 @@
124124
;;
125125

126126
;; This variable will always hold the version number of the mode
127-
(defconst verilog-mode-version "2019-11-21-ec9935a-vpo-GNU"
127+
(defconst verilog-mode-version "2019-12-17-ffa2ba5-vpo-GNU"
128128
"Version of this Verilog mode.")
129129
(defconst verilog-mode-release-emacs t
130130
"If non-nil, this version of Verilog mode was released with Emacs itself.")
@@ -2077,7 +2077,7 @@ find the errors."
20772077
"`resetall" "`timescale" "`unconnected_drive" "`undef" "`undefineall"
20782078
;; compiler directives not covered by IEEE 1800
20792079
"`case" "`default" "`endfor" "`endprotect" "`endswitch" "`endwhile" "`for"
2080-
"`format" "`if" "`let" "`protect" "`switch" "`time_scale"
2080+
"`format" "`if" "`let" "`protect" "`switch" "`time_scale" "`uselib"
20812081
"`while"
20822082
))
20832083
"List of Verilog compiler directives.")
@@ -8491,6 +8491,9 @@ Return an array of [outputs inouts inputs wire reg assign const]."
84918491
((looking-at "^\\s *`pragma\\s +protect\\s +begin_protected")
84928492
(or (re-search-forward "^\\s *`pragma\\s +protect\\s +end_protected" nil t)
84938493
(forward-line)))
8494+
((looking-at "^\\s *`protected\\>")
8495+
(or (re-search-forward "^\\s *`endprotected\\>" nil t)
8496+
(forward-line)))
84948497
((looking-at "(\\*")
84958498
;; To advance past either "(*)" or "(* ... *)" don't forward past first *
84968499
(forward-char 1)
@@ -9363,6 +9366,8 @@ Returns REGEXP and list of ( (signal_name connection_name)... )."
93639366
(setq tpl-regexp (match-string-no-properties 1))
93649367
(goto-char (match-end 0)))
93659368
(search-forward "(")
9369+
(while (verilog-within-string) ;; e.g. inside a tpl-regexp spec
9370+
(search-forward "("))
93669371
;; Parse lines in the template
93679372
(when (or verilog-auto-inst-template-numbers
93689373
verilog-auto-template-warn-unused)
@@ -14565,7 +14570,7 @@ Files are checked based on `verilog-library-flags'."
1456514570
(interactive)
1456614571
(let ((reporter-prompt-for-summary-p t))
1456714572
(reporter-submit-bug-report
14568-
14573+
1456914574
(concat "verilog-mode v" verilog-mode-version)
1457014575
'(
1457114576
verilog-active-low-regexp
@@ -14645,7 +14650,7 @@ Files are checked based on `verilog-library-flags'."
1464514650
verilog-warn-fatal
1464614651
)
1464714652
nil nil
14648-
(concat "Hi Mac,
14653+
(concat "Hi,
1464914654

1465014655
I want to report a bug.
1465114656

0 commit comments

Comments
 (0)