@@ -29,6 +29,6 @@ + (NSArray *)arrayWithJSONString:(NSString *)jsonString; - (NSString *)jsonStringValue; -- (NSString *)jsonStringValueWithIndentLevel:(int)level; +- (NSString *)jsonStringValueWithIndentLevel:(NSInteger)level; @end NSArray+BSJSONAdditions.h @@ -11,7 +11,7 @@ #import "NSString+BSJSONAdditions.h" @interface NSArray (PrivateBSJSONAdditions) -- (NSString *)jsonStringForValue:(id)value withIndentLevel:(int)level; +- (NSString *)jsonStringForValue:(id)value withIndentLevel:(NSInteger)level; @end @implementation NSArray (BSJSONAdditions) @@ -31,7 +31,7 @@ return [self jsonStringValueWithIndentLevel:0]; } -- (NSString *)jsonStringValueWithIndentLevel:(int)level +- (NSString *)jsonStringValueWithIndentLevel:(NSInteger)level { NSMutableString *jsonString = [[NSMutableString alloc] init]; [jsonString appendString:jsonArrayStartString]; @@ -40,7 +40,7 @@ [jsonString appendString:[self jsonStringForValue:[self objectAtIndex:0] withIndentLevel:level]]; } - int i; + NSInteger i; for (i = 1; i < [self count]; i++) { [jsonString appendFormat:@"%@ %@", jsonValueSeparatorString, [self jsonStringForValue:[self objectAtIndex:i] withIndentLevel:level]]; } @@ -53,7 +53,7 @@ @implementation NSArray (PrivateBSJSONAdditions) -- (NSString *)jsonStringForValue:(id)value withIndentLevel:(int)level +- (NSString *)jsonStringForValue:(id)value withIndentLevel:(NSInteger)level { NSString *jsonString; if ([value respondsToSelector:@selector(characterAtIndex:)]) // String NSArray+BSJSONAdditions.m @@ -24,11 +24,11 @@ #import <Foundation/Foundation.h> extern NSString *jsonIndentString; -extern const int jsonDoNotIndent; +extern const NSInteger jsonDoNotIndent; @interface NSDictionary (BSJSONAdditions) + (NSDictionary *)dictionaryWithJSONString:(NSString *)jsonString; - (NSString *)jsonStringValue; -- (NSString *)jsonStringValueWithIndentLevel:(int)level; +- (NSString *)jsonStringValueWithIndentLevel:(NSInteger)level; @end NSDictionary+BSJSONAdditions.h @@ -27,10 +27,10 @@ #import "NSString+BSJSONAdditions.h" NSString *jsonIndentString = @"\t"; // Modify this string to change how the output formats. -const int jsonDoNotIndent = -1; +const NSInteger jsonDoNotIndent = -1; @interface NSDictionary (PrivateBSJSONAdditions) -- (NSString *)jsonStringForValue:(id)value withIndentLevel:(int)level; +- (NSString *)jsonStringForValue:(id)value withIndentLevel:(NSInteger)level; @end @implementation NSDictionary (BSJSONAdditions) @@ -49,7 +49,7 @@ const int jsonDoNotIndent = -1; return [self jsonStringValueWithIndentLevel:0]; } -- (NSString *)jsonStringValueWithIndentLevel:(int)level +- (NSString *)jsonStringValueWithIndentLevel:(NSInteger)level { NSMutableString *jsonString = [[NSMutableString alloc] initWithString:jsonObjectStartString]; @@ -75,7 +75,7 @@ const int jsonDoNotIndent = -1; @implementation NSDictionary (PrivateBSJSONAdditions) -- (NSString *)jsonStringForValue:(id)value withIndentLevel:(int)level +- (NSString *)jsonStringForValue:(id)value withIndentLevel:(NSInteger)level { NSString *jsonString; if ([value respondsToSelector:@selector(characterAtIndex:)]) // String NSDictionary+BSJSONAdditions.m @@ -189,8 +189,8 @@ NSString *jsonNullString = @"null"; /* this code is more appropriate if you have a separate method to unescape the found string for example, between inputting json and outputting it, it may make more sense to have a category on NSString to perform escaping and unescaping. Keeping this code and looking into this for a future update. - unsigned int searchLength = [[self string] length] - [self scanLocation]; - unsigned int quoteLocation = [[self string] rangeOfString:jsonStringDelimiterString options:0 range:NSMakeRange([self scanLocation], searchLength)].location; + NSUInteger searchLength = [[self string] length] - [self scanLocation]; + NSUInteger quoteLocation = [[self string] rangeOfString:jsonStringDelimiterString options:0 range:NSMakeRange([self scanLocation], searchLength)].location; searchLength = [[self string] length] - quoteLocation; while (([[[self string] substringWithRange:NSMakeRange((quoteLocation - 1), 2)] isEqualToString:jsonStringEscapedDoubleQuoteString]) && (quoteLocation != NSNotFound) && @@ -222,20 +222,20 @@ NSString *jsonNullString = @"null"; // Since we have already scanned white space, we know that we're at the start of some value, and each of the strings below is at most // four characters, so just look ahead that many spaces. (In previous versions of the code, I was scanning ahead through the entire string, but this // was incredibly expensive for long strings - adding massive amounts of time to scan way past the string we might care about) - unsigned int scanLength = [[self string] length] - [self scanLocation]; + NSUInteger scanLength = [[self string] length] - [self scanLocation]; if (scanLength > [jsonTrueString length]) scanLength = [jsonTrueString length]; - unsigned int trueLocation = [[self string] rangeOfString:jsonTrueString options:0 range:NSMakeRange([self scanLocation], scanLength)].location; + NSUInteger trueLocation = [[self string] rangeOfString:jsonTrueString options:0 range:NSMakeRange([self scanLocation], scanLength)].location; scanLength = [[self string] length] - [self scanLocation]; if (scanLength > [jsonFalseString length]) scanLength = [jsonFalseString length]; - unsigned int falseLocation = [[self string] rangeOfString:jsonFalseString options:0 range:NSMakeRange([self scanLocation], scanLength)].location; + NSUInteger falseLocation = [[self string] rangeOfString:jsonFalseString options:0 range:NSMakeRange([self scanLocation], scanLength)].location; scanLength = [[self string] length] - [self scanLocation]; if (scanLength > [jsonNullString length]) scanLength = [jsonNullString length]; - unsigned int nullLocation = [[self string] rangeOfString:jsonNullString options:0 range:NSMakeRange([self scanLocation], scanLength)].location; + NSUInteger nullLocation = [[self string] rangeOfString:jsonNullString options:0 range:NSMakeRange([self scanLocation], scanLength)].location; if ([substring isEqualToString:jsonStringDelimiterString]) { result = [self scanJSONString:value]; NSScanner+BSJSONAdditions.m @@ -11,7 +11,7 @@ @interface NSString (BSJSONAdditions) -+ (NSString *)jsonIndentStringForLevel:(int)level; ++ (NSString *)jsonIndentStringForLevel:(NSInteger)level; - (NSString *)jsonStringValue; @end NSString+BSJSONAdditions.h @@ -12,12 +12,12 @@ @implementation NSString (BSJSONAdditions) -+ (NSString *)jsonIndentStringForLevel:(int)level ++ (NSString *)jsonIndentStringForLevel:(NSInteger)level { NSMutableString *indentString = [[NSMutableString alloc] init]; if (level != jsonDoNotIndent) { [indentString appendString:@"\n"]; - int i; + NSInteger i; for (i = 0; i < level; i++) { [indentString appendString:jsonIndentString]; } @@ -32,7 +32,7 @@ [jsonString appendString:jsonStringDelimiterString]; // Build the result one character at a time, inserting escaped characters as necessary - int i; + NSInteger i; unichar nextChar; for (i = 0; i < [self length]; i++) { nextChar = [self characterAtIndex:i]; NSString+BSJSONAdditions.m e0fbda9412e269db084ec048ef132f9ea104b142 Jakub Suder jakub.suder@gmail.com http://github.com/blakeseely/bsjsonadditions/commit/4fc2f550bb975e572eaa466dcf1968ccf00821a5 4fc2f550bb975e572eaa466dcf1968ccf00821a5 2009-04-04T04:51:06-07:00 2009-04-04T04:51:06-07:00 converted int types to NS(U)Integers using ConvertCocoa64 script 5289bb68e48ed393477efd2f21c752dc555b4b31 Jakub Suder jakub.suder@gmail.com