Overview
Context
Changes
Modified src/OFArray.m
from [b356d7c687]
to [c89de989b4].
︙ | | |
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
|
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
|
-
+
|
if (self.count == 0)
return @"()";
pool = objc_autoreleasePoolPush();
ret = [[self componentsJoinedByString: @",\n"] mutableCopy];
@try {
[ret prependString: @"(\n"];
[ret insertString: @"(\n" atIndex: 0];
[ret replaceOccurrencesOfString: @"\n" withString: @"\n\t"];
[ret appendString: @"\n)"];
} @catch (id e) {
[ret release];
@throw e;
}
|
︙ | | |
Modified src/OFINICategory.m
from [a3ae5f50aa]
to [1db2d24df3].
︙ | | |
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
|
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
|
-
+
|
[mutableString replaceOccurrencesOfString: @"\\" withString: @"\\\\"];
[mutableString replaceOccurrencesOfString: @"\f" withString: @"\\f"];
[mutableString replaceOccurrencesOfString: @"\r" withString: @"\\r"];
[mutableString replaceOccurrencesOfString: @"\n" withString: @"\\n"];
[mutableString replaceOccurrencesOfString: @"\"" withString: @"\\\""];
[mutableString prependString: @"\""];
[mutableString insertString: @"\"" atIndex: 0];
[mutableString appendString: @"\""];
[mutableString makeImmutable];
return mutableString;
}
|
︙ | | |
Modified src/OFMutableString.h
from [9300a1f2cf]
to [91a3b5acd2].
︙ | | |
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
|
107
108
109
110
111
112
113
114
115
116
117
118
119
120
|
-
-
-
-
-
-
-
-
-
-
-
-
|
* `const OFUnichar *`.
*
* @param format A format string which generates the string to append
* @param arguments The arguments used in the format string
*/
- (void)appendFormat: (OFConstantString *)format arguments: (va_list)arguments;
/**
* @brief Prepends another OFString to the OFMutableString.
*
* @param string An OFString to prepend
*/
- (void)prependString: (OFString *)string;
/**
* @brief Reverses the string.
*/
- (void)reverse;
/**
* @brief Converts the string to uppercase.
*/
- (void)uppercase;
/**
* @brief Converts the string to lowercase.
|
︙ | | |
Modified src/OFMutableString.m
from [538b23eb1a]
to [b626e8ca80].
︙ | | |
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
|
368
369
370
371
372
373
374
375
376
377
378
379
380
381
|
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
|
@try {
[self appendUTF8String: UTF8String length: UTF8StringLength];
} @finally {
free(UTF8String);
}
}
- (void)prependString: (OFString *)string
{
[self insertString: string atIndex: 0];
}
- (void)reverse
{
size_t i, j, length = self.length;
for (i = 0, j = length - 1; i < length / 2; i++, j--) {
OFUnichar tmp = [self characterAtIndex: j];
[self setCharacter: [self characterAtIndex: i] atIndex: j];
[self setCharacter: tmp atIndex: i];
}
}
#ifdef OF_HAVE_UNICODE_TABLES
- (void)uppercase
{
[self of_convertWithWordStartTable: OFUnicodeUppercaseTable
wordMiddleTable: OFUnicodeUppercaseTable
wordStartTableSize: OFUnicodeUppercaseTableSize
wordMiddleTableSize: OFUnicodeUppercaseTableSize];
|
︙ | | |
Modified src/OFMutableUTF8String.m
from [e069c57766]
to [57e4df0b5d].
︙ | | |
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
|
421
422
423
424
425
426
427
428
429
430
431
432
433
434
|
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
|
@try {
[self appendUTF8String: UTF8String length: UTF8StringLength];
} @finally {
free(UTF8String);
}
}
- (void)reverse
{
size_t i, j;
_s->hasHash = false;
/* We reverse all bytes and restore UTF-8 later, if necessary */
for (i = 0, j = _s->cStringLength - 1; i < _s->cStringLength / 2;
i++, j--) {
_s->cString[i] ^= _s->cString[j];
_s->cString[j] ^= _s->cString[i];
_s->cString[i] ^= _s->cString[j];
}
if (!_s->isUTF8)
return;
for (i = 0; i < _s->cStringLength; i++) {
/* ASCII */
if OF_LIKELY (!(_s->cString[i] & 0x80))
continue;
/* A start byte can't happen first as we reversed everything */
if OF_UNLIKELY (_s->cString[i] & 0x40)
@throw [OFInvalidEncodingException exception];
/* Next byte must not be ASCII */
if OF_UNLIKELY (_s->cStringLength < i + 1 ||
!(_s->cString[i + 1] & 0x80))
@throw [OFInvalidEncodingException exception];
/* Next byte is the start byte */
if OF_LIKELY (_s->cString[i + 1] & 0x40) {
_s->cString[i] ^= _s->cString[i + 1];
_s->cString[i + 1] ^= _s->cString[i];
_s->cString[i] ^= _s->cString[i + 1];
i++;
continue;
}
/* Second next byte must not be ASCII */
if OF_UNLIKELY (_s->cStringLength < i + 2 ||
!(_s->cString[i + 2] & 0x80))
@throw [OFInvalidEncodingException exception];
/* Second next byte is the start byte */
if OF_LIKELY (_s->cString[i + 2] & 0x40) {
_s->cString[i] ^= _s->cString[i + 2];
_s->cString[i + 2] ^= _s->cString[i];
_s->cString[i] ^= _s->cString[i + 2];
i += 2;
continue;
}
/* Third next byte must not be ASCII */
if OF_UNLIKELY (_s->cStringLength < i + 3 ||
!(_s->cString[i + 3] & 0x80))
@throw [OFInvalidEncodingException exception];
/* Third next byte is the start byte */
if OF_LIKELY (_s->cString[i + 3] & 0x40) {
_s->cString[i] ^= _s->cString[i + 3];
_s->cString[i + 3] ^= _s->cString[i];
_s->cString[i] ^= _s->cString[i + 3];
_s->cString[i + 1] ^= _s->cString[i + 2];
_s->cString[i + 2] ^= _s->cString[i + 1];
_s->cString[i + 1] ^= _s->cString[i + 2];
i += 3;
continue;
}
/* UTF-8 does not allow more than 4 bytes per character */
@throw [OFInvalidEncodingException exception];
}
}
- (void)insertString: (OFString *)string atIndex: (size_t)idx
{
size_t newCStringLength;
if (idx > _s->length)
@throw [OFOutOfRangeException exception];
|
︙ | | |
Modified src/OFString.m
from [9ff5525c3f]
to [c20b83a313].
︙ | | |
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
|
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
|
-
+
-
+
-
+
|
if (options & OFJSONRepresentationOptionIsIdentifier) {
const char *cString = self.UTF8String;
if ((!OFASCIIIsAlpha(cString[0]) &&
cString[0] != '_' && cString[0] != '$') ||
strpbrk(cString, " \n\r\t\b\f\\\"'") != NULL) {
[JSON prependString: @"\""];
[JSON insertString: @"\"" atIndex: 0];
[JSON appendString: @"\""];
}
} else {
[JSON prependString: @"\""];
[JSON insertString: @"\"" atIndex: 0];
[JSON appendString: @"\""];
}
} else {
[JSON replaceOccurrencesOfString: @"\n" withString: @"\\n"];
[JSON prependString: @"\""];
[JSON insertString: @"\"" atIndex: 0];
[JSON appendString: @"\""];
}
[JSON makeImmutable];
return JSON;
}
|
︙ | | |
Modified src/OFSystemInfo.m
from [22395c80f5]
to [08b6db7f62].
︙ | | |
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
|
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
|
-
+
|
OFDictionary *env = [OFApplication environment];
OFString *home;
if ((home = [env objectForKey: @"HOME"]) == nil)
return nil;
[path deleteCharactersInRange: OFMakeRange(0, 1)];
[path prependString: home];
[path insertString: home atIndex: 0];
}
[path makeImmutable];
return [OFURL fileURLWithPath: path isDirectory: true];
# elif defined(OF_WINDOWS)
OFDictionary *env = [OFApplication environment];
|
︙ | | |
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
|
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
|
-
+
|
OFDictionary *env = [OFApplication environment];
OFString *home;
if ((home = [env objectForKey: @"HOME"]) == nil)
return nil;
[path deleteCharactersInRange: OFMakeRange(0, 1)];
[path prependString: home];
[path insertString: home atIndex: 0];
}
[path appendString: @"/Preferences"];
[path makeImmutable];
return [OFURL fileURLWithPath: path isDirectory: true];
# elif defined(OF_WINDOWS)
|
︙ | | |
Modified src/platform/Windows/OFSubprocess.m
from [0ef8b1e769]
to [4951913bf9].
︙ | | |
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
|
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
|
-
+
|
[OFMutableString stringWithString: programName];
[argumentsString replaceOccurrencesOfString: @"\\\""
withString: @"\\\\\""];
[argumentsString replaceOccurrencesOfString: @"\""
withString: @"\\\""];
if ([argumentsString containsString: @" "]) {
[argumentsString prependString: @"\""];
[argumentsString insertString: @"\"" atIndex: 0];
[argumentsString appendString: @"\""];
}
for (OFString *argument in arguments) {
OFMutableString *tmp =
[[argument mutableCopy] autorelease];
bool containsSpaces = [tmp containsString: @" "];
|
︙ | | |
Modified tests/OFStringTests.m
from [9bcae0600b]
to [cdfdf23d3d].
︙ | | |
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
|
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
|
-
-
-
-
+
-
+
-
+
-
+
|
[mutableString1 characterAtIndex: 1] == 0xE4 &&
[mutableString1 characterAtIndex: 3] == 0x20AC &&
[mutableString1 characterAtIndex: 5] == 0x1D11E)
EXPECT_EXCEPTION(@"Detect out of range in -[characterAtIndex:]",
OFOutOfRangeException, [mutableString1 characterAtIndex: 7])
TEST(@"-[reverse]",
R([mutableString1 reverse]) && [mutableString1 isEqual: @"3𝄞1€sät"])
mutableString2 = [mutableStringClass stringWithString: @"abc"];
#ifdef OF_HAVE_UNICODE_TABLES
TEST(@"-[uppercase]", R([mutableString1 uppercase]) &&
[mutableString1 isEqual: @"3𝄞1€SÄT"] &&
[mutableString1 isEqual: @"TÄS€1𝄞3"] &&
R([mutableString2 uppercase]) && [mutableString2 isEqual: @"ABC"])
TEST(@"-[lowercase]", R([mutableString1 lowercase]) &&
[mutableString1 isEqual: @"3𝄞1€sät"] &&
[mutableString1 isEqual: @"täs€1𝄞3"] &&
R([mutableString2 lowercase]) && [mutableString2 isEqual: @"abc"])
TEST(@"-[uppercaseString]",
[[mutableString1 uppercaseString] isEqual: @"3𝄞1€SÄT"])
[[mutableString1 uppercaseString] isEqual: @"TÄS€1𝄞3"])
TEST(@"-[lowercaseString]", R([mutableString1 uppercase]) &&
[[mutableString1 lowercaseString] isEqual: @"3𝄞1€sät"])
[[mutableString1 lowercaseString] isEqual: @"täs€1𝄞3"])
TEST(@"-[capitalizedString]", [C(@"džbla tdžst TDŽST").capitalizedString
isEqual: @"Džbla Tdžst Tdžst"])
#else
TEST(@"-[uppercase]", R([mutableString1 uppercase]) &&
[mutableString1 isEqual: @"3𝄞1€SäT"] &&
R([mutableString2 uppercase]) && [mutableString2 isEqual: @"ABC"])
|
︙ | | |
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
|
540
541
542
543
544
545
546
547
548
549
550
551
552
553
|
-
-
-
|
EXPECT_EXCEPTION(@"Detect out of range in -[substringWithRange:] #2",
OFOutOfRangeException,
[C(@"𝄞öö") substringWithRange: OFMakeRange(4, 0)])
TEST(@"-[stringByAppendingString:]",
[[C(@"foo") stringByAppendingString: @"bar"] isEqual: @"foobar"])
TEST(@"-[stringByPrependingString:]",
[[C(@"foo") stringByPrependingString: @"bar"] isEqual: @"barfoo"])
#ifdef OF_HAVE_FILES
# if defined(OF_WINDOWS)
TEST(@"-[isAbsolutePath]",
C(@"C:\\foo").absolutePath && C(@"a:/foo").absolutePath &&
!C(@"foo").absolutePath && !C(@"b:foo").absolutePath &&
C(@"\\\\foo").absolutePath)
# elif defined(OF_MSDOS)
|
︙ | | |