r4453: Automatic commit for debian_version_2_6_5-1

[umlisp.git] / classes.lisp

diff --git a/classes.lisp b/classes.lisp
index 40db29a86dd1b45a66721fbfebeb856263d341bd..6f29ca69f861db98550c781d2a4dc602e9a51620 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.30 2003/04/12 05:45:50 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -228,14 +228,14 @@
        :hyperlink find-ucon-cui)
    (lrl :value-type fixnum :initarg :lrl :reader lrl)
    (pfstr :value-type cdata :initarg :pfstr :reader pfstr)
-   (s#term :reader s#term :subobject (find-uterm-cui cui))
    (s#def :reader s#def :subobject (find-udef-cui cui))
-   (s#lo :reader s#lo :subobject (find-ulo-cui cui))
-   (s#rel :reader s#rel :subobject (find-urel-cui cui))
-   (s#coc :reader s#coc :subobject (find-ucoc-cui cui))
+   (s#sty :reader s#sty :subobject (find-usty-cui cui))
    (s#sat :reader s#sat :subobject (find-usat-ui cui))
    (s#atx :reader s#atx :subobject (find-uatx-cui cui))
-   (s#sty :reader s#sty :subobject (find-usty-cui cui)))
+   (s#lo :reader s#lo :subobject (find-ulo-cui cui))
+   (s#term :reader s#term :subobject (find-uterm-cui cui))
+   (s#rel :reader s#rel :subobject (find-urel-cui cui))
+   (s#coc :reader s#coc :subobject (find-ucoc-cui cui)))
   (:metaclass hyperobject-class)
   (:default-initargs :cui nil :lrl nil :pfstr nil)
   (:user-name "Concept")
@@ -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)))