projects
/
umlisp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r11140: do not export internal functions
[umlisp.git]
/
utils.lisp
diff --git
a/utils.lisp
b/utils.lisp
index 974da721d318d7b6ba0ebb04ceb201ea3664a9ae..7fa3395f2ca870887c308b0c920f5854d4c88e4b 100644
(file)
--- a/
utils.lisp
+++ b/
utils.lisp
@@
-10,7
+10,7
@@
;;;; $Id$
;;;;
;;;; This file, part of UMLisp, is
;;;; $Id$
;;;;
;;;; This file, part of UMLisp, is
-;;;; Copyright (c) 2000-200
4
by Kevin M. Rosenberg, M.D.
+;;;; Copyright (c) 2000-200
6
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.
@@
-76,6
+76,15
@@
(nth-value 0 (parse-integer tui))))
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-eui (eui)
(declare (optimize (speed 3) (safety 0)))
(if (stringp eui)
(defun parse-eui (eui)
(declare (optimize (speed 3) (safety 0)))
(if (stringp eui)
@@
-86,13
+95,29
@@
eui))
(defconstant +cuisui-scale+ 10000000)
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))
(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)))
(defun make-cuilui (cui lui)
(declare (fixnum cui lui)
(optimize (speed 3) (safety 0) (space 0)))
@@
-100,6
+125,8
@@
(defun decompose-cuisui (cuisui)
"Returns the CUI and SUI of a cuisui number"
(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
(floor cuisui +cuisui-scale+))
;;; Lookup functions for uterms,ustr in ucons