[Openmcl-cvs-notifications] r11958 - in /trunk/source: compiler/ compiler/X86/ level-0/ level-1/ lib/
gz at clozure.com
gz at clozure.com
Sun Apr 19 12:09:29 EDT 2009
Author: gz
Date: Sun Apr 19 12:09:28 2009
New Revision: 11958
Log:
Fix a bunch of malformed/mistyped declarations
Modified:
trunk/source/compiler/X86/x862.lisp
trunk/source/compiler/backend.lisp
trunk/source/level-0/l0-bignum64.lisp
trunk/source/level-0/l0-hash.lisp
trunk/source/level-1/l1-aprims.lisp
trunk/source/level-1/l1-lisp-threads.lisp
trunk/source/level-1/l1-streams.lisp
trunk/source/level-1/l1-unicode.lisp
trunk/source/lib/chars.lisp
trunk/source/lib/method-combination.lisp
Modified: trunk/source/compiler/X86/x862.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/compiler/X86/x862.lisp (original)
+++ trunk/source/compiler/X86/x862.lisp Sun Apr 19 12:09:28 2009
@@ -5810,7 +5810,7 @@
(head (make-list (length operands)))
(tail head))
(declare (dynamic-extent head)
- (cons (head tail)))
+ (cons head tail))
(dolist (op operands)
(rplaca tail (parse-operand-form op))
(setq tail (cdr tail)))
Modified: trunk/source/compiler/backend.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/compiler/backend.lisp (original)
+++ trunk/source/compiler/backend.lisp Sun Apr 19 12:09:28 2009
@@ -347,7 +347,7 @@
(defun regspec-class-and-value (regspec expected)
(declare (fixnum expected))
(let* ((class (hard-regspec-class regspec)))
- (declare (type (unsigned-byte 8 class)))
+ (declare (type (unsigned-byte 8) class))
(if (logbitp class expected)
(values class (if (typep regspec 'lreg)
regspec
Modified: trunk/source/level-0/l0-bignum64.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/level-0/l0-bignum64.lisp (original)
+++ trunk/source/level-0/l0-bignum64.lisp Sun Apr 19 12:09:28 2009
@@ -221,8 +221,8 @@
(sign-b (%bignum-sign b)))
(dotimes (i len-b)
(let* ((sum (+
- (the fixnum (+ (the digit-type (bignum-ref a i))
- (the digit-type (bignum-ref b i))))
+ (the fixnum (+ (the bignum-element-type (bignum-ref=
a i))
+ (the bignum-element-type (bignum-ref=
b i))))
carry)))
(declare (fixnum sum))
(setf (bignum-ref res i) sum)
@@ -231,7 +231,7 @@
(finish-bignum-add res carry a sign-b len-b len-a)
(setf (bignum-ref res len-a)
(+ (the fixnum carry)
- (the fixnum (+ (the digit-type (%bignum-sign a))
+ (the fixnum (+ (the bignum-element-type (%bignum-sign a=
))
sign-b)))))
(%normalize-bignum-macro res))))
=
@@ -246,20 +246,20 @@
(high (logand all-ones-digit (the fixnum (ash fixnum -32)))))
(declare (bignum-index len-bignum)
(bignum-type res)
- (digit-type low high))
- (let* ((sum0 (+ (the digit-type (bignum-ref bignum 0)) low))
- (sum1 (+ (the fixnum (+ (the digit-type (bignum-ref bignum 1))
+ (bignum-element-type low high))
+ (let* ((sum0 (+ (the bignum-element-type (bignum-ref bignum 0)) low))
+ (sum1 (+ (the fixnum (+ (the bignum-element-type (bignum-ref bi=
gnum 1))
high))
(the fixnum (logand 1 (ash sum0 -32)))))
(carry (logand 1 (ash sum1 -32))))
- (declare (fixnum sum0 sum1) (digit-type carry))
+ (declare (fixnum sum0 sum1) (bignum-element-type carry))
(setf (bignum-ref res 0) sum0
(bignum-ref res 1) sum1)
(if (> len-bignum 2)
(finish-bignum-add res carry bignum (ash fixnum (- (- target::nbi=
ts-in-word target::fixnumshift))) 2 len-bignum)
(setf (bignum-ref res 2)
(+ (the fixnum carry)
- (the fixnum (+ (the digit-type (%bignum-sign bignum))
+ (the fixnum (+ (the bignum-element-type (%bignum-sign big=
num))
(the fixnum (ash fixnum (- (- target::nbit=
s-in-word target::fixnumshift)))))))))
(%normalize-bignum-macro res))))
=
@@ -271,7 +271,7 @@
;;; digit of A, propagating the carry.
(defun finish-bignum-add (result carry a sign-b start end)
(declare (type bignum-index start end)
- (digit-type sign-b carry)
+ (bignum-element-type sign-b carry)
(optimize (speed 3) (safety 0)))
(do* ((i start (1+ i))
(sign-b (logand all-ones-digit sign-b)))
@@ -284,7 +284,7 @@
(%sign-digit a end))=
))
sign-b))
carry))))
- (declare (fixnum i) (digit-type sign-b))
+ (declare (fixnum i) (bignum-element-type sign-b))
(let* ((sum (the fixnum (+ (the fixnum (+ (bignum-ref a i)
sign-b))
carry))))
@@ -313,7 +313,7 @@
(let* ((borrow 1)
(sign-a (%bignum-sign a))
(sign-b (%bignum-sign b)))
- (declare (digit-type borrow sign-a sign-b))
+ (declare (bignum-element-type borrow sign-a sign-b))
(dotimes (i (the bignum-index len-res))
(multiple-value-bind (result-digit borrow-out)
(%subtract-with-borrow
Modified: trunk/source/level-0/l0-hash.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/level-0/l0-hash.lisp (original)
+++ trunk/source/level-0/l0-hash.lisp Sun Apr 19 12:09:28 2009
@@ -178,7 +178,7 @@
(or (car cell)
(let* ((pname (%svref vector target::symbol.pname-cell))
(hash (mixup-hash-code (%pname-hash pname (uvsize pname))=
)))
- (declare (type (simple-string pname)))
+ (declare (type simple-string pname))
(if cell
(setf (car cell) hash)
(progn
Modified: trunk/source/level-1/l1-aprims.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/level-1/l1-aprims.lisp (original)
+++ trunk/source/level-1/l1-aprims.lisp Sun Apr 19 12:09:28 2009
@@ -3496,7 +3496,7 @@
argument is an alphabetic character; otherwise NIL."
(let* ((code (char-code c))
(bits *alpha-char-bits*))
- (declare (type (mod #x110000 code))
+ (declare (type (mod #x110000) code)
(simple-bit-vector bits))
(and (< code (length bits))
(not (eql 0 (sbit bits code))))))
Modified: trunk/source/level-1/l1-lisp-threads.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/level-1/l1-lisp-threads.lisp (original)
+++ trunk/source/level-1/l1-lisp-threads.lisp Sun Apr 19 12:09:28 2009
@@ -299,7 +299,7 @@
#+64-bit-target :unsigned-doubleword
#+32-bit-target :unsigned-fullword ts-size
:address))))
- (declare (fixum tcr))
+ (declare (fixnum tcr))
(if (zerop tcr)
(error "Can't create thread")
tcr)))
Modified: trunk/source/level-1/l1-streams.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/level-1/l1-streams.lisp (original)
+++ trunk/source/level-1/l1-streams.lisp Sun Apr 19 12:09:28 2009
@@ -1921,7 +1921,7 @@
=
(defun %ioblock-write-u8-encoded-simple-string (ioblock string start-char =
num-chars)
(declare (fixnum start-char num-chars)
- (simple-base-strng string)
+ (simple-base-string string)
(optimize (speed 3) (safety 0)))
(do* ((i 0 (1+ i))
(col (ioblock-charpos ioblock))
@@ -1972,7 +1972,7 @@
=
(defun %ioblock-write-u16-encoded-simple-string (ioblock string start-char=
num-chars)
(declare (fixnum start-char num-chars)
- (simple-base-strng string)
+ (simple-base-string string)
(optimize (speed 3) (safety 0)))
(when (ioblock-pending-byte-order-mark ioblock)
(setf (ioblock-pending-byte-order-mark ioblock) nil)
@@ -2021,7 +2021,7 @@
=
(defun %ioblock-write-swapped-u16-encoded-simple-string (ioblock string st=
art-char num-chars)
(declare (fixnum start-char num-chars)
- (simple-base-strng string)
+ (simple-base-string string)
(optimize (speed 3) (safety 0)))
(do* ((i 0 (1+ i))
(col (ioblock-charpos ioblock))
@@ -2054,7 +2054,7 @@
(setf (ioblock-charpos ioblock) 0)
(incf (ioblock-charpos ioblock)))
(let* ((code (char-code char)))
- (declare (type (mod #x110000 code)))
+ (declare (type (mod #x110000) code))
(if (< code (the fixnum (ioblock-encode-literal-char-code-limit iobloc=
k)))
(%ioblock-write-u32-code-unit ioblock code)
(funcall (ioblock-encode-output-function ioblock)
@@ -2074,7 +2074,7 @@
=
(defun %ioblock-write-u32-encoded-simple-string (ioblock string start-char=
num-chars)
(declare (fixnum start-char num-chars)
- (simple-base-strng string)
+ (simple-base-string string)
(optimize (speed 3) (safety 0)))
(when (ioblock-pending-byte-order-mark ioblock)
(setf (ioblock-pending-byte-order-mark ioblock) nil)
@@ -2104,7 +2104,7 @@
(setf (ioblock-charpos ioblock) 0)
(incf (ioblock-charpos ioblock)))
(let* ((code (char-code char)))
- (declare (type (mod #x110000 code)))
+ (declare (type (mod #x110000) code))
(if (< code (the fixnum (ioblock-encode-literal-char-code-limit iobloc=
k)))
(%ioblock-write-swapped-u32-code-unit ioblock code)
(funcall (ioblock-encode-output-function ioblock)
@@ -2124,7 +2124,7 @@
=
(defun %ioblock-write-swapped-u32-encoded-simple-string (ioblock string st=
art-char num-chars)
(declare (fixnum start-char num-chars)
- (simple-base-strng string)
+ (simple-base-string string)
(optimize (speed 3) (safety 0)))
(do* ((i 0 (1+ i))
(col (ioblock-charpos ioblock))
Modified: trunk/source/level-1/l1-unicode.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/level-1/l1-unicode.lisp (original)
+++ trunk/source/level-1/l1-unicode.lisp Sun Apr 19 12:09:28 2009
@@ -3828,7 +3828,7 @@
(end (+ origin noctets))
(nchars 0 (1+ nchars)))
((> j end) (values nchars (- i origin)))
- (declare (fixnum (i j end nchars)))
+ (declare (fixnum i j end nchars))
(let* ((code (%get-unsigned-word pointer i)))
(declare (type (unsigned-byte 16) code))
(if swap (setq code (%swap-u16 code)))
Modified: trunk/source/lib/chars.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/lib/chars.lisp (original)
+++ trunk/source/lib/chars.lisp Sun Apr 19 12:09:28 2009
@@ -90,7 +90,7 @@
(let* ((code (char-code c))
(to-lower *upper-to-lower*))
(declare (type (mod #x110000) code)
- (type (simple-array (signed-byte 16) *to-lower)))
+ (type (simple-array (signed-byte 16) (*)) to-lower))
(and (< code (length to-lower))
(not (zerop (aref to-lower code))))))
=
@@ -564,7 +564,7 @@
(character (setq string1 (make-string 1 :initial-element string1)
len1 1))))
(if (typep string2 'simple-string)
- (setq len2 (length (the sumple-string string2)))
+ (setq len2 (length (the simple-string string2)))
(etypecase string2
(string (setq len2 (length string2))
(multiple-value-setq (string2 disp2)
Modified: trunk/source/lib/method-combination.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/lib/method-combination.lisp (original)
+++ trunk/source/lib/method-combination.lisp Sun Apr 19 12:09:28 2009
@@ -456,7 +456,7 @@
(numopt (ldb $lfbits-numopt bits)))
(declare (fixnum bits numreq numopt))
(and (< i numopt)
- (< (the fixum (+ i numreq)) (length argvals)))))
+ (< (the fixnum (+ i numreq)) (length argvals)))))
=
;;; This assumes that we've checked for argument presence.
(defun nth-opt-gf-arg (gf argvals i)
@@ -464,7 +464,7 @@
(let* ((bits (lfun-bits gf))
(numreq (ldb $lfbits-numreq bits)))
(declare (fixnum bits numreq ))
- (nth (the fixum (+ i numreq)) argvals)))
+ (nth (the fixnum (+ i numreq)) argvals)))
=
(defun gf-arguments-tail (gf argvals)
(let* ((bits (lfun-bits gf))
More information about the Openmcl-cvs-notifications
mailing list