Changeset 1951

Timestamp:

03/22/07 04:03:11 (2 years ago)

Author:

kris

Message:

optimized nextLine() for jollies

Files:

• trunk/tango/io/Console.d (modified) (4 diffs)

trunk/tango/io/Console.d

@@ -19 +19 @@
-private import  tango.io.Buffer,
-                tango.io.DeviceConduit;
+
+
+version (Opt)
+{
+private uint indexOf (void* str, char match, uint length)
+{
+        version (D_InlineAsm_X86)
+        {       
+                        asm {
+                            mov   EDI, str;
+                            mov   ECX, length;
+                            movzx EAX, match;
+                            mov   ESI, ECX;
+                            and   ESI, ESI;            
+                            jz    end;        
+
+                            cld;
+                            repnz;
+                            scasb;
+                            jnz   end;
+                            sub   ESI, ECX;
+                            dec   ESI;
+                        end:;
+                            mov   EAX, ESI;
+                            }
+        }
+        else
+        {
+                auto len = length;
+                for (auto p=str-1; len--;)
+                     if (*++p is match)
+                         return p - str;
+                return length;
+        }
+}
+}
-
-/*******************************************************************************
@@ -115 +151 @@
-                bool nextLine (inout char[] content, bool raw=false)
-                {
+version (Opt)
+{
+                        uint scan (void[] input)
+                        {
+                                auto i = indexOf (input.ptr, '\n', input.length);
+                                if (i < input.length)
+                                   {
+                                   ++i;
+                                   content = cast(char[])cast(void*) input [0..i];
+                                   return i;
+                                   }
+                                content = cast(char[])cast(void*) input;
+                                return IConduit.Eof;
+                        }
+}
+else
+{
-                        uint scan (void[] input)
-                        {
@@ -133 +186 @@
-                                return IConduit.Eof;
-                        }
+}
-
-                        return buffer_.next (&scan) || content.length;
@@ -318 +372 @@
-
-                        *******************************************************/
-
+
-                        uint bufferSize ()
-                        {
-                                return 1024 * 8;
-                        }
-
+
-                        /*******************************************************
-