Changeset 11958


Ignore:
Timestamp:
Apr 19, 2009, 4:09:28 PM (11 years ago)
Author:
gz
Message:

Fix a bunch of malformed/mistyped declarations

Location:
trunk/source
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/compiler/X86/x862.lisp

    r11711 r11958  
    58115811                      (tail head))
    58125812                 (declare (dynamic-extent head)
    5813                           (cons (head tail)))
     5813                          (cons head tail))
    58145814                 (dolist (op operands)
    58155815                   (rplaca tail (parse-operand-form op))
  • trunk/source/compiler/backend.lisp

    r10958 r11958  
    348348  (declare (fixnum expected))
    349349  (let* ((class (hard-regspec-class regspec)))
    350     (declare (type (unsigned-byte 8 class)))
     350    (declare (type (unsigned-byte 8) class))
    351351    (if (logbitp class expected)
    352352      (values class (if (typep regspec 'lreg)
  • trunk/source/level-0/l0-bignum64.lisp

    r11141 r11958  
    223223        (dotimes (i len-b)
    224224          (let* ((sum (+
    225                        (the fixnum (+ (the digit-type (bignum-ref a i))
    226                                       (the digit-type (bignum-ref b i))))
     225                       (the fixnum (+ (the bignum-element-type (bignum-ref a i))
     226                                      (the bignum-element-type (bignum-ref b i))))
    227227                       carry)))
    228228            (declare (fixnum sum))
     
    233233          (setf (bignum-ref res len-a)
    234234                (+ (the fixnum carry)
    235                    (the fixnum (+ (the digit-type (%bignum-sign a))
     235                   (the fixnum (+ (the bignum-element-type (%bignum-sign a))
    236236                                  sign-b)))))
    237237        (%normalize-bignum-macro res))))
     
    248248    (declare (bignum-index len-bignum)
    249249             (bignum-type res)
    250              (digit-type low high))
    251     (let* ((sum0 (+ (the digit-type (bignum-ref bignum 0)) low))
    252            (sum1 (+ (the fixnum (+ (the digit-type (bignum-ref bignum 1))
     250             (bignum-element-type low high))
     251    (let* ((sum0 (+ (the bignum-element-type (bignum-ref bignum 0)) low))
     252           (sum1 (+ (the fixnum (+ (the bignum-element-type (bignum-ref bignum 1))
    253253                                   high))
    254254                    (the fixnum (logand 1 (ash sum0 -32)))))
    255255           (carry (logand 1 (ash sum1 -32))))
    256       (declare (fixnum sum0 sum1) (digit-type carry))
     256      (declare (fixnum sum0 sum1) (bignum-element-type carry))
    257257      (setf (bignum-ref res 0) sum0
    258258            (bignum-ref res 1) sum1)
     
    261261        (setf (bignum-ref res 2)
    262262              (+ (the fixnum carry)
    263                  (the fixnum (+ (the digit-type (%bignum-sign bignum))
     263                 (the fixnum (+ (the bignum-element-type (%bignum-sign bignum))
    264264                                (the fixnum (ash fixnum (- (- target::nbits-in-word target::fixnumshift)))))))))
    265265      (%normalize-bignum-macro res))))
     
    273273(defun finish-bignum-add (result carry a sign-b start end)
    274274  (declare (type bignum-index start end)
    275            (digit-type sign-b carry)
     275           (bignum-element-type sign-b carry)
    276276           (optimize (speed 3) (safety 0)))
    277277  (do* ((i start (1+ i))
     
    286286                                          sign-b))
    287287                           carry))))
    288     (declare (fixnum i) (digit-type sign-b))
     288    (declare (fixnum i) (bignum-element-type sign-b))
    289289    (let* ((sum (the fixnum (+ (the fixnum (+ (bignum-ref a i)
    290290                                              sign-b))
     
    316316           (sign-a (%bignum-sign a))
    317317           (sign-b (%bignum-sign b)))
    318       (declare (digit-type borrow sign-a sign-b))
     318      (declare (bignum-element-type borrow sign-a sign-b))
    319319      (dotimes (i (the bignum-index len-res))
    320320        (multiple-value-bind (result-digit borrow-out)
  • trunk/source/level-0/l0-hash.lisp

    r11070 r11958  
    179179          (let* ((pname (%svref vector target::symbol.pname-cell))
    180180                 (hash (mixup-hash-code (%pname-hash pname (uvsize pname)))))
    181             (declare (type (simple-string pname)))
     181            (declare (type simple-string pname))
    182182            (if cell
    183183              (setf (car cell) hash)
  • trunk/source/level-1/l1-aprims.lisp

    r11676 r11958  
    34973497  (let* ((code (char-code c))
    34983498         (bits *alpha-char-bits*))
    3499     (declare (type (mod #x110000 code))
     3499    (declare (type (mod #x110000) code)
    35003500             (simple-bit-vector bits))
    35013501    (and (< code (length bits))
  • trunk/source/level-1/l1-lisp-threads.lisp

    r11744 r11958  
    300300                #+32-bit-target :unsigned-fullword ts-size
    301301                :address))))
    302     (declare (fixum tcr))
     302    (declare (fixnum tcr))
    303303    (if (zerop tcr)
    304304      (error "Can't create thread")
  • trunk/source/level-1/l1-streams.lisp

    r11827 r11958  
    19241924(defun %ioblock-write-u8-encoded-simple-string (ioblock string start-char num-chars)
    19251925  (declare (fixnum start-char num-chars)
    1926            (simple-base-strng string)
     1926           (simple-base-string string)
    19271927           (optimize (speed 3) (safety 0)))
    19281928  (do* ((i 0 (1+ i))
     
    19751975(defun %ioblock-write-u16-encoded-simple-string (ioblock string start-char num-chars)
    19761976  (declare (fixnum start-char num-chars)
    1977            (simple-base-strng string)
     1977           (simple-base-string string)
    19781978           (optimize (speed 3) (safety 0)))
    19791979  (when (ioblock-pending-byte-order-mark ioblock)
     
    20242024(defun %ioblock-write-swapped-u16-encoded-simple-string (ioblock string start-char num-chars)
    20252025  (declare (fixnum start-char num-chars)
    2026            (simple-base-strng string)
     2026           (simple-base-string string)
    20272027           (optimize (speed 3) (safety 0)))
    20282028  (do* ((i 0 (1+ i))
     
    20572057    (incf (ioblock-charpos ioblock)))
    20582058  (let* ((code (char-code char)))
    2059     (declare (type (mod #x110000 code)))
     2059    (declare (type (mod #x110000) code))
    20602060    (if (< code (the fixnum (ioblock-encode-literal-char-code-limit ioblock)))
    20612061      (%ioblock-write-u32-code-unit ioblock code)
     
    20772077(defun %ioblock-write-u32-encoded-simple-string (ioblock string start-char num-chars)
    20782078  (declare (fixnum start-char num-chars)
    2079            (simple-base-strng string)
     2079           (simple-base-string string)
    20802080           (optimize (speed 3) (safety 0)))
    20812081  (when (ioblock-pending-byte-order-mark ioblock)
     
    21072107    (incf (ioblock-charpos ioblock)))
    21082108  (let* ((code (char-code char)))
    2109     (declare (type (mod #x110000 code)))
     2109    (declare (type (mod #x110000) code))
    21102110    (if (< code (the fixnum (ioblock-encode-literal-char-code-limit ioblock)))
    21112111      (%ioblock-write-swapped-u32-code-unit ioblock code)
     
    21272127(defun %ioblock-write-swapped-u32-encoded-simple-string (ioblock string start-char num-chars)
    21282128  (declare (fixnum start-char num-chars)
    2129            (simple-base-strng string)
     2129           (simple-base-string string)
    21302130           (optimize (speed 3) (safety 0)))
    21312131  (do* ((i 0 (1+ i))
  • trunk/source/level-1/l1-unicode.lisp

    r11625 r11958  
    38293829             (nchars 0 (1+ nchars)))
    38303830            ((> j end) (values nchars (- i origin)))
    3831          (declare (fixnum (i j end nchars)))
     3831         (declare (fixnum i j end nchars))
    38323832         (let* ((code (%get-unsigned-word pointer i)))
    38333833           (declare (type (unsigned-byte 16) code))
  • trunk/source/lib/chars.lisp

    r11226 r11958  
    9191         (to-lower *upper-to-lower*))
    9292    (declare (type (mod #x110000) code)
    93              (type (simple-array (signed-byte 16) *to-lower)))
     93             (type (simple-array (signed-byte 16) (*)) to-lower))
    9494    (and (< code (length to-lower))
    9595         (not (zerop (aref to-lower code))))))
     
    565565                         len1 1))))
    566566    (if (typep string2 'simple-string)
    567       (setq len2 (length (the sumple-string string2)))
     567      (setq len2 (length (the simple-string string2)))
    568568      (etypecase string2
    569569        (string (setq len2 (length string2))
  • trunk/source/lib/method-combination.lisp

    r11855 r11958  
    457457    (declare (fixnum bits numreq numopt))
    458458    (and (< i numopt)
    459          (< (the fixum (+ i numreq)) (length argvals)))))
     459         (< (the fixnum (+ i numreq)) (length argvals)))))
    460460
    461461;;; This assumes that we've checked for argument presence.
     
    465465         (numreq (ldb $lfbits-numreq bits)))
    466466    (declare (fixnum bits numreq ))
    467     (nth (the fixum (+ i numreq)) argvals)))
     467    (nth (the fixnum (+ i numreq)) argvals)))
    468468
    469469(defun gf-arguments-tail (gf argvals)
Note: See TracChangeset for help on using the changeset viewer.