From 01a97b90f3c4dc65e0004f05932683fb56a88708 Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Mon, 20 Jul 2015 12:06:10 +0200 Subject: [PATCH] * Fix header for string store --- spacy/strings.pxd | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/spacy/strings.pxd b/spacy/strings.pxd index 66e07e207..328a87c55 100644 --- a/spacy/strings.pxd +++ b/spacy/strings.pxd @@ -5,12 +5,17 @@ from .typedefs cimport attr_t from libc.stdint cimport int64_t -from .structs cimport Utf8Str, UniStr +from .structs cimport UniStr from .typedefs cimport hash_t cpdef hash_t hash_string(unicode string) except 0 +ctypedef union Utf8Str: + unsigned char[8] s + unsigned char* p + + cdef inline void slice_unicode(UniStr* s, Py_UNICODE* chars, int start, int end) nogil: s.chars = &chars[start] s.n = end - start @@ -19,10 +24,10 @@ cdef inline void slice_unicode(UniStr* s, Py_UNICODE* chars, int start, int end) cdef class StringStore: cdef Pool mem - cdef Utf8Str* strings + cdef Utf8Str* c cdef int64_t size cdef PreshMap _map cdef size_t _resize_at - cdef const Utf8Str* intern(self, char* chars, int length, attr_t* id_) except NULL + cdef const Utf8Str* intern(self, unsigned char* chars, int length) except NULL