From c1b81d4321ea8d41c3d0685ac6cf9a717f419b0d Mon Sep 17 00:00:00 2001
From: Gerd Heber <gheber@hdfgroup.org>
Date: Thu, 2 Jul 2015 11:22:55 -0500
Subject: [PATCH] Minor adjustments for CCL. The code compiles, but some of the
 tests are failing.

---
 src/cat-init.lisp | 13 ++++++-------
 src/classes.lisp  | 33 ++++++++++++++++++++++++---------
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/src/cat-init.lisp b/src/cat-init.lisp
index 39302e8..58de261 100644
--- a/src/cat-init.lisp
+++ b/src/cat-init.lisp
@@ -61,16 +61,15 @@
 
 (DEFCONSTANT +SOURCE-EXTENSION+
   #+(or allegro clisp lispworks) "cl"
-  #+(or sbcl) "lisp"
-  #-(or allegro clisp lispworks sbcl)
-    (error "Not an Allegro or CLisp or LispWorks or SBCL environment."))
+  #+(or ccl sbcl) "lisp"
+  #-(or allegro ccl clisp lispworks sbcl)
+    (error "Not an Allegro or CCL or CLisp or LispWorks or SBCL environment."))
 
 (DEFCONSTANT +COMPILED-EXTENSION+ 
-    #+allegro "fasl"
+    #+(or allegro sbcl) "fasl"
+    #+ccl "lafsl"
     #+clisp "fas"
-    #+lispworks "ofasl"
-    #+sbcl "fasl"
-    )
+    #+lispworks "ofasl")
 
 (DEFUN LOAD-SFILES ()
    (mapc #'(lambda (file-name)
diff --git a/src/classes.lisp b/src/classes.lisp
index a302b43..c7b0610 100644
--- a/src/classes.lisp
+++ b/src/classes.lisp
@@ -21,6 +21,11 @@
   (degr -1 :type fixnum)
   (list () :type list))
 
+#+ccl
+(DEFMETHOD make-load-form ((c cmbn) &optional env)
+  (declare (ignore env))
+  (make-load-form-saving-slots c))
+
 ;; CFFC = CoeFFiCient
 (DEFUN CFFC-P (object)
   (declare (type any object))
@@ -95,12 +100,6 @@
 	excl::*redefinition-warnings*
 	*redefinition-warnings* nil))
 
-(DEFCLASS CHAIN-COMPLEX () ())  ;; will be redefined later.
-
-(DEFCLASS MORPHISM () ())  ;; will be redefined later.
-
-(DEFCLASS HOMOTOPY-EQUIVALENCE () ())  ;;  will be redefined later
-
 ;;  IDNM = IDentification NuMber
 (DEFVAR *IDNM-COUNTER*)
 (SETF *IDNM-COUNTER* 0)
@@ -275,6 +274,11 @@
 (DEFSTRUCT (ALLP (:print-function allp-print))
   (list #+allegro :type #+allegro iallp))
 
+#+ccl
+(DEFMETHOD make-load-form ((a allp) &optional env)
+  (declare (ignore env))
+  (make-load-form-saving-slots a))
+
 ;;;
 ;;;  ALGEBRAS
 ;;;
@@ -326,6 +330,11 @@
 (DEFSTRUCT (ABAR (:print-function abar-print))
   (list #+allegro :type #+allegro list))
 
+#+ccl
+(DEFMETHOD make-load-form ((a abar) &optional env)
+  (declare (ignore env))
+  (make-load-form-saving-slots a))
+
 ;;;
 ;;;  SIMPLICIAL SETS
 ;;;
@@ -353,7 +362,6 @@
   (dgop #+allegro :type #+allegro dgop)
   (gmsm #+allegro :type #+allegro gmsm))
 
-
 #|
 ()
 (absm-p 1)
@@ -363,7 +371,6 @@
 (absm-p '(:absm -5 . a)) ;; printer-error
 |#
 
-
 (DEFTYPE FACE () 'function)
 ;;   (function (indx dmns gmsm) absm)
 
@@ -373,7 +380,6 @@
 (DEFCLASS SIMPLICIAL-SET (coalgebra)
   ((face :type face :initarg :face :reader face1)))
 
-
 ;;;
 ;;;  SIMPLICIAL-MRPHS
 ;;;
@@ -502,6 +508,10 @@
 #+sbcl(eval-when (:compile-toplevel :load-toplevel :execute)
 	(sb-ext:lock-package :common-lisp))
 
+#+ccl
+(DEFMETHOD make-load-form ((l loop) &optional env)
+  (declare (ignore env))
+  (make-load-form-saving-slots l))
 
 ;;;
 ;;;  CLASSIFYING-SPACES
@@ -513,3 +523,8 @@
 (DEFSTRUCT (GBAR (:print-function gbar-print))
   (dmns -1 :type fixnum)
   (list () :type list))
+
+#+ccl
+(DEFMETHOD make-load-form ((g gbar) &optional env)
+  (declare (ignore env))
+  (make-load-form-saving-slots g))