Differences From Artifact [46193e4da0]:
- File src/OFIntrospection.m — part of check-in [4df6ab6bca] at 2017-05-13 16:56:44 on branch trunk — Fix compilation with GCC (user: js, size: 12629) [annotate] [blame] [check-ins using]
To Artifact [0844281f73]:
- File
src/OFIntrospection.m
— part of check-in
[6b77a5dd8b]
at
2017-05-21 21:28:57
on branch trunk
— Prefix private methods with of_ instead of OF_
This matches Apple's style. (user: js, size: 12629) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
29 30 31 32 33 34 35 |
- init
{
OF_INVALID_INIT_METHOD
}
#if defined(OF_OBJFW_RUNTIME)
| | | | 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 |
- init
{
OF_INVALID_INIT_METHOD
}
#if defined(OF_OBJFW_RUNTIME)
- (instancetype)of_initWithMethod: (struct objc_method *)method
{
self = [super init];
@try {
_selector = (SEL)&method->sel;
_name = [[OFString alloc]
initWithUTF8String: sel_getName(_selector)];
_typeEncoding = method->sel.types;
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
#elif defined(OF_APPLE_RUNTIME)
- (instancetype)of_initWithMethod: (Method)method
{
self = [super init];
@try {
_selector = method_getName(method);
_name = [[OFString alloc]
initWithUTF8String: sel_getName(_selector)];
|
| ︙ | ︙ | |||
136 137 138 139 140 141 142 |
- init
{
OF_INVALID_INIT_METHOD
}
#if defined(OF_OBJFW_RUNTIME)
| | | 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 |
- init
{
OF_INVALID_INIT_METHOD
}
#if defined(OF_OBJFW_RUNTIME)
- (instancetype)of_initWithProperty: (struct objc_property *)property
{
self = [super init];
@try {
_name = [[OFString alloc] initWithUTF8String: property->name];
_attributes =
property->attributes | (property->extended_attributes << 8);
|
| ︙ | ︙ | |||
159 160 161 162 163 164 165 | [self release]; @throw e; } return self; } #elif defined(OF_APPLE_RUNTIME) | | | 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 |
[self release];
@throw e;
}
return self;
}
#elif defined(OF_APPLE_RUNTIME)
- (instancetype)of_initWithProperty: (objc_property_t)property
{
self = [super init];
@try {
const char *attributes;
_name = [[OFString alloc]
|
| ︙ | ︙ | |||
362 363 364 365 366 367 368 |
- init
{
OF_INVALID_INIT_METHOD
}
#if defined(OF_OBJFW_RUNTIME)
| | | | 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 |
- init
{
OF_INVALID_INIT_METHOD
}
#if defined(OF_OBJFW_RUNTIME)
- (instancetype)of_initWithIvar: (struct objc_ivar *)ivar
{
self = [super init];
@try {
_name = [[OFString alloc] initWithUTF8String: ivar->name];
_typeEncoding = ivar->type;
_offset = ivar->offset;
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
#elif defined(OF_APPLE_RUNTIME)
- (instancetype)of_initWithIvar: (Ivar)ivar
{
self = [super init];
@try {
_name = [[OFString alloc]
initWithUTF8String: ivar_getName(ivar)];
_typeEncoding = ivar_getTypeEncoding(ivar);
|
| ︙ | ︙ | |||
455 456 457 458 459 460 461 |
#if defined(OF_OBJFW_RUNTIME)
for (methodList = object_getClass(class)->methodlist;
methodList != NULL; methodList = methodList->next) {
pool = objc_autoreleasePoolPush();
for (unsigned int i = 0; i < methodList->count; i++)
[_classMethods addObject: [[[OFMethod alloc]
| | | | | | | | | | 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 |
#if defined(OF_OBJFW_RUNTIME)
for (methodList = object_getClass(class)->methodlist;
methodList != NULL; methodList = methodList->next) {
pool = objc_autoreleasePoolPush();
for (unsigned int i = 0; i < methodList->count; i++)
[_classMethods addObject: [[[OFMethod alloc]
of_initWithMethod:
&methodList->methods[i]] autorelease]];
objc_autoreleasePoolPop(pool);
}
for (methodList = class->methodlist; methodList != NULL;
methodList = methodList->next) {
pool = objc_autoreleasePoolPush();
for (unsigned int i = 0; i < methodList->count; i++)
[_instanceMethods addObject: [[[OFMethod alloc]
of_initWithMethod:
&methodList->methods[i]] autorelease]];
objc_autoreleasePoolPop(pool);
}
for (propertyList = class->properties; propertyList != NULL;
propertyList = propertyList->next) {
pool = objc_autoreleasePoolPush();
for (unsigned int i = 0; i < propertyList->count; i++)
[_properties addObject: [[[OFProperty alloc]
of_initWithProperty:
&propertyList->properties[i]] autorelease]];
objc_autoreleasePoolPop(pool);
}
if (class->ivars != NULL) {
pool = objc_autoreleasePoolPush();
for (unsigned int i = 0; i < class->ivars->count; i++)
[_instanceVariables addObject:
[[[OFInstanceVariable alloc]
of_initWithIvar:
&class->ivars->ivars[i]] autorelease]];
objc_autoreleasePoolPop(pool);
}
#elif defined(OF_APPLE_RUNTIME)
methodList = class_copyMethodList(object_getClass(class),
&count);
@try {
pool = objc_autoreleasePoolPush();
for (unsigned int i = 0; i < count; i++)
[_classMethods addObject: [[[OFMethod alloc]
of_initWithMethod: methodList[i]]
autorelease]];
objc_autoreleasePoolPop(pool);
} @finally {
free(methodList);
}
methodList = class_copyMethodList(class, &count);
@try {
pool = objc_autoreleasePoolPush();
for (unsigned int i = 0; i < count; i++)
[_instanceMethods addObject: [[[OFMethod alloc]
of_initWithMethod: methodList[i]]
autorelease]];
objc_autoreleasePoolPop(pool);
} @finally {
free(methodList);
}
propertyList = class_copyPropertyList(class, &count);
@try {
pool = objc_autoreleasePoolPush();
for (unsigned int i = 0; i < count; i++)
[_properties addObject: [[[OFProperty alloc]
of_initWithProperty: propertyList[i]]
autorelease]];
objc_autoreleasePoolPop(pool);
} @finally {
free(propertyList);
}
ivarList = class_copyIvarList(class, &count);
@try {
pool = objc_autoreleasePoolPush();
for (unsigned int i = 0; i < count; i++)
[_instanceVariables addObject:
[[[OFInstanceVariable alloc]
of_initWithIvar: ivarList[i]] autorelease]];
objc_autoreleasePoolPop(pool);
} @finally {
free(ivarList);
}
#else
# error Invalid ObjC runtime!
|
| ︙ | ︙ |