ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't re-add *INDENT-OFF* ... *INDENT-ON* tags

Browse Source 
Change-Id: Ifd2249c0152805e7b23c4629acce31634dca6f04
Signed-off-by: Dave Barach <dave@barachs.net>
This commit is contained in:
Dave Barach
2016-08-11 12:13:55 -04:00
committed by Ed Warnicke
parent 6304884468
commit 2bc547cc17
1 changed files with 58 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
build-root/emacs-lisp/fix-coding-style.el
View File

@ -1,13 +1,17 @@
#!/usr/bin/emacs --script #!/usr/bin/emacs --script
;; Insert style boilerplate ;; Insert style boilerplate if it's not already there
;; ;;
;; Breaking the string in half keeps emacs ;; Breaking the string in half keeps emacs
;; from trying to interpret the local variable ;; from trying to interpret the local variable
;; settings e.g. when it reads the lisp source code ;; settings e.g. when it reads the lisp source code
(defun insert-style-boilerplate () (interactive) (defun insert-style-boilerplate () (interactive)
(save-excursion (goto-char (point-max)) (save-excursion
(goto-char (point-min))
(if (eq nil (search-forward "coding-style-patch-verification"
(point-max) t))
(let ((junk 0)) (goto-char (point-max))
(insert " (insert "
/* /*
* fd.io coding-style-patch-verification: ON * fd.io coding-style-patch-verification: ON
@ -15,7 +19,23 @@
* Local Var" "iables: * Local Var" "iables:
* eval: (c-set-style \"gnu\") * eval: (c-set-style \"gnu\")
* End: * End:
*/"))) */")))))
;; (cons xxx <list>) means insert xxx at the head of <list>
;; Build a sorted list of *INDENT-OFF* lines, by searching
;; backwards. The initial (setq indent-offset-list nil)
;; results in (cdr <last-cell>) nil, which makes it a proper list
(defun find-indent-offs () (interactive)
(save-excursion
(if (boundp 'indent-offset-list)
(makunbound 'indent-offset-list))
(setq indent-offset-list nil)
(goto-char (point-max))
(while (search-backward "*INDENT-OFF*" (point-min) t)
(move-beginning-of-line nil)
(setq indent-offset-list (cons (point) indent-offset-list))
(previous-line))))
;; Insert indent-off ... indent-on brackets around ;; Insert indent-off ... indent-on brackets around
;; a certain xxx_foreach macro, etc. which "indent" ;; a certain xxx_foreach macro, etc. which "indent"
@ -23,10 +43,19 @@
;; are few examples (fortunately). ;; are few examples (fortunately).
(defun fix-initializer (what) (interactive) (defun fix-initializer (what) (interactive)
(find-indent-offs)
(save-excursion (save-excursion
(goto-char (point-min)) (goto-char (point-min))
(while (search-forward-regexp what (point-max) t) (while (search-forward-regexp what (point-max) t)
(move-beginning-of-line nil) (move-beginning-of-line nil)
(previous-line)
(let ((index 0)(pointval 0))
(while (and (< pointval (point))(elt indent-offset-list index))
(setq pointval (elt indent-offset-list index))
(setq index (1+ index)))
(if (not (eq pointval (point)))
(let ((junk 0))
(next-line)
(open-line 1) (open-line 1)
(c-indent-line-or-region) (c-indent-line-or-region)
(insert "/* *INDENT-OFF* */") (insert "/* *INDENT-OFF* */")
@ -36,7 +65,9 @@
(move-end-of-line nil) (move-end-of-line nil)
(newline 1) (newline 1)
(c-indent-line-or-region) (c-indent-line-or-region)
(insert "/* *INDENT-ON* */")))) (insert "/* *INDENT-ON* */")
(find-indent-offs))
(search-forward "*INDENT-ON*"))))))
(defun fix-pool-foreach () (interactive) (defun fix-pool-foreach () (interactive)
(fix-initializer "pool_foreach *(")) (fix-initializer "pool_foreach *("))
@ -98,8 +129,9 @@
(fix-reply-macro2) (fix-reply-macro2)
(fix-vnet-device-class) (fix-vnet-device-class)
(fix-vnet-hw-interface-class) (fix-vnet-hw-interface-class)
(insert-style-boilerplate)) (insert-style-boilerplate)
(if (boundp 'indent-offset-list)
(makunbound 'indent-offset-list)))
;; When run as a script, this sexp ;; When run as a script, this sexp
;; walks the list of files supplied on the command line. ;; walks the list of files supplied on the command line.
@ -108,14 +140,16 @@
;; or M-x load-file the file, so we won't accidentally ;; or M-x load-file the file, so we won't accidentally
;; evaluate (save-buffers-kill-emacs)... ;; evaluate (save-buffers-kill-emacs)...
(let ((index 0)) (let ((file-index 0))
(if (elt argv index) (if (elt argv file-index)
(while (elt argv index) (while (elt argv file-index)
(message "Processing %s..." (elt argv index)) (find-file (elt argv file-index))
(find-file (elt argv index))
(fd-io-styleify) (fd-io-styleify)
(setq index (1+ index)))) (message "Done %s..." (elt argv file-index))
(if (> index 0) (setq file-index (1+ file-index))))
(save-buffers-kill-emacs t))) (if (> file-index 0)
(let ((junk 0))
(message "Save and quit...")
(save-buffers-kill-emacs t))))