X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=sql%2Fsyntax.lisp;h=f00545e9c22d288fd2afffbf985790e1264195e5;hp=be92ab507be713519597a9ffd9a93562ae7c6fca;hb=837ef5c074e599060d89b5fd51abbe6fcd960094;hpb=edb8adb0dabcbdbfa7be63a749c20cada389e598

diff --git a/sql/syntax.lisp b/sql/syntax.lisp
index be92ab5..f00545e 100644
--- a/sql/syntax.lisp
+++ b/sql/syntax.lisp
@@ -16,9 +16,7 @@
 
 (in-package #:clsql-sys)
 
-(defvar *original-reader-enter* nil)
-
-(defvar *original-reader-exit* nil)
+(defvar *original-readtable* nil)
 
 (defvar *sql-macro-open-char* #\[)
 
@@ -45,8 +43,9 @@ the current syntax state."
     (%disable-sql-reader-syntax)))
 
 (defun %disable-sql-reader-syntax ()
-  (set-macro-character *sql-macro-open-char* *original-reader-enter*)
-  (set-macro-character *sql-macro-close-char* *original-reader-exit*)
+  (when *original-readtable* 
+    (setf *readtable* *original-readtable*
+          *original-readtable* nil))
   (values))
 
 
@@ -68,12 +67,10 @@ the current syntax state."
     (%enable-sql-reader-syntax)))
 
 (defun %enable-sql-reader-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*))
+  (unless *original-readtable*
+    (setf *original-readtable* *readtable*
+          *readtable* (copy-readtable))
+    (set-macro-character *sql-macro-open-char* #'sql-reader-open)
     (set-macro-character *sql-macro-close-char* (get-macro-character #\))))
   (values))