X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Freadtable.lisp;h=0df3891f81867bb65d7e8ba2093fabcb6c36781b;hb=0e3c4b4db102bd204a30402d7e5a0de44aea57ce;hp=5f712e4175e52f37a160bd49e22fea36d3a485ec;hpb=bdb53694a70062532aa735e4cb37db51e9cd7254;p=sbcl.git

diff --git a/src/code/readtable.lisp b/src/code/readtable.lisp
index 5f712e4..0df3891 100644
--- a/src/code/readtable.lisp
+++ b/src/code/readtable.lisp
@@ -23,37 +23,37 @@
 ;;; when changing them.
 (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)
+(def!constant +char-attr-single-escape+ 2)
+(def!constant +char-attr-multiple-escape+ 3)
+(def!constant +char-attr-constituent+ 4)
+(def!constant +char-attr-constituent-dot+ 5)
+(def!constant +char-attr-constituent-expt+ 6)
+(def!constant +char-attr-constituent-slash+ 7)
+(def!constant +char-attr-constituent-digit+ 8)
+(def!constant +char-attr-constituent-sign+ 9)
 ;;; the following two are not static but depend on *READ-BASE*.
 ;;; DECIMAL-DIGIT is for characters being digits in base 10 but not in
 ;;; base *READ-BASE* (which is therefore perforce smaller than 10);
 ;;; DIGIT-OR-EXPT is for characters being both exponent markers and
 ;;; digits in base *READ-BASE* (which is therefore perforce larger
 ;;; than 10).  -- CSR, 2004-03-16
-(def!constant +char-attr-constituent-decimal-digit+ 9)
-(def!constant +char-attr-constituent-digit-or-expt+ 10)
+(def!constant +char-attr-constituent-decimal-digit+ 10)
+(def!constant +char-attr-constituent-digit-or-expt+ 11)
 
-(def!constant +char-attr-multiple-escape+ 11)
 (def!constant +char-attr-package-delimiter+ 12)
 (def!constant +char-attr-invalid+ 13)
 (def!constant +char-attr-delimiter+ 14) ; (a fake for READ-UNQUALIFIED-TOKEN)
 
 (sb!xc:defstruct (readtable (:conc-name nil)
-			    (:predicate readtablep)
-			    ;; ANSI requires a CL:COPY-READTABLE to do
-			    ;; a deep copy, so the DEFSTRUCT-generated
-			    ;; default is not suitable.
-			    (:copier nil))
+                            (: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."
-  ;; The CHARACTER-ATTRIBUTE-TABLE is a vector of CHAR-CODE-LIMIT
+types for the Common Lisp expression reader."
+  ;; The CHARACTER-ATTRIBUTE-TABLE is a vector of BASE-CHAR-CODE-LIMIT
   ;; integers for describing the character type. Conceptually, there
   ;; are 4 distinct "primary" character attributes:
   ;; +CHAR-ATTR-WHITESPACE+, +CHAR-ATTR-TERMINATING-MACRO+,
@@ -66,11 +66,11 @@
   ;; constituents.
   (character-attribute-array
    (make-array base-char-code-limit
-	       :element-type '(unsigned-byte 8)
-	       :initial-element +char-attr-constituent+)
+               :element-type '(unsigned-byte 8)
+               :initial-element +char-attr-constituent+)
    :type attribute-table)
   (character-attribute-hash-table (make-hash-table) :type hash-table)
-  ;; The CHARACTER-MACRO-TABLE is a vector of CHAR-CODE-LIMIT
+  ;; The CHARACTER-MACRO-TABLE is a vector of BASE-CHAR-CODE-LIMIT
   ;; functions. One of these functions called with appropriate
   ;; arguments whenever any non-WHITESPACE character is encountered
   ;; inside READ-PRESERVING-WHITESPACE. These functions are used to
@@ -80,7 +80,7 @@
    (make-array base-char-code-limit :initial-element #'undefined-macro-char)
    :type (simple-vector #.base-char-code-limit))
   (character-macro-hash-table (make-hash-table) :type hash-table)
-  ;; an alist from dispatch characters to vectors of CHAR-CODE-LIMIT
-  ;; functions, for use in defining dispatching macros (like #-macro)
+  ;; an alist from dispatch characters to hash-tables akin to
+  ;; CHARACTER-MACRO-HASH-TABLE.
   (dispatch-tables () :type list)
-  (readtable-case :upcase :type (member :upcase :downcase :preserve :invert)))
+  (%readtable-case :upcase :type (member :upcase :downcase :preserve :invert)))