X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=utils.lisp;fp=utils.lisp;h=07f297bb8f7391b1515384ca8ae56777ee4c8933;hb=2038ce2f480179fd23cb3ded6fa1250e61e22029;hp=6c7d08fa7476b00f57e292b6394f293e07203822;hpb=7d5546141bd1916109792db767431dd8e3e1fe64;p=umlisp.git

diff --git a/utils.lisp b/utils.lisp
index 6c7d08f..07f297b 100644
--- a/utils.lisp
+++ b/utils.lisp
@@ -7,10 +7,10 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: utils.lisp,v 1.6 2003/05/06 02:36:58 kevin Exp $
+;;;; $Id: utils.lisp,v 1.7 2003/06/10 22:30:16 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
-;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
+;;;;    Copyright (c) 2000-2003 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)
@@ -82,11 +79,16 @@
     eui))
     
 (defconstant +cuisui-scale+ 10000000)
+(proclaim (type fixnum +cuisui-scale+))
 
 (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)
+  (declare (fixnum cui sui)
+	   (optimize (speed 3) (safety 0) (space 0)))
   (+ (* +cuisui-scale+ cui) lui))
 
 (defun decompose-cuisui (cuisui)