Changes to keep ECL happy. (NIL for BASIS and INTR-MRPH...)

This commit is contained in:
Gerd Heber 2015-07-22 21:43:03 -05:00
parent 0007886ffa
commit 9e2a323b85
3 changed files with 9 additions and 10 deletions

View File

@ -170,9 +170,9 @@ IDNUM or NIL, if it doesn't exist."
(DEFUN BUILD-CHCM (&key cmpr basis bsgn intr-dffr strt orgn) (DEFUN BUILD-CHCM (&key cmpr basis bsgn intr-dffr strt orgn)
(declare (declare
(type cmprf cmpr) (type cmprf cmpr)
(type basis basis) (type (or basis null) basis)
(type gnrt bsgn) (type gnrt bsgn)
(type intr-mrph intr-dffr) (type (or intr-mrph null) intr-dffr)
(type strt strt) (type strt strt)
(type list orgn)) (type list orgn))
"Returns an instance of CHAIN-COMPLEX. Use this function instead of creating "Returns an instance of CHAIN-COMPLEX. Use this function instead of creating

View File

@ -81,11 +81,11 @@
(DEFTYPE CMBN () '(satisfies cmbn-p)) (DEFTYPE CMBN () '(satisfies cmbn-p))
|# |#
(DEFTYPE BASIS () '(or function (eql :locally-effective))) (DEFTYPE BASIS () '(or function (eql :locally-effective) #+ecl null))
;; (function (degr) (list gnrt)) ;; (function (degr) (list gnrt))
;; INTR-MRPH = INTeRnal-MoRPHism ;; INTR-MRPH = INTeRnal-MoRPHism
(DEFTYPE INTR-MRPH () '(or function morphism #+ccl null)) (DEFTYPE INTR-MRPH () '(or function morphism #+(or ccl ecl) null))
;; (or (function (degr gnrt) cmbn) ;; if :gnrt strategy ;; (or (function (degr gnrt) cmbn) ;; if :gnrt strategy
;; (function (cmbn) (cmbn)) ;; if :cmbn strategy ;; (function (cmbn) (cmbn)) ;; if :cmbn strategy

View File

@ -5,9 +5,8 @@
(test circle (test circle
(progn (cat:cat-init)
(cat:cat-init) (let ((circle (cat:circle)))
(let ((circle (cat:circle))) (is (equal (cat:basis circle 0) '(*)))
(is (equal (cat:basis circle 0) '(*))) (is (equal (cat:basis circle 1) '(cat::s1)))
(is (equal (cat:basis circle 1) '(s1))) (is (equal (cat:basis circle 2) cat:+empty-list+))))
(is (equal (cat:basis circle 2) cat:+empty-list+)))))