procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(byte-compile-or-recursion): New function.

Browse source 
(byte-compile-or): Use that.
(byte-compile-maybe-guarded): Handle (not (featurep 'emacs)).
This commit is contained in:
Richard M. Stallman 2005-07-16 18:27:25 +00:00
parent 5ba583d104
commit 83b0af6e4f
1 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
lisp/emacs-lisp/bytecomp.el
View file

@ -3377,8 +3377,10 @@ warnings during execution of BODY."
(if bound (if bound
(cons bound byte-compile-bound-variables) (cons bound byte-compile-bound-variables)
byte-compile-bound-variables)) byte-compile-bound-variables))
;; Suppress all warnings, for code not used in Emacs.
(byte-compile-warnings (byte-compile-warnings
(if (equal ,condition '(featurep 'xemacs)) (if (member ,condition '((featurep 'xemacs)
(not (featurep 'emacs))))
nil byte-compile-warnings))) nil byte-compile-warnings)))
(unwind-protect (unwind-protect
(progn ,@body) (progn ,@body)
@ -3450,7 +3452,7 @@ warnings during execution of BODY."
(byte-compile-form-do-effect t) (byte-compile-form-do-effect t)
(byte-compile-and-recursion args failtag)))) (byte-compile-and-recursion args failtag))))
;; Handle compilation of a multi-argument `and' call. ;; Handle compilation of a nontrivial `and' call.
;; We use tail recursion so we can use byte-compile-maybe-guarded. ;; We use tail recursion so we can use byte-compile-maybe-guarded.
(defun byte-compile-and-recursion (rest failtag) (defun byte-compile-and-recursion (rest failtag)
(if (cdr rest) (if (cdr rest)
@ -3467,12 +3469,19 @@ warnings during execution of BODY."
(args (cdr form))) (args (cdr form)))
(if (null args) (if (null args)
(byte-compile-form-do-effect nil) (byte-compile-form-do-effect nil)
(while (cdr args) (byte-compile-or-recursion args wintag))))
(byte-compile-form (car args))
;; Handle compilation of a nontrivial `or' call.
;; We use tail recursion so we can use byte-compile-maybe-guarded.
(defun byte-compile-or-recursion (rest wintag)
(if (cdr rest)
(progn
(byte-compile-form (car rest))
(byte-compile-goto-if t for-effect wintag) (byte-compile-goto-if t for-effect wintag)
(setq args (cdr args))) (byte-compile-maybe-guarded (list 'not (car rest))
(byte-compile-form-do-effect (car args)) (byte-compile-or-recursion (cdr rest) wintag)))
(byte-compile-out-tag wintag)))) (byte-compile-form-do-effect (car rest))
(byte-compile-out-tag wintag)))
(defun byte-compile-while (form) (defun byte-compile-while (form)
(let ((endtag (byte-compile-make-tag)) (let ((endtag (byte-compile-make-tag))