tommy/libpostal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[utils] Using token offsets to calculate lengths for contiguous string arrays, inlining a few functions

Browse Source
This commit is contained in:
Al
2015-04-15 20:16:58 -04:00
parent 24e62b1c6c
commit e21873635c
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/string_utils.c
View File

@@ -392,39 +392,50 @@ cstring_array *cstring_array_from_char_array(char_array *str) {
return array; return array;
} }
uint32_t cstring_array_start_token(cstring_array *self) { inline uint32_t cstring_array_start_token(cstring_array *self) {
uint32_t index = self->str->n; uint32_t index = self->str->n;
uint32_array_push(self->indices, index); uint32_array_push(self->indices, index);
return index; return index;
} }
uint32_t cstring_array_add_string(cstring_array *self, char *str) { inline uint32_t cstring_array_add_string(cstring_array *self, char *str) {
uint32_t index = cstring_array_start_token(self); uint32_t index = cstring_array_start_token(self);
char_array_append(self->str, str); char_array_append(self->str, str);
char_array_terminate(self->str); char_array_terminate(self->str);
return index; return index;
} }
uint32_t cstring_array_add_string_len(cstring_array *self, char *str, size_t len) { inline uint32_t cstring_array_add_string_len(cstring_array *self, char *str, size_t len) {
uint32_t index = cstring_array_start_token(self); uint32_t index = cstring_array_start_token(self);
char_array_append_len(self->str, str, len); char_array_append_len(self->str, str, len);
char_array_terminate(self->str); char_array_terminate(self->str);
return index; return index;
} }
int32_t cstring_array_get_offset(cstring_array *self, uint32_t i) { inline int32_t cstring_array_get_offset(cstring_array *self, uint32_t i) {
if (INVALID_INDEX(i, self->indices->n)) { if (INVALID_INDEX(i, self->indices->n)) {
return -1; return -1;
} }
return (int32_t)self->indices->a[i]; return (int32_t)self->indices->a[i];
} }
char *cstring_array_get_token(cstring_array *self, uint32_t i) { inline char *cstring_array_get_token(cstring_array *self, uint32_t i) {
int32_t data_index = cstring_array_get_offset(self, i); int32_t data_index = cstring_array_get_offset(self, i);
if (data_index < 0) return NULL; if (data_index < 0) return NULL;
return self->str->a + data_index; return self->str->a + data_index;
} }
inline int64_t cstring_array_token_length(cstring_array *self, uint32_t i) {
if (INVALID_INDEX(i, self->indices->n)) {
return -1;
}
if (i < self->indices->n - 1) {
return self->indices->a[i+1] - self->indices->a[i] - 1;
} else {
return self->str->n - self->indices->a[i] - 1;
}
}
cstring_array *cstring_array_split(char *str, const char *separator, size_t separator_len, int *count) { cstring_array *cstring_array_split(char *str, const char *separator, size_t separator_len, int *count) {
*count = 0; *count = 0;
char_array *array = char_array_new_size(strlen(str)); char_array *array = char_array_new_size(strlen(str));

1
src/string_utils.h
View File

@@ -98,6 +98,7 @@ uint32_t cstring_array_add_string(cstring_array *self, char *str);
uint32_t cstring_array_add_string_len(cstring_array *self, char *str, size_t len); uint32_t cstring_array_add_string_len(cstring_array *self, char *str, size_t len);
int32_t cstring_array_get_offset(cstring_array *self, uint32_t i); int32_t cstring_array_get_offset(cstring_array *self, uint32_t i);
char *cstring_array_get_token(cstring_array *self, uint32_t i); char *cstring_array_get_token(cstring_array *self, uint32_t i);
int64_t cstring_array_token_length(cstring_array *self, uint32_t i);
void cstring_array_destroy(cstring_array *self); void cstring_array_destroy(cstring_array *self);