From 70e09522d32bd39fda37a3af6492db012720acf7 Mon Sep 17 00:00:00 2001 From: Jos Kuijpers Date: Sun, 8 Apr 2012 21:48:43 +0200 Subject: [PATCH] Adding ranges and cfstring_find --- src/cfwrange.c | 29 +++++++++++++++++++++++++++++ src/cfwrange.h | 37 +++++++++++++++++++++++++++++++++++++ src/cfwstring.c | 31 +++++++++++++++++++++++++++++++ src/cfwstring.h | 5 +++++ 4 files changed, 102 insertions(+) create mode 100644 src/cfwrange.c create mode 100644 src/cfwrange.h diff --git a/src/cfwrange.c b/src/cfwrange.c new file mode 100644 index 0000000..cce7ffb --- /dev/null +++ b/src/cfwrange.c @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2012, Jos Kuijpers + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include "cfwrange.h" + +cfw_range_t cfw_range_all = { 0, SIZE_MAX }; diff --git a/src/cfwrange.h b/src/cfwrange.h new file mode 100644 index 0000000..1193e9a --- /dev/null +++ b/src/cfwrange.h @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2012, Jos Kuijpers + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef __CFWRANGE_H__ +#define __CFWRANGE_H__ + +typedef struct cfw_range_t +{ + size_t location, length; +} cfw_range_t; + +extern cfw_range_t cfw_range_all; + +#endif diff --git a/src/cfwstring.c b/src/cfwstring.c index bbfb8fd..91707e4 100644 --- a/src/cfwstring.c +++ b/src/cfwstring.c @@ -131,6 +131,37 @@ cfw_string_set(CFWString *str, const char *cstr) return true; } +cfw_unichar +cfw_string_char(CFWString *str, size_t index) +{ + if(len > index) + return str->cstr[index]; + return NULL; +} + +size_t +cfw_string_find(CFWString *strA, CFWString *strB, cfw_range_t range) +{ + char *cstrA = strA->cstr+range.location; + size_t i, max = MIN(range.length+range.location, strB->len); + + if(strA->len == 0) + return 0; + + if(strA->len-range.location < strB->len) + return SIZE_MAX; + + for(i = range.location; + i <= strA->len-strB->len && i <= max; + i++) + { + if(!memcmp(strA->cstr+i, strB->cstr, max-i)) + return i; + } + + return SIZE_MAX; +} + static CFWClass class = { .name = "CFWString", .size = sizeof(CFWString), diff --git a/src/cfwstring.h b/src/cfwstring.h index 9424334..3227195 100644 --- a/src/cfwstring.h +++ b/src/cfwstring.h @@ -28,11 +28,16 @@ #define __CFWSTRING_H__ #include "cfwclass.h" +#include "cfwrange.h" typedef struct CFWString CFWString; +typedef uint32_t cfw_unichar; + extern CFWClass *cfw_string; extern const char* cfw_string_c(CFWString*); extern size_t cfw_string_len(CFWString*); extern bool cfw_string_set(CFWString*, const char*); +extern cfw_unichar cfw_string_char(CFWString*, size_t); +extern size_t cfw_string_find(CFWString*, CFWString*, cfw_range_t); #endif