version_sorter 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a70fd7cdb6644724f9e56ec43763ab434869157e
-  data.tar.gz: 158a5dca9eb719f7a70cfc31c4e25939869c2953
+SHA256:
+  metadata.gz: ac54da2224203400008bdcc488a07f6014466645135dba8447a328b88d01a5c3
+  data.tar.gz: fb4f9564c440553d0a5ac8a1580b3545c5d394219c9169547765d07dc3610a41
 SHA512:
-  metadata.gz: 7b129cf5ded38073805a6893b2dc1d9eb2c5d5ed18f5306dd277a042a7f3e6ce066e30b1ee9c181945acc93a4dfbf0a21349b5e29745915ab0879c46339547cb
-  data.tar.gz: b827661988f7d51796a24b6e08d376b8a8e43477c02a81a19f1f5ab2373a4225243f430f3a85ffd767e4c5a61748b1509b751c6a3c7b5ef7486c5b75ebac7707
+  metadata.gz: 9e7a5716f656e8bbad48a61d8d82c2c7330b9027eb7bc7a45ce1bd6f40f0717e46515e0243a938e524ac2e024263fd84202d267ffba4efa61567f209c2e9eec0
+  data.tar.gz: 20018a183745d8b1d139181b061307e095add6cc77e4d5120d27c93b31081120ffef00c784cada52681b4491acfca2b3db7db42b8c1cf000fccf0a36ce7a64ad

data/ext/version_sorter/version_sorter.c

@@ -15,6 +15,7 @@
 #include <ruby.h>
 
 #define min(a, b) ((a) < (b) ? (a) : (b))
+#define max(a, b) ((a) > (b) ? (a) : (b))
 typedef int compare_callback_t(const void *, const void *);
 
 struct version_number {
@@ -56,7 +57,8 @@ compare_version_number(const struct version_number *a,
 			int cmp = 0;
 
 			if (num_a) {
-				cmp = (int)ca->number - (int)cb->number;
+				int64_t cmp64 = (int64_t)ca->number - (int64_t)cb->number;
+				cmp = (int)max(-1, min(1, cmp64));
 			} else {
 				cmp = strchunk_cmp(
 						a->original, &ca->string,
@@ -69,6 +71,10 @@ compare_version_number(const struct version_number *a,
 		}
 	}
 
+	if (max_n == 0) {
+		return strcmp(a->original, b->original);
+	}
+
 	if (a->size < b->size)
 		return (b->num_flags & (1ull << n)) ? -1 : 1;
 
@@ -138,7 +144,7 @@ parse_version_number(const char *string)
 				version->comp[comp_n].string.len = offset - start;
 			} else {
 				version->comp[comp_n].number = number;
-				num_flags |= (1 << comp_n);
+				num_flags |= (1ull << comp_n);
 			}
 			comp_n++;
 			continue;
@@ -147,10 +153,7 @@ parse_version_number(const char *string)
 		if (string[offset] == '-' || isalpha(string[offset])) {
 			uint16_t start = offset;
 
-			if (string[offset] == '-')
-				offset++;
-
-			while (isalpha(string[offset]))
+			while (string[offset] == '-' || isalpha(string[offset]))
 				offset++;
 
 			version->comp[comp_n].string.offset = start;
@@ -169,43 +172,75 @@ parse_version_number(const char *string)
 	return version;
 }
 
+struct sort_context {
+	VALUE rb_self;
+	VALUE rb_version_array;
+	compare_callback_t *cmp;
+	struct version_number **versions;
+};
+
 static VALUE
-rb_version_sort_1(VALUE rb_self, VALUE rb_version_array, compare_callback_t cmp)
+rb_version_sort_1_cb(VALUE arg)
 {
-	struct version_number **versions;
+	struct sort_context *context = (struct sort_context *)arg;
 	long length, i;
 	VALUE *rb_version_ptr;
 
-	Check_Type(rb_version_array, T_ARRAY);
-
-	length = RARRAY_LEN(rb_version_array);
-	if (!length)
-		return rb_ary_new();
-
-	versions = xcalloc(length, sizeof(struct version_number *));
-
+	length = RARRAY_LEN(context->rb_version_array);
 	for (i = 0; i < length; ++i) {
 		VALUE rb_version, rb_version_string;
 
-		rb_version = rb_ary_entry(rb_version_array, i);
+		rb_version = rb_ary_entry(context->rb_version_array, i);
 		if (rb_block_given_p())
 			rb_version_string = rb_yield(rb_version);
 		else
 			rb_version_string = rb_version;
 
-		versions[i] = parse_version_number(StringValuePtr(rb_version_string));
-		versions[i]->rb_version = rb_version;
+		context->versions[i] = parse_version_number(StringValueCStr(rb_version_string));
+		context->versions[i]->rb_version = rb_version;
+	}
+
+	qsort(context->versions, length, sizeof(struct version_number *), context->cmp);
+	rb_version_ptr = RARRAY_PTR(context->rb_version_array);
+
+	for (i = 0; i < length; ++i) {
+		rb_version_ptr[i] = context->versions[i]->rb_version;
 	}
 
-	qsort(versions, length, sizeof(struct version_number *), cmp);
-	rb_version_ptr = RARRAY_PTR(rb_version_array);
+	return context->rb_version_array;
+}
+
+static VALUE
+rb_version_sort_1(VALUE rb_self, VALUE rb_version_array, compare_callback_t cmp)
+{
+	long length, i;
+	int exception;
+
+	Check_Type(rb_version_array, T_ARRAY);
+
+	length = RARRAY_LEN(rb_version_array);
+	if (!length)
+		return rb_ary_new();
+
+	struct sort_context context = {
+		rb_self,
+		rb_version_array,
+		cmp,
+		xcalloc(length, sizeof(struct version_number *)),
+	};
+
+	VALUE result = rb_protect(rb_version_sort_1_cb, (VALUE)&context, &exception);
 
 	for (i = 0; i < length; ++i) {
-		rb_version_ptr[i] = versions[i]->rb_version;
-		xfree(versions[i]);
+		xfree(context.versions[i]);
+	}
+	xfree(context.versions);
+
+	if (exception) {
+		rb_jump_tag(exception);
 	}
-	xfree(versions);
-	return rb_version_array;
+
+	return result;
 }
 
 static VALUE
@@ -232,12 +267,41 @@ rb_version_sort_r_bang(VALUE rb_self, VALUE rb_versions)
 	return rb_version_sort_1(rb_self, rb_versions, version_compare_cb_r);
 }
 
+struct compare_context {
+	VALUE rb_version_a, rb_version_b;
+	struct version_number *version_a, *version_b;
+};
+
+static VALUE
+rb_version_compare_cb(VALUE arg)
+{
+	struct compare_context *context = (struct compare_context *)arg;
+
+	context->version_a = parse_version_number(StringValueCStr(context->rb_version_a));
+	context->version_b = parse_version_number(StringValueCStr(context->rb_version_b));
+
+	return INT2NUM(version_compare_cb(&context->version_a, &context->version_b));
+}
+
 static VALUE
 rb_version_compare(VALUE rb_self, VALUE rb_version_a, VALUE rb_version_b)
 {
-	struct version_number *version_a = parse_version_number(StringValuePtr(rb_version_a));
-	struct version_number *version_b = parse_version_number(StringValuePtr(rb_version_b));
-	return INT2NUM(version_compare_cb(&version_a, &version_b));
+	int exception;
+	struct compare_context context = {
+		rb_version_a, rb_version_b,
+		NULL, NULL,
+	};
+
+	VALUE result = rb_protect(rb_version_compare_cb, (VALUE)&context, &exception);
+
+	xfree(context.version_a);
+	xfree(context.version_b);
+
+	if (exception) {
+		rb_jump_tag(exception);
+	}
+
+	return result;
 }
 
 void Init_version_sorter(void)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: version_sorter
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Chris Wanstrath
 - K. Adam Christensen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-06-21 00:00:00.000000000 Z
+date: 2021-10-20 00:00:00.000000000 Z
 dependencies: []
 description: VersionSorter is a C extension that does fast sorting of large sets of
   version strings.
@@ -26,7 +26,7 @@ homepage: https://github.com/github/version_sorter#readme
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -41,9 +41,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Fast sorting of version strings
 test_files: []