Changeset 3838

Timestamp:

08/03/08 13:47:38 (4 months ago)

Author:

kris

Message:

fixes #1188 :: "Token is too large to fit within buffer" while using GrowBuffer?

Added an expand() method to take care of this. Kudos to fvbommel

Files:

• trunk/tango/io/Buffer.d (modified) (7 diffs)

trunk/tango/io/Buffer.d

@@ -710 +710 @@
-                          else
-                             // no more space in the buffer?
-
+ && expand(0) is 0
-                                 error ("Token is too large to fit within buffer");
-
@@ -1112 +1112 @@
-                   extent += size;
-                   }
+        }
+
+        /***********************************************************************
+
+                Expand existing buffer space
+
+                Returns:
+                Available space, without any expansion
+
+                Remarks:
+                Make some additional room in the buffer, of at least the 
+                given size. This can be used by subclasses as appropriate
+                                     
+        ***********************************************************************/
+
+        protected uint expand (uint size)
+        {
+                return writable;
-        }
-
@@ -1518 +1536 @@
-
-                   if (size + index > dimension)
-makeRoom
+expand
-
-                   // populate tail of buffer with new content
@@ -1543 +1561 @@
-        {               
-                if (length > writable)
-makeRoom
+expand
-
-                copy (src, length);
@@ -1561 +1579 @@
-        {
-                if (writable <= increment/8)
-makeRoom
+expand
-
-                return write (&src.read);
@@ -1585 +1603 @@
-        /***********************************************************************
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        {
-                if (size < increment)
@@ -1596 +1621 @@
-                dimension += size;
-                data.length = dimension;               
-()
+
-        }
-}