X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=utils.lisp;h=9fc23e4b8befa07d6a6a60c3819f1076d4009a51;hb=cdaa9cb65482eaca5a8eafbbe7b3bec9fb157512;hp=1e4a70a4a67306cbc14677786d7104e7b13f797e;hpb=7c24d71d4e9bcd08dae31577407bd51982d173c0;p=umlisp.git

diff --git a/utils.lisp b/utils.lisp
index 1e4a70a..9fc23e4 100644
--- a/utils.lisp
+++ b/utils.lisp
@@ -2,15 +2,15 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          utils.lisp
-;;;; Purpose:       Low-level utility functions for UMLisp
-;;;; Author:        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$
 ;;;;
 ;;;; This file, part of UMLisp, is
-;;;;    Copyright (c) 2000-2003 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.
@@ -34,58 +34,99 @@
 
 (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
     (nth-value 0 (parse-integer s :start 1))))
 
 (defun parse-cui (cui)
+  (declare (optimize (speed 3) (safety 0)))
   (if (stringp cui)
-      (let ((ch (char cui 0)))
+      (let ((ch (schar cui 0)))
 	(if (char-equal ch #\C)
 	    (parse-ui cui)
 	    (nth-value 0 (parse-integer cui))))
     cui))
     
 (defun parse-lui (lui)
+  (declare (optimize (speed 3) (safety 0)))
   (if (stringp lui)
-      (let ((ch (char lui 0)))
+      (let ((ch (schar lui 0)))
 	(if (char-equal ch #\L)
 	    (parse-ui lui)
 	    (nth-value 0 (parse-integer lui))))
     lui))
     
 (defun parse-sui (sui)
+  (declare (optimize (speed 3) (safety 0)))
   (if (stringp sui)
-      (let ((ch (char sui 0)))
+      (let ((ch (schar sui 0)))
 	(if (char-equal ch #\S)
 	    (parse-ui sui)
 	    (nth-value 0 (parse-integer sui))))
     sui))
     
 (defun parse-tui (tui)
+  (declare (optimize (speed 3) (safety 0)))
   (if (stringp tui)
-      (let ((ch (char tui 0)))
+      (let ((ch (schar tui 0)))
 	(if (char-equal ch #\T)
 	    (parse-ui tui)
 	    (nth-value 0 (parse-integer tui))))
     tui))
 
+(defun parse-aui (aui)
+  (declare (optimize (speed 3) (safety 0)))
+  (if (stringp aui)
+      (let ((ch (schar aui 0)))
+	(if (char-equal ch #\A)
+	    (parse-ui aui)
+	    (nth-value 0 (parse-integer aui))))
+    aui))
+
+(defun parse-rui (rui)
+  (declare (optimize (speed 3) (safety 0)))
+  (if (stringp rui)
+      (let ((ch (schar rui 0)))
+	(if (char-equal ch #\R)
+	    (parse-ui rui)
+          (nth-value 0 (parse-integer rui))))
+    rui))
+
 (defun parse-eui (eui)
+  (declare (optimize (speed 3) (safety 0)))
   (if (stringp eui)
-      (let ((ch (char eui 0)))
+      (let ((ch (schar eui 0)))
 	(if (char-equal ch #\E)
 	    (parse-ui eui)
 	    (nth-value 0 (parse-integer eui))))
     eui))
     
 (defconstant +cuisui-scale+ 10000000)
-(declaim (type fixnum +cuisui-scale+))
+(declaim (type (integer 0 10000000) +cuisui-scale+))
+
+#+64bit
+(defun make-cuisui (cui sui)
+  (declare (fixnum cui sui)
+	   (optimize (speed 3) (safety 0) (space 0)))
+  (the fixnum 
+    (+ (the fixnum (* +cuisui-scale+ cui)) sui)))
 
+#-64bit
 (defun make-cuisui (cui sui)
   (declare (fixnum cui sui)
 	   (optimize (speed 3) (safety 0) (space 0)))
   (+ (* +cuisui-scale+ cui) sui))
 
+#+64bit
+(defun make-cuilui (cui lui)
+  (declare (fixnum cui lui)
+	   (optimize (speed 3) (safety 0) (space 0)))
+  (the fixnum 
+    (+ (the fixnum (* +cuisui-scale+ cui)) lui)))
+
+#-64bit
 (defun make-cuilui (cui lui)
   (declare (fixnum cui lui)
 	   (optimize (speed 3) (safety 0) (space 0)))
@@ -93,6 +134,8 @@
 
 (defun decompose-cuisui (cuisui)
   "Returns the CUI and SUI of a cuisui number"
+  #-64bit (declare (integer cuisui))
+  #+64bit (declare (fixnum cuisui))
   (floor cuisui +cuisui-scale+))
 
 ;;; Lookup functions for uterms,ustr in ucons