Rooba
/
RapidFuzz
mirror of https://github.com/maxbachmann/RapidFuzz.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove boost::optional dependency

This commit is contained in:
maxbachmann 2020-05-22 14:33:59 +02:00
parent 15c6dbb6fb
commit 3137df9e96
No known key found for this signature in database
GPG Key ID: 60334E83C23820B8
3 changed files with 40 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MANIFEST.in
View File

@ -7,4 +7,5 @@ recursive-include src/rapidfuzz-cpp/extern/boost *
recursive-include src/rapidfuzz-cpp/extern/difflib *
recursive-include src/rapidfuzz-cpp/extern/nonstd *
recursive-include extern/variant *
include src/py_utils.hpp
include src/rapidfuzz-cpp/LICENSE

2
VERSION
View File

@ -1 +1 @@
0.8.2
0.9.0

83
src/py_fuzz.cpp
View File

@ -9,35 +9,10 @@
#include "utils.hpp"
#include "py_utils.hpp"
#include <nonstd/string_view.hpp>
#include <boost/optional.hpp>
namespace fuzz = rapidfuzz::fuzz;
namespace utils = rapidfuzz::utils;
boost::optional<std::pair<wchar_t*, Py_ssize_t>> PyString_AsBuffer(PyObject* str, PyObject *processor) {
PyObject *proc_str = PyObject_CallFunctionObjArgs(processor, str, NULL);
if (proc_str == NULL) {
return boost::none;
}
Py_ssize_t len = PyUnicode_GET_LENGTH(proc_str);
wchar_t* buffer = PyUnicode_AsWideCharString(proc_str, &len);
if (buffer == NULL) {
Py_DecRef(proc_str);
return boost::none;
}
Py_DecRef(proc_str);
return std::make_pair(buffer, len);
}
boost::optional<std::pair<wchar_t*, Py_ssize_t>> PyString_AsBuffer(PyObject* str) {
Py_ssize_t len = PyUnicode_GET_LENGTH(str);
wchar_t* buffer = PyUnicode_AsWideCharString(str, &len);
if (buffer == NULL) {
return boost::none;
}
return std::make_pair(buffer, len);
}
bool use_preprocessing(PyObject* processor, bool processor_default) {
return processor ? PyObject_IsTrue(processor) : processor_default;
}
@ -60,33 +35,51 @@ static PyObject* fuzz_impl(T&& scorer, bool processor_default, PyObject* args, P
}
if (PyCallable_Check(processor)) {
auto s1 = PyString_AsBuffer(py_s1, processor);
if(!s1) {
PyObject *proc_s1 = PyObject_CallFunctionObjArgs(processor, py_s1, NULL);
if (proc_s1 == NULL) {
return NULL;
}
auto s2 = PyString_AsBuffer(py_s2, processor);
if(!s2) {
PyMem_Free(s1->first);
Py_ssize_t len_s1 = PyUnicode_GET_LENGTH(proc_s1);
wchar_t* buffer_s1 = PyUnicode_AsWideCharString(proc_s1, &len_s1);
Py_DecRef(proc_s1);
if (buffer_s1 == NULL) {
return NULL;
}
PyObject *proc_s2 = PyObject_CallFunctionObjArgs(processor, py_s2, NULL);
if (proc_s2 == NULL) {
PyMem_Free(buffer_s1);
return NULL;
}
Py_ssize_t len_s2 = PyUnicode_GET_LENGTH(proc_s2);
wchar_t* buffer_s2 = PyUnicode_AsWideCharString(proc_s2, &len_s2);
Py_DecRef(proc_s2);
if (buffer_s2 == NULL) {
PyMem_Free(buffer_s1);
return NULL;
}
auto result = scorer(
nonstd::wstring_view(s1->first, s1->second),
nonstd::wstring_view(s2->first, s2->second),
nonstd::wstring_view(buffer_s1, len_s1),
nonstd::wstring_view(buffer_s2, len_s2),
score_cutoff);
PyMem_Free(s1->first);
PyMem_Free(s2->first);
PyMem_Free(buffer_s1);
PyMem_Free(buffer_s2);
return PyFloat_FromDouble(result);
}
auto s1 = PyString_AsBuffer(py_s1);
if(!s1) {
Py_ssize_t len_s1 = PyUnicode_GET_LENGTH(py_s1);
wchar_t* buffer_s1 = PyUnicode_AsWideCharString(py_s1, &len_s1);
if (buffer_s1 == NULL) {
return NULL;
}
auto s2 = PyString_AsBuffer(py_s2);
if(!s2) {
PyMem_Free(s1->first);
Py_ssize_t len_s2 = PyUnicode_GET_LENGTH(py_s2);
wchar_t* buffer_s2 = PyUnicode_AsWideCharString(py_s2, &len_s2);
if (buffer_s2 == NULL) {
PyMem_Free(buffer_s1);
return NULL;
}
@ -94,18 +87,18 @@ static PyObject* fuzz_impl(T&& scorer, bool processor_default, PyObject* args, P
if (use_preprocessing(processor, processor_default)) {
result = scorer(
utils::default_process(std::wstring(s1->first, s1->second)),
utils::default_process(std::wstring(s2->first, s2->second)),
utils::default_process(nonstd::wstring_view(buffer_s1, len_s1)),
utils::default_process(nonstd::wstring_view(buffer_s2, len_s2)),
score_cutoff);
} else {
result = scorer(
nonstd::wstring_view(s1->first, s1->second),
nonstd::wstring_view(s2->first, s2->second),
nonstd::wstring_view(buffer_s1, len_s1),
nonstd::wstring_view(buffer_s2, len_s2),
score_cutoff);
}
PyMem_Free(s1->first);
PyMem_Free(s2->first);
PyMem_Free(buffer_s1);
PyMem_Free(buffer_s2);
return PyFloat_FromDouble(result);
}