Thu, 30 Oct 2025 19:27:18 +0100
fix typo bug in cxListDifference() - resolves #745
| 576 
ba0c4ff6698e
first proposal for the string header
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 1 | /* | 
| 
ba0c4ff6698e
first proposal for the string header
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. | 
| 
ba0c4ff6698e
first proposal for the string header
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 3 | * | 
| 
ba0c4ff6698e
first proposal for the string header
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 4 | * Copyright 2021 Mike Becker, Olaf Wintermann All rights reserved. | 
| 
ba0c4ff6698e
first proposal for the string header
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 5 | * | 
| 
ba0c4ff6698e
first proposal for the string header
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 6 | * Redistribution and use in source and binary forms, with or without | 
| 
ba0c4ff6698e
first proposal for the string header
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 7 | * modification, are permitted provided that the following conditions are met: | 
| 
ba0c4ff6698e
first proposal for the string header
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 8 | * | 
| 
ba0c4ff6698e
first proposal for the string header
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 9 | * 1. Redistributions of source code must retain the above copyright | 
| 
ba0c4ff6698e
first proposal for the string header
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 10 | * notice, this list of conditions and the following disclaimer. | 
| 
ba0c4ff6698e
first proposal for the string header
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 11 | * | 
| 
ba0c4ff6698e
first proposal for the string header
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 12 | * 2. Redistributions in binary form must reproduce the above copyright | 
| 
ba0c4ff6698e
first proposal for the string header
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 13 | * notice, this list of conditions and the following disclaimer in the | 
| 
ba0c4ff6698e
first proposal for the string header
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 14 | * documentation and/or other materials provided with the distribution. | 
| 
ba0c4ff6698e
first proposal for the string header
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 15 | * | 
| 
ba0c4ff6698e
first proposal for the string header
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 
| 
ba0c4ff6698e
first proposal for the string header
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 
| 
ba0c4ff6698e
first proposal for the string header
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 
| 
ba0c4ff6698e
first proposal for the string header
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE | 
| 
ba0c4ff6698e
first proposal for the string header
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 
| 
ba0c4ff6698e
first proposal for the string header
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 
| 
ba0c4ff6698e
first proposal for the string header
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 
| 
ba0c4ff6698e
first proposal for the string header
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | 
| 
ba0c4ff6698e
first proposal for the string header
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 
| 
ba0c4ff6698e
first proposal for the string header
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 
| 
ba0c4ff6698e
first proposal for the string header
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 26 | * POSSIBILITY OF SUCH DAMAGE. | 
| 
ba0c4ff6698e
first proposal for the string header
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 27 | */ | 
| 1413 
c5a225d7228c
improve feature test for memrchr() making it also available on BSD
 Mike Becker <universe@uap-core.de> parents: 
1412diff
changeset | 28 | #ifdef MEMRCHR_NEED_GNU | 
| 1412 
a6f357c18ac6
use memrchr() to implement cx_strrchr() when it is available
 Mike Becker <universe@uap-core.de> parents: 
1334diff
changeset | 29 | #define _GNU_SOURCE | 
| 
a6f357c18ac6
use memrchr() to implement cx_strrchr() when it is available
 Mike Becker <universe@uap-core.de> parents: 
1334diff
changeset | 30 | #endif | 
| 
a6f357c18ac6
use memrchr() to implement cx_strrchr() when it is available
 Mike Becker <universe@uap-core.de> parents: 
1334diff
changeset | 31 | |
| 576 
ba0c4ff6698e
first proposal for the string header
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 32 | #include "cx/string.h" | 
| 579 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 33 | |
| 1413 
c5a225d7228c
improve feature test for memrchr() making it also available on BSD
 Mike Becker <universe@uap-core.de> parents: 
1412diff
changeset | 34 | #include <string.h> | 
| 579 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 35 | #include <stdarg.h> | 
| 1048 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 36 | #include <assert.h> | 
| 1041 
508dc8b32a17
fix missing errno.h include
 Mike Becker <universe@uap-core.de> parents: 
1040diff
changeset | 37 | #include <errno.h> | 
| 1048 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 38 | #include <limits.h> | 
| 1063 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 39 | #include <float.h> | 
| 1415 
40074e643663
go back to ctype.h, but this time try to avoid crashes in Microsoft's implementation
 Mike Becker <universe@uap-core.de> parents: 
1413diff
changeset | 40 | #include <ctype.h> | 
| 581 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 41 | |
| 1073 
13c8a92625d4
fix for ultrafail fix #546
 Mike Becker <universe@uap-core.de> parents: 
1071diff
changeset | 42 | #ifdef _WIN32 | 
| 
13c8a92625d4
fix for ultrafail fix #546
 Mike Becker <universe@uap-core.de> parents: 
1071diff
changeset | 43 | #define cx_strcasecmp_impl _strnicmp | 
| 
13c8a92625d4
fix for ultrafail fix #546
 Mike Becker <universe@uap-core.de> parents: 
1071diff
changeset | 44 | #else | 
| 
13c8a92625d4
fix for ultrafail fix #546
 Mike Becker <universe@uap-core.de> parents: 
1071diff
changeset | 45 | #include <strings.h> | 
| 
13c8a92625d4
fix for ultrafail fix #546
 Mike Becker <universe@uap-core.de> parents: 
1071diff
changeset | 46 | #define cx_strcasecmp_impl strncasecmp | 
| 
13c8a92625d4
fix for ultrafail fix #546
 Mike Becker <universe@uap-core.de> parents: 
1071diff
changeset | 47 | #endif | 
| 579 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 48 | |
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 49 | cxmutstr cx_mutstr(char *cstring) { | 
| 1334 
7763892ed801
allow NULL for creating UCX strings - resolves #683
 Mike Becker <universe@uap-core.de> parents: 
1319diff
changeset | 50 | return (cxmutstr) {cstring, cstring == NULL ? 0 : strlen(cstring)}; | 
| 579 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 51 | } | 
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 52 | |
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 53 | cxmutstr cx_mutstrn( | 
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 54 | char *cstring, | 
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 55 | size_t length | 
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 56 | ) { | 
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 57 | return (cxmutstr) {cstring, length}; | 
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 58 | } | 
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 59 | |
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 60 | cxstring cx_str(const char *cstring) { | 
| 1334 
7763892ed801
allow NULL for creating UCX strings - resolves #683
 Mike Becker <universe@uap-core.de> parents: 
1319diff
changeset | 61 | return (cxstring) {cstring, cstring == NULL ? 0 : strlen(cstring)}; | 
| 579 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 62 | } | 
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 63 | |
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 64 | cxstring cx_strn( | 
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 65 | const char *cstring, | 
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 66 | size_t length | 
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 67 | ) { | 
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 68 | return (cxstring) {cstring, length}; | 
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 69 | } | 
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 70 | |
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 71 | void cx_strfree(cxmutstr *str) { | 
| 985 
68754c7de906
major refactoring of attributes
 Mike Becker <universe@uap-core.de> parents: 
962diff
changeset | 72 | if (str == NULL) return; | 
| 1319 
aa1f580f8f59
add convenience macros for using the default allocator - relates to #669
 Mike Becker <universe@uap-core.de> parents: 
1318diff
changeset | 73 | cxFreeDefault(str->ptr); | 
| 579 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 74 | str->ptr = NULL; | 
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 75 | str->length = 0; | 
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 76 | } | 
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 77 | |
| 583 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 78 | void cx_strfree_a( | 
| 890 
54565fd74e74
move all const keywords to the west - fixes #426
 Mike Becker <universe@uap-core.de> parents: 
806diff
changeset | 79 | const CxAllocator *alloc, | 
| 583 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 80 | cxmutstr *str | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 81 | ) { | 
| 985 
68754c7de906
major refactoring of attributes
 Mike Becker <universe@uap-core.de> parents: 
962diff
changeset | 82 | if (str == NULL) return; | 
| 583 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 83 | cxFree(alloc, str->ptr); | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 84 | str->ptr = NULL; | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 85 | str->length = 0; | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 86 | } | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 87 | |
| 1304 
57e062a4bb05
adds cx_strcpy() and cx_strcpy_a()
 Mike Becker <universe@uap-core.de> parents: 
1300diff
changeset | 88 | int cx_strcpy_a( | 
| 
57e062a4bb05
adds cx_strcpy() and cx_strcpy_a()
 Mike Becker <universe@uap-core.de> parents: 
1300diff
changeset | 89 | const CxAllocator *alloc, | 
| 
57e062a4bb05
adds cx_strcpy() and cx_strcpy_a()
 Mike Becker <universe@uap-core.de> parents: 
1300diff
changeset | 90 | cxmutstr *dest, | 
| 
57e062a4bb05
adds cx_strcpy() and cx_strcpy_a()
 Mike Becker <universe@uap-core.de> parents: 
1300diff
changeset | 91 | cxstring src | 
| 
57e062a4bb05
adds cx_strcpy() and cx_strcpy_a()
 Mike Becker <universe@uap-core.de> parents: 
1300diff
changeset | 92 | ) { | 
| 
57e062a4bb05
adds cx_strcpy() and cx_strcpy_a()
 Mike Becker <universe@uap-core.de> parents: 
1300diff
changeset | 93 | if (cxReallocate(alloc, &dest->ptr, src.length + 1)) { | 
| 
57e062a4bb05
adds cx_strcpy() and cx_strcpy_a()
 Mike Becker <universe@uap-core.de> parents: 
1300diff
changeset | 94 | return 1; | 
| 
57e062a4bb05
adds cx_strcpy() and cx_strcpy_a()
 Mike Becker <universe@uap-core.de> parents: 
1300diff
changeset | 95 | } | 
| 
57e062a4bb05
adds cx_strcpy() and cx_strcpy_a()
 Mike Becker <universe@uap-core.de> parents: 
1300diff
changeset | 96 | |
| 
57e062a4bb05
adds cx_strcpy() and cx_strcpy_a()
 Mike Becker <universe@uap-core.de> parents: 
1300diff
changeset | 97 | memcpy(dest->ptr, src.ptr, src.length); | 
| 
57e062a4bb05
adds cx_strcpy() and cx_strcpy_a()
 Mike Becker <universe@uap-core.de> parents: 
1300diff
changeset | 98 | dest->length = src.length; | 
| 
57e062a4bb05
adds cx_strcpy() and cx_strcpy_a()
 Mike Becker <universe@uap-core.de> parents: 
1300diff
changeset | 99 | dest->ptr[dest->length] = '\0'; | 
| 
57e062a4bb05
adds cx_strcpy() and cx_strcpy_a()
 Mike Becker <universe@uap-core.de> parents: 
1300diff
changeset | 100 | |
| 
57e062a4bb05
adds cx_strcpy() and cx_strcpy_a()
 Mike Becker <universe@uap-core.de> parents: 
1300diff
changeset | 101 | return 0; | 
| 
57e062a4bb05
adds cx_strcpy() and cx_strcpy_a()
 Mike Becker <universe@uap-core.de> parents: 
1300diff
changeset | 102 | } | 
| 
57e062a4bb05
adds cx_strcpy() and cx_strcpy_a()
 Mike Becker <universe@uap-core.de> parents: 
1300diff
changeset | 103 | |
| 579 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 104 | size_t cx_strlen( | 
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 105 | size_t count, | 
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 106 | ... | 
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 107 | ) { | 
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 108 | if (count == 0) return 0; | 
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 109 | |
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 110 | va_list ap; | 
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 111 | va_start(ap, count); | 
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 112 | size_t size = 0; | 
| 962 
cd418898af5c
remove cx_for_n() macro - fixes #467
 Mike Becker <universe@uap-core.de> parents: 
926diff
changeset | 113 | for (size_t i = 0; i < count; i++) { | 
| 579 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 114 | cxstring str = va_arg(ap, cxstring); | 
| 1040 
1ecf4dbbc60c
add some more overflow treatment and make sure to set errno properly
 Mike Becker <universe@uap-core.de> parents: 
1001diff
changeset | 115 | if (size > SIZE_MAX - str.length) errno = EOVERFLOW; | 
| 579 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 116 | size += str.length; | 
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 117 | } | 
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 118 | va_end(ap); | 
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 119 | |
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 120 | return size; | 
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 121 | } | 
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 122 | |
| 697 
ebdce4bf262b
add cx_strcat_m() and cx_strcat_ma() for in-place concatenation
 Mike Becker <universe@uap-core.de> parents: 
693diff
changeset | 123 | cxmutstr cx_strcat_ma( | 
| 890 
54565fd74e74
move all const keywords to the west - fixes #426
 Mike Becker <universe@uap-core.de> parents: 
806diff
changeset | 124 | const CxAllocator *alloc, | 
| 697 
ebdce4bf262b
add cx_strcat_m() and cx_strcat_ma() for in-place concatenation
 Mike Becker <universe@uap-core.de> parents: 
693diff
changeset | 125 | cxmutstr str, | 
| 579 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 126 | size_t count, | 
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 127 | ... | 
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 128 | ) { | 
| 697 
ebdce4bf262b
add cx_strcat_m() and cx_strcat_ma() for in-place concatenation
 Mike Becker <universe@uap-core.de> parents: 
693diff
changeset | 129 | if (count == 0) return str; | 
| 579 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 130 | va_list ap; | 
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 131 | va_start(ap, count); | 
| 1296 
2a2403c63439
fixes unnecessary allocations in cx_strcat() family of functions
 Mike Becker <universe@uap-core.de> parents: 
1221diff
changeset | 132 | va_list ap2; | 
| 
2a2403c63439
fixes unnecessary allocations in cx_strcat() family of functions
 Mike Becker <universe@uap-core.de> parents: 
1221diff
changeset | 133 | va_copy(ap2, ap); | 
| 579 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 134 | |
| 1296 
2a2403c63439
fixes unnecessary allocations in cx_strcat() family of functions
 Mike Becker <universe@uap-core.de> parents: 
1221diff
changeset | 135 | // compute overall length | 
| 1040 
1ecf4dbbc60c
add some more overflow treatment and make sure to set errno properly
 Mike Becker <universe@uap-core.de> parents: 
1001diff
changeset | 136 | bool overflow = false; | 
| 697 
ebdce4bf262b
add cx_strcat_m() and cx_strcat_ma() for in-place concatenation
 Mike Becker <universe@uap-core.de> parents: 
693diff
changeset | 137 | size_t slen = str.length; | 
| 962 
cd418898af5c
remove cx_for_n() macro - fixes #467
 Mike Becker <universe@uap-core.de> parents: 
926diff
changeset | 138 | for (size_t i = 0; i < count; i++) { | 
| 1296 
2a2403c63439
fixes unnecessary allocations in cx_strcat() family of functions
 Mike Becker <universe@uap-core.de> parents: 
1221diff
changeset | 139 | cxstring s = va_arg(ap, cxstring); | 
| 1040 
1ecf4dbbc60c
add some more overflow treatment and make sure to set errno properly
 Mike Becker <universe@uap-core.de> parents: 
1001diff
changeset | 140 | if (slen > SIZE_MAX - str.length) overflow = true; | 
| 579 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 141 | slen += s.length; | 
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 142 | } | 
| 697 
ebdce4bf262b
add cx_strcat_m() and cx_strcat_ma() for in-place concatenation
 Mike Becker <universe@uap-core.de> parents: 
693diff
changeset | 143 | va_end(ap); | 
| 579 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 144 | |
| 1040 
1ecf4dbbc60c
add some more overflow treatment and make sure to set errno properly
 Mike Becker <universe@uap-core.de> parents: 
1001diff
changeset | 145 | // abort in case of overflow | 
| 
1ecf4dbbc60c
add some more overflow treatment and make sure to set errno properly
 Mike Becker <universe@uap-core.de> parents: 
1001diff
changeset | 146 | if (overflow) { | 
| 1296 
2a2403c63439
fixes unnecessary allocations in cx_strcat() family of functions
 Mike Becker <universe@uap-core.de> parents: 
1221diff
changeset | 147 | va_end(ap2); | 
| 1040 
1ecf4dbbc60c
add some more overflow treatment and make sure to set errno properly
 Mike Becker <universe@uap-core.de> parents: 
1001diff
changeset | 148 | errno = EOVERFLOW; | 
| 
1ecf4dbbc60c
add some more overflow treatment and make sure to set errno properly
 Mike Becker <universe@uap-core.de> parents: 
1001diff
changeset | 149 | return (cxmutstr) { NULL, 0 }; | 
| 
1ecf4dbbc60c
add some more overflow treatment and make sure to set errno properly
 Mike Becker <universe@uap-core.de> parents: 
1001diff
changeset | 150 | } | 
| 
1ecf4dbbc60c
add some more overflow treatment and make sure to set errno properly
 Mike Becker <universe@uap-core.de> parents: 
1001diff
changeset | 151 | |
| 697 
ebdce4bf262b
add cx_strcat_m() and cx_strcat_ma() for in-place concatenation
 Mike Becker <universe@uap-core.de> parents: 
693diff
changeset | 152 | // reallocate or create new string | 
| 1001 
5c9ec5a0a4ef
change cx_strcat variants to allow handling of ENOMEM
 Mike Becker <universe@uap-core.de> parents: 
985diff
changeset | 153 | char *newstr; | 
| 697 
ebdce4bf262b
add cx_strcat_m() and cx_strcat_ma() for in-place concatenation
 Mike Becker <universe@uap-core.de> parents: 
693diff
changeset | 154 | if (str.ptr == NULL) { | 
| 1001 
5c9ec5a0a4ef
change cx_strcat variants to allow handling of ENOMEM
 Mike Becker <universe@uap-core.de> parents: 
985diff
changeset | 155 | newstr = cxMalloc(alloc, slen + 1); | 
| 697 
ebdce4bf262b
add cx_strcat_m() and cx_strcat_ma() for in-place concatenation
 Mike Becker <universe@uap-core.de> parents: 
693diff
changeset | 156 | } else { | 
| 1001 
5c9ec5a0a4ef
change cx_strcat variants to allow handling of ENOMEM
 Mike Becker <universe@uap-core.de> parents: 
985diff
changeset | 157 | newstr = cxRealloc(alloc, str.ptr, slen + 1); | 
| 697 
ebdce4bf262b
add cx_strcat_m() and cx_strcat_ma() for in-place concatenation
 Mike Becker <universe@uap-core.de> parents: 
693diff
changeset | 158 | } | 
| 1001 
5c9ec5a0a4ef
change cx_strcat variants to allow handling of ENOMEM
 Mike Becker <universe@uap-core.de> parents: 
985diff
changeset | 159 | if (newstr == NULL) { | 
| 1296 
2a2403c63439
fixes unnecessary allocations in cx_strcat() family of functions
 Mike Becker <universe@uap-core.de> parents: 
1221diff
changeset | 160 | va_end(ap2); | 
| 1001 
5c9ec5a0a4ef
change cx_strcat variants to allow handling of ENOMEM
 Mike Becker <universe@uap-core.de> parents: 
985diff
changeset | 161 | return (cxmutstr) {NULL, 0}; | 
| 
5c9ec5a0a4ef
change cx_strcat variants to allow handling of ENOMEM
 Mike Becker <universe@uap-core.de> parents: 
985diff
changeset | 162 | } | 
| 
5c9ec5a0a4ef
change cx_strcat variants to allow handling of ENOMEM
 Mike Becker <universe@uap-core.de> parents: 
985diff
changeset | 163 | str.ptr = newstr; | 
| 579 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 164 | |
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 165 | // concatenate strings | 
| 697 
ebdce4bf262b
add cx_strcat_m() and cx_strcat_ma() for in-place concatenation
 Mike Becker <universe@uap-core.de> parents: 
693diff
changeset | 166 | size_t pos = str.length; | 
| 
ebdce4bf262b
add cx_strcat_m() and cx_strcat_ma() for in-place concatenation
 Mike Becker <universe@uap-core.de> parents: 
693diff
changeset | 167 | str.length = slen; | 
| 962 
cd418898af5c
remove cx_for_n() macro - fixes #467
 Mike Becker <universe@uap-core.de> parents: 
926diff
changeset | 168 | for (size_t i = 0; i < count; i++) { | 
| 1296 
2a2403c63439
fixes unnecessary allocations in cx_strcat() family of functions
 Mike Becker <universe@uap-core.de> parents: 
1221diff
changeset | 169 | cxstring s = va_arg(ap2, cxstring); | 
| 697 
ebdce4bf262b
add cx_strcat_m() and cx_strcat_ma() for in-place concatenation
 Mike Becker <universe@uap-core.de> parents: 
693diff
changeset | 170 | memcpy(str.ptr + pos, s.ptr, s.length); | 
| 579 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 171 | pos += s.length; | 
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 172 | } | 
| 1296 
2a2403c63439
fixes unnecessary allocations in cx_strcat() family of functions
 Mike Becker <universe@uap-core.de> parents: 
1221diff
changeset | 173 | va_end(ap2); | 
| 579 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 174 | |
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 175 | // terminate string | 
| 697 
ebdce4bf262b
add cx_strcat_m() and cx_strcat_ma() for in-place concatenation
 Mike Becker <universe@uap-core.de> parents: 
693diff
changeset | 176 | str.ptr[str.length] = '\0'; | 
| 579 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 177 | |
| 697 
ebdce4bf262b
add cx_strcat_m() and cx_strcat_ma() for in-place concatenation
 Mike Becker <universe@uap-core.de> parents: 
693diff
changeset | 178 | return str; | 
| 579 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 179 | } | 
| 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 180 | |
| 580 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 181 | cxstring cx_strsubs( | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 182 | cxstring string, | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 183 | size_t start | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 184 | ) { | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 185 | return cx_strsubsl(string, start, string.length - start); | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 186 | } | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 187 | |
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 188 | cxmutstr cx_strsubs_m( | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 189 | cxmutstr string, | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 190 | size_t start | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 191 | ) { | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 192 | return cx_strsubsl_m(string, start, string.length - start); | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 193 | } | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 194 | |
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 195 | cxstring cx_strsubsl( | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 196 | cxstring string, | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 197 | size_t start, | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 198 | size_t length | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 199 | ) { | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 200 | if (start > string.length) { | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 201 | return (cxstring) {NULL, 0}; | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 202 | } | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 203 | |
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 204 | size_t rem_len = string.length - start; | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 205 | if (length > rem_len) { | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 206 | length = rem_len; | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 207 | } | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 208 | |
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 209 | return (cxstring) {string.ptr + start, length}; | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 210 | } | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 211 | |
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 212 | cxmutstr cx_strsubsl_m( | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 213 | cxmutstr string, | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 214 | size_t start, | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 215 | size_t length | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 216 | ) { | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 217 | cxstring result = cx_strsubsl(cx_strcast(string), start, length); | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 218 | return (cxmutstr) {(char *) result.ptr, result.length}; | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 219 | } | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 220 | |
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 221 | cxstring cx_strchr( | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 222 | cxstring string, | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 223 | int chr | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 224 | ) { | 
| 1161 | 225 | char *ret = memchr(string.ptr, 0xFF & chr, string.length); | 
| 226 | if (ret == NULL) return (cxstring) {NULL, 0}; | |
| 227 | return (cxstring) {ret, string.length - (ret - string.ptr)}; | |
| 580 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 228 | } | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 229 | |
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 230 | cxmutstr cx_strchr_m( | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 231 | cxmutstr string, | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 232 | int chr | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 233 | ) { | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 234 | cxstring result = cx_strchr(cx_strcast(string), chr); | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 235 | return (cxmutstr) {(char *) result.ptr, result.length}; | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 236 | } | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 237 | |
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 238 | cxstring cx_strrchr( | 
| 1412 
a6f357c18ac6
use memrchr() to implement cx_strrchr() when it is available
 Mike Becker <universe@uap-core.de> parents: 
1334diff
changeset | 239 | cxstring string, | 
| 
a6f357c18ac6
use memrchr() to implement cx_strrchr() when it is available
 Mike Becker <universe@uap-core.de> parents: 
1334diff
changeset | 240 | int chr | 
| 580 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 241 | ) { | 
| 1413 
c5a225d7228c
improve feature test for memrchr() making it also available on BSD
 Mike Becker <universe@uap-core.de> parents: 
1412diff
changeset | 242 | #ifdef WITH_MEMRCHR | 
| 1412 
a6f357c18ac6
use memrchr() to implement cx_strrchr() when it is available
 Mike Becker <universe@uap-core.de> parents: 
1334diff
changeset | 243 | char *ret = memrchr(string.ptr, 0xFF & chr, string.length); | 
| 
a6f357c18ac6
use memrchr() to implement cx_strrchr() when it is available
 Mike Becker <universe@uap-core.de> parents: 
1334diff
changeset | 244 | if (ret == NULL) return (cxstring) {NULL, 0}; | 
| 
a6f357c18ac6
use memrchr() to implement cx_strrchr() when it is available
 Mike Becker <universe@uap-core.de> parents: 
1334diff
changeset | 245 | return (cxstring) {ret, string.length - (ret - string.ptr)}; | 
| 
a6f357c18ac6
use memrchr() to implement cx_strrchr() when it is available
 Mike Becker <universe@uap-core.de> parents: 
1334diff
changeset | 246 | #else | 
| 580 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 247 | chr = 0xFF & chr; | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 248 | size_t i = string.length; | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 249 | while (i > 0) { | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 250 | i--; | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 251 | if (string.ptr[i] == chr) { | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 252 | return cx_strsubs(string, i); | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 253 | } | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 254 | } | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 255 | return (cxstring) {NULL, 0}; | 
| 1412 
a6f357c18ac6
use memrchr() to implement cx_strrchr() when it is available
 Mike Becker <universe@uap-core.de> parents: 
1334diff
changeset | 256 | #endif | 
| 580 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 257 | } | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 258 | |
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 259 | cxmutstr cx_strrchr_m( | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 260 | cxmutstr string, | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 261 | int chr | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 262 | ) { | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 263 | cxstring result = cx_strrchr(cx_strcast(string), chr); | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 264 | return (cxmutstr) {(char *) result.ptr, result.length}; | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 265 | } | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 266 | |
| 643 
5700ba9154ab
#228 make buffer sizes adjustable at compile time
 Mike Becker <universe@uap-core.de> parents: 
628diff
changeset | 267 | #ifndef CX_STRSTR_SBO_SIZE | 
| 1136 
d9ff0f091f28
reduce default SBO memory for strstr - relates to #575
 Mike Becker <universe@uap-core.de> parents: 
1134diff
changeset | 268 | #define CX_STRSTR_SBO_SIZE 128 | 
| 643 
5700ba9154ab
#228 make buffer sizes adjustable at compile time
 Mike Becker <universe@uap-core.de> parents: 
628diff
changeset | 269 | #endif | 
| 926 
8fdd8d78c14b
fix several survivors of east-const and some missing consts
 Mike Becker <universe@uap-core.de> parents: 
890diff
changeset | 270 | const unsigned cx_strstr_sbo_size = CX_STRSTR_SBO_SIZE; | 
| 579 
bbc46dcd5255
start implementing string functions
 Mike Becker <universe@uap-core.de> parents: 
576diff
changeset | 271 | |
| 580 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 272 | cxstring cx_strstr( | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 273 | cxstring haystack, | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 274 | cxstring needle | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 275 | ) { | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 276 | if (needle.length == 0) { | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 277 | return haystack; | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 278 | } | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 279 | |
| 628 
1e2be40f0cb5
use //-style single line comments everywhere
 Mike Becker <universe@uap-core.de> parents: 
593diff
changeset | 280 | // optimize for single-char needles | 
| 583 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 281 | if (needle.length == 1) { | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 282 | return cx_strchr(haystack, *needle.ptr); | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 283 | } | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 284 | |
| 580 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 285 | /* | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 286 | * IMPORTANT: | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 287 | * Our prefix table contains the prefix length PLUS ONE | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 288 | * this is our decision, because we want to use the full range of size_t. | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 289 | * The original algorithm needs a (-1) at one single place, | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 290 | * and we want to avoid that. | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 291 | */ | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 292 | |
| 628 
1e2be40f0cb5
use //-style single line comments everywhere
 Mike Becker <universe@uap-core.de> parents: 
593diff
changeset | 293 | // local prefix table | 
| 643 
5700ba9154ab
#228 make buffer sizes adjustable at compile time
 Mike Becker <universe@uap-core.de> parents: 
628diff
changeset | 294 | size_t s_prefix_table[CX_STRSTR_SBO_SIZE]; | 
| 580 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 295 | |
| 628 
1e2be40f0cb5
use //-style single line comments everywhere
 Mike Becker <universe@uap-core.de> parents: 
593diff
changeset | 296 | // check needle length and use appropriate prefix table | 
| 
1e2be40f0cb5
use //-style single line comments everywhere
 Mike Becker <universe@uap-core.de> parents: 
593diff
changeset | 297 | // if the pattern exceeds static prefix table, allocate on the heap | 
| 1125 
6090c455b8df
avoid unnecessary comparison
 Mike Becker <universe@uap-core.de> parents: 
1074diff
changeset | 298 | const bool useheap = needle.length >= CX_STRSTR_SBO_SIZE; | 
| 1318 
12fa1d37fe48
allow changing the cxDefaultAllocator - resolves #669
 Mike Becker <universe@uap-core.de> parents: 
1304diff
changeset | 299 | register size_t *ptable = useheap | 
| 1319 
aa1f580f8f59
add convenience macros for using the default allocator - relates to #669
 Mike Becker <universe@uap-core.de> parents: 
1318diff
changeset | 300 | ? cxCallocDefault(needle.length + 1, sizeof(size_t)) | 
| 1318 
12fa1d37fe48
allow changing the cxDefaultAllocator - resolves #669
 Mike Becker <universe@uap-core.de> parents: 
1304diff
changeset | 301 | : s_prefix_table; | 
| 580 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 302 | |
| 628 
1e2be40f0cb5
use //-style single line comments everywhere
 Mike Becker <universe@uap-core.de> parents: 
593diff
changeset | 303 | // keep counter in registers | 
| 580 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 304 | register size_t i, j; | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 305 | |
| 628 
1e2be40f0cb5
use //-style single line comments everywhere
 Mike Becker <universe@uap-core.de> parents: 
593diff
changeset | 306 | // fill prefix table | 
| 580 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 307 | i = 0; | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 308 | j = 0; | 
| 591 
7df0bcaecffa
fix over-optimization of strstr
 Mike Becker <universe@uap-core.de> parents: 
590diff
changeset | 309 | ptable[i] = j; | 
| 580 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 310 | while (i < needle.length) { | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 311 | while (j >= 1 && needle.ptr[j - 1] != needle.ptr[i]) { | 
| 591 
7df0bcaecffa
fix over-optimization of strstr
 Mike Becker <universe@uap-core.de> parents: 
590diff
changeset | 312 | j = ptable[j - 1]; | 
| 580 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 313 | } | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 314 | i++; | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 315 | j++; | 
| 591 
7df0bcaecffa
fix over-optimization of strstr
 Mike Becker <universe@uap-core.de> parents: 
590diff
changeset | 316 | ptable[i] = j; | 
| 580 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 317 | } | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 318 | |
| 628 
1e2be40f0cb5
use //-style single line comments everywhere
 Mike Becker <universe@uap-core.de> parents: 
593diff
changeset | 319 | // search | 
| 580 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 320 | cxstring result = {NULL, 0}; | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 321 | i = 0; | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 322 | j = 1; | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 323 | while (i < haystack.length) { | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 324 | while (j >= 1 && haystack.ptr[i] != needle.ptr[j - 1]) { | 
| 591 
7df0bcaecffa
fix over-optimization of strstr
 Mike Becker <universe@uap-core.de> parents: 
590diff
changeset | 325 | j = ptable[j - 1]; | 
| 580 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 326 | } | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 327 | i++; | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 328 | j++; | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 329 | if (j - 1 == needle.length) { | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 330 | size_t start = i - needle.length; | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 331 | result.ptr = haystack.ptr + start; | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 332 | result.length = haystack.length - start; | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 333 | break; | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 334 | } | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 335 | } | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 336 | |
| 628 
1e2be40f0cb5
use //-style single line comments everywhere
 Mike Becker <universe@uap-core.de> parents: 
593diff
changeset | 337 | // if prefix table was allocated on the heap, free it | 
| 1125 
6090c455b8df
avoid unnecessary comparison
 Mike Becker <universe@uap-core.de> parents: 
1074diff
changeset | 338 | if (useheap) { | 
| 1319 
aa1f580f8f59
add convenience macros for using the default allocator - relates to #669
 Mike Becker <universe@uap-core.de> parents: 
1318diff
changeset | 339 | cxFreeDefault(ptable); | 
| 580 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 340 | } | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 341 | |
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 342 | return result; | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 343 | } | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 344 | |
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 345 | cxmutstr cx_strstr_m( | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 346 | cxmutstr haystack, | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 347 | cxstring needle | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 348 | ) { | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 349 | cxstring result = cx_strstr(cx_strcast(haystack), needle); | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 350 | return (cxmutstr) {(char *) result.ptr, result.length}; | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 351 | } | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 352 | |
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 353 | size_t cx_strsplit( | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 354 | cxstring string, | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 355 | cxstring delim, | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 356 | size_t limit, | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 357 | cxstring *output | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 358 | ) { | 
| 628 
1e2be40f0cb5
use //-style single line comments everywhere
 Mike Becker <universe@uap-core.de> parents: 
593diff
changeset | 359 | // special case: output limit is zero | 
| 583 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 360 | if (limit == 0) return 0; | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 361 | |
| 628 
1e2be40f0cb5
use //-style single line comments everywhere
 Mike Becker <universe@uap-core.de> parents: 
593diff
changeset | 362 | // special case: delimiter is empty | 
| 583 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 363 | if (delim.length == 0) { | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 364 | output[0] = string; | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 365 | return 1; | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 366 | } | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 367 | |
| 628 
1e2be40f0cb5
use //-style single line comments everywhere
 Mike Becker <universe@uap-core.de> parents: 
593diff
changeset | 368 | // special cases: delimiter is at least as large as the string | 
| 583 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 369 | if (delim.length >= string.length) { | 
| 628 
1e2be40f0cb5
use //-style single line comments everywhere
 Mike Becker <universe@uap-core.de> parents: 
593diff
changeset | 370 | // exact match | 
| 583 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 371 | if (cx_strcmp(string, delim) == 0) { | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 372 | output[0] = cx_strn(string.ptr, 0); | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 373 | output[1] = cx_strn(string.ptr + string.length, 0); | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 374 | return 2; | 
| 628 
1e2be40f0cb5
use //-style single line comments everywhere
 Mike Becker <universe@uap-core.de> parents: 
593diff
changeset | 375 | } else { | 
| 
1e2be40f0cb5
use //-style single line comments everywhere
 Mike Becker <universe@uap-core.de> parents: 
593diff
changeset | 376 | // no match possible | 
| 583 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 377 | output[0] = string; | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 378 | return 1; | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 379 | } | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 380 | } | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 381 | |
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 382 | size_t n = 0; | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 383 | cxstring curpos = string; | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 384 | while (1) { | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 385 | ++n; | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 386 | cxstring match = cx_strstr(curpos, delim); | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 387 | if (match.length > 0) { | 
| 628 
1e2be40f0cb5
use //-style single line comments everywhere
 Mike Becker <universe@uap-core.de> parents: 
593diff
changeset | 388 | // is the limit reached? | 
| 583 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 389 | if (n < limit) { | 
| 628 
1e2be40f0cb5
use //-style single line comments everywhere
 Mike Becker <universe@uap-core.de> parents: 
593diff
changeset | 390 | // copy the current string to the array | 
| 583 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 391 | cxstring item = cx_strn(curpos.ptr, match.ptr - curpos.ptr); | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 392 | output[n - 1] = item; | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 393 | size_t processed = item.length + delim.length; | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 394 | curpos.ptr += processed; | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 395 | curpos.length -= processed; | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 396 | } else { | 
| 628 
1e2be40f0cb5
use //-style single line comments everywhere
 Mike Becker <universe@uap-core.de> parents: 
593diff
changeset | 397 | // limit reached, copy the _full_ remaining string | 
| 583 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 398 | output[n - 1] = curpos; | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 399 | break; | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 400 | } | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 401 | } else { | 
| 628 
1e2be40f0cb5
use //-style single line comments everywhere
 Mike Becker <universe@uap-core.de> parents: 
593diff
changeset | 402 | // no more matches, copy last string | 
| 583 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 403 | output[n - 1] = curpos; | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 404 | break; | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 405 | } | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 406 | } | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 407 | |
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 408 | return n; | 
| 580 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 409 | } | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 410 | |
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 411 | size_t cx_strsplit_a( | 
| 890 
54565fd74e74
move all const keywords to the west - fixes #426
 Mike Becker <universe@uap-core.de> parents: 
806diff
changeset | 412 | const CxAllocator *allocator, | 
| 580 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 413 | cxstring string, | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 414 | cxstring delim, | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 415 | size_t limit, | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 416 | cxstring **output | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 417 | ) { | 
| 628 
1e2be40f0cb5
use //-style single line comments everywhere
 Mike Becker <universe@uap-core.de> parents: 
593diff
changeset | 418 | // find out how many splits we're going to make and allocate memory | 
| 583 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 419 | size_t n = 0; | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 420 | cxstring curpos = string; | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 421 | while (1) { | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 422 | ++n; | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 423 | cxstring match = cx_strstr(curpos, delim); | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 424 | if (match.length > 0) { | 
| 628 
1e2be40f0cb5
use //-style single line comments everywhere
 Mike Becker <universe@uap-core.de> parents: 
593diff
changeset | 425 | // is the limit reached? | 
| 583 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 426 | if (n < limit) { | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 427 | size_t processed = match.ptr - curpos.ptr + delim.length; | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 428 | curpos.ptr += processed; | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 429 | curpos.length -= processed; | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 430 | } else { | 
| 628 
1e2be40f0cb5
use //-style single line comments everywhere
 Mike Becker <universe@uap-core.de> parents: 
593diff
changeset | 431 | // limit reached | 
| 583 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 432 | break; | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 433 | } | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 434 | } else { | 
| 628 
1e2be40f0cb5
use //-style single line comments everywhere
 Mike Becker <universe@uap-core.de> parents: 
593diff
changeset | 435 | // no more matches | 
| 583 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 436 | break; | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 437 | } | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 438 | } | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 439 | *output = cxCalloc(allocator, n, sizeof(cxstring)); | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 440 | return cx_strsplit(string, delim, n, *output); | 
| 580 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 441 | } | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 442 | |
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 443 | size_t cx_strsplit_m( | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 444 | cxmutstr string, | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 445 | cxstring delim, | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 446 | size_t limit, | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 447 | cxmutstr *output | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 448 | ) { | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 449 | return cx_strsplit(cx_strcast(string), | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 450 | delim, limit, (cxstring *) output); | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 451 | } | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 452 | |
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 453 | size_t cx_strsplit_ma( | 
| 890 
54565fd74e74
move all const keywords to the west - fixes #426
 Mike Becker <universe@uap-core.de> parents: 
806diff
changeset | 454 | const CxAllocator *allocator, | 
| 580 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 455 | cxmutstr string, | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 456 | cxstring delim, | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 457 | size_t limit, | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 458 | cxmutstr **output | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 459 | ) { | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 460 | return cx_strsplit_a(allocator, cx_strcast(string), | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 461 | delim, limit, (cxstring **) output); | 
| 
aac47db8da0b
more implementations of string functions
 Mike Becker <universe@uap-core.de> parents: 
579diff
changeset | 462 | } | 
| 581 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 463 | |
| 1426 
3a89b31f0724
clean up header files and adds support for comparing arbitrary strings with string.h functions
 Mike Becker <universe@uap-core.de> parents: 
1415diff
changeset | 464 | int cx_strcmp_( | 
| 583 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 465 | cxstring s1, | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 466 | cxstring s2 | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 467 | ) { | 
| 581 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 468 | if (s1.length == s2.length) { | 
| 1073 
13c8a92625d4
fix for ultrafail fix #546
 Mike Becker <universe@uap-core.de> parents: 
1071diff
changeset | 469 | return strncmp(s1.ptr, s2.ptr, s1.length); | 
| 581 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 470 | } else if (s1.length > s2.length) { | 
| 1073 
13c8a92625d4
fix for ultrafail fix #546
 Mike Becker <universe@uap-core.de> parents: 
1071diff
changeset | 471 | int r = strncmp(s1.ptr, s2.ptr, s2.length); | 
| 
13c8a92625d4
fix for ultrafail fix #546
 Mike Becker <universe@uap-core.de> parents: 
1071diff
changeset | 472 | if (r != 0) return r; | 
| 581 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 473 | return 1; | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 474 | } else { | 
| 1073 
13c8a92625d4
fix for ultrafail fix #546
 Mike Becker <universe@uap-core.de> parents: 
1071diff
changeset | 475 | int r = strncmp(s1.ptr, s2.ptr, s1.length); | 
| 
13c8a92625d4
fix for ultrafail fix #546
 Mike Becker <universe@uap-core.de> parents: 
1071diff
changeset | 476 | if (r != 0) return r; | 
| 581 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 477 | return -1; | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 478 | } | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 479 | } | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 480 | |
| 1426 
3a89b31f0724
clean up header files and adds support for comparing arbitrary strings with string.h functions
 Mike Becker <universe@uap-core.de> parents: 
1415diff
changeset | 481 | int cx_strcasecmp_( | 
| 583 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 482 | cxstring s1, | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 483 | cxstring s2 | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 484 | ) { | 
| 581 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 485 | if (s1.length == s2.length) { | 
| 1073 
13c8a92625d4
fix for ultrafail fix #546
 Mike Becker <universe@uap-core.de> parents: 
1071diff
changeset | 486 | return cx_strcasecmp_impl(s1.ptr, s2.ptr, s1.length); | 
| 581 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 487 | } else if (s1.length > s2.length) { | 
| 1073 
13c8a92625d4
fix for ultrafail fix #546
 Mike Becker <universe@uap-core.de> parents: 
1071diff
changeset | 488 | int r = cx_strcasecmp_impl(s1.ptr, s2.ptr, s2.length); | 
| 
13c8a92625d4
fix for ultrafail fix #546
 Mike Becker <universe@uap-core.de> parents: 
1071diff
changeset | 489 | if (r != 0) return r; | 
| 581 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 490 | return 1; | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 491 | } else { | 
| 1073 
13c8a92625d4
fix for ultrafail fix #546
 Mike Becker <universe@uap-core.de> parents: 
1071diff
changeset | 492 | int r = cx_strcasecmp_impl(s1.ptr, s2.ptr, s1.length); | 
| 
13c8a92625d4
fix for ultrafail fix #546
 Mike Becker <universe@uap-core.de> parents: 
1071diff
changeset | 493 | if (r != 0) return r; | 
| 581 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 494 | return -1; | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 495 | } | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 496 | } | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 497 | |
| 657 
3eeadf666d6b
add CxListComparator compatible string compare functions
 Mike Becker <universe@uap-core.de> parents: 
645diff
changeset | 498 | int cx_strcmp_p( | 
| 890 
54565fd74e74
move all const keywords to the west - fixes #426
 Mike Becker <universe@uap-core.de> parents: 
806diff
changeset | 499 | const void *s1, | 
| 
54565fd74e74
move all const keywords to the west - fixes #426
 Mike Becker <universe@uap-core.de> parents: 
806diff
changeset | 500 | const void *s2 | 
| 657 
3eeadf666d6b
add CxListComparator compatible string compare functions
 Mike Becker <universe@uap-core.de> parents: 
645diff
changeset | 501 | ) { | 
| 890 
54565fd74e74
move all const keywords to the west - fixes #426
 Mike Becker <universe@uap-core.de> parents: 
806diff
changeset | 502 | const cxstring *left = s1; | 
| 
54565fd74e74
move all const keywords to the west - fixes #426
 Mike Becker <universe@uap-core.de> parents: 
806diff
changeset | 503 | const cxstring *right = s2; | 
| 657 
3eeadf666d6b
add CxListComparator compatible string compare functions
 Mike Becker <universe@uap-core.de> parents: 
645diff
changeset | 504 | return cx_strcmp(*left, *right); | 
| 
3eeadf666d6b
add CxListComparator compatible string compare functions
 Mike Becker <universe@uap-core.de> parents: 
645diff
changeset | 505 | } | 
| 
3eeadf666d6b
add CxListComparator compatible string compare functions
 Mike Becker <universe@uap-core.de> parents: 
645diff
changeset | 506 | |
| 
3eeadf666d6b
add CxListComparator compatible string compare functions
 Mike Becker <universe@uap-core.de> parents: 
645diff
changeset | 507 | int cx_strcasecmp_p( | 
| 890 
54565fd74e74
move all const keywords to the west - fixes #426
 Mike Becker <universe@uap-core.de> parents: 
806diff
changeset | 508 | const void *s1, | 
| 
54565fd74e74
move all const keywords to the west - fixes #426
 Mike Becker <universe@uap-core.de> parents: 
806diff
changeset | 509 | const void *s2 | 
| 657 
3eeadf666d6b
add CxListComparator compatible string compare functions
 Mike Becker <universe@uap-core.de> parents: 
645diff
changeset | 510 | ) { | 
| 890 
54565fd74e74
move all const keywords to the west - fixes #426
 Mike Becker <universe@uap-core.de> parents: 
806diff
changeset | 511 | const cxstring *left = s1; | 
| 
54565fd74e74
move all const keywords to the west - fixes #426
 Mike Becker <universe@uap-core.de> parents: 
806diff
changeset | 512 | const cxstring *right = s2; | 
| 657 
3eeadf666d6b
add CxListComparator compatible string compare functions
 Mike Becker <universe@uap-core.de> parents: 
645diff
changeset | 513 | return cx_strcasecmp(*left, *right); | 
| 
3eeadf666d6b
add CxListComparator compatible string compare functions
 Mike Becker <universe@uap-core.de> parents: 
645diff
changeset | 514 | } | 
| 
3eeadf666d6b
add CxListComparator compatible string compare functions
 Mike Becker <universe@uap-core.de> parents: 
645diff
changeset | 515 | |
| 1134 
60edcd57d54c
fix that some IDEs cannot resolve documentation
 Mike Becker <universe@uap-core.de> parents: 
1132diff
changeset | 516 | cxmutstr cx_strdup_a_( | 
| 890 
54565fd74e74
move all const keywords to the west - fixes #426
 Mike Becker <universe@uap-core.de> parents: 
806diff
changeset | 517 | const CxAllocator *allocator, | 
| 583 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 518 | cxstring string | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 519 | ) { | 
| 581 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 520 | cxmutstr result = { | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 521 | cxMalloc(allocator, string.length + 1), | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 522 | string.length | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 523 | }; | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 524 | if (result.ptr == NULL) { | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 525 | result.length = 0; | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 526 | return result; | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 527 | } | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 528 | memcpy(result.ptr, string.ptr, string.length); | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 529 | result.ptr[string.length] = '\0'; | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 530 | return result; | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 531 | } | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 532 | |
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 533 | cxstring cx_strtrim(cxstring string) { | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 534 | cxstring result = string; | 
| 1415 
40074e643663
go back to ctype.h, but this time try to avoid crashes in Microsoft's implementation
 Mike Becker <universe@uap-core.de> parents: 
1413diff
changeset | 535 | while (result.length > 0 && isspace((unsigned char)(result.ptr[0]))) { | 
| 581 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 536 | result.ptr++; | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 537 | result.length--; | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 538 | } | 
| 1415 
40074e643663
go back to ctype.h, but this time try to avoid crashes in Microsoft's implementation
 Mike Becker <universe@uap-core.de> parents: 
1413diff
changeset | 539 | while (result.length > 0 && isspace((unsigned char)result.ptr[result.length - 1])) { | 
| 581 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 540 | result.length--; | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 541 | } | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 542 | return result; | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 543 | } | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 544 | |
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 545 | cxmutstr cx_strtrim_m(cxmutstr string) { | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 546 | cxstring result = cx_strtrim(cx_strcast(string)); | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 547 | return (cxmutstr) {(char *) result.ptr, result.length}; | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 548 | } | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 549 | |
| 1426 
3a89b31f0724
clean up header files and adds support for comparing arbitrary strings with string.h functions
 Mike Becker <universe@uap-core.de> parents: 
1415diff
changeset | 550 | bool cx_strprefix_( | 
| 583 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 551 | cxstring string, | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 552 | cxstring prefix | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 553 | ) { | 
| 581 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 554 | if (string.length < prefix.length) return false; | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 555 | return memcmp(string.ptr, prefix.ptr, prefix.length) == 0; | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 556 | } | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 557 | |
| 1426 
3a89b31f0724
clean up header files and adds support for comparing arbitrary strings with string.h functions
 Mike Becker <universe@uap-core.de> parents: 
1415diff
changeset | 558 | bool cx_strsuffix_( | 
| 583 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 559 | cxstring string, | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 560 | cxstring suffix | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 561 | ) { | 
| 581 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 562 | if (string.length < suffix.length) return false; | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 563 | return memcmp(string.ptr + string.length - suffix.length, | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 564 | suffix.ptr, suffix.length) == 0; | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 565 | } | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 566 | |
| 1426 
3a89b31f0724
clean up header files and adds support for comparing arbitrary strings with string.h functions
 Mike Becker <universe@uap-core.de> parents: 
1415diff
changeset | 567 | bool cx_strcaseprefix_( | 
| 583 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 568 | cxstring string, | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 569 | cxstring prefix | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 570 | ) { | 
| 581 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 571 | if (string.length < prefix.length) return false; | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 572 | #ifdef _WIN32 | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 573 | return _strnicmp(string.ptr, prefix.ptr, prefix.length) == 0; | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 574 | #else | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 575 | return strncasecmp(string.ptr, prefix.ptr, prefix.length) == 0; | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 576 | #endif | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 577 | } | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 578 | |
| 1426 
3a89b31f0724
clean up header files and adds support for comparing arbitrary strings with string.h functions
 Mike Becker <universe@uap-core.de> parents: 
1415diff
changeset | 579 | bool cx_strcasesuffix_( | 
| 583 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 580 | cxstring string, | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 581 | cxstring suffix | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 582 | ) { | 
| 581 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 583 | if (string.length < suffix.length) return false; | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 584 | #ifdef _WIN32 | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 585 | return _strnicmp(string.ptr+string.length-suffix.length, | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 586 | suffix.ptr, suffix.length) == 0; | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 587 | #else | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 588 | return strncasecmp(string.ptr + string.length - suffix.length, | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 589 | suffix.ptr, suffix.length) == 0; | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 590 | #endif | 
| 
c067394737ca
implement more string functions
 Mike Becker <universe@uap-core.de> parents: 
580diff
changeset | 591 | } | 
| 582 
96fa7fa6af4f
implement strupper and strlower
 Mike Becker <universe@uap-core.de> parents: 
581diff
changeset | 592 | |
| 583 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 593 | cxmutstr cx_strreplacen_a( | 
| 890 
54565fd74e74
move all const keywords to the west - fixes #426
 Mike Becker <universe@uap-core.de> parents: 
806diff
changeset | 594 | const CxAllocator *allocator, | 
| 583 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 595 | cxstring str, | 
| 1221 
304f4f7b37d1
document cx_strreplace() family of functions and improve docstrings
 Mike Becker <universe@uap-core.de> parents: 
1176diff
changeset | 596 | cxstring search, | 
| 583 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 597 | cxstring replacement, | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 598 | size_t replmax | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 599 | ) { | 
| 1300 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 600 | // special cases | 
| 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 601 | if (search.length == 0 || search.length > str.length || replmax == 0) { | 
| 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 602 | return cx_strdup_a(allocator, str); | 
| 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 603 | } | 
| 583 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 604 | |
| 1300 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 605 | size_t in_len = str.length; | 
| 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 606 | size_t search_len = search.length; | 
| 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 607 | size_t repl_len = replacement.length; | 
| 583 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 608 | |
| 1300 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 609 | // first run, count the occurrences | 
| 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 610 | // and remember where the first is | 
| 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 611 | size_t occurrences = 1; | 
| 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 612 | cxstring first = cx_strstr(str, search); | 
| 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 613 | if (first.length == 0) { | 
| 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 614 | // special case, no replacements | 
| 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 615 | return cx_strdup_a(allocator, str); | 
| 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 616 | } | 
| 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 617 | cxstring tmp = cx_strsubs(first, search_len); | 
| 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 618 | while (occurrences < replmax && | 
| 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 619 | (tmp = cx_strstr(tmp, search)).length > 0) { | 
| 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 620 | occurrences++; | 
| 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 621 | tmp = cx_strsubs(tmp, search_len); | 
| 583 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 622 | } | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 623 | |
| 1300 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 624 | // calculate necessary memory | 
| 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 625 | signed long long diff_len = (signed long long) repl_len - search_len; | 
| 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 626 | size_t out_len = in_len + diff_len * occurrences; | 
| 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 627 | cxmutstr out = { | 
| 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 628 | cxMalloc(allocator, out_len + 1), | 
| 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 629 | out_len | 
| 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 630 | }; | 
| 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 631 | if (out.ptr == NULL) return out; | 
| 583 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 632 | |
| 1300 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 633 | // second run: perform the replacements | 
| 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 634 | // but start where we found the first occurrence | 
| 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 635 | const char *inp = str.ptr; | 
| 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 636 | tmp = first; | 
| 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 637 | char *outp = out.ptr; | 
| 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 638 | while (occurrences-- > 0 && (tmp = cx_strstr(tmp, search)).length > 0) { | 
| 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 639 | size_t copylen = tmp.ptr - inp; | 
| 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 640 | memcpy(outp, inp, copylen); | 
| 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 641 | outp += copylen; | 
| 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 642 | memcpy(outp, replacement.ptr, repl_len); | 
| 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 643 | outp += repl_len; | 
| 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 644 | inp += copylen + search_len; | 
| 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 645 | tmp = cx_strsubs(tmp, search_len); | 
| 583 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 646 | } | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 647 | |
| 1300 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 648 | // add the remaining string | 
| 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 649 | size_t copylen = in_len - (inp - str.ptr); | 
| 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 650 | memcpy(outp, inp, copylen); | 
| 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 651 | out.ptr[out_len] = '\0'; | 
| 583 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 652 | |
| 1300 
fcb149ee60ff
improve cx_strreplacen() - resolves #623
 Mike Becker <universe@uap-core.de> parents: 
1296diff
changeset | 653 | return out; | 
| 583 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 654 | } | 
| 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 655 | |
| 1134 
60edcd57d54c
fix that some IDEs cannot resolve documentation
 Mike Becker <universe@uap-core.de> parents: 
1132diff
changeset | 656 | CxStrtokCtx cx_strtok_( | 
| 645 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 657 | cxstring str, | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 658 | cxstring delim, | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 659 | size_t limit | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 660 | ) { | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 661 | CxStrtokCtx ctx; | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 662 | ctx.str = str; | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 663 | ctx.delim = delim; | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 664 | ctx.limit = limit; | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 665 | ctx.pos = 0; | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 666 | ctx.next_pos = 0; | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 667 | ctx.delim_pos = 0; | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 668 | ctx.found = 0; | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 669 | ctx.delim_more = NULL; | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 670 | ctx.delim_more_count = 0; | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 671 | return ctx; | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 672 | } | 
| 583 
0f3c9662f9b5
add tests and missing implementations for strings
 Mike Becker <universe@uap-core.de> parents: 
582diff
changeset | 673 | |
| 645 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 674 | bool cx_strtok_next( | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 675 | CxStrtokCtx *ctx, | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 676 | cxstring *token | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 677 | ) { | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 678 | // abortion criteria | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 679 | if (ctx->found >= ctx->limit || ctx->delim_pos >= ctx->str.length) { | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 680 | return false; | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 681 | } | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 682 | |
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 683 | // determine the search start | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 684 | cxstring haystack = cx_strsubs(ctx->str, ctx->next_pos); | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 685 | |
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 686 | // search the next delimiter | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 687 | cxstring delim = cx_strstr(haystack, ctx->delim); | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 688 | |
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 689 | // if found, make delim capture exactly the delimiter | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 690 | if (delim.length > 0) { | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 691 | delim.length = ctx->delim.length; | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 692 | } | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 693 | |
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 694 | // if more delimiters are specified, check them now | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 695 | if (ctx->delim_more_count > 0) { | 
| 962 
cd418898af5c
remove cx_for_n() macro - fixes #467
 Mike Becker <universe@uap-core.de> parents: 
926diff
changeset | 696 | for (size_t i = 0; i < ctx->delim_more_count; i++) { | 
| 645 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 697 | cxstring d = cx_strstr(haystack, ctx->delim_more[i]); | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 698 | if (d.length > 0 && (delim.length == 0 || d.ptr < delim.ptr)) { | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 699 | delim.ptr = d.ptr; | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 700 | delim.length = ctx->delim_more[i].length; | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 701 | } | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 702 | } | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 703 | } | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 704 | |
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 705 | // store the token information and adjust the context | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 706 | ctx->found++; | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 707 | ctx->pos = ctx->next_pos; | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 708 | token->ptr = &ctx->str.ptr[ctx->pos]; | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 709 | ctx->delim_pos = delim.length == 0 ? | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 710 | ctx->str.length : (size_t) (delim.ptr - ctx->str.ptr); | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 711 | token->length = ctx->delim_pos - ctx->pos; | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 712 | ctx->next_pos = ctx->delim_pos + delim.length; | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 713 | |
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 714 | return true; | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 715 | } | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 716 | |
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 717 | bool cx_strtok_next_m( | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 718 | CxStrtokCtx *ctx, | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 719 | cxmutstr *token | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 720 | ) { | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 721 | return cx_strtok_next(ctx, (cxstring *) token); | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 722 | } | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 723 | |
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 724 | void cx_strtok_delim( | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 725 | CxStrtokCtx *ctx, | 
| 890 
54565fd74e74
move all const keywords to the west - fixes #426
 Mike Becker <universe@uap-core.de> parents: 
806diff
changeset | 726 | const cxstring *delim, | 
| 645 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 727 | size_t count | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 728 | ) { | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 729 | ctx->delim_more = delim; | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 730 | ctx->delim_more_count = count; | 
| 
ec50abb285ad
add strtok API - fixes #220
 Mike Becker <universe@uap-core.de> parents: 
643diff
changeset | 731 | } | 
| 1048 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 732 | |
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 733 | #define cx_strtoX_signed_impl(rtype, rmin, rmax) \ | 
| 1052 
e997862a57d8
add temporary implementations for string to number and first test cases
 Mike Becker <universe@uap-core.de> parents: 
1050diff
changeset | 734 | long long result; \ | 
| 
e997862a57d8
add temporary implementations for string to number and first test cases
 Mike Becker <universe@uap-core.de> parents: 
1050diff
changeset | 735 | if (cx_strtoll_lc(str, &result, base, groupsep)) { \ | 
| 1048 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 736 | return -1; \ | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 737 | } \ | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 738 | if (result < rmin || result > rmax) { \ | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 739 | errno = ERANGE; \ | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 740 | return -1; \ | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 741 | } \ | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 742 | *output = (rtype) result; \ | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 743 | return 0 | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 744 | |
| 1134 
60edcd57d54c
fix that some IDEs cannot resolve documentation
 Mike Becker <universe@uap-core.de> parents: 
1132diff
changeset | 745 | int cx_strtos_lc_(cxstring str, short *output, int base, const char *groupsep) { | 
| 1048 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 746 | cx_strtoX_signed_impl(short, SHRT_MIN, SHRT_MAX); | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 747 | } | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 748 | |
| 1134 
60edcd57d54c
fix that some IDEs cannot resolve documentation
 Mike Becker <universe@uap-core.de> parents: 
1132diff
changeset | 749 | int cx_strtoi_lc_(cxstring str, int *output, int base, const char *groupsep) { | 
| 1048 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 750 | cx_strtoX_signed_impl(int, INT_MIN, INT_MAX); | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 751 | } | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 752 | |
| 1134 
60edcd57d54c
fix that some IDEs cannot resolve documentation
 Mike Becker <universe@uap-core.de> parents: 
1132diff
changeset | 753 | int cx_strtol_lc_(cxstring str, long *output, int base, const char *groupsep) { | 
| 1048 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 754 | cx_strtoX_signed_impl(long, LONG_MIN, LONG_MAX); | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 755 | } | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 756 | |
| 1134 
60edcd57d54c
fix that some IDEs cannot resolve documentation
 Mike Becker <universe@uap-core.de> parents: 
1132diff
changeset | 757 | int cx_strtoll_lc_(cxstring str, long long *output, int base, const char *groupsep) { | 
| 1061 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 758 | // strategy: parse as unsigned, check range, negate if required | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 759 | bool neg = false; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 760 | size_t start_unsigned = 0; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 761 | |
| 1155 
b77d56a27e9c
do not trim strings before conversion to number
 Mike Becker <universe@uap-core.de> parents: 
1137diff
changeset | 762 | // emptiness check | 
| 1061 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 763 | if (str.length == 0) { | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 764 | errno = EINVAL; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 765 | return -1; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 766 | } | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 767 | |
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 768 | // test if we have a negative sign character | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 769 | if (str.ptr[start_unsigned] == '-') { | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 770 | neg = true; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 771 | start_unsigned++; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 772 | // must not be followed by positive sign character | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 773 | if (str.length == 1 || str.ptr[start_unsigned] == '+') { | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 774 | errno = EINVAL; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 775 | return -1; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 776 | } | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 777 | } | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 778 | |
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 779 | // now parse the number with strtoull | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 780 | unsigned long long v; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 781 | cxstring ustr = start_unsigned == 0 ? str | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 782 | : cx_strn(str.ptr + start_unsigned, str.length - start_unsigned); | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 783 | int ret = cx_strtoull_lc(ustr, &v, base, groupsep); | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 784 | if (ret != 0) return ret; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 785 | if (neg) { | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 786 | if (v - 1 > LLONG_MAX) { | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 787 | errno = ERANGE; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 788 | return -1; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 789 | } | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 790 | *output = -(long long) v; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 791 | return 0; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 792 | } else { | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 793 | if (v > LLONG_MAX) { | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 794 | errno = ERANGE; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 795 | return -1; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 796 | } | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 797 | *output = (long long) v; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 798 | return 0; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 799 | } | 
| 1048 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 800 | } | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 801 | |
| 1134 
60edcd57d54c
fix that some IDEs cannot resolve documentation
 Mike Becker <universe@uap-core.de> parents: 
1132diff
changeset | 802 | int cx_strtoi8_lc_(cxstring str, int8_t *output, int base, const char *groupsep) { | 
| 1048 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 803 | cx_strtoX_signed_impl(int8_t, INT8_MIN, INT8_MAX); | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 804 | } | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 805 | |
| 1134 
60edcd57d54c
fix that some IDEs cannot resolve documentation
 Mike Becker <universe@uap-core.de> parents: 
1132diff
changeset | 806 | int cx_strtoi16_lc_(cxstring str, int16_t *output, int base, const char *groupsep) { | 
| 1048 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 807 | cx_strtoX_signed_impl(int16_t, INT16_MIN, INT16_MAX); | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 808 | } | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 809 | |
| 1134 
60edcd57d54c
fix that some IDEs cannot resolve documentation
 Mike Becker <universe@uap-core.de> parents: 
1132diff
changeset | 810 | int cx_strtoi32_lc_(cxstring str, int32_t *output, int base, const char *groupsep) { | 
| 1048 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 811 | cx_strtoX_signed_impl(int32_t, INT32_MIN, INT32_MAX); | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 812 | } | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 813 | |
| 1134 
60edcd57d54c
fix that some IDEs cannot resolve documentation
 Mike Becker <universe@uap-core.de> parents: 
1132diff
changeset | 814 | int cx_strtoi64_lc_(cxstring str, int64_t *output, int base, const char *groupsep) { | 
| 1052 
e997862a57d8
add temporary implementations for string to number and first test cases
 Mike Becker <universe@uap-core.de> parents: 
1050diff
changeset | 815 | assert(sizeof(long long) == sizeof(int64_t)); // should be true on all platforms | 
| 
e997862a57d8
add temporary implementations for string to number and first test cases
 Mike Becker <universe@uap-core.de> parents: 
1050diff
changeset | 816 | return cx_strtoll_lc(str, (long long*) output, base, groupsep); | 
| 1048 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 817 | } | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 818 | |
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 819 | #define cx_strtoX_unsigned_impl(rtype, rmax) \ | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 820 | uint64_t result; \ | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 821 | if (cx_strtou64_lc(str, &result, base, groupsep)) { \ | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 822 | return -1; \ | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 823 | } \ | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 824 | if (result > rmax) { \ | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 825 | errno = ERANGE; \ | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 826 | return -1; \ | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 827 | } \ | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 828 | *output = (rtype) result; \ | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 829 | return 0 | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 830 | |
| 1134 
60edcd57d54c
fix that some IDEs cannot resolve documentation
 Mike Becker <universe@uap-core.de> parents: 
1132diff
changeset | 831 | int cx_strtous_lc_(cxstring str, unsigned short *output, int base, const char *groupsep) { | 
| 1048 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 832 | cx_strtoX_unsigned_impl(unsigned short, USHRT_MAX); | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 833 | } | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 834 | |
| 1134 
60edcd57d54c
fix that some IDEs cannot resolve documentation
 Mike Becker <universe@uap-core.de> parents: 
1132diff
changeset | 835 | int cx_strtou_lc_(cxstring str, unsigned int *output, int base, const char *groupsep) { | 
| 1048 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 836 | cx_strtoX_unsigned_impl(unsigned int, UINT_MAX); | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 837 | } | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 838 | |
| 1134 
60edcd57d54c
fix that some IDEs cannot resolve documentation
 Mike Becker <universe@uap-core.de> parents: 
1132diff
changeset | 839 | int cx_strtoul_lc_(cxstring str, unsigned long *output, int base, const char *groupsep) { | 
| 1048 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 840 | cx_strtoX_unsigned_impl(unsigned long, ULONG_MAX); | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 841 | } | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 842 | |
| 1134 
60edcd57d54c
fix that some IDEs cannot resolve documentation
 Mike Becker <universe@uap-core.de> parents: 
1132diff
changeset | 843 | int cx_strtoull_lc_(cxstring str, unsigned long long *output, int base, const char *groupsep) { | 
| 1061 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 844 | // some sanity checks | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 845 | if (str.length == 0) { | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 846 | errno = EINVAL; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 847 | return -1; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 848 | } | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 849 | if (!(base == 2 || base == 8 || base == 10 || base == 16)) { | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 850 | errno = EINVAL; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 851 | return -1; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 852 | } | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 853 | if (groupsep == NULL) groupsep = ""; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 854 | |
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 855 | // find the actual start of the number | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 856 | if (str.ptr[0] == '+') { | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 857 | str.ptr++; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 858 | str.length--; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 859 | if (str.length == 0) { | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 860 | errno = EINVAL; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 861 | return -1; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 862 | } | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 863 | } | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 864 | size_t start = 0; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 865 | |
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 866 | // if base is 2 or 16, some leading stuff may appear | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 867 | if (base == 2) { | 
| 1063 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 868 | if ((str.ptr[0] | 32) == 'b') { | 
| 1061 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 869 | start = 1; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 870 | } else if (str.ptr[0] == '0' && str.length > 1) { | 
| 1063 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 871 | if ((str.ptr[1] | 32) == 'b') { | 
| 1061 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 872 | start = 2; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 873 | } | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 874 | } | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 875 | } else if (base == 16) { | 
| 1063 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 876 | if ((str.ptr[0] | 32) == 'x' || str.ptr[0] == '#') { | 
| 1061 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 877 | start = 1; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 878 | } else if (str.ptr[0] == '0' && str.length > 1) { | 
| 1063 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 879 | if ((str.ptr[1] | 32) == 'x') { | 
| 1061 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 880 | start = 2; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 881 | } | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 882 | } | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 883 | } | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 884 | |
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 885 | // check if there are digits left | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 886 | if (start >= str.length) { | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 887 | errno = EINVAL; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 888 | return -1; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 889 | } | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 890 | |
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 891 | // now parse the number | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 892 | unsigned long long result = 0; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 893 | for (size_t i = start; i < str.length; i++) { | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 894 | // ignore group separators | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 895 | if (strchr(groupsep, str.ptr[i])) continue; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 896 | |
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 897 | // determine the digit value of the character | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 898 | unsigned char c = str.ptr[i]; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 899 | if (c >= 'a') c = 10 + (c - 'a'); | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 900 | else if (c >= 'A') c = 10 + (c - 'A'); | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 901 | else if (c >= '0') c = c - '0'; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 902 | else c = 255; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 903 | if (c >= base) { | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 904 | errno = EINVAL; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 905 | return -1; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 906 | } | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 907 | |
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 908 | // now combine the digit with what we already have | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 909 | unsigned long right = (result & 0xff) * base + c; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 910 | unsigned long long left = (result >> 8) * base + (right >> 8); | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 911 | if (left > (ULLONG_MAX >> 8)) { | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 912 | errno = ERANGE; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 913 | return -1; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 914 | } | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 915 | result = (left << 8) + (right & 0xff); | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 916 | } | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 917 | |
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 918 | *output = result; | 
| 
c7d23892eab5
implement string to integer conversions
 Mike Becker <universe@uap-core.de> parents: 
1052diff
changeset | 919 | return 0; | 
| 1048 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 920 | } | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 921 | |
| 1134 
60edcd57d54c
fix that some IDEs cannot resolve documentation
 Mike Becker <universe@uap-core.de> parents: 
1132diff
changeset | 922 | int cx_strtou8_lc_(cxstring str, uint8_t *output, int base, const char *groupsep) { | 
| 1048 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 923 | cx_strtoX_unsigned_impl(uint8_t, UINT8_MAX); | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 924 | } | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 925 | |
| 1134 
60edcd57d54c
fix that some IDEs cannot resolve documentation
 Mike Becker <universe@uap-core.de> parents: 
1132diff
changeset | 926 | int cx_strtou16_lc_(cxstring str, uint16_t *output, int base, const char *groupsep) { | 
| 1048 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 927 | cx_strtoX_unsigned_impl(uint16_t, UINT16_MAX); | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 928 | } | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 929 | |
| 1134 
60edcd57d54c
fix that some IDEs cannot resolve documentation
 Mike Becker <universe@uap-core.de> parents: 
1132diff
changeset | 930 | int cx_strtou32_lc_(cxstring str, uint32_t *output, int base, const char *groupsep) { | 
| 1048 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 931 | cx_strtoX_unsigned_impl(uint32_t, UINT32_MAX); | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 932 | } | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 933 | |
| 1134 
60edcd57d54c
fix that some IDEs cannot resolve documentation
 Mike Becker <universe@uap-core.de> parents: 
1132diff
changeset | 934 | int cx_strtou64_lc_(cxstring str, uint64_t *output, int base, const char *groupsep) { | 
| 1052 
e997862a57d8
add temporary implementations for string to number and first test cases
 Mike Becker <universe@uap-core.de> parents: 
1050diff
changeset | 935 | assert(sizeof(unsigned long long) == sizeof(uint64_t)); // should be true on all platforms | 
| 
e997862a57d8
add temporary implementations for string to number and first test cases
 Mike Becker <universe@uap-core.de> parents: 
1050diff
changeset | 936 | return cx_strtoull_lc(str, (unsigned long long*) output, base, groupsep); | 
| 1048 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 937 | } | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 938 | |
| 1162 
e3bb67b72d33
remove dependency to ssize_t - fixes #552
 Mike Becker <universe@uap-core.de> parents: 
1161diff
changeset | 939 | int cx_strtoz_lc_(cxstring str, size_t *output, int base, const char *groupsep) { | 
| 1052 
e997862a57d8
add temporary implementations for string to number and first test cases
 Mike Becker <universe@uap-core.de> parents: 
1050diff
changeset | 940 | #if SIZE_MAX == UINT32_MAX | 
| 1134 
60edcd57d54c
fix that some IDEs cannot resolve documentation
 Mike Becker <universe@uap-core.de> parents: 
1132diff
changeset | 941 | return cx_strtou32_lc_(str, (uint32_t*) output, base, groupsep); | 
| 1052 
e997862a57d8
add temporary implementations for string to number and first test cases
 Mike Becker <universe@uap-core.de> parents: 
1050diff
changeset | 942 | #elif SIZE_MAX == UINT64_MAX | 
| 1134 
60edcd57d54c
fix that some IDEs cannot resolve documentation
 Mike Becker <universe@uap-core.de> parents: 
1132diff
changeset | 943 | return cx_strtoull_lc_(str, (unsigned long long *) output, base, groupsep); | 
| 1048 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 944 | #else | 
| 1052 
e997862a57d8
add temporary implementations for string to number and first test cases
 Mike Becker <universe@uap-core.de> parents: 
1050diff
changeset | 945 | #error "unsupported size_t size" | 
| 1048 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 946 | #endif | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 947 | } | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 948 | |
| 1134 
60edcd57d54c
fix that some IDEs cannot resolve documentation
 Mike Becker <universe@uap-core.de> parents: 
1132diff
changeset | 949 | int cx_strtof_lc_(cxstring str, float *output, char decsep, const char *groupsep) { | 
| 1063 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 950 | // use string to double and add a range check | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 951 | double d; | 
| 1134 
60edcd57d54c
fix that some IDEs cannot resolve documentation
 Mike Becker <universe@uap-core.de> parents: 
1132diff
changeset | 952 | int ret = cx_strtod_lc_(str, &d, decsep, groupsep); | 
| 1063 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 953 | if (ret != 0) return ret; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 954 | // note: FLT_MIN is the smallest POSITIVE number that can be represented | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 955 | double test = d < 0 ? -d : d; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 956 | if (test < FLT_MIN || test > FLT_MAX) { | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 957 | errno = ERANGE; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 958 | return -1; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 959 | } | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 960 | *output = (float) d; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 961 | return 0; | 
| 1048 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 962 | } | 
| 
12f38affefd5
implement all string to number conversions that are just wrappers
 Mike Becker <universe@uap-core.de> parents: 
1041diff
changeset | 963 | |
| 1134 
60edcd57d54c
fix that some IDEs cannot resolve documentation
 Mike Becker <universe@uap-core.de> parents: 
1132diff
changeset | 964 | int cx_strtod_lc_(cxstring str, double *output, char decsep, const char *groupsep) { | 
| 1063 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 965 | // TODO: overflow check | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 966 | // TODO: increase precision | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 967 | |
| 1155 
b77d56a27e9c
do not trim strings before conversion to number
 Mike Becker <universe@uap-core.de> parents: 
1137diff
changeset | 968 | // emptiness check | 
| 1063 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 969 | if (str.length == 0) { | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 970 | errno = EINVAL; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 971 | return -1; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 972 | } | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 973 | |
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 974 | double result = 0.; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 975 | int sign = 1; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 976 | |
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 977 | // check if there is a sign | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 978 | if (str.ptr[0] == '-') { | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 979 | sign = -1; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 980 | str.ptr++; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 981 | str.length--; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 982 | } else if (str.ptr[0] == '+') { | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 983 | str.ptr++; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 984 | str.length--; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 985 | } | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 986 | |
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 987 | // there must be at least one char to parse | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 988 | if (str.length == 0) { | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 989 | errno = EINVAL; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 990 | return -1; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 991 | } | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 992 | |
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 993 | // parse all digits until we find the decsep | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 994 | size_t pos = 0; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 995 | do { | 
| 1415 
40074e643663
go back to ctype.h, but this time try to avoid crashes in Microsoft's implementation
 Mike Becker <universe@uap-core.de> parents: 
1413diff
changeset | 996 | if (isdigit((unsigned char)str.ptr[pos])) { | 
| 1063 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 997 | result = result * 10 + (str.ptr[pos] - '0'); | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 998 | } else if (strchr(groupsep, str.ptr[pos]) == NULL) { | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 999 | break; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1000 | } | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1001 | } while (++pos < str.length); | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1002 | |
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1003 | // already done? | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1004 | if (pos == str.length) { | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1005 | *output = result * sign; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1006 | return 0; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1007 | } | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1008 | |
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1009 | // is the next char the decsep? | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1010 | if (str.ptr[pos] == decsep) { | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1011 | pos++; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1012 | // it may end with the decsep, if it did not start with it | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1013 | if (pos == str.length) { | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1014 | if (str.length == 1) { | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1015 | errno = EINVAL; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1016 | return -1; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1017 | } else { | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1018 | *output = result * sign; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1019 | return 0; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1020 | } | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1021 | } | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1022 | // parse everything until exponent or end | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1023 | double factor = 1.; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1024 | do { | 
| 1415 
40074e643663
go back to ctype.h, but this time try to avoid crashes in Microsoft's implementation
 Mike Becker <universe@uap-core.de> parents: 
1413diff
changeset | 1025 | if (isdigit((unsigned char)str.ptr[pos])) { | 
| 1063 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1026 | factor *= 0.1; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1027 | result = result + factor * (str.ptr[pos] - '0'); | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1028 | } else if (strchr(groupsep, str.ptr[pos]) == NULL) { | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1029 | break; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1030 | } | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1031 | } while (++pos < str.length); | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1032 | } | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1033 | |
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1034 | // no exponent? | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1035 | if (pos == str.length) { | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1036 | *output = result * sign; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1037 | return 0; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1038 | } | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1039 | |
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1040 | // now the next separator MUST be the exponent separator | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1041 | // and at least one char must follow | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1042 | if ((str.ptr[pos] | 32) != 'e' || str.length <= pos + 1) { | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1043 | errno = EINVAL; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1044 | return -1; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1045 | } | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1046 | pos++; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1047 | |
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1048 | // check if we have a sign for the exponent | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1049 | double factor = 10.; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1050 | if (str.ptr[pos] == '-') { | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1051 | factor = .1; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1052 | pos++; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1053 | } else if (str.ptr[pos] == '+') { | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1054 | pos++; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1055 | } | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1056 | |
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1057 | // at least one digit must follow | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1058 | if (pos == str.length) { | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1059 | errno = EINVAL; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1060 | return -1; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1061 | } | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1062 | |
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1063 | // parse the exponent | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1064 | unsigned int exp = 0; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1065 | do { | 
| 1415 
40074e643663
go back to ctype.h, but this time try to avoid crashes in Microsoft's implementation
 Mike Becker <universe@uap-core.de> parents: 
1413diff
changeset | 1066 | if (isdigit((unsigned char)str.ptr[pos])) { | 
| 1063 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1067 | exp = 10 * exp + (str.ptr[pos] - '0'); | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1068 | } else if (strchr(groupsep, str.ptr[pos]) == NULL) { | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1069 | errno = EINVAL; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1070 | return -1; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1071 | } | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1072 | } while (++pos < str.length); | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1073 | |
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1074 | // apply the exponent by fast exponentiation | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1075 | do { | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1076 | if (exp & 1) { | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1077 | result *= factor; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1078 | } | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1079 | factor *= factor; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1080 | } while ((exp >>= 1) > 0); | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1081 | |
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1082 | // store the result and exit | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1083 | *output = result * sign; | 
| 
e453e717876e
implement floating point string to number conversions
 Mike Becker <universe@uap-core.de> parents: 
1061diff
changeset | 1084 | return 0; | 
| 1074 | 1085 | } |