Changeset 3385

Timestamp:

03/21/08 02:12:09 (6 months ago)

Author:

kris

Message:

fixes #970 :: foreach (index, line, delim; stream)

Thanks, Daniel919

Files:

• trunk/tango/text/stream/LineIterator.d (modified) (2 diffs)
• trunk/tango/text/stream/QuoteIterator.d (modified) (1 diff)
• trunk/tango/text/stream/SimpleIterator.d (modified) (1 diff)
• trunk/tango/text/stream/StreamIterator.d (modified) (5 diffs)

trunk/tango/text/stream/LineIterator.d

@@ -107 +107 @@
-                            if (i && content[i-1] is '\r')
-                                --slice;
-
+, i
-                            return found (i);
-                            }
@@ -115 +115 @@
-}
-
+
+
+/*******************************************************************************
+
+*******************************************************************************/
+
+debug (LineIterator)
+{
+        import tango.io.Buffer;
+        import tango.io.Console;
+
+        void main()
+        {
+                auto lines = new LineIterator!(char)(new Buffer("one\ntwo\r\nthree"));
+                foreach (i, line, delim; lines)
+                         Cout (line) (delim);
+        }
+}

trunk/tango/text/stream/QuoteIterator.d

@@ -103 +103 @@
-                foreach (int i, T c; content)
-                         if (has (delim, c))
-
+, i
-                         else
-                            if (c is '"' || c is '\'')

trunk/tango/text/stream/SimpleIterator.d

@@ -91 +91 @@
-                   foreach (int i, T c; content)
-                            if (c is delim[0])
-
+, i
-                   }
-                else
-                   foreach (int i, T c; content)
-                            if (has (delim, c))
-
+, i
-
-                return notFound;

trunk/tango/text/stream/StreamIterator.d

@@ -55 +55 @@
-class StreamIterator(T) : InputStream, Buffered
-{
-
+
+
-        private IBuffer         input;
-
@@ -157 +158 @@
-        }
-
+        /**********************************************************************
+
+                Iterate over a set of tokens and delimiters, exposing a 
+                token count starting at zero
+
+        **********************************************************************/
+
+        int opApply (int delegate(inout int, inout T[], inout T[]) dg)
+        {
+                bool more;
+                int  result,
+                     tokens;
+
+                do {
+                   delim = null;
+                   more = consume;
+                   result = dg (tokens, slice, delim);
+                   ++tokens;
+                   } while (more && !result);
+                return result;
+        }
+
-        /***********************************************************************
-
@@ -180 +203 @@
-                         Cout(line).newline;
-                ---
-
-                Note that tokens exposed via push() are returned immediately
-                when available, taking priority over the input stream itself
-                
-        ***********************************************************************/
@@ -195 +215 @@
-        /***********************************************************************
-
-
+
+
-
-        ***********************************************************************/
@@ -202 +223 @@
-        {
-                slice = content [start .. end];
+                return end;
+        }
+
+        /***********************************************************************
+
+                Set the content of the current slice to the provided 
+                start and end points, and delimiter to the segment
+                between end & next (inclusive)
+
+        ***********************************************************************/
+
+        protected final uint set (T* content, uint start, uint end, uint next)
+        {
+                slice = content [start .. end];
+                delim = content [end .. next+1];
-                return end;
-        }