ObjFW  Diff

Differences From Artifact [65a71eea19]:

To Artifact [2c4d7aef99]:


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
177
178


179
180
181


182
183

184
185
186

187
188
189
190
191



192
193

194
195
196
197
198
199
200
201
202
203
204
205

206
207

208
209

210
211
212
213
214
215
216
217

218
219
220
221

222
223

224
225

226
227
228
229
230
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
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


177
178
179


180
181
182

183
184
185

186
187
188



189
190
191
192

193
194
195
196
197
198
199
200
201
202
203
204

205
206

207
208

209
210
211
212
213
214
215
216

217
218
219
220

221
222

223
224

225
226
227
228
229
230
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







-
-
-
-
+
+
+
+

-
-
-
+
+
+







-
+



-
+



-
+

-
-
-
+
+
+

-
+








-
+



-
+












-
+

-
+


-
+


-
+



-
-
+
+


-
+



-
+





-
-
+
+




-
+


-
+



-
+



-
+


-
+





-
+










-
+


-
+

-
+


-
+


-
+

-
-
+
+


-
+



-
+


-
+

-
+


-
-
+
+

-
-
+
+

-
+


-
+


-
-
-
+
+
+

-
+











-
+

-
+

-
+







-
+



-
+

-
+

-
+







-
+












-
+

-
+

-
+










/*!
 * @struct of_map_table_functions_t OFMapTable.h ObjFW/OFMapTable.h
 *
 * @brief A struct describing the functions to be used by the map table.
 */
typedef struct {
	/// The function to retain keys / values
	void *_Nonnull (*_Nullable retain)(void *value);
	/// The function to release keys / values
	void (*_Nullable release)(void *value);
	/// The function to retain keys / objects
	void *_Nonnull (*_Nullable retain)(void *object);
	/// The function to release keys / objects
	void (*_Nullable release)(void *object);
	/// The function to hash keys
	uint32_t (*_Nullable hash)(void *value);
	/// The function to compare keys / values
	bool (*_Nullable equal)(void *value1, void *value2);
	uint32_t (*_Nullable hash)(void *object);
	/// The function to compare keys / objects
	bool (*_Nullable equal)(void *object1, void *object2);
} of_map_table_functions_t;

#ifdef OF_HAVE_BLOCKS
/*!
 * @brief A block for enumerating an OFMapTable.
 *
 * @param key The current key
 * @param value The current value
 * @param object The current object
 * @param stop A pointer to a variable that can be set to true to stop the
 *	       enumeration
 */
typedef void (^of_map_table_enumeration_block_t)(void *key, void *value,
typedef void (^of_map_table_enumeration_block_t)(void *key, void *object,
    bool *stop);

/*!
 * @brief A block for replacing values in an OFMapTable.
 * @brief A block for replacing objects in an OFMapTable.
 *
 * @param key The key of the value to replace
 * @param value The value to replace
 * @return The value to replace the value with
 * @param key The key of the object to replace
 * @param object The object to replace
 * @return The object to replace the object with
 */
typedef void *_Nonnull (^of_map_table_replace_block_t)(void *key, void *value);
typedef void *_Nonnull (^of_map_table_replace_block_t)(void *key, void *object);
#endif

@class OFMapTableEnumerator;

/*!
 * @class OFMapTable OFMapTable.h ObjFW/OFMapTable.h
 *
 * @brief A class similar to OFDictionary, but providing more options how keys
 *	  and values should be retained, released, compared and hashed.
 *	  and objects should be retained, released, compared and hashed.
 */
@interface OFMapTable: OFObject <OFCopying, OFFastEnumeration>
{
	of_map_table_functions_t _keyFunctions, _valueFunctions;
	of_map_table_functions_t _keyFunctions, _objectFunctions;
	struct of_map_table_bucket **_buckets;
	uint32_t _count, _capacity;
	uint8_t _rotate;
	unsigned long _mutations;
}

/*!
 * The key functions used by the map table.
 */
@property (readonly) of_map_table_functions_t keyFunctions;

/*!
 * The value functions used by the map table.
 * The object functions used by the map table.
 */
@property (readonly) of_map_table_functions_t valueFunctions;
@property (readonly) of_map_table_functions_t objectFunctions;

/*!
 * @brief Creates a new OFMapTable with the specified key and value functions.
 * @brief Creates a new OFMapTable with the specified key and object functions.
 *
 * @param keyFunctions A structure of functions for handling keys
 * @param valueFunctions A structure of functions for handling values
 * @param objectFunctions A structure of functions for handling objects
 * @return A new autoreleased OFMapTable
 */
+ (instancetype)mapTableWithKeyFunctions: (of_map_table_functions_t)keyFunctions
			  valueFunctions: (of_map_table_functions_t)
					      valueFunctions;
			 objectFunctions: (of_map_table_functions_t)
					      objectFunctions;

/*!
 * @brief Creates a new OFMapTable with the specified key functions, value
 * @brief Creates a new OFMapTable with the specified key functions, object
 *	  functions and capacity.
 *
 * @param keyFunctions A structure of functions for handling keys
 * @param valueFunctions A structure of functions for handling values
 * @param objectFunctions A structure of functions for handling objects
 * @param capacity A hint about the count of elements expected to be in the map
 *	  table
 * @return A new autoreleased OFMapTable
 */
+ (instancetype)mapTableWithKeyFunctions: (of_map_table_functions_t)keyFunctions
			  valueFunctions: (of_map_table_functions_t)
					      valueFunctions
			 objectFunctions: (of_map_table_functions_t)
					      objectFunctions
				capacity: (size_t)capacity;

/*!
 * @brief Initializes an already allocated OFMapTable with the specified key
 *	  and value functions.
 *	  and object functions.
 *
 * @param keyFunctions A structure of functions for handling keys
 * @param valueFunctions A structure of functions for handling values
 * @param objectFunctions A structure of functions for handling objects
 * @return An initialized OFMapTable
 */
- initWithKeyFunctions: (of_map_table_functions_t)keyFunctions
	valueFunctions: (of_map_table_functions_t)valueFunctions;
       objectFunctions: (of_map_table_functions_t)objectFunctions;

/*!
 * @brief Initializes an already allocated OFMapTable with the specified key
 *	  functions, value functions and capacity.
 *	  functions, object functions and capacity.
 *
 * @param keyFunctions A structure of functions for handling keys
 * @param valueFunctions A structure of functions for handling values
 * @param objectFunctions A structure of functions for handling objects
 * @param capacity A hint about the count of elements expected to be in the map
 *	  table
 * @return An initialized OFMapTable
 */
- initWithKeyFunctions: (of_map_table_functions_t)keyFunctions
	valueFunctions: (of_map_table_functions_t)valueFunctions
       objectFunctions: (of_map_table_functions_t)objectFunctions
	      capacity: (size_t)capacity;

/*!
 * @brief Returns the number of objects in the map table.
 *
 * @return The number of objects in the map table
 */
- (size_t)count;

/*!
 * @brief Returns the value for the given key or NULL if the key was not found.
 * @brief Returns the object for the given key or NULL if the key was not found.
 *
 * @param key The key whose object should be returned
 * @return The value for the given key or NULL if the key was not found
 * @return The object for the given key or NULL if the key was not found
 */
- (nullable void*)valueForKey: (void*)key;
- (nullable void*)objectForKey: (void*)key;

/*!
 * @brief Sets a value for a key.
 * @brief Sets an object for a key.
 *
 * @param key The key to set
 * @param value The value to set the key to
 * @param object The object to set the key to
 */
- (void)setValue: (void*)value
	  forKey: (void*)key;
- (void)setObject: (void*)object
	   forKey: (void*)key;

/*!
 * @brief Removes the value for the specified key from the map table.
 * @brief Removes the object for the specified key from the map table.
 *
 * @param key The key whose object should be removed
 */
- (void)removeValueForKey: (void*)key;
- (void)removeObjectForKey: (void*)key;

/*!
 * @brief Removes all values.
 * @brief Removes all objects.
 */
- (void)removeAllValues;
- (void)removeAllObjects;

/*!
 * @brief Checks whether the map table contains a value equal to the specified
 *	  value.
 * @brief Checks whether the map table contains an object equal to the
 *	  specified object.
 *
 * @param value The value which is checked for being in the map table
 * @return A boolean whether the map table contains the specified value
 * @param object The object which is checked for being in the map table
 * @return A boolean whether the map table contains the specified object
*/
- (bool)containsValue: (nullable void*)value;
- (bool)containsObject: (nullable void*)object;

/*!
 * @brief Checks whether the map table contains a value with the specified
 * @brief Checks whether the map table contains an object with the specified
 *        address.
 *
 * @param value The value which is checked for being in the map table
 * @return A boolean whether the map table contains a value with the specified
 *	   address.
 * @param object The object which is checked for being in the map table
 * @return A boolean whether the map table contains an object with the
 *	   specified address.
 */
- (bool)containsValueIdenticalTo: (nullable void*)value;
- (bool)containsObjectIdenticalTo: (nullable void*)object;

/*!
 * @brief Returns an OFMapTableEnumerator to enumerate through the map table's
 *	  keys.
 *
 * @return An OFMapTableEnumerator to enumerate through the map table's keys
 */
- (OFMapTableEnumerator*)keyEnumerator;

/*!
 * @brief Returns an OFMapTableEnumerator to enumerate through the map table's
 *	  values.
 *	  objects.
 *
 * @return An OFMapTableEnumerator to enumerate through the map table's values
 * @return An OFMapTableEnumerator to enumerate through the map table's objects
 */
- (OFMapTableEnumerator*)valueEnumerator;
- (OFMapTableEnumerator*)objectEnumerator;

#ifdef OF_HAVE_BLOCKS
/*!
 * @brief Executes a block for each key / object pair.
 *
 * @param block The block to execute for each key / object pair.
 */
- (void)enumerateKeysAndValuesUsingBlock:
- (void)enumerateKeysAndObjectsUsingBlock:
    (of_map_table_enumeration_block_t)block;

/*!
 * @brief Replaces each value with the value returned by the block.
 * @brief Replaces each object with the object returned by the block.
 *
 * @param block The block which returns a new value for each value
 * @param block The block which returns a new object for each object
 */
- (void)replaceValuesUsingBlock: (of_map_table_replace_block_t)block;
- (void)replaceObjectsUsingBlock: (of_map_table_replace_block_t)block;
#endif
@end

/*!
 * @class OFMapTableEnumerator OFMapTable.h ObjFW/OFMapTable.h
 *
 * @brief A class which provides methods to enumerate through an OFMapTable's
 *	  keys or values.
 *	  keys or objects.
 */
@interface OFMapTableEnumerator: OFObject
{
	OFMapTable *_mapTable;
	struct of_map_table_bucket **_buckets;
	uint32_t _capacity;
	unsigned long _mutations;
	unsigned long *_mutationsPtr;
	uint32_t _position;
}

/*!
 * @brief Returns the next value.
 * @brief Returns the next object.
 *
 * @return The next value
 * @return The next object
 */
- (void*)nextValue;
- (void*)nextObject;

/*!
 * @brief Resets the enumerator, so the next call to nextKey returns the first
 *	  key again.
 */
- (void)reset;
@end

OF_ASSUME_NONNULL_END