Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow compiling the gem with MSVC (which is not C99 compliant) #43

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Allow compiling the gem with MSVC (which is not C99 compliant) #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9e1d7a0
[OPTIONAL] Bump dependency versions
jmarrec Mar 25, 2020
a742b86
Allow compiling the gem with MSVC (which is not C99 compliant)
jmarrec Mar 25, 2020
12dc642
Us alloca (stack allocation) instead of malloc (heap)
jmarrec Mar 26, 2020
f1ca425
Obviously this doesn't work on MSVC, so use macros
jmarrec Mar 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 26 additions & 7 deletions ext/jaro_winkler/jaro.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,28 @@
#include <stdlib.h>
#include <string.h>

#if HAVE_ALLOCA_H
# include <alloca.h>
#elif defined __GNUC__
# define alloca __builtin_alloca
#elif defined _AIX
# define alloca __alloca
#elif defined _MSC_VER
# include <malloc.h>
# define alloca _alloca
#else
# include <stddef.h>
# ifdef __cplusplus
extern "C"
# endif
void *alloca (size_t);
#endif

#define DEFAULT_WEIGHT 0.1
#define DEFAULT_THRESHOLD 0.7
#define SWAP(x, y) \
#define SWAP(type, x, y) \
do { \
__typeof__(x) SWAP = x; \
type SWAP = x; \
x = y; \
y = SWAP; \
} while (0)
Expand All @@ -27,8 +44,8 @@ double jaro_distance_from_codes(uint32_t *codepoints1, size_t len1,
return 0.0;

if (len1 > len2) {
SWAP(codepoints1, codepoints2);
SWAP(len1, len2);
SWAP(uint32_t*, codepoints1, codepoints2);
SWAP(size_t, len1, len2);
}

if (opt->ignore_case) {
Expand All @@ -42,8 +59,8 @@ double jaro_distance_from_codes(uint32_t *codepoints1, size_t len1,
if (window_size < 0)
window_size = 0;

char short_codes_flag[len1];
char long_codes_flag[len2];
char * short_codes_flag = alloca(len1);
char * long_codes_flag = alloca(len2);
memset(short_codes_flag, 0, len1);
memset(long_codes_flag, 0, len2);

Expand All @@ -64,8 +81,9 @@ double jaro_distance_from_codes(uint32_t *codepoints1, size_t len1,
}
}

if (!match_count)
if (!match_count) {
return 0.0;
}

// count number of transpositions
size_t transposition_count = 0, j = 0, k = 0;
Expand Down Expand Up @@ -99,6 +117,7 @@ double jaro_distance_from_codes(uint32_t *codepoints1, size_t len1,
double t = (double)(transposition_count / 2);
if (opt->adj_table)
m = similar_count / 10.0 + m;

return (m / len1 + m / len2 + (m - t) / m) / 3;
}

Expand Down
4 changes: 2 additions & 2 deletions jaro_winkler.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ Gem::Specification.new do |spec|
'source_code_uri' => "https://github.com/tonytonyjan/jaro_winkler/tree/v#{spec.version}",
}
spec.files = Dir['lib/**/*.rb', 'ext/**/*.{h,c}', 'LICENSE.txt']
spec.add_development_dependency 'bundler', '~> 1.7'
spec.add_development_dependency 'rake', '~> 12.0'
spec.add_development_dependency 'bundler', '~> 2.1'
spec.add_development_dependency 'rake', '~> 13.0'
spec.add_development_dependency 'rake-compiler'
spec.add_development_dependency 'minitest'
end