PONSO - Type-safe, in-memory Plain Old NSObjects with relationships

.gitignore

@@ -17,4 +17,8 @@ dist
 *.xcodeproj/*.mode*
 *.xcodeproj/*.pbxuser
 **/*.xcodeproj/*
-!**/*.xcodeproj/project.pbxproj
+!**/*.xcodeproj/project.pbxproj
+/mogenerator.xcodeproj/project.xcworkspace/
+/mogenerator.xcodeproj/xcuserdata/
+/contributed templates/Nikita Zhuk/ponso/sample project/PonsoTest/PonsoTest.xcodeproj/project.xcworkspace/xcuserdata/
+/contributed templates/Nikita Zhuk/ponso/sample project/PonsoTest/PonsoTest.xcodeproj/xcuserdata/

FoundationAdditions.h

@@ -39,6 +39,5 @@ extern void Printf(NSString *format, ...);
 - (BOOL)regularFileExistsAtPath:(NSString *)path;
 - (NSString *)findFile:(NSString *)filename inSearchPath:(NSArray *)paths;
 - (void)touchPath:(NSString *)filePath;
-- (BOOL)deepCreateDirectoryAtPath:(NSString *)path attributes:(NSDictionary *)attributes;
 
 @end

FoundationAdditions.m

@@ -38,7 +38,7 @@
 void ErrVPrintf(NSString *format, va_list arguments)
 {
     NSString *logString = [[NSString alloc] initWithFormat:format arguments:arguments];
-    fwrite([logString cString], 1, [logString cStringLength], stderr);
+    fwrite([logString cStringUsingEncoding:NSUTF8StringEncoding], 1, [logString lengthOfBytesUsingEncoding:NSUTF8StringEncoding], stderr);
     if (![logString hasSuffix:@"\n"]) fputc('\n', stdout);
     [logString release];
 }
@@ -55,7 +55,7 @@ void ErrPrintf(NSString *format, ...)
 void VPrintf(NSString *format, va_list arguments)
 {
     NSString *logString = [[NSString alloc] initWithFormat:format arguments:arguments];
-    fwrite([logString cString], 1, [logString cStringLength], stdout);
+    fwrite([logString cStringUsingEncoding:NSUTF8StringEncoding], 1, [logString lengthOfBytesUsingEncoding:NSUTF8StringEncoding], stdout);
     if (![logString hasSuffix:@"\n"]) fputc('\n', stdout);
     [logString release];
 }
@@ -92,7 +92,7 @@ - (id)computeReversedArrayForKey:(NSString *) key
         return [[self reversedArray] valueForKeyPath:key];
 }
 
-static int sortByName(id obj1, id obj2, void *context)
+static NSInteger sortByName(id obj1, id obj2, void *context)
 {
     return [(NSString *)[obj1 valueForKey:@"name"] compare:[obj2 valueForKey:@"name"]];
 }
@@ -143,7 +143,7 @@ - (NSArray *)arrayByMakingObjectsPerformSelector:(SEL)aSelector withObject:anObj
 - (NSArray *)arrayByMakingObjectsPerformSelector:(SEL)aSelector withObject:anObject
                                       withObject:anObject2
 {
-    unsigned		i, count = [self count];
+    NSUInteger		i, count = [self count];
     NSMutableArray	*array = [NSMutableArray arrayWithCapacity:count];
 
     for(i=0; i<count; i++)
@@ -223,7 +223,7 @@ - (BOOL)regularFileExistsAtPath:(NSString *)path
 
 - (NSString *)findFile:(NSString *)filename inSearchPath:(NSArray *)paths
 {
-    int i, count = [paths count];
+    NSInteger i, count = [paths count];
 
     for (i=0; i<count; i++)
     {
@@ -243,22 +243,8 @@ - (void)touchPath:(NSString *)filePath
 
     attributes = [[NSMutableDictionary alloc] initWithCapacity:1];
     [attributes setObject:[NSDate date] forKey:NSFileModificationDate];
-    [self changeFileAttributes:attributes atPath:filePath];
+    [self setAttributes:attributes ofItemAtPath:filePath error:nil];
     [attributes release];
 }
 
-- (BOOL)deepCreateDirectoryAtPath:(NSString *)path attributes:(NSDictionary *)attributes
-{
-    NSString *parent = [path stringByDeletingLastPathComponent];
-
-    if ([parent length] > 0 && ![self directoryExistsAtPath:parent])
-    {
-        // May want to ensure owner write permissions here...
-        if (![self deepCreateDirectoryAtPath:parent attributes:attributes])
-            return NO;
-    }
-
-    return [self createDirectoryAtPath:path attributes:attributes];
-}
-
 @end

MiscMerge/KeyValue+MiscMerge.m

@@ -65,7 +65,7 @@ - (BOOL)hasMiscMergeKey:(NSString *)key
 
     return (keySelector != NULL && [self respondsToSelector:keySelector]) ||
         ([[self class] accessInstanceVariablesDirectly] &&
-         class_getInstanceVariable([self class], [key cString]));
+         class_getInstanceVariable([self class], [key cStringUsingEncoding:NSUTF8StringEncoding]));
 }
 
 @end
@@ -117,4 +117,4 @@ static Ivar_t class_getInstanceVariable(Class aClass, const char *name)
     return NULL;
 }
 
-#endif GNU_RUNTIME
+#endif

MiscMerge/MiscMergeCommand.m

@@ -112,7 +112,7 @@ - (BOOL)eatKeyWord:(NSString *)aKeyWord fromScanner:(NSScanner *)scanner
         isOptional:(BOOL)optional
 {
     NSCharacterSet *letterSet = [NSCharacterSet letterCharacterSet];
-    int  origLocation = [scanner scanLocation];
+    NSUInteger origLocation = [scanner scanLocation];
     BOOL isAlphaKeyword = [aKeyWord length] > 0 && [letterSet characterIsMember:[aKeyWord characterAtIndex:0]];
     BOOL wasCaseSensitive = [scanner caseSensitive];
     BOOL foundKeyword;
@@ -124,7 +124,7 @@ - (BOOL)eatKeyWord:(NSString *)aKeyWord fromScanner:(NSScanner *)scanner
     if (foundKeyword && isAlphaKeyword)
     {
         NSString *string = [scanner string];
-        int currLocation = [scanner scanLocation];
+        NSUInteger currLocation = [scanner scanLocation];
 
         /* If we're at the end of the string, or the next char is not a letter, we're good. Otherwise abort. */
         if (currLocation < [string length] &&

MiscMerge/MiscMergeEngine.m

@@ -427,7 +427,7 @@ - (void)removeContextObject:(id)anObject
         [contextStack removeObjectIdenticalTo:anObject];
 
         if ( anObject == localSymbols ) {
-            int i;
+            NSInteger i;
 
             localSymbols = nil;
 
@@ -466,7 +466,7 @@ - (MiscMergeTemplate *)template
 "*/
 - (void)setMainObject:(id)anObject
 {
-    unsigned oldIndex = NSNotFound;
+    NSUInteger oldIndex = NSNotFound;
 
     if (currentObject != nil)
     {
@@ -569,7 +569,7 @@ - (MiscMergeCommandExitType)executeCommandBlock:(MiscMergeCommandBlock *)block
 {
     NSAutoreleasePool *localPool = [[NSAutoreleasePool alloc] init];
     NSArray *commandArray = [block commandArray];
-    int i, count = [commandArray count];
+    NSInteger i, count = [commandArray count];
     MiscMergeCommandExitType exitCode = MiscMergeCommandExitNormal;
     /*
      * Maintain the execution stack.  This stack isn't being used at the
@@ -603,7 +603,7 @@ - (MiscMergeCommandExitType)executeCommandBlock:(MiscMergeCommandBlock *)block
 "*/
 - (id)valueForField:(NSString *)fieldName quoted:(int)quoted
 {
-    int  i;
+    NSInteger  i;
     id   value = nil;
     id   prevValue = nil;
     id   returnValue = nil;

MiscMerge/MiscMergeExpression.m

@@ -441,7 +441,7 @@ - (NSString *)nameDescription
 
 - (NSString *)description
 {
-    int index, count = [expressions count];
+    NSInteger index, count = [expressions count];
     NSMutableString *string = [NSMutableString stringWithFormat:@"%@(", [self nameDescription]];
 
     for ( index = 0; index < count; index++ ) {
@@ -525,7 +525,7 @@ - (NSArray *)evaluateAsListWithEngine:(MiscMergeEngine *)anEngine
     NSEnumerator *enumerator = [expressions objectEnumerator];
     MiscMergeExpression *expression;
 
-    while ( expression = (MiscMergeExpression *)[enumerator nextObject] ) {
+    while (( expression = (MiscMergeExpression *)[enumerator nextObject] )) {
         [array addObject:[expression evaluateWithEngine:anEngine]];
     }
 

MiscMerge/MiscMergeFunctions.m

@@ -112,8 +112,8 @@ Class MMCommonAnscestorClass(id obj1, id obj2)
     else {
         NSCharacterSet *whitespaceSet = [NSCharacterSet whitespaceCharacterSet];
         NSCharacterSet *newlineSet = [NSCharacterSet newlineCharacterSet];
-        int start = 0, end = [string length]-1;
-        int i;
+        NSInteger start = 0, end = [string length]-1;
+        NSInteger i;
 
         for ( i = 0; i <= end; i++ ) {
             unichar character = [string characterAtIndex:i];

MiscMerge/MiscMergeTemplate.m

@@ -75,7 +75,7 @@ + (NSString *)defaultStartDelimiter
     /* This works better for whatever reason. Due to some unknown pecularities,
     a constant NSString doesn't work under Windows with Apple's
     implementation. */
-    return [NSString stringWithCString:"�"];
+    return [NSString stringWithCString:"�" encoding:NSUTF8StringEncoding];
 }
 
 /*"
@@ -87,7 +87,7 @@ + (NSString *)defaultEndDelimiter
     //	return @")";
     //	return @"�";
     /* This works better than a constant NSString for whatever reason.  See above. */
-    return [NSString stringWithCString:"�"];
+    return [NSString stringWithCString:"�" encoding:NSUTF8StringEncoding];
 }
 
 /*" Creates a new, autoreleased MiscMergeTemplate. "*/
@@ -444,9 +444,9 @@ - (void)parseContentsOfFile:(NSString *)filename
 "*/
 - (void)parseString:(NSString *)string
 {
+    NSMutableString *accumString = [[[NSMutableString alloc] init] autorelease];
     NSAutoreleasePool *localPool = [[NSAutoreleasePool alloc] init];
     NSScanner *scanner = [NSScanner scannerWithString:string];
-    NSMutableString *accumString = [[NSMutableString alloc] init];
     NSString *currString;
     int nestingLevel = 0;
     int maxNestingLevel = 0;

MiscMerge/NSScanner+MiscMerge.m

@@ -51,7 +51,7 @@ - (BOOL)scanString:(NSString *)aString
 "*/
 - (NSRange)remainingRange
 {
-    unsigned location = [self scanLocation];
+    NSUInteger location = [self scanLocation];
     return NSMakeRange(location, [[self string] length] - location);
 }
 
@@ -84,7 +84,7 @@ - (void)skipPastSkipCharacters
 
 - (BOOL)scanCharacter:(unichar)targetCharacter
 {
-    unsigned scanLocation = [self scanLocation];
+    NSUInteger scanLocation = [self scanLocation];
     NSString *myString = [self string];
 
     [self skipPastSkipCharacters];
@@ -104,7 +104,7 @@ - (BOOL)scanCharacter:(unichar)targetCharacter
 
 - (unichar)peekNextCharacter
 {
-    unsigned scanLocation;
+    NSUInteger scanLocation;
     NSString *myString;
 
     [self skipPastSkipCharacters];

MiscMerge/NSString+MiscAdditions.h

@@ -40,7 +40,7 @@ enum
 /*" "Letter" manipulation "*/
 - (NSString *)letterAtIndex:(unsigned)anIndex;
 - (NSString *)firstLetter;
-- (unsigned)letterCount;
+- (NSUInteger)letterCount;
 
 /*" Getting "words" "*/
 - (NSArray *)wordArray;

MiscMerge/NSString+MiscAdditions.m

@@ -123,11 +123,11 @@ - (NSString *)firstLetter
     return [self letterAtIndex:0];
 }
 
-- (unsigned)letterCount
+- (NSUInteger)letterCount
 {
-    unsigned count = 0;
-    unsigned selfLength = [self length];
-    unsigned currIndex = 0;
+    NSUInteger count = 0;
+    NSUInteger selfLength = [self length];
+    NSUInteger currIndex = 0;
     NSRange letterRange;
 
     while (currIndex < selfLength)
@@ -227,7 +227,7 @@ - (NSString *)firstWord
 }
 
 static NSRange _nextSearchRange(NSString *string, unsigned mask,
-                                NSRange *foundRange, unsigned lastIndex, unsigned firstIndex)
+                                NSRange *foundRange, NSUInteger lastIndex, NSUInteger firstIndex)
 {
     /*
      * The char range stuff is if we want to use
@@ -241,7 +241,7 @@ static NSRange _nextSearchRange(NSString *string, unsigned mask,
 
     if (mask & NSBackwardsSearch)
     {
-        unsigned endLocation;
+        NSUInteger endLocation;
 
         if (mask & MiscOverlappingSearch)
         {
@@ -282,7 +282,7 @@ static NSRange _nextSearchRange(NSString *string, unsigned mask,
     NSRange foundRange;
     NSRange betweenRange;
     unsigned searchOptions = (mask & (NSCaseInsensitiveSearch|NSLiteralSearch));
-    unsigned selfLength = [self length];
+    NSUInteger selfLength = [self length];
     NSMutableString *newString = [NSMutableString stringWithCapacity:selfLength];
 
     mask &= ~NSBackwardsSearch;
@@ -347,7 +347,7 @@ static NSRange _nextSearchRange(NSString *string, unsigned mask,
 
         if ([scanner scanCharactersFromSet:aSet intoString:&betweenString])
         {
-            int i, count = [betweenString length];
+            NSInteger i, count = [betweenString length];
             //			int i, count = [betweenString letterCount];
 
             for (i=0;i<count;i++)
@@ -376,7 +376,7 @@ static NSRange _nextSearchRange(NSString *string, unsigned mask,
         if ([scanner scanCharactersFromSet:aSet intoString:&betweenString])
         {
             // int i, count = [betweenString length];
-            int i, count = [betweenString letterCount];
+            NSInteger i, count = [betweenString letterCount];
 
             for (i=0;i<count;i++)
                 [stringArray addObject:replaceString];
@@ -403,7 +403,7 @@ - (unsigned)numOfString:(NSString *)aString range:(NSRange)range
 
 - (unsigned)numOfString:(NSString *)aString options:(unsigned)mask range:(NSRange)range
 {
-    unsigned lastIndex = NSMaxRange(range);
+    NSUInteger lastIndex = NSMaxRange(range);
     unsigned stringCount = 0;
     unsigned searchOptions = (mask & (NSCaseInsensitiveSearch|NSLiteralSearch));
     NSRange searchRange;
@@ -441,7 +441,7 @@ - (NSRange)rangeOfString:(NSString *)aString occurrenceNum:(int)n range:(NSRange
 - (NSRange)rangeOfString:(NSString *)aString options:(unsigned)mask
                                        occurrenceNum:(int)n range:(NSRange)range
 {
-    unsigned lastIndex = NSMaxRange(range);
+    NSUInteger lastIndex = NSMaxRange(range);
     unsigned count = 0;
     unsigned searchOptions = (mask & (~NSAnchoredSearch));
     NSRange searchRange;
@@ -467,7 +467,7 @@ - (unsigned)numOfCharactersFromSet:(NSCharacterSet *)aSet
 
 - (unsigned)numOfCharactersFromSet:(NSCharacterSet *)aSet range:(NSRange)range
 {
-    unsigned lastIndex = NSMaxRange(range);
+    NSUInteger lastIndex = NSMaxRange(range);
     NSRange searchRange = {range.location, lastIndex};
     NSRange foundRange;
     unsigned characterCount = 0;
@@ -487,7 +487,7 @@ - (unsigned)numOfCharactersFromSet:(NSCharacterSet *)aSet range:(NSRange)range
 
 - (NSArray *)componentsSeparatedByCharactersFromSet:(NSCharacterSet *)aSet
 {
-    unsigned selfLength = [self length];
+    NSUInteger selfLength = [self length];
     NSRange searchRange = {0, selfLength};
     NSRange betweenRange = {0, 0};
     NSRange foundRange;

MiscMerge/_MiscMergeCallCommand.m

@@ -50,7 +50,7 @@ - (BOOL)parseFromScanner:(NSScanner *)aScanner template:(MiscMergeTemplate *)tem
     [self eatKeyWord:@"call" fromScanner:aScanner isOptional:NO];
     procedureName = [[self getArgumentStringFromScanner:aScanner toEnd:NO] retain];
 
-    while (argName = [self getArgumentStringFromScanner:aScanner toEnd:NO quotes:&quotes])
+    while ((argName = [self getArgumentStringFromScanner:aScanner toEnd:NO quotes:&quotes]))
     {
         [argumentArray addObject:argName];
         [quotedArray addObject:[NSNumber numberWithInt:quotes]];
@@ -63,7 +63,7 @@ - (MiscMergeCommandExitType)executeForMerge:(MiscMergeEngine *)aMerger
 {
     NSString *symbolName = [NSString stringWithFormat:@"_MiscMergeProcedure%@", procedureName];
     _MiscMergeProcedureCommand *procCommand = [[aMerger userInfo] objectForKey:symbolName];
-    int i, count = [argumentArray count];
+    NSInteger i, count = [argumentArray count];
     NSMutableArray *realArgArray = [NSMutableArray arrayWithCapacity:count];
 
     if (procCommand == nil)

MiscMerge/_MiscMergeDebugCommand.m

@@ -38,7 +38,7 @@ - (BOOL)parseFromScanner:(NSScanner *)aScanner template:(MiscMergeTemplate *)tem
 
 - (MiscMergeCommandExitType)executeForMerge:(MiscMergeEngine *)aMerger
 {
-    fwrite([theText cString], 1, [theText cStringLength], stderr);
+    fwrite([theText cStringUsingEncoding:NSUTF8StringEncoding], 1, [theText lengthOfBytesUsingEncoding:NSUTF8StringEncoding], stderr);
     if (![theText hasSuffix:@"\n"])
         fputc('\n', stderr);
 

MiscMerge/_MiscMergeIncludeCommand.m

@@ -53,7 +53,7 @@ - (BOOL)parseFromScanner:(NSScanner *)aScanner template:(MiscMergeTemplate *)tem
     resolvedFilename = [template resolveTemplateFilename:filename];
 
     if ([resolvedFilename length] > 0)
-        fileString = [[NSString alloc] initWithContentsOfFile:resolvedFilename];
+        fileString = [[[NSString alloc] initWithContentsOfFile:resolvedFilename] autorelease];
 
     if (fileString)
     {