Skip to content

Commit

Permalink
more classes compiling for iOS
Browse files Browse the repository at this point in the history 
- CWQueue
- CWTree
- CWBTree
- NSMutableArrayAdditions
- NSDataAdditions
- NSDateAdditions
- NSDictionaryAdditions
  • Loading branch information
@Machx
Machx committed Jan 16, 2012
1 parent 665f9d2 commit 3f3b7d0
Show file tree
Hide file tree
Showing 5 changed files with 51 additions and 20 deletions.
10 changes: 5 additions & 5 deletions Source/CWBTree.m
View file
Expand Up @@ -54,9 +54,9 @@ -(id)initWithValue:(id)aValue {
@return a BOOL indicating if the nove value and its pointers are equal
*/
-(BOOL)isEqualToNode:(CWBTreeNode *)node {
if ([[node value] isEqualTo:[self value]]){
if ([[node leftNode] isEqualTo:[self leftNode]]) {
if ([[node rightNode] isEqualTo:[self rightNode]]) {
if ([[node value] isEqual:[self value]]){
if ([[node leftNode] isEqual:[self leftNode]]) {
if ([[node rightNode] isEqual:[self rightNode]]) {
return YES;
}
}
Expand All @@ -68,7 +68,7 @@ -(BOOL)isEqualToNode:(CWBTreeNode *)node {
Performs the necessary validation before assigning the nodes left pointer value
*/
-(void)setLeftNode:(CWBTreeNode *)node {
if (![node isEqualTo:self]) {
if (![node isEqual:self]) {
if (node) { [node setParent:self]; }
leftNode = node;
}
Expand All @@ -78,7 +78,7 @@ -(void)setLeftNode:(CWBTreeNode *)node {
Performs the necessary validation before assigning the nodes right pointer value
*/
-(void)setRightNode:(CWBTreeNode *)node {
if (![node isEqualTo:self]) {
if (![node isEqual:self]) {
if (node) { [node setParent:self]; }
rightNode = node;
}
Expand Down
2 changes: 1 addition & 1 deletion Source/CWQueue.m
View file
Expand Up @@ -94,7 +94,7 @@ -(id)initWithObjectsFromArray:(NSArray *)array {
*/
-(id)dequeueTopObject {
if ([[self queue] count] == 0) { return nil; }
id topObject = [[self queue] cw_firstObject];
id topObject = [[self queue] objectAtIndex:0]; //change back to cw_firstObject sometime
[[self queue] removeObjectAtIndex:0];
return topObject;
}
Expand Down
10 changes: 5 additions & 5 deletions Source/CWTree.m
View file
Expand Up @@ -114,7 +114,7 @@ -(void)addChild:(CWTreeNode *)node {
__block BOOL anyNodeContainsValue = NO;
[[self children] cw_each:^(id obj, NSUInteger index, BOOL *stop) {
id nodeValue = [(CWTreeNode *)obj value];
if ([nodeValue isEqualTo:[node value]]) {
if ([nodeValue isEqual:[node value]]) {
anyNodeContainsValue = YES;
}
}];
Expand Down Expand Up @@ -154,9 +154,9 @@ -(void)removeChild:(CWTreeNode *)node {
@return a BOOL indicatign if the value and children/parent pointers all equal to nodes value & pointers
*/
-(BOOL)isEqualToNode:(CWTreeNode *)node {
if ([[node value] isEqualTo:[self value]]) {
if ([[node parent] isEqualTo:[self parent]]) {
if ([[node children] isEqualTo:[self children]]) {
if ([[node value] isEqual:[self value]]) {
if ([[node parent] isEqual:[self parent]]) {
if ([[node children] isEqual:[self children]]) {
return YES;
}
}
Expand All @@ -171,7 +171,7 @@ -(BOOL)isEqualToNode:(CWTreeNode *)node {
@return a BOOL with yes if the node values are equal, otherwise no.
*/
-(BOOL)isNodeValueEqualTo:(CWTreeNode *)node {
if ([[node value] isEqualTo:[self value]]) {
if ([[node value] isEqual:[self value]]) {
return YES;
}
return NO;
Expand Down
19 changes: 10 additions & 9 deletions Source/ZangetsuTouch.h
View file
Expand Up @@ -29,11 +29,10 @@

#import "CWMacros.h"
//#import "CWSHA1Utilities.h"
//#import "CWTask.h"
//#import "CWDateUtilities.h"
//#import "CWDateUtilities.h" //IN_PROGRESS_IOS
//#import "NSStringAdditions.h"
//#import "NSArrayAdditions.h"
//#import "NSDictionaryAdditions.h"
#import "NSArrayAdditions.h"
#import "NSDictionaryAdditions.h"
//#import "CWSystemInfo.h"
//#import "NSSetAdditions.h"
//#import "NSURLConnectionAdditions.h"
Expand All @@ -44,7 +43,7 @@
#import "CWErrorUtilities.h"
//#import "CWGraphicsFoundation.h"
//#import "CWMD5Utilities.h"
//#import "NSDataAdditions.h"
#import "NSDataAdditions.h"
//#import "CWCoreDataCenter.h"
//#import "NSManagedObjectAdditions.h"
//#import "CWExceptionUtilities.h"
Expand All @@ -54,14 +53,16 @@
//#import "NSDateAddtions.h"
#import "CWCFConversionMacros.h"
#import "CWStack.h"
//#import "CWTree.h"
//#import "CWBTree.h"
//#import "NSMutableArrayAdditions.h"
#import "CWTree.h"
#import "CWBTree.h"
#import "NSMutableArrayAdditions.h"
//#import "CWBase64.h"
//#import "CWZLib.h"
//#import "NSOperationQueueAdditions.h"
//#import "CWQueue.h"
#import "CWQueue.h"
//#import "CWURLRequest.h"
//#import "NSMutableURLRequestAdditions.h"
//#import "NSRecursiveLockAdditions.h"
//#import "NSManagedObjectContextAdditions.h"
// NO_COMPILE_IOS
//#import "CWTask.h" // NO_NSTASK_IOS
30 changes: 30 additions & 0 deletions Zangetsu.xcodeproj/project.pbxproj
View file
Expand Up @@ -45,6 +45,15 @@
B849523212CBE1CF00098684 /* CWMD5Utilities.m in Sources */ = {isa = PBXBuildFile; fileRef = B849523012CBE1CF00098684 /* CWMD5Utilities.m */; };
B849840614C46DC400E799A1 /* CWErrorUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = B8E71A9312C42A10003D09A7 /* CWErrorUtilities.h */; settings = {ATTRIBUTES = (Public, ); }; };
B849840814C46DCA00E799A1 /* CWErrorUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = B8E71A9412C42A10003D09A7 /* CWErrorUtilities.m */; };
B849840914C4724C00E799A1 /* CWQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = B87A7AF4145D0EDC007A4C0D /* CWQueue.h */; settings = {ATTRIBUTES = (Public, ); }; };
B849840A14C4725300E799A1 /* CWQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = B87A7AF5145D0EDC007A4C0D /* CWQueue.m */; };
B849840B14C472BE00E799A1 /* CWTree.m in Sources */ = {isa = PBXBuildFile; fileRef = 1701DA1913CC9285007EE513 /* CWTree.m */; };
B849840C14C472C200E799A1 /* CWTree.h in Headers */ = {isa = PBXBuildFile; fileRef = 1701DA1813CC9285007EE513 /* CWTree.h */; settings = {ATTRIBUTES = (Public, ); }; };
B849840D14C4736D00E799A1 /* ZangetsuTouch-Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = B869BAFF14C3AA5A00ED2908 /* ZangetsuTouch-Prefix.pch */; settings = {ATTRIBUTES = (Public, ); }; };
B849840E14C4744400E799A1 /* CWBTree.h in Headers */ = {isa = PBXBuildFile; fileRef = 17967DC313CF3CBE0023DCCB /* CWBTree.h */; settings = {ATTRIBUTES = (Public, ); }; };
B849840F14C4744A00E799A1 /* CWBTree.m in Sources */ = {isa = PBXBuildFile; fileRef = 17967DC413CF3CBE0023DCCB /* CWBTree.m */; };
B849841014C474A800E799A1 /* NSMutableArrayAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = B81049AC1407DB07005DE1E5 /* NSMutableArrayAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
B849841114C474AD00E799A1 /* NSMutableArrayAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = B81049AD1407DB07005DE1E5 /* NSMutableArrayAdditions.m */; };
B84994AA128210D6001206E1 /* CWTask.h in Headers */ = {isa = PBXBuildFile; fileRef = B84994A7128210D6001206E1 /* CWTask.h */; settings = {ATTRIBUTES = (Public, ); }; };
B84994AB128210D6001206E1 /* CWTask.m in Sources */ = {isa = PBXBuildFile; fileRef = B84994A8128210D6001206E1 /* CWTask.m */; };
B84995C6128396E1001206E1 /* CWDateUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = B84995C4128396E1001206E1 /* CWDateUtilities.h */; settings = {ATTRIBUTES = (Public, ); }; };
Expand Down Expand Up @@ -124,6 +133,12 @@
B8D9193B133E3C9D009AC4AC /* CWReachability.m in Sources */ = {isa = PBXBuildFile; fileRef = B8D91939133E3C9D009AC4AC /* CWReachability.m */; };
B8D9196D133E493A009AC4AC /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B8D9196C133E493A009AC4AC /* SystemConfiguration.framework */; };
B8DC9A94134A6DF200501FC1 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B8DC9A93134A6DF200501FC1 /* libz.dylib */; };
B8E3880414C4756F00F6D2A8 /* NSDataAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = B82B955512E24F8E00CABF26 /* NSDataAdditions.m */; };
B8E3880614C4757300F6D2A8 /* NSDataAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = B82B955412E24F8E00CABF26 /* NSDataAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
B8E3880714C4759900F6D2A8 /* NSDateAddtions.m in Sources */ = {isa = PBXBuildFile; fileRef = B8380E4113452C18009988F5 /* NSDateAddtions.m */; };
B8E3880814C4759D00F6D2A8 /* NSDateAddtions.h in Headers */ = {isa = PBXBuildFile; fileRef = B8380E4013452C18009988F5 /* NSDateAddtions.h */; settings = {ATTRIBUTES = (Public, ); }; };
B8E3880914C475EC00F6D2A8 /* NSDictionaryAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = B85889A0128E04E9002AC417 /* NSDictionaryAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
B8E3880A14C475F300F6D2A8 /* NSDictionaryAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = B85889A1128E04E9002AC417 /* NSDictionaryAdditions.m */; };
B8E654B5136CD6F8000672A0 /* CWCFConversionMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = B8E654B4136CD6F8000672A0 /* CWCFConversionMacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
B8E71A9512C42A10003D09A7 /* CWErrorUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = B8E71A9312C42A10003D09A7 /* CWErrorUtilities.h */; settings = {ATTRIBUTES = (Public, ); }; };
B8E71A9612C42A10003D09A7 /* CWErrorUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = B8E71A9412C42A10003D09A7 /* CWErrorUtilities.m */; };
Expand Down Expand Up @@ -709,6 +724,14 @@
B869BB3614C46C8400ED2908 /* CWFoundation.h in Headers */,
B869BB3914C46D3500ED2908 /* CWRuntimeUtilities.h in Headers */,
B849840614C46DC400E799A1 /* CWErrorUtilities.h in Headers */,
B849840914C4724C00E799A1 /* CWQueue.h in Headers */,
B849840C14C472C200E799A1 /* CWTree.h in Headers */,
B849840D14C4736D00E799A1 /* ZangetsuTouch-Prefix.pch in Headers */,
B849840E14C4744400E799A1 /* CWBTree.h in Headers */,
B849841014C474A800E799A1 /* NSMutableArrayAdditions.h in Headers */,
B8E3880614C4757300F6D2A8 /* NSDataAdditions.h in Headers */,
B8E3880814C4759D00F6D2A8 /* NSDateAddtions.h in Headers */,
B8E3880914C475EC00F6D2A8 /* NSDictionaryAdditions.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -931,6 +954,13 @@
B869BB3714C46C8B00ED2908 /* CWFoundation.m in Sources */,
B869BB3814C46D3100ED2908 /* CWRuntimeUtilities.m in Sources */,
B849840814C46DCA00E799A1 /* CWErrorUtilities.m in Sources */,
B849840A14C4725300E799A1 /* CWQueue.m in Sources */,
B849840B14C472BE00E799A1 /* CWTree.m in Sources */,
B849840F14C4744A00E799A1 /* CWBTree.m in Sources */,
B849841114C474AD00E799A1 /* NSMutableArrayAdditions.m in Sources */,
B8E3880414C4756F00F6D2A8 /* NSDataAdditions.m in Sources */,
B8E3880714C4759900F6D2A8 /* NSDateAddtions.m in Sources */,
B8E3880A14C475F300F6D2A8 /* NSDictionaryAdditions.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down

0 comments on commit 3f3b7d0

Please sign in to comment.