r11207: 03 Oct 2006 Kevin Rosenberg <kevin@rosenberg.net>

        * sql/syntax.lisp: Commit patch from Marcus Pearce to improve
        readtable modifications

diff --git a/ChangeLog b/ChangeLog
index 4fdb45fe565358e2cbcf8a18d602b3d3eed940d7..dbb0d606c2d565d9e7c3ab2a0a8aff7c28b939ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+03 Oct 2006  Kevin Rosenberg <kevin@rosenberg.net>
+       * sql/syntax.lisp: Commit patch from Marcus Pearce to improve
+       readtable modifications
+

 02 Oct 2006  Kevin Rosenberg <kevin@rosenberg.net>
        * sql/syntax.lisp: Check that original reader syntax functions
        stored before trying to restore them.
 02 Oct 2006  Kevin Rosenberg <kevin@rosenberg.net>
        * sql/syntax.lisp: Check that original reader syntax functions
        stored before trying to restore them.

diff --git a/debian/changelog b/debian/changelog
index 5790452ac4e1f999ba1d24718eb43c42e02db597..6b59a0a58be4e64b65931fae93165f2cf86cbb9a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-sql (3.7.4-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Tue,  3 Oct 2006 05:01:09 -0600
+

 cl-sql (3.7.3-1) unstable; urgency=low
 
   * New upstream
 cl-sql (3.7.3-1) unstable; urgency=low
 
   * New upstream

diff --git a/sql/syntax.lisp b/sql/syntax.lisp
index c0e8487ba1edc355e78303ff8260cad0d17143c7..f00545e9c22d288fd2afffbf985790e1264195e5 100644 (file)
--- a/sql/syntax.lisp
+++ b/sql/syntax.lisp
@@ -16,9 +16,7 @@
 
 (in-package #:clsql-sys)
 
 
 (in-package #:clsql-sys)
 

-(defvar *original-reader-enter* nil)
-
-(defvar *original-reader-exit* nil)
+(defvar *original-readtable* nil)

 
 (defvar *sql-macro-open-char* #\[)
 
 
 (defvar *sql-macro-open-char* #\[)
 


@@ -45,10 +43,9 @@ the current syntax state."
     (%disable-sql-reader-syntax)))
 
 (defun %disable-sql-reader-syntax ()
     (%disable-sql-reader-syntax)))
 
 (defun %disable-sql-reader-syntax ()

-  (when *original-reader-enter*
-    (set-macro-character *sql-macro-open-char* *original-reader-enter*))
-  (when *original-reader-exit*
-    (set-macro-character *sql-macro-close-char* *original-reader-exit*))
+  (when *original-readtable* 
+    (setf *readtable* *original-readtable*
+          *original-readtable* nil))

   (values))
 
 
   (values))
 
 


@@ -70,12 +67,10 @@ the current syntax state."
     (%enable-sql-reader-syntax)))
 
 (defun %enable-sql-reader-syntax ()
     (%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))
 
     (set-macro-character *sql-macro-close-char* (get-macro-character #\))))
   (values))