edlib 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a7ecc7eca8aef827a022a66bcf9c540e24f0e3d070b8af5d37913f112f68b0d
-  data.tar.gz: 6c25316af8bc413b4c014660e9bb7769a139ecd537983a67ab4a249fcaa31faf
+  metadata.gz: 6e6f83cf227f49681f1c3c1e50b0ca5a9816ff6b2ad42c8fc293963e4c82dd1a
+  data.tar.gz: d725b5937ea1c5c3c04cae03015682285d4481bde378f89bbc7336bc532c758e
 SHA512:
-  metadata.gz: 0e63d0dbdb063833d7bea3e0ee53ca0ae0daa1e5828d0c022e9d7da8c5c3f3a3ce8dc16418fd7b925894767bdc053cebc7e85c214f5541d2d4c2d40434ef4dd9
-  data.tar.gz: c666e503c1af8de0d91cc8acce4d253f5e73f84137cc2b2436b936a145c552997db518c8193ba917c6ccd6f14134f80e464bb6e6f1e6b23f751413529d00c454
+  metadata.gz: 4a5aba207f2e51a0091b36dd1666a68daf68f93cba48ffa86f6daf0c18a28967f8b393f58ff3377191096bd0e8994e8d99afd64322cf5d53fa42a69499d1b4fe
+  data.tar.gz: ddd9bc252e46eb4bd53d3a435321242b42829f94aeaa6d115597ad9ec27d05424a53523cc0d5688af49368e59bb1023b5766adb45cba58e309823a3ce82c5317

data/ext/edlib/edlibext.c

@@ -3,13 +3,15 @@
 
 VALUE mEdlib;
 VALUE cAligner;
+EdlibEqualityPair *eqpairs;
 
 static size_t config_memsize(const void *ptr);
+static void config_free(void *ptr);
 
 static const rb_data_type_t config_type = {
 	.wrap_struct_name = "EdlibAlignConfig",
 	.function = {
-		.dfree = RUBY_DEFAULT_FREE,
+		.dfree = config_free,
 		.dsize = config_memsize,
 	},
 	.flags = RUBY_TYPED_FREE_IMMEDIATELY,
@@ -24,6 +26,17 @@ config_allocate(VALUE klass)
 	return obj;
 }
 
+static void
+config_free(void *ptr)
+{
+	if (eqpairs != NULL)
+	{
+		free(eqpairs);
+		eqpairs = NULL;
+	}
+	xfree(ptr);
+}
+
 static size_t
 config_memsize(const void *ptr)
 {
@@ -31,7 +44,8 @@ config_memsize(const void *ptr)
 	return sizeof(ptr) + 2 * sizeof(char) * (config->additionalEqualitiesLength);
 }
 
-static EdlibAlignConfig *get_config(VALUE self)
+static EdlibAlignConfig *
+get_config(VALUE self)
 {
 	EdlibAlignConfig *ptr = NULL;
 	TypedData_Get_Struct(self, EdlibAlignConfig, &config_type, ptr);
@@ -94,7 +108,7 @@ set_mode(EdlibAlignConfig *config, VALUE mode)
 {
 	if (TYPE(mode) == T_SYMBOL)
 	{
-		mode =  rb_String(mode);
+		mode = rb_String(mode);
 	}
 	switch (TYPE(mode))
 	{
@@ -238,9 +252,20 @@ static VALUE
 set_additional_equalities(EdlibAlignConfig *config, VALUE equalities)
 {
 	Check_Type(equalities, T_ARRAY);
-	EdlibEqualityPair *pairs = (EdlibEqualityPair *)malloc(sizeof(EdlibEqualityPair) * RARRAY_LEN(equalities));
-
-	for (int i = 0; i < RARRAY_LEN(equalities); i++)
+	int len = RARRAY_LEN(equalities);
+	if (len == 0)
+	{
+		if(eqpairs != NULL) {
+			free(eqpairs);
+			eqpairs = NULL;
+		}
+		config->additionalEqualities = NULL;
+		config->additionalEqualitiesLength = 0;
+		return equalities;
+	}
+	char *first_arr = malloc(len * sizeof(char));
+	char *second_arr = malloc(len * sizeof(char));
+	for (int i = 0; i < len; i++)
 	{
 		VALUE pair = rb_ary_entry(equalities, i);
 		Check_Type(pair, T_ARRAY);
@@ -258,15 +283,28 @@ set_additional_equalities(EdlibAlignConfig *config, VALUE equalities)
 		}
 		char c1 = RSTRING_PTR(s1)[0];
 		char c2 = RSTRING_PTR(s2)[0];
+		first_arr[i] = c1;
+		second_arr[i] = c2;
+	}
+
+	if (eqpairs != NULL)
+	{
+		free(eqpairs);
+	}
 
-		pairs[i].first = c1;
-		pairs[i].second = c2;
+	eqpairs = (EdlibEqualityPair *)malloc(sizeof(EdlibEqualityPair) * len);
+
+	for (int i = 0; i < len; i++)
+	{
+		eqpairs[i].first = first_arr[i];
+		eqpairs[i].second = second_arr[i];
 	}
 
-	config->additionalEqualities = pairs;
-	free(pairs);
+	config->additionalEqualities = eqpairs;
+	config->additionalEqualitiesLength = len;
 
-	config->additionalEqualitiesLength = RARRAY_LEN(equalities);
+	free(first_arr);
+	free(second_arr);
 
 	return equalities;
 }

data/lib/edlib/version.rb

@@ -1,3 +1,3 @@
 module Edlib
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: edlib
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - kojix2
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
 date: 2022-10-31 00:00:00.000000000 Z
@@ -29,7 +29,7 @@ homepage: https://github.com/kojix2/ruby-edlib
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -45,7 +45,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.7
-signing_key:
+signing_key: 
 specification_version: 4
 summary: ruby-edlib is a wrapper for edlib.
 test_files: []