X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Freadtable.lisp;h=3764b16bf4196cdb16350fe7e259241e30d0f2ea;hb=860543cc7ba0266e41e1d41ac9b6a208f3795f1a;hp=8d51dc9889214507f2e7c49d029cd37644dfe268;hpb=143edab8d233c784cde14bce6c5165219ea84bf4;p=sbcl.git

diff --git a/src/code/readtable.lisp b/src/code/readtable.lisp
index 8d51dc9..3764b16 100644
--- a/src/code/readtable.lisp
+++ b/src/code/readtable.lisp
@@ -12,26 +12,30 @@
 (in-package "SB!IMPL")
 
 (sb!xc:deftype attribute-table ()
-  '(simple-array (unsigned-byte 8) (#.char-code-limit)))
+  '(simple-array (unsigned-byte 8) (#.sb!xc:char-code-limit)))
 
 ;;; constants for readtable character attributes. These are all as in
 ;;; the manual.
-(defconstant +char-attr-whitespace+ 0)
-(defconstant +char-attr-terminating-macro+ 1)
-(defconstant +char-attr-escape+ 2)
-(defconstant +char-attr-constituent+ 3)
-(defconstant +char-attr-constituent-dot+ 4)
-(defconstant +char-attr-constituent-expt+ 5)
-(defconstant +char-attr-constituent-slash+ 6)
-(defconstant +char-attr-constituent-digit+ 7)
-(defconstant +char-attr-constituent-sign+ 8)
+(def!constant +char-attr-whitespace+ 0)
+(def!constant +char-attr-terminating-macro+ 1)
+(def!constant +char-attr-escape+ 2)
+(def!constant +char-attr-constituent+ 3)
+(def!constant +char-attr-constituent-dot+ 4)
+(def!constant +char-attr-constituent-expt+ 5)
+(def!constant +char-attr-constituent-slash+ 6)
+(def!constant +char-attr-constituent-digit+ 7)
+(def!constant +char-attr-constituent-sign+ 8)
 ;; the "9" entry intentionally left blank for some reason -- WHN 19990806
-(defconstant +char-attr-multiple-escape+ 10)
-(defconstant +char-attr-package-delimiter+ 11)
-(defconstant +char-attr-delimiter+ 12) ; (a fake for READ-UNQUALIFIED-TOKEN)
+(def!constant +char-attr-multiple-escape+ 10)
+(def!constant +char-attr-package-delimiter+ 11)
+(def!constant +char-attr-delimiter+ 12) ; (a fake for READ-UNQUALIFIED-TOKEN)
 
 (sb!xc:defstruct (readtable (:conc-name nil)
-			    (:predicate readtablep))
+			    (:predicate readtablep)
+			    ;; ANSI requires a CL:COPY-READTABLE to do
+			    ;; a deep copy, so the DEFSTRUCT-generated
+			    ;; default is not suitable.
+			    (:copier nil))
   #!+sb-doc
   "A READTABLE is a data structure that maps characters into syntax
    types for the Common Lisp expression reader."
@@ -47,7 +51,7 @@
   ;; in the character attribute table by having different varieties of
   ;; constituents.
   (character-attribute-table
-   (make-array char-code-limit
+   (make-array sb!xc:char-code-limit
 	       :element-type '(unsigned-byte 8)
 	       :initial-element +char-attr-constituent+)
    :type attribute-table)
@@ -58,8 +62,8 @@
   ;; implement user-defined read-macros, system read-macros, and the
   ;; number-symbol reader.
   (character-macro-table
-   (make-array char-code-limit :initial-element #'undefined-macro-char)
-   :type (simple-vector #.char-code-limit))
+   (make-array sb!xc:char-code-limit :initial-element #'undefined-macro-char)
+   :type (simple-vector #.sb!xc:char-code-limit))
   ;; an alist from dispatch characters to vectors of CHAR-CODE-LIMIT
   ;; functions, for use in defining dispatching macros (like #-macro)
   (dispatch-tables () :type list)