Avoid casting to CFNumberRef and CFMutableStringRef types

Author: stig

Classes/SBJsonStreamWriter.m

@@ -34,6 +34,11 @@
 #import "SBJsonStreamWriterState.h"
 
 static NSDecimalNumber *kNotANumber;
+static NSNumber *kTrue;
+static NSNumber *kFalse;
+static NSNumber *kPositiveInfinity;
+static NSNumber *kNegativeInfinity;
+
 static id kStaticStringCache;
 
 
@@ -48,6 +53,10 @@ @implementation SBJsonStreamWriter
 
 + (void)initialize {
 	kNotANumber = [NSDecimalNumber notANumber];
+    kPositiveInfinity = [NSNumber numberWithDouble:+INFINITY];
+    kNegativeInfinity = [NSNumber numberWithDouble:-INFINITY];
+    kTrue = [NSNumber numberWithBool:YES];
+    kFalse = [NSNumber numberWithBool:NO];
 
     Class cacheClass = NSClassFromString(@"NSCache");
     if (cacheClass) {
@@ -321,27 +330,23 @@ - (BOOL)writeString:(NSString*)string {
 }
 
 - (BOOL)writeNumber:(NSNumber*)number {
-	if ((CFBooleanRef)number == kCFBooleanTrue || (CFBooleanRef)number == kCFBooleanFalse)
+	if (number == kTrue || number == kFalse)
 		return [self writeBool:[number boolValue]];
 
 	if ([state isInvalidState:self]) return NO;
 	if ([state expectingKey:self]) return NO;
 	[state appendSeparator:self];
 	if (humanReadable) [state appendWhitespace:self];
 
-	if ((CFNumberRef)number == kCFNumberPositiveInfinity) {
+	if ([kPositiveInfinity isEqualToNumber:number]) {
 		self.error = @"+Infinity is not a valid number in JSON";
 		return NO;
 
-	} else if ((CFNumberRef)number == kCFNumberNegativeInfinity) {
+	} else if ([kNegativeInfinity isEqualToNumber:number]) {
 		self.error = @"-Infinity is not a valid number in JSON";
 		return NO;
 
-	} else if ((CFNumberRef)number == kCFNumberNaN) {
-		self.error = @"NaN is not a valid number in JSON";
-		return NO;
-
-	} else if (number == kNotANumber) {
+	} else if ([kNotANumber isEqualToNumber:number]) {
 		self.error = @"NaN is not a valid number in JSON";
 		return NO;
 	}

Classes/SBJsonTokeniser.m

@@ -211,21 +211,20 @@ - (sbjson_token_t)getStringToken:(NSObject**)token {
                             return sbjson_token_error;
                         }
 
-                        unichar pair[2] = {hi, lo};
-                        CFStringAppendCharacters((CFMutableStringRef)acc, pair, 2);
+                        [acc appendFormat:@"%C%C", hi, lo];
                     } else if (SBStringIsIllegalSurrogateHighCharacter(hi)) {
                         self.error = @"Invalid high character in surrogate pair";
                         return sbjson_token_error;
                     } else {
-                        CFStringAppendCharacters((CFMutableStringRef)acc, &hi, 1);
+                        [acc appendFormat:@"%C", hi];
                     }
 
 
                 } else {
                     unichar decoded;
                     if (![self decodeEscape:ch into:&decoded])
                         return sbjson_token_error;
-                    CFStringAppendCharacters((CFMutableStringRef)acc, &decoded, 1);
+                    [acc appendFormat:@"%C", decoded];
                 }
 
                 break;