X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=utils.lisp;h=974da721d318d7b6ba0ebb04ceb201ea3664a9ae;hb=aeade16272b79115d3f307906c7a3e9597137e97;hp=6b9e17eb63a11c8cad4469fd6e020658b3e57f5c;hpb=c7524b9cd7631b94729a20aac13c069ab7988233;p=umlisp.git

diff --git a/utils.lisp b/utils.lisp
index 6b9e17e..974da72 100644
--- a/utils.lisp
+++ b/utils.lisp
@@ -2,22 +2,22 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          utils.lisp
-;;;; Purpose:       Low-level utility functions for UMLisp
-;;;; Programmer:    Kevin M. Rosenberg
-;;;; Date Started:  Apr 2000
+;;;; Name:     utils.lisp
+;;;; Purpose:  Low-level utility functions for UMLisp
+;;;; Author:   Kevin M. Rosenberg
+;;;; Created:  Apr 2000
 ;;;;
-;;;; $Id: utils.lisp,v 1.3 2003/05/02 21:49:19 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of UMLisp, is
-;;;;    Copyright (c) 2000-2002 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.
 ;;;; *************************************************************************
  
-(in-package :umlisp)
-(declaim (optimize (speed 3) (safety 1) (compilation-speed 0) (debug 3)))
+(in-package #:umlisp)
+
 (declaim (inline make-cuisui make-cuilui parse-ui parse-cui))
 
 (defmacro def-metaclass-reader (field)
@@ -34,65 +34,73 @@
 
 (defun parse-ui (s &optional (nullvalue 0))
   "Return integer value for a UMLS unique identifier."
+  (declare (simple-string s)
+	   (optimize (speed 3) (safety 0)))
   (if (< (length s) 2)
       nullvalue
-    (parse-integer s :start 1)))
+    (nth-value 0 (parse-integer s :start 1))))
 
 (defun parse-cui (cui)
+  (declare (optimize (speed 3) (safety 0)))
   (if (stringp cui)
-      (let ((ch (aref cui 0)))
-	(if (eql ch #\C)
+      (let ((ch (schar cui 0)))
+	(if (char-equal ch #\C)
 	    (parse-ui cui)
-	  (parse-integer cui)))
+	    (nth-value 0 (parse-integer cui))))
     cui))
     
 (defun parse-lui (lui)
+  (declare (optimize (speed 3) (safety 0)))
   (if (stringp lui)
-      (let ((ch (aref lui 0)))
-	(if (eql ch #\L)
+      (let ((ch (schar lui 0)))
+	(if (char-equal ch #\L)
 	    (parse-ui lui)
-	  (parse-integer lui)))
+	    (nth-value 0 (parse-integer lui))))
     lui))
     
 (defun parse-sui (sui)
+  (declare (optimize (speed 3) (safety 0)))
   (if (stringp sui)
-      (let ((ch (aref sui 0)))
-	(if (eql ch #\S)
+      (let ((ch (schar sui 0)))
+	(if (char-equal ch #\S)
 	    (parse-ui sui)
-	  (parse-integer sui)))
+	    (nth-value 0 (parse-integer sui))))
     sui))
     
 (defun parse-tui (tui)
+  (declare (optimize (speed 3) (safety 0)))
   (if (stringp tui)
-      (let ((ch (aref tui 0)))
-	(if (eql ch #\T)
+      (let ((ch (schar tui 0)))
+	(if (char-equal ch #\T)
 	    (parse-ui tui)
-	  (parse-integer tui)))
+	    (nth-value 0 (parse-integer tui))))
     tui))
 
 (defun parse-eui (eui)
+  (declare (optimize (speed 3) (safety 0)))
   (if (stringp eui)
-      (let ((ch (aref eui 0)))
-	(if (eql ch #\E)
+      (let ((ch (schar eui 0)))
+	(if (char-equal ch #\E)
 	    (parse-ui eui)
-	  (parse-integer eui)))
+	    (nth-value 0 (parse-integer eui))))
     eui))
     
 (defconstant +cuisui-scale+ 10000000)
+(declaim (type fixnum +cuisui-scale+))
 
 (defun make-cuisui (cui sui)
-  (declare (fixnum cui sui))
-  (the integer (+ (* +cuisui-scale+ cui) sui)))
+  (declare (fixnum cui sui)
+	   (optimize (speed 3) (safety 0) (space 0)))
+  (+ (* +cuisui-scale+ cui) sui))
 
 (defun make-cuilui (cui lui)
-  (declare (fixnum cui lui))
-  (the integer (+ (* +cuisui-scale+ cui) lui)))
+  (declare (fixnum cui lui)
+	   (optimize (speed 3) (safety 0) (space 0)))
+  (+ (* +cuisui-scale+ cui) lui))
 
 (defun decompose-cuisui (cuisui)
-  (declare (integer cuisui))
-  (let* ((cui (the fixnum (truncate (/ cuisui +cuisui-scale+))))
-	(sui (the fixnum (- cuisui (* cui +cuisui-scale+)))))
-    (values cui sui)))
+  "Returns the CUI and SUI of a cuisui number"
+  (floor cuisui +cuisui-scale+))
 
 ;;; Lookup functions for uterms,ustr in ucons
 
@@ -103,11 +111,7 @@
   (find sui (s#str uterm) :key #'sui :test 'equal))
 
 (defun find-ustr-in-ucon (ucon sui)
-  (let ((found-ustr nil))
-    (dolist (uterm (s#term ucon))
-      (unless found-ustr
-	(dolist (ustr (s#str uterm))
-	  (unless found-ustr
-	    (when (string-equal sui (sui ustr))
-	      (setq found-ustr ustr))))))
-    found-ustr))
+  (dolist (uterm (s#term ucon))
+    (dolist (ustr (s#str uterm))
+      (when (string-equal sui (sui ustr))
+	(return-from find-ustr-in-ucon ustr)))))