diff options
Diffstat (limited to 'lisp/progmodes/verilog-mode.el')
| -rw-r--r-- | lisp/progmodes/verilog-mode.el | 100 |
1 files changed, 36 insertions, 64 deletions
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el index f250947b8f8..8bb9256078a 100644 --- a/lisp/progmodes/verilog-mode.el +++ b/lisp/progmodes/verilog-mode.el @@ -1,7 +1,6 @@ ;; verilog-mode.el --- major mode for editing verilog source in Emacs -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +;; Copyright (C) 1996-2011 Free Software Foundation, Inc. ;; Author: Michael McNamara (mac@verilog.com), ;; Wilson Snyder (wsnyder@wsnyder.org) @@ -1378,19 +1377,8 @@ If set will become buffer local.") ;; Macros ;; -(defsubst verilog-get-beg-of-line (&optional arg) - (save-excursion - (beginning-of-line arg) - (point))) - -(defsubst verilog-get-end-of-line (&optional arg) - (save-excursion - (end-of-line arg) - (point))) - (defsubst verilog-within-string () - (save-excursion - (nth 3 (parse-partial-sexp (verilog-get-beg-of-line) (point))))) + (nth 3 (parse-partial-sexp (point-at-bol) (point)))) (defsubst verilog-string-replace-matches (from-string to-string fixedcase literal string) "Replace occurrences of FROM-STRING with TO-STRING. @@ -1480,7 +1468,7 @@ This speeds up complicated regexp matches." (search-forward substr bound noerror)) (save-excursion (beginning-of-line) - (setq done (re-search-forward regexp (verilog-get-end-of-line) noerror))) + (setq done (re-search-forward regexp (point-at-eol) noerror))) (unless (and (<= (match-beginning 0) (point)) (>= (match-end 0) (point))) (setq done nil))) @@ -1500,7 +1488,7 @@ This speeds up complicated regexp matches." (search-backward substr bound noerror)) (save-excursion (end-of-line) - (setq done (re-search-backward regexp (verilog-get-beg-of-line) noerror))) + (setq done (re-search-backward regexp (point-at-bol) noerror))) (unless (and (<= (match-beginning 0) (point)) (>= (match-end 0) (point))) (setq done nil))) @@ -1544,16 +1532,14 @@ portion, will be substituted." (cond ((or (file-exists-p "makefile") ;If there is a makefile, use it (file-exists-p "Makefile")) - (make-local-variable 'compile-command) - (setq compile-command "make ")) + (set (make-local-variable 'compile-command) "make ")) (t - (make-local-variable 'compile-command) - (setq compile-command - (if verilog-tool - (if (string-match "%s" (eval verilog-tool)) - (format (eval verilog-tool) (or buffer-file-name "")) - (concat (eval verilog-tool) " " (or buffer-file-name ""))) - "")))) + (set (make-local-variable 'compile-command) + (if verilog-tool + (if (string-match "%s" (eval verilog-tool)) + (format (eval verilog-tool) (or buffer-file-name "")) + (concat (eval verilog-tool) " " (or buffer-file-name ""))) + "")))) (verilog-modify-compile-command)) (defun verilog-expand-command (command) @@ -1577,8 +1563,8 @@ be substituted." (when (and (stringp compile-command) (string-match "\\b\\(__FLAGS__\\|__FILE__\\)\\b" compile-command)) - (make-local-variable 'compile-command) - (setq compile-command (verilog-expand-command compile-command)))) + (set (make-local-variable 'compile-command) + (verilog-expand-command compile-command)))) (if (featurep 'xemacs) ;; Following code only gets called from compilation-mode-hook on XEmacs to add error handling. @@ -1599,8 +1585,8 @@ find the errors." (cdr compilation-error-regexp-alist-alist))))) (if (boundp 'compilation-font-lock-keywords) (progn - (make-local-variable 'compilation-font-lock-keywords) - (setq compilation-font-lock-keywords verilog-error-font-lock-keywords) + (set (make-local-variable 'compilation-font-lock-keywords) + verilog-error-font-lock-keywords) (font-lock-set-defaults))) ;; Need to re-run compilation-error-regexp builder (if (fboundp 'compilation-build-compilation-error-regexp-alist) @@ -2919,7 +2905,7 @@ Use filename, if current buffer being edited shorten to just buffer name." (catch 'skip (if (eq nest 'yes) (let ((depth 1) - here ) + here) (while (verilog-re-search-forward reg nil 'move) (cond ((match-end md) ; a closer in regular expression, so we are climbing out @@ -2986,7 +2972,7 @@ Use filename, if current buffer being edited shorten to just buffer name." ;; (defvar verilog-which-tool 1) ;;;###autoload -(defun verilog-mode () +(define-derived-mode verilog-mode prog-mode "Verilog" "Major mode for editing Verilog code. \\<verilog-mode-map> See \\[describe-function] verilog-auto (\\[verilog-auto]) for details on how @@ -3114,30 +3100,21 @@ All key bindings can be seen in a Verilog-buffer with \\[describe-bindings]. Key bindings specific to `verilog-mode-map' are: \\{verilog-mode-map}" - (interactive) - (kill-all-local-variables) - (use-local-map verilog-mode-map) - (setq major-mode 'verilog-mode) - (setq mode-name "Verilog") - (setq local-abbrev-table verilog-mode-abbrev-table) + :abbrev-table verilog-mode-abbrev-table (set (make-local-variable 'beginning-of-defun-function) 'verilog-beg-of-defun) (set (make-local-variable 'end-of-defun-function) 'verilog-end-of-defun) (set-syntax-table verilog-mode-syntax-table) - (make-local-variable 'indent-line-function) - (setq indent-line-function 'verilog-indent-line-relative) + (set (make-local-variable 'indent-line-function) + #'verilog-indent-line-relative) (setq comment-indent-function 'verilog-comment-indent) - (make-local-variable 'parse-sexp-ignore-comments) - (setq parse-sexp-ignore-comments nil) - (make-local-variable 'comment-start) - (make-local-variable 'comment-end) - (make-local-variable 'comment-multi-line) - (make-local-variable 'comment-start-skip) - (setq comment-start "// " - comment-end "" - comment-start-skip "/\\*+ *\\|// *" - comment-multi-line nil) + (set (make-local-variable 'parse-sexp-ignore-comments) nil) + + (set (make-local-variable 'comment-start) "// ") + (set (make-local-variable 'comment-end) "") + (set (make-local-variable 'comment-start-skip) "/\\*+ *\\|// *") + (set (make-local-variable 'comment-multi-line) nil) ;; Set up for compilation (setq verilog-which-tool 1) (setq verilog-tool 'verilog-linter) @@ -3177,8 +3154,8 @@ Key bindings specific to `verilog-mode-map' are: (add-hook 'after-change-functions 'verilog-highlight-region t t)) ;; Tell imenu how to handle Verilog. - (make-local-variable 'imenu-generic-expression) - (setq imenu-generic-expression verilog-imenu-generic-expression) + (set (make-local-variable 'imenu-generic-expression) + verilog-imenu-generic-expression) ;; Tell which-func-modes that imenu knows about verilog (when (boundp 'which-function-modes) (add-to-list 'which-func-modes 'verilog-mode)) @@ -3191,8 +3168,7 @@ Key bindings specific to `verilog-mode-map' are: hs-special-modes-alist)))) ;; Stuff for autos - (add-hook 'write-contents-hooks 'verilog-auto-save-check) ; already local - (run-hooks 'verilog-mode-hook)) + (add-hook 'write-contents-hooks 'verilog-auto-save-check nil 'local)) ;; @@ -3925,7 +3901,7 @@ primitive or interface named NAME." (or kill-existing-comment (not (save-excursion (end-of-line) - (search-backward "//" (verilog-get-beg-of-line) t))))) + (search-backward "//" (point-at-bol) t))))) (let ((nest 1) b e m (else (if (match-end 2) "!" " "))) @@ -3978,7 +3954,7 @@ primitive or interface named NAME." (or kill-existing-comment (not (save-excursion (end-of-line) - (search-backward "//" (verilog-get-beg-of-line) t))))) + (search-backward "//" (point-at-bol) t))))) (let ((type (car indent-str))) (unless (eq type 'declaration) (unless (looking-at (concat "\\(" verilog-end-block-ordered-re "\\)[ \t]*:")) ;; ignore named ends @@ -4512,7 +4488,7 @@ becomes: (cond ((looking-at "// surefire lint_off_line ") (goto-char (match-end 0)) - (let ((lim (save-excursion (end-of-line) (point)))) + (let ((lim (point-at-eol))) (if (re-search-forward code lim 'move) (throw 'already t) (insert (concat " " code))))) @@ -8053,8 +8029,7 @@ Optionally associate it with the specified enumeration ENUMNAME." (let ((enumvar (intern (concat "venum-" enumname)))) ;;(message "Define %s=%s" defname defvalue) (sleep-for 1) (unless (boundp enumvar) (set enumvar nil)) - (make-local-variable enumvar) - (add-to-list enumvar defname))))) + (add-to-list (make-local-variable enumvar) defname))))) (defun verilog-read-defines (&optional filename recurse subcall) "Read `defines and parameters for the current file, or optional FILENAME. @@ -8287,8 +8262,7 @@ Some macros and such are also found and included. For dinotrace.el." ": Can't find verilog-getopt-file -f file: " filename))) (goto-char (point-min)) (while (not (eobp)) - (setq line (buffer-substring (point) - (save-excursion (end-of-line) (point)))) + (setq line (buffer-substring (point) (point-at-eol))) (forward-line 1) (when (string-match "//" line) (setq line (substring line 0 (match-beginning 0)))) @@ -9361,10 +9335,9 @@ Typing \\[verilog-inject-auto] will make this into: (defun verilog-auto-reeval-locals (&optional force) "Read file local variable segment at bottom of file if it has changed. If FORCE, always reread it." - (make-local-variable 'verilog-auto-last-file-locals) (let ((curlocal (verilog-auto-read-locals))) (when (or force (not (equal verilog-auto-last-file-locals curlocal))) - (setq verilog-auto-last-file-locals curlocal) + (set (make-local-variable 'verilog-auto-last-file-locals) curlocal) ;; Note this may cause this function to be recursively invoked, ;; because hack-local-variables may call (verilog-mode) ;; The above when statement will prevent it from recursing forever. @@ -11915,7 +11888,7 @@ Clicking on the middle-mouse button loads them in a buffer (as in dired)." (verilog-save-scan-cache (let (end-point) (goto-char end) - (setq end-point (verilog-get-end-of-line)) + (setq end-point (point-at-eol)) (goto-char beg) (beginning-of-line) ; scan entire line ;; delete overlays existing on this line @@ -12139,5 +12112,4 @@ but instead, [[Fill in here]] happens!. ;; checkdoc-force-docstrings-flag:nil ;; End: -;; arch-tag: 87923725-57b3-41b5-9494-be21118c6a6f ;;; verilog-mode.el ends here |