version_sorter 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9b7f83f240fe5c1f73869ea5d444c4353295ef09
-  data.tar.gz: ce3be5fc421d9406a5176ea4b9d0b9739533d47d
+SHA256:
+  metadata.gz: ca2c813ab2e3b07a3c6ba8c7cbac756613b61e7b514b0c06deac6d43b01d819e
+  data.tar.gz: caacf05c4444ed24ce2ec866af9bdc2b9455af2eba50afde6010a3d440088389
 SHA512:
-  metadata.gz: bf063d33fbe28d170b5eec3bee5e5a1107fa8188d9524e0052b602a4f08ed6aae3d101286f9c9387dcc45489fc084ca15f066006d97034d8ceeb795c58d4088e
-  data.tar.gz: b5d1c089b337f129a428515a2bc3066ab5d87f92c8e93895bfcd45c18b82625d7e152da0acfaa1215da54e9000d5a0fb58dd4721882945f67e52ee7304fb0be9
+  metadata.gz: 7cb7c84a4213cb66509f06809422892d9f14b0d95a955c5124764fa5fdb9881e8f0df86dec159d02fc585d3ee5b0816e39ac451135b675f1e3272ac512b8b93a
+  data.tar.gz: 493b92cb2e19a9e2d3b7cb2078c1965860fa299f35b3a07bc6342438903d2b379eb221ca6e32e074045f03ebb51bbc4740ec6beaa11d7f1678c8f325919dc027

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,
@@ -169,36 +171,68 @@ 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;
 
+	length = RARRAY_LEN(context->rb_version_array);
+	for (i = 0; i < length; ++i) {
+		VALUE rb_version = rb_ary_entry(context->rb_version_array, i);
+		context->versions[i] = parse_version_number(StringValueCStr(rb_version));
+		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;
+	}
+
+	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();
 
-	versions = xcalloc(length, sizeof(struct version_number *));
+	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) {
-		VALUE rb_version = rb_ary_entry(rb_version_array, i);
-		versions[i] = parse_version_number(StringValueCStr(rb_version));
-		versions[i]->rb_version = rb_version;
+		xfree(context.versions[i]);
 	}
+	xfree(context.versions);
 
-	qsort(versions, length, sizeof(struct version_number *), cmp);
-	rb_version_ptr = RARRAY_PTR(rb_version_array);
-
-	for (i = 0; i < length; ++i) {
-		rb_version_ptr[i] = versions[i]->rb_version;
-		xfree(versions[i]);
+	if (exception) {
+		rb_jump_tag(exception);
 	}
-	xfree(versions);
-	return rb_version_array;
+
+	return result;
 }
 
 static VALUE

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: version_sorter
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Chris Wanstrath
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-29 00:00:00.000000000 Z
+date: 2018-02-12 00:00:00.000000000 Z
 dependencies: []
 description: VersionSorter is a C extension that does fast sorting of large sets of
   version strings.
@@ -42,7 +42,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Fast sorting of version strings