projects
/
umlisp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r3287: *** empty log message ***
[umlisp.git]
/
composite.lisp
diff --git
a/composite.lisp
b/composite.lisp
index 9b5f60199a65eede49754dfa5d8624bf178cc0a6..007c5725988df14e32624645de3cde53efd98ec2 100644
(file)
--- a/
composite.lisp
+++ b/
composite.lisp
@@
-7,7
+7,7
@@
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Apr 2000
;;;;
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Apr 2000
;;;;
-;;;; $Id: composite.lisp,v 1.
6 2002/10/16 16:05:23
kevin Exp $
+;;;; $Id: composite.lisp,v 1.
8 2002/10/18 07:28:57
kevin Exp $
;;;;
;;;; This file, part of UMLisp, is
;;;; Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
;;;;
;;;; This file, part of UMLisp, is
;;;; Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@
-109,15
+109,16
@@
(:metaclass kmrcl:ml-class)
(:default-initargs :usty nil :freq nil)
(:title "Semantic Type and Count")
(:metaclass kmrcl:ml-class)
(:default-initargs :usty nil :freq nil)
(:title "Semantic Type and Count")
- (:ref-fields (tui find-ucon-tui "subobjects=no"))
+;; (:ref-fields (tui find-ucon-tui "subobjects=no"))
+ (:ref-fields (tui find-ucon-tui))
(:fields (tui :string fmt-tui) (freq :fixnum) (sty :string))
(:documentation "Composite object of usty/freq"))
(defmethod tui ((s usty_freq))
(:fields (tui :string fmt-tui) (freq :fixnum) (sty :string))
(:documentation "Composite object of usty/freq"))
(defmethod tui ((s usty_freq))
- (
usty-tui (usty_freq-
usty s)))
+ (
tui (
usty s)))
(defmethod sty ((s usty_freq))
(defmethod sty ((s usty_freq))
- (
usty-sty (usty_freq-
usty s)))
+ (
sty (
usty s)))
(defun find-usty_freq-all ()
(defun find-usty_freq-all ()
@@
-215,9
+216,9
@@
(defun find-ucon2_freq-coc-tui-all (tui)
(find-ucon2_freq-tui-all tui #'find-ucon2-coc-tui))
(defun find-ucon2_freq-coc-tui-all (tui)
(find-ucon2_freq-tui-all tui #'find-ucon2-coc-tui))
-#+
cmu
+#+
(or cmu scl)
(dolist (c '(ucon_freq ustr_freq usty_freq usrl_freq))
(let ((cl #+cmu (pcl:find-class c)
(dolist (c '(ucon_freq ustr_freq usty_freq usrl_freq))
(let ((cl #+cmu (pcl:find-class c)
- #+s
bcl (sb-pcl:
find-class c)))
+ #+s
cl (
find-class c)))
#+cmu (pcl:finalize-inheritance cl)
#+cmu (pcl:finalize-inheritance cl)
- #+s
bcl (sb-pcl
:finalize-inheritance cl)))
+ #+s
cl (clos
:finalize-inheritance cl)))