| Comment: | Merge trunk into branch "asn1" |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | asn1 |
| Files: | files | file ages | folders |
| SHA3-256: |
1779d5b5a74a0cf7cfb0b185bad5e3ad |
| User & Date: | js on 2024-02-18 21:07:27 |
| Other Links: | branch diff | manifest | tags |
|
2024-02-18
| ||
| 21:07 | Merge trunk into branch "asn1" (Leaf check-in: 1779d5b5a7 user: js tags: asn1) | |
| 20:34 | A few minor improvements (check-in: 4eea22291b user: js tags: trunk) | |
|
2024-02-11
| ||
| 23:56 | Migrate OFASN1DERRepresentationTests to ObjFWTest (check-in: 5bc1402377 user: js tags: asn1) | |
Modified .fossil-settings/clean-glob from [e643e584dc] to [2a90f48586].
| ︙ | |||
22 23 24 25 26 27 28 | 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 | - - - - - - - - - - - - + + + + | config.log config.status configure docs extra.mk generators/library/gen_libraries generators/unicode/gen_tables |
Modified .fossil-settings/ignore-glob from [c6f3c5d302] to [1998337625].
| ︙ | |||
24 25 26 27 28 29 30 | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 | - - - - - - - - - - - - + + + + | config.log config.status configure docs extra.mk generators/library/gen_libraries generators/unicode/gen_tables |
Modified .gitignore from [fdf5c85348] to [f4069ec503].
| ︙ | |||
24 25 26 27 28 29 30 | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 | - - - - - - - - - - - - + + + + | config.log config.status configure docs extra.mk generators/library/gen_libraries generators/unicode/gen_tables |
Modified ChangeLog from [400b1b6d53] to [fcedf24573].
1 2 3 4 5 6 7 8 9 10 11 12 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | + + + + + + + + + + + | Legend: * Changes of existing features or bugfixes + New features This file only contains the most significant changes. ObjFW 1.0.8 -> ObjFW 1.0.9, 2024-02-18 * Fixes OFGZIPStream reading the size and CRC32 incorrectly when either spans multiple reads. * Fixes a type mismatch in OFMapTable that could cause problems on big endian systems when uint32_t and unsigned long have a different size. * Fixes the default implementation of -[initWithKeys:arguments:] for custom dictionaries. * Improves detection of mutation during enumeration in -[enumerateKeysAndObjectsUsingBlock:]. * Minor documentation fixes. ObjFW 1.0.7 -> ObjFW 1.0.8, 2024-01-21 * Fixes compilation on NetBSD, OpenBSD, OpenIndiana etc. which was broken by 1.0.7. ObjFW 1.0.6 -> ObjFW 1.0.7, 2024-01-21 * Fixes inheriting the environment in OFSubprocess. |
| ︙ |
Modified Makefile from [3b78119a83] to [cf98c87f50].
1 2 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 | - + - + - - + + - | include extra.mk |
| ︙ |
Modified configure.ac from [724633f612] to [914db26e91].
| ︙ | |||
437 438 439 440 441 442 443 | 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 | - + |
])
AC_DEFINE_UNQUOTED(PLUGIN_SUFFIX, "$PLUGIN_SUFFIX", [Suffix for plugins])
AS_IF([test x"$enable_files" != x"no" -a x"$PLUGIN_SUFFIX" != x""], [
AC_SUBST(USE_SRCS_PLUGINS, '${SRCS_PLUGINS}')
AC_SUBST(TESTPLUGIN, "plugin")
AC_DEFINE(OF_HAVE_PLUGINS, 1, [Whether we have plugin support])
|
| ︙ | |||
735 736 737 738 739 740 741 | 735 736 737 738 739 740 741 742 743 744 745 746 747 748 | - | @end ], [[ __weak id foo = [Foo alloc]; (void)foo; ]]) ], [ AC_MSG_RESULT(yes) |
| ︙ | |||
786 787 788 789 790 791 792 | 785 786 787 788 789 790 791 792 793 794 795 796 797 798 | - - - | AC_CHECK_HEADER(inttypes.h, [AC_DEFINE(OF_HAVE_INTTYPES_H, 1, [Whether we have inttypes.h])]) AC_CHECK_HEADER(sys/types.h, [AC_DEFINE(OF_HAVE_SYS_TYPES_H, 1, [Whether we have sys/types.h])]) |
| ︙ |
Deleted new_tests/Makefile version [8d253bc11b].
| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
|
Deleted new_tests/OFArrayTests.h version [418a1a5a2c].
| - - - - - - - - - - - - - - - - - - - - - - - - - |
|
Deleted new_tests/OFArrayTests.m version [82ed4031a9].
| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
|
Deleted new_tests/OFCharacterSetTests.m version [2ac90291b5].
| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
|
Deleted new_tests/OFColorTests.m version [f2116a7a9c].
| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
|
Deleted new_tests/OFConcreteArrayTests.m version [70542429e0].
| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
|
Deleted new_tests/OFConcreteMutableArrayTests.m version [b38f014238].
| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
|
Deleted new_tests/OFCryptographicHashTests.m version [9a95ece37d].
| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
|
Deleted new_tests/OFDateTests.m version [f4f700dfaa].
| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
|
Deleted new_tests/OFHMACTests.m version [726dca6e51].
| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
|
Deleted new_tests/OFINIFileTests.m version [878892df10].
| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
|
Deleted new_tests/OFInvocationTests.m version [11b71f5c4f].
| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
|
Deleted new_tests/OFJSONTests.m version [125230cf82].
| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
|
Deleted new_tests/OFMethodSignatureTests.m version [27f044c8f7].
| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
|
Deleted new_tests/OFMutableArrayTests.h version [5ae96e61d9].
| - - - - - - - - - - - - - - - - - - - - - - |
|
Deleted new_tests/OFMutableArrayTests.m version [55585061e4].
| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
|
Deleted new_tests/OFNumberTests.m version [03fbf0fe79].
| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
|
Deleted new_tests/OFPluginTests.m version [b4655165af].
| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
|
Deleted new_tests/OFPropertyListTests.m version [2c2f0ce2a0].
| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
|
Deleted new_tests/OFSubprocessTests.m version [bf448d2b80].
| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
|
Deleted new_tests/OFThreadTests.m version [b2b1434e44].
| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
|
Deleted new_tests/plugin/Info.plist.in version [bbe65d4bbd].
| - - - - - - - - - - - - - - - - - - - - - - |
|
Deleted new_tests/plugin/Makefile version [a32249aa5e].
| - - - - - - - - - - - |
|
Deleted new_tests/plugin/TestPlugin.h version [0bf4ece135].
| - - - - - - - - - - - - - - - - - - - - |
|
Deleted new_tests/plugin/TestPlugin.m version [f9d32844b0].
| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
|
Deleted new_tests/subprocess/Makefile version [0c326652cc].
| - - - - - - - - - |
|
Deleted new_tests/subprocess/Subprocess.m version [31a1046120].
| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
|
Deleted new_tests/testfile.bin version [ac78121630].
cannot compute difference between binary files
Deleted new_tests/testfile.ini version [9e2ef2dc1a].
| - - - - - - - - - - - - - - - - - - - - - |
|
Modified src/OFDictionary.m from [b6db2734d8] to [4417aedc0d].
| ︙ | |||
315 316 317 318 319 320 321 322 323 324 325 326 327 328 | 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 | + + + + + + + + |
if (count % 2 != 0)
@throw [OFInvalidArgumentException exception];
count /= 2;
objects = OFAllocMemory(count, sizeof(id));
keys = OFAllocMemory(count, sizeof(id));
keys[i] = firstKey;
objects[i] = va_arg(arguments, id);
if (objects[i] == nil)
@throw [OFInvalidArgumentException exception];
i++;
while ((key = va_arg(arguments, id)) != nil &&
(object = va_arg(arguments, id)) != nil) {
OFEnsure(i < count);
objects[i] = object;
keys[i] = key;
|
| ︙ |
Modified src/OFMapTable.m from [810b88a011] to [77fd4c4f10].
| ︙ | |||
24 25 26 27 28 29 30 | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 | - + | #import "OFMapTable+Private.h" #import "OFEnumerator.h" #import "OFEnumerationMutationException.h" #import "OFInvalidArgumentException.h" #import "OFOutOfRangeException.h" |
| ︙ | |||
468 469 470 471 472 473 474 | 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 | - - + |
for (i = rotatedHash & (_capacity - 1);
i < last && _buckets[i] != NULL; i++) {
if (_buckets[i] == &deletedBucket)
continue;
if (_keyFunctions.equal(_buckets[i]->key, key)) {
|
| ︙ | |||
614 615 616 617 618 619 620 621 622 623 | 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 | + + + - - - |
#ifdef OF_HAVE_BLOCKS
- (void)enumerateKeysAndObjectsUsingBlock: (OFMapTableEnumerationBlock)block
{
bool stop = false;
unsigned long mutations = _mutations;
for (size_t i = 0; i < _capacity && !stop; i++) {
if (_buckets[i] != NULL && _buckets[i] != &deletedBucket)
block(_buckets[i]->key, _buckets[i]->object, &stop);
if (_mutations != mutations)
@throw [OFEnumerationMutationException
exceptionWithObject: self];
|
| ︙ |
Modified src/OFObject.m from [70b0e206af] to [8335b4d9d4].
| ︙ | |||
83 84 85 86 87 88 89 | 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 | - - + + |
struct PreIvars {
int retainCount;
#if !defined(OF_HAVE_ATOMIC_OPS) && !defined(OF_AMIGAOS)
OFSpinlock retainCountSpinlock;
#endif
};
|
| ︙ | |||
336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 | 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 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 | + + + + + + + + + + + + + + + |
instanceSize = class_getInstanceSize(class);
if OF_UNLIKELY (extraAlignment > 1)
extraAlignment = OFRoundUpToPowerOf2(extraAlignment,
PRE_IVARS_ALIGN + instanceSize) -
PRE_IVARS_ALIGN - instanceSize;
#ifndef OF_WINDOWS
instance = calloc(1, PRE_IVARS_ALIGN + instanceSize +
extraAlignment + extraSize);
#else
instance = _aligned_malloc(PRE_IVARS_ALIGN + instanceSize +
extraAlignment + extraSize, OF_BIGGEST_ALIGNMENT);
memset(instance, 0, PRE_IVARS_ALIGN + instanceSize + extraAlignment +
extraSize);
#endif
if OF_UNLIKELY (instance == nil) {
object_setClass((id)&allocFailedException,
[OFAllocFailedException class]);
@throw (id)&allocFailedException;
}
((struct PreIvars *)instance)->retainCount = 1;
#if !defined(OF_HAVE_ATOMIC_OPS) && !defined(OF_AMIGAOS)
if OF_UNLIKELY (OFSpinlockNew(
&((struct PreIvars *)instance)->retainCountSpinlock) != 0) {
# ifndef OF_WINDOWS
free(instance);
# else
_aligned_free(instance);
# endif
@throw [OFInitializationFailedException
exceptionWithClass: class];
}
#endif
instance = (OFObject *)(void *)((char *)instance + PRE_IVARS_ALIGN);
if (!objc_constructInstance(class, instance)) {
#if !defined(OF_HAVE_ATOMIC_OPS) && !defined(OF_AMIGAOS)
OFSpinlockFree(&((struct PreIvars *)(void *)
((char *)instance - PRE_IVARS_ALIGN))->retainCountSpinlock);
#endif
#ifndef OF_WINDOWS
free((char *)instance - PRE_IVARS_ALIGN);
#else
_aligned_free((char *)instance - PRE_IVARS_ALIGN);
#endif
@throw [OFInitializationFailedException
exceptionWithClass: class];
}
if OF_UNLIKELY (extra != NULL)
*extra = (char *)instance + instanceSize + extraAlignment;
|
| ︙ | |||
1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 | 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 | + + + + |
{
objc_destructInstance(self);
#if !defined(OF_HAVE_ATOMIC_OPS) && !defined(OF_AMIGAOS)
OFSpinlockFree(&PRE_IVARS->retainCountSpinlock);
#endif
#ifndef OF_WINDOWS
free((char *)self - PRE_IVARS_ALIGN);
#else
_aligned_free((char *)self - PRE_IVARS_ALIGN);
#endif
}
/* Required to use properties with the Apple runtime */
- (id)copyWithZone: (void *)zone
{
if OF_UNLIKELY (zone != NULL) {
[self doesNotRecognizeSelector: _cmd];
|
| ︙ |
Modified src/OFStdIOStream.m from [4bd5de9454] to [4e9d096bab].
| ︙ | |||
115 116 117 118 119 120 121 | 115 116 117 118 119 120 121 122 123 124 125 126 127 128 | - | [OFStdErr writeFormat: @"[%@.%03d %@(%d)] %@\n", dateString, date.microsecond / 1000, me, getpid(), msg]; objc_autoreleasePoolPop(pool); } |
| ︙ | |||
154 155 156 157 158 159 160 | 153 154 155 156 157 158 159 160 161 162 163 164 165 166 | - | if ([color isEqual: [OFColor aqua]]) return 96; if ([color isEqual: [OFColor white]]) return 97; return -1; } |
| ︙ | |||
428 429 430 431 432 433 434 | 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 | + + + - + |
- (unsigned int)retainCount
{
return OFMaxRetainCount;
}
- (bool)hasTerminal
{
#if defined(OF_WII) || defined(OF_NINTENDO_DS) || defined(OF_NINTENDO_3DS) || \
defined(OF_NINTENDO_SWITCH)
return true;
|
| ︙ | |||
467 468 469 470 471 472 473 | 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 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 | - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - |
#else
return -1;
#endif
}
- (void)setForegroundColor: (OFColor *)color
{
|
Modified src/OFString+PathAdditions.m from [d839db3f93] to [1756dbb6cf].
| ︙ | |||
17 18 19 20 21 22 23 | 17 18 19 20 21 22 23 24 25 26 27 28 29 | - - + + | #include "platform.h" #if defined(OF_WINDOWS) || defined(OF_MSDOS) || defined(OF_MINT) # import "platform/Windows/OFString+PathAdditions.m" #elif defined(OF_AMIGAOS) # import "platform/AmigaOS/OFString+PathAdditions.m" |
Modified src/OFString.m from [855db5cb26] to [fd5aa1a3b0].
| ︙ | |||
2337 2338 2339 2340 2341 2342 2343 | 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 | - - + + + - + + + | if ([stripped caseInsensitiveCompare: @"-NAN"] == OFOrderedSame) return -NAN; #if defined(HAVE_STRTOF_L) || defined(HAVE_USELOCALE) const char *UTF8String = self.UTF8String; #else /* |
| ︙ | |||
2394 2395 2396 2397 2398 2399 2400 | 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 | - - + + + - + + + | if ([stripped caseInsensitiveCompare: @"-NAN"] == OFOrderedSame) return -NAN; #if defined(HAVE_STRTOD_L) || defined(HAVE_USELOCALE) const char *UTF8String = self.UTF8String; #else /* |
| ︙ |
Modified src/macros.h from [f9c11c2712] to [1147a05908].
| ︙ | |||
110 111 112 113 114 115 116 | 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 | - - - - - - - - - + + + + + + + + + + + + + | # define OF_ALIGNOF(type) _Alignof(type) # define OF_ALIGNAS(type) _Alignas(type) #else # define OF_ALIGNOF(type) __alignof__(type) # define OF_ALIGNAS(type) OF_ALIGN(OF_ALIGNOF(type)) #endif |
| ︙ |
Modified src/objfw-defs.h.in from [5a8629e6a6] to [ab0ba34911].
| ︙ | |||
13 14 15 16 17 18 19 | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 | - | #undef OF_HAVE_CHOWN #undef OF_HAVE_FILES #undef OF_HAVE_FORWARDING_TARGET_FOR_SELECTOR #undef OF_HAVE_IPV6 #undef OF_HAVE_IPX #undef OF_HAVE_LIMITS_H #undef OF_HAVE_LINK |
| ︙ |
Modified src/test/Makefile from [b269c69e19] to [c3118bd230].
1 2 3 4 5 6 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 | - + + - + + | include ../../extra.mk DISTCLEAN = Info.plist STATIC_LIB = libobjfwtest.a |
| ︙ |
Deleted src/test/OTAppDelegate.h version [64bf862003].
| - - - - - - - - - - - - - - - - - - - - - - - |
|
Modified src/test/OTAppDelegate.m from [c000033e03] to [e5ebae8f3e].
| ︙ | |||
11 12 13 14 15 16 17 | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 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 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 | - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" |
| ︙ | |||
122 123 124 125 126 127 128 | 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 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 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 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 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 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 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 | - + - - - - - - - + + + + + + + + + + + - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + - - + + + + - - + - + - + + + + + + + + + + + + + + + + + + + - + + + + + - + + + + + + + + - + + + + + - + + - - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | [tests makeImmutable]; return tests; } - (void)printStatusForTest: (SEL)test inClass: (Class)class |
Modified src/test/OTAssert.h from [4079f8ef1f] to [5c08862032].
| ︙ | |||
22 23 24 25 26 27 28 29 30 31 32 33 34 35 | 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 | + + + + |
#define OTAssert(cond, ...) \
OTAssertImpl(self, _cmd, cond, @#cond, @__FILE__, __LINE__, \
## __VA_ARGS__, nil)
#define OTAssertTrue(cond, ...) OTAssert(cond == true, ## __VA_ARGS__)
#define OTAssertFalse(cond, ...) OTAssert(cond == false, ## __VA_ARGS__)
#define OTAssertEqual(a, b, ...) OTAssert(a == b, ## __VA_ARGS__)
#define OTAssertNotEqual(a, b, ...) OTAssert(a != b, ## __VA_ARGS__)
#define OTAssertLessThan(a, b, ...) OTAssert(a < b, ## __VA_ARGS__)
#define OTAssertLessThanOrEqual(a, b, ...) OTAssert(a <= b, ## __VA_ARGS__)
#define OTAssertGreaterThan(a, b, ...) OTAssert(a > b, ## __VA_ARGS__)
#define OTAssertGreaterThanOrEqual(a, b, ...) OTAssert(a >= b, ## __VA_ARGS__)
#define OTAssertEqualObjects(a, b, ...) OTAssert([a isEqual: b], ## __VA_ARGS__)
#define OTAssertNotEqualObjects(a, b, ...) \
OTAssert(![a isEqual: b], ## __VA_ARGS__)
#define OTAssertNil(object, ...) OTAssert(object == nil, ## __VA_ARGS__)
#define OTAssertNotNil(object, ...) OTAssert(object != nil, ## __VA_ARGS__)
#define OTAssertThrows(expression, ...) \
{ \
|
| ︙ | |||
47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 | 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 | + + + |
@try { \
expression; \
} @catch (exception *e) { \
OTThrown = true; \
} \
OTAssert(OTThrown, ## __VA_ARGS__); \
}
#define OTSkip(...) \
OTSkipImpl(self, _cmd, @__FILE__, __LINE__, ## __VA_ARGS__, nil)
#ifdef __cplusplus
extern "C" {
#endif
extern void OTAssertImpl(id testCase, SEL test, bool condition, OFString *check,
OFString *file, size_t line, ...);
extern void OTSkipImpl(id testCase, SEL test, OFString *file, size_t line, ...);
#ifdef __cplusplus
}
#endif
|
Modified src/test/OTAssert.m from [dfc3f7ba82] to [27e2adc076].
| ︙ | |||
14 15 16 17 18 19 20 21 22 23 24 25 26 27 | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | + |
*/
#include "config.h"
#import "OFString.h"
#import "OTAssertionFailedException.h"
#import "OTTestSkippedException.h"
void
OTAssertImpl(id testCase, SEL test, bool condition, OFString *check,
OFString *file, size_t line, ...)
{
va_list arguments;
OFConstantString *format;
|
| ︙ | |||
39 40 41 42 43 44 45 | 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 | + + + + + + + + + + + + + + + + + + + + |
arguments: arguments] autorelease];
va_end(arguments);
@throw [OTAssertionFailedException exceptionWithCondition: check
message: message];
}
void
OTSkipImpl(id testCase, SEL test, OFString *file, size_t line, ...)
{
va_list arguments;
OFConstantString *format;
OFString *message = nil;
va_start(arguments, line);
format = va_arg(arguments, OFConstantString *);
if (format != nil)
message = [[[OFString alloc]
initWithFormat: format
arguments: arguments] autorelease];
va_end(arguments);
@throw [OTTestSkippedException exceptionWithMessage: message];
}
|
Added src/test/OTOrderedDictionary.h version [b6c6515436].
|
Added src/test/OTOrderedDictionary.m version [fea7c7d9b6].