From 0dd2364a7cfc80cecbe500a68bd3833fd6702c89 Mon Sep 17 00:00:00 2001 From: Tomaz Kragelj Date: Fri, 24 Sep 2010 09:31:53 +0200 Subject: [PATCH] Renamed GBDeclaredFileData to GBSourceInfo to better convey the purpose of the class. --- Model/GBDataObjects.h | 2 +- Model/GBModelBase.h | 24 ++++++------ Model/GBModelBase.m | 38 +++++++++---------- .../{GBDeclaredFileData.h => GBSourceInfo.h} | 6 +-- .../{GBDeclaredFileData.m => GBSourceInfo.m} | 12 +++--- Parsing/GBObjectiveCParser.m | 10 ++--- Parsing/GBTokenizer.h | 6 +-- Parsing/GBTokenizer.m | 6 +-- Testing/GBCategoryDataTesting.m | 4 +- Testing/GBClassDataTesting.m | 4 +- Testing/GBIvarDataTesting.m | 4 +- Testing/GBMethodDataTesting.m | 4 +- Testing/GBModelBaseTesting.m | 20 +++++----- ...BObjectiveCParser-CategoryParsingTesting.m | 12 +++--- .../GBObjectiveCParser-ClassParsingTesting.m | 8 ++-- ...GBObjectiveCParser-MethodsParsingTesting.m | 12 +++--- ...BObjectiveCParser-ProtocolParsingTesting.m | 4 +- Testing/GBProtocolDataTesting.m | 4 +- appledoc.xcodeproj/project.pbxproj | 16 ++++---- 19 files changed, 98 insertions(+), 98 deletions(-) rename Model/{GBDeclaredFileData.h => GBSourceInfo.h} (94%) rename Model/{GBDeclaredFileData.m => GBSourceInfo.m} (80%) diff --git a/Model/GBDataObjects.h b/Model/GBDataObjects.h index 7f85278d..7e401c4c 100644 --- a/Model/GBDataObjects.h +++ b/Model/GBDataObjects.h @@ -24,7 +24,7 @@ #import "GBMethodData.h" #import "GBMethodArgument.h" #import "GBMethodSectionData.h" -#import "GBDeclaredFileData.h" +#import "GBSourceInfo.h" #import "GBAdoptedProtocolsProvider.h" #import "GBIvarsProvider.h" diff --git a/Model/GBModelBase.h b/Model/GBModelBase.h index e6efebb8..09f32222 100644 --- a/Model/GBModelBase.h +++ b/Model/GBModelBase.h @@ -9,13 +9,13 @@ #import @class GBComment; -@class GBDeclaredFileData; +@class GBSourceInfo; /** Provides common functionality for model objects. */ @interface GBModelBase : NSObject { @private - NSMutableSet *_declaredFiles; - NSMutableDictionary *_declaredFilesByFilenames; + NSMutableSet *_sourceInfos; + NSMutableDictionary *_sourceInfosByFilenames; GBComment *_comment; } @@ -23,28 +23,28 @@ /// @name Declared files handling ///--------------------------------------------------------------------------------------- -/** Registers the given `GBDeclaredFileData` to `declaredFiles` list. +/** Registers the given `GBDeclaredFileData` to `sourceInfos` list. If file data with the same filename already exists in the set, it is replaced with the given one. @param filename The name of the file to register. @exception NSException Thrown if the given filename is `nil` or empty. */ -- (void)registerDeclaredFile:(GBDeclaredFileData *)data; +- (void)registerSourceInfo:(GBSourceInfo *)data; -/** Returns the array of all `declaredFiles` sorted by file name. +/** Returns the array of all `sourceInfos` sorted by file name. - @see declaredFiles - @see registerDeclaredFile: + @see sourceInfos + @see registerSourceInfo: */ -- (NSArray *)declaredFilesSortedByName; +- (NSArray *)sourceInfosSortedByName; /** The list of all declared file data as `GBDeclaredFileData` objects. - @see registerDeclaredFile: - @see declaredFilesSortedByName + @see registerSourceInfo: + @see sourceInfosSortedByName */ -@property (readonly) NSSet *declaredFiles; +@property (readonly) NSSet *sourceInfos; ///--------------------------------------------------------------------------------------- /// @name Comments handling diff --git a/Model/GBModelBase.m b/Model/GBModelBase.m index be9112e0..d05b97f1 100644 --- a/Model/GBModelBase.m +++ b/Model/GBModelBase.m @@ -16,8 +16,8 @@ @implementation GBModelBase - (id)init { self = [super init]; if (self) { - _declaredFiles = [[NSMutableSet alloc] init]; - _declaredFilesByFilenames = [[NSMutableDictionary alloc] init]; + _sourceInfos = [[NSMutableSet alloc] init]; + _sourceInfosByFilenames = [[NSMutableDictionary alloc] init]; } return self; } @@ -28,19 +28,19 @@ - (void)mergeDataFromObject:(id)source { NSParameterAssert([source isKindOfClass:[self class]]); // Merge declared files. - NSArray *sourceFiles = [[source declaredFiles] allObjects]; - for (GBDeclaredFileData *filedata in sourceFiles) { - GBDeclaredFileData *ourfiledata = [_declaredFilesByFilenames objectForKey:filedata.filename]; + NSArray *sourceFiles = [[source sourceInfos] allObjects]; + for (GBSourceInfo *filedata in sourceFiles) { + GBSourceInfo *ourfiledata = [_sourceInfosByFilenames objectForKey:filedata.filename]; if (ourfiledata) { if (ourfiledata.lineNumber < filedata.lineNumber) { - [_declaredFilesByFilenames setObject:filedata forKey:filedata.filename]; - [_declaredFiles removeObject:ourfiledata]; - [_declaredFiles addObject:filedata]; + [_sourceInfosByFilenames setObject:filedata forKey:filedata.filename]; + [_sourceInfos removeObject:ourfiledata]; + [_sourceInfos addObject:filedata]; } continue; } - [_declaredFilesByFilenames setObject:filedata forKey:filedata.filename]; - [_declaredFiles addObject:filedata]; + [_sourceInfosByFilenames setObject:filedata forKey:filedata.filename]; + [_sourceInfos addObject:filedata]; } // Merge comment. @@ -54,23 +54,23 @@ - (void)mergeDataFromObject:(id)source { #pragma mark Declared files handling -- (void)registerDeclaredFile:(GBDeclaredFileData *)data { +- (void)registerSourceInfo:(GBSourceInfo *)data { NSParameterAssert(data != nil); // Ignore already registered objects. - if ([_declaredFiles member:data]) return; + if ([_sourceInfos member:data]) return; // Replace data with same filename. - GBDeclaredFileData *existing = [_declaredFilesByFilenames objectForKey:data.filename]; - if (existing) [_declaredFiles removeObject:existing]; + GBSourceInfo *existing = [_sourceInfosByFilenames objectForKey:data.filename]; + if (existing) [_sourceInfos removeObject:existing]; // Add object. - [_declaredFilesByFilenames setObject:data forKey:data.filename]; - [_declaredFiles addObject:data]; + [_sourceInfosByFilenames setObject:data forKey:data.filename]; + [_sourceInfos addObject:data]; } -- (NSArray *)declaredFilesSortedByName { - return [[self.declaredFiles allObjects] sortedArrayUsingSelector:@selector(compare:)]; +- (NSArray *)sourceInfosSortedByName { + return [[self.sourceInfos allObjects] sortedArrayUsingSelector:@selector(compare:)]; } #pragma mark Comments handling @@ -88,7 +88,7 @@ - (void)registerCommentString:(NSString *)value { #pragma mark Properties @synthesize comment = _comment; -@synthesize declaredFiles = _declaredFiles; +@synthesize sourceInfos = _sourceInfos; @synthesize parentObject; @end diff --git a/Model/GBDeclaredFileData.h b/Model/GBSourceInfo.h similarity index 94% rename from Model/GBDeclaredFileData.h rename to Model/GBSourceInfo.h index 9d5a84d3..4fdad907 100644 --- a/Model/GBDeclaredFileData.h +++ b/Model/GBSourceInfo.h @@ -1,5 +1,5 @@ // -// GBDeclaredFileData.h +// GBSourceInfo.h // appledoc // // Created by Tomaz Kragelj on 23.9.10. @@ -12,7 +12,7 @@ Declared file provides information about where an object was declared - i.e. source file name and line number. This can be used for generating output and for diagnostics and as debug information. */ -@interface GBDeclaredFileData : NSObject +@interface GBSourceInfo : NSObject ///--------------------------------------------------------------------------------------- /// @name Initialization & disposal @@ -40,7 +40,7 @@ @param data `GBDeclaredFileData` to compare with. @return `NSOrderedAscending` if the value of _data_ is greater than the receiver, `NSOrderedSame` if they’re equal, and `NSOrderedDescending` if the _data_ is less than the receiver. */ -- (NSComparisonResult)compare:(GBDeclaredFileData *)data; +- (NSComparisonResult)compare:(GBSourceInfo *)data; /** The name of the file, without path. diff --git a/Model/GBDeclaredFileData.m b/Model/GBSourceInfo.m similarity index 80% rename from Model/GBDeclaredFileData.m rename to Model/GBSourceInfo.m index a25953e0..4489fa29 100644 --- a/Model/GBDeclaredFileData.m +++ b/Model/GBSourceInfo.m @@ -1,14 +1,14 @@ // -// GBDeclaredFileData.m +// GBSourceInfo.m // appledoc // // Created by Tomaz Kragelj on 23.9.10. // Copyright (C) 2010, Gentle Bytes. All rights reserved. // -#import "GBDeclaredFileData.h" +#import "GBSourceInfo.h" -@interface GBDeclaredFileData () +@interface GBSourceInfo () @property (readwrite, copy) NSString *filename; @property (readwrite, assign) NSUInteger lineNumber; @@ -17,14 +17,14 @@ @interface GBDeclaredFileData () #pragma mark - -@implementation GBDeclaredFileData +@implementation GBSourceInfo #pragma mark Initialization & disposal + (id)fileDataWithFilename:(NSString *)filename lineNumber:(NSUInteger)lineNumber { NSParameterAssert(filename != nil); NSParameterAssert([filename length] > 0); - GBDeclaredFileData *result = [[[GBDeclaredFileData alloc] init] autorelease]; + GBSourceInfo *result = [[[GBSourceInfo alloc] init] autorelease]; result.filename = filename; result.lineNumber = lineNumber; return result; @@ -32,7 +32,7 @@ + (id)fileDataWithFilename:(NSString *)filename lineNumber:(NSUInteger)lineNumbe #pragma mark Helper methods -- (NSComparisonResult)compare:(GBDeclaredFileData *)data { +- (NSComparisonResult)compare:(GBSourceInfo *)data { NSComparisonResult result = [self.filename compare:data.filename]; if (result == NSOrderedSame) { if (data.lineNumber > self.lineNumber) return NSOrderedAscending; diff --git a/Parsing/GBObjectiveCParser.m b/Parsing/GBObjectiveCParser.m index 22825c7c..fc28b384 100644 --- a/Parsing/GBObjectiveCParser.m +++ b/Parsing/GBObjectiveCParser.m @@ -217,7 +217,7 @@ - (BOOL)matchPropertyDefinitionForProvider:(GBMethodsProvider *)provider { NSString *sectionComment = [[self.tokenizer previousCommentString] copy]; NSString *sectionName = [self sectionNameFromCommentString:sectionComment]; __block BOOL result = NO; - __block GBDeclaredFileData *filedata = nil; + __block GBSourceInfo *filedata = nil; [self.tokenizer consumeFrom:@"@property" to:@";" usingBlock:^(PKToken *token, BOOL *consume, BOOL *stop) { if (!filedata) filedata = [self.tokenizer fileDataForToken:token filename:self.filename]; @@ -245,7 +245,7 @@ - (BOOL)matchPropertyDefinitionForProvider:(GBMethodsProvider *)provider { // Register property. GBMethodData *propertyData = [GBMethodData propertyDataWithAttributes:propertyAttributes components:propertyComponents]; GBLogDebug(@"Matched property definition %@.", propertyData); - [propertyData registerDeclaredFile:filedata]; + [propertyData registerSourceInfo:filedata]; [propertyData registerCommentString:comment]; [provider registerSectionIfNameIsValid:sectionName]; [provider registerMethod:propertyData]; @@ -401,7 +401,7 @@ - (BOOL)matchMethodDataForProvider:(GBMethodsProvider *)provider from:(NSString NSString *sectionComment = [[self.tokenizer previousCommentString] copy]; NSString *sectionName = [self sectionNameFromCommentString:sectionComment]; __block BOOL result = NO; - __block GBDeclaredFileData *filedata = nil; + __block GBSourceInfo *filedata = nil; GBMethodType methodType = [start isEqualToString:@"-"] ? GBMethodTypeInstance : GBMethodTypeClass; [self.tokenizer consumeFrom:start to:end usingBlock:^(PKToken *token, BOOL *consume, BOOL *stop) { if (!filedata) filedata = [self.tokenizer fileDataForToken:token filename:self.filename]; @@ -468,7 +468,7 @@ - (BOOL)matchMethodDataForProvider:(GBMethodsProvider *)provider from:(NSString // Create method instance and register it. GBMethodData *methodData = [GBMethodData methodDataWithType:methodType result:methodResult arguments:methodArgs]; GBLogDebug(@"Matched method %@%@.", start, methodData); - [methodData registerDeclaredFile:filedata]; + [methodData registerSourceInfo:filedata]; [methodData registerCommentString:comment]; [provider registerSectionIfNameIsValid:sectionName]; [provider registerMethod:methodData]; @@ -484,7 +484,7 @@ - (void)registerLastCommentToObject:(GBModelBase *)object { } - (void)registerDeclaredDataFromCurrentTokenToObject:(GBModelBase *)object { - [object registerDeclaredFile:[self.tokenizer fileDataForCurrentTokenWithFilename:self.filename]]; + [object registerSourceInfo:[self.tokenizer fileDataForCurrentTokenWithFilename:self.filename]]; } - (NSString *)sectionNameFromCommentString:(NSString *)string { diff --git a/Parsing/GBTokenizer.h b/Parsing/GBTokenizer.h index 0d9d2426..2368122d 100644 --- a/Parsing/GBTokenizer.h +++ b/Parsing/GBTokenizer.h @@ -9,7 +9,7 @@ #import #import "ParseKit.h" -@class GBDeclaredFileData; +@class GBSourceInfo; /** Provides common methods for tokenizing input source strings. @@ -122,7 +122,7 @@ @return Returns declared file data. @exception NSException Thrown if current token is `nil` or the given filename is `nil` or empty string. */ -- (GBDeclaredFileData *)fileDataForCurrentTokenWithFilename:(NSString *)filename; +- (GBSourceInfo *)fileDataForCurrentTokenWithFilename:(NSString *)filename; /** Returns `GBDeclaredFileData` object describing the given token source information. @@ -133,7 +133,7 @@ @return Returns declared file data. @exception NSException Thrown if the given token is `nil` or the given filename is `nil` or empty string. */ -- (GBDeclaredFileData *)fileDataForToken:(PKToken *)token filename:(NSString *)filename; +- (GBSourceInfo *)fileDataForToken:(PKToken *)token filename:(NSString *)filename; ///--------------------------------------------------------------------------------------- /// @name Comments handling diff --git a/Parsing/GBTokenizer.m b/Parsing/GBTokenizer.m index c311939d..866683f9 100644 --- a/Parsing/GBTokenizer.m +++ b/Parsing/GBTokenizer.m @@ -125,15 +125,15 @@ - (BOOL)eof { #pragma mark Token information handling -- (GBDeclaredFileData *)fileDataForCurrentTokenWithFilename:(NSString *)filename { +- (GBSourceInfo *)fileDataForCurrentTokenWithFilename:(NSString *)filename { return [self fileDataForToken:[self currentToken] filename:filename]; } -- (GBDeclaredFileData *)fileDataForToken:(PKToken *)token filename:(NSString *)filename { +- (GBSourceInfo *)fileDataForToken:(PKToken *)token filename:(NSString *)filename { NSParameterAssert(token != nil); NSString *substring = [self.input substringToIndex:[token offset]]; NSUInteger lines = [[substring componentsSeparatedByCharactersInSet:[NSCharacterSet newlineCharacterSet]] count]; - return [GBDeclaredFileData fileDataWithFilename:filename lineNumber:lines]; + return [GBSourceInfo fileDataWithFilename:filename lineNumber:lines]; } #pragma mark Comments handling diff --git a/Testing/GBCategoryDataTesting.m b/Testing/GBCategoryDataTesting.m index 59fdc386..a22cb62f 100644 --- a/Testing/GBCategoryDataTesting.m +++ b/Testing/GBCategoryDataTesting.m @@ -30,11 +30,11 @@ - (void)testMergeDataFromObject_shouldMergeImplementationDetails { // setup GBCategoryData *original = [GBCategoryData categoryDataWithName:@"MyCategory" className:@"MyClass"]; GBCategoryData *source = [GBCategoryData categoryDataWithName:@"MyCategory" className:@"MyClass"]; - [source registerDeclaredFile:[GBDeclaredFileData fileDataWithFilename:@"file" lineNumber:1]]; + [source registerSourceInfo:[GBSourceInfo fileDataWithFilename:@"file" lineNumber:1]]; // execute [original mergeDataFromObject:source]; // verify - simple testing here, fully tested in GBModelBaseTesting! - assertThatInteger([original.declaredFiles count], equalToInteger(1)); + assertThatInteger([original.sourceInfos count], equalToInteger(1)); } #pragma mark Category components merging diff --git a/Testing/GBClassDataTesting.m b/Testing/GBClassDataTesting.m index fd9ee646..10403e9e 100644 --- a/Testing/GBClassDataTesting.m +++ b/Testing/GBClassDataTesting.m @@ -19,11 +19,11 @@ - (void)testMergeDataFromObject_shouldMergeImplementationDetails { //setup GBClassData *original = [GBClassData classDataWithName:@"MyClass"]; GBClassData *source = [GBClassData classDataWithName:@"MyClass"]; - [source registerDeclaredFile:[GBDeclaredFileData fileDataWithFilename:@"file" lineNumber:1]]; + [source registerSourceInfo:[GBSourceInfo fileDataWithFilename:@"file" lineNumber:1]]; // execute [original mergeDataFromObject:source]; // verify - simple testing here, fully tested in GBModelBaseTesting! - assertThatInteger([original.declaredFiles count], equalToInteger(1)); + assertThatInteger([original.sourceInfos count], equalToInteger(1)); } #pragma mark Superclass data merging diff --git a/Testing/GBIvarDataTesting.m b/Testing/GBIvarDataTesting.m index aa0ab707..0ee8d6bb 100644 --- a/Testing/GBIvarDataTesting.m +++ b/Testing/GBIvarDataTesting.m @@ -17,11 +17,11 @@ - (void)testMergeDataFromObject_shouldMergeImplementationDetails { // setup - ivars don't merge any data, except they need to send base class merging message! GBIvarData *original = [GBTestObjectsRegistry ivarWithComponents:@"int", @"_name", nil]; GBIvarData *source = [GBTestObjectsRegistry ivarWithComponents:@"int", @"_name", nil]; - [source registerDeclaredFile:[GBDeclaredFileData fileDataWithFilename:@"file" lineNumber:1]]; + [source registerSourceInfo:[GBSourceInfo fileDataWithFilename:@"file" lineNumber:1]]; // execute [original mergeDataFromObject:source]; // verify - simple testing here, fully tested in GBModelBaseTesting! - assertThatInteger([original.declaredFiles count], equalToInteger(1)); + assertThatInteger([original.sourceInfos count], equalToInteger(1)); } @end diff --git a/Testing/GBMethodDataTesting.m b/Testing/GBMethodDataTesting.m index f6ce35fa..99d2513c 100644 --- a/Testing/GBMethodDataTesting.m +++ b/Testing/GBMethodDataTesting.m @@ -71,11 +71,11 @@ - (void)testMergeDataFromObject_shouldMergeImplementationDetails { // setup - methods don't merge any data, except they need to send base class merging message! GBMethodData *original = [GBTestObjectsRegistry instanceMethodWithNames:@"method", nil]; GBMethodData *source = [GBTestObjectsRegistry instanceMethodWithNames:@"method", nil]; - [source registerDeclaredFile:[GBDeclaredFileData fileDataWithFilename:@"file" lineNumber:1]]; + [source registerSourceInfo:[GBSourceInfo fileDataWithFilename:@"file" lineNumber:1]]; // execute [original mergeDataFromObject:source]; // verify - simple testing here, fully tested in GBModelBaseTesting! - assertThatInteger([original.declaredFiles count], equalToInteger(1)); + assertThatInteger([original.sourceInfos count], equalToInteger(1)); } @end diff --git a/Testing/GBModelBaseTesting.m b/Testing/GBModelBaseTesting.m index 488ae3b7..0dabdb49 100644 --- a/Testing/GBModelBaseTesting.m +++ b/Testing/GBModelBaseTesting.m @@ -18,15 +18,15 @@ @implementation GBModelBaseTesting - (void)testMergeDataFromObject_shouldMergeDeclaredFiles { // setup GBModelBase *original = [[GBModelBase alloc] init]; - [original registerDeclaredFile:[GBDeclaredFileData fileDataWithFilename:@"f1" lineNumber:1]]; - [original registerDeclaredFile:[GBDeclaredFileData fileDataWithFilename:@"f2" lineNumber:2]]; + [original registerSourceInfo:[GBSourceInfo fileDataWithFilename:@"f1" lineNumber:1]]; + [original registerSourceInfo:[GBSourceInfo fileDataWithFilename:@"f2" lineNumber:2]]; GBModelBase *source = [[GBModelBase alloc] init]; - [source registerDeclaredFile:[GBDeclaredFileData fileDataWithFilename:@"f1" lineNumber:3]]; - [source registerDeclaredFile:[GBDeclaredFileData fileDataWithFilename:@"f3" lineNumber:4]]; + [source registerSourceInfo:[GBSourceInfo fileDataWithFilename:@"f1" lineNumber:3]]; + [source registerSourceInfo:[GBSourceInfo fileDataWithFilename:@"f3" lineNumber:4]]; // execute [original mergeDataFromObject:source]; // verify - NSArray *files = [original declaredFilesSortedByName]; + NSArray *files = [original sourceInfosSortedByName]; assertThatInteger([files count], equalToInteger(3)); assertThat([[files objectAtIndex:0] filename], is(@"f1")); assertThat([[files objectAtIndex:1] filename], is(@"f2")); @@ -39,15 +39,15 @@ - (void)testMergeDataFromObject_shouldMergeDeclaredFiles { - (void)testMergeDataFromObject_shouldPreserveSourceDeclaredFiles { // setup GBModelBase *original = [[GBModelBase alloc] init]; - [original registerDeclaredFile:[GBDeclaredFileData fileDataWithFilename:@"f1" lineNumber:4]]; - [original registerDeclaredFile:[GBDeclaredFileData fileDataWithFilename:@"f2" lineNumber:3]]; + [original registerSourceInfo:[GBSourceInfo fileDataWithFilename:@"f1" lineNumber:4]]; + [original registerSourceInfo:[GBSourceInfo fileDataWithFilename:@"f2" lineNumber:3]]; GBModelBase *source = [[GBModelBase alloc] init]; - [source registerDeclaredFile:[GBDeclaredFileData fileDataWithFilename:@"f1" lineNumber:2]]; - [source registerDeclaredFile:[GBDeclaredFileData fileDataWithFilename:@"f3" lineNumber:1]]; + [source registerSourceInfo:[GBSourceInfo fileDataWithFilename:@"f1" lineNumber:2]]; + [source registerSourceInfo:[GBSourceInfo fileDataWithFilename:@"f3" lineNumber:1]]; // execute [original mergeDataFromObject:source]; // verify - NSArray *files = [source declaredFilesSortedByName]; + NSArray *files = [source sourceInfosSortedByName]; assertThatInteger([files count], equalToInteger(2)); assertThat([[files objectAtIndex:0] filename], is(@"f1")); assertThat([[files objectAtIndex:1] filename], is(@"f3")); diff --git a/Testing/GBObjectiveCParser-CategoryParsingTesting.m b/Testing/GBObjectiveCParser-CategoryParsingTesting.m index e2a42dce..5e332f81 100644 --- a/Testing/GBObjectiveCParser-CategoryParsingTesting.m +++ b/Testing/GBObjectiveCParser-CategoryParsingTesting.m @@ -39,7 +39,7 @@ - (void)testParseObjectsFromString_shouldRegisterCategoryDefinitionSourceFileAnd // execute [parser parseObjectsFromString:@"@interface MyClass(MyCategory) @end" sourceFile:@"filename.h" toStore:store]; // verify - NSSet *files = [[[store categoriesSortedByName] objectAtIndex:0] declaredFiles]; + NSSet *files = [[[store categoriesSortedByName] objectAtIndex:0] sourceInfos]; assertThatInteger([files count], equalToInteger(1)); assertThat([[files anyObject] filename], is(@"filename.h")); assertThatInteger([[files anyObject] lineNumber], equalToInteger(1)); @@ -52,7 +52,7 @@ - (void)testParseObjectsFromString_shouldRegisterCategoryDefinitionProperSourceL // execute [parser parseObjectsFromString:@"\n// cmt\n\n#define DEBUG\n\n/// hello\n@interface MyClass(MyCategory) @end" sourceFile:@"filename.h" toStore:store]; // verify - NSSet *files = [[[store categoriesSortedByName] objectAtIndex:0] declaredFiles]; + NSSet *files = [[[store categoriesSortedByName] objectAtIndex:0] sourceInfos]; assertThatInteger([[files anyObject] lineNumber], equalToInteger(7)); } @@ -91,7 +91,7 @@ - (void)testParseObjectsFromString_shouldRegisterCategoryDeclarationSourceFileAn // execute [parser parseObjectsFromString:@"@implementation MyClass(MyCategory) @end" sourceFile:@"filename.h" toStore:store]; // verify - NSSet *files = [[[store categoriesSortedByName] objectAtIndex:0] declaredFiles]; + NSSet *files = [[[store categoriesSortedByName] objectAtIndex:0] sourceInfos]; assertThatInteger([files count], equalToInteger(1)); assertThat([[files anyObject] filename], is(@"filename.h")); assertThatInteger([[files anyObject] lineNumber], equalToInteger(1)); @@ -104,7 +104,7 @@ - (void)testParseObjectsFromString_shouldRegisterCategoryDeclarationProperSource // execute [parser parseObjectsFromString:@"\n// cmt\n\n#define DEBUG\n\n/// hello\n@implementation MyClass(MyCategory) @end" sourceFile:@"filename.h" toStore:store]; // verify - NSSet *files = [[[store categoriesSortedByName] objectAtIndex:0] declaredFiles]; + NSSet *files = [[[store categoriesSortedByName] objectAtIndex:0] sourceInfos]; assertThatInteger([[files anyObject] lineNumber], equalToInteger(7)); } @@ -143,7 +143,7 @@ - (void)testParseObjectsFromString_shouldRegisterExtensionSourceFileAndLineNumbe // execute [parser parseObjectsFromString:@"@interface MyClass() @end" sourceFile:@"filename.h" toStore:store]; // verify - NSSet *files = [[[store categoriesSortedByName] objectAtIndex:0] declaredFiles]; + NSSet *files = [[[store categoriesSortedByName] objectAtIndex:0] sourceInfos]; assertThatInteger([files count], equalToInteger(1)); assertThat([[files anyObject] filename], is(@"filename.h")); assertThatInteger([[files anyObject] lineNumber], equalToInteger(1)); @@ -156,7 +156,7 @@ - (void)testParseObjectsFromString_shouldRegisterExtensionProperSourceLineNumber // execute [parser parseObjectsFromString:@"\n// cmt\n\n#define DEBUG\n\n/// hello\n@interface MyClass() @end" sourceFile:@"filename.h" toStore:store]; // verify - NSSet *files = [[[store categoriesSortedByName] objectAtIndex:0] declaredFiles]; + NSSet *files = [[[store categoriesSortedByName] objectAtIndex:0] sourceInfos]; assertThatInteger([[files anyObject] lineNumber], equalToInteger(7)); } diff --git a/Testing/GBObjectiveCParser-ClassParsingTesting.m b/Testing/GBObjectiveCParser-ClassParsingTesting.m index da2a094e..701d1d32 100644 --- a/Testing/GBObjectiveCParser-ClassParsingTesting.m +++ b/Testing/GBObjectiveCParser-ClassParsingTesting.m @@ -38,7 +38,7 @@ - (void)testParseObjectsFromString_shouldRegisterClassDefinitionSourceFileAndLin // execute [parser parseObjectsFromString:@"@interface MyClass @end" sourceFile:@"filename.h" toStore:store]; // verify - NSSet *files = [[[store classesSortedByName] objectAtIndex:0] declaredFiles]; + NSSet *files = [[[store classesSortedByName] objectAtIndex:0] sourceInfos]; assertThatInteger([files count], equalToInteger(1)); assertThat([[files anyObject] filename], is(@"filename.h")); assertThatInteger([[files anyObject] lineNumber], equalToInteger(1)); @@ -51,7 +51,7 @@ - (void)testParseObjectsFromString_shouldRegisterClassDefinitionProperSourceLine // execute [parser parseObjectsFromString:@"\n// cmt\n\n#define DEBUG\n\n/// hello\n@interface MyClass @end" sourceFile:@"filename.h" toStore:store]; // verify - NSSet *files = [[[store classesSortedByName] objectAtIndex:0] declaredFiles]; + NSSet *files = [[[store classesSortedByName] objectAtIndex:0] sourceInfos]; assertThatInteger([[files anyObject] lineNumber], equalToInteger(7)); } @@ -111,7 +111,7 @@ - (void)testParseObjectsFromString_shouldRegisterClassDeclarationSourceFileAndLi // execute [parser parseObjectsFromString:@"@implementation MyClass @end" sourceFile:@"filename.h" toStore:store]; // verify - NSSet *files = [[[store classesSortedByName] objectAtIndex:0] declaredFiles]; + NSSet *files = [[[store classesSortedByName] objectAtIndex:0] sourceInfos]; assertThatInteger([files count], equalToInteger(1)); assertThat([[files anyObject] filename], is(@"filename.h")); assertThatInteger([[files anyObject] lineNumber], equalToInteger(1)); @@ -124,7 +124,7 @@ - (void)testParseObjectsFromString_shouldRegisterClassDeclarationProperSourceLin // execute [parser parseObjectsFromString:@"\n// cmt\n\n#define DEBUG\n\n/// hello\n@implementation MyClass @end" sourceFile:@"filename.h" toStore:store]; // verify - NSSet *files = [[[store classesSortedByName] objectAtIndex:0] declaredFiles]; + NSSet *files = [[[store classesSortedByName] objectAtIndex:0] sourceInfos]; assertThatInteger([[files anyObject] lineNumber], equalToInteger(7)); } diff --git a/Testing/GBObjectiveCParser-MethodsParsingTesting.m b/Testing/GBObjectiveCParser-MethodsParsingTesting.m index ec13898c..3c759d98 100644 --- a/Testing/GBObjectiveCParser-MethodsParsingTesting.m +++ b/Testing/GBObjectiveCParser-MethodsParsingTesting.m @@ -270,7 +270,7 @@ - (void)testParseObjectsFromString_shouldRegisterMethodDefinitionSourceFileAndLi [parser parseObjectsFromString:@"@interface MyClass -(id)method; @end" sourceFile:@"filename.h" toStore:store]; // verify GBMethodData *method = [[[[[store classes] anyObject] methods] methods] objectAtIndex:0]; - NSSet *files = [method declaredFiles]; + NSSet *files = [method sourceInfos]; assertThatInteger([files count], equalToInteger(1)); assertThat([[files anyObject] filename], is(@"filename.h")); assertThatInteger([[files anyObject] lineNumber], equalToInteger(1)); @@ -284,7 +284,7 @@ - (void)testParseObjectsFromString_shouldRegisterMethodDefinitionProperLineNumbe [parser parseObjectsFromString:@"// comment\n#define SOMETHING\n\n@interface MyClass\n\n-(id)method; @end" sourceFile:@"filename.h" toStore:store]; // verify GBMethodData *method = [[[[[store classes] anyObject] methods] methods] objectAtIndex:0]; - NSSet *files = [method declaredFiles]; + NSSet *files = [method sourceInfos]; assertThatInteger([[files anyObject] lineNumber], equalToInteger(6)); } @@ -296,7 +296,7 @@ - (void)testParseObjectsFromString_shouldRegisterMethodDeclarationSourceFileAndL [parser parseObjectsFromString:@"@implementation MyClass -(id)method {} @end" sourceFile:@"filename.h" toStore:store]; // verify GBMethodData *method = [[[[[store classes] anyObject] methods] methods] objectAtIndex:0]; - NSSet *files = [method declaredFiles]; + NSSet *files = [method sourceInfos]; assertThatInteger([files count], equalToInteger(1)); assertThat([[files anyObject] filename], is(@"filename.h")); assertThatInteger([[files anyObject] lineNumber], equalToInteger(1)); @@ -310,7 +310,7 @@ - (void)testParseObjectsFromString_shouldRegisterMethodDeclarationProperLineNumb [parser parseObjectsFromString:@"// comment\n#define SOMETHING\n\n@implementation MyClass\n\n-(id)method {} @end" sourceFile:@"filename.h" toStore:store]; // verify GBMethodData *method = [[[[[store classes] anyObject] methods] methods] objectAtIndex:0]; - NSSet *files = [method declaredFiles]; + NSSet *files = [method sourceInfos]; assertThatInteger([[files anyObject] lineNumber], equalToInteger(6)); } @@ -322,7 +322,7 @@ - (void)testParseObjectsFromString_shouldRegisterProperyDefinitionSourceFileAndL [parser parseObjectsFromString:@"@interface MyClass @property(readonly)int p1; @end" sourceFile:@"filename.h" toStore:store]; // verify GBMethodData *method = [[[[[store classes] anyObject] methods] methods] objectAtIndex:0]; - NSSet *files = [method declaredFiles]; + NSSet *files = [method sourceInfos]; assertThatInteger([files count], equalToInteger(1)); assertThat([[files anyObject] filename], is(@"filename.h")); assertThatInteger([[files anyObject] lineNumber], equalToInteger(1)); @@ -336,7 +336,7 @@ - (void)testParseObjectsFromString_shouldRegisterPropertyDefinitionProperLineNum [parser parseObjectsFromString:@"// comment\n#define SOMETHING\n\n@interface MyClass\n\n@property(readonly)int p1; @end" sourceFile:@"filename.h" toStore:store]; // verify GBMethodData *method = [[[[[store classes] anyObject] methods] methods] objectAtIndex:0]; - NSSet *files = [method declaredFiles]; + NSSet *files = [method sourceInfos]; assertThatInteger([[files anyObject] lineNumber], equalToInteger(6)); } diff --git a/Testing/GBObjectiveCParser-ProtocolParsingTesting.m b/Testing/GBObjectiveCParser-ProtocolParsingTesting.m index a26c0ac3..45aad4ff 100644 --- a/Testing/GBObjectiveCParser-ProtocolParsingTesting.m +++ b/Testing/GBObjectiveCParser-ProtocolParsingTesting.m @@ -38,7 +38,7 @@ - (void)testParseObjectsFromString_shouldRegisterProtocolSourceFileAndLineNumber // execute [parser parseObjectsFromString:@"@protocol MyProtocol @end" sourceFile:@"filename.h" toStore:store]; // verify - NSSet *files = [[[store protocolsSortedByName] objectAtIndex:0] declaredFiles]; + NSSet *files = [[[store protocolsSortedByName] objectAtIndex:0] sourceInfos]; assertThatInteger([files count], equalToInteger(1)); assertThat([[files anyObject] filename], is(@"filename.h")); assertThatInteger([[files anyObject] lineNumber], equalToInteger(1)); @@ -51,7 +51,7 @@ - (void)testParseObjectsFromString_shouldRegisterProtocolProperSourceLineNumber // execute [parser parseObjectsFromString:@"\n// cmt\n\n#define DEBUG\n\n/// hello\n@protocol MyProtocol @end" sourceFile:@"filename.h" toStore:store]; // verify - NSSet *files = [[[store protocolsSortedByName] objectAtIndex:0] declaredFiles]; + NSSet *files = [[[store protocolsSortedByName] objectAtIndex:0] sourceInfos]; assertThatInteger([[files anyObject] lineNumber], equalToInteger(7)); } diff --git a/Testing/GBProtocolDataTesting.m b/Testing/GBProtocolDataTesting.m index 7e8c1bc7..fd930878 100644 --- a/Testing/GBProtocolDataTesting.m +++ b/Testing/GBProtocolDataTesting.m @@ -17,11 +17,11 @@ - (void)testMergeDataFromObject_shouldMergeImplementationDetails { // setup - protocols don't merge any data, except they need to send base class merging message! GBProtocolData *original = [GBProtocolData protocolDataWithName:@"MyProtocol"]; GBProtocolData *source = [GBProtocolData protocolDataWithName:@"MyProtocol"]; - [source registerDeclaredFile:[GBDeclaredFileData fileDataWithFilename:@"file" lineNumber:1]]; + [source registerSourceInfo:[GBSourceInfo fileDataWithFilename:@"file" lineNumber:1]]; // execute [original mergeDataFromObject:source]; // verify - simple testing here, fully tested in GBModelBaseTesting! - assertThatInteger([original.declaredFiles count], equalToInteger(1)); + assertThatInteger([original.sourceInfos count], equalToInteger(1)); } - (void)testMergeDataFromObject_shouldMergeAdoptedProtocolsAndPreserveSourceData { diff --git a/appledoc.xcodeproj/project.pbxproj b/appledoc.xcodeproj/project.pbxproj index 0de718c7..78a35655 100644 --- a/appledoc.xcodeproj/project.pbxproj +++ b/appledoc.xcodeproj/project.pbxproj @@ -84,8 +84,8 @@ 7340F02911FCC63100E712A4 /* NSObject+GBObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 7340F02711FCC63100E712A4 /* NSObject+GBObject.m */; }; 7367B84E11FEF496005ED6CD /* GBCategoryData.m in Sources */ = {isa = PBXBuildFile; fileRef = 7367B84D11FEF496005ED6CD /* GBCategoryData.m */; }; 7367BB3612003CAB005ED6CD /* GBModelBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 7367BB3512003CAB005ED6CD /* GBModelBase.m */; }; - 736B2BF6124BCBB6009145B1 /* GBDeclaredFileData.m in Sources */ = {isa = PBXBuildFile; fileRef = 736B2BF5124BCBB6009145B1 /* GBDeclaredFileData.m */; }; - 736B2BF7124BCBB6009145B1 /* GBDeclaredFileData.m in Sources */ = {isa = PBXBuildFile; fileRef = 736B2BF5124BCBB6009145B1 /* GBDeclaredFileData.m */; }; + 736B2BF6124BCBB6009145B1 /* GBSourceInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 736B2BF5124BCBB6009145B1 /* GBSourceInfo.m */; }; + 736B2BF7124BCBB6009145B1 /* GBSourceInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 736B2BF5124BCBB6009145B1 /* GBSourceInfo.m */; }; 7377404312301AC700E29F1E /* GBParagraphDecoratorItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 7377404212301AC700E29F1E /* GBParagraphDecoratorItem.m */; }; 7377404412301AC700E29F1E /* GBParagraphDecoratorItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 7377404212301AC700E29F1E /* GBParagraphDecoratorItem.m */; }; 7377404612301CDC00E29F1E /* GBCommentsProcessor-DecoratorItemsTesting.m in Sources */ = {isa = PBXBuildFile; fileRef = 7377404512301CDC00E29F1E /* GBCommentsProcessor-DecoratorItemsTesting.m */; }; @@ -186,8 +186,8 @@ 7367BB5112004058005ED6CD /* GBModelBaseTesting.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GBModelBaseTesting.m; sourceTree = ""; }; 7367BBB612004928005ED6CD /* GBCategoryDataTesting.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GBCategoryDataTesting.m; sourceTree = ""; }; 7367BC4212005888005ED6CD /* GBDataObjects.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GBDataObjects.h; sourceTree = ""; }; - 736B2BF4124BCBB6009145B1 /* GBDeclaredFileData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GBDeclaredFileData.h; sourceTree = ""; }; - 736B2BF5124BCBB6009145B1 /* GBDeclaredFileData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GBDeclaredFileData.m; sourceTree = ""; }; + 736B2BF4124BCBB6009145B1 /* GBSourceInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GBSourceInfo.h; sourceTree = ""; }; + 736B2BF5124BCBB6009145B1 /* GBSourceInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GBSourceInfo.m; sourceTree = ""; }; 7377404112301AC700E29F1E /* GBParagraphDecoratorItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GBParagraphDecoratorItem.h; sourceTree = ""; }; 7377404212301AC700E29F1E /* GBParagraphDecoratorItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GBParagraphDecoratorItem.m; sourceTree = ""; }; 7377404512301CDC00E29F1E /* GBCommentsProcessor-DecoratorItemsTesting.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GBCommentsProcessor-DecoratorItemsTesting.m"; sourceTree = ""; }; @@ -751,8 +751,8 @@ 73FC741011FE1FDF00AAD0B9 /* GBMethodsProvider.m */, 7367BB3412003CAB005ED6CD /* GBModelBase.h */, 7367BB3512003CAB005ED6CD /* GBModelBase.m */, - 736B2BF4124BCBB6009145B1 /* GBDeclaredFileData.h */, - 736B2BF5124BCBB6009145B1 /* GBDeclaredFileData.m */, + 736B2BF4124BCBB6009145B1 /* GBSourceInfo.h */, + 736B2BF5124BCBB6009145B1 /* GBSourceInfo.m */, 7307B318124A1C2E007EC6B8 /* GBMethodSectionData.h */, 7307B319124A1C2E007EC6B8 /* GBMethodSectionData.m */, ); @@ -906,7 +906,7 @@ 7307B2A6124A0888007EC6B8 /* GBCommentsProcessor-ComplexTesting.m in Sources */, 7307B311124A1929007EC6B8 /* GBObjectiveCParser-SectionsParsingTesting.m in Sources */, 7307B31A124A1C2E007EC6B8 /* GBMethodSectionData.m in Sources */, - 736B2BF6124BCBB6009145B1 /* GBDeclaredFileData.m in Sources */, + 736B2BF6124BCBB6009145B1 /* GBSourceInfo.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -957,7 +957,7 @@ 73F2CF3C1240DD64009B406B /* GBParagraphSpecialItem.m in Sources */, 738945D71246857500A4A3A0 /* GBCommentArgument.m in Sources */, 7307B31B124A1C2E007EC6B8 /* GBMethodSectionData.m in Sources */, - 736B2BF7124BCBB6009145B1 /* GBDeclaredFileData.m in Sources */, + 736B2BF7124BCBB6009145B1 /* GBSourceInfo.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };