Differences From Artifact [8c96d0cf6e]:
- File
src/OFString.m
— part of check-in
[627511b032]
at
2020-11-14 12:23:55
on branch trunk
— Rename of_malloc and of_calloc
The new names should be more accurate. (user: js, size: 65922) [annotate] [blame] [check-ins using] [more...]
To Artifact [0e8c3a02df]:
- File src/OFString.m — part of check-in [1b2efa1f5d] at 2020-12-22 20:09:40 on branch trunk — Correctly handle componentsSeparatedByString: @"" (user: js, size: 67227) [annotate] [blame] [check-ins using] [more...]
| ︙ | ︙ | |||
72 73 74 75 76 77 78 79 80 81 82 83 84 85 |
# define strtod __strtod
#endif
#ifdef OF_AMIGAOS_M68K
/* libnix has strtod, but not strtof */
# define strtof strtod
#endif
static struct {
Class isa;
} placeholder;
#if defined(HAVE_STRTOF_L) || defined(HAVE_STRTOD_L)
static locale_t cLocale;
| > > > > | 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 |
# define strtod __strtod
#endif
#ifdef OF_AMIGAOS_M68K
/* libnix has strtod, but not strtof */
# define strtof strtod
#endif
#ifndef INFINITY
# define INFINITY __builtin_inf()
#endif
static struct {
Class isa;
} placeholder;
#if defined(HAVE_STRTOF_L) || defined(HAVE_STRTOD_L)
static locale_t cLocale;
|
| ︙ | ︙ | |||
2236 2237 2238 2239 2240 2241 2242 |
options: 0];
}
- (OFArray *)componentsSeparatedByString: (OFString *)delimiter
options: (int)options
{
void *pool;
| | > > > > > > > | 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 |
options: 0];
}
- (OFArray *)componentsSeparatedByString: (OFString *)delimiter
options: (int)options
{
void *pool;
OFMutableArray *array;
const of_unichar_t *characters, *delimiterCharacters;
bool skipEmpty = (options & OF_STRING_SKIP_EMPTY);
size_t length = self.length;
size_t delimiterLength = delimiter.length;
size_t last;
OFString *component;
if (delimiter == nil)
@throw [OFInvalidArgumentException exception];
if (delimiter.length == 0)
return [OFArray arrayWithObject: self];
array = [OFMutableArray array];
pool = objc_autoreleasePoolPush();
characters = self.characters;
delimiterCharacters = delimiter.characters;
if (delimiterLength > length) {
[array addObject: [[self copy] autorelease]];
|
| ︙ | ︙ | |||
2338 2339 2340 2341 2342 2343 2344 |
return [self longLongValueWithBase: 10];
}
- (long long)longLongValueWithBase: (int)base
{
void *pool = objc_autoreleasePoolPush();
const char *UTF8String = self.UTF8String;
| | | > > | > > > > | | | > > > > > > | > > > > | > > > | > > | > > > > > > > > > | > > > | > | > > > > > > > > > < | < | | > > > | | | > > > | | > > > > | > > > | > > | > > > > > > > > > | > > > | > | > > > > > > > | 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 2390 2391 2392 2393 2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 |
return [self longLongValueWithBase: 10];
}
- (long long)longLongValueWithBase: (int)base
{
void *pool = objc_autoreleasePoolPush();
const char *UTF8String = self.UTF8String;
bool negative = false;
long long value = 0;
while (of_ascii_isspace(*UTF8String))
UTF8String++;
switch (*UTF8String) {
case '-':
negative = true;
case '+':
UTF8String++;
}
if (UTF8String[0] == '0') {
if (UTF8String[1] == 'x') {
if (base == 0)
base = 16;
if (base != 16 || UTF8String[2] == '\0')
@throw [OFInvalidFormatException exception];
UTF8String += 2;
} else {
if (base == 0)
base = 8;
UTF8String++;
}
}
while (*UTF8String != '\0') {
unsigned char c = of_ascii_toupper(*UTF8String++);
if (c >= '0' && c <= '9')
c -= '0';
else if (c >= 'A' && c <= 'Z')
c -= ('A' - 10);
else if (of_ascii_isspace(c)) {
while (*UTF8String != '\0')
if (!of_ascii_isspace(*UTF8String++))
@throw [OFInvalidFormatException
exception];
break;
} else
@throw [OFInvalidFormatException exception];
if (c >= base)
@throw [OFInvalidFormatException exception];
if (LLONG_MAX / base < value || LLONG_MAX - (value * base) < c)
@throw [OFOutOfRangeException exception];
value = (value * base) + c;
}
if (negative)
value *= -1;
objc_autoreleasePoolPop(pool);
return value;
}
- (unsigned long long)unsignedLongLongValue
{
return [self unsignedLongLongValueWithBase: 10];
}
- (unsigned long long)unsignedLongLongValueWithBase: (int)base
{
void *pool = objc_autoreleasePoolPush();
const char *UTF8String = self.UTF8String;
unsigned long long value = 0;
while (of_ascii_isspace(*UTF8String))
UTF8String++;
switch (*UTF8String) {
case '-':
@throw [OFInvalidFormatException exception];
case '+':
UTF8String++;
}
if (UTF8String[0] == '0') {
if (UTF8String[1] == 'x') {
if (base == 0)
base = 16;
if (base != 16 || UTF8String[2] == '\0')
@throw [OFInvalidFormatException exception];
UTF8String += 2;
} else {
if (base == 0)
base = 8;
UTF8String++;
}
}
while (*UTF8String != '\0') {
unsigned char c = of_ascii_toupper(*UTF8String++);
if (c >= '0' && c <= '9')
c -= '0';
else if (c >= 'A' && c <= 'Z')
c -= ('A' - 10);
else if (of_ascii_isspace(c)) {
while (*UTF8String != '\0')
if (!of_ascii_isspace(*UTF8String++))
@throw [OFInvalidFormatException
exception];
break;
} else
@throw [OFInvalidFormatException exception];
if (c >= base)
@throw [OFInvalidFormatException exception];
if (ULLONG_MAX / base < value ||
ULLONG_MAX - (value * base) < c)
@throw [OFOutOfRangeException exception];
value = (value * base) + c;
}
objc_autoreleasePoolPop(pool);
return value;
}
- (float)floatValue
|
| ︙ | ︙ |