From d5393dd736972a5c84cd97fec9892cd3da80b669 Mon Sep 17 00:00:00 2001 From: Christophe Rhodes Date: Thu, 3 Jul 2003 11:22:20 +0000 Subject: [PATCH] 0.8.1.20: Really inline math (sic) routines ... we need the proclamation to take effect at compile-time, so change PROCLAIM to DECLAIM ... fix up the two other instances of PROCLAIMs being used where DECLAIM should have been --- src/code/defstruct.lisp | 2 +- src/code/irrat.lisp | 2 +- src/compiler/debug.lisp | 4 ++-- version.lisp-expr | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/code/defstruct.lisp b/src/code/defstruct.lisp index 4b0f84d..177d9c4 100644 --- a/src/code/defstruct.lisp +++ b/src/code/defstruct.lisp @@ -455,7 +455,7 @@ (let ((inherited (accessor-inherited-data name defstruct))) (cond ((not inherited) - (stuff `(proclaim '(inline ,name (setf ,name)))) + (stuff `(declaim (inline ,name (setf ,name)))) ;; FIXME: The arguments in the next two DEFUNs should ;; be gensyms. (Otherwise e.g. if NEW-VALUE happened to ;; be the name of a special variable, things could get diff --git a/src/code/irrat.lisp b/src/code/irrat.lisp index 68e5d9f..771795a 100644 --- a/src/code/irrat.lisp +++ b/src/code/irrat.lisp @@ -25,7 +25,7 @@ (sb!xc:defmacro def-math-rtn (name num-args) (let ((function (symbolicate "%" (string-upcase name)))) `(progn - (proclaim '(inline ,function)) + (declaim (inline ,function)) (sb!alien:define-alien-routine (,name ,function) double-float ,@(let ((results nil)) (dotimes (i num-args (nreverse results)) diff --git a/src/compiler/debug.lisp b/src/compiler/debug.lisp index cd549cc..b29ac89 100644 --- a/src/compiler/debug.lisp +++ b/src/compiler/debug.lisp @@ -894,11 +894,11 @@ ;;; keep garbage from being collected. (macrolet ((def (counter vto vfrom fto ffrom) `(progn + (declaim (type hash-table ,vto ,vfrom)) (defvar ,vto (make-hash-table :test 'eq)) (defvar ,vfrom (make-hash-table :test 'eql)) - (proclaim '(hash-table ,vto ,vfrom)) + (declaim (type fixnum ,counter)) (defvar ,counter 0) - (proclaim '(fixnum ,counter)) (defun ,fto (x) (or (gethash x ,vto) diff --git a/version.lisp-expr b/version.lisp-expr index 470941a..f9bf478 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.8.1.19" +"0.8.1.20" -- 1.7.10.4