From: Kevin M. Rosenberg Date: Fri, 18 Oct 2002 07:31:42 +0000 (+0000) Subject: r3103: *** empty log message *** X-Git-Tag: v2006ac.2~316 X-Git-Url: http://git.kpe.io/?p=umlisp.git;a=commitdiff_plain;h=3b0cda891f452703d74fe1792aa2c39f662dd38b r3103: *** empty log message *** --- diff --git a/classes.lisp b/classes.lisp index fd31e48..0a866ee 100644 --- a/classes.lisp +++ b/classes.lisp @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Apr 2000 ;;;; -;;;; $Id: classes.lisp,v 1.7 2002/10/16 17:37:18 kevin Exp $ +;;;; $Id: classes.lisp,v 1.8 2002/10/18 07:28:57 kevin Exp $ ;;;; ;;;; This file, part of UMLisp, is ;;;; Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D. @@ -554,10 +554,14 @@ (defludisp-ml-class disp-term #'find-uterm-lui) (defludisp-ml-class disp-str #'find-ustr-sui) -#+cmu -(dolist (c '(urank udef usat uso ucxt ustr ulo uterm usty urel ucoc uatx ucon uxw uxnw uxns lexterm labr lagr lcmp lmod lnom lprn lprp lspl ltrm ltyp lwd sdef sstr sstre1 sstre2 )) - (let ((cl (pcl:find-class c))) - (pcl:finalize-inheritance cl))) +#+(or scl cmu) +(dolist (c '(urank udef usat uso ucxt ustr ulo uterm usty urel ucoc uatx ucon uxw uxnw uxns lexterm labr lagr lcmp lmod lnom lprn lprp lspl ltrm ltyp lwd sdef sstr sstre1 sstre2 usrl)) + #+cmu + (let ((cl (pcl:find-class c))) + (pcl:finalize-inheritance cl)) + #+scl + (let ((cl (find-class c))) + (clos:finalize-inheritance cl))) diff --git a/composite.lisp b/composite.lisp index 0730713..007c572 100644 --- a/composite.lisp +++ b/composite.lisp @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Apr 2000 ;;;; -;;;; $Id: composite.lisp,v 1.7 2002/10/16 16:09:55 kevin Exp $ +;;;; $Id: composite.lisp,v 1.8 2002/10/18 07:28:57 kevin Exp $ ;;;; ;;;; This file, part of UMLisp, is ;;;; Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D. @@ -216,9 +216,9 @@ (defun find-ucon2_freq-coc-tui-all (tui) (find-ucon2_freq-tui-all tui #'find-ucon2-coc-tui)) -#+cmu +#+(or cmu scl) (dolist (c '(ucon_freq ustr_freq usty_freq usrl_freq)) (let ((cl #+cmu (pcl:find-class c) - #+sbcl (sb-pcl:find-class c))) + #+scl (find-class c))) #+cmu (pcl:finalize-inheritance cl) - #+sbcl (sb-pcl:finalize-inheritance cl))) + #+scl (clos:finalize-inheritance cl))) diff --git a/umlisp.asd b/umlisp.asd index 86d6b2c..0ef0499 100644 --- a/umlisp.asd +++ b/umlisp.asd @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Apr 2000 ;;;; -;;;; $Id: umlisp.asd,v 1.8 2002/10/18 03:57:39 kevin Exp $ +;;;; $Id: umlisp.asd,v 1.9 2002/10/18 07:28:57 kevin Exp $ ;;;; ;;;; This file, part of UMLisp, is ;;;; Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D. @@ -18,7 +18,7 @@ (in-package :asdf) -#+(or allegro lispworks cmu sbcl openmcl) +#+(or allegro lispworks cmu sbcl openmcl scl) (defsystem :umlisp :perform (load-op :after (op umlisp) (pushnew :umlisp cl:*features*))