From: Kevin M. Rosenberg Date: Fri, 13 May 2005 01:09:04 +0000 (+0000) Subject: r10536: 11 May 2005 Kevin Rosenberg X-Git-Tag: v3.8.6~151 X-Git-Url: http://git.kpe.io/?p=clsql.git;a=commitdiff_plain;h=67a677df17f4af2cbf6e57294605f2454c392e00 r10536: 11 May 2005 Kevin Rosenberg * sql/expressions.lisp: Avoid using simple-string declaration when a non-simple string may be encountered. [issue noted by will@cesmail.net] Add a simple-string declaration for a local string generated. --- diff --git a/ChangeLog b/ChangeLog index 1b4dd49..a43a34c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +11 May 2005 Kevin Rosenberg + * sql/expressions.lisp: Avoid using simple-string declaration when + a non-simple string may be encountered. [issue noted by + will@cesmail.net] Add a simple-string declaration for a local + string generated. + 06 May 2005 Kevin Rosenberg * sql/oodml.lisp: Change db-writer and db-reader processing to accept a symbol as well as function to serve as a function designator diff --git a/sql/expressions.lisp b/sql/expressions.lisp index 96013de..2098cf3 100644 --- a/sql/expressions.lisp +++ b/sql/expressions.lisp @@ -831,8 +831,7 @@ uninclusive, and the args from that keyword to the end." (defmethod database-output-sql ((str string) database) (declare (optimize (speed 3) (safety 1) - #+cmu (extensions:inhibit-warnings 3)) - (simple-string str)) + #+cmu (extensions:inhibit-warnings 3))) (let ((len (length str))) (declare (type fixnum len)) (cond ((zerop len) @@ -842,7 +841,8 @@ uninclusive, and the args from that keyword to the end." (concatenate 'string "'" str "'")) (t (let ((buf (make-string (+ (* len 2) 2) :initial-element #\'))) - (do* ((i 0 (incf i)) + (declare (simple-string buf)) + (do* ((i 0 (incf i)) (j 1 (incf j))) ((= i len) (subseq buf 0 (1+ j))) (declare (type fixnum i j))