src/string.c

Wed, 01 Jan 2025 15:26:50 +0100

author
Mike Becker <universe@uap-core.de>
date
Wed, 01 Jan 2025 15:26:50 +0100
changeset 1071
028cb6d22197
parent 1063
e453e717876e
child 1073
13c8a92625d4
permissions
-rw-r--r--

fix cx_strcmp() and cx_strcasecmp() - fixes #546

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 */
1048
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
28 #define CX_STR_IMPLEMENTATION
576
ba0c4ff6698e first proposal for the string header
Mike Becker <universe@uap-core.de>
parents:
diff changeset
29 #include "cx/string.h"
579
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
30
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
31 #include <string.h>
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
32 #include <stdarg.h>
581
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
33 #include <ctype.h>
1048
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
34 #include <assert.h>
1041
508dc8b32a17 fix missing errno.h include
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
35 #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
36 #include <limits.h>
1063
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
37 #include <float.h>
581
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
38
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
39 #ifndef _WIN32
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
40
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 593
diff changeset
41 #include <strings.h> // for strncasecmp()
581
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
42
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 593
diff changeset
43 #endif // _WIN32
579
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
44
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
45 cxmutstr cx_mutstr(char *cstring) {
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
46 return (cxmutstr) {cstring, strlen(cstring)};
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
47 }
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_mutstrn(
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
50 char *cstring,
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
51 size_t length
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 return (cxmutstr) {cstring, length};
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
54 }
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
55
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
56 cxstring cx_str(const char *cstring) {
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
57 return (cxstring) {cstring, strlen(cstring)};
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_strn(
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
61 const char *cstring,
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
62 size_t length
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 return (cxstring) {cstring, length};
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
65 }
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
66
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
67 void cx_strfree(cxmutstr *str) {
985
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 962
diff changeset
68 if (str == NULL) return;
579
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
69 free(str->ptr);
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
70 str->ptr = NULL;
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
71 str->length = 0;
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
72 }
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
73
583
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
74 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
75 const CxAllocator *alloc,
583
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
76 cxmutstr *str
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
77 ) {
985
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 962
diff changeset
78 if (str == NULL) return;
583
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
79 cxFree(alloc, str->ptr);
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
80 str->ptr = NULL;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
81 str->length = 0;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
82 }
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
83
579
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
84 size_t cx_strlen(
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
85 size_t count,
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
86 ...
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
87 ) {
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
88 if (count == 0) return 0;
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
89
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
90 va_list ap;
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
91 va_start(ap, count);
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
92 size_t size = 0;
962
cd418898af5c remove cx_for_n() macro - fixes #467
Mike Becker <universe@uap-core.de>
parents: 926
diff changeset
93 for (size_t i = 0; i < count; i++) {
579
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
94 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
95 if (size > SIZE_MAX - str.length) errno = EOVERFLOW;
579
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
96 size += str.length;
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
97 }
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
98 va_end(ap);
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
99
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
100 return size;
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
101 }
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
102
697
ebdce4bf262b add cx_strcat_m() and cx_strcat_ma() for in-place concatenation
Mike Becker <universe@uap-core.de>
parents: 693
diff changeset
103 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
104 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
105 cxmutstr str,
579
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
106 size_t count,
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 ) {
697
ebdce4bf262b add cx_strcat_m() and cx_strcat_ma() for in-place concatenation
Mike Becker <universe@uap-core.de>
parents: 693
diff changeset
109 if (count == 0) return str;
ebdce4bf262b add cx_strcat_m() and cx_strcat_ma() for in-place concatenation
Mike Becker <universe@uap-core.de>
parents: 693
diff changeset
110
1001
5c9ec5a0a4ef change cx_strcat variants to allow handling of ENOMEM
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
111 cxstring strings_stack[8];
5c9ec5a0a4ef change cx_strcat variants to allow handling of ENOMEM
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
112 cxstring *strings;
5c9ec5a0a4ef change cx_strcat variants to allow handling of ENOMEM
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
113 if (count > 8) {
5c9ec5a0a4ef change cx_strcat variants to allow handling of ENOMEM
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
114 strings = calloc(count, sizeof(cxstring));
5c9ec5a0a4ef change cx_strcat variants to allow handling of ENOMEM
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
115 if (strings == NULL) {
5c9ec5a0a4ef change cx_strcat variants to allow handling of ENOMEM
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
116 return (cxmutstr) {NULL, 0};
5c9ec5a0a4ef change cx_strcat variants to allow handling of ENOMEM
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
117 }
5c9ec5a0a4ef change cx_strcat variants to allow handling of ENOMEM
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
118 } else {
5c9ec5a0a4ef change cx_strcat variants to allow handling of ENOMEM
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
119 strings = strings_stack;
5c9ec5a0a4ef change cx_strcat variants to allow handling of ENOMEM
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
120 }
579
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 va_list ap;
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
123 va_start(ap, count);
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
124
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
125 // get all args and 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
126 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
127 size_t slen = str.length;
962
cd418898af5c remove cx_for_n() macro - fixes #467
Mike Becker <universe@uap-core.de>
parents: 926
diff changeset
128 for (size_t i = 0; i < count; i++) {
579
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
129 cxstring s = va_arg (ap, cxstring);
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
130 strings[i] = s;
1040
1ecf4dbbc60c add some more overflow treatment and make sure to set errno properly
Mike Becker <universe@uap-core.de>
parents: 1001
diff changeset
131 if (slen > SIZE_MAX - str.length) overflow = true;
579
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
132 slen += s.length;
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
133 }
697
ebdce4bf262b add cx_strcat_m() and cx_strcat_ma() for in-place concatenation
Mike Becker <universe@uap-core.de>
parents: 693
diff changeset
134 va_end(ap);
579
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
135
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 // 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
137 if (overflow) {
1ecf4dbbc60c add some more overflow treatment and make sure to set errno properly
Mike Becker <universe@uap-core.de>
parents: 1001
diff changeset
138 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
139 if (strings != strings_stack) {
1ecf4dbbc60c add some more overflow treatment and make sure to set errno properly
Mike Becker <universe@uap-core.de>
parents: 1001
diff changeset
140 free(strings);
1ecf4dbbc60c add some more overflow treatment and make sure to set errno properly
Mike Becker <universe@uap-core.de>
parents: 1001
diff changeset
141 }
1ecf4dbbc60c add some more overflow treatment and make sure to set errno properly
Mike Becker <universe@uap-core.de>
parents: 1001
diff changeset
142 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
143 }
1ecf4dbbc60c add some more overflow treatment and make sure to set errno properly
Mike Becker <universe@uap-core.de>
parents: 1001
diff changeset
144
697
ebdce4bf262b add cx_strcat_m() and cx_strcat_ma() for in-place concatenation
Mike Becker <universe@uap-core.de>
parents: 693
diff changeset
145 // 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
146 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
147 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
148 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
149 } else {
1001
5c9ec5a0a4ef change cx_strcat variants to allow handling of ENOMEM
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
150 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
151 }
1001
5c9ec5a0a4ef change cx_strcat variants to allow handling of ENOMEM
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
152 if (newstr == NULL) {
1040
1ecf4dbbc60c add some more overflow treatment and make sure to set errno properly
Mike Becker <universe@uap-core.de>
parents: 1001
diff changeset
153 if (strings != strings_stack) {
1ecf4dbbc60c add some more overflow treatment and make sure to set errno properly
Mike Becker <universe@uap-core.de>
parents: 1001
diff changeset
154 free(strings);
1ecf4dbbc60c add some more overflow treatment and make sure to set errno properly
Mike Becker <universe@uap-core.de>
parents: 1001
diff changeset
155 }
1001
5c9ec5a0a4ef change cx_strcat variants to allow handling of ENOMEM
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
156 return (cxmutstr) {NULL, 0};
5c9ec5a0a4ef change cx_strcat variants to allow handling of ENOMEM
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
157 }
5c9ec5a0a4ef change cx_strcat variants to allow handling of ENOMEM
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
158 str.ptr = newstr;
579
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
159
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
160 // 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
161 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
162 str.length = slen;
962
cd418898af5c remove cx_for_n() macro - fixes #467
Mike Becker <universe@uap-core.de>
parents: 926
diff changeset
163 for (size_t i = 0; i < count; i++) {
579
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
164 cxstring s = strings[i];
697
ebdce4bf262b add cx_strcat_m() and cx_strcat_ma() for in-place concatenation
Mike Becker <universe@uap-core.de>
parents: 693
diff changeset
165 memcpy(str.ptr + pos, s.ptr, s.length);
579
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
166 pos += s.length;
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
167 }
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
168
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
169 // 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
170 str.ptr[str.length] = '\0';
579
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
171
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
172 // free temporary array
1001
5c9ec5a0a4ef change cx_strcat variants to allow handling of ENOMEM
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
173 if (strings != strings_stack) {
5c9ec5a0a4ef change cx_strcat variants to allow handling of ENOMEM
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
174 free(strings);
5c9ec5a0a4ef change cx_strcat variants to allow handling of ENOMEM
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
175 }
579
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
176
697
ebdce4bf262b add cx_strcat_m() and cx_strcat_ma() for in-place concatenation
Mike Becker <universe@uap-core.de>
parents: 693
diff changeset
177 return str;
579
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
178 }
bbc46dcd5255 start implementing string functions
Mike Becker <universe@uap-core.de>
parents: 576
diff changeset
179
580
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
180 cxstring cx_strsubs(
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
181 cxstring string,
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
182 size_t start
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
183 ) {
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
184 return cx_strsubsl(string, start, string.length - start);
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
185 }
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 cxmutstr cx_strsubs_m(
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
188 cxmutstr string,
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
189 size_t start
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
190 ) {
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
191 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
192 }
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 cxstring cx_strsubsl(
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
195 cxstring string,
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
196 size_t start,
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
197 size_t length
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
198 ) {
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
199 if (start > string.length) {
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
200 return (cxstring) {NULL, 0};
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
201 }
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 size_t rem_len = string.length - start;
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
204 if (length > rem_len) {
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
205 length = rem_len;
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
206 }
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 return (cxstring) {string.ptr + start, length};
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
209 }
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 cxmutstr cx_strsubsl_m(
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
212 cxmutstr string,
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
213 size_t start,
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
214 size_t length
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
215 ) {
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
216 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
217 return (cxmutstr) {(char *) result.ptr, result.length};
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
218 }
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 cxstring cx_strchr(
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
221 cxstring string,
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
222 int chr
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
223 ) {
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
224 chr = 0xFF & chr;
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
225 // TODO: improve by comparing multiple bytes at once
962
cd418898af5c remove cx_for_n() macro - fixes #467
Mike Becker <universe@uap-core.de>
parents: 926
diff changeset
226 for (size_t i = 0; i < string.length; i++) {
580
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
227 if (string.ptr[i] == chr) {
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
228 return cx_strsubs(string, i);
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 }
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
231 return (cxstring) {NULL, 0};
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
232 }
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 cxmutstr cx_strchr_m(
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
235 cxmutstr string,
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
236 int chr
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 result = cx_strchr(cx_strcast(string), chr);
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
239 return (cxmutstr) {(char *) result.ptr, result.length};
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
240 }
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
241
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
242 cxstring cx_strrchr(
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
243 cxstring string,
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
244 int chr
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
245 ) {
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
246 chr = 0xFF & chr;
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
247 size_t i = string.length;
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
248 while (i > 0) {
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
249 i--;
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
250 // TODO: improve by comparing multiple bytes at once
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
251 if (string.ptr[i] == chr) {
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
252 return cx_strsubs(string, i);
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
253 }
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 return (cxstring) {NULL, 0};
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
256 }
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
257
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
258 cxmutstr cx_strrchr_m(
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
259 cxmutstr string,
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
260 int chr
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
261 ) {
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
262 cxstring result = cx_strrchr(cx_strcast(string), chr);
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
263 return (cxmutstr) {(char *) result.ptr, result.length};
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
264 }
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
265
643
5700ba9154ab #228 make buffer sizes adjustable at compile time
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
266 #ifndef CX_STRSTR_SBO_SIZE
5700ba9154ab #228 make buffer sizes adjustable at compile time
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
267 #define CX_STRSTR_SBO_SIZE 512
5700ba9154ab #228 make buffer sizes adjustable at compile time
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
268 #endif
926
8fdd8d78c14b fix several survivors of east-const and some missing consts
Mike Becker <universe@uap-core.de>
parents: 890
diff changeset
269 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
270
580
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
271 cxstring cx_strstr(
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
272 cxstring haystack,
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
273 cxstring needle
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
274 ) {
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
275 if (needle.length == 0) {
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
276 return haystack;
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
277 }
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
278
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 593
diff changeset
279 // optimize for single-char needles
583
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
280 if (needle.length == 1) {
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
281 return cx_strchr(haystack, *needle.ptr);
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
282 }
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
283
580
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
284 /*
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
285 * IMPORTANT:
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
286 * 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
287 * 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
288 * 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
289 * and we want to avoid that.
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
290 */
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
291
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 593
diff changeset
292 // local prefix table
643
5700ba9154ab #228 make buffer sizes adjustable at compile time
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
293 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
294
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 593
diff changeset
295 // 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
296 // if the pattern exceeds static prefix table, allocate on the heap
643
5700ba9154ab #228 make buffer sizes adjustable at compile time
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
297 bool useheap = needle.length >= CX_STRSTR_SBO_SIZE;
591
7df0bcaecffa fix over-optimization of strstr
Mike Becker <universe@uap-core.de>
parents: 590
diff changeset
298 register size_t *ptable = useheap ? calloc(needle.length + 1,
7df0bcaecffa fix over-optimization of strstr
Mike Becker <universe@uap-core.de>
parents: 590
diff changeset
299 sizeof(size_t)) : s_prefix_table;
580
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
300
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 593
diff changeset
301 // keep counter in registers
580
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
302 register size_t i, j;
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 // fill prefix table
580
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
305 i = 0;
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
306 j = 0;
591
7df0bcaecffa fix over-optimization of strstr
Mike Becker <universe@uap-core.de>
parents: 590
diff changeset
307 ptable[i] = j;
580
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
308 while (i < needle.length) {
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
309 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
310 j = ptable[j - 1];
580
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
311 }
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
312 i++;
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
313 j++;
591
7df0bcaecffa fix over-optimization of strstr
Mike Becker <universe@uap-core.de>
parents: 590
diff changeset
314 ptable[i] = j;
580
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
315 }
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
316
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 593
diff changeset
317 // search
580
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
318 cxstring result = {NULL, 0};
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
319 i = 0;
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
320 j = 1;
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
321 while (i < haystack.length) {
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
322 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
323 j = ptable[j - 1];
580
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
324 }
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
325 i++;
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
326 j++;
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
327 if (j - 1 == needle.length) {
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
328 size_t start = i - needle.length;
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
329 result.ptr = haystack.ptr + start;
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
330 result.length = haystack.length - start;
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
331 break;
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
332 }
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
333 }
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
334
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 593
diff changeset
335 // if prefix table was allocated on the heap, free it
580
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
336 if (ptable != s_prefix_table) {
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
337 free(ptable);
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
338 }
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
339
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
340 return result;
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 cxmutstr cx_strstr_m(
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
344 cxmutstr haystack,
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
345 cxstring needle
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
346 ) {
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
347 cxstring result = cx_strstr(cx_strcast(haystack), needle);
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
348 return (cxmutstr) {(char *) result.ptr, result.length};
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
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
351 size_t cx_strsplit(
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
352 cxstring string,
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
353 cxstring delim,
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
354 size_t limit,
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
355 cxstring *output
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
356 ) {
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 593
diff changeset
357 // 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
358 if (limit == 0) return 0;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
359
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 593
diff changeset
360 // special case: delimiter is empty
583
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
361 if (delim.length == 0) {
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
362 output[0] = string;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
363 return 1;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
364 }
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
365
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 593
diff changeset
366 // 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
367 if (delim.length >= string.length) {
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 593
diff changeset
368 // exact match
583
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
369 if (cx_strcmp(string, delim) == 0) {
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
370 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
371 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
372 return 2;
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 593
diff changeset
373 } else {
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 593
diff changeset
374 // no match possible
583
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
375 output[0] = string;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
376 return 1;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
377 }
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
378 }
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
379
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
380 size_t n = 0;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
381 cxstring curpos = string;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
382 while (1) {
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
383 ++n;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
384 cxstring match = cx_strstr(curpos, delim);
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
385 if (match.length > 0) {
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 593
diff changeset
386 // is the limit reached?
583
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
387 if (n < limit) {
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 593
diff changeset
388 // 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
389 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
390 output[n - 1] = item;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
391 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
392 curpos.ptr += processed;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
393 curpos.length -= processed;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
394 } else {
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 593
diff changeset
395 // 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
396 output[n - 1] = curpos;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
397 break;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
398 }
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
399 } else {
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 593
diff changeset
400 // 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
401 output[n - 1] = curpos;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
402 break;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
403 }
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
404 }
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
405
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
406 return n;
580
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
407 }
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
408
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
409 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
410 const CxAllocator *allocator,
580
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
411 cxstring string,
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
412 cxstring delim,
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
413 size_t limit,
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
414 cxstring **output
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
415 ) {
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 593
diff changeset
416 // 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
417 size_t n = 0;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
418 cxstring curpos = string;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
419 while (1) {
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
420 ++n;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
421 cxstring match = cx_strstr(curpos, delim);
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
422 if (match.length > 0) {
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 593
diff changeset
423 // is the limit reached?
583
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
424 if (n < limit) {
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
425 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
426 curpos.ptr += processed;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
427 curpos.length -= processed;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
428 } else {
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 593
diff changeset
429 // limit reached
583
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
430 break;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
431 }
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
432 } else {
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 593
diff changeset
433 // no more matches
583
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
434 break;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
435 }
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
436 }
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
437 *output = cxCalloc(allocator, n, sizeof(cxstring));
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
438 return cx_strsplit(string, delim, n, *output);
580
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
439 }
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
440
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
441 size_t cx_strsplit_m(
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
442 cxmutstr string,
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
443 cxstring delim,
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
444 size_t limit,
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
445 cxmutstr *output
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
446 ) {
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
447 return cx_strsplit(cx_strcast(string),
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
448 delim, limit, (cxstring *) 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
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
451 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
452 const CxAllocator *allocator,
580
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
453 cxmutstr string,
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
454 cxstring delim,
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
455 size_t limit,
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
456 cxmutstr **output
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
457 ) {
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
458 return cx_strsplit_a(allocator, cx_strcast(string),
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
459 delim, limit, (cxstring **) output);
aac47db8da0b more implementations of string functions
Mike Becker <universe@uap-core.de>
parents: 579
diff changeset
460 }
581
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
461
583
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
462 int cx_strcmp(
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
463 cxstring s1,
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
464 cxstring s2
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
465 ) {
1071
028cb6d22197 fix cx_strcmp() and cx_strcasecmp() - fixes #546
Mike Becker <universe@uap-core.de>
parents: 1063
diff changeset
466 int r = strncmp(s1.ptr, s2.ptr, s1.length);
028cb6d22197 fix cx_strcmp() and cx_strcasecmp() - fixes #546
Mike Becker <universe@uap-core.de>
parents: 1063
diff changeset
467 if (r != 0) return r;
581
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
468 if (s1.length == s2.length) {
1071
028cb6d22197 fix cx_strcmp() and cx_strcasecmp() - fixes #546
Mike Becker <universe@uap-core.de>
parents: 1063
diff changeset
469 return 0;
581
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
470 } else if (s1.length > s2.length) {
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
471 return 1;
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
472 } else {
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
473 return -1;
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
474 }
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
475 }
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
476
583
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
477 int cx_strcasecmp(
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
478 cxstring s1,
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
479 cxstring s2
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
480 ) {
1071
028cb6d22197 fix cx_strcmp() and cx_strcasecmp() - fixes #546
Mike Becker <universe@uap-core.de>
parents: 1063
diff changeset
481 #ifdef _WIN32
028cb6d22197 fix cx_strcmp() and cx_strcasecmp() - fixes #546
Mike Becker <universe@uap-core.de>
parents: 1063
diff changeset
482 int r = _strnicmp(s1.ptr, s2.ptr, s1.length);
028cb6d22197 fix cx_strcmp() and cx_strcasecmp() - fixes #546
Mike Becker <universe@uap-core.de>
parents: 1063
diff changeset
483 #else
028cb6d22197 fix cx_strcmp() and cx_strcasecmp() - fixes #546
Mike Becker <universe@uap-core.de>
parents: 1063
diff changeset
484 int r = strncasecmp(s1.ptr, s2.ptr, s1.length);
028cb6d22197 fix cx_strcmp() and cx_strcasecmp() - fixes #546
Mike Becker <universe@uap-core.de>
parents: 1063
diff changeset
485 #endif
028cb6d22197 fix cx_strcmp() and cx_strcasecmp() - fixes #546
Mike Becker <universe@uap-core.de>
parents: 1063
diff changeset
486 if (r != 0) return r;
581
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
487 if (s1.length == s2.length) {
1071
028cb6d22197 fix cx_strcmp() and cx_strcasecmp() - fixes #546
Mike Becker <universe@uap-core.de>
parents: 1063
diff changeset
488 return 0;
581
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
489 } else if (s1.length > s2.length) {
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
490 return 1;
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
491 } else {
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
492 return -1;
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
493 }
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
494 }
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
495
657
3eeadf666d6b add CxListComparator compatible string compare functions
Mike Becker <universe@uap-core.de>
parents: 645
diff changeset
496 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
497 const void *s1,
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 806
diff changeset
498 const void *s2
657
3eeadf666d6b add CxListComparator compatible string compare functions
Mike Becker <universe@uap-core.de>
parents: 645
diff changeset
499 ) {
890
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 806
diff changeset
500 const cxstring *left = s1;
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 806
diff changeset
501 const cxstring *right = s2;
657
3eeadf666d6b add CxListComparator compatible string compare functions
Mike Becker <universe@uap-core.de>
parents: 645
diff changeset
502 return cx_strcmp(*left, *right);
3eeadf666d6b add CxListComparator compatible string compare functions
Mike Becker <universe@uap-core.de>
parents: 645
diff changeset
503 }
3eeadf666d6b add CxListComparator compatible string compare functions
Mike Becker <universe@uap-core.de>
parents: 645
diff changeset
504
3eeadf666d6b add CxListComparator compatible string compare functions
Mike Becker <universe@uap-core.de>
parents: 645
diff changeset
505 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
506 const void *s1,
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 806
diff changeset
507 const void *s2
657
3eeadf666d6b add CxListComparator compatible string compare functions
Mike Becker <universe@uap-core.de>
parents: 645
diff changeset
508 ) {
890
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 806
diff changeset
509 const cxstring *left = s1;
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 806
diff changeset
510 const cxstring *right = s2;
657
3eeadf666d6b add CxListComparator compatible string compare functions
Mike Becker <universe@uap-core.de>
parents: 645
diff changeset
511 return cx_strcasecmp(*left, *right);
3eeadf666d6b add CxListComparator compatible string compare functions
Mike Becker <universe@uap-core.de>
parents: 645
diff changeset
512 }
3eeadf666d6b add CxListComparator compatible string compare functions
Mike Becker <universe@uap-core.de>
parents: 645
diff changeset
513
583
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
514 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
515 const CxAllocator *allocator,
583
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
516 cxstring string
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
517 ) {
581
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
518 cxmutstr result = {
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
519 cxMalloc(allocator, string.length + 1),
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
520 string.length
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
521 };
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
522 if (result.ptr == NULL) {
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
523 result.length = 0;
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
524 return result;
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
525 }
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
526 memcpy(result.ptr, string.ptr, string.length);
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
527 result.ptr[string.length] = '\0';
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
528 return result;
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
529 }
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
530
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
531 cxstring cx_strtrim(cxstring string) {
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
532 cxstring result = string;
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
533 // TODO: optimize by comparing multiple bytes at once
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
534 while (result.length > 0 && isspace(*result.ptr)) {
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
535 result.ptr++;
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
536 result.length--;
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
537 }
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
538 while (result.length > 0 && isspace(result.ptr[result.length - 1])) {
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
539 result.length--;
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
540 }
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
541 return result;
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
542 }
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
543
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
544 cxmutstr cx_strtrim_m(cxmutstr string) {
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
545 cxstring result = cx_strtrim(cx_strcast(string));
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
546 return (cxmutstr) {(char *) result.ptr, result.length};
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
547 }
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
548
583
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
549 bool cx_strprefix(
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
550 cxstring string,
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
551 cxstring prefix
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
552 ) {
581
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
553 if (string.length < prefix.length) return false;
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
554 return memcmp(string.ptr, prefix.ptr, prefix.length) == 0;
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_strsuffix(
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 suffix
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 < suffix.length) return false;
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
562 return memcmp(string.ptr + string.length - suffix.length,
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
563 suffix.ptr, suffix.length) == 0;
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
564 }
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
565
583
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
566 bool cx_strcaseprefix(
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
567 cxstring string,
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
568 cxstring prefix
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
569 ) {
581
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
570 if (string.length < prefix.length) return false;
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
571 #ifdef _WIN32
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
572 return _strnicmp(string.ptr, prefix.ptr, prefix.length) == 0;
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
573 #else
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
574 return strncasecmp(string.ptr, prefix.ptr, prefix.length) == 0;
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
575 #endif
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
576 }
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
577
583
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
578 bool cx_strcasesuffix(
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
579 cxstring string,
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
580 cxstring suffix
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
581 ) {
581
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
582 if (string.length < suffix.length) return false;
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
583 #ifdef _WIN32
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
584 return _strnicmp(string.ptr+string.length-suffix.length,
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
585 suffix.ptr, suffix.length) == 0;
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
586 #else
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
587 return strncasecmp(string.ptr + string.length - suffix.length,
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
588 suffix.ptr, suffix.length) == 0;
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
589 #endif
c067394737ca implement more string functions
Mike Becker <universe@uap-core.de>
parents: 580
diff changeset
590 }
582
96fa7fa6af4f implement strupper and strlower
Mike Becker <universe@uap-core.de>
parents: 581
diff changeset
591
96fa7fa6af4f implement strupper and strlower
Mike Becker <universe@uap-core.de>
parents: 581
diff changeset
592 void cx_strlower(cxmutstr string) {
962
cd418898af5c remove cx_for_n() macro - fixes #467
Mike Becker <universe@uap-core.de>
parents: 926
diff changeset
593 for (size_t i = 0; i < string.length; i++) {
593
ea9b41b5ebbc explicitly cast int to char
Mike Becker <universe@uap-core.de>
parents: 591
diff changeset
594 string.ptr[i] = (char) tolower(string.ptr[i]);
582
96fa7fa6af4f implement strupper and strlower
Mike Becker <universe@uap-core.de>
parents: 581
diff changeset
595 }
96fa7fa6af4f implement strupper and strlower
Mike Becker <universe@uap-core.de>
parents: 581
diff changeset
596 }
96fa7fa6af4f implement strupper and strlower
Mike Becker <universe@uap-core.de>
parents: 581
diff changeset
597
96fa7fa6af4f implement strupper and strlower
Mike Becker <universe@uap-core.de>
parents: 581
diff changeset
598 void cx_strupper(cxmutstr string) {
962
cd418898af5c remove cx_for_n() macro - fixes #467
Mike Becker <universe@uap-core.de>
parents: 926
diff changeset
599 for (size_t i = 0; i < string.length; i++) {
593
ea9b41b5ebbc explicitly cast int to char
Mike Becker <universe@uap-core.de>
parents: 591
diff changeset
600 string.ptr[i] = (char) toupper(string.ptr[i]);
582
96fa7fa6af4f implement strupper and strlower
Mike Becker <universe@uap-core.de>
parents: 581
diff changeset
601 }
96fa7fa6af4f implement strupper and strlower
Mike Becker <universe@uap-core.de>
parents: 581
diff changeset
602 }
583
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
603
643
5700ba9154ab #228 make buffer sizes adjustable at compile time
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
604 #ifndef CX_STRREPLACE_INDEX_BUFFER_SIZE
5700ba9154ab #228 make buffer sizes adjustable at compile time
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
605 #define CX_STRREPLACE_INDEX_BUFFER_SIZE 64
5700ba9154ab #228 make buffer sizes adjustable at compile time
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
606 #endif
583
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
607
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
608 struct cx_strreplace_ibuf {
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
609 size_t *buf;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
610 struct cx_strreplace_ibuf *next;
590
02a56701a5cb fix missing zero-termination in strreplace
Mike Becker <universe@uap-core.de>
parents: 583
diff changeset
611 unsigned int len;
583
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
612 };
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
613
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
614 static void cx_strrepl_free_ibuf(struct cx_strreplace_ibuf *buf) {
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
615 while (buf) {
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
616 struct cx_strreplace_ibuf *next = buf->next;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
617 free(buf->buf);
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
618 free(buf);
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
619 buf = next;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
620 }
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
621 }
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
622
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
623 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
624 const CxAllocator *allocator,
583
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
625 cxstring str,
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
626 cxstring pattern,
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
627 cxstring replacement,
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
628 size_t replmax
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
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
631 if (pattern.length == 0 || pattern.length > str.length || replmax == 0)
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
632 return cx_strdup_a(allocator, str);
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
633
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 593
diff changeset
634 // Compute expected buffer length
583
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
635 size_t ibufmax = str.length / pattern.length;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
636 size_t ibuflen = replmax < ibufmax ? replmax : ibufmax;
643
5700ba9154ab #228 make buffer sizes adjustable at compile time
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
637 if (ibuflen > CX_STRREPLACE_INDEX_BUFFER_SIZE) {
5700ba9154ab #228 make buffer sizes adjustable at compile time
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
638 ibuflen = CX_STRREPLACE_INDEX_BUFFER_SIZE;
583
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
639 }
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
640
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 593
diff changeset
641 // Allocate first index buffer
583
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
642 struct cx_strreplace_ibuf *firstbuf, *curbuf;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
643 firstbuf = curbuf = calloc(1, sizeof(struct cx_strreplace_ibuf));
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
644 if (!firstbuf) return cx_mutstrn(NULL, 0);
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
645 firstbuf->buf = calloc(ibuflen, sizeof(size_t));
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
646 if (!firstbuf->buf) {
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
647 free(firstbuf);
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
648 return cx_mutstrn(NULL, 0);
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
649 }
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
650
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 593
diff changeset
651 // Search occurrences
583
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
652 cxstring searchstr = str;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
653 size_t found = 0;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
654 do {
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
655 cxstring match = cx_strstr(searchstr, pattern);
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
656 if (match.length > 0) {
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 593
diff changeset
657 // Allocate next buffer in chain, if required
583
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
658 if (curbuf->len == ibuflen) {
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
659 struct cx_strreplace_ibuf *nextbuf =
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
660 calloc(1, sizeof(struct cx_strreplace_ibuf));
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
661 if (!nextbuf) {
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
662 cx_strrepl_free_ibuf(firstbuf);
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
663 return cx_mutstrn(NULL, 0);
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
664 }
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
665 nextbuf->buf = calloc(ibuflen, sizeof(size_t));
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
666 if (!nextbuf->buf) {
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
667 free(nextbuf);
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
668 cx_strrepl_free_ibuf(firstbuf);
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
669 return cx_mutstrn(NULL, 0);
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
670 }
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
671 curbuf->next = nextbuf;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
672 curbuf = nextbuf;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
673 }
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
674
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 593
diff changeset
675 // Record match index
583
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
676 found++;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
677 size_t idx = match.ptr - str.ptr;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
678 curbuf->buf[curbuf->len++] = idx;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
679 searchstr.ptr = match.ptr + pattern.length;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
680 searchstr.length = str.length - idx - pattern.length;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
681 } else {
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
682 break;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
683 }
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
684 } while (searchstr.length > 0 && found < replmax);
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
685
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 593
diff changeset
686 // Allocate result string
583
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
687 cxmutstr result;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
688 {
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
689 ssize_t adjlen = (ssize_t) replacement.length - (ssize_t) pattern.length;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
690 size_t rcount = 0;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
691 curbuf = firstbuf;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
692 do {
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
693 rcount += curbuf->len;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
694 curbuf = curbuf->next;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
695 } while (curbuf);
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
696 result.length = str.length + rcount * adjlen;
590
02a56701a5cb fix missing zero-termination in strreplace
Mike Becker <universe@uap-core.de>
parents: 583
diff changeset
697 result.ptr = cxMalloc(allocator, result.length + 1);
583
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
698 if (!result.ptr) {
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
699 cx_strrepl_free_ibuf(firstbuf);
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
700 return cx_mutstrn(NULL, 0);
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
701 }
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
702 }
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
703
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 593
diff changeset
704 // Build result string
583
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
705 curbuf = firstbuf;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
706 size_t srcidx = 0;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
707 char *destptr = result.ptr;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
708 do {
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
709 for (size_t i = 0; i < curbuf->len; i++) {
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 593
diff changeset
710 // Copy source part up to next match
583
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
711 size_t idx = curbuf->buf[i];
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
712 size_t srclen = idx - srcidx;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
713 if (srclen > 0) {
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
714 memcpy(destptr, str.ptr + srcidx, srclen);
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
715 destptr += srclen;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
716 srcidx += srclen;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
717 }
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
718
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 593
diff changeset
719 // Copy the replacement and skip the source pattern
583
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
720 srcidx += pattern.length;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
721 memcpy(destptr, replacement.ptr, replacement.length);
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
722 destptr += replacement.length;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
723 }
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
724 curbuf = curbuf->next;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
725 } while (curbuf);
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
726 memcpy(destptr, str.ptr + srcidx, str.length - srcidx);
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
727
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 593
diff changeset
728 // Result is guaranteed to be zero-terminated
590
02a56701a5cb fix missing zero-termination in strreplace
Mike Becker <universe@uap-core.de>
parents: 583
diff changeset
729 result.ptr[result.length] = '\0';
02a56701a5cb fix missing zero-termination in strreplace
Mike Becker <universe@uap-core.de>
parents: 583
diff changeset
730
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 593
diff changeset
731 // Free index buffer
583
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
732 cx_strrepl_free_ibuf(firstbuf);
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
733
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
734 return result;
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
735 }
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
736
645
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
737 CxStrtokCtx cx_strtok(
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
738 cxstring str,
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
739 cxstring delim,
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
740 size_t limit
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
741 ) {
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
742 CxStrtokCtx ctx;
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
743 ctx.str = str;
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
744 ctx.delim = delim;
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
745 ctx.limit = limit;
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
746 ctx.pos = 0;
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
747 ctx.next_pos = 0;
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
748 ctx.delim_pos = 0;
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
749 ctx.found = 0;
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
750 ctx.delim_more = NULL;
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
751 ctx.delim_more_count = 0;
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
752 return ctx;
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
753 }
583
0f3c9662f9b5 add tests and missing implementations for strings
Mike Becker <universe@uap-core.de>
parents: 582
diff changeset
754
645
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
755 CxStrtokCtx cx_strtok_m(
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
756 cxmutstr str,
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
757 cxstring delim,
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
758 size_t limit
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
759 ) {
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
760 return cx_strtok(cx_strcast(str), delim, limit);
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
761 }
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
762
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
763 bool cx_strtok_next(
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
764 CxStrtokCtx *ctx,
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
765 cxstring *token
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
766 ) {
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
767 // abortion criteria
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
768 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
769 return false;
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
770 }
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
771
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
772 // determine the search start
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
773 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
774
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
775 // search the next delimiter
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
776 cxstring delim = cx_strstr(haystack, ctx->delim);
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
777
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
778 // if found, make delim capture exactly the delimiter
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
779 if (delim.length > 0) {
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
780 delim.length = ctx->delim.length;
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
781 }
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
782
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
783 // if more delimiters are specified, check them now
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
784 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
785 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
786 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
787 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
788 delim.ptr = d.ptr;
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
789 delim.length = ctx->delim_more[i].length;
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
790 }
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
791 }
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
792 }
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
793
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
794 // store the token information and adjust the context
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
795 ctx->found++;
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
796 ctx->pos = ctx->next_pos;
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
797 token->ptr = &ctx->str.ptr[ctx->pos];
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
798 ctx->delim_pos = delim.length == 0 ?
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
799 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
800 token->length = ctx->delim_pos - ctx->pos;
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
801 ctx->next_pos = ctx->delim_pos + delim.length;
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
802
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
803 return true;
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
804 }
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
805
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
806 bool cx_strtok_next_m(
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
807 CxStrtokCtx *ctx,
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
808 cxmutstr *token
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
809 ) {
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
810 return cx_strtok_next(ctx, (cxstring *) token);
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
811 }
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
812
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
813 void cx_strtok_delim(
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
814 CxStrtokCtx *ctx,
890
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 806
diff changeset
815 const cxstring *delim,
645
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
816 size_t count
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
817 ) {
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
818 ctx->delim_more = delim;
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
819 ctx->delim_more_count = count;
ec50abb285ad add strtok API - fixes #220
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
820 }
1048
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
821
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
822 #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
823 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
824 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
825 return -1; \
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
826 } \
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
827 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
828 errno = ERANGE; \
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 *output = (rtype) result; \
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
832 return 0
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
833
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
834 int cx_strtos_lc(cxstring str, short *output, int base, const char *groupsep) {
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
835 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
836 }
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
837
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
838 int cx_strtoi_lc(cxstring str, int *output, int base, const char *groupsep) {
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
839 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
840 }
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
841
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
842 int cx_strtol_lc(cxstring str, long *output, int base, const char *groupsep) {
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
843 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
844 }
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
845
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
846 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
847 // 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
848 bool neg = false;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
849 size_t start_unsigned = 0;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
850
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
851 // trim already, to search for a sign character
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
852 str = cx_strtrim(str);
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
853 if (str.length == 0) {
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
854 errno = EINVAL;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
855 return -1;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
856 }
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
857
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
858 // test if we have a negative sign character
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
859 if (str.ptr[start_unsigned] == '-') {
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
860 neg = true;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
861 start_unsigned++;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
862 // must not be followed by positive sign character
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
863 if (str.length == 1 || str.ptr[start_unsigned] == '+') {
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
864 errno = EINVAL;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
865 return -1;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
866 }
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
867 }
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
868
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
869 // now parse the number with strtoull
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
870 unsigned long long v;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
871 cxstring ustr = start_unsigned == 0 ? str
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
872 : 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
873 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
874 if (ret != 0) return ret;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
875 if (neg) {
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
876 if (v - 1 > LLONG_MAX) {
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
877 errno = ERANGE;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
878 return -1;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
879 }
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
880 *output = -(long long) v;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
881 return 0;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
882 } else {
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
883 if (v > LLONG_MAX) {
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
884 errno = ERANGE;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
885 return -1;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
886 }
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
887 *output = (long long) v;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
888 return 0;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
889 }
1048
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
890 }
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
891
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
892 int cx_strtoi8_lc(cxstring str, int8_t *output, int base, const char *groupsep) {
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
893 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
894 }
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
895
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
896 int cx_strtoi16_lc(cxstring str, int16_t *output, int base, const char *groupsep) {
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
897 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
898 }
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
899
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
900 int cx_strtoi32_lc(cxstring str, int32_t *output, int base, const char *groupsep) {
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
901 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
902 }
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
903
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
904 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
905 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
906 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
907 }
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
908
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
909 int cx_strtoz_lc(cxstring str, ssize_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
910 #if SSIZE_MAX == INT32_MAX
e997862a57d8 add temporary implementations for string to number and first test cases
Mike Becker <universe@uap-core.de>
parents: 1050
diff changeset
911 return cx_strtoi32_lc(str, (int32_t*) output, base, groupsep);
e997862a57d8 add temporary implementations for string to number and first test cases
Mike Becker <universe@uap-core.de>
parents: 1050
diff changeset
912 #elif SSIZE_MAX == INT64_MAX
e997862a57d8 add temporary implementations for string to number and first test cases
Mike Becker <universe@uap-core.de>
parents: 1050
diff changeset
913 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
914 #else
1052
e997862a57d8 add temporary implementations for string to number and first test cases
Mike Becker <universe@uap-core.de>
parents: 1050
diff changeset
915 #error "unsupported ssize_t size"
1048
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
916 #endif
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
917 }
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
918
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
919 #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
920 uint64_t result; \
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
921 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
922 return -1; \
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
923 } \
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
924 if (result > rmax) { \
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
925 errno = ERANGE; \
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
926 return -1; \
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 *output = (rtype) result; \
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
929 return 0
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
930
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
931 int cx_strtous_lc(cxstring str, unsigned short *output, int base, const char *groupsep) {
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
932 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
933 }
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
934
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
935 int cx_strtou_lc(cxstring str, unsigned int *output, int base, const char *groupsep) {
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
936 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
937 }
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
938
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
939 int cx_strtoul_lc(cxstring str, unsigned long *output, int base, const char *groupsep) {
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
940 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
941 }
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
942
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
943 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
944 // some sanity checks
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
945 str = cx_strtrim(str);
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
946 if (str.length == 0) {
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
947 errno = EINVAL;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
948 return -1;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
949 }
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
950 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
951 errno = EINVAL;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
952 return -1;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
953 }
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
954 if (groupsep == NULL) groupsep = "";
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
955
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
956 // find the actual start of the number
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
957 if (str.ptr[0] == '+') {
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
958 str.ptr++;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
959 str.length--;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
960 if (str.length == 0) {
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
961 errno = EINVAL;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
962 return -1;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
963 }
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
964 }
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
965 size_t start = 0;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
966
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
967 // 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
968 if (base == 2) {
1063
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
969 if ((str.ptr[0] | 32) == 'b') {
1061
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
970 start = 1;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
971 } 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
972 if ((str.ptr[1] | 32) == 'b') {
1061
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
973 start = 2;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
974 }
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
975 }
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
976 } else if (base == 16) {
1063
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
977 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
978 start = 1;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
979 } 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
980 if ((str.ptr[1] | 32) == 'x') {
1061
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
981 start = 2;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
982 }
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
983 }
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
984 }
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
985
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
986 // check if there are digits left
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
987 if (start >= str.length) {
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
988 errno = EINVAL;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
989 return -1;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
990 }
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
991
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
992 // now parse the number
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
993 unsigned long long result = 0;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
994 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
995 // ignore group separators
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
996 if (strchr(groupsep, str.ptr[i])) continue;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
997
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
998 // determine the digit value of the character
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
999 unsigned char c = str.ptr[i];
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
1000 if (c >= 'a') c = 10 + (c - 'a');
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
1001 else if (c >= 'A') c = 10 + (c - 'A');
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
1002 else if (c >= '0') c = c - '0';
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
1003 else c = 255;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
1004 if (c >= base) {
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
1005 errno = EINVAL;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
1006 return -1;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
1007 }
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
1008
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
1009 // 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
1010 unsigned long right = (result & 0xff) * base + c;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
1011 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
1012 if (left > (ULLONG_MAX >> 8)) {
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
1013 errno = ERANGE;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
1014 return -1;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
1015 }
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
1016 result = (left << 8) + (right & 0xff);
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
1017 }
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
1018
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
1019 *output = result;
c7d23892eab5 implement string to integer conversions
Mike Becker <universe@uap-core.de>
parents: 1052
diff changeset
1020 return 0;
1048
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
1021 }
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
1022
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
1023 int cx_strtou8_lc(cxstring str, uint8_t *output, int base, const char *groupsep) {
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
1024 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
1025 }
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
1026
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
1027 int cx_strtou16_lc(cxstring str, uint16_t *output, int base, const char *groupsep) {
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
1028 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
1029 }
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
1030
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
1031 int cx_strtou32_lc(cxstring str, uint32_t *output, int base, const char *groupsep) {
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
1032 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
1033 }
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
1034
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
1035 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
1036 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
1037 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
1038 }
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
1039
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
1040 int cx_strtouz_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
1041 #if SIZE_MAX == UINT32_MAX
e997862a57d8 add temporary implementations for string to number and first test cases
Mike Becker <universe@uap-core.de>
parents: 1050
diff changeset
1042 return cx_strtou32_lc(str, (uint32_t*) output, base, groupsep);
e997862a57d8 add temporary implementations for string to number and first test cases
Mike Becker <universe@uap-core.de>
parents: 1050
diff changeset
1043 #elif SIZE_MAX == UINT64_MAX
e997862a57d8 add temporary implementations for string to number and first test cases
Mike Becker <universe@uap-core.de>
parents: 1050
diff changeset
1044 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
1045 #else
1052
e997862a57d8 add temporary implementations for string to number and first test cases
Mike Becker <universe@uap-core.de>
parents: 1050
diff changeset
1046 #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
1047 #endif
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
1048 }
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
1049
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
1050 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
1051 // 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
1052 double d;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1053 int ret = cx_strtod_lc(str, &d, decsep, groupsep);
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1054 if (ret != 0) return ret;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1055 // 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
1056 double test = d < 0 ? -d : d;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1057 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
1058 errno = ERANGE;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1059 return -1;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1060 }
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1061 *output = (float) d;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1062 return 0;
1048
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
1063 }
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
1064
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
1065 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
1066 // TODO: overflow check
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1067 // TODO: increase precision
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 // trim and check
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1070 str = cx_strtrim(str);
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1071 if (str.length == 0) {
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1072 errno = EINVAL;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1073 return -1;
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
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1076 double result = 0.;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1077 int sign = 1;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1078
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1079 // check if there is a sign
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1080 if (str.ptr[0] == '-') {
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1081 sign = -1;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1082 str.ptr++;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1083 str.length--;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1084 } else if (str.ptr[0] == '+') {
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1085 str.ptr++;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1086 str.length--;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1087 }
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1088
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1089 // 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
1090 if (str.length == 0) {
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1091 errno = EINVAL;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1092 return -1;
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
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1095 // 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
1096 size_t pos = 0;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1097 do {
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1098 if (isdigit(str.ptr[pos])) {
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1099 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
1100 } 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
1101 break;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1102 }
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1103 } while (++pos < str.length);
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1104
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1105 // already done?
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1106 if (pos == str.length) {
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1107 *output = result * sign;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1108 return 0;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1109 }
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1110
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1111 // is the next char the decsep?
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1112 if (str.ptr[pos] == decsep) {
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1113 pos++;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1114 // 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
1115 if (pos == str.length) {
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1116 if (str.length == 1) {
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1117 errno = EINVAL;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1118 return -1;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1119 } else {
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1120 *output = result * sign;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1121 return 0;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1122 }
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1123 }
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1124 // parse everything until exponent or end
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1125 double factor = 1.;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1126 do {
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1127 if (isdigit(str.ptr[pos])) {
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1128 factor *= 0.1;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1129 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
1130 } 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
1131 break;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1132 }
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1133 } while (++pos < str.length);
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1134 }
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1135
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1136 // no exponent?
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1137 if (pos == str.length) {
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1138 *output = result * sign;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1139 return 0;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1140 }
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1141
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1142 // 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
1143 // 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
1144 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
1145 errno = EINVAL;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1146 return -1;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1147 }
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1148 pos++;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1149
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1150 // 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
1151 double factor = 10.;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1152 if (str.ptr[pos] == '-') {
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1153 factor = .1;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1154 pos++;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1155 } else if (str.ptr[pos] == '+') {
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1156 pos++;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1157 }
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1158
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1159 // at least one digit must follow
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1160 if (pos == str.length) {
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1161 errno = EINVAL;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1162 return -1;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1163 }
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1164
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1165 // parse the exponent
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1166 unsigned int exp = 0;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1167 do {
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1168 if (isdigit(str.ptr[pos])) {
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1169 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
1170 } 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
1171 errno = EINVAL;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1172 return -1;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1173 }
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1174 } while (++pos < str.length);
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1175
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1176 // apply the exponent by fast exponentiation
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1177 do {
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1178 if (exp & 1) {
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1179 result *= factor;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1180 }
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1181 factor *= factor;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1182 } while ((exp >>= 1) > 0);
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1183
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1184 // store the result and exit
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1185 *output = result * sign;
e453e717876e implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents: 1061
diff changeset
1186 return 0;
1048
12f38affefd5 implement all string to number conversions that are just wrappers
Mike Becker <universe@uap-core.de>
parents: 1041
diff changeset
1187 }

mercurial