Overview
| Comment: | OFEnumerator: Conform to OFFastEnumeration |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
f18b5db636efa7e4efee16a51152b1bd |
| User & Date: | js on 2019-06-19 00:54:33 |
| Other Links: | manifest | tags |
Context
|
2019-06-19
| ||
| 01:19 | bridge: Add -[{OF,NS}Object] to {NS,OF}Enumerator check-in: d23d6802cc user: js tags: trunk | |
| 00:54 | OFEnumerator: Conform to OFFastEnumeration check-in: f18b5db636 user: js tags: trunk | |
| 00:45 | OFEnumerator: Remove -[reset] check-in: 7214a2c7af user: js tags: trunk | |
Changes
Modified src/OFEnumerator.h from [fb1ecf6b18] to [5d33d7fcc0].
| ︙ | ︙ | |||
33 34 35 36 37 38 39 | * collection. * * @return An OFEnumerator to enumerate through all objects of the collection */ - (OFEnumerator *)objectEnumerator; @end | < < < < < < < < < < < < < < < < < < < < < < < < < < < | 33 34 35 36 37 38 39 40 41 42 43 44 45 46 | * collection. * * @return An OFEnumerator to enumerate through all objects of the collection */ - (OFEnumerator *)objectEnumerator; @end /* * This needs to be exactly like this because it's hard-coded in the compiler. * * We need this bad check to see if we already imported Cocoa, which defines * this as well. */ /*! |
| ︙ | ︙ | |||
110 111 112 113 114 115 116 117 | */ - (int)countByEnumeratingWithState: (of_fast_enumeration_state_t *)state objects: (id __unsafe_unretained _Nonnull *_Nonnull) objects count: (int)count; @end OF_ASSUME_NONNULL_END | > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 | */ - (int)countByEnumeratingWithState: (of_fast_enumeration_state_t *)state objects: (id __unsafe_unretained _Nonnull *_Nonnull) objects count: (int)count; @end /*! * @class OFEnumerator OFEnumerator.h ObjFW/OFEnumerator.h * * @brief A class which provides methods to enumerate through collections. */ @interface OFEnumerator OF_GENERIC(ObjectType): OFObject <OFFastEnumeration> #if !defined(OF_HAVE_GENERICS) && !defined(DOXYGEN) # define ObjectType id #endif /*! * @brief Returns the next object or `nil` if there is none left. * * @return The next object or `nil` if there is none left */ - (nullable ObjectType)nextObject; /*! * @brief Returns an array of all remaining objects in the collection. * * @return An array of all remaining objects in the collection. */ - (OFArray OF_GENERIC(ObjectType) *)allObjects; #if !defined(OF_HAVE_GENERICS) && !defined(DOXYGEN) # undef ObjectType #endif @end OF_ASSUME_NONNULL_END |
Modified src/OFEnumerator.m from [cc0c7b76c2] to [125e27ae6a].
| ︙ | ︙ | |||
54 55 56 57 58 59 60 61 | [ret makeImmutable]; objc_autoreleasePoolPop(pool); return ret; } @end | > > > > > > > > > > > > > > > > > > > > > | 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 |
[ret makeImmutable];
objc_autoreleasePoolPop(pool);
return ret;
}
- (int)countByEnumeratingWithState: (of_fast_enumeration_state_t *)state
objects: (id *)objects
count: (int)count
{
int i;
state->itemsPtr = objects;
state->mutationsPtr = (unsigned long *)self;
for (i = 0; i < count; i++) {
id object = [self nextObject];
if (object == nil)
return i;
objects[i] = object;
}
return i;
}
@end
|