X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=class-support.lisp;h=89dbd6e2b5d399236e93d1805a908900c1124719;hb=aeade16272b79115d3f307906c7a3e9597137e97;hp=a085828956576010adfb476ebf66fd5a30da0af6;hpb=66261c2e75caf0c281ea9e5c21e99b024a0f33da;p=umlisp.git

diff --git a/class-support.lisp b/class-support.lisp
index a085828..89dbd6e 100644
--- a/class-support.lisp
+++ b/class-support.lisp
@@ -2,15 +2,15 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:         classes-support.lisp
-;;;; Purpose:      Support for UMLisp classes
-;;;; Author:       Kevin M. Rosenberg
-;;;; Date Started: Apr 2000
+;;;; Name:     classes-support.lisp
+;;;; Purpose:  Support for UMLisp classes
+;;;; Author:   Kevin M. Rosenberg
+;;;; Created:  Apr 2000
 ;;;;
-;;;; $Id: class-support.lisp,v 1.19 2003/07/21 08:41:44 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of UMLisp, is
-;;;;    Copyright (c) 2000-2003 by Kevin M. Rosenberg, M.D.
+;;;;    Copyright (c) 2000-2004 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,7 +18,6 @@
 
 (in-package #:umlisp)
 
-
 ;;; Formatting routines
 
 (defgeneric fmt-cui (c))
@@ -170,11 +169,12 @@
 
 (defmethod mesh-number ((ustr ustr))
   (let ((codes
-	 (filter (lambda (sat)
-		   (when (and (string-equal "MSH" (sab sat))
-			      (string-equal "MN" (atn sat)))
-		     (atv sat)))
-		 (s#sat ustr))))
+	 (map-and-remove-nils
+	  (lambda (sat)
+	    (when (and (string-equal "MSH" (sab sat))
+		       (string-equal "MN" (atn sat)))
+	      (atv sat)))
+	  (s#sat ustr))))
     (if (= 1 (length codes))
 	(car codes)
       codes)))