r4269: Auto commit for Debian build

diff --git a/classes.lisp b/classes.lisp
index 40db29a86dd1b45a66721fbfebeb856263d341bd..d7afaa6cd68289c165a3d390493e30ddb0f18d40 100644 (file)
--- a/classes.lisp
+++ b/classes.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: classes.lisp,v 1.26 2002/12/14 02:35:28 kevin Exp $
+;;;; $Id: classes.lisp,v 1.27 2003/03/27 21:56:07 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -460,109 +460,3 @@
   (:user-name "Fully Inherited Set of Releatons (strings)")
   (:default-print-slots sty rl sty2))
 
-;;; Formatting routines
-
-(defgeneric fmt-cui (c))
-(defmethod fmt-cui ((c ucon))
-  (format nil "C~7,'0d" (cui c)))
-
-(defmethod fmt-cui ((c fixnum))
-  (format nil "C~7,'0d" c))
-
-(defmethod fmt-cui ((c string))
-  (if (eql (aref c 0) #\C)
-      c
-    (format nil "C~7,'0d" (parse-integer c))))
-
-(defmethod fmt-cui ((c null))
-  (format nil "nil"))
-
-(defgeneric fmt-lui (c))
-(defmethod fmt-lui ((l uterm))
-  (format nil "L~7,'0d" (lui l)))
-
-(defmethod fmt-lui ((l fixnum))
-  (format nil "L~7,'0d" l))
-
-(defmethod fmt-lui ((l string))
-  (if (eql (aref l 0) #\L)
-      l
-  (format nil "L~7,'0d" (parse-integer l))))
-
-(defgeneric fmt-sui (s))
-(defmethod fmt-sui ((s ustr))
-  (format nil "S~7,'0d" (sui s)))
-
-(defmethod fmt-sui ((s fixnum))
-  (format nil "S~7,'0d" s))
-
-(defmethod fmt-sui ((s string))
-  (if (eql (aref s 0) #\S)
-      s
-  (format nil "S~7,'0d" (parse-integer s))))
-
-(defgeneric fmt-tui (t))
-(defmethod fmt-tui ((s fixnum))
-  (format nil "T~3,'0d" s))
-
-(defmethod fmt-tui ((s string))
-  (if (eql (aref s 0) #\T)
-      s
-  (format nil "T~3,'0d" (parse-integer s))))
-
-(defgeneric fmt-eui (e))
-(defmethod fmt-eui ((e fixnum))
-  (format nil "E~7,'0d" e))
-
-(defmethod fmt-eui ((e string))
-  (if (eql (aref e 0) #\E)
-      e
-    (format nil "E~7,'0d" (parse-integer e))))
-
-(defmethod fmt-eui ((e null))
-  (format nil "nil"))
-
-;;; Generic display functions
-
-(eval-when (:compile-toplevel :load-toplevel :execute)
-(defun english-term-p (obj)
-  "Returns two values: T/NIL if term is english and T/NIL if obj is a TERM"
-  (if (eq (hyperobject::class-name (hyperobject::class-of obj)) 'uterm)
-      (values (string-equal (lat obj) "ENG") t)
-    (values nil nil))))
-
-(defun english-term-filter (obj)
-  "Retrns NIL if object is a term and not english"
-  (multiple-value-bind (is-english is-term) (english-term-p obj)
-      (or (not is-term) is-english)))
-
-(defun print-umlsclass (obj &key (stream *standard-output*) (category :compact-text)
-                       (file-wrapper t) (english-only nil) (subobjects nil)
-                       (refvars nil))
-  (view obj :stream stream :category category :subobjects subobjects
-       :file-wrapper file-wrapper
-       :filter (if english-only nil #'english-term-filter)
-       :refvars refvars))
-
-(defmacro define-lookup-display (newfuncname lookup-func)
-  "Defines functions for looking up and displaying objects"
-  `(defun ,newfuncname  (keyval &key (stream *standard-output*) (category :compact-text)
-                        (file-wrapper t) (english-only nil) (subobjects nil))
-     (let ((obj (funcall ,lookup-func keyval)))
-       (print-umlsclass obj :stream stream :category category
-                       :file-wrapper file-wrapper :english-only english-only
-                       :subobjects subobjects)
-       obj)))
-
-(define-lookup-display display-con #'find-ucon-cui)
-(define-lookup-display display-term #'find-uterm-lui)
-(define-lookup-display display-str #'find-ustr-sui)
-
-#+(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/debian/changelog b/debian/changelog
index f30abb2c71753fba92e6376858835f8039e54f84..32a1a7e644125e8d79943acc236ca583ff131433 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-umlisp (2.6.5-1) unstable; urgency=low
+
+  * New upstream supporting sbcl
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Thu, 27 Mar 2003 14:55:47 -0700
+
 cl-umlisp (2.6.4-1) unstable; urgency=low
 
   * Use clsql-mysql backend

diff --git a/umlisp.asd b/umlisp.asd
index 0e1eafbb32bc84d47f393d259bd0d5b08e70109f..fc92c334fad4cdfb0233d7095f21e31c9cefaa73 100644 (file)
--- a/umlisp.asd
+++ b/umlisp.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: umlisp.asd,v 1.13 2003/03/25 14:56:37 kevin Exp $
+;;;; $Id: umlisp.asd,v 1.14 2003/03/27 21:56:07 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -33,7 +33,8 @@
       (:file "parse-common"  :depends-on ("parse-2002"))
       (:file "sql-create" :depends-on ("parse-common"))
       (:file "classes" :depends-on ("utils"))
-      (:file "sql-classes" :depends-on ("classes" "sql"))
+      (:file "class-support" :depends-on ("classes"))
+      (:file "sql-classes" :depends-on ("class-support" "sql"))
       (:file "composite" :depends-on ("sql-classes")))
      :depends-on (:clsql
                  :clsql-mysql