move io over to dvec

Author: nikomatsakis

src/libcore/dvec.rs

@@ -176,7 +176,7 @@ impl extensions<A:copy> for dvec<A> {
     //    attempts to access this vector.
     //"]
     //fn append_iter<I:iter::base<A>>(ts: I) {
-    //    self.dvec.swap { |v|
+    //    self.data.swap { |v|
     //        alt ts.size_hint() {
     //          none {}
     //          some(h) { vec::reserve(v, len(v) + h) }

src/libcore/io.rs

@@ -6,6 +6,7 @@ Basic input/output
 
 import result::result;
 
+import dvec::{dvec, extensions};
 import libc::{c_int, c_uint, c_void, size_t, ssize_t};
 import libc::consts::os::posix88::*;
 import libc::consts::os::extra::*;
@@ -574,46 +575,45 @@ fn stderr() -> writer { fd_writer(libc::STDERR_FILENO as c_int, false) }
 fn print(s: str) { stdout().write_str(s); }
 fn println(s: str) { stdout().write_line(s); }
 
-type mem_buffer = @{mut buf: [mut u8],
-                    mut pos: uint};
+type mem_buffer = @{buf: dvec<u8>, mut pos: uint};
 
 impl of writer for mem_buffer {
     fn write(v: [const u8]/&) {
         // Fast path.
-        if self.pos == vec::len(self.buf) {
-            for vec::each(v) {|b| self.buf += [mut b]; }
-            self.pos += vec::len(v);
+        let vlen = vec::len(v);
+        let buf_len = self.buf.len();
+        if self.pos == buf_len {
+            self.buf.push_all(v);
+            self.pos += vlen;
             ret;
         }
-        // FIXME: Optimize: These should be unique pointers. // #2004
-        let vlen = vec::len(v);
-        let mut vpos = 0u;
-        while vpos < vlen {
-            let b = v[vpos];
-            if self.pos == vec::len(self.buf) {
-                self.buf += [mut b];
-            } else { self.buf[self.pos] = b; }
-            self.pos += 1u;
+
+        // FIXME #2004--use memcpy here?
+        let mut pos = self.pos, vpos = 0u;
+        while vpos < vlen && pos < buf_len {
+            self.buf.set_elt(pos, v[vpos]);
+            pos += 1u;
             vpos += 1u;
         }
+        self.buf.push_slice(v, vpos, vlen);
+        self.pos += vlen;
     }
     fn seek(offset: int, whence: seek_style) {
         let pos = self.pos;
-        let len = vec::len(self.buf);
+        let len = self.buf.len();
         self.pos = seek_in_buf(offset, pos, len, whence);
     }
     fn tell() -> uint { self.pos }
     fn flush() -> int { 0 }
 }
 
 fn mem_buffer() -> mem_buffer {
-    @{mut buf: [mut], mut pos: 0u}
+    @{buf: dvec(), mut pos: 0u}
 }
 fn mem_buffer_writer(b: mem_buffer) -> writer { b as writer }
-fn mem_buffer_buf(b: mem_buffer) -> [u8] { vec::from_mut(b.buf) }
+fn mem_buffer_buf(b: mem_buffer) -> [u8] { b.buf.get() }
 fn mem_buffer_str(b: mem_buffer) -> str {
-    let b_ = vec::from_mut(b.buf);
-    str::from_bytes(b_)
+    str::from_bytes(b.buf.get())
 }
 
 fn with_str_writer(f: fn(writer)) -> str {
@@ -827,6 +827,21 @@ mod tests {
           result::ok(_) { fail; }
         }
     }
+
+    #[test]
+    fn mem_buffer_overwrite() {
+        let mbuf = mem_buffer();
+        mbuf.write([0u8, 1u8, 2u8, 3u8]);
+        assert mem_buffer_buf(mbuf) == [0u8, 1u8, 2u8, 3u8];
+        mbuf.seek(-2, seek_cur);
+        mbuf.write([4u8, 5u8, 6u8, 7u8]);
+        assert mem_buffer_buf(mbuf) == [0u8, 1u8, 4u8, 5u8, 6u8, 7u8];
+        mbuf.seek(-2, seek_end);
+        mbuf.write([8u8]);
+        mbuf.seek(1, seek_set);
+        mbuf.write([9u8]);
+        assert mem_buffer_buf(mbuf) == [0u8, 9u8, 4u8, 5u8, 8u8, 7u8];
+    }
 }
 
 //

src/test/run-pass/dvec-test.rs

@@ -11,9 +11,10 @@ fn main() {
     d.push(8);
     d.push(9);
     d.push(10);
-    d.push_vec([11, 12, 13]);
+    d.push_all([11, 12, 13]);
+    d.push_slice([11, 12, 13], 1u, 2u);
 
-    let exp = [5, 6, 7, 8, 9, 10, 11, 12, 13];
+    let exp = [5, 6, 7, 8, 9, 10, 11, 12, 13, 12];
     assert d.get() == exp;
     assert d.get() == exp;
     assert d.len() == exp.len();
@@ -22,5 +23,5 @@ fn main() {
         assert e == exp[i];
     }
 
-    assert dvec::unwrap(d) == [5, 6, 7, 8, 9, 10, 11, 12, 13];
+    assert dvec::unwrap(d) == exp;
 }