[slime-cvs] CVS slime

[dcrosher]

Update of /project/slime/cvsroot/slime
In directory clnet:/tmp/cvs-serv3662

Modified Files:
	ChangeLog swank-scl.lisp 
Log Message:
o swank-scl.lisp: Fix slime input stream reading.



--- /project/slime/cvsroot/slime/ChangeLog	2006/02/25 15:00:22	1.847
+++ /project/slime/cvsroot/slime/ChangeLog	2006/02/25 17:46:13	1.848
@@ -1,3 +1,7 @@
+2006-02-26  Douglas Crosher <dcrosher at common-lisp.net>
+	* swank-scl.lisp: (ext:stream-read-chars):  Correct the updating of
+	the buffer index.  Fixes slime input stream problems.
+
 2006-02-25  Helmut Eller  <heller at common-lisp.net>
 
 	* swank-loader.lisp (default-fasl-directory): Previously we return
--- /project/slime/cvsroot/slime/swank-scl.lisp	2006/02/25 12:10:33	1.4
+++ /project/slime/cvsroot/slime/swank-scl.lisp	2006/02/25 17:46:13	1.5
@@ -192,6 +192,7 @@
            (dotimes (i copy)
              (declare (type kernel:index i))
              (setf (aref buffer (+ start i)) (aref input-buffer (+ index i))))
+           (setf (slot-value stream 'index) (+ index copy))
            (incf (slot-value stream 'position) copy)
 	   copy)
 	  (waitp
@@ -206,7 +207,8 @@
                      (t
                       (setf (slot-value stream 'buffer) new-input)
                       (setf (slot-value stream 'index) 0)
-                      (ext:stream-read-chars stream buffer start requested waitp))))))
+                      (ext:stream-read-chars stream buffer
+                                             start requested waitp))))))
           (t
            0))))
 
@@ -1767,9 +1769,6 @@
 (defun scl-inspect (o)
   (destructuring-bind (text labeledp . parts)
       (inspect::describe-parts o)
-    (loop for value in parts
-          for i from 0 
-          do (format stream " ~S~%" (label-value-line i value)))
     (values (format nil "~A~%" text)
             (if labeledp
                 (loop for (label . value) in parts