Changeset 12959

Timestamp:

Oct 9, 2009, 11:43:00 AM (15 years ago)

Author:

gz

Message:

distinguish between standard and initial readtables (r12497, r12889)

Location:

branches/working-0711/ccl

Files:

• level-1/l1-boot-2.lisp (modified) (2 diffs)
• level-1/l1-reader.lisp (modified) (2 diffs)
• lib/macros.lisp (modified) (1 diff)

branches/working-0711/ccl/level-1/l1-boot-2.lisp

@@ -256 +256 @@
         (bin-load-provide "X86-DISASSEMBLE" "x86-disassemble")
         (bin-load-provide "X86-LAPMACROS" "x86-lapmacros"))
-      
+
 
       (bin-load-provide "FOREIGN-TYPES" "foreign-types")
@@ -289 +289 @@
       #+freebsdx8632-target
       (bin-load-provide "FFI-FREEBSDX8632" "ffi-freebsdx8632")
-      
+
+
+      ;; Knock wood: all standard reader macros and no non-standard
+      ;; reader macros are defined at this point.
+      (setq *readtable* (copy-readtable *readtable*))
+
       (bin-load-provide "DB-IO" "db-io")
 

branches/working-0711/ccl/level-1/l1-reader.lisp

@@ -1965 +1965 @@
 
 ;;; This -really- gets initialized later in the file
-(defvar %initial-readtable%
+(defvar %standard-readtable%
   (let* ((ttab (make-array 256 :element-type '(unsigned-byte 8)))
          (macs `((#\# . (,#'read-dispatch))))
@@ -1980 +1980 @@
     (%istruct 'readtable ttab macs case)))
 
-(setq *readtable* %initial-readtable%)
+(defvar %initial-readtable%)
+(setq *readtable* %standard-readtable%)
 (def-standard-initial-binding *readtable* )
 (queue-fixup (setq %initial-readtable% (copy-readtable *readtable*)))
 
 (defun copy-readtable (&optional (from *readtable*) to)
-  (setq from (if from (readtable-arg from)  %initial-readtable%))
+  (setq from (if from (readtable-arg from)  %standard-readtable%))
   (setq to (if to 
              (readtable-arg to)

branches/working-0711/ccl/lib/macros.lisp

@@ -1547 +1547 @@
            (*read-eval* t) ; Also MIA as of 5/15/90
            (*read-suppress* nil)
-           (*readtable* %initial-readtable%)
+           (*readtable* %standard-readtable%)
            ; ccl extensions (see l1-io.lisp)
            (*print-abbreviate-quote* t)