r3618: *** empty log message ***

[umlisp.git] / classes.lisp

diff --git a/classes.lisp b/classes.lisp
index 09b1e9e0b7a7506eee9f36ef8d01bac08ba3a019..abf07fea757fe7a81f3c24a8cb013e956c4b115c 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.23 2002/12/13 05:43:38 kevin Exp $
+;;;; $Id: classes.lisp,v 1.25 2002/12/13 09:16:13 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -226,8 +226,8 @@
 (defclass ucon (umlsclass)
   ((cui :type fixnum :initarg :cui :reader cui :print-formatter fmt-cui
        :hyperlink find-ucon-cui)
-   (pfstr :type cdata :initarg :pfstr :reader pfstr)
    (lrl :type fixnum :initarg :lrl :reader lrl)
+   (pfstr :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))
@@ -237,7 +237,7 @@
    (s#atx :reader s#atx :subobject (find-uatx-cui cui))
    (s#sty :reader s#sty :subobject (find-usty-cui cui)))
   (:metaclass hyperobject-class)
-  (:default-initargs :cui nil :pfstr nil :lrl nil)
+  (:default-initargs :cui nil :lrl nil :pfstr nil)
   (:user-name "Concept")
   (:default-print-slots cui lrl pfstr))
 
@@ -536,10 +536,10 @@
   (multiple-value-bind (is-english is-term) (english-term-p obj)
       (or (not is-term) is-english)))
 
-(defun print-umlsclass (obj &key (os *standard-output*) (category :compact-text)
+(defun print-umlsclass (obj &key (stream *standard-output*) (category :compact-text)
                        (file-wrapper t) (english-only nil) (subobjects nil)
                        (refvars nil))
-  (view obj :stream os :category category :subobjects subobjects
+  (view obj :stream stream :category category :subobjects subobjects
        :file-wrapper file-wrapper
        :filter (if english-only nil #'english-term-filter)
        :refvars refvars))