Use named-readtables.

closure-common/package.lisp

@@ -9,7 +9,7 @@
 (in-package :cl-user)
 
 (defpackage :fxml.runes
-  (:use :cl #-scl :trivial-gray-streams)
+  (:use :cl #-scl :trivial-gray-streams :named-readtables)
   (:export #:definline
 
            ;; runes.lisp
@@ -90,9 +90,8 @@
 	   #:make-octet-input-stream))
 
 (defpackage :fxml.utf8-runes
-  (:use :cl)
-  (:export *utf8-runes-readtable*
-	   #:rune #:rod #:simple-rod #:rod-string #:rod= #:make-rod
+  (:use :cl :named-readtables)
+  (:export #:rune #:rod #:simple-rod #:rod-string #:rod= #:make-rod
 	   #:string-rod))
 
 (defpackage :fxml.runes-encoding

closure-common/stream-scl.lisp

@@ -23,6 +23,7 @@
 ;;; Boston, MA  02111-1307  USA.
 
 (in-package :fxml.runes)
+(in-readtable :runes)
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defparameter *fast* '(optimize (speed 3) (safety 3))))

closure-common/syntax.lisp

@@ -148,8 +148,6 @@
   subchar arg
   (values (rune-from-read-name (read-rune-name stream))))
 
-(set-dispatch-macro-character #\# #\/ 'rune-reader)
-
 ;;; ROD ext syntax
 
 (defun rod-reader (stream subchar arg)
@@ -178,4 +176,9 @@
                (format stream "\\u~4,'0X" x))))
   (princ #\" stream))
 
-(set-dispatch-macro-character #\# #\" 'rod-reader)
+;;; Readtable.
+
+(defreadtable :runes
+  (:merge :standard)
+  (:dispatch-macro-char #\# #\" 'rod-reader)
+  (:dispatch-macro-char #\# #\/ 'rune-reader))

closure-common/utf8.lisp

@@ -29,8 +29,7 @@
 (defun rod-reader (stream subchar arg)
   (fxml.runes::rod-string (fxml.runes::rod-reader stream subchar arg)))
 
-(setf closure-common-system:*utf8-runes-readtable*
-      (let ((rt (copy-readtable)))
-	(set-dispatch-macro-character #\# #\/ 'rune-reader rt)
-	(set-dispatch-macro-character #\# #\" 'rod-reader rt)
-	rt))
+(defreadtable :utf8-runes
+  (:merge :standard)
+  (:dispatch-macro-char #\# #\/ #'rune-reader)
+  (:dispatch-macro-char #\# #\" #'rod-reader))

closure-common/xstream.lisp

@@ -23,6 +23,7 @@
 ;;; Boston, MA  02111-1307  USA.
 
 (in-package :fxml.runes)
+(in-readtable :runes)
 
 ;;; API
 ;; 

closure-common/ystream.lisp

@@ -4,6 +4,7 @@
 ;;; ystream (for lack of a better name): a rune output "stream"
 
 (in-package :fxml.runes)
+(in-readtable :runes)
 
 (defconstant +ystream-bufsize+ 1024)
 

dom/dom-builder.lisp

@@ -8,23 +8,24 @@
 ;;;; Author: David Lichteblau <david@lichteblau.com>
 ;;;; Author: knowledgeTools Int. GmbH
 
-#-fxml-system::utf8dom-file
+#-rune-is-integer
 (in-package :fxml.rune-dom)
 
-#+fxml-system::utf8dom-file
+#+rune-is-integer
 (in-package :fxml.utf8-dom)
 
+#-rune-is-integer
+(in-readtable :runes)
+#+rune-is-integer
+(in-readtable :utf8-runes)
+
 
 (defclass dom-builder (fxml.sax:content-handler)
   ((document      :initform nil :accessor document)
    (element-stack :initform '() :accessor element-stack)
    (internal-subset             :accessor internal-subset)
    (text-buffer   :initform nil :accessor text-buffer)))
 
-#+(and rune-is-integer (not fxml-system::utf8dom-file))
-(defmethod fxml.hax:%want-strings-p ((handler dom-builder))
-  nil)
-
 (defun make-dom-builder ()
   (make-instance 'dom-builder))
 

dom/dom-impl.lisp

@@ -7,24 +7,29 @@
 ;;;; Author: David Lichteblau <david@lichteblau.com>
 ;;;; Author: knowledgeTools Int. GmbH
 
-#-fxml-system::utf8dom-file
+#-rune-is-integer
 (defpackage :fxml.rune-dom
-  (:use :cl :fxml.runes)
+  (:use :cl :fxml.runes :named-readtables)
   #+rune-is-character (:nicknames :fxml-dom)
   (:export #:implementation #:make-dom-builder #:create-document))
 
-#+fxml-system::utf8dom-file
+#+rune-is-integer
 (defpackage :fxml.utf8-dom
   (:use :cl :fxml.utf8-runes)
   (:nicknames :fxml-dom)
   (:export #:implementation #:make-dom-builder #:create-document))
 
-#-fxml-system::utf8dom-file
+#-rune-is-integer
 (in-package :fxml.rune-dom)
 
-#+fxml-system::utf8dom-file
+#+rune-is-integer
 (in-package :fxml.utf8-dom)
 
+#-rune-is-integer
+(in-readtable :runes)
+#+rune-is-integer
+(in-readtable :utf8-runes)
+
 
 ;; Classes
 
@@ -157,15 +162,15 @@
   (etypecase x
     (null x)
     (rod x)
-    #+fxml-system::utf8dom-file (fxml.runes::rod (fxml::rod-to-utf8-string x))
+    #+rune-is-integer (fxml.runes::rod (fxml::rod-to-utf8-string x))
     (string (string-rod x))
     (vector x)))
 
-#-fxml-system::utf8dom-file
+#-rune-is-integer
 (defun real-rod (x)
   (%rod x))
 
-#+fxml-system::utf8dom-file
+#+rune-is-integer
 (defun real-rod (x)
   (etypecase x
     (null x)
@@ -1244,7 +1249,7 @@
     (when resolver
       (setf (document handler) owner)
       (push instance (element-stack handler))
-      #+fxml-system::utf8dom-file
+      #+rune-is-integer
       (setf handler (fxml:make-recoder handler #'fxml:rod-to-utf8-string))
       (funcall resolver (real-rod (fxml.dom:name instance)) handler)
       (flush-characters handler)))

fxml.asd

@@ -32,8 +32,6 @@
        (pushnew :rune-is-utf-16 *features*)
        (pushnew :rune-is-character *features*)))))
 
-(defvar *utf8-runes-readtable*)
-
 (defclass closure-source-file (cl-source-file) ())
 
 #+scl

klacks/klacks-impl.lisp

@@ -17,6 +17,7 @@
 ;;; Boston, MA  02111-1307  USA.
 
 (in-package :fxml)
+(in-readtable :runes)
 
 (defclass fxml-source (fxml.klacks:source)
     (;; args to make-source

klacks/klacks.lisp

@@ -17,6 +17,7 @@
 ;;; Boston, MA  02111-1307  USA.
 
 (in-package :fxml)
+(in-readtable :runes)
 
 (defclass fxml.klacks:source ()
     (

klacks/tap-source.lisp

@@ -17,6 +17,7 @@
 ;;; Boston, MA  02111-1307  USA.
 
 (in-package :fxml)
+(in-readtable :runes)
 
 (defun fxml.klacks:make-tapping-source (upstream-source &optional sax-handler)
   (make-instance 'fxml.klacks:tapping-source

xml/catalog.lisp

@@ -7,6 +7,7 @@
 ;;;; Copyright: David Lichteblau
 
 (in-package :fxml)
+(in-readtable :runes)
 
 ;;; http://www.oasis-open.org/committees/entity/spec.html
 ;;;

xml/package.lisp

@@ -7,6 +7,7 @@
 
 (defpackage :fxml
   (:use :cl :fxml.runes :fxml.runes-encoding #-scl :trivial-gray-streams)
+  (:import-from #:named-readtables #:in-readtable)
   (:export
    ;; meta
    #:xml-character-p

xml/sax-handler.lisp

@@ -43,7 +43,7 @@
 ;;     conditions (but isn't yet)
 
 (defpackage :fxml.sax
-  (:use :common-lisp)
+  (:use :common-lisp :named-readtables)
   (:export #:*namespace-processing*
            #:*include-xmlns-attributes*
            #:*use-xmlns-namespace*
@@ -99,6 +99,7 @@
            #:standard-attribute))
 
 (in-package :fxml.sax)
+(in-readtable :runes)
 
 
 ;;;; SAX-PARSER interface

xml/sax-tests/tests.lisp

@@ -1,4 +1,5 @@
 (in-package :fxml.sax.tests)
+(named.readtables:in-readtable :runes)
 
 (defun first-start-element-event (string)
   (let ((events (fxml:parse-rod string (make-instance 'event-collecting-handler))))

xml/space-normalizer.lisp

@@ -6,6 +6,7 @@
 ;;;; Copyright (c) 2005 David Lichteblau
 
 (in-package :fxml)
+(in-readtable :runes)
 
 (defclass whitespace-normalizer (sax-proxy)
     ((attributes :initform '(t) :accessor xml-space-attributes)

xml/unparse.lisp

@@ -30,6 +30,7 @@
 ;;; Boston, MA  02111-1307  USA.
 
 (in-package :fxml)
+(in-readtable :runes)
 
 ;;
 ;; | Canonical XML

xml/xml-parse.lisp

@@ -168,6 +168,7 @@
 ;;;; we check this VC together with the WFC even in non-validating mode.
 
 (in-package :fxml)
+(in-readtable :runes)
 
 #+allegro
 (setf (excl:named-readtable :runes) *readtable*)

xml/xmlns-normalizer.lisp

@@ -24,6 +24,7 @@
 ;;;; [1] http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/namespaces-algorithms.html#normalizeDocumentAlgo
 
 (in-package :fxml)
+(in-readtable :runes)
 
 (defclass namespace-normalizer (sax-proxy)
     ((xmlns-stack :initarg :xmlns-stack :accessor xmlns-stack)))