Differences From Artifact [6aba1314ef]:
- File
src/OFINICategory.m
— part of check-in
[44f45c2e35]
at
2017-01-09 17:36:36
on branch trunk
— Update copyright
Forgot to add 2017, even though I already did quite some changes in
2017. (user: js, size: 10825) [annotate] [blame] [check-ins using]
To Artifact [0b4fba9171]:
- File
src/OFINICategory.m
— part of check-in
[4af49a13c3]
at
2017-05-07 20:10:13
on branch trunk
— Small code style change
Casts are now written like types in variable declarations. (user: js, size: 10850) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
35 36 37 38 39 40 41 |
@interface OFINICategory_Comment: OFObject
{
@public
OFString *_comment;
}
@end
| | | 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 |
@interface OFINICategory_Comment: OFObject
{
@public
OFString *_comment;
}
@end
static OFString *
escapeString(OFString *string)
{
OFMutableString *mutableString;
/* FIXME: Optimize */
if (![string hasPrefix: @" "] && ![string hasPrefix: @"\t"] &&
![string hasPrefix: @"\f"] && ![string hasSuffix: @" "] &&
|
| ︙ | ︙ | |||
68 69 70 71 72 73 74 | [mutableString appendString: @"\""]; [mutableString makeImmutable]; return mutableString; } | | | 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 |
[mutableString appendString: @"\""];
[mutableString makeImmutable];
return mutableString;
}
static OFString *
unescapeString(OFString *string)
{
OFMutableString *mutableString;
if (![string hasPrefix: @"\""] || ![string hasSuffix: @"\""])
return string;
|
| ︙ | ︙ | |||
144 145 146 147 148 149 150 |
{
[_name release];
[_lines release];
[super dealloc];
}
| | | 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 |
{
[_name release];
[_lines release];
[super dealloc];
}
- (void)OF_parseLine: (OFString *)line
{
if (![line hasPrefix: @";"]) {
OFINICategory_Pair *pair =
[[[OFINICategory_Pair alloc] init] autorelease];
OFString *key, *value;
size_t pos;
|
| ︙ | ︙ | |||
179 180 181 182 183 184 185 | comment->_comment = [line copy]; [_lines addObject: comment]; } } | | | | | | | 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 |
comment->_comment = [line copy];
[_lines addObject: comment];
}
}
- (OFString *)stringForKey: (OFString *)key
{
return [self stringForKey: key
defaultValue: nil];
}
- (OFString *)stringForKey: (OFString *)key
defaultValue: (OFString *)defaultValue
{
for (id line in _lines) {
OFINICategory_Pair *pair;
if (![line isKindOfClass: [OFINICategory_Pair class]])
continue;
pair = line;
if ([pair->_key isEqual: key])
return [[pair->_value copy] autorelease];
}
return defaultValue;
}
- (intmax_t)integerForKey: (OFString *)key
defaultValue: (intmax_t)defaultValue
{
void *pool = objc_autoreleasePoolPush();
OFString *value = [self stringForKey: key
defaultValue: nil];
intmax_t ret;
if (value != nil) {
if ([value hasPrefix: @"0x"] || [value hasPrefix: @"$"])
ret = [value hexadecimalValue];
else
ret = [value decimalValue];
} else
ret = defaultValue;
objc_autoreleasePoolPop(pool);
return ret;
}
- (bool)boolForKey: (OFString *)key
defaultValue: (bool)defaultValue
{
void *pool = objc_autoreleasePoolPush();
OFString *value = [self stringForKey: key
defaultValue: nil];
bool ret;
|
| ︙ | ︙ | |||
247 248 249 250 251 252 253 | ret = defaultValue; objc_autoreleasePoolPop(pool); return ret; } | | | | | 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 |
ret = defaultValue;
objc_autoreleasePoolPop(pool);
return ret;
}
- (float)floatForKey: (OFString *)key
defaultValue: (float)defaultValue
{
void *pool = objc_autoreleasePoolPush();
OFString *value = [self stringForKey: key
defaultValue: nil];
float ret;
if (value != nil)
ret = [value floatValue];
else
ret = defaultValue;
objc_autoreleasePoolPop(pool);
return ret;
}
- (double)doubleForKey: (OFString *)key
defaultValue: (double)defaultValue
{
void *pool = objc_autoreleasePoolPush();
OFString *value = [self stringForKey: key
defaultValue: nil];
double ret;
if (value != nil)
ret = [value doubleValue];
else
ret = defaultValue;
objc_autoreleasePoolPop(pool);
return ret;
}
- (OFArray *)arrayForKey: (OFString *)key
{
OFMutableArray *ret = [OFMutableArray array];
void *pool = objc_autoreleasePoolPush();
for (id line in _lines) {
OFINICategory_Pair *pair;
|
| ︙ | ︙ | |||
307 308 309 310 311 312 313 | objc_autoreleasePoolPop(pool); [ret makeImmutable]; return ret; } | | | | 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 |
objc_autoreleasePoolPop(pool);
[ret makeImmutable];
return ret;
}
- (void)setString: (OFString *)string
forKey: (OFString *)key
{
void *pool = objc_autoreleasePoolPush();
OFINICategory_Pair *pair;
for (id line in _lines) {
if (![line isKindOfClass: [OFINICategory_Pair class]])
continue;
|
| ︙ | ︙ | |||
349 350 351 352 353 354 355 | @throw e; } objc_autoreleasePoolPop(pool); } - (void)setInteger: (intmax_t)integer | | | | | | | | 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 |
@throw e;
}
objc_autoreleasePoolPop(pool);
}
- (void)setInteger: (intmax_t)integer
forKey: (OFString *)key
{
void *pool = objc_autoreleasePoolPush();
[self setString: [OFString stringWithFormat: @"%jd", integer]
forKey: key];
objc_autoreleasePoolPop(pool);
}
- (void)setBool: (bool)bool_
forKey: (OFString *)key
{
[self setString: (bool_ ? @"true" : @"false")
forKey: key];
}
- (void)setFloat: (float)float_
forKey: (OFString *)key
{
void *pool = objc_autoreleasePoolPush();
[self setString: [OFString stringWithFormat: @"%g", float_]
forKey: key];
objc_autoreleasePoolPop(pool);
}
- (void)setDouble: (double)double_
forKey: (OFString *)key
{
void *pool = objc_autoreleasePoolPush();
[self setString: [OFString stringWithFormat: @"%g", double_]
forKey: key];
objc_autoreleasePoolPop(pool);
}
- (void)setArray: (OFArray *)array
forKey: (OFString *)key
{
void *pool;
OFMutableArray *pairs;
id const *lines;
size_t count;
bool replaced;
|
| ︙ | ︙ | |||
457 458 459 460 461 462 463 | if (!replaced) [_lines addObjectsFromArray: pairs]; objc_autoreleasePoolPop(pool); } | | | 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 |
if (!replaced)
[_lines addObjectsFromArray: pairs];
objc_autoreleasePoolPop(pool);
}
- (void)removeValueForKey: (OFString *)key
{
void *pool = objc_autoreleasePoolPush();
id const *lines = [_lines objects];
size_t count = [_lines count];
for (size_t i = 0; i < count; i++) {
OFINICategory_Pair *pair;
|
| ︙ | ︙ | |||
485 486 487 488 489 490 491 | continue; } } objc_autoreleasePoolPop(pool); } | | | 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 |
continue;
}
}
objc_autoreleasePoolPop(pool);
}
- (bool)OF_writeToStream: (OFStream *)stream
encoding: (of_string_encoding_t)encoding
first: (bool)first
{
if ([_lines count] == 0)
return false;
if (first)
|
| ︙ | ︙ |