Changeset 13387 for release/1.4/source


Ignore:
Timestamp:
Jan 14, 2010, 8:49:15 AM (10 years ago)
Author:
gb
Message:

Propagate r13368 to 1.4. See ticket:642 .

Location:
release/1.4/source
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • release/1.4/source/level-1/l1-readloop-lds.lisp

    r13159 r13387  
    555555        (*print-right-margin* nil)
    556556        (*signal-printing-errors* nil)
    557         (s (make-indenting-string-output-stream prefixchar nil)))
     557        (s (make-indenting-string-output-stream prefixchar nil))
     558        (sub (make-string-output-stream))
     559        (indent 0))
    558560    (format s "~A ~A: " prefixchar msg)
    559     (setf (indenting-string-output-stream-indent s) (column s))
     561    (setf (indenting-string-output-stream-indent s) (setq indent (column s)))
     562    (decf (stream-line-length sub) indent)
    560563    ;(format s "~A" condition) ; evil if circle
    561     (report-condition condition s)
     564    (report-condition condition sub)
     565    (format s "~A" (get-output-stream-string sub))
    562566    (if (not (and (typep condition 'simple-program-error)
    563567                  (simple-program-error-context condition)))
  • release/1.4/source/level-1/l1-streams.lisp

    r13159 r13387  
    24742474      (if (eq b :eof)
    24752475        (return (- i start)))
    2476       (setf (uvref vector i) b)
     2476      (setf (aref vector i) b)
    24772477      (incf i)
    24782478      (decf need)
     
    42364236(defstruct (string-output-stream-ioblock (:include string-stream-ioblock))
    42374237  (index 0)
    4238   freelist)
     4238  freelist
     4239  (line-length 80))
    42394240
    42404241(defstatic *string-output-stream-class* (make-built-in-class 'string-output-stream 'string-stream 'basic-character-output-stream))
     
    42534254(defmethod stream-clear-output ((s string-output-stream))
    42544255  nil)
     4256
     4257(defmethod stream-line-length ((s string-output-stream))
     4258  (let* ((ioblock (basic-stream-ioblock s)))
     4259    (string-output-stream-ioblock-line-length ioblock)))
     4260
     4261(defmethod (setf stream-line-length) (newlen (s string-output-stream))
     4262  (let* ((ioblock (basic-stream-ioblock s)))
     4263    (setf (string-output-stream-ioblock-line-length ioblock) newlen)))
     4264
    42554265
    42564266;;; Should only be used for a stream whose class is exactly
     
    42904300                                   (ioblock-device data) -1
    42914301                                   (ioblock-charpos data) 0
    4292                                    (string-output-stream-ioblock-index data) 0))
     4302                                   (string-output-stream-ioblock-index data) 0
     4303                                   (string-output-stream-ioblock-line-length data) 80))
    42934304                           data)))))
    42944305    (or recycled (apply #'make-string-output-stream-ioblock keys))))
  • release/1.4/source/lib/streams.lisp

    r13075 r13387  
    131131
    132132(defun line-length (stream)
    133   (declare (ignore stream))
    134   80)
     133  (or (stream-line-length stream) 80))
    135134
    136135(defun write-byte (byte stream)
Note: See TracChangeset for help on using the changeset viewer.