projects
/
umlisp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r9077: Automated commit for Debian build of umlisp upstream-version-3.2.4
[umlisp.git]
/
utils.lisp
diff --git
a/utils.lisp
b/utils.lisp
index d2a5dd80a2331f6e25b6ab4d17f73349864674f4..1e4a70a4a67306cbc14677786d7104e7b13f797e 100644
(file)
--- a/
utils.lisp
+++ b/
utils.lisp
@@
-7,10
+7,10
@@
;;;; Author: Kevin M. Rosenberg
;;;; Date Started: Apr 2000
;;;;
;;;; Author: Kevin M. Rosenberg
;;;; Date Started: Apr 2000
;;;;
-;;;; $Id
: utils.lisp,v 1.4 2003/05/06 02:14:59 kevin Exp
$
+;;;; $Id$
;;;;
;;;; This file, part of UMLisp, is
;;;;
;;;; This file, part of UMLisp, is
-;;;; Copyright (c) 2000-200
2
by Kevin M. Rosenberg, M.D.
+;;;; Copyright (c) 2000-200
3
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.
;;;;
;;;; 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)
(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)
(declaim (inline make-cuisui make-cuilui parse-ui parse-cui))
(defmacro def-metaclass-reader (field)
@@
-39,59
+36,64
@@
"Return integer value for a UMLS unique identifier."
(if (< (length s) 2)
nullvalue
"Return integer value for a UMLS unique identifier."
(if (< (length s) 2)
nullvalue
- (
parse-integer s :start 1
)))
+ (
nth-value 0 (parse-integer s :start 1)
)))
(defun parse-cui (cui)
(if (stringp cui)
(defun parse-cui (cui)
(if (stringp cui)
- (let ((ch (
aref
cui 0)))
- (if (
eq
l ch #\C)
+ (let ((ch (
char
cui 0)))
+ (if (
char-equa
l ch #\C)
(parse-ui cui)
(parse-ui cui)
-
(parse-integer cui
)))
+
(nth-value 0 (parse-integer cui)
)))
cui))
(defun parse-lui (lui)
(if (stringp lui)
cui))
(defun parse-lui (lui)
(if (stringp lui)
- (let ((ch (
aref
lui 0)))
- (if (
eq
l ch #\L)
+ (let ((ch (
char
lui 0)))
+ (if (
char-equa
l ch #\L)
(parse-ui lui)
(parse-ui lui)
-
(parse-integer lui
)))
+
(nth-value 0 (parse-integer lui)
)))
lui))
(defun parse-sui (sui)
(if (stringp sui)
lui))
(defun parse-sui (sui)
(if (stringp sui)
- (let ((ch (
aref
sui 0)))
- (if (
eq
l ch #\S)
+ (let ((ch (
char
sui 0)))
+ (if (
char-equa
l ch #\S)
(parse-ui sui)
(parse-ui sui)
-
(parse-integer sui
)))
+
(nth-value 0 (parse-integer sui)
)))
sui))
(defun parse-tui (tui)
(if (stringp tui)
sui))
(defun parse-tui (tui)
(if (stringp tui)
- (let ((ch (
aref
tui 0)))
- (if (
eq
l ch #\T)
+ (let ((ch (
char
tui 0)))
+ (if (
char-equa
l ch #\T)
(parse-ui tui)
(parse-ui tui)
-
(parse-integer tui
)))
+
(nth-value 0 (parse-integer tui)
)))
tui))
(defun parse-eui (eui)
(if (stringp eui)
tui))
(defun parse-eui (eui)
(if (stringp eui)
- (let ((ch (
aref
eui 0)))
- (if (
eq
l ch #\E)
+ (let ((ch (
char
eui 0)))
+ (if (
char-equa
l ch #\E)
(parse-ui eui)
(parse-ui eui)
-
(parse-integer eui
)))
+
(nth-value 0 (parse-integer eui)
)))
eui))
(defconstant +cuisui-scale+ 10000000)
eui))
(defconstant +cuisui-scale+ 10000000)
+(declaim (type fixnum +cuisui-scale+))
(defun make-cuisui (cui sui)
(defun make-cuisui (cui sui)
+ (declare (fixnum cui sui)
+ (optimize (speed 3) (safety 0) (space 0)))
(+ (* +cuisui-scale+ cui) sui))
(defun make-cuilui (cui lui)
(+ (* +cuisui-scale+ cui) sui))
(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"
(+ (* +cuisui-scale+ cui) lui))
(defun decompose-cuisui (cuisui)
"Returns the CUI and SUI of a cuisui number"
- (floor cuisui
cuisui
+cuisui-scale+))
+ (floor cuisui +cuisui-scale+))
;;; Lookup functions for uterms,ustr in ucons
;;; Lookup functions for uterms,ustr in ucons