Overview
Comment: | of_comparator_t -> OFComparator |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | new-naming-convention |
Files: | files | file ages | folders |
SHA3-256: |
aade14a6e20cee75168633b38c010c29 |
User & Date: | js on 2021-04-17 00:24:52 |
Other Links: | branch diff | manifest | tags |
Context
2021-04-17
| ||
00:31 | of_byte_order_t -> OFByteOrder check-in: 1046d10a20 user: js tags: new-naming-convention | |
00:24 | of_comparator_t -> OFComparator check-in: aade14a6e2 user: js tags: new-naming-convention | |
00:14 | of_comparison_result_t -> OFComparisonResult check-in: 61fc389aee user: js tags: new-naming-convention | |
Changes
Modified src/OFArray.h from [702817f9c0] to [891042f11e].
︙ | ︙ | |||
413 414 415 416 417 418 419 | * Possible values are: * Value | Description * ---------------------------|------------------------- * `OF_ARRAY_SORT_DESCENDING` | Sort in descending order * @return A sorted copy of the array */ - (OFArray OF_GENERIC(ObjectType) *) | | | 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 | * Possible values are: * Value | Description * ---------------------------|------------------------- * `OF_ARRAY_SORT_DESCENDING` | Sort in descending order * @return A sorted copy of the array */ - (OFArray OF_GENERIC(ObjectType) *) sortedArrayUsingComparator: (OFComparator)comparator options: (int)options; #endif /** * @brief Creates a new array with the specified object added. * * @param object The object to add |
︙ | ︙ |
Modified src/OFArray.m from [f6ae42a2d9] to [cb54365db5].
︙ | ︙ | |||
719 720 721 722 723 724 725 | OFMutableArray *new = [[self mutableCopy] autorelease]; [new sortUsingSelector: selector options: options]; [new makeImmutable]; return new; } #ifdef OF_HAVE_BLOCKS | | | 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 | OFMutableArray *new = [[self mutableCopy] autorelease]; [new sortUsingSelector: selector options: options]; [new makeImmutable]; return new; } #ifdef OF_HAVE_BLOCKS - (OFArray *)sortedArrayUsingComparator: (OFComparator)comparator options: (int)options { OFMutableArray *new = [[self mutableCopy] autorelease]; [new sortUsingComparator: comparator options: options]; [new makeImmutable]; return new; } |
︙ | ︙ |
Modified src/OFMutableArray.h from [16603a1ba8] to [ffc0dffd0c].
︙ | ︙ | |||
213 214 215 216 217 218 219 | * @param comparator The comparator to use to sort the array * @param options The options to use when sorting the array.@n * Possible values are: * Value | Description * ---------------------------|------------------------- * `OF_ARRAY_SORT_DESCENDING` | Sort in descending order */ | | | 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 | * @param comparator The comparator to use to sort the array * @param options The options to use when sorting the array.@n * Possible values are: * Value | Description * ---------------------------|------------------------- * `OF_ARRAY_SORT_DESCENDING` | Sort in descending order */ - (void)sortUsingComparator: (OFComparator)comparator options: (int)options; #endif /** * @brief Reverts the order of the objects in the array. */ - (void)reverse; |
︙ | ︙ |
Modified src/OFMutableArray.m from [0f6bd8fd60] to [38e99ca8e4].
︙ | ︙ | |||
88 89 90 91 92 93 94 | left = i + 1; } } #ifdef OF_HAVE_BLOCKS static void quicksortWithBlock(OFMutableArray *array, size_t left, size_t right, | | | 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 | left = i + 1; } } #ifdef OF_HAVE_BLOCKS static void quicksortWithBlock(OFMutableArray *array, size_t left, size_t right, OFComparator comparator, int options) { OFComparisonResult ascending, descending; if (options & OF_ARRAY_SORT_DESCENDING) { ascending = OFOrderedDescending; descending = OFOrderedAscending; } else { |
︙ | ︙ | |||
423 424 425 426 427 428 429 | if (count == 0 || count == 1) return; quicksort(self, 0, count - 1, selector, options); } #ifdef OF_HAVE_BLOCKS | | | 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 | if (count == 0 || count == 1) return; quicksort(self, 0, count - 1, selector, options); } #ifdef OF_HAVE_BLOCKS - (void)sortUsingComparator: (OFComparator)comparator options: (int)options { size_t count = self.count; if (count == 0 || count == 1) return; quicksortWithBlock(self, 0, count - 1, comparator, options); |
︙ | ︙ |
Modified src/OFObject.h from [035a07e792] to [726a0561e2].
︙ | ︙ | |||
67 68 69 70 71 72 73 | /** * @brief A comparator to compare two objects. * * @param left The left object * @param right The right object * @return The order of the objects */ | | < | 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 | /** * @brief A comparator to compare two objects. * * @param left The left object * @param right The right object * @return The order of the objects */ typedef OFComparisonResult (^OFComparator)(id _Nonnull left, id _Nonnull right); #endif /** * @brief An enum for storing endianess. */ typedef enum { /** Most significant byte first (big endian) */ |
︙ | ︙ |