Changeset 11981


Ignore:
Timestamp:
Apr 28, 2009, 8:49:38 AM (10 years ago)
Author:
gb
Message:

Propagate recent changes (r11979, r11980) to 1.3 (ticket:464).

Location:
release/1.3/source
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • release/1.3/source/level-1/l1-boot-2.lisp

    r11818 r11981  
    170170
    171171(defun set-terminal-encoding (encoding-name)
     172  #+windows-target (when (atom encoding-name)
     173                     (setq encoding-name `(:character-encoding ,encoding-name
     174                                           :line-termination :crlf)))
    172175  (let* ((exformat (normalize-external-format t encoding-name)))
    173176    (setf (stream-external-format *stdin*) exformat
  • release/1.3/source/level-1/l1-streams.lisp

    r11831 r11981  
    191191
    192192
    193 (defloadvar *heap-ivectors* ())
     193(defstatic *heap-ivectors* ())
    194194(defvar *heap-ivector-lock* (make-lock))
    195195
     
    19241924(defun %ioblock-write-u8-encoded-simple-string (ioblock string start-char num-chars)
    19251925  (declare (fixnum start-char num-chars)
    1926            (simple-base-strng string)
     1926           (simple-base-string string)
    19271927           (optimize (speed 3) (safety 0)))
    19281928  (do* ((i 0 (1+ i))
     
    19751975(defun %ioblock-write-u16-encoded-simple-string (ioblock string start-char num-chars)
    19761976  (declare (fixnum start-char num-chars)
    1977            (simple-base-strng string)
     1977           (simple-base-string string)
    19781978           (optimize (speed 3) (safety 0)))
    19791979  (when (ioblock-pending-byte-order-mark ioblock)
     
    20242024(defun %ioblock-write-swapped-u16-encoded-simple-string (ioblock string start-char num-chars)
    20252025  (declare (fixnum start-char num-chars)
    2026            (simple-base-strng string)
     2026           (simple-base-string string)
    20272027           (optimize (speed 3) (safety 0)))
    20282028  (do* ((i 0 (1+ i))
     
    20572057    (incf (ioblock-charpos ioblock)))
    20582058  (let* ((code (char-code char)))
    2059     (declare (type (mod #x110000 code)))
     2059    (declare (type (mod #x110000) code))
    20602060    (if (< code (the fixnum (ioblock-encode-literal-char-code-limit ioblock)))
    20612061      (%ioblock-write-u32-code-unit ioblock code)
     
    20772077(defun %ioblock-write-u32-encoded-simple-string (ioblock string start-char num-chars)
    20782078  (declare (fixnum start-char num-chars)
    2079            (simple-base-strng string)
     2079           (simple-base-string string)
    20802080           (optimize (speed 3) (safety 0)))
    20812081  (when (ioblock-pending-byte-order-mark ioblock)
     
    21072107    (incf (ioblock-charpos ioblock)))
    21082108  (let* ((code (char-code char)))
    2109     (declare (type (mod #x110000 code)))
     2109    (declare (type (mod #x110000) code))
    21102110    (if (< code (the fixnum (ioblock-encode-literal-char-code-limit ioblock)))
    21112111      (%ioblock-write-swapped-u32-code-unit ioblock code)
     
    21272127(defun %ioblock-write-swapped-u32-encoded-simple-string (ioblock string start-char num-chars)
    21282128  (declare (fixnum start-char num-chars)
    2129            (simple-base-strng string)
     2129           (simple-base-string string)
    21302130           (optimize (speed 3) (safety 0)))
    21312131  (do* ((i 0 (1+ i))
     
    26182618
    26192619(defun %locked-ioblock-write-char-translating-newline-to-cr (ioblock char)
    2620   (with-ioblock-input-lock-grabbed (ioblock)
     2620  (with-ioblock-output-lock-grabbed (ioblock)
    26212621    (%ioblock-write-char-translating-newline-to-cr ioblock char)))
    26222622
     
    26382638
    26392639(defun %locked-ioblock-write-char-translating-newline-to-crlf (ioblock char)
    2640   (with-ioblock-input-lock-grabbed (ioblock)
     2640  (with-ioblock-output-lock-grabbed (ioblock)
    26412641    (%ioblock-write-char-translating-newline-to-crlf ioblock char)))
    26422642
     
    26532653
    26542654(defun %locked-ioblock-write-char-translating-newline-to-line-separator (ioblock char)
    2655   (with-ioblock-input-lock-grabbed (ioblock)
     2655  (with-ioblock-output-lock-grabbed (ioblock)
    26562656    (%ioblock-write-char-translating-newline-to-line-separator ioblock char)))
    26572657
     
    28652865                          (:lock
    28662866                           '%locked-ioblock-read-char-translating-line-separator-to-newline)
    2867                           (t '%ioblock-read-char-translating-line-separator-to-newline))))))))
     2867                          (t '%ioblock-read-char-translating-line-separator-to-newline)))))
     2868      (setf (ioblock-line-termination ioblock) line-termination))))
    28682869 
    28692870(defun setup-ioblock-output (ioblock character-p element-type sharing encoding line-termination)
     
    30483049                          (:lock
    30493050                           '%locked-ioblock-write-char-translating-newline-to-line-separator)
    3050                           (t '%ioblock-write-char-translating-newline-to-line-separator))))))))
     3051                          (t '%ioblock-write-char-translating-newline-to-line-separator)))))
     3052      (setf (ioblock-line-termination ioblock) line-termination))))
    30513053
    30523054
  • release/1.3/source/lib/dumplisp.lisp

    r11301 r11981  
    240240(defun restore-lisp-pointers ()
    241241  (setq *interactive-streams-initialized* nil)
     242  (setq *heap-ivectors* nil)
    242243  (%revive-system-locks)
    243244  (refresh-external-entrypoints)
Note: See TracChangeset for help on using the changeset viewer.