Changeset 4110

Timestamp:

11/22/08 04:53:36 (3 hours ago)

Author:

kris

Message:

added opSlice() and reserve().

Also adjusted fill(src) and read(dst) to be more careful about how they reset the buffer indices, in order to preserve slicing positions within the buffer.

Files:

• trunk/tango/io/Buffer.d (modified) (9 diffs)
• trunk/tango/io/model/IBuffer.d (modified) (3 diffs)

trunk/tango/io/Buffer.d

@@ -386 +386 @@
-        /***********************************************************************
-
+                Retrieve the valid content
+
+                Returns:
+                a void[] slice of the buffer
+
+                Remarks:
+                Return a void[] slice of the buffer, from the current position
+                up to the limit of valid content. The content remains in the
+                buffer for future extraction.
+
+        ***********************************************************************/
+
+        void[] slice ()
+        {
+                return  data [index .. extent];
+        }
+
+        /***********************************************************************
+        
+                Return a void[] slice of the buffer from start to end, where
+                end is exclusive
+
+        ***********************************************************************/
+
+        final void[] opSlice (uint start, uint end)
+        {
+                assert (start <= extent && end <= extent && start <= end);
+                return data [start .. end];
+        }
+
+        /***********************************************************************
+
-                Access buffer content
-
@@ -431 +463 @@
-                   // in the buffer as possible, such that entire records may
-                   // be aliased directly from within.
-writable
+(dimension - index)
-                      {
-                      if (size > dimension)
@@ -619 +651 @@
-        /***********************************************************************
-
-                Retrieve the valid content
-
-                Returns:
-                a void[] slice of the buffer
-
-                Remarks:
-                Return a void[] slice of the buffer, from the current position
-                up to the limit of valid content. The content remains in the
-                buffer for future extraction.
-
-        ***********************************************************************/
-
-        void[] slice ()
-        {
-                return  data [index .. extent];
-        }
-
-        /***********************************************************************
-
-                Move the current read location
-
@@ -773 +786 @@
-        /***********************************************************************
-
+                Reserve the specified space within the buffer, compressing
+                existing content as necessary to make room
+
+                Returns the current read point, after compression if that
+                was required
+
+        ***********************************************************************/
+
+        final uint reserve (uint space)
+        {       
+                assert (space < dimension);
+
+                if ((dimension - index) < space)
+                     compress;
+                return index;
+        }
+
+        /***********************************************************************
+
-                Write into this buffer
-
@@ -855 +887 @@
-
-        IBuffer compress ()
-
- ()
+       
+
-
-                if (index > 0 && r > 0)
@@ -887 +919 @@
-                if (src is null)
-                    return IConduit.Eof;
-
+
+
-                if (readable is 0 && canCompress)
-                    index = extent = 0;  // same as clear(), without call-chain
@@ -893 +926 @@
-                   if (writable is 0)
-                       return 0;
-
+
-                return write (&src.read);
-        }
@@ -1321 +1354 @@
-                          content = source.read (dst);
-                      else
+                         {
+                         if (writable is 0)
+                             index = extent = 0;  // same as clear(), without call-chain
+
-                         // keep buffer partially populated
-                         if ((content = fill(source)) != IConduit.Eof && content > 0)
-                              content = read (dst);
+                         }
-                      }
-                   else
@@ -1624 +1662 @@
-        }
-}
+
+
+/******************************************************************************
+
+******************************************************************************/
+
+debug (Buffer)
+{
+        void main()
+        {       
+                auto b = new Buffer(6);
+                b.append ("fubar");
+                b.reserve (1);
+                b.slice (5);
+                b.reserve (4);
+        }
+}

trunk/tango/io/model/IBuffer.d

@@ -78 +78 @@
-        /***********************************************************************
-        
-                Return a void[] slice of the buffer up to the limit of
-                valid content.
-
-        ***********************************************************************/
-
-        abstract void[] slice ();
-
-        /***********************************************************************
-        
-                Set the backing array with all content readable. Writing
-                to this will either flush it to an associated conduit, or
@@ -169 +160 @@
-
-        abstract void consume (void[] src);
+
+        /***********************************************************************
+        
+                Return a void[] slice of the buffer up to the limit of
+                valid content.
+
+        ***********************************************************************/
+
+        abstract void[] slice ();
+
+        /***********************************************************************
+        
+                Return a void[] slice of the buffer from start to end, where
+                end is exclusive
+
+        ***********************************************************************/
+
+        abstract void[] opSlice (uint start, uint end);
-
-        /***********************************************************************
@@ -363 +372 @@
-
-        /***********************************************************************
+
+                Reserve the specified space within the buffer, compressing
+                existing content as necessary to make room
+
+                Returns the current read point, after compression if that
+                was required
+
+        ***********************************************************************/
+
+        abstract uint reserve (uint space);
+
+        /***********************************************************************
-        
-                Returns the limit of readable content within this buffer.