Added CDExtensions.h, which imports all the extensions. Import this in the prefix headers. Removed those imports from the rest of the files.

This commit is contained in:
Steve Nygard 2012-02-23 04:57:47 -07:00
parent 801207f60c
commit 01051b8508
33 changed files with 31 additions and 50 deletions

View File

@ -4,5 +4,6 @@
#ifdef __OBJC__
#import <Foundation/Foundation.h>
#import "CDExtensions.h"
#define __cmd __PRETTY_FUNCTION__
#endif

View File

@ -5,8 +5,6 @@
#import "CDBalanceFormatter.h"
#import "NSString-Extensions.h"
static BOOL debug = NO;
@implementation CDBalanceFormatter

View File

@ -5,8 +5,6 @@
#import "CDClassDump.h"
#import "NSArray-Extensions.h"
#import "NSString-Extensions.h"
#import "CDFatArch.h"
#import "CDFatFile.h"
#import "CDLCDylib.h"

View File

@ -7,7 +7,6 @@
#include <mach-o/arch.h>
#import "NSArray-Extensions.h"
#import "CDClassDump.h"
#import "CDObjectiveCProcessor.h"
#import "CDMachOFile.h"

12
Source/CDExtensions.h Normal file
View File

@ -0,0 +1,12 @@
// -*- mode: ObjC -*-
// This file is part of class-dump, a utility for examining the Objective-C segment of Mach-O files.
// Copyright (C) 1997-1998, 2000-2001, 2004-2012 Steve Nygard.
#import "CDTopoSortNode.h"
#import "NSArray-Extensions.h"
#import "NSData-CDExtensions.h"
#import "NSData-CDExtensions.h"
#import "NSError-CDExtensions.h"
#import "NSScanner-Extensions.h"
#import "NSString-Extensions.h"

View File

@ -5,7 +5,6 @@
#import "CDFindMethodVisitor.h"
#import "NSArray-Extensions.h"
#import "CDClassDump.h"
#import "CDObjectiveC1Processor.h"
#import "CDMachOFile.h"

View File

@ -5,8 +5,6 @@
#import "CDLoadCommand.h"
#import <CoreFoundation/CoreFoundation.h>
@interface CDLCUUID : CDLoadCommand
@property (readonly) NSString *uuidString;

View File

@ -5,6 +5,7 @@
#import "CDLCUUID.h"
#import <CoreFoundation/CoreFoundation.h>
#import "CDMachOFile.h"
@implementation CDLCUUID

View File

@ -5,7 +5,6 @@
#import "CDMultiFileVisitor.h"
#import "NSArray-Extensions.h"
#import "CDClassDump.h"
#import "CDClassFrameworkVisitor.h"
#import "CDSymbolReferences.h"

View File

@ -4,7 +4,6 @@
// Copyright (C) 1997-1998, 2000-2001, 2004-2012 Steve Nygard.
#import "CDOCProtocol.h"
#import "CDTopologicalSortProtocol.h"
@class CDSymbolReferences;

View File

@ -8,7 +8,6 @@
#import "CDClassDump.h"
#import "CDOCMethod.h"
#import "CDSymbolReferences.h"
#import "NSArray-Extensions.h"
#import "CDVisitor.h"
#import "CDVisitorPropertyState.h"

View File

@ -4,6 +4,7 @@
// Copyright (C) 1997-1998, 2000-2001, 2004-2012 Steve Nygard.
#import "CDOCProtocol.h"
#import "CDTopologicalSortProtocol.h"
@interface CDOCClass : CDOCProtocol <CDTopologicalSort>

View File

@ -5,7 +5,6 @@
#import "CDOCClass.h"
#import "NSArray-Extensions.h"
#import "CDClassDump.h"
#import "CDOCIvar.h"
#import "CDOCMethod.h"

View File

@ -5,7 +5,6 @@
#import "CDOCIvar.h"
#import "NSError-CDExtensions.h"
#import "CDClassDump.h"
#import "CDTypeFormatter.h"
#import "CDTypeParser.h"

View File

@ -8,7 +8,6 @@
#import "CDClassDump.h"
#import "CDTypeFormatter.h"
#import "CDTypeParser.h"
#import "NSError-CDExtensions.h"
#import "CDTypeController.h"
@implementation CDOCMethod

View File

@ -5,7 +5,6 @@
#import "CDOCProperty.h"
#import "NSString-Extensions.h"
#import "CDTypeParser.h"
#import "CDTypeLexer.h"

View File

@ -5,8 +5,6 @@
#import "CDOCProtocol.h"
#import "NSArray-Extensions.h"
#import "NSError-CDExtensions.h"
#import "CDClassDump.h"
#import "CDOCMethod.h"
#import "CDOCSymtab.h"

View File

@ -19,7 +19,6 @@
#import "CDOCSymtab.h"
#import "CDSection32.h"
#import "CDLCSegment32.h"
#import "NSArray-Extensions.h"
#import "CDVisitor.h"

View File

@ -12,7 +12,6 @@
#import "CDOCClass.h"
#import "CDOCMethod.h"
#import "CDOCIvar.h"
#import "NSArray-Extensions.h"
#import "CDLCSymbolTable.h"
#import "CDOCCategory.h"
#import "CDClassDump.h"

View File

@ -8,7 +8,6 @@
#import "CDClassDump.h"
#import "CDMachOFile.h"
#import "CDVisitor.h"
#import "NSArray-Extensions.h"
#import "CDLCSegment.h"
#import "CDLCDynamicSymbolTable.h"
#import "CDLCSymbolTable.h"

View File

@ -5,8 +5,6 @@
#import "CDStructureInfo.h"
#import "NSError-CDExtensions.h"
#import "NSString-Extensions.h"
#import "CDType.h"
// If it's used in a method, then it should be declared at the top. (name or typedef)

View File

@ -5,9 +5,6 @@
#import "CDStructureTable.h"
#import "NSArray-Extensions.h"
#import "NSError-CDExtensions.h"
#import "NSString-Extensions.h"
#import "CDClassDump.h"
#import "CDSymbolReferences.h"
#import "CDType.h"

View File

@ -5,7 +5,6 @@
#import "CDTextClassDumpVisitor.h"
#import "NSArray-Extensions.h"
#import "CDClassDump.h"
#import "CDObjectiveC1Processor.h"
#import "CDMachOFile.h"

View File

@ -5,15 +5,12 @@
#import "CDType.h"
#import "NSArray-Extensions.h"
#import "NSString-Extensions.h"
#import "CDSymbolReferences.h"
#import "CDTypeController.h"
#import "CDTypeName.h"
#import "CDTypeLexer.h" // For T_NAMED_OBJECT
#import "CDTypeFormatter.h"
#import "CDTypeParser.h"
#import "NSError-CDExtensions.h"
static BOOL debugMerge = NO;

View File

@ -5,9 +5,6 @@
#import "CDTypeFormatter.h"
#import "NSError-CDExtensions.h"
#import "NSScanner-Extensions.h"
#import "NSString-Extensions.h"
#import "CDMethodType.h"
#import "CDSymbolReferences.h"
#import "CDType.h"

View File

@ -5,16 +5,16 @@
#import <Foundation/Foundation.h>
#define TK_EOS 0
#define TK_NUMBER 257
#define TK_IDENTIFIER 258
#define T_NAMED_OBJECT 259
#define TK_EOS 0
#define TK_NUMBER 257
#define TK_IDENTIFIER 258
#define T_NAMED_OBJECT 259
#define TK_QUOTED_STRING 260
#define TK_TEMPLATE_TYPE TK_IDENTIFIER
enum {
CDTypeLexerState_Normal = 0,
CDTypeLexerState_Identifier = 1,
CDTypeLexerState_Normal = 0,
CDTypeLexerState_Identifier = 1,
CDTypeLexerState_TemplateTypes = 2,
};
typedef NSUInteger CDTypeLexerState;

View File

@ -5,16 +5,14 @@
#import "CDTypeLexer.h"
#import "NSScanner-Extensions.h"
static BOOL debug = NO;
static NSString *CDTypeLexerStateName(CDTypeLexerState state)
{
switch (state) {
case CDTypeLexerState_Normal: return @"Normal";
case CDTypeLexerState_Identifier: return @"Identifier";
case CDTypeLexerState_TemplateTypes: return @"Template";
case CDTypeLexerState_Normal: return @"Normal";
case CDTypeLexerState_Identifier: return @"Identifier";
case CDTypeLexerState_TemplateTypes: return @"Template";
}
return @"Unknown";

View File

@ -5,16 +5,14 @@
#import "CDTypeParser.h"
#include <assert.h>
#import "CDMethodType.h"
#import "CDType.h"
#import "CDTypeName.h"
#import "CDTypeLexer.h"
#import "NSString-Extensions.h"
NSString *CDExceptionName_SyntaxError = @"CDExceptionName_SyntaxError";
NSString *CDExceptionName_SyntaxError = @"CDExceptionName_SyntaxError";
NSString *CDErrorDomain_TypeParser = @"CDErrorDomain_TypeParser";
NSString *CDErrorDomain_TypeParser = @"CDErrorDomain_TypeParser";
NSString *CDErrorKey_Type = @"CDErrorKey_Type";
NSString *CDErrorKey_RemainingString = @"CDErrorKey_RemainingString";

View File

@ -4,5 +4,6 @@
#ifdef __OBJC__
#import <Foundation/Foundation.h>
#import "CDExtensions.h"
#define __cmd __PRETTY_FUNCTION__
#endif

View File

@ -11,7 +11,6 @@
#include <mach-o/arch.h>
#import <Foundation/Foundation.h>
#import "NSString-Extensions.h"
#import "CDClassDump.h"
#import "CDFindMethodVisitor.h"

View File

@ -92,6 +92,7 @@
013D1F5A13A5AF6500BF0A67 /* libMachObjC.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 013D1F1113A5AE5A00BF0A67 /* libMachObjC.a */; };
0168C98713E4AB3200926EC3 /* CDLCFunctionStarts.h in Headers */ = {isa = PBXBuildFile; fileRef = 0168C98513E4AB3200926EC3 /* CDLCFunctionStarts.h */; };
0168C98813E4AB3200926EC3 /* CDLCFunctionStarts.m in Sources */ = {isa = PBXBuildFile; fileRef = 0168C98613E4AB3200926EC3 /* CDLCFunctionStarts.m */; };
018BFD4214F65DB600190F07 /* CDExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 018BFD4114F65DB600190F07 /* CDExtensions.h */; };
01B02D0113A5B0DC0047BC53 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 01EB826313A590D9003EDE60 /* Foundation.framework */; };
01B02D0E13A5B0FB0047BC53 /* formatType.m in Sources */ = {isa = PBXBuildFile; fileRef = 01B02D0D13A5B0FB0047BC53 /* formatType.m */; };
01B02D1113A5B1460047BC53 /* class-dump.m in Sources */ = {isa = PBXBuildFile; fileRef = 01B02D1013A5B1460047BC53 /* class-dump.m */; };
@ -204,6 +205,7 @@
013D1F1113A5AE5A00BF0A67 /* libMachObjC.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libMachObjC.a; sourceTree = BUILT_PRODUCTS_DIR; };
0168C98513E4AB3200926EC3 /* CDLCFunctionStarts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CDLCFunctionStarts.h; path = Source/CDLCFunctionStarts.h; sourceTree = "<group>"; };
0168C98613E4AB3200926EC3 /* CDLCFunctionStarts.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CDLCFunctionStarts.m; path = Source/CDLCFunctionStarts.m; sourceTree = "<group>"; };
018BFD4114F65DB600190F07 /* CDExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CDExtensions.h; path = Source/CDExtensions.h; sourceTree = "<group>"; };
01B02CFF13A5B0DC0047BC53 /* formatType */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = formatType; sourceTree = BUILT_PRODUCTS_DIR; };
01B02D0D13A5B0FB0047BC53 /* formatType.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = formatType.m; sourceTree = SOURCE_ROOT; };
01B02D0F13A5B1220047BC53 /* formatType-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "formatType-Prefix.pch"; sourceTree = SOURCE_ROOT; };
@ -540,6 +542,7 @@
01EB836513A59202003EDE60 /* Extensions */ = {
isa = PBXGroup;
children = (
018BFD4114F65DB600190F07 /* CDExtensions.h */,
01EB830D13A591D8003EDE60 /* CDTopologicalSortProtocol.h */,
01EB830E13A591D8003EDE60 /* CDTopoSortNode.h */,
01EB830F13A591D8003EDE60 /* CDTopoSortNode.m */,
@ -703,6 +706,7 @@
buildActionMask = 2147483647;
files = (
0168C98713E4AB3200926EC3 /* CDLCFunctionStarts.h in Headers */,
018BFD4214F65DB600190F07 /* CDExtensions.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};

View File

@ -10,7 +10,6 @@
#include <stdlib.h>
#import <Foundation/Foundation.h>
#import "NSString-Extensions.h"
#import "CDClassDump.h"
#import "CDMachOFile.h"

View File

@ -10,7 +10,6 @@
#include <stdlib.h>
#import <Foundation/Foundation.h>
#import "NSString-Extensions.h"
#import "CDClassDump.h"
#import "CDTypeFormatter.h"