Feature/ARC

Source/CDataScanner.h

@@ -40,7 +40,7 @@
 	NSUInteger length;
 }
 
-@property (readwrite, nonatomic, retain) NSData *data;
+@property (readwrite, nonatomic, strong) NSData *data;
 @property (readwrite, nonatomic, assign) NSUInteger scanLocation;
 @property (readonly, nonatomic, assign) NSUInteger bytesRemaining;
 @property (readonly, nonatomic, assign) BOOL isAtEnd;

Source/JSON/CJSONDeserializer.h

@@ -46,9 +46,9 @@ typedef NSUInteger EJSONDeserializationOptions;
     EJSONDeserializationOptions options;
 }
 
-@property (readwrite, nonatomic, retain) CJSONScanner *scanner;
+@property (readwrite, nonatomic, strong) CJSONScanner *scanner;
 /// Object to return instead when a null encountered in the JSON. Defaults to NSNull. Setting to null causes the scanner to skip null values.
-@property (readwrite, nonatomic, retain) id nullObject;
+@property (readwrite, nonatomic, strong) id nullObject;
 /// JSON must be encoded in Unicode (UTF-8, UTF-16 or UTF-32). Use this if you expect to get the JSON in another encoding.
 @property (readwrite, nonatomic, assign) NSStringEncoding allowedEncoding;
 @property (readwrite, nonatomic, assign) EJSONDeserializationOptions options;

Source/JSON/CJSONScanner.h

@@ -44,7 +44,7 @@ typedef NSUInteger EJSONScannerOptions;
 }
 
 @property (readwrite, nonatomic, assign) BOOL strictEscapeCodes;
-@property (readwrite, nonatomic, retain) id nullObject;
+@property (readwrite, nonatomic, strong) id nullObject;
 @property (readwrite, nonatomic, assign) NSStringEncoding allowedEncoding;
 @property (readwrite, nonatomic, assign) EJSONScannerOptions options;
 

Source/JSON/CJSONScanner.m

@@ -287,7 +287,7 @@ - (BOOL)scanJSONDictionary:(NSDictionary **)outDictionary error:(NSError **)outE
                 [self setScanLocation:theScanLocation];
                 if (outError)
                     {
-                    *outError = [self error:kJSONScannerErrorDomain description:@"kJSONScannerErrorCode_DictionaryKeyValuePairNoDelimiter"];
+                    *outError = [self error:kJSONScannerErrorCode_DictionaryNotTerminated description:@"kJSONScannerErrorCode_DictionaryKeyValuePairNoDelimiter"];
                     }
                 return(NO);
                 }