r5361: *** empty log message ***

[umlisp.git] / utils.lisp

diff --git a/utils.lisp b/utils.lisp
index 8f00b3daf54551f360e654a2ace83f1fac301842..1be342cc855f65d3e92dd897d44e57e647e105ae 100644 (file)
--- a/utils.lisp
+++ b/utils.lisp
@@ -7,7 +7,7 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: utils.lisp,v 1.8 2003/06/10 22:57:45 kevin Exp $
+;;;; $Id: utils.lisp,v 1.10 2003/07/19 20:32:48 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2003 by Kevin M. Rosenberg, M.D.
@@ -40,40 +40,40 @@
 
 (defun parse-cui (cui)
   (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)
            (nth-value 0 (parse-integer cui))))
     cui))
     
 (defun parse-lui (lui)
   (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)
            (nth-value 0 (parse-integer lui))))
     lui))
     
 (defun parse-sui (sui)
   (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)
            (nth-value 0 (parse-integer sui))))
     sui))
     
 (defun parse-tui (tui)
   (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)
            (nth-value 0 (parse-integer tui))))
     tui))
 
 (defun parse-eui (eui)
   (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)
            (nth-value 0 (parse-integer eui))))
     eui))
@@ -87,7 +87,7 @@
   (+ (* +cuisui-scale+ cui) sui))
 
 (defun make-cuilui (cui lui)
-  (declare (fixnum cui sui)
+  (declare (fixnum cui lui)
           (optimize (speed 3) (safety 0) (space 0)))
   (+ (* +cuisui-scale+ cui) lui))