Minor adjustments for CCL. The code compiles, but some of the tests

are failing.
This commit is contained in:
Gerd Heber 2015-07-02 11:22:55 -05:00
parent 31c09565c7
commit c1b81d4321
2 changed files with 30 additions and 16 deletions

View File

@ -61,16 +61,15 @@
(DEFCONSTANT +SOURCE-EXTENSION+ (DEFCONSTANT +SOURCE-EXTENSION+
#+(or allegro clisp lispworks) "cl" #+(or allegro clisp lispworks) "cl"
#+(or sbcl) "lisp" #+(or ccl sbcl) "lisp"
#-(or allegro clisp lispworks sbcl) #-(or allegro ccl clisp lispworks sbcl)
(error "Not an Allegro or CLisp or LispWorks or SBCL environment.")) (error "Not an Allegro or CCL or CLisp or LispWorks or SBCL environment."))
(DEFCONSTANT +COMPILED-EXTENSION+ (DEFCONSTANT +COMPILED-EXTENSION+
#+allegro "fasl" #+(or allegro sbcl) "fasl"
#+ccl "lafsl"
#+clisp "fas" #+clisp "fas"
#+lispworks "ofasl" #+lispworks "ofasl")
#+sbcl "fasl"
)
(DEFUN LOAD-SFILES () (DEFUN LOAD-SFILES ()
(mapc #'(lambda (file-name) (mapc #'(lambda (file-name)

View File

@ -21,6 +21,11 @@
(degr -1 :type fixnum) (degr -1 :type fixnum)
(list () :type list)) (list () :type list))
#+ccl
(DEFMETHOD make-load-form ((c cmbn) &optional env)
(declare (ignore env))
(make-load-form-saving-slots c))
;; CFFC = CoeFFiCient ;; CFFC = CoeFFiCient
(DEFUN CFFC-P (object) (DEFUN CFFC-P (object)
(declare (type any object)) (declare (type any object))
@ -95,12 +100,6 @@
excl::*redefinition-warnings* excl::*redefinition-warnings*
*redefinition-warnings* nil)) *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 ;; IDNM = IDentification NuMber
(DEFVAR *IDNM-COUNTER*) (DEFVAR *IDNM-COUNTER*)
(SETF *IDNM-COUNTER* 0) (SETF *IDNM-COUNTER* 0)
@ -275,6 +274,11 @@
(DEFSTRUCT (ALLP (:print-function allp-print)) (DEFSTRUCT (ALLP (:print-function allp-print))
(list #+allegro :type #+allegro iallp)) (list #+allegro :type #+allegro iallp))
#+ccl
(DEFMETHOD make-load-form ((a allp) &optional env)
(declare (ignore env))
(make-load-form-saving-slots a))
;;; ;;;
;;; ALGEBRAS ;;; ALGEBRAS
;;; ;;;
@ -326,6 +330,11 @@
(DEFSTRUCT (ABAR (:print-function abar-print)) (DEFSTRUCT (ABAR (:print-function abar-print))
(list #+allegro :type #+allegro list)) (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 ;;; SIMPLICIAL SETS
;;; ;;;
@ -353,7 +362,6 @@
(dgop #+allegro :type #+allegro dgop) (dgop #+allegro :type #+allegro dgop)
(gmsm #+allegro :type #+allegro gmsm)) (gmsm #+allegro :type #+allegro gmsm))
#| #|
() ()
(absm-p 1) (absm-p 1)
@ -363,7 +371,6 @@
(absm-p '(:absm -5 . a)) ;; printer-error (absm-p '(:absm -5 . a)) ;; printer-error
|# |#
(DEFTYPE FACE () 'function) (DEFTYPE FACE () 'function)
;; (function (indx dmns gmsm) absm) ;; (function (indx dmns gmsm) absm)
@ -373,7 +380,6 @@
(DEFCLASS SIMPLICIAL-SET (coalgebra) (DEFCLASS SIMPLICIAL-SET (coalgebra)
((face :type face :initarg :face :reader face1))) ((face :type face :initarg :face :reader face1)))
;;; ;;;
;;; SIMPLICIAL-MRPHS ;;; SIMPLICIAL-MRPHS
;;; ;;;
@ -502,6 +508,10 @@
#+sbcl(eval-when (:compile-toplevel :load-toplevel :execute) #+sbcl(eval-when (:compile-toplevel :load-toplevel :execute)
(sb-ext:lock-package :common-lisp)) (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 ;;; CLASSIFYING-SPACES
@ -513,3 +523,8 @@
(DEFSTRUCT (GBAR (:print-function gbar-print)) (DEFSTRUCT (GBAR (:print-function gbar-print))
(dmns -1 :type fixnum) (dmns -1 :type fixnum)
(list () :type list)) (list () :type list))
#+ccl
(DEFMETHOD make-load-form ((g gbar) &optional env)
(declare (ignore env))
(make-load-form-saving-slots g))