mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-05 19:31:02 -08:00
Code Issues Projects Releases Wiki Activity

* lisp/progmodes/hideif.el: Use lexical-binding. Fix up cl-lib usage.

Browse source
This commit is contained in:
Stefan Monnier 2014-06-27 21:52:38 -04:00
parent f036e167fe
commit b1c4d6861e
2 changed files with 28 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -1,3 +1,7 @@
2014-06-28 Stefan Monnier <monnier@iro.umontreal.ca>
* progmodes/hideif.el: Use lexical-binding. Fix up cl-lib usage.
2014-06-28 K. Handa <handa@gnu.org> 2014-06-28 K. Handa <handa@gnu.org>
Fix Bug#17739. Fix Bug#17739.

51
lisp/progmodes/hideif.el
View file

@ -1,4 +1,4 @@
;;; hideif.el --- hides selected code within ifdef ;;; hideif.el --- hides selected code within ifdef -*- lexical-binding:t -*-
;; Copyright (C) 1988, 1994, 2001-2014 Free Software Foundation, Inc. ;; Copyright (C) 1988, 1994, 2001-2014 Free Software Foundation, Inc.
@ -550,8 +550,8 @@ that form should be displayed.")
(setq tok (cadr tokens)) (setq tok (cadr tokens))
(if (eq (car tokens) 'hif-lparen) (if (eq (car tokens) 'hif-lparen)
(if (and (hif-if-valid-identifier-p tok) (if (and (hif-if-valid-identifier-p tok)
(eq (caddr tokens) 'hif-rparen)) (eq (cl-caddr tokens) 'hif-rparen))
(setq tokens (cdddr tokens)) (setq tokens (cl-cdddr tokens))
(error "#define followed by non-identifier: %S" tok)) (error "#define followed by non-identifier: %S" tok))
(setq tok (car tokens) (setq tok (car tokens)
tokens (cdr tokens)) tokens (cdr tokens))
@ -607,9 +607,8 @@ detecting self-reference."
;; for hif-macro-supply-arguments ;; for hif-macro-supply-arguments
(let* ((hif-token-list (cdr remains)) (let* ((hif-token-list (cdr remains))
(hif-token nil) (hif-token nil)
(parmlist (mapcar 'hif-expand-token-list (parmlist (mapcar #'hif-expand-token-list
(hif-get-argument-list (hif-get-argument-list)))
tok)))
(result (result
(hif-expand-token-list (hif-expand-token-list
(hif-macro-supply-arguments tok parmlist) (hif-macro-supply-arguments tok parmlist)
@ -618,10 +617,10 @@ detecting self-reference."
result)) result))
;; Argument list is nil, direct expansion ;; Argument list is nil, direct expansion
(setq rep (hif-expand-token-list (setq rep (hif-expand-token-list
(caddr rep) ; Macro's token list (cl-caddr rep) ; Macro's token list
tok expand_list)) tok expand_list))
;; Replace all remaining references immediately ;; Replace all remaining references immediately
(setq remains (substitute tok rep remains)) (setq remains (cl-substitute tok rep remains))
rep) rep)
;; Lookup tok returns an atom ;; Lookup tok returns an atom
rep)) rep))
@ -824,7 +823,7 @@ factor : '!' factor | '~' factor | '(' expr ')' | 'defined(' id ')' |
(hif-place-macro-invocation ident) (hif-place-macro-invocation ident)
`(hif-lookup (quote ,ident))))))) `(hif-lookup (quote ,ident)))))))
(defun hif-get-argument-list (ident) (defun hif-get-argument-list ()
(let ((nest 0) (let ((nest 0)
(parmlist nil) ; A "token" list of parameters, will later be parsed (parmlist nil) ; A "token" list of parameters, will later be parsed
(parm nil)) (parm nil))
@ -849,7 +848,7 @@ factor : '!' factor | '~' factor | '(' expr ')' | 'defined(' id ')' |
(nreverse parmlist))) (nreverse parmlist)))
(defun hif-place-macro-invocation (ident) (defun hif-place-macro-invocation (ident)
(let ((parmlist (hif-get-argument-list ident))) (let ((parmlist (hif-get-argument-list)))
`(hif-invoke (quote ,ident) (quote ,parmlist)))) `(hif-invoke (quote ,ident) (quote ,parmlist))))
(defun hif-string-concatenation () (defun hif-string-concatenation ()
@ -861,7 +860,7 @@ factor : '!' factor | '~' factor | '(' expr ')' | 'defined(' id ')' |
(substring hif-token 1)))) ; remove leading '"' (substring hif-token 1)))) ; remove leading '"'
result)) result))
(defun hif-define-macro (parmlist token-body) (defun hif-define-macro (_parmlist _token-body)
"A marker for defined macro with arguments. "A marker for defined macro with arguments.
This macro cannot be evaluated alone without parameters inputed." This macro cannot be evaluated alone without parameters inputed."
;;TODO: input arguments at run time, use minibuffer to query all arguments ;;TODO: input arguments at run time, use minibuffer to query all arguments
@ -1002,8 +1001,8 @@ preprocessing token"
result))) result)))
(defun hif-delimit (lis atom) (defun hif-delimit (lis atom)
(nconc (mapcan (lambda (l) (list l atom)) (nconc (cl-mapcan (lambda (l) (list l atom))
(butlast lis)) (butlast lis))
(last lis))) (last lis)))
;; Perform token replacement: ;; Perform token replacement:
@ -1018,7 +1017,6 @@ preprocessing token"
(macro-body (and macro (cadr macro))) (macro-body (and macro (cadr macro)))
actual-count actual-count
formal-count formal-count
actual
formal formal
etc) etc)
@ -1055,10 +1053,10 @@ preprocessing token"
;; Unlike `subst', `substitute' replace only the top level ;; Unlike `subst', `substitute' replace only the top level
;; instead of the whole tree; more importantly, it's not ;; instead of the whole tree; more importantly, it's not
;; destructive. ;; destructive.
(substitute (if (and etc (null formal-parms)) (cl-substitute (if (and etc (null formal-parms))
(hif-delimit actual-parms 'hif-comma) (hif-delimit actual-parms 'hif-comma)
(car actual-parms)) (car actual-parms))
formal macro-body)) formal macro-body))
(setq actual-parms (cdr actual-parms))) (setq actual-parms (cdr actual-parms)))
;; Replacement completed, flatten the whole token list ;; Replacement completed, flatten the whole token list
@ -1462,7 +1460,6 @@ first arg will be `hif-etc'."
(let* ((defining (string= "define" (match-string 2))) (let* ((defining (string= "define" (match-string 2)))
(name (and (re-search-forward hif-macroref-regexp max t) (name (and (re-search-forward hif-macroref-regexp max t)
(match-string 1))) (match-string 1)))
(parsed nil)
(parmlist (and (match-string 3) ; First arg id found (parmlist (and (match-string 3) ; First arg id found
(hif-parse-macro-arglist (match-string 2))))) (hif-parse-macro-arglist (match-string 2)))))
(if defining (if defining
@ -1534,15 +1531,15 @@ It does not do the work that's pointless to redo on a recursive entry."
(save-excursion (save-excursion
(let ((case-fold-search nil) (let ((case-fold-search nil)
min max) min max)
(goto-char (point-min)) (goto-char (point-min))
(setf min (point)) (setf min (point))
(loop do (cl-loop do
(setf max (hif-find-any-ifX)) (setf max (hif-find-any-ifX))
(hif-add-new-defines min max) (hif-add-new-defines min max)
(if max (if max
(hif-possibly-hide)) (hif-possibly-hide))
(setf min (point)) (setf min (point))
while max)))) while max))))
;;===%%SF%% hide-ifdef-hiding (End) === ;;===%%SF%% hide-ifdef-hiding (End) ===