r11199: 20 Sep 2006 Kevin Rosenberg <kevin@rosenberg.net>

[clsql.git] / sql / syntax.lisp

diff --git a/sql/syntax.lisp b/sql/syntax.lisp
index 5ad83d8ca2c27f6ed6859cf7845abf823191e389..be92ab507be713519597a9ffd9a93562ae7c6fca 100644 (file)
--- a/sql/syntax.lisp
+++ b/sql/syntax.lisp
@@ -45,9 +45,8 @@ the current syntax state."
     (%disable-sql-reader-syntax)))
 
 (defun %disable-sql-reader-syntax ()
-  (when *original-reader-enter*
-    (set-macro-character *sql-macro-open-char* *original-reader-enter*))
-  (setf *original-reader-enter* nil)
+  (set-macro-character *sql-macro-open-char* *original-reader-enter*)
+  (set-macro-character *sql-macro-close-char* *original-reader-exit*)
   (values))
 
 
@@ -69,10 +68,13 @@ the current syntax state."
     (%enable-sql-reader-syntax)))
 
 (defun %enable-sql-reader-syntax ()
-  (unless *original-reader-enter*
-    (setf *original-reader-enter* (get-macro-character *sql-macro-open-char*)))
-  (set-macro-character *sql-macro-open-char* #'sql-reader-open)
-  (enable-sql-close-syntax)
+  (unless (eq (get-macro-character *sql-macro-open-char*) #'sql-reader-open)
+    (setf *original-reader-enter* (get-macro-character *sql-macro-open-char*))
+    (set-macro-character *sql-macro-open-char* #'sql-reader-open))
+  (unless (eq (get-macro-character *sql-macro-close-char*) 
+              (get-macro-character #\)))
+    (setf *original-reader-exit* (get-macro-character *sql-macro-close-char*))
+    (set-macro-character *sql-macro-close-char* (get-macro-character #\))))
   (values))
 
 (defmacro restore-sql-reader-syntax-state ()
@@ -102,18 +104,6 @@ reader syntax is disabled."
                 :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
-  sql context."
-  (set-macro-character *sql-macro-close-char* *original-reader-exit*)
-  (setf *original-reader-exit* nil))
-
-(defun enable-sql-close-syntax ()
-  "Internal function that enables close syntax when entering SQL
-  context."
-  (setf *original-reader-exit* (get-macro-character *sql-macro-close-char*))
-  (set-macro-character *sql-macro-close-char* (get-macro-character #\))))
-
 (defun generate-sql-reference (&rest arglist)
   (cond ((= (length arglist) 1)        ; string, table or attribute
         (if (stringp (car arglist))