r9529: successful import of 2004aa

[umlisp.git] / classes.lisp

diff --git a/classes.lisp b/classes.lisp
index e62c1ee190c2760c7a647aaf4f2b6bb189b65064..72b4d450f4786b56cbe5c0fb90efbbd3028c4b0c 100644 (file)
--- a/classes.lisp
+++ b/classes.lisp
@@ -116,7 +116,7 @@
    (str :value-type cdata :initarg :str :reader str)
    (lrl :value-type fixnum :initarg :lrl :reader lrl)
    (stt :value-type string :initarg :stt :reader stt)
-   (s#so :reader s#atom :subobject (find-uso-cuisui cui sui))
+   (s#so :reader s#so :subobject (find-uso-cuisui cui sui))
    (s#sat :reader s#sat :subobject (find-usat-ui cui lui sui))
    (s#cxt :reader s#cxt :subobject (find-ucxt-cuisui cui sui)))
   (:metaclass hyperobject-class)
@@ -127,7 +127,7 @@
   ((aui :value-type fixnum :initarg :aui :reader aui :print-formatter fmt-aui)
    (cui :value-type fixnum :initarg :cui :reader cui :print-formatter fmt-cui
        :hyperlink find-ucon-cui)
-   (sui :value-type fixnum :initarg :cui :reader sui :print-formatter fmt-sui
+   (sui :value-type fixnum :initarg :sui :reader sui :print-formatter fmt-sui
        :hyperlink find-ucon-sui)
    (saui :value-type string :initarg :saui :reader saui)
    (sdui :value-type string :initarg :sdui :reader sdui)
@@ -138,7 +138,7 @@
    (srl :value-type fixnum :initarg :srl :reader srl))
   (:metaclass hyperobject-class)
   (:user-name "Source")
-  (:default-print-slots aui sab code saui adui scui tty srl))
+  (:default-print-slots aui sab code saui sdui scui tty srl))
 
 (defclass ulo (umlsclass)
   ((isn :value-type string :initarg :isn :reader isn)