edlib 0.0.2 → 0.0.4

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.4'
 end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: edlib
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - kojix2
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
 date: 2022-10-31 00:00:00.000000000 Z
@@ -20,6 +20,7 @@ extensions:
 extra_rdoc_files: []
 files:
 - README.md
+- ext/edlib/edlib.cpp
 - ext/edlib/edlib.h
 - ext/edlib/edlibext.c
 - ext/edlib/extconf.rb
@@ -29,7 +30,7 @@ homepage: https://github.com/kojix2/ruby-edlib
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -45,7 +46,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: []