Fix Issue 15918

dlang · May 24, 2016 · 54f0597 · 54f0597
1 parent 35b92c6
commit 54f0597
Showing 1 changed file with 46 additions and 3 deletions.
diff --git a/std/algorithm/searching.d b/std/algorithm/searching.d
@@ -2563,6 +2563,10 @@ if (isForwardRange!R1 && isForwardRange!R2)
         {
             asTuple = typeof(asTuple)(pre, separator, post);
         }
+        void opAssign(typeof(asTuple) rhs)
+        {
+            asTuple = rhs;
+        }
         Tuple!(S1, S1, S2) asTuple;
         bool opCast(T : bool)()
         {
@@ -2623,6 +2627,10 @@ if (isForwardRange!R1 && isForwardRange!R2)
         {
             asTuple = typeof(asTuple)(pre, post);
         }
+        void opAssign(typeof(asTuple) rhs)
+        {
+            asTuple = rhs;
+        }
         Tuple!(S1, S2) asTuple;
         bool opCast(T : bool)()
         {
@@ -2679,6 +2687,10 @@ if (isForwardRange!R1 && isForwardRange!R2)
         {
             asTuple = typeof(asTuple)(pre, post);
         }
+        void opAssign(typeof(asTuple) rhs)
+        {
+            asTuple = rhs;
+        }
         Tuple!(S1, S2) asTuple;
         bool opCast(T : bool)()
         {
@@ -2733,7 +2745,7 @@ if (isForwardRange!R1 && isForwardRange!R2)
 }
 
 ///
-@safe unittest
+@safe pure nothrow unittest
 {
     auto a = "Carl Sagan Memorial Station";
     auto r = findSplit(a, "Velikovsky");
@@ -2758,7 +2770,7 @@ if (isForwardRange!R1 && isForwardRange!R2)
     assert(r2[1] == " Memorial Station");
 }
 
-@safe unittest
+@safe pure nothrow unittest
 {
     auto a = [ 1, 2, 3, 4, 5, 6, 7, 8 ];
     auto r = findSplit(a, [9, 1]);
@@ -2791,7 +2803,7 @@ if (isForwardRange!R1 && isForwardRange!R2)
     assert(r2[1] == a[4 .. $]);
 }
 
-@safe unittest
+@safe pure nothrow unittest
 {
     import std.algorithm.comparison : equal;
     import std.algorithm.iteration : filter;
@@ -2828,6 +2840,37 @@ if (isForwardRange!R1 && isForwardRange!R2)
     assert(equal(r2[1], a[4 .. $]));
 }
 
+@safe pure nothrow @nogc unittest
+{
+    auto str = "sep,one,sep,two";
+
+    auto split = str.findSplitAfter(",");
+    assert(split[0] == "sep,");
+
+    split = split[1].findSplitAfter(",");
+    assert(split[0] == "one,");
+
+    split = split[1].findSplitBefore(",");
+    assert(split[0] == "sep");
+}
+
+@safe pure nothrow @nogc unittest
+{
+    auto str = "sep,one,sep,two";
+
+    auto split = str.findSplitBefore(",two");
+    assert(split[0] == "sep,one,sep");
+    assert(split[1] == ",two");
+
+    split = split[0].findSplitBefore(",sep");
+    assert(split[0] == "sep,one");
+    assert(split[1] == ",sep");
+
+    split = split[0].findSplitAfter(",");
+    assert(split[0] == "sep,");
+    assert(split[1] == "one");
+}
+
 // minCount
 /**