X-Git-Url: http://git.kpe.io/?p=umlisp.git;a=blobdiff_plain;f=composite.lisp;h=49f6e2e06f551ed28ba9b99f06c82147b9148175;hp=d967c99130bdbea196b14e2cca9ea2f2ae4da2b1;hb=08af5459d3ba7d229a8339d242ef742cfe846861;hpb=5265bd2d2382c51c7bbef19c150466eb1afd58bd

diff --git a/composite.lisp b/composite.lisp
index d967c99..49f6e2e 100644
--- a/composite.lisp
+++ b/composite.lisp
@@ -2,15 +2,15 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          composite.lisp
-;;;; Purpose:       Composite Classes for UMLisp
-;;;; Author:        Kevin M. Rosenberg
-;;;; Date Started:  Apr 2000
+;;;; Name:     composite.lisp
+;;;; Purpose:  Composite Classes for UMLisp
+;;;; Author:   Kevin M. Rosenberg
+;;;; Created:  Apr 2000
 ;;;;
-;;;; $Id: composite.lisp,v 1.22 2003/05/14 05:37:48 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of UMLisp, is
-;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
+;;;;    Copyright (c) 2000-2006 by Kevin M. Rosenberg, M.D.
 ;;;;
 ;;;; UMLisp users are granted the rights to distribute and use this software
 ;;;; as governed by the terms of the GNU General Public License.
@@ -18,10 +18,6 @@
 
 (in-package #:umlisp)
 
-(eval-when (:compile-toplevel)
-  (declaim (optimize (speed 3) (safety 1) (compilation-speed 0) (debug 3))))
-
-
 ;;; Semantic type constants
 
 (defun find-tui-word (words)
@@ -67,7 +63,8 @@
 ;;; Composite Objects
 
 (defclass freq (hyperobject)
-  ((freq :value-type integer :initarg :freq :accessor freq :print-formatter fmt-comma-integer))
+  ((freq :value-type integer :initarg :freq :accessor freq
+	 :print-formatter fmt-comma-integer))
   (:metaclass hyperobject-class)
   (:default-initargs :freq 0)
   (:user-name "Frequency class" "Frequency classes")
@@ -89,7 +86,7 @@
   (: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" "Semantic Types and Counts")
   (:default-print-slots tui freq sty)
@@ -186,7 +183,7 @@
 (defun find-ucon2_freq-coc-tui-all (tui)
   (find-ucon2_freq-tui-all tui #'find-ucon2-coc-tui))
 
-#+(or cmu scl)
+#+(or scl)
 (dolist (c '(ucon_freq ustr_freq usty_freq usrl_freq))
   (let ((cl #+cmu (pcl:find-class c)
 	    #+scl (find-class c)))