Merge asdf-issues branch.

This commit is contained in:
gheber 2015-06-15 16:13:17 -05:00
parent 870466490b
commit 0f873a569b
5 changed files with 8 additions and 8 deletions

View File

@ -252,7 +252,7 @@
(map nil #'(lambda (rslt) (map nil #'(lambda (rslt)
(declare (type result rslt)) (declare (type result rslt))
(let ((rntm (result-rntm rslt))) (let ((rntm (result-rntm rslt)))
(declare (integer rntm)) (declare (single-float rntm))
(when (plusp rntm) (when (plusp rntm)
(push rntm time-list)))) (push rntm time-list))))
drslt)) drslt))

View File

@ -543,7 +543,7 @@
(gfgf-tail (term-cmbn 0 1 +null-allp+))) (gfgf-tail (term-cmbn 0 1 +null-allp+)))
(declare (declare
(list cbgn-list rslt) (list cbgn-list rslt)
(fixnum sign) (boolean sign)
(type cmbn gfgf-tail)) (type cmbn gfgf-tail))
(unless cbgn-list (unless cbgn-list
(return-from rslt (zero-cmbn 1))) (return-from rslt (zero-cmbn 1)))
@ -557,7 +557,7 @@
(let ((h-gnrt (gnrt-? h degr gnrt))) (let ((h-gnrt (gnrt-? h degr gnrt)))
(declare (type cmbn h-gnrt)) (declare (type cmbn h-gnrt))
(let ((hgfgf (cmbn-list (cmbn-allp-cmbn-tnpr h-gnrt gfgf-tail)))) (let ((hgfgf (cmbn-list (cmbn-allp-cmbn-tnpr h-gnrt gfgf-tail))))
(declare (type cmbn hgfgf)) (declare (type list hgfgf))
(when sign (when sign
(mapc #'(lambda (term) (mapc #'(lambda (term)
(declare (type term term)) (declare (type term term))

View File

@ -372,8 +372,7 @@
(multiple-value-bind (expn y-n+1 gp-n) (pop-first-absm n g-n) (multiple-value-bind (expn y-n+1 gp-n) (pop-first-absm n g-n)
(declare (declare
(fixnum expn) (fixnum expn)
(type absm y-n+1) (type absm y-n+1 gp-n))
(type loop gp-n)) ;;; ***
(ecase expn (ecase expn
(0 (zero-cmbn (1+ n))) (0 (zero-cmbn (1+ n)))
(+1 (+1

View File

@ -472,7 +472,7 @@
(declare (declare
(list mtrx-list) (list mtrx-list)
(fixnum begin il ic)) (fixnum begin il ic))
(the matrix (progn (the list (progn
(when (< begin il) (when (< begin il)
(line-swap-5 mtrx-list begin begin il)) (line-swap-5 mtrx-list begin begin il))
(when (< begin ic) (when (< begin ic)

View File

@ -155,7 +155,8 @@
(list1 (cmbn-list (gnrt-? dffr1 degr1 gnrt1))) (list1 (cmbn-list (gnrt-? dffr1 degr1 gnrt1)))
(list2 (cmbn-list (gnrt-? dffr2 degr2 gnrt2)))) (list2 (cmbn-list (gnrt-? dffr2 degr2 gnrt2))))
(declare (declare
(fixnum degr1-1 degr2-1 sign) (fixnum degr1-1 degr2-1)
(boolean sign)
(list list1 list2)) (list list1 list2))
(make-cmbn (make-cmbn
:degr (1- degr) :degr (1- degr)