Issue 8829 - std.algorithm.find fails to take advantage of SortedRange

dlang · Dec 6, 2016 · 818d512 · 818d512
1 parent d651985
commit 818d512
Showing 1 changed file with 36 additions and 68 deletions.
diff --git a/std/format.d b/std/format.d
@@ -4302,7 +4302,7 @@ T unformatValue(T, Range, Char)(ref Range input, ref FormatSpec!Char spec)
     import std.conv : parse, text;
     if (spec.spec == 's')
     {
-        static if(__traits(compiles, parse!T(input)) ) return parse!T(input);
+        return parse!T(input);
     }
     enforce(find(acceptedSpecs!long, spec.spec).length,
             text("Wrong unformat specifier '%", spec.spec , "' for ", T.stringof));
@@ -4359,38 +4359,7 @@ T unformatValue(T, Range, Char)(ref Range input, ref FormatSpec!Char spec)
     enforce(spec.spec == 's',
             text("Wrong unformat specifier '%", spec.spec , "' for ", T.stringof));
 
-    static if(__traits(compiles, parse!T(input)) ) return parse!T(input);
-}
-
-private T rawRead(T, Range)(ref Range input)
-{
-    enforce(
-            isSomeString!Range || ElementType!(Range).sizeof == 1,
-            "Cannot parse input of type %s".format(Range.stringof)
-        );
-    union X
-    {
-        ubyte[T.sizeof] raw;
-        T typed;
-    }
-    X x;
-    foreach (i; 0 .. T.sizeof)
-    {
-        static if (isSomeString!Range)
-        {
-            x.raw[i] = input[0];
-            input = input[1 .. $];
-        }
-        else
-        {
-            // TODO: recheck this
-            x.raw[i] = cast(ubyte) input.front;
-            input.popFront();
-        }
-    }
-
-    return x.typed;
-
+    return parse!T(input);
 }
 
 /**
@@ -4399,7 +4368,6 @@ private T rawRead(T, Range)(ref Range input)
 T unformatValue(T, Range, Char)(ref Range input, ref FormatSpec!Char spec)
     if (isInputRange!Range && isIntegral!T && !is(T == enum))
 {
-
     import std.algorithm.searching : find;
     import std.conv : parse, text;
     enforce(find(acceptedSpecs!T, spec.spec).length,
@@ -4413,31 +4381,7 @@ T unformatValue(T, Range, Char)(ref Range input, ref FormatSpec!Char spec)
         spec.spec == 'b' ? 2 :
         spec.spec == 's' || spec.spec == 'd' || spec.spec == 'u' ? 10 : 0;
     assert(base != 0);
-
-    // raw read
-    //enforce(input.length >= T.sizeof);
-    if (spec.spec == 'r') return rawRead!T(input);
-
-    enforce(find(acceptedSpecs!T, spec.spec).length,
-            text("Wrong unformat specifier '%", spec.spec , "' for ", T.stringof));
-
-    static if(__traits(compiles, parse!T(input, base)) ) return parse!T(input, base);
-
-}
-
-version(none)unittest
-{
-    union B
-    {
-        char[int.sizeof] untyped;
-        int typed;
-    }
-    B b;
-    b.typed = 5;
-    char[] input = b.untyped[];
-    int witness;
-    formattedRead(input, "%r", &witness);
-    assert(witness == b.typed);
+    return parse!T(input, base);
 }
 
 /**
@@ -4448,16 +4392,40 @@ T unformatValue(T, Range, Char)(ref Range input, ref FormatSpec!Char spec)
 {
     import std.algorithm.searching : find;
     import std.conv : parse, text;
-
-
-    // raw read
-    //enforce(input.length >= T.sizeof);
-    if (spec.spec == 'r') return rawRead!T(input);
-
+    if (spec.spec == 'r')
+    {
+        // raw read
+        //enforce(input.length >= T.sizeof);
+        enforce(
+            isSomeString!Range || ElementType!(Range).sizeof == 1,
+            "Cannot parse input of type %s".format(Range.stringof)
+        );
+        union X
+        {
+            ubyte[T.sizeof] raw;
+            T typed;
+        }
+        X x;
+        foreach (i; 0 .. T.sizeof)
+        {
+            static if (isSomeString!Range)
+            {
+                x.raw[i] = input[0];
+                input = input[1 .. $];
+            }
+            else
+            {
+                // TODO: recheck this
+                x.raw[i] = cast(ubyte) input.front;
+                input.popFront();
+            }
+        }
+        return x.typed;
+    }
     enforce(find(acceptedSpecs!T, spec.spec).length,
             text("Wrong unformat specifier '%", spec.spec , "' for ", T.stringof));
 
-    static if(__traits(compiles, parse!T(input)) ) return parse!T(input);
+    return parse!T(input);
 }
 
 version(none)unittest
@@ -4632,7 +4600,7 @@ T unformatValue(T, Range, Char)(ref Range input, ref FormatSpec!Char spec)
     enforce(spec.spec == 's',
             text("Wrong unformat specifier '%", spec.spec , "' for ", T.stringof));
 
-    static if(__traits(compiles, parse!T(input)) ) return parse!T(input);
+    return parse!T(input);
 }
 
 @system pure unittest
@@ -4726,7 +4694,7 @@ T unformatValue(T, Range, Char)(ref Range input, ref FormatSpec!Char spec)
     enforce(spec.spec == 's',
             text("Wrong unformat specifier '%", spec.spec , "' for ", T.stringof));
 
-    static if(__traits(compiles, parse!T(input)) ) return parse!T(input);
+    return parse!T(input);
 }
 
 @system pure unittest