Merge pull request #15 from gfx/issue14

add check code for #14

Author: gfx

Makefile

@@ -28,6 +28,10 @@ test-with-cpp11: test/test.cpp timsort.hpp .bin
 	$(COMPILE) -std=c++11 $< $(LIB_BOOST_TEST) -o .bin/$@
 	time ./.bin/$@
 
+test-issue14: valgrind/issue14.cpp
+	$(COMPILE) -DENABLE_TIMSORT_LOG -std=c++11 -fsanitize=address $< -o .bin/$@
+	./.bin/$@
+
 bench: example/bench.cpp timsort.hpp .bin
 	$(CXX) -v
 	$(COMPILE) $(OPTIMIZE) -std=c++11 $< -o .bin/$@

test/test.cpp

@@ -1,5 +1,6 @@
 #include <iostream>
 #include <vector>
+#include <deque>
 #include <algorithm>
 #include <utility>
 
@@ -607,4 +608,13 @@ BOOST_AUTO_TEST_CASE(shuffle10k_for_move_only_types) {
     }
 }
 
+BOOST_AUTO_TEST_CASE(issue14) {
+    int a[] = {15, 7,  16, 20, 25, 28, 13, 27, 34, 24, 19, 1, 6,  30, 32, 29, 10, 9,
+               3,  31, 21, 26, 8,  2,  22, 14, 4,  12, 5,  0, 23, 33, 11, 17, 18};
+    std::deque<int> c(std::begin(a), std::end(a));
+
+    gfx::timsort(std::begin(c), std::end(c));
+    BOOST_CHECK(std::is_sorted(std::begin(c), std::end(c)));
+}
+
 #endif // if std::move available

timsort.hpp

@@ -626,8 +626,7 @@ template <typename RandomAccessIterator, typename LessFunction> class TimSort {
         if (len2 == 1) {
             assert(len1 > 0);
             dest -= len1;
-            cursor1 -= len1;
-            GFX_TIMSORT_MOVE_BACKWARD(cursor1 + 1, cursor1 + (1 + len1), dest + (1 + len1));
+            GFX_TIMSORT_MOVE_BACKWARD(cursor1 + (1 - len1), cursor1 + 1, dest + (1 + len1));
             *dest = GFX_TIMSORT_MOVE(*cursor2);
         } else {
             assert(len2 != 0 && "Comparison function violates its general contract");

valgrind/issue14.cpp

@@ -0,0 +1,13 @@
+#include "timsort.hpp"
+#include <deque>
+#include <cstdlib>
+
+int main() {
+    std::deque<int> collection = {15, 7,  16, 20, 25, 28, 13, 27, 34, 24, 19, 1, 6,  30, 32, 29, 10, 9,
+                                  3,  31, 21, 26, 8,  2,  22, 14, 4,  12, 5,  0, 23, 33, 11, 17, 18};
+
+    gfx::timsort(std::begin(collection), std::end(collection));
+    assert(std::is_sorted(std::begin(collection), std::end(collection)));
+
+    return 0;
+}