Changeset 5306

Timestamp:

Oct 6, 2006, 3:49:18 AM (18 years ago)

Author:

Gary Byers

Message:

CODE-UNIT, not CODE-ELEMENT. Add a TRANSLATE slot to IO-BUFFER.

File:

• trunk/ccl/level-1/l1-streams.lisp (modified) (17 diffs)

trunk/ccl/level-1/l1-streams.lisp

@@ -331 +331 @@
   (count 0 :type fixnum)                ; count of active elements
   (limit 0 :type fixnum)                ; size (in elements) of buffer
+  (translate nil)                       ; newline-translation
   )
 
@@ -668 +669 @@
 ;;; (UNSIGNED-BYTE 8), in native byte-order.
 
-(declaim (inline %ioblock-read-u16-code-element))
-(defun %ioblock-read-u16-code-element (ioblock)
+(declaim (inline %ioblock-read-u16-code-unit))
+(defun %ioblock-read-u16-code-unit (ioblock)
   (declare (optimize (speed 3) (safety 0)))
   (let* ((buf (ioblock-inbuf ioblock))
@@ -715 +716 @@
                 (logior (the (unsigned-byte 16) (ash b1 8)) b0)))))))))
   
-(declaim (inline %ioblock-read-swapped-u16-code-element))
-(defun %ioblock-read-swapped-u16-code-element (ioblock)
+(declaim (inline %ioblock-read-swapped-u16-code-unit))
+(defun %ioblock-read-swapped-u16-code-unit (ioblock)
   (declare (optimize (speed 3) (safety 0)))
     (let* ((buf (ioblock-inbuf ioblock))
@@ -763 +764 @@
 
 
-(declaim (inline %ioblock-read-u32-code-element))
-(defun %ioblock-read-u32-code-element (ioblock)
+(declaim (inline %ioblock-read-u32-code-unit))
+(defun %ioblock-read-u32-code-unit (ioblock)
   (declare (optimize (speed 3) (safety 0)))
   (let* ((buf (ioblock-inbuf ioblock))
@@ -884 +885 @@
                         b0)))))))))
 
-(declaim (inline %ioblock-read-swapped-u32-code-element))
-(defun %ioblock-read-swapped-u32-code-element (ioblock)
+(declaim (inline %ioblock-read-swapped-u32-code-unit))
+(defun %ioblock-read-swapped-u32-code-unit (ioblock)
   (declare (optimize (speed 3) (safety 0)))
   (let* ((buf (ioblock-inbuf ioblock))
@@ -1138 +1139 @@
       (prog1 ch
         (setf (ioblock-untyi-char ioblock) nil))
-      (let* ((1st-unit (%ioblock-read-u16-code-element ioblock)))
+      (let* ((1st-unit (%ioblock-read-u16-code-unit ioblock)))
         (if (eq 1st-unit :eof)
           1st-unit
@@ -1148 +1149 @@
               (funcall (ioblock-decode-input-function ioblock)
                        1st-unit
-                       #'%ioblock-read-u16-code-element
+                       #'%ioblock-read-u16-code-unit
                        ioblock))))))))
 
@@ -1168 +1169 @@
       (prog1 ch
         (setf (ioblock-untyi-char ioblock) nil))
-      (let* ((1st-unit (%ioblock-read-swapped-u16-code-element ioblock)))
+      (let* ((1st-unit (%ioblock-read-swapped-u16-code-unit ioblock)))
         (if (eq 1st-unit :eof)
           1st-unit
@@ -1178 +1179 @@
               (funcall (ioblock-decode-input-function ioblock)
                        1st-unit
-                       #'%ioblock-read-swapped-u16-code-element
+                       #'%ioblock-read-swapped-u16-code-unit
                        ioblock))))))))
 
@@ -1575 +1576 @@
     element))
 
-(declaim (inline %ioblock-write-u16-code-element))
-(defun %ioblock-write-u16-code-element (ioblock element)
+(declaim (inline %ioblock-write-u16-code-unit))
+(defun %ioblock-write-u16-code-unit (ioblock element)
   (declare (optimize (speed 3) (safety 0))
            (type (unsigned-byte 16) element))
@@ -1608 +1609 @@
     element))
 
-(declaim (inline %ioblock-write-swapped-u16-code-element))
-(defun %ioblock-write-swapped-u16-code-element (ioblock element)
+(declaim (inline %ioblock-write-swapped-u16-code-unit))
+(defun %ioblock-write-swapped-u16-code-unit (ioblock element)
   (declare (optimize (speed 3) (safety 0)))
 (let* ((buf (ioblock-outbuf ioblock))
@@ -1834 +1835 @@
     (funcall (ioblock-encode-output-function ioblock)
              byte-order-mark
-             #'%ioblock-write-u16-code-element
+             #'%ioblock-write-u16-code-unit
              ioblock))
   (if (eq char #\linefeed)
@@ -1845 +1846 @@
       (funcall (ioblock-encode-output-function ioblock)
                char
-               #'%ioblock-write-u16-code-element
+               #'%ioblock-write-u16-code-unit
                ioblock))))
 
@@ -1865 +1866 @@
   (when (ioblock-pending-byte-order-mark ioblock)
     (setf (ioblock-pending-byte-order-mark ioblock) nil)
-    (%ioblock-write-u16-code-element ioblock byte-order-mark-char-code))
+    (%ioblock-write-u16-code-unit ioblock byte-order-mark-char-code))
   (do* ((i 0 (1+ i))
         (col (ioblock-charpos ioblock))
@@ -1880 +1881 @@
         (incf col))
       (if (< code limit)
-        (%ioblock-write-u16-code-element ioblock code)
-        (funcall encode-function char #'%ioblock-write-u16-code-element ioblock)))))
+        (%ioblock-write-u16-code-unit ioblock code)
+        (funcall encode-function char #'%ioblock-write-u16-code-unit ioblock)))))
 
 (declaim (inline %ioblock-write-swapped-u16-encoded-char))
@@ -1892 +1893 @@
     (declare (type (mod #x110000) code))
     (if (< code (the fixnum (ioblock-literal-char-code-limit ioblock)))
-      (%ioblock-write-swapped-u16-code-element ioblock code)
+      (%ioblock-write-swapped-u16-code-unit ioblock code)
       (funcall (ioblock-encode-output-function ioblock)
                char
-               #'%ioblock-write-swapped-u16-code-element
+               #'%ioblock-write-swapped-u16-code-unit
                ioblock))))
 
@@ -1926 +1927 @@
         (incf col))
       (if (< code limit)
-        (%ioblock-write-swapped-u16-code-element ioblock code)
-        (funcall encode-function char #'%ioblock-write-swapped-u16-code-element ioblock)))))
+        (%ioblock-write-swapped-u16-code-unit ioblock code)
+        (funcall encode-function char #'%ioblock-write-swapped-u16-code-unit ioblock)))))