diff --git a/hemlock/bit-screen.lisp b/hemlock/bit-screen.lisp index bbfe477ed19ab46c91ea824637449157d9bd36d9..30474726086bec1ad5f2fac65b8de1762b03c0f6 100644 --- a/hemlock/bit-screen.lisp +++ b/hemlock/bit-screen.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/bit-screen.lisp,v 1.16 1994/10/31 04:50:12 ram Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/bit-screen.lisp,v 1.17 2001/03/13 15:49:50 pw Exp $") ;;; ;;; ********************************************************************** ;;; @@ -22,7 +22,7 @@ *random-typeout-hook* *create-initial-windows-hook*)) -(proclaim '(special *echo-area-window*)) +(declaim (special *echo-area-window*)) ;;; We have an internal notion of window groups on bitmap devices. Every ;;; Hemlock window has a hunk slot which holds a structure with information @@ -672,7 +672,7 @@ (let ((*print-base* 10)) (format nil "Hemlock ~S" (incf *hemlock-window-count*)))) -(proclaim '(inline surplus-window-height surplus-window-height-w/-modeline)) +(declaim (inline surplus-window-height surplus-window-height-w/-modeline)) ;;; (defun surplus-window-height (thumb-bar-p) (+ hunk-top-border (if thumb-bar-p diff --git a/hemlock/buffer.lisp b/hemlock/buffer.lisp index 11c3e91201af104470bf19e3bea3763a87a7c9ef..12db5b40d902c08653ec3bb2c3f8534b6c3307ef 100644 --- a/hemlock/buffer.lisp +++ b/hemlock/buffer.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/buffer.lisp,v 1.4 1994/10/31 04:50:12 ram Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/buffer.lisp,v 1.5 2001/03/13 15:49:51 pw Rel $") ;;; ;;; ********************************************************************** ;;; @@ -56,7 +56,7 @@ sense) -(proclaim '(inline buffer-name buffer-pathname buffer-region)) +(declaim (inline buffer-name buffer-pathname buffer-region)) (defun buffer-region (buffer) "Return the region which contains Buffer's text." @@ -72,7 +72,7 @@ "Return Buffer's string name." (buffer-%name buffer)) -(proclaim '(special *buffer-names*)) +(declaim (special *buffer-names*)) (defun %set-buffer-name (buffer name) (multiple-value-bind (entry foundp) (getstring name *buffer-names*) @@ -248,7 +248,7 @@ (with-mode-and-buffer (name nil buffer) (not (null (memq mode (buffer-mode-objects buffer)))))) -(proclaim '(special *mode-names*)) +(declaim (special *mode-names*)) ;;; %SET-BUFFER-MINOR-MODE -- Public ;;; @@ -315,7 +315,7 @@ ;;;; CURRENT-BUFFER, CURRENT-POINT, and buffer using setup and cleanup. -(proclaim '(inline current-buffer)) +(declaim (inline current-buffer)) (defun current-buffer () "Return the current buffer object." *current-buffer*) @@ -372,7 +372,7 @@ (defvar *in-a-recursive-edit* nil "True if we are in a recursive edit.") -(proclaim '(inline in-recursive-edit)) +(declaim (inline in-recursive-edit)) (defun in-recursive-edit () "Returns whether the calling point is dynamically within a recursive edit diff --git a/hemlock/cursor.lisp b/hemlock/cursor.lisp index 81e1bc3d4bc864eb8e8b4d31cdbe2f49cd12c816..520b2209b56a9bc4cf17e3f5b0f0bb40b119984f 100644 --- a/hemlock/cursor.lisp +++ b/hemlock/cursor.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/cursor.lisp,v 1.3 1994/10/31 04:50:12 ram Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/cursor.lisp,v 1.4 2001/03/13 15:49:52 pw Rel $") ;;; ;;; ********************************************************************** ;;; @@ -36,7 +36,7 @@ ;;; 3) Call Real-Line-Length or Cached-Real-Line-Length to get the ;;; X position and number of times wrapped. -(proclaim '(special the-sentinel)) +(declaim (special the-sentinel)) (eval-when (compile eval) ;;; find-line diff --git a/hemlock/display.lisp b/hemlock/display.lisp index 82a9f84e171a229a528762710c6cb383991afcf1..ff4f068149a3e95ddc3151b10bbdaca8752dfd34 100644 --- a/hemlock/display.lisp +++ b/hemlock/display.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/display.lisp,v 1.9 1994/10/31 04:50:12 ram Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/display.lisp,v 1.10 2001/03/13 15:49:52 pw Rel $") ;;; ;;; ********************************************************************** ;;; @@ -35,7 +35,7 @@ ;;; (defvar *in-redisplay* nil) -(proclaim '(special *window-list*)) +(declaim (special *window-list*)) (eval-when (compile eval) diff --git a/hemlock/echocoms.lisp b/hemlock/echocoms.lisp index 060b7277aac863585c877aef164b3d86e584e6a2..662eb0d988b127698fc1f33481124ada12ce2de2 100644 --- a/hemlock/echocoms.lisp +++ b/hemlock/echocoms.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/echocoms.lisp,v 1.7 1998/09/05 23:17:06 dtc Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/echocoms.lisp,v 1.8 2001/03/13 15:49:52 pw Rel $") ;;; ;;; ********************************************************************** ;;; @@ -295,7 +295,7 @@ (when (mark< tem *parse-starting-mark*) (editor-error)) (kill-previous-word-command p))) -(proclaim '(special *kill-ring*)) +(declaim (special *kill-ring*)) (defcommand "Kill Parse" (p) "Kills any input so far." diff --git a/hemlock/ed-integrity.lisp b/hemlock/ed-integrity.lisp index f112696d3efc33f3b1fa8abc8bf0a386528ba15e..8ccee5dc0d74997be53c8047057ad6ceda507a7a 100644 --- a/hemlock/ed-integrity.lisp +++ b/hemlock/ed-integrity.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/ed-integrity.lisp,v 1.4 1994/10/31 04:50:12 ram Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/ed-integrity.lisp,v 1.5 2001/03/13 15:49:52 pw Rel $") ;;; ;;; ********************************************************************** ;;; @@ -24,11 +24,11 @@ (in-package "ED") -(proclaim '(special hemlock-internals::*debugging-tty-redisplay* - hemlock-internals::*testing-delete-queue* - hemlock-internals::*testing-insert-queue* - hemlock-internals::*testing-moved* - hemlock-internals::*testing-writes*)) +(declaim (special hemlock-internals::*debugging-tty-redisplay* + hemlock-internals::*testing-delete-queue* + hemlock-internals::*testing-insert-queue* + hemlock-internals::*testing-moved* + hemlock-internals::*testing-writes*)) (defcommand "Setup Tty Buffer" (p) diff --git a/hemlock/edit-defs.lisp b/hemlock/edit-defs.lisp index 74b207c919ae35aebfc9d67406b76069814792f4..74bf41db19f947c16e9cc8cd8ce7d0f442d2575b 100644 --- a/hemlock/edit-defs.lisp +++ b/hemlock/edit-defs.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/edit-defs.lisp,v 1.6 1994/10/31 04:50:12 ram Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/edit-defs.lisp,v 1.7 2001/03/13 15:49:52 pw Rel $") ;;; ;;; ********************************************************************** ;;; @@ -86,7 +86,7 @@ (new-search-pattern :string-insensitive :forward " ")) (defvar *last-go-to-def-string* "") -(proclaim '(simple-string *last-go-to-def-string*)) +(declaim (simple-string *last-go-to-def-string*)) ;;; GET-DEFINITION-PATTERN takes a type and a name. It returns a search ;;; pattern for finding the defining form for name using diff --git a/hemlock/hunk-draw.lisp b/hemlock/hunk-draw.lisp index 6935b6280add6d243b90bae741ae540c0c0822f3..917501c0077301af76c8f426d9ce34ad35dac811 100644 --- a/hemlock/hunk-draw.lisp +++ b/hemlock/hunk-draw.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/hunk-draw.lisp,v 1.6 1994/10/31 04:50:12 ram Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/hunk-draw.lisp,v 1.7 2001/03/13 15:49:52 pw Rel $") ;;; ;;; ********************************************************************** ;;; @@ -332,7 +332,7 @@ (defun frob-cursor (on) (if on (drop-cursor) (lift-cursor))) -(proclaim '(special *default-border-pixmap* *highlight-border-pixmap*)) +(declaim (special *default-border-pixmap* *highlight-border-pixmap*)) ;;; DROP-CURSOR and LIFT-CURSOR are separate functions from FROB-CURSOR ;;; because they are called a couple places (e.g., HUNK-EXPOSED-REGION diff --git a/hemlock/input.lisp b/hemlock/input.lisp index b7e9a9f2f5dfa5c5c6371a4e4fafa763368e1c86..501b7fd47fcf71a2cd6373c8cc7c062fbb8e6217 100644 --- a/hemlock/input.lisp +++ b/hemlock/input.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/input.lisp,v 1.7 2001/01/27 14:22:20 pw Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/input.lisp,v 1.8 2001/03/13 15:49:53 pw Rel $") ;;; ;;; ********************************************************************** ;;; @@ -92,7 +92,7 @@ (defvar *key-event-history* nil "This ring holds the last 60 key-events read by the command interpreter.") -(proclaim '(special *input-transcript*)) +(declaim (special *input-transcript*)) ;;; DQ-EVENT is used in editor stream methods for popping off input. ;;; If there is an event not yet read in Stream, then pop the queue @@ -160,7 +160,7 @@ "This keeps us from undefined nasties like re-entering Hemlock stream input methods from input hooks and scheduled events.") -(proclaim '(special *screen-image-trashed*)) +(declaim (special *screen-image-trashed*)) ;;; These are the characters GET-KEY-EVENT notices when it pays attention ;;; to aborting input. This happens via EDITOR-INPUT-METHOD-MACRO. @@ -440,7 +440,7 @@ (random-typeout-cleanup stream) (throw 'more-punt nil))))) -(proclaim '(special *more-prompt-action*)) +(declaim (special *more-prompt-action*)) (defun maybe-keep-random-typeout-window (stream) (let* ((window (random-typeout-stream-window stream)) diff --git a/hemlock/interp.lisp b/hemlock/interp.lisp index 27b17cae49fafea7ec645bda490e861d3f8907b6..af488976481cdea1ae7bae85f00959d43adcfe6b 100644 --- a/hemlock/interp.lisp +++ b/hemlock/interp.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/interp.lisp,v 1.4 1994/10/31 04:50:12 ram Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/interp.lisp,v 1.5 2001/03/13 15:49:53 pw Rel $") ;;; ;;; ********************************************************************** ;;; @@ -204,7 +204,7 @@ ;;;; Exported Primitives: -(proclaim '(special *command-names*)) +(declaim (special *command-names*)) ;;; BIND-KEY -- Public. ;;; diff --git a/hemlock/key-event.lisp b/hemlock/key-event.lisp index 524cdb19b8d28a312cb36b38be6988974d346b6c..f9a3bb15c51bc8e79187d14c8fd1fdd7438a39f4 100644 --- a/hemlock/key-event.lisp +++ b/hemlock/key-event.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/key-event.lisp,v 1.4 1996/05/08 14:56:40 ram Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/key-event.lisp,v 1.5 2001/03/13 15:49:53 pw Exp $") ;;; ;;; ********************************************************************** ;;; @@ -56,7 +56,7 @@ ;;; (defvar *names-to-keysyms*) -(proclaim '(inline name-keysym keysym-names keysym-preferred-name)) +(declaim (inline name-keysym keysym-names keysym-preferred-name)) (defun name-keysym (name) "This returns the keysym named name. If name is unknown, this returns nil." diff --git a/hemlock/killcoms.lisp b/hemlock/killcoms.lisp index 6bc491f90f4d763093b67242af21e78a5d41eed0..f30193b6e2dba143cb762d11bc04e82eea3604d3 100644 --- a/hemlock/killcoms.lisp +++ b/hemlock/killcoms.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/killcoms.lisp,v 1.3 1994/10/31 04:50:12 ram Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/killcoms.lisp,v 1.4 2001/03/13 15:49:54 pw Rel $") ;;; ;;; ********************************************************************** ;;; @@ -38,7 +38,7 @@ "This is a list of command types that permit the current region to be active for the immediately following command.") -(proclaim '(inline activate-region deactivate-region region-active-p)) +(declaim (inline activate-region deactivate-region region-active-p)) (defun activate-region () "Make the current region active." @@ -204,7 +204,7 @@ ;;;; KILL-REGION and KILL-CHARACTERS primitives. -(proclaim '(special *delete-char-region*)) +(declaim (special *delete-char-region*)) ;;; KILL-REGION first checks for any characters that may need to be added to ;;; the region. If there are some, we possibly push a region onto *kill-ring*, diff --git a/hemlock/line.lisp b/hemlock/line.lisp index 92af68a2523a7539ad5e0a722cad218e274e3e67..a0ed06541d6daceb16975a8244f7a14ec7e0c8ee 100644 --- a/hemlock/line.lisp +++ b/hemlock/line.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/line.lisp,v 1.3 1994/10/31 04:50:12 ram Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/line.lisp,v 1.4 2001/03/13 15:49:54 pw Rel $") ;;; ;;; ********************************************************************** ;;; @@ -37,7 +37,7 @@ ;;;; The line object: -(proclaim '(inline %make-line)) +(declaim (inline %make-line)) (defstruct (line (:print-function %print-hline) (:constructor %make-line) (:predicate linep)) @@ -122,7 +122,7 @@ ;;; ;;; We can just return the Line-%Chars. ;;; -(proclaim '(inline line-signature)) +(declaim (inline line-signature)) (defun line-signature (line) "This function returns an object which serves as a signature for a line's contents. It is guaranteed that any modification of text on the line will diff --git a/hemlock/linimage.lisp b/hemlock/linimage.lisp index 730c51b99991f7912174e4ee9b35cd529534e5b0..1847a66a3a9979bbe815cd692f7d79848c26c420 100644 --- a/hemlock/linimage.lisp +++ b/hemlock/linimage.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/linimage.lisp,v 1.3 1994/10/31 04:50:12 ram Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/linimage.lisp,v 1.4 2001/03/13 15:49:54 pw Exp $") ;;; ;;; ********************************************************************** ;;; @@ -78,7 +78,7 @@ -(proclaim '(special *character-attributes*)) +(declaim (special *character-attributes*)) ;;; %init-line-image -- Internal ;;; diff --git a/hemlock/lispbuf.lisp b/hemlock/lispbuf.lisp index 87c9a1d04e938f6d486807b5a0e53d919e60080e..c5b7092d556a0f9e213c5ef0ab69ad639893aeb1 100644 --- a/hemlock/lispbuf.lisp +++ b/hemlock/lispbuf.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/lispbuf.lisp,v 1.3 1994/10/31 04:50:12 ram Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/lispbuf.lisp,v 1.4 2001/03/13 15:49:54 pw Rel $") ;;; ;;; ********************************************************************** ;;; @@ -48,7 +48,7 @@ ;;;; Eval Mode Interaction. -(proclaim '(special * ** *** - + ++ +++ / // /// *prompt*)) +(declaim (special * ** *** - + ++ +++ / // /// *prompt*)) (defun setup-eval-mode (buffer) (let ((point (buffer-point buffer))) diff --git a/hemlock/lispmode.lisp b/hemlock/lispmode.lisp index e89538b28b90bbd3b2882e9c7caf44be24575b11..b6ad9c64240a600c680a1fd184afb3ac2283ab2e 100644 --- a/hemlock/lispmode.lisp +++ b/hemlock/lispmode.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/lispmode.lisp,v 1.9 1998/09/05 23:21:17 dtc Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/lispmode.lisp,v 1.10 2001/03/13 15:49:55 pw Exp $") ;;; ;;; ********************************************************************** ;;; @@ -847,6 +847,7 @@ (defindent "compiler-let" 1) (defindent "ctypecase" 1) (defindent "defconstant" 1) +(defindent "define-compiler-macro" 2) (defindent "define-setf-method" 2) (defindent "destructuring-bind" 2) (defindent "defmacro" 2) diff --git a/hemlock/macros.lisp b/hemlock/macros.lisp index daa2f06cdbcb299b83a3f83a064f2e08012051b0..7d685ab09727b07c24bbcf73f6e4e16c4d9b38d1 100644 --- a/hemlock/macros.lisp +++ b/hemlock/macros.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/macros.lisp,v 1.7 1997/02/05 18:08:03 pw Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/macros.lisp,v 1.8 2001/03/13 15:49:56 pw Exp $") ;;; ;;; ********************************************************************** ;;; @@ -557,7 +557,7 @@ (setf ,cleanup-p nil)) (when ,cleanup-p (random-typeout-cleanup ,stream)))))) -(proclaim '(special *random-typeout-ml-fields* *buffer-names*)) +(declaim (special *random-typeout-ml-fields* *buffer-names*)) (defvar *random-typeout-buffers* () "A list of random-typeout buffers.") @@ -607,7 +607,7 @@ ;;;; Error handling stuff. -(proclaim '(special *echo-area-stream*)) +(declaim (special *echo-area-stream*)) ;;; LISP-ERROR-ERROR-HANDLER is in Macros.Lisp instead of Rompsite.Lisp because ;;; it uses WITH-POP-UP-DISPLAY, and Macros is compiled after Rompsite. It diff --git a/hemlock/main.lisp b/hemlock/main.lisp index 2ba3a3db407322e97b0a1d06c15d42e1dc84dafe..c9b915c0ee79523f60787c858bcf5dfccaf4d2f9 100644 --- a/hemlock/main.lisp +++ b/hemlock/main.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/main.lisp,v 1.14 1994/10/31 04:50:12 ram Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/main.lisp,v 1.15 2001/03/13 15:49:56 pw Exp $") ;;; ;;; ********************************************************************** ;;; @@ -94,7 +94,7 @@ ;;; beside the other modeline variables. This DEFVAR would live in ;;; Morecoms.Lisp, but it is compiled and loaded after this file. ;;; -(proclaim '(special ed::*recursive-edit-count*)) +(declaim (special ed::*recursive-edit-count*)) ;;; (make-modeline-field :name :edit-level :width 15 @@ -109,7 +109,7 @@ ;;; beside the other modeline variables. This DEFVAR would live in ;;; Completion.Lisp, but it is compiled and loaded after this file. ;;; -(proclaim '(special ed::*completion-mode-possibility*)) +(declaim (special ed::*completion-mode-possibility*)) ;;; Hack for now until completion mode is added. (defvar ed::*completion-mode-possibility* "") ;;; diff --git a/hemlock/netnews.lisp b/hemlock/netnews.lisp index 2d3f5f3226aa54cc558d5a6b256523ddce4d2247..9201df1e1bb2b2ddc02049670c71a9f1ed46fcb2 100644 --- a/hemlock/netnews.lisp +++ b/hemlock/netnews.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/netnews.lisp,v 1.14 1994/10/31 04:50:12 ram Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/netnews.lisp,v 1.15 2001/03/13 15:49:56 pw Rel $") ;;; ;;; ********************************************************************** ;;; @@ -818,7 +818,7 @@ (setf (nn-info-last-batch-p nn-info) last-batch-p) (setf (nn-info-from-end-p nn-info) nil))) -(proclaim '(special *nn-last-command-issued*)) +(declaim (special *nn-last-command-issued*)) (defun nn-send-many-head-requests (stream first last out-of-order-p) (do ((i first (1+ i))) diff --git a/hemlock/pop-up-stream.lisp b/hemlock/pop-up-stream.lisp index 9bb5d8ec4585af1c9b7b1d287e0e4ce9d11feed6..9d1a2d7a88a0c3e9ce8a901e5c852985f18d652c 100644 --- a/hemlock/pop-up-stream.lisp +++ b/hemlock/pop-up-stream.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/pop-up-stream.lisp,v 1.3 1994/10/31 04:50:12 ram Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/pop-up-stream.lisp,v 1.4 2001/03/13 15:49:57 pw Rel $") ;;; ;;; ********************************************************************** ;;; @@ -211,7 +211,7 @@ ;;; Proclaim this special so the compiler doesn't warn me. I hate that. ;;; -(proclaim '(special *more-prompt-action*)) +(declaim (special *more-prompt-action*)) (defun display-more-prompt (stream) (unless (random-typeout-stream-no-prompt stream) diff --git a/hemlock/rompsite.lisp b/hemlock/rompsite.lisp index 5385dab31300d727a4dc22f965fbf0f78261bbfd..088d5b18068cc3cf0cba27a6403f1ef611ee2553 100644 --- a/hemlock/rompsite.lisp +++ b/hemlock/rompsite.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/rompsite.lisp,v 1.12 1998/06/16 06:58:57 dtc Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/rompsite.lisp,v 1.13 2001/03/13 15:49:57 pw Exp $") ;;; ;;; ********************************************************************** ;;; @@ -66,7 +66,7 @@ ;;; *key-event-history* is defined in input.lisp, but it needs to be set in ;;; SITE-INIT, since MAKE-RING doesn't exist at load time for this file. ;;; -(proclaim '(special *key-event-history*)) +(declaim (special *key-event-history*)) ;;; SITE-INIT -- Internal ;;; @@ -219,15 +219,15 @@ #+clx -(proclaim '(special ed::*open-paren-highlight-font* - ed::*active-region-highlight-font*)) +(declaim (special ed::*open-paren-highlight-font* + ed::*active-region-highlight-font*)) #+clx (defparameter lisp-fonts-pathnames '("library:fonts/")) -(proclaim '(special *editor-input* *real-editor-input*)) +(declaim (special *editor-input* *real-editor-input*)) -(proclaim '(special *editor-input* *real-editor-input*)) +(declaim (special *editor-input* *real-editor-input*)) ;;; INIT-RAW-IO -- Internal ;;; @@ -255,8 +255,8 @@ ;;; Stop flaming from compiler due to CLX macros expanding into illegal ;;; declarations. ;;; -(proclaim '(declaration values)) -(proclaim '(special *default-font-family*)) +(declaim (declaration values)) +(declaim (special *default-font-family*)) ;;; font-map-size should be defined in font.lisp, but SETUP-FONT-FAMILY would ;;; assume it to be special, issuing a nasty warning. @@ -332,7 +332,7 @@ (when (variable-value 'ed::bell-style) (unix:unix-write 1 *editor-bell* 0 1))) -(proclaim '(special *current-window*)) +(declaim (special *current-window*)) ;;; BITMAP-BEEP is used in Hemlock for beeping when running under windowed ;;; input. @@ -361,7 +361,7 @@ )))) #+clx -(proclaim '(special *foreground-background-xor*)) +(declaim (special *foreground-background-xor*)) #+clx (defun flash-window-border (window) @@ -488,7 +488,7 @@ (defun standard-device-exit () (reset-input)) -(proclaim '(special *echo-area-window*)) +(declaim (special *echo-area-window*)) ;;; Maybe bury/unbury hemlock window when we go to and from Lisp. ;;; This should do something more sophisticated when we know what that is. @@ -776,7 +776,7 @@ ;;; #+clx -(proclaim '(special *default-foreground-pixel* *default-background-pixel*)) +(declaim (special *default-foreground-pixel* *default-background-pixel*)) #+clx (defvar *hemlock-cursor* nil "Holds cursor for Hemlock windows.") diff --git a/hemlock/screen.lisp b/hemlock/screen.lisp index 7d760d9bc6b7ae967e897cf036a154cfb6fd1153..6b5972a0e7482786a633246717593e40a972129f 100644 --- a/hemlock/screen.lisp +++ b/hemlock/screen.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/screen.lisp,v 1.4 1994/10/31 04:50:12 ram Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/screen.lisp,v 1.5 2001/03/13 15:49:59 pw Rel $") ;;; ;;; ********************************************************************** ;;; @@ -22,7 +22,7 @@ ;;;; Screen management initialization. -(proclaim '(special *echo-area-buffer*)) +(declaim (special *echo-area-buffer*)) ;;; %INIT-SCREEN-MANAGER creates the initial windows and sets up the data ;;; structures used by the screen manager. The "Main" and "Echo Area" buffer diff --git a/hemlock/search2.lisp b/hemlock/search2.lisp index 4a0a639cfeaa1ee2c11b158e0c4dc300176a9ee3..53ed55b60accfa8c4729f5826141654d85ab4635 100644 --- a/hemlock/search2.lisp +++ b/hemlock/search2.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/search2.lisp,v 1.3 1994/10/31 04:50:12 ram Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/search2.lisp,v 1.4 2001/03/13 15:49:59 pw Rel $") ;;; ;;; ********************************************************************** ;;; @@ -98,7 +98,7 @@ ;;; ;;; Modify the character-set Set to succeed for Character. ;;; -(proclaim '(inline add-character-to-set)) +(declaim (inline add-character-to-set)) (defun add-character-to-set (character set) (setf (aref (the (simple-array (mod 256)) set) (search-char-code character)) diff --git a/hemlock/syntax.lisp b/hemlock/syntax.lisp index 137bd4862f72916bce302564dbf95286fa6256f4..7cd3994c985af3b51fddad08c5c55a7da553aa6d 100644 --- a/hemlock/syntax.lisp +++ b/hemlock/syntax.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/syntax.lisp,v 1.3 1994/10/31 04:50:12 ram Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/syntax.lisp,v 1.4 2001/03/13 15:49:59 pw Rel $") ;;; ;;; ********************************************************************** ;;; @@ -70,7 +70,7 @@ (defvar *value-of-last-character-attribute-requested* nil "The value of the most recent character attribute, Do Not Bind.") -(proclaim '(special *character-attribute-names*)) +(declaim (special *character-attribute-names*)) ;;; Each bucket contains a list of character-attribute-bucket-size @@ -251,14 +251,14 @@ (with-attribute attribute (setf (attribute-descriptor-hooks obj) new-value))) -(proclaim '(special *last-character-attribute-requested* +(declaim (special *last-character-attribute-requested* *value-of-last-character-attribute-requested*)) ;;; CHARACTER-ATTRIBUTE -- Public ;;; ;;; Return the value of a character attribute for some character. ;;; -(proclaim '(inline character-attribute)) +(declaim (inline character-attribute)) (defun character-attribute (attribute character) "Return the value of the the character-attribute Attribute for Character. If Character is Nil then return the end-value." @@ -368,7 +368,7 @@ -(proclaim '(special *mode-names* *current-buffer*)) +(declaim (special *mode-names* *current-buffer*)) ;;; SHADOW-ATTRIBUTE -- Public ;;; diff --git a/hemlock/table.lisp b/hemlock/table.lisp index 45920dd6eed62c6d1309ebf9478b1f18894ccdee..bea8f6eddc692a9e781e2f17424b83ee75815929 100644 --- a/hemlock/table.lisp +++ b/hemlock/table.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/table.lisp,v 1.3 1994/10/31 04:50:12 ram Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/table.lisp,v 1.4 2001/03/13 15:50:00 pw Exp $") ;;; ;;; ********************************************************************** ;;; @@ -237,7 +237,7 @@ (defvar *string-buffer-size* 128) (defvar *string-buffer* (make-string *string-buffer-size*)) -(proclaim '(simple-string *string-buffer*)) +(declaim (simple-string *string-buffer*)) (defvar *separator-positions* nil) @@ -528,7 +528,7 @@ (defvar *complete-string-buffer-size* 128) (defvar *complete-string-buffer* (make-string *complete-string-buffer-size*)) -(proclaim '(simple-string *complete-string-buffer*)) +(declaim (simple-string *complete-string-buffer*)) (defun complete-string (string tables) "Attempts to complete the string String against the string tables in the diff --git a/hemlock/termcap.lisp b/hemlock/termcap.lisp index acaec0412699c4bc2f0a32d0a5edea3303d606c4..48c6497b6ae7be94e4170611e2dbd625002ea354 100644 --- a/hemlock/termcap.lisp +++ b/hemlock/termcap.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/termcap.lisp,v 1.9 1999/04/11 13:05:26 dtc Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/termcap.lisp,v 1.10 2001/03/13 15:50:00 pw Rel $") ;;; ;;; ********************************************************************** ;;; @@ -44,7 +44,7 @@ (parse-fields s) (error "Unknown Terminal ~S in file ~S." name termcap-file)))))) -(proclaim '(inline termcap)) +(declaim (inline termcap)) (defun termcap (name termcap) (cdr (assoc name termcap :test #'eq))) diff --git a/hemlock/tty-disp-rt.lisp b/hemlock/tty-disp-rt.lisp index 5d07029181ace12a23c2b9d07db6557f54806425..cb9a4bef11b5172f935db9e26eb9158b95ad891e 100644 --- a/hemlock/tty-disp-rt.lisp +++ b/hemlock/tty-disp-rt.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/tty-disp-rt.lisp,v 1.5 1998/10/04 08:28:33 dtc Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/tty-disp-rt.lisp,v 1.6 2001/03/13 15:50:00 pw Exp $") ;;; ;;; ********************************************************************** ;;; @@ -97,10 +97,10 @@ (defvar *redisplay-output-buffer* (make-string redisplay-output-buffer-length)) -(proclaim '(simple-string *redisplay-output-buffer*)) +(declaim (simple-string *redisplay-output-buffer*)) (defvar *redisplay-output-buffer-index* 0) -(proclaim '(fixnum *redisplay-output-buffer-index*)) +(declaim (fixnum *redisplay-output-buffer-index*)) ;;; WRITE-AND-MAYBE-WAIT -- Internal ;;; diff --git a/hemlock/tty-display.lisp b/hemlock/tty-display.lisp index 35860e181cf5991a464a285910f729e1b3573375..f33ca9f01b7231faf59d79ce946e7949051021a8 100644 --- a/hemlock/tty-display.lisp +++ b/hemlock/tty-display.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/tty-display.lisp,v 1.4 1994/10/31 04:50:12 ram Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/tty-display.lisp,v 1.5 2001/03/13 15:50:00 pw Exp $") ;;; ;;; ********************************************************************** ;;; @@ -29,7 +29,7 @@ (defvar *currently-selected-hunk* nil) (defvar *hunk-top-line*) -(proclaim '(fixnum *hunk-top-line*)) +(declaim (fixnum *hunk-top-line*)) (eval-when (compile eval) (defmacro select-hunk (hunk) diff --git a/hemlock/tty-screen.lisp b/hemlock/tty-screen.lisp index 83109cae2d485e2d13ff42ec331177375de096ae..58991503d9da81e1228f8c6da2563e2e7d915943 100644 --- a/hemlock/tty-screen.lisp +++ b/hemlock/tty-screen.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/tty-screen.lisp,v 1.8 1994/10/31 04:50:12 ram Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/tty-screen.lisp,v 1.9 2001/03/13 15:50:01 pw Rel $") ;;; ;;; ********************************************************************** ;;; @@ -22,7 +22,7 @@ ;;;; Terminal screen initialization -(proclaim '(special *parse-starting-mark*)) +(declaim (special *parse-starting-mark*)) (defun init-tty-screen-manager (tty-name) (setf *line-wrap-char* #\!) diff --git a/hemlock/vars.lisp b/hemlock/vars.lisp index 4550a81f9f072b77a98f3008208c69e3debc39e4..743f12669edba625400e815a3a9756339ee9b171 100644 --- a/hemlock/vars.lisp +++ b/hemlock/vars.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/vars.lisp,v 1.3 1994/10/31 04:50:12 ram Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/vars.lisp,v 1.4 2001/03/13 15:50:01 pw Rel $") ;;; ;;; ********************************************************************** ;;; @@ -194,7 +194,7 @@ (intern (nsubstitute #\- #\space (the simple-string (string-upcase string))) (find-package "HEMLOCK"))) -(proclaim '(special *global-variable-names*)) +(declaim (special *global-variable-names*)) ;;; DEFHVAR -- Public ;;; diff --git a/hemlock/window.lisp b/hemlock/window.lisp index deb4f27dba8658ff22bb2567377f954de94d2ca3..390ab26da516c8f839586426824ceb1d22c189f1 100644 --- a/hemlock/window.lisp +++ b/hemlock/window.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/window.lisp,v 1.4 1994/10/31 04:50:12 ram Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/hemlock/window.lisp,v 1.5 2001/03/13 15:50:01 pw Rel $") ;;; ;;; ********************************************************************** ;;; @@ -30,7 +30,7 @@ (defvar *current-window* nil "The current window object.") (defvar *window-list* () "A list of all window objects.") -(proclaim '(inline current-window)) +(declaim (inline current-window)) (defun current-window () "Return the current window. The current window is specially treated by @@ -151,8 +151,8 @@ (gethash name *modeline-field-names*)) -(proclaim '(inline modeline-field-name modeline-field-width - modeline-field-function)) +(declaim (inline modeline-field-name modeline-field-width + modeline-field-function)) (defun modeline-field-name (ml-field) "Returns the name of a modeline field object." @@ -171,7 +171,7 @@ "Returns the width of a modeline field." (modeline-field-%width ml-field)) -(proclaim '(special *buffer-list*)) +(declaim (special *buffer-list*)) (defun %set-modeline-field-width (ml-field width) (check-type ml-field modeline-field) diff --git a/pcl/boot.lisp b/pcl/boot.lisp index 6458db542dbe02de311fbafc89ac138cbb148b2d..32f46480f5065e9545d50c093ad51ed143e52463 100644 --- a/pcl/boot.lisp +++ b/pcl/boot.lisp @@ -26,7 +26,7 @@ ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/boot.lisp,v 1.23 2000/12/19 14:26:29 pw Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/boot.lisp,v 1.24 2001/03/13 15:49:46 pw Exp $") (in-package :pcl) @@ -74,13 +74,12 @@ work during bootstrapping. |# -(proclaim '(notinline make-a-method - add-named-method - ensure-generic-function-using-class - - add-method - remove-method - )) +(declaim (notinline make-a-method + add-named-method + ensure-generic-function-using-class + add-method + remove-method + )) (defvar *early-functions* '((make-a-method early-make-a-method diff --git a/pcl/defclass.lisp b/pcl/defclass.lisp index 6acc74e8a74531f54936a8d4fcbedb7daf54a250..a72088b2c2d6dada021bd2c84255243fc042f810 100644 --- a/pcl/defclass.lisp +++ b/pcl/defclass.lisp @@ -26,7 +26,7 @@ ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/defclass.lisp,v 1.18 2000/08/03 16:58:56 pw Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/defclass.lisp,v 1.19 2001/03/13 15:49:47 pw Exp $") ;;; (in-package :pcl) @@ -396,7 +396,7 @@ (defun early-class-direct-subclasses (class) (bootstrap-get-slot 'class class 'direct-subclasses)) -(proclaim '(notinline load-defclass)) +(declaim (notinline load-defclass)) (defun load-defclass (name metaclass supers canonical-slots canonical-options) (setq supers (copy-tree supers) canonical-slots (copy-tree canonical-slots) diff --git a/pcl/defs.lisp b/pcl/defs.lisp index 8d510a430e870d88a624df122fcc0a706453a0ec..e738353b8c4e5fa48f1f26441d65ef4a1576e1e9 100644 --- a/pcl/defs.lisp +++ b/pcl/defs.lisp @@ -76,49 +76,49 @@ (c::note-name-defined name :function) new-definition) -(proclaim '(special *the-class-t* - *the-class-vector* *the-class-symbol* - *the-class-string* *the-class-sequence* - *the-class-rational* *the-class-ratio* - *the-class-number* *the-class-null* *the-class-list* - *the-class-integer* *the-class-float* *the-class-cons* - *the-class-complex* *the-class-character* - *the-class-bit-vector* *the-class-array* - *the-class-stream* - - *the-class-slot-object* - *the-class-structure-object* - *the-class-std-object* - *the-class-standard-object* - *the-class-funcallable-standard-object* - *the-class-class* - *the-class-generic-function* - *the-class-built-in-class* - *the-class-slot-class* - *the-class-structure-class* - *the-class-std-class* - *the-class-standard-class* - *the-class-funcallable-standard-class* - *the-class-method* - *the-class-standard-method* - *the-class-standard-reader-method* - *the-class-standard-writer-method* - *the-class-standard-boundp-method* - *the-class-standard-generic-function* - *the-class-standard-effective-slot-definition* - - *the-eslotd-standard-class-slots* - *the-eslotd-funcallable-standard-class-slots*)) - -(proclaim '(special *the-wrapper-of-t* - *the-wrapper-of-vector* *the-wrapper-of-symbol* - *the-wrapper-of-string* *the-wrapper-of-sequence* - *the-wrapper-of-rational* *the-wrapper-of-ratio* - *the-wrapper-of-number* *the-wrapper-of-null* - *the-wrapper-of-list* *the-wrapper-of-integer* - *the-wrapper-of-float* *the-wrapper-of-cons* - *the-wrapper-of-complex* *the-wrapper-of-character* - *the-wrapper-of-bit-vector* *the-wrapper-of-array*)) +(declaim (special *the-class-t* + *the-class-vector* *the-class-symbol* + *the-class-string* *the-class-sequence* + *the-class-rational* *the-class-ratio* + *the-class-number* *the-class-null* *the-class-list* + *the-class-integer* *the-class-float* *the-class-cons* + *the-class-complex* *the-class-character* + *the-class-bit-vector* *the-class-array* + *the-class-stream* + + *the-class-slot-object* + *the-class-structure-object* + *the-class-std-object* + *the-class-standard-object* + *the-class-funcallable-standard-object* + *the-class-class* + *the-class-generic-function* + *the-class-built-in-class* + *the-class-slot-class* + *the-class-structure-class* + *the-class-std-class* + *the-class-standard-class* + *the-class-funcallable-standard-class* + *the-class-method* + *the-class-standard-method* + *the-class-standard-reader-method* + *the-class-standard-writer-method* + *the-class-standard-boundp-method* + *the-class-standard-generic-function* + *the-class-standard-effective-slot-definition* + + *the-eslotd-standard-class-slots* + *the-eslotd-funcallable-standard-class-slots*)) + +(declaim (special *the-wrapper-of-t* + *the-wrapper-of-vector* *the-wrapper-of-symbol* + *the-wrapper-of-string* *the-wrapper-of-sequence* + *the-wrapper-of-rational* *the-wrapper-of-ratio* + *the-wrapper-of-number* *the-wrapper-of-null* + *the-wrapper-of-list* *the-wrapper-of-integer* + *the-wrapper-of-float* *the-wrapper-of-cons* + *the-wrapper-of-complex* *the-wrapper-of-character* + *the-wrapper-of-bit-vector* *the-wrapper-of-array*)) ;;;; Type specifier hackery: diff --git a/pcl/fin.lisp b/pcl/fin.lisp index 6b08189a6ad6a09c32cc65962dd2bff6674b49b2..26a2761906b77fd622dad7923b86053360de75b1 100644 --- a/pcl/fin.lisp +++ b/pcl/fin.lisp @@ -26,7 +26,7 @@ ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/fin.lisp,v 1.13 1999/05/30 23:13:59 pw Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/fin.lisp,v 1.14 2001/03/13 15:49:47 pw Exp $") ;;; ;; @@ -127,7 +127,7 @@ explicitly marked saying who wrote it. `(error "Unknown funcallable-instance data: ~S." ',(cadr data)))) `(position ,data funcallable-instance-data :test #'eq))) -(proclaim '(notinline called-fin-without-function)) +(declaim (notinline called-fin-without-function)) (defun called-fin-without-function (&rest args) (declare (ignore args)) (error "Attempt to funcall a funcallable-instance without first~%~ diff --git a/pcl/lap.lisp b/pcl/lap.lisp index a9f80e503aa1da94585aa10059de012797b8d58f..eaaeeba084ee15828c062764ff1094892d2caf15 100644 --- a/pcl/lap.lisp +++ b/pcl/lap.lisp @@ -26,7 +26,7 @@ ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/Attic/lap.lisp,v 1.8 1999/05/30 23:14:01 pw Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/Attic/lap.lisp,v 1.9 2001/03/13 15:49:48 pw Exp $") ;;; (in-package 'pcl) @@ -81,7 +81,7 @@ ;;; OPCODE ;;; OPERAND ;;; -(proclaim '(special *generating-lap*)) ;CAR - alist of free registers +(declaim '(special *generating-lap*)) ;CAR - alist of free registers ;CADR - alist of allocated registers ;CADDR - max reg number allocated ; @@ -383,7 +383,7 @@ (compile 'make-lap-test-closure-1) (compile 'make-lap-test-closure-2)) -(proclaim '(special lap-win lap-lose)) +(declaim (special lap-win lap-lose)) (eval-when (load eval) (setq lap-win (make-lap-test-closure-1 'win) lap-lose (make-lap-test-closure-1 'lose))) diff --git a/pcl/macros.lisp b/pcl/macros.lisp index 63e8f509fcda57536abf070abaf32e478f4d8d0b..a09b40a8b46bb64bdd465dea439158a35bc745fc 100644 --- a/pcl/macros.lisp +++ b/pcl/macros.lisp @@ -26,7 +26,7 @@ ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/macros.lisp,v 1.14 1999/05/30 23:14:03 pw Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/macros.lisp,v 1.15 2001/03/13 15:49:48 pw Exp $") ;;; ;;; Macros global variable definitions, and other random support stuff used ;;; by the rest of the system. @@ -37,22 +37,22 @@ (in-package :pcl) -(proclaim '(declaration - values ;;I use this so that Zwei can remind - ;;me what values a function returns. +(declaim (declaration + values ;;I use this so that Zwei can remind + ;;me what values a function returns. - arglist ;;Tells me what the pretty arglist - ;;of something (which probably takes - ;;&rest args) is. - - indentation ;;Tells ZWEI how to indent things - ;;like defclass. - class - variable-rebinding - pcl-fast-call - method-name - method-lambda-list - )) + arglist ;;Tells me what the pretty arglist + ;;of something (which probably takes + ;;&rest args) is. + + indentation ;;Tells ZWEI how to indent things + ;;like defclass. + class + variable-rebinding + pcl-fast-call + method-name + method-lambda-list + )) ;;; Age old functions which CommonLisp cleaned-up away. They probably exist ;;; in other packages in all CommonLisp implementations, but I will leave it diff --git a/pcl/methods.lisp b/pcl/methods.lisp index 63ca9ebd5a18017bcc8e1fdfe628a234000cc9b1..fb2e0f6d019053d3f44af2156c7488f2f1cdc635 100644 --- a/pcl/methods.lisp +++ b/pcl/methods.lisp @@ -26,7 +26,7 @@ ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/methods.lisp,v 1.13 1999/05/30 23:14:03 pw Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/methods.lisp,v 1.14 2001/03/13 15:49:48 pw Exp $") ;;; (in-package :pcl) @@ -592,7 +592,7 @@ ;;; ;;; -(proclaim '(special *lazy-dfun-compute-p*)) +(declaim (special *lazy-dfun-compute-p*)) (defun set-methods (gf methods) (setf (generic-function-methods gf) nil) diff --git a/pcl/plap.lisp b/pcl/plap.lisp index bddcbd184f60d1f5c76023a3ba5c019153df24d0..3b670ea38d48e56c2646c09b94d4f6d2e7404c61 100644 --- a/pcl/plap.lisp +++ b/pcl/plap.lisp @@ -26,7 +26,7 @@ ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/Attic/plap.lisp,v 1.9 1999/05/30 23:14:06 pw Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/Attic/plap.lisp,v 1.10 2001/03/13 15:49:49 pw Exp $") ;;; (in-package 'pcl) @@ -245,7 +245,7 @@ ;;; one or more of these to get the compiler to produce better code. That ;;; is why they are split out. ;;; -(proclaim '(declaration pcl-fast-call)) +(declaim (declaration pcl-fast-call)) (defmacro RUNTIME\ FUNCALL (fn &rest args) `(funcall (the function ,fn) ,.args)) diff --git a/pcl/time.lisp b/pcl/time.lisp index 06aefc4ca4403aebce4918af0168b395b76503c8..2b5d9cbfe734153e8bab2c2d47dd2eae98c35c7b 100644 --- a/pcl/time.lisp +++ b/pcl/time.lisp @@ -1,6 +1,6 @@ (in-package "PCL") -(proclaim '(optimize (speed 3)(safety 0)(compilation-speed 0))) +(declaim (optimize (speed 3)(safety 0)(compilation-speed 0))) (defvar *tests*) (setq *tests* nil)