From 9e2a323b85919663222aecda9c06e04cf006d50b Mon Sep 17 00:00:00 2001
From: Gerd Heber <gheber@hdfgroup.org>
Date: Wed, 22 Jul 2015 21:43:03 -0500
Subject: [PATCH] Changes to keep ECL happy. (NIL for BASIS and INTR-MRPH...)

---
 src/chain-complexes.lisp |  4 ++--
 src/classes.lisp         |  4 ++--
 test/circle.lisp         | 11 +++++------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/chain-complexes.lisp b/src/chain-complexes.lisp
index 61ef51e..6c15d92 100644
--- a/src/chain-complexes.lisp
+++ b/src/chain-complexes.lisp
@@ -170,9 +170,9 @@ IDNUM or NIL, if it doesn't exist."
 (DEFUN BUILD-CHCM (&key cmpr basis bsgn intr-dffr strt orgn)
   (declare
    (type cmprf cmpr)
-   (type basis basis)
+   (type (or basis null) basis)
    (type gnrt bsgn)
-   (type intr-mrph intr-dffr)
+   (type (or intr-mrph null) intr-dffr)
    (type strt strt)
    (type list orgn))
   "Returns an instance of CHAIN-COMPLEX. Use this function instead of creating
diff --git a/src/classes.lisp b/src/classes.lisp
index 7bba460..8b141b1 100644
--- a/src/classes.lisp
+++ b/src/classes.lisp
@@ -81,11 +81,11 @@
 (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))
 
 ;; 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
 ;;     (function (cmbn) (cmbn))     ;; if :cmbn strategy
 
diff --git a/test/circle.lisp b/test/circle.lisp
index 45ba537..46aef73 100644
--- a/test/circle.lisp
+++ b/test/circle.lisp
@@ -5,9 +5,8 @@
 
 
 (test circle
-      (progn
-	(cat:cat-init)
-	(let ((circle (cat:circle)))
-	  (is (equal (cat:basis circle 0) '(*)))
-	  (is (equal (cat:basis circle 1) '(s1)))
-	  (is (equal (cat:basis circle 2) cat:+empty-list+)))))
+      (cat:cat-init)
+      (let ((circle (cat:circle)))
+	(is (equal (cat:basis circle 0) '(*)))
+	(is (equal (cat:basis circle 1) '(cat::s1)))
+	(is (equal (cat:basis circle 2) cat:+empty-list+))))