[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r112608: Sync with upstream verilog-m
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r112608: Sync with upstream verilog-mode r840. |
Date: |
Thu, 16 May 2013 09:11:38 -0700 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 112608
author: Wilson Snyder <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2013-05-16 09:11:38 -0700
message:
Sync with upstream verilog-mode r840.
* lisp/progmodes/verilog-mode.el (verilog-mode-version)
(verilog-mode-release-date): Update.
(verilog-auto-lineup, verilog-auto-reset): Doc fixes.
(verilog-sig-tieoff): Fix string error on
AUTORESET with colon define, bug594. Reported by Andrew Hou.
(verilog-read-decls): Fix parameters confusing
AUTOINST interfaces, bug565. Reported by Leith Johnson.
modified:
lisp/ChangeLog
lisp/progmodes/verilog-mode.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-05-16 12:48:54 +0000
+++ b/lisp/ChangeLog 2013-05-16 16:11:38 +0000
@@ -1,3 +1,14 @@
+2013-05-16 Wilson Snyder <address@hidden>
+
+ Sync with upstream verilog-mode r840.
+ * progmodes/verilog-mode.el (verilog-mode-version)
+ (verilog-mode-release-date): Update.
+ (verilog-auto-lineup, verilog-auto-reset): Doc fixes.
+ (verilog-sig-tieoff): Fix string error on
+ AUTORESET with colon define, bug594. Reported by Andrew Hou.
+ (verilog-read-decls): Fix parameters confusing
+ AUTOINST interfaces, bug565. Reported by Leith Johnson.
+
2013-05-16 Eli Zaretskii <address@hidden>
* subr.el (reveal-filename): New function.
=== modified file 'lisp/progmodes/verilog-mode.el'
--- a/lisp/progmodes/verilog-mode.el 2013-05-09 01:40:20 +0000
+++ b/lisp/progmodes/verilog-mode.el 2013-05-16 16:11:38 +0000
@@ -123,9 +123,9 @@
;;; Code:
;; This variable will always hold the version number of the mode
-(defconst verilog-mode-version (substring "$$Revision: 820 $$" 12 -3)
+(defconst verilog-mode-version (substring "$$Revision: 840 $$" 12 -3)
"Version of this Verilog mode.")
-(defconst verilog-mode-release-date (substring "$$Date: 2012-09-17 20:43:10
-0400 (Mon, 17 Sep 2012) $$" 8 -3)
+(defconst verilog-mode-release-date (substring "$$Date: 2013-01-03 05:29:05
-0800 (Thu, 03 Jan 2013) $$" 8 -3)
"Release date of this Verilog mode.")
(defconst verilog-mode-release-emacs t
"If non-nil, this version of Verilog mode was released with Emacs itself.")
@@ -501,7 +501,7 @@
"Type of statements to lineup across multiple lines.
If 'all' is selected, then all line ups described below are done.
-If 'declaration', then just declarations are lined up with any
+If 'declarations', then just declarations are lined up with any
preceding declarations, taking into account widths and the like,
so or example the code:
reg [31:0] a;
@@ -1129,9 +1129,9 @@
(defcustom verilog-auto-inst-interfaced-ports nil
"Non-nil means include interfaced ports in AUTOINST expansions."
+ :version "24.3" ;; rev773, default change rev815
:group 'verilog-mode-auto
- :type 'boolean
- :version "24.3")
+ :type 'boolean)
(put 'verilog-auto-inst-interfaced-ports 'safe-local-variable
'verilog-booleanp)
(defcustom verilog-auto-input-ignore-regexp nil
@@ -1158,8 +1158,8 @@
(defcustom verilog-auto-template-warn-unused nil
"Non-nil means report warning if an AUTO_TEMPLATE line is not used.
This feature is not supported before Emacs 21.1 or XEmacs 21.4."
+ :version "24.3" ;;rev787
:group 'verilog-mode-auto
- :version "24.3"
:type 'boolean)
(put 'verilog-auto-template-warn-unused 'safe-local-variable 'verilog-booleanp)
@@ -1230,14 +1230,14 @@
(defcustom verilog-before-save-font-hook nil
"Hook run before `verilog-save-font-mods' removes highlighting."
+ :version "24.3" ;;rev735
:group 'verilog-mode-auto
- :version "24.3"
:type 'hook)
(defcustom verilog-after-save-font-hook nil
"Hook run after `verilog-save-font-mods' restores highlighting."
+ :version "24.3" ;;rev735
:group 'verilog-mode-auto
- :version "24.3"
:type 'hook)
(defvar verilog-imenu-generic-expression
@@ -7773,9 +7773,12 @@
;; Else presume verilog-auto-reset-widths is true
(t
(let* ((width (verilog-sig-width sig)))
- (if (string-match "^[0-9]+$" width)
- (concat width (if (verilog-sig-signed sig) "'sh0" "'h0"))
- (concat "{" width "{1'b0}}")))))))
+ (cond ((not width)
+ "`0/*NOWIDTH*/")
+ ((string-match "^[0-9]+$" width)
+ (concat width (if (verilog-sig-signed sig) "'sh0" "'h0")))
+ (t
+ (concat "{" width "{1'b0}}"))))))))
;;
;; Dumping
@@ -7956,6 +7959,7 @@
vec expect-signal keywd newsig rvalue enum io signed typedefed multidim
modport
varstack tmp)
+ ;;(if dbg (setq dbg (concat dbg (format "\n\nverilog-read-decls START PT
%s END %s\n" (point) end-mod-point))))
(save-excursion
(verilog-beg-of-defun-quick)
(setq sigs-const (verilog-read-auto-constants (point) end-mod-point))
@@ -8010,7 +8014,7 @@
(setq paren (1- paren))
(forward-char 1)
(when (< paren sig-paren)
- (setq expect-signal nil))) ; ) that ends variables inside v2k arg
list
+ (setq expect-signal nil rvalue nil))) ; ) that ends variables
inside v2k arg list
((looking-at "\\s-*\\(\\[[^]]+\\]\\)")
(goto-char (match-end 0))
(cond (newsig ; Memory, not just width. Patch last signal added's
memory (nth 3)
@@ -12458,12 +12462,20 @@
By default, AUTORESET will include the width of the signal in the
autos, SystemVerilog designs may want to change this. To control
-this behavior, see `verilog-auto-reset-widths'.
+this behavior, see `verilog-auto-reset-widths'. In some cases
+AUTORESET must use a '0 assignment and it will print NOWIDTH; use
+`verilog-auto-reset-widths' unbased to prevent this.
AUTORESET ties signals to deasserted, which is presumed to be zero.
Signals that match `verilog-active-low-regexp' will be deasserted by tying
them to a one.
+AUTORESET may try to reset arrays or structures that cannot be
+reset by a simple assignment, resulting in compile errors. This
+is a feature to be taken as a hint that you need to reset these
+signals manually (or put them into a \"`ifdef NEVER signal<=`0;
+`endif\" so Verilog-Mode ignores them.)
+
An example:
always @(posedge clk or negedge reset_l) begin
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r112608: Sync with upstream verilog-mode r840.,
Glenn Morris <=