From: Kevin M. Rosenberg Date: Thu, 21 Apr 2005 15:31:19 +0000 (+0000) Subject: r10435: 21 Apr 2005 Kevin Rosenberg X-Git-Tag: v3.8.6~164 X-Git-Url: http://git.kpe.io/?p=clsql.git;a=commitdiff_plain;h=daa416b0cddb7d18a9bc4c85988203aad4429ad6;ds=sidebyside r10435: 21 Apr 2005 Kevin Rosenberg * sql/syntax: Commit patch from Alan Shields to supress reader macros when *read-supress* is T. --- diff --git a/ChangeLog b/ChangeLog index 4f4a900..8dffcbf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +21 Apr 2005 Kevin Rosenberg + * sql/syntax: Commit patch from Alan Shields to supress reader + macros when *read-supress* is T. + 13 Apr 2005 Kevin Rosenberg * Version 3.1.10 * db-postgresql-socket/postgresql-socket-api.lisp: Commit patch diff --git a/sql/syntax.lisp b/sql/syntax.lisp index a898dfb..5ad83d8 100644 --- a/sql/syntax.lisp +++ b/sql/syntax.lisp @@ -88,18 +88,19 @@ reader syntax is disabled." (defun sql-reader-open (stream char) (declare (ignore char)) (let ((sqllist (read-delimited-list #\] stream t))) - (handler-case - (cond ((string= (write-to-string (car sqllist)) "||") - (cons (sql-operator 'concat-op) (cdr sqllist))) - ((and (= (length sqllist) 1) (eql (car sqllist) '*)) - (apply #'generate-sql-reference sqllist)) - ((sql-operator (car sqllist)) - (cons (sql-operator (car sqllist)) (cdr sqllist))) - (t (apply #'generate-sql-reference sqllist))) - (sql-user-error (c) - (error 'sql-user-error - :message (format nil "Error ~A occured while attempting to parse '~A' at file position ~A" - (sql-user-error-message c) sqllist (file-position stream))))))) + (unless *read-suppress* + (handler-case + (cond ((string= (write-to-string (car sqllist)) "||") + (cons (sql-operator 'concat-op) (cdr sqllist))) + ((and (= (length sqllist) 1) (eql (car sqllist) '*)) + (apply #'generate-sql-reference sqllist)) + ((sql-operator (car sqllist)) + (cons (sql-operator (car sqllist)) (cdr sqllist))) + (t (apply #'generate-sql-reference sqllist))) + (sql-user-error (c) + (error 'sql-user-error + :message (format nil "Error ~A occured while attempting to parse '~A' at file position ~A" + (sql-user-error-message c) sqllist (file-position stream)))))))) (defun disable-sql-close-syntax () "Internal function that disables the close syntax when leaving