1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
|
From: Filip Pytloun <filip@pytloun.cz>
Date: Thu, 26 Apr 2018 12:17:02 +0200
Subject: Drop use of libdatrie patched method
---
src/cdatrie.pxd | 2 +-
src/datrie.pyx | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/cdatrie.pxd b/src/cdatrie.pxd
index f0414e5..e2cb777 100644
--- a/src/cdatrie.pxd
+++ b/src/cdatrie.pxd
@@ -96,7 +96,7 @@ cdef extern from "/usr/include/datrie/trie.h":
TrieData trie_state_get_data (TrieState *s)
- TrieData trie_state_get_terminal_data (TrieState *s)
+ TrieData trie_state_get_data (TrieState *s)
# ============== ITERATION ===================
diff --git a/src/datrie.pyx b/src/datrie.pyx
index b404b01..f969c7c 100644
--- a/src/datrie.pyx
+++ b/src/datrie.pyx
@@ -309,7 +309,7 @@ cdef class BaseTrie:
if not cdatrie.trie_state_walk(state, <cdatrie.AlphaChar> char):
return
if cdatrie.trie_state_is_terminal(state): # word is found
- yield key[:index], cdatrie.trie_state_get_terminal_data(state)
+ yield key[:index], cdatrie.trie_state_get_data(state)
index += 1
finally:
cdatrie.trie_state_free(state)
@@ -329,7 +329,7 @@ cdef class BaseTrie:
if not cdatrie.trie_state_walk(state, <cdatrie.AlphaChar> char):
return
if cdatrie.trie_state_is_terminal(state):
- yield cdatrie.trie_state_get_terminal_data(state)
+ yield cdatrie.trie_state_get_data(state)
finally:
cdatrie.trie_state_free(state)
@@ -397,7 +397,7 @@ cdef class BaseTrie:
if cdatrie.trie_state_is_terminal(state): # word is found
result.append(
(key[:index],
- cdatrie.trie_state_get_terminal_data(state))
+ cdatrie.trie_state_get_data(state))
)
index += 1
return result
@@ -423,7 +423,7 @@ cdef class BaseTrie:
if not cdatrie.trie_state_walk(state, <cdatrie.AlphaChar> char):
break
if cdatrie.trie_state_is_terminal(state): # word is found
- result.append(cdatrie.trie_state_get_terminal_data(state))
+ result.append(cdatrie.trie_state_get_data(state))
return result
finally:
cdatrie.trie_state_free(state)
@@ -488,7 +488,7 @@ cdef class BaseTrie:
index += 1
if cdatrie.trie_state_is_terminal(state):
last_terminal_index = index
- data = cdatrie.trie_state_get_terminal_data(state)
+ data = cdatrie.trie_state_get_data(state)
if not last_terminal_index:
if default is RAISE_KEY_ERROR:
@@ -527,7 +527,7 @@ cdef class BaseTrie:
if cdatrie.trie_state_is_terminal(state):
found = 1
- data = cdatrie.trie_state_get_terminal_data(state)
+ data = cdatrie.trie_state_get_data(state)
if not found:
if default is RAISE_KEY_ERROR:
@@ -906,7 +906,7 @@ cdef class BaseState(_TrieState):
cdatrie.TrieState wrapper. It can be used for custom trie traversal.
"""
cpdef int data(self):
- return cdatrie.trie_state_get_terminal_data(self._state)
+ return cdatrie.trie_state_get_data(self._state)
cdef class State(_TrieState):
@@ -918,7 +918,7 @@ cdef class State(_TrieState):
self._trie = trie
cpdef data(self):
- cdef cdatrie.TrieData data = cdatrie.trie_state_get_terminal_data(self._state)
+ cdef cdatrie.TrieData data = cdatrie.trie_state_get_data(self._state)
return self._trie._index_to_value(data)
|
