Changeset 12213


Ignore:
Timestamp:
Jun 6, 2009, 8:23:20 PM (10 years ago)
Author:
gz
Message:

Merge r11483 r11817 r11979 r11980 r12166 from trunk

Location:
branches/working-0711/ccl
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/working-0711/ccl/level-1/l1-boot-2.lisp

    r11764 r12213  
    6868
    6969
    70 (defloadvar *batch-flag* (not (eql (%get-kernel-global 'batch-flag) 0)))
     70(defvar *batch-flag* (not (eql (%get-kernel-global 'batch-flag) 0)))
    7171(defloadvar *quiet-flag* nil)
    7272(defvar *terminal-input* ())
     
    106106                                  :direction :input
    107107                                  :interactive (not *batch-flag*)
    108                                   :encoding encoding-name))
     108                                  :encoding encoding-name
     109                                  #+windows-target :line-termination #+windows-target :cp/m))
    109110    (setq *stdout* (make-fd-stream #-windows-target 1
    110111                                   #+windows-target (%ptr-to-int
    111112                                                     (#_GetStdHandle #$STD_OUTPUT_HANDLE))
    112                                    :basic t :direction :output :sharing :lock :encoding encoding-name))
     113                                   :basic t :direction :output :sharing :lock :encoding encoding-name #+windows-target :line-termination #+windows-target :msdos))
    113114    (setq *stderr* (make-fd-stream #-windows-target 2
    114115                                   #+windows-target (%ptr-to-int
    115116                                                     (#_GetStdHandle #$STD_ERROR_HANDLE))
    116                     :basic t :direction :output :sharing :lock :encoding encoding-name))
     117                    :basic t :direction :output :sharing :lock :encoding encoding-name #+windows-target :line-termination #+windows-target :crlf))
    117118    (if *batch-flag*
    118119      (let* ((tty-fd
     
    169170
    170171(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)))
    171175  (let* ((exformat (normalize-external-format t encoding-name)))
    172176    (setf (stream-external-format *stdin*) exformat
     
    283287      #+solarisx8632-target
    284288      (bin-load-provide "FFI-SOLARISX8632" "ffi-solarisx8632")
     289      #+freebsdx8632-target
     290      (bin-load-provide "FFI-FREEBSDX8632" "ffi-freebsdx8632")
    285291     
    286292      (bin-load-provide "DB-IO" "db-io")
  • branches/working-0711/ccl/level-1/l1-streams.lisp

    r12048 r12213  
    191191
    192192
    193 (defloadvar *heap-ivectors* ())
     193(defstatic *heap-ivectors* ())
    194194(defvar *heap-ivector-lock* (make-lock))
    195195
     
    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
  • branches/working-0711/ccl/lib/dumplisp.lisp

    r11417 r12213  
    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.