Convert timsort.c.src to C++

serge-sans-paille · serge-sans-paille · commit 73a20fd8ecab · 2022-01-14T22:09:48.000+01:00
diff --git a/numpy/core/setup.py b/numpy/core/setup.py
@@ -948,7 +948,7 @@ def gl_if_msvc(build_cmd):
             join('src', 'common', 'npy_sort.h.src'),
             join('src', 'npysort', 'quicksort.c.src'),
             join('src', 'npysort', 'mergesort.c.src'),
-            join('src', 'npysort', 'timsort.c.src'),
+            join('src', 'npysort', 'timsort.cpp'),
             join('src', 'npysort', 'heapsort.c.src'),
             join('src', 'npysort', 'radixsort.cpp'),
             join('src', 'common', 'npy_partition.h.src'),
diff --git a/numpy/core/src/common/numpy_tag.h b/numpy/core/src/common/numpy_tag.h
@@ -220,6 +220,40 @@ struct timedelta_tag : date_tag {
     }
 };
 
+struct string_tag {
+    using type = npy_char;
+    static constexpr NPY_TYPES type_value = NPY_STRING;
+    static int less(type const* a, type const* b, size_t len) {
+      return STRING_LT(a, b, len);
+    }
+    static int less_equal(type const* a, type const* b, size_t len) {
+      return !less(b, a, len);
+    }
+    static void swap(type* a, type* b, size_t len) {
+      STRING_SWAP(a, b, len);
+    }
+    static void copy(type * a, type const* b, size_t len) {
+      STRING_COPY(a, b, len);
+    }
+};
+
+struct unicode_tag {
+    using type = npy_ucs4;
+    static constexpr NPY_TYPES type_value = NPY_UNICODE;
+    static int less(type const* a, type const* b, size_t len) {
+      return UNICODE_LT(a, b, len);
+    }
+    static int less_equal(type const* a, type const* b, size_t len) {
+      return !less(b, a, len);
+    }
+    static void swap(type* a, type* b, size_t len) {
+      UNICODE_SWAP(a, b, len);
+    }
+    static void copy(type * a, type const* b, size_t len) {
+      UNICODE_COPY(a, b, len);
+    }
+};
+
 }  // namespace npy
 
 #endif
diff --git a/numpy/core/src/npysort/npysort_common.h b/numpy/core/src/npysort/npysort_common.h
@@ -259,7 +259,7 @@ CLONGDOUBLE_LT(npy_clongdouble a, npy_clongdouble b)
 
 
 NPY_INLINE static void
-STRING_COPY(char *s1, char *s2, size_t len)
+STRING_COPY(char *s1, char const*s2, size_t len)
 {
     memcpy(s1, s2, len);
 }
@@ -295,7 +295,7 @@ STRING_LT(const char *s1, const char *s2, size_t len)
 
 
 NPY_INLINE static void
-UNICODE_COPY(npy_ucs4 *s1, npy_ucs4 *s2, size_t len)
+UNICODE_COPY(npy_ucs4 *s1, npy_ucs4 const *s2, size_t len)
 {
     while(len--) {
         *s1++ = *s2++;
diff --git a/numpy/core/src/npysort/timsort.cpp b/numpy/core/src/npysort/timsort.cpp

Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,7 @@ CLONGDOUBLE_LT(npy_clongdouble a, npy_clongdouble b)`
`259`	`259`
`260`	`260`
`261`	`261`	`NPY_INLINE static void`
`262`		`-STRING_COPY(char s1, char s2, size_t len)`
	`262`	`+STRING_COPY(char s1, char consts2, size_t len)`
`263`	`263`	`{`
`264`	`264`	`memcpy(s1, s2, len);`
`265`	`265`	`}`
`@@ -295,7 +295,7 @@ STRING_LT(const char s1, const char s2, size_t len)`
`295`	`295`
`296`	`296`
`297`	`297`	`NPY_INLINE static void`
`298`		`-UNICODE_COPY(npy_ucs4 s1, npy_ucs4 s2, size_t len)`
	`298`	`+UNICODE_COPY(npy_ucs4 s1, npy_ucs4 const s2, size_t len)`
`299`	`299`	`{`
`300`	`300`	`while(len--) {`
`301`	`301`	`s1++ = s2++;`