Skip to content

Commit ddc7ec6

Browse files
committed
Renamed CDOCClass’s superClass property to superClassRef, for consistency with CDOCCategory, and to avoid confusion with -superclass (all lowercase)
1 parent bc7d56f commit ddc7ec6

5 files changed

+14
-14
lines changed

Source/CDClassFrameworkVisitor.m

+3-3
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ - (void)willVisitClass:(CDOCClass *)aClass;
4747
[self addClassName:aClass.name referencedInFramework:self.frameworkName];
4848

4949
// We only need to add superclasses for external classes - classes defined in this binary will be visited on their own
50-
id superClass = [aClass superClass];
51-
if ([superClass isKindOfClass:[CDSymbol class]]) {
52-
[self addClassForExternalSymbol:superClass];
50+
id superClassRef = [aClass superClassRef];
51+
if ([superClassRef isKindOfClass:[CDSymbol class]]) {
52+
[self addClassForExternalSymbol:superClassRef];
5353
}
5454
}
5555

Source/CDOCClass.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
@interface CDOCClass : CDOCProtocol <CDTopologicalSort>
1111

12-
@property (strong) id superClass; // can be CDOCClass, CDSymbol (for external classes), or NSString (for ObjC1 class refs)
12+
@property (strong) id superClassRef; // can be CDOCClass, CDSymbol (for external classes), or NSString (for ObjC1 class refs)
1313
@property (strong, readonly) NSString *superClassName;
1414
@property (strong) NSArray *instanceVariables;
1515
@property (assign) BOOL isExported;

Source/CDOCClass.m

+7-7
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@ - (NSString *)description;
4242

4343
- (NSString *)superClassName
4444
{
45-
if ([_superClass isKindOfClass:[CDOCClass class]]) {
46-
return [(CDOCClass *)_superClass name];
47-
} else if ([_superClass isKindOfClass:[CDSymbol class]]) {
48-
NSString *name = [(CDSymbol *)_superClass name];
45+
if ([_superClassRef isKindOfClass:[CDOCClass class]]) {
46+
return [(CDOCClass *)_superClassRef name];
47+
} else if ([_superClassRef isKindOfClass:[CDSymbol class]]) {
48+
NSString *name = [(CDSymbol *)_superClassRef name];
4949
return [CDSymbol classNameFromSymbolName:name];
50-
} else if ([_superClass isKindOfClass:[NSString class]]) {
51-
return _superClass;
50+
} else if ([_superClassRef isKindOfClass:[NSString class]]) {
51+
return _superClassRef;
5252
} else {
53-
if (_superClass) NSLog(@"unknown superclass instance %@", _superClass);
53+
if (_superClassRef) NSLog(@"unknown superclass instance %@", _superClassRef);
5454
return nil;
5555
}
5656
}

Source/CDObjectiveC1Processor.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ - (CDOCClass *)processClassDefinitionAtAddress:(uint32_t)address;
262262
aClass.name = className;
263263

264264
// TODO: can we extract more than just the string from here?
265-
aClass.superClass = [self.machOFile stringAtAddress:objcClass.super_class];
265+
aClass.superClassRef = [self.machOFile stringAtAddress:objcClass.super_class];
266266

267267
// Process ivars
268268
if (objcClass.ivars != 0) {

Source/CDObjectiveC2Processor.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -272,13 +272,13 @@ - (CDOCClass *)loadClassAtAddress:(uint64_t)address;
272272
//NSLog(@"class: got external class name (1): %@", [aClass superClassName]);
273273
} else if (objc2Class.superclass != 0) {
274274
CDOCClass *sc = [self loadClassAtAddress:objc2Class.superclass];
275-
aClass.superClass = sc;
275+
aClass.superClassRef = sc;
276276
}
277277

278278
if (superClassName) {
279279
CDSymbol *superClassSymbol = [[self.machOFile symbolTable] symbolForExternalClassName:superClassName];
280280
if (superClassSymbol)
281-
aClass.superClass = superClassSymbol;
281+
aClass.superClassRef = superClassSymbol;
282282
}
283283
}
284284

0 commit comments

Comments
 (0)