Differences From Artifact [d718ec6322]:
- File src/OFMutableDictionary.m — part of check-in [88a584a16f] at 2017-05-25 15:09:45 on branch trunk — -[OFMutableDictionary addEntiresFromDictionary:] (user: js, size: 4404) [annotate] [blame] [check-ins using]
To Artifact [04d26872af]:
- File
src/OFMutableDictionary.m
— part of check-in
[2f4e0df8be]
at
2017-10-17 00:33:37
on branch trunk
— Do not use implicit method return types
Instead, explicitly declare them, as OF_ASSUME_NONNULL_{BEGIN,END} does
not apply to implicit return types. This means that after this commit,
all init methods have a nonnull return type, as they should have. (user: js, size: 4604) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
26 27 28 29 30 31 32 | Class isa; } placeholder; @interface OFMutableDictionary_placeholder: OFDictionary @end @implementation OFMutableDictionary_placeholder | | | | | | | | | | | | | | | | | | 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 |
Class isa;
} placeholder;
@interface OFMutableDictionary_placeholder: OFDictionary
@end
@implementation OFMutableDictionary_placeholder
- (instancetype)init
{
return (id)[[OFMutableDictionary_hashtable alloc] init];
}
- (instancetype)initWithDictionary: (OFDictionary *)dictionary
{
return (id)[[OFMutableDictionary_hashtable alloc]
initWithDictionary: dictionary];
}
- (instancetype)initWithObject: (id)object
forKey: (id)key
{
return (id)[[OFMutableDictionary_hashtable alloc] initWithObject: object
forKey: key];
}
- (instancetype)initWithObjects: (OFArray *)objects
forKeys: (OFArray *)keys
{
return (id)[[OFMutableDictionary_hashtable alloc]
initWithObjects: objects
forKeys: keys];
}
- (instancetype)initWithObjects: (id const *)objects
forKeys: (id const *)keys
count: (size_t)count
{
return (id)[[OFMutableDictionary_hashtable alloc]
initWithObjects: objects
forKeys: keys
count: count];
}
- (instancetype)initWithKeysAndObjects: (id)firstKey, ...
{
id ret;
va_list arguments;
va_start(arguments, firstKey);
ret = (id)[[OFMutableDictionary_hashtable alloc]
initWithKey: firstKey
arguments: arguments];
va_end(arguments);
return ret;
}
- (instancetype)initWithKey: (id)firstKey
arguments: (va_list)arguments
{
return (id)[[OFMutableDictionary_hashtable alloc]
initWithKey: firstKey
arguments: arguments];
}
- (instancetype)initWithSerialization: (OFXMLElement *)element
{
return (id)[[OFMutableDictionary_hashtable alloc]
initWithSerialization: element];
}
- (instancetype)initWithCapacity: (size_t)capacity
{
return (id)[[OFMutableDictionary_hashtable alloc]
initWithCapacity: capacity];
}
- (instancetype)retain
{
return self;
}
- (instancetype)autorelease
{
return self;
}
- (void)release
{
}
|
| ︙ | ︙ | |||
123 124 125 126 127 128 129 |
@implementation OFMutableDictionary
+ (void)initialize
{
if (self == [OFMutableDictionary class])
placeholder.isa = [OFMutableDictionary_placeholder class];
}
| | | | | 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 |
@implementation OFMutableDictionary
+ (void)initialize
{
if (self == [OFMutableDictionary class])
placeholder.isa = [OFMutableDictionary_placeholder class];
}
+ (instancetype)alloc
{
if (self == [OFMutableDictionary class])
return (id)&placeholder;
return [super alloc];
}
+ (instancetype)dictionaryWithCapacity: (size_t)capacity
{
return [[[self alloc] initWithCapacity: capacity] autorelease];
}
- (instancetype)init
{
if (object_getClass(self) == [OFMutableDictionary class]) {
@try {
[self doesNotRecognizeSelector: _cmd];
} @catch (id e) {
[self release];
@throw e;
}
abort();
}
return [super init];
}
- (instancetype)initWithCapacity: (size_t)capacity
{
OF_INVALID_INIT_METHOD
}
- (void)setObject: (id)object
forKey: (id)key
{
|
| ︙ | ︙ | |||
185 186 187 188 189 190 191 | for (id key in [self allKeys]) [self removeObjectForKey: key]; objc_autoreleasePoolPop(pool); } | | | 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 |
for (id key in [self allKeys])
[self removeObjectForKey: key];
objc_autoreleasePoolPop(pool);
}
- (id)copy
{
return [[OFDictionary alloc] initWithDictionary: self];
}
- (void)addEntriesFromDictionary: (OFDictionary *)dictionary
{
void *pool = objc_autoreleasePoolPush();
|
| ︙ | ︙ |