X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=utils.lisp;h=416405f9647f9501f0104b18aac6217b734f582f;hb=01888d11a058ecc8c1dcde23291f9cfbb3a307c0;hp=358a1413bbcca0741711fdd61be38cca11011241;hpb=c01a3503e58ba9d4e7fadb42f3f0f69c38496e10;p=umlisp.git diff --git a/utils.lisp b/utils.lisp index 358a141..416405f 100644 --- a/utils.lisp +++ b/utils.lisp @@ -44,53 +44,53 @@ (declare (optimize (speed 3) (safety 0))) (if (stringp cui) (let ((ch (schar cui 0))) - (if (char-equal ch #\C) - (parse-ui cui) - (nth-value 0 (parse-integer cui)))) + (if (char-equal ch #\C) + (parse-ui cui) + (nth-value 0 (parse-integer cui)))) cui)) (defun parse-lui (lui) (declare (optimize (speed 3) (safety 0))) (if (stringp lui) (let ((ch (schar lui 0))) - (if (char-equal ch #\L) - (parse-ui lui) - (nth-value 0 (parse-integer lui)))) + (if (char-equal ch #\L) + (parse-ui lui) + (nth-value 0 (parse-integer lui)))) lui)) (defun parse-sui (sui) (declare (optimize (speed 3) (safety 0))) (if (stringp sui) (let ((ch (schar sui 0))) - (if (char-equal ch #\S) - (parse-ui sui) - (nth-value 0 (parse-integer sui)))) + (if (char-equal ch #\S) + (parse-ui sui) + (nth-value 0 (parse-integer sui)))) sui)) (defun parse-tui (tui) (declare (optimize (speed 3) (safety 0))) (if (stringp tui) (let ((ch (schar tui 0))) - (if (char-equal ch #\T) - (parse-ui tui) - (nth-value 0 (parse-integer tui)))) + (if (char-equal ch #\T) + (parse-ui 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)))) + (if (char-equal ch #\A) + (parse-ui aui) + (nth-value 0 (parse-integer aui)))) aui)) (defun parse-rui (rui) (declare (optimize (speed 3) (safety 0))) (if (stringp rui) (let ((ch (schar rui 0))) - (if (char-equal ch #\R) - (parse-ui rui) + (if (char-equal ch #\R) + (parse-ui rui) (nth-value 0 (parse-integer rui)))) rui)) @@ -98,9 +98,9 @@ (declare (optimize (speed 3) (safety 0))) (if (stringp eui) (let ((ch (schar eui 0))) - (if (char-equal ch #\E) - (parse-ui eui) - (nth-value 0 (parse-integer eui)))) + (if (char-equal ch #\E) + (parse-ui eui) + (nth-value 0 (parse-integer eui)))) eui)) (defconstant +cuisui-scale+ 10000000) @@ -130,7 +130,7 @@ #-(or 64bit x86-64) (defun make-cuilui (cui lui) (declare (fixnum cui lui) - (optimize (speed 3) (safety 0) (space 0))) + (optimize (speed 3) (safety 0) (space 0))) (+ (* +cuisui-scale+ cui) lui)) (defun decompose-cuisui (cuisui) @@ -151,4 +151,4 @@ (dolist (uterm (s#term ucon)) (dolist (ustr (s#str uterm)) (when (string-equal sui (sui ustr)) - (return-from find-ustr-in-ucon ustr))))) + (return-from find-ustr-in-ucon ustr)))))