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