- Fixed a lot of NS(U)Integer issues which caused potential 64-bit in…

…compatibility

FoundationAdditions.m

@@ -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++)
     {

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;
 
@@ -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++ ) {

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/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

@@ -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/_MiscMergeProcedureCommand.m

@@ -104,9 +104,9 @@ - (MiscMergeCommandExitType)executeForMerge:(MiscMergeEngine *)aMerger
 /* The *real* execute; messaged from the call command */
 - (MiscMergeCommandExitType)executeForMerge:(MiscMergeEngine *)aMerger arguments:(NSArray *)passedArgArray
 {
-    int argumentIndex = 0, argumentCount = [argumentArray count];
-    int passedIndex = 0, passedCount = [passedArgArray count];
-    int addToArgIndex = 0;
+    NSInteger argumentIndex = 0, argumentCount = [argumentArray count];
+    NSInteger passedIndex = 0, passedCount = [passedArgArray count];
+    NSInteger addToArgIndex = 0;
     NSMutableDictionary *procedureContext = [NSMutableDictionary dictionary];
 
     for ( ; passedIndex < passedCount; passedIndex++ ) {

ddcli/DDGetoptLongParser.m

@@ -42,12 +42,12 @@ - (void) handleArgumentNotRecognized: (NSString *) option
 
 @implementation DDGetoptLongParser
 
-+ (DDGetoptLongParser *) optionsWithTarget: (id) target;
++ (DDGetoptLongParser *) optionsWithTarget: (id) target
 {
     return [[[self alloc] initWithTarget: target] autorelease];
 }
 
-- (id) initWithTarget: (id) target;
+- (id) initWithTarget: (id) target
 {
     self = [super init];
     if (self == nil)
@@ -170,7 +170,7 @@ - (NSArray *) parseOptions;
 - (NSArray *) parseOptionsWithArguments: (NSArray *) arguments
                                 command: (NSString *) command;
 {
-    int argc = [arguments count];
+    NSUInteger argc = [arguments count];
     char ** argv = alloca(sizeof(char *) * argc);
     int i;
     for (i = 0; i < argc; i++)
@@ -193,7 +193,7 @@ - (NSArray *) parseOptionsWithArguments: (NSArray *) arguments
     opterr = 1;
 
     int longOptionIndex = -1;
-    while ((ch = mGetoptFunction(argc, argv, optionString, options, &longOptionIndex)) != -1)
+    while ((ch = mGetoptFunction((int)argc, argv, optionString, options, &longOptionIndex)) != -1)
     {
         NSString * last_argv = [NSString stringWithUTF8String: argv[optind-1]];
         if (ch == ':')

mogenerator.m

@@ -260,7 +260,7 @@ - (BOOL)hasTransformableAttributeType {
 @implementation NSString (camelCaseString)
 - (NSString*)camelCaseString {
 	NSArray *lowerCasedWordArray = [[self wordArray] arrayByMakingObjectsPerformSelector:@selector(lowercaseString)];
-	unsigned wordIndex = 1, wordCount = [lowerCasedWordArray count];
+	NSUInteger wordIndex = 1, wordCount = [lowerCasedWordArray count];
 	NSMutableArray *camelCasedWordArray = [NSMutableArray arrayWithCapacity:wordCount];
 	if (wordCount)
 		[camelCasedWordArray addObject:[lowerCasedWordArray objectAtIndex:0]];

mogenerator.xcodeproj/project.pbxproj

@@ -431,6 +431,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = mogenerator_Prefix.pch;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				INSTALL_PATH = "$(HOME)/bin";
 				PRODUCT_NAME = mogenerator;
 				WARNING_CFLAGS = "-Wall";
@@ -446,6 +447,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = mogenerator_Prefix.pch;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				INSTALL_PATH = "$(HOME)/bin";
 				PRODUCT_NAME = mogenerator;
 				WARNING_CFLAGS = "-Wall";