X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=sql%2Fsyntax.lisp;h=5ad83d8ca2c27f6ed6859cf7845abf823191e389;hp=eb19060c4b6ad655eab3c542d1a1482aa03a7925;hb=f6ab1b1e5f2cac1257f2a37de4260840c3204d51;hpb=528064c179b6b74f0a9d6a43c42e71de3f0e9a3a

diff --git a/sql/syntax.lisp b/sql/syntax.lisp
index eb19060..5ad83d8 100644
--- a/sql/syntax.lisp
+++ b/sql/syntax.lisp
@@ -88,13 +88,19 @@ reader syntax is disabled."
 (defun sql-reader-open (stream char)
   (declare (ignore char))
   (let ((sqllist (read-delimited-list #\] stream t)))
-    (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)))))
+    (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