r11478: generate custom columns by dynamically finding position of dependant columns...

[umlisp.git] / utils.lisp

diff --git a/utils.lisp b/utils.lisp
index ba75eea82c7fb4074c3500a30e9f7523e1088e72..358a1413bbcca0741711fdd61be38cca11011241 100644 (file)
--- a/utils.lisp
+++ b/utils.lisp
@@ -35,10 +35,10 @@
 (defun parse-ui (s &optional (nullvalue 0))
   "Return integer value for a UMLS unique identifier."
   (declare (simple-string s)
-          (optimize (speed 3) (safety 0)))
+           (optimize (speed 3) (safety 0)))
   (if (< (length s) 2)
       nullvalue
-    (nth-value 0 (parse-integer s :start 1))))
+      (nth-value 0 (parse-integer s :start 1))))
 
 (defun parse-cui (cui)
   (declare (optimize (speed 3) (safety 0)))
@@ -115,9 +115,10 @@
 
 #-(or 64bit x86-64)
 (defun make-cuisui (cui sui)
-  (declare (fixnum cui sui)
-          (optimize (speed 3) (safety 0) (space 0)))
-  (+ (* +cuisui-scale+ cui) sui))
+  (when (and cui sui)
+    (locally (declare (fixnum cui sui)
+                      (optimize (speed 3) (safety 0) (space 0)))
+             (+ (* +cuisui-scale+ cui) sui))))
 
 #+(or 64bit x86-64)
 (defun make-cuilui (cui lui)