r11209: fix test

[umlisp.git] / utils.lisp

diff --git a/utils.lisp b/utils.lisp
index d2a5dd80a2331f6e25b6ab4d17f73349864674f4..9fc23e4b8befa07d6a6a60c3819f1076d4009a51 100644 (file)
--- 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: utils.lisp,v 1.4 2003/05/06 02:14:59 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,9 +18,6 @@
  
 (in-package #:umlisp)
 
-(eval-when (:compile-toplevel)
-  (declaim (optimize (speed 3) (safety 1) (compilation-speed 0) (debug 3))))
-
 (declaim (inline make-cuisui make-cuilui parse-ui parse-cui))
 
 (defmacro def-metaclass-reader (field)
@@ -37,61 +34,109 @@
 
 (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-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 (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 (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)))
   (+ (* +cuisui-scale+ cui) lui))
 
 (defun decompose-cuisui (cuisui)
   "Returns the CUI and SUI of a cuisui number"
-  (floor cuisui cuisui +cuisui-scale+))
+  #-64bit (declare (integer cuisui))
+  #+64bit (declare (fixnum cuisui))
+  (floor cuisui +cuisui-scale+))
 
 ;;; Lookup functions for uterms,ustr in ucons