Overview
Comment: | Add property introspection |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
bb26fbe4b8f7024ff88dac9f1c94955e |
User & Date: | js on 2014-02-12 00:10:00 |
Original User & Date: | js on 2014-02-12 00:10:01 |
Other Links: | manifest | tags |
Context
2014-02-12
| ||
00:10 | Fix --disable-sockets check-in: 611838d62d user: js tags: trunk | |
00:10 | Add property introspection check-in: bb26fbe4b8 user: js tags: trunk | |
2014-02-11
| ||
14:44 | OFHTTPServer: Allow binding to port 0 check-in: 1724525754 user: js tags: trunk | |
Changes
Modified src/OFIntrospection.h from [6014bfe449] to [f90e9b8b92].
︙ | ︙ | |||
15 16 17 18 19 20 21 22 23 24 25 26 27 28 | */ #import "OFObject.h" @class OFString; @class OFArray; @class OFMutableArray; /*! * @brief A class for describing a method. */ @interface OFMethod: OFObject { SEL _selector; | > > > > > > > > > > > > > | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 | */ #import "OFObject.h" @class OFString; @class OFArray; @class OFMutableArray; enum { OF_PROPERTY_READONLY = 0x01, OF_PROPERTY_ASSIGN = 0x04, OF_PROPERTY_READWRITE = 0x08, OF_PROPERTY_RETAIN = 0x10, OF_PROPERTY_COPY = 0x20, OF_PROPERTY_NONATOMIC = 0x40, OF_PROPERTY_SYNTHESIZED = 0x100, OF_PROPERTY_DYNAMIC = 0x200, OF_PROPERTY_ATOMIC = 0x400, OF_PROPERTY_WEAK = 0x800 }; /*! * @brief A class for describing a method. */ @interface OFMethod: OFObject { SEL _selector; |
︙ | ︙ | |||
54 55 56 57 58 59 60 61 62 63 64 65 66 67 | * @brief Returns the type encoding for the method. * * @return The type encoding for the method */ - (const char*)typeEncoding; @end /*! * @brief A class for describing an instance variable. */ @interface OFInstanceVariable: OFObject { OFString *_name; const char *_typeEncoding; | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 | * @brief Returns the type encoding for the method. * * @return The type encoding for the method */ - (const char*)typeEncoding; @end /*! * @brief A class for describing a property. */ @interface OFProperty: OFObject { OFString *_name; unsigned _attributes; OFString *_getter, *_setter; } #ifdef OF_HAVE_PROPERTIES @property (readonly, copy) OFString *name; @property (readonly) unsigned attributes; @property (readonly, copy) OFString *getter, *setter; #endif /*! * @brief Returns the name of the property. * * @return The name of the property */ - (OFString*)name; /*! * @brief Returns the attributes of the property. * * The attributes are a bitmask with the following possible flags:@n * Flag | Description * ------------------------------|------------------------------------- * OF_PROPERTY_READONLY | The property is declared `readonly` * OF_PROPERTY_READWRITE | The property is declared `readwrite` * OF_PROPERTY_ASSIGN | The property is declared `assign` * OF_PROPERTY_RETAIN | The property is declared `retain` * OF_PROPERTY_COPY | The property is declared `copy` * OF_PROPERTY_NONATOMIC | The property is declared `nonatomic` * OF_PROPERTY_ATOMIC | The property is declared `atomic` * OF_PROPERTY_WEAK | The property is declared `weak` * OF_PROPERTY_SYNTHESIZED | The property is synthesized * OF_PROPERTY_DYNAMIC | The property is dynamic * * @return The attributes of the property */ - (unsigned)attributes; /*! * @brief Returns the name of the getter. * * @return The name of the getter */ - (OFString*)getter; /*! * @brief Returns the name of the setter. * * @return The name of the setter */ - (OFString*)setter; @end /*! * @brief A class for describing an instance variable. */ @interface OFInstanceVariable: OFObject { OFString *_name; const char *_typeEncoding; |
︙ | ︙ | |||
99 100 101 102 103 104 105 | /*! * @brief A class for introspecting classes. */ @interface OFIntrospection: OFObject { OFMutableArray *_classMethods; OFMutableArray *_instanceMethods; | | < | < > | 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 | /*! * @brief A class for introspecting classes. */ @interface OFIntrospection: OFObject { OFMutableArray *_classMethods; OFMutableArray *_instanceMethods; OFMutableArray *_properties; OFMutableArray *_instanceVariables; } #ifdef OF_HAVE_PROPERTIES @property (readonly, copy) OFArray *classMethods; @property (readonly, copy) OFArray *instanceMethods; @property (readonly, copy) OFArray *properties; @property (readonly, copy) OFArray *instanceVariables; #endif /*! * @brief Creates a new introspection for the specified class. * * @return A new, autoreleased introspection for the specified class |
︙ | ︙ | |||
129 130 131 132 133 134 135 | * @return An initialized OFIntrospection */ - initWithClass: (Class)class_; /*! * @brief Returns the class methods of the class. * | | | > > > > > > > > > > > > > > > > > > > > > > > > | | 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 | * @return An initialized OFIntrospection */ - initWithClass: (Class)class_; /*! * @brief Returns the class methods of the class. * * @return An array of objects of class @ref OFMethod */ - (OFArray*)classMethods; /*! * @brief Returns the instance methods of the class. * * @return An array of objects of class @ref OFMethod */ - (OFArray*)instanceMethods; /*! * @brief Returns the properties of the class. * * @warning **Do not rely on this, as this behaves differently depending on the * compiler and ABI used!** * * @warning For the ObjFW ABI, Clang only emits data for property introspection * if `@``synthesize` or `@``dynamic` has been used on the property, * not if the property has only been implemented by methods. Using * `@``synthesize` and manually implementing the methods works, * though. * * @warning For the Apple ABI, Clang and GCC both emit data for property * introspection for every property that has been declared using * `@``property`, even if no `@``synchronize` or `@``dynamic` has been * used. * * @warning GCC does not emit any data for property introspection for the GNU * ABI. * * @return An array of objects of class @ref OFProperty */ - (OFArray*)properties; /*! * @brief Returns the instance variables of the class. * * @return An array of objects of class @ref OFInstanceVariable */ - (OFArray*)instanceVariables; /* TODO: protocols */ @end |
Modified src/OFIntrospection.m from [6a14ecf60c] to [6ffe55f66b].
︙ | ︙ | |||
13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #include <string.h> #if defined(OF_APPLE_RUNTIME) # import <objc/runtime.h> #endif #import "OFIntrospection.h" #import "OFString.h" #import "OFArray.h" #import "autorelease.h" #import "macros.h" @implementation OFMethod #if defined(OF_OBJFW_RUNTIME) - (instancetype)OF_initWithMethod: (struct objc_method*)method | > > > | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 | * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #include <string.h> #include <ctype.h> #if defined(OF_APPLE_RUNTIME) # import <objc/runtime.h> #endif #import "OFIntrospection.h" #import "OFString.h" #import "OFArray.h" #import "OFInitializationFailedException.h" #import "autorelease.h" #import "macros.h" @implementation OFMethod #if defined(OF_OBJFW_RUNTIME) - (instancetype)OF_initWithMethod: (struct objc_method*)method |
︙ | ︙ | |||
60 61 62 63 64 65 66 67 68 69 70 71 72 73 | } @catch (id e) { [self release]; @throw e; } return self; } #endif - init { OF_INVALID_INIT_METHOD } | > > | 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 | } @catch (id e) { [self release]; @throw e; } return self; } #else # error Invalid ObjC runtime! #endif - init { OF_INVALID_INIT_METHOD } |
︙ | ︙ | |||
91 92 93 94 95 96 97 | - (const char*)typeEncoding { return _typeEncoding; } - (OFString*)description { | | | | 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 | - (const char*)typeEncoding { return _typeEncoding; } - (OFString*)description { return [OFString stringWithFormat: @"<%@: %@ [%s]>", [self class], _name, _typeEncoding]; } - (bool)isEqual: (id)object { OFMethod *method; if (![object isKindOfClass: [OFMethod class]]) |
︙ | ︙ | |||
142 143 144 145 146 147 148 149 150 151 152 153 154 155 | } OF_HASH_FINALIZE(hash); return hash; } @end @implementation OFInstanceVariable #if defined(OF_OBJFW_RUNTIME) - (instancetype)OF_initWithIvar: (struct objc_ivar*)ivar { self = [super init]; | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 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 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 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 | } OF_HASH_FINALIZE(hash); return hash; } @end @implementation OFProperty #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); if (property->getter.name != NULL) _getter = [[OFString alloc] initWithUTF8String: property->getter.name]; if (property->setter.name != NULL) _setter = [[OFString alloc] initWithUTF8String: property->setter.name]; } @catch (id e) { [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] initWithUTF8String: property_getName(property)]; if ((attributes = property_getAttributes(property)) == NULL) @throw [OFInitializationFailedException exceptionWithClass: [self class]]; while (*attributes != '\0') { const char *start; switch (*attributes) { case 'R': _attributes |= OF_PROPERTY_READONLY; attributes++; break; case 'C': _attributes |= OF_PROPERTY_COPY; attributes++; break; case '&': _attributes |= OF_PROPERTY_RETAIN; attributes++; break; case 'N': _attributes |= OF_PROPERTY_NONATOMIC; attributes++; break; case 'G': start = ++attributes; if (_getter != nil) @throw [OFInitializationFailedException exceptionWithClass: [self class]]; while (*attributes != ',' && *attributes != '\0') attributes++; _getter = [[OFString alloc] initWithUTF8String: start length: attributes - start]; break; case 'S': start = ++attributes; if (_setter != nil) @throw [OFInitializationFailedException exceptionWithClass: [self class]]; while (*attributes != ',' && *attributes != '\0') attributes++; _setter = [[OFString alloc] initWithUTF8String: start length: attributes - start]; break; case 'D': _attributes |= OF_PROPERTY_DYNAMIC; attributes++; break; case 'W': _attributes |= OF_PROPERTY_WEAK; attributes++; break; case 'P': attributes++; break; case 'T': case 't': while (*attributes != ',' && *attributes != '\0') attributes++; break; default: @throw [OFInitializationFailedException exceptionWithClass: [self class]]; } if (*attributes != ',' && *attributes != '\0') @throw [OFInitializationFailedException exceptionWithClass: [self class]]; if (*attributes != '\0') attributes++; } if (!(_attributes & OF_PROPERTY_READONLY)) _attributes |= OF_PROPERTY_READWRITE; if (!(_attributes & OF_PROPERTY_COPY) && !(_attributes & OF_PROPERTY_RETAIN)) _attributes |= OF_PROPERTY_ASSIGN; if (!(_attributes & OF_PROPERTY_NONATOMIC)) _attributes |= OF_PROPERTY_ATOMIC; if (!(_attributes & OF_PROPERTY_DYNAMIC)) _attributes |= OF_PROPERTY_SYNTHESIZED; if (_getter == nil) _getter = [_name copy]; if ((_attributes & OF_PROPERTY_READWRITE) && _setter == nil) { of_unichar_t first = [_name characterAtIndex: 0]; OFMutableString *tmp = [_name mutableCopy]; _setter = tmp; if (first < 0x80) { [tmp setCharacter: toupper((int)first) atIndex: 0]; } [tmp prependString: @"set"]; [tmp makeImmutable]; } } @catch (id e) { [self release]; @throw e; } return self; } #else # error Invalid ObjC runtime! #endif - (void)dealloc { [_name release]; [_getter release]; [_setter release]; [super dealloc]; } - (OFString*)name { OF_GETTER(_name, true) } - (unsigned)attributes { return _attributes; } - (OFString*)getter { OF_GETTER(_getter, true) } - (OFString*)setter { OF_GETTER(_setter, true) } - (OFString*)description { return [OFString stringWithFormat: @"<%@: %@\n" @"\tAttributes = 0x%03X\n" @"\tGetter = %@\n" @"\tSetter = %@\n" @">", [self class], _name, _attributes, _getter, _setter]; } - (bool)isEqual: (id)object { OFProperty *otherProperty; if ([object isKindOfClass: [OFProperty class]]) return false; otherProperty = object; if (![otherProperty->_name isEqual: _name]) return false; if (otherProperty->_attributes != _attributes) return false; if (![otherProperty->_getter isEqual: _getter]) return false; if (![otherProperty->_setter isEqual: _setter]) return false; return true; } - (uint32_t)hash { uint32_t hash; OF_HASH_INIT(hash); OF_HASH_ADD_HASH(hash, [_name hash]); OF_HASH_ADD(hash, (_attributes & 0xFF00) >> 8); OF_HASH_ADD(hash, _attributes & 0xFF); OF_HASH_ADD_HASH(hash, [_getter hash]); OF_HASH_ADD_HASH(hash, [_setter hash]); OF_HASH_FINALIZE(hash); return hash; } @end @implementation OFInstanceVariable #if defined(OF_OBJFW_RUNTIME) - (instancetype)OF_initWithIvar: (struct objc_ivar*)ivar { self = [super init]; |
︙ | ︙ | |||
177 178 179 180 181 182 183 184 185 186 187 188 189 190 | } @catch (id e) { [self release]; @throw e; } return self; } #endif - init { OF_INVALID_INIT_METHOD } | > > | 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 | } @catch (id e) { [self release]; @throw e; } return self; } #else # error Invalid ObjC runtime! #endif - init { OF_INVALID_INIT_METHOD } |
︙ | ︙ | |||
227 228 229 230 231 232 233 234 235 236 | - initWithClass: (Class)class { self = [super init]; @try { #if defined(OF_OBJFW_RUNTIME) struct objc_method_list *methodList; #elif defined(OF_APPLE_RUNTIME) Method *methodList; Ivar *ivarList; | > > | > > > | | < | | | > | | | < < > | < | | | | | | > > > > > > > > > > > | | < | < | | < | | < > > | < < | > > > | < < | > > > > > > > > > > > > > > > > > | < < | > > > > | 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 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 | - initWithClass: (Class)class { self = [super init]; @try { #if defined(OF_OBJFW_RUNTIME) struct objc_method_list *methodList; struct objc_property_list *propertyList; #elif defined(OF_APPLE_RUNTIME) Method *methodList; objc_property_t *propertyList; Ivar *ivarList; unsigned count; #endif unsigned i; void *pool; _classMethods = [[OFMutableArray alloc] init]; _instanceMethods = [[OFMutableArray alloc] init]; _properties = [[OFMutableArray alloc] init]; _instanceVariables = [[OFMutableArray alloc] init]; #if defined(OF_OBJFW_RUNTIME) for (methodList = object_getClass(class)->methodlist; methodList != NULL; methodList = methodList->next) { pool = objc_autoreleasePoolPush(); for (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 (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 (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 (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 (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 (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 (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 (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! #endif [_classMethods makeImmutable]; [_instanceMethods makeImmutable]; [_properties makeImmutable]; [_instanceVariables makeImmutable]; } @catch (id e) { [self release]; @throw e; } return self; |
︙ | ︙ | |||
356 357 358 359 360 361 362 363 364 365 366 367 368 | OF_GETTER(_classMethods, true) } - (OFArray*)instanceMethods { OF_GETTER(_instanceMethods, true) } - (OFArray*)instanceVariables { OF_GETTER(_instanceVariables, true) } @end | > > > > > | 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 | OF_GETTER(_classMethods, true) } - (OFArray*)instanceMethods { OF_GETTER(_instanceMethods, true) } - (OFArray*)properties { OF_GETTER(_properties, true) } - (OFArray*)instanceVariables { OF_GETTER(_instanceVariables, true) } @end |
Modified src/runtime/runtime.h from [d678a70fe3] to [b35afd5ad2].
︙ | ︙ | |||
131 132 133 134 135 136 137 138 139 140 | OBJC_PROPERTY_ASSIGN = 0x04, OBJC_PROPERTY_READWRITE = 0x08, OBJC_PROPERTY_RETAIN = 0x10, OBJC_PROPERTY_COPY = 0x20, OBJC_PROPERTY_NONATOMIC = 0x40, OBJC_PROPERTY_SETTER = 0x80 }; struct objc_property { const char *name; | > > > > > > > > > > | < | 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 | OBJC_PROPERTY_ASSIGN = 0x04, OBJC_PROPERTY_READWRITE = 0x08, OBJC_PROPERTY_RETAIN = 0x10, OBJC_PROPERTY_COPY = 0x20, OBJC_PROPERTY_NONATOMIC = 0x40, OBJC_PROPERTY_SETTER = 0x80 }; enum objc_property_extended_attributes { OBJC_PROPERTY_SYNTHESIZE = 0x1, OBJC_PROPERTY_DYNAMIC = 0x2, OBJC_PROPERTY_PROTOCOL = 0x3, OBJC_PROPERTY_ATOMIC = 0x4, OBJC_PROPERTY_WEAK = 0x8, OBJC_PROPERTY_STRONG = 0x10, OBJC_PROPERTY_UNSAFE_UNRETAINED = 0x20 }; struct objc_property { const char *name; unsigned char attributes, extended_attributes; struct { const char *name; const char *type; } getter, setter; }; struct objc_property_list { |
︙ | ︙ |