[Openmcl-cvs-notifications] r11981 - in /release/1.3/source: level-1/l1-boot-2.lisp level-1/l1-streams.lisp lib/dumplisp.lisp
gb at clozure.com
gb at clozure.com
Tue Apr 28 04:49:38 EDT 2009
Author: gb
Date: Tue Apr 28 04:49:38 2009
New Revision: 11981
Log:
Propagate recent changes (r11979, r11980) to 1.3 (ticket:464).
Modified:
release/1.3/source/level-1/l1-boot-2.lisp
release/1.3/source/level-1/l1-streams.lisp
release/1.3/source/lib/dumplisp.lisp
Modified: release/1.3/source/level-1/l1-boot-2.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.3/source/level-1/l1-boot-2.lisp (original)
+++ release/1.3/source/level-1/l1-boot-2.lisp Tue Apr 28 04:49:38 2009
@@ -169,6 +169,9 @@
=
=
(defun set-terminal-encoding (encoding-name)
+ #+windows-target (when (atom encoding-name)
+ (setq encoding-name `(:character-encoding ,encoding-n=
ame
+ :line-termination :crlf)))
(let* ((exformat (normalize-external-format t encoding-name)))
(setf (stream-external-format *stdin*) exformat
(stream-external-format *stdout*) exformat
Modified: release/1.3/source/level-1/l1-streams.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.3/source/level-1/l1-streams.lisp (original)
+++ release/1.3/source/level-1/l1-streams.lisp Tue Apr 28 04:49:38 2009
@@ -189,7 +189,7 @@
=
=
=
-(defloadvar *heap-ivectors* ())
+(defstatic *heap-ivectors* ())
(defvar *heap-ivector-lock* (make-lock))
=
=
@@ -1921,7 +1921,7 @@
=
(defun %ioblock-write-u8-encoded-simple-string (ioblock string start-char =
num-chars)
(declare (fixnum start-char num-chars)
- (simple-base-strng string)
+ (simple-base-string string)
(optimize (speed 3) (safety 0)))
(do* ((i 0 (1+ i))
(col (ioblock-charpos ioblock))
@@ -1972,7 +1972,7 @@
=
(defun %ioblock-write-u16-encoded-simple-string (ioblock string start-char=
num-chars)
(declare (fixnum start-char num-chars)
- (simple-base-strng string)
+ (simple-base-string string)
(optimize (speed 3) (safety 0)))
(when (ioblock-pending-byte-order-mark ioblock)
(setf (ioblock-pending-byte-order-mark ioblock) nil)
@@ -2021,7 +2021,7 @@
=
(defun %ioblock-write-swapped-u16-encoded-simple-string (ioblock string st=
art-char num-chars)
(declare (fixnum start-char num-chars)
- (simple-base-strng string)
+ (simple-base-string string)
(optimize (speed 3) (safety 0)))
(do* ((i 0 (1+ i))
(col (ioblock-charpos ioblock))
@@ -2054,7 +2054,7 @@
(setf (ioblock-charpos ioblock) 0)
(incf (ioblock-charpos ioblock)))
(let* ((code (char-code char)))
- (declare (type (mod #x110000 code)))
+ (declare (type (mod #x110000) code))
(if (< code (the fixnum (ioblock-encode-literal-char-code-limit iobloc=
k)))
(%ioblock-write-u32-code-unit ioblock code)
(funcall (ioblock-encode-output-function ioblock)
@@ -2074,7 +2074,7 @@
=
(defun %ioblock-write-u32-encoded-simple-string (ioblock string start-char=
num-chars)
(declare (fixnum start-char num-chars)
- (simple-base-strng string)
+ (simple-base-string string)
(optimize (speed 3) (safety 0)))
(when (ioblock-pending-byte-order-mark ioblock)
(setf (ioblock-pending-byte-order-mark ioblock) nil)
@@ -2104,7 +2104,7 @@
(setf (ioblock-charpos ioblock) 0)
(incf (ioblock-charpos ioblock)))
(let* ((code (char-code char)))
- (declare (type (mod #x110000 code)))
+ (declare (type (mod #x110000) code))
(if (< code (the fixnum (ioblock-encode-literal-char-code-limit iobloc=
k)))
(%ioblock-write-swapped-u32-code-unit ioblock code)
(funcall (ioblock-encode-output-function ioblock)
@@ -2124,7 +2124,7 @@
=
(defun %ioblock-write-swapped-u32-encoded-simple-string (ioblock string st=
art-char num-chars)
(declare (fixnum start-char num-chars)
- (simple-base-strng string)
+ (simple-base-string string)
(optimize (speed 3) (safety 0)))
(do* ((i 0 (1+ i))
(col (ioblock-charpos ioblock))
@@ -2614,7 +2614,7 @@
(%ioblock-write-char-translating-newline-to-cr ioblock char))
=
(defun %locked-ioblock-write-char-translating-newline-to-cr (ioblock char)
- (with-ioblock-input-lock-grabbed (ioblock)
+ (with-ioblock-output-lock-grabbed (ioblock)
(%ioblock-write-char-translating-newline-to-cr ioblock char)))
=
(declaim (inline %ioblock-write-char-translating-newline-to-crlf))
@@ -2634,7 +2634,7 @@
(%ioblock-write-char-translating-newline-to-crlf ioblock char))
=
(defun %locked-ioblock-write-char-translating-newline-to-crlf (ioblock cha=
r)
- (with-ioblock-input-lock-grabbed (ioblock)
+ (with-ioblock-output-lock-grabbed (ioblock)
(%ioblock-write-char-translating-newline-to-crlf ioblock char)))
=
(declaim (inline %ioblock-write-char-translating-newline-to-line-separator=
))
@@ -2649,7 +2649,7 @@
(%ioblock-write-char-translating-newline-to-line-separator ioblock char))
=
(defun %locked-ioblock-write-char-translating-newline-to-line-separator (i=
oblock char)
- (with-ioblock-input-lock-grabbed (ioblock)
+ (with-ioblock-output-lock-grabbed (ioblock)
(%ioblock-write-char-translating-newline-to-line-separator ioblock cha=
r)))
=
;;; If we do newline translation, we probably can't be too clever about re=
ading/writing
@@ -2860,7 +2860,8 @@
'%private-ioblock-read-char-translating-line-se=
parator-to-newline)
(:lock
'%locked-ioblock-read-char-translating-line-sep=
arator-to-newline)
- (t '%ioblock-read-char-translating-line-separato=
r-to-newline))))))))
+ (t '%ioblock-read-char-translating-line-separato=
r-to-newline)))))
+ (setf (ioblock-line-termination ioblock) line-termination))))
=
(defun setup-ioblock-output (ioblock character-p element-type sharing enco=
ding line-termination)
(or (ioblock-sharing ioblock)
@@ -3043,7 +3044,8 @@
'%private-ioblock-write-char-translating-newlin=
e-to-line-separator)
(:lock
'%locked-ioblock-write-char-translating-newline=
-to-line-separator)
- (t '%ioblock-write-char-translating-newline-to-l=
ine-separator))))))))
+ (t '%ioblock-write-char-translating-newline-to-l=
ine-separator)))))
+ (setf (ioblock-line-termination ioblock) line-termination))))
=
=
(defun ensure-reasonable-element-type (element-type)
Modified: release/1.3/source/lib/dumplisp.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- release/1.3/source/lib/dumplisp.lisp (original)
+++ release/1.3/source/lib/dumplisp.lisp Tue Apr 28 04:49:38 2009
@@ -239,6 +239,7 @@
=
(defun restore-lisp-pointers ()
(setq *interactive-streams-initialized* nil)
+ (setq *heap-ivectors* nil)
(%revive-system-locks)
(refresh-external-entrypoints)
(restore-pascal-functions)
More information about the Openmcl-cvs-notifications
mailing list