r4924: *** empty log message ***

[umlisp.git] / composite.lisp

diff --git a/composite.lisp b/composite.lisp
index 07fe8ae0376a69c5fe92d9d248c718cae8e02132..d967c99130bdbea196b14e2cca9ea2f2ae4da2b1 100644 (file)
--- a/composite.lisp
+++ b/composite.lisp
@@ -4,10 +4,10 @@
 ;;;;
 ;;;; Name:          composite.lisp
 ;;;; Purpose:       Composite Classes for UMLisp
-;;;; Programmer:    Kevin M. Rosenberg
+;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: composite.lisp,v 1.20 2003/01/17 18:40:49 kevin Exp $
+;;;; $Id: composite.lisp,v 1.22 2003/05/14 05:37:48 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -16,8 +16,10 @@
 ;;;; as governed by the terms of the GNU General Public License.
 ;;;; *************************************************************************
 
-(in-package :umlisp)
-(declaim (optimize (speed 3) (safety 1) (compilation-speed 0) (debug 3)))
+(in-package #:umlisp)
+
+(eval-when (:compile-toplevel)
+  (declaim (optimize (speed 3) (safety 1) (compilation-speed 0) (debug 3))))
 
 
 ;;; Semantic type constants
@@ -68,28 +70,28 @@
   ((freq :value-type integer :initarg :freq :accessor freq :print-formatter fmt-comma-integer))
   (:metaclass hyperobject-class)
   (:default-initargs :freq 0)
-  (:user-name "Frequency class")
+  (:user-name "Frequency class" "Frequency classes")
   (:default-print-slots freq)
   (:description "Base class containing frequency slot, used for multi-inherited objects"))
 
 (defclass ucon_freq (ucon freq)
   ()
   (:metaclass hyperobject-class)
-  (:user-name "Concept and Count")
+  (:user-name "Concept and Count" "Concepts and Counts")
   (:default-print-slots cui freq pfstr)
   (:description "Composite object of ucon/freq"))
 
 (defclass ustr_freq (ustr freq)
   ()
   (:metaclass hyperobject-class)
-  (:user-name "String and Count")
+  (:user-name "String and Count" "Strings and Counts")
   (:default-print-slots sui freq stt lrl str)
   (:description "Composite object of ustr/freq"))
 
 (defclass usty_freq (usty freq)
   ((freq :value-type fixnum :initarg :freq :accessor freq))
   (:metaclass hyperobject-class)
-  (:user-name "Semantic Type and Count")
+  (:user-name "Semantic Type and Count" "Semantic Types and Counts")
   (:default-print-slots tui freq sty)
   (:description "Composite object of usty/freq"))
 
@@ -109,7 +111,7 @@
 (defclass usrl_freq (usrl freq)
   ()
   (:metaclass hyperobject-class)
-  (:user-name "Source and Count")
+  (:user-name "Source and Count" "Sources and Counts")
   (:default-print-slots sab freq srl)
   (:description "Composite object of usrl/freq"))