Automatic translation to ARC for SBJson + SBJsonTests

SBJson · Oct 17, 2011 · 02463ba · 02463ba
1 parent 037d3d1
commit 02463ba
Show file tree

Hide file tree

Showing 15 changed files with 30 additions and 66 deletions.
diff --git a/Classes/NSObject+SBJson.m b/Classes/NSObject+SBJson.m
@@ -34,7 +34,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 @implementation NSObject (NSObject_SBJsonWriting)
 
 - (NSString *)JSONRepresentation {
-    SBJsonWriter *writer = [[[SBJsonWriter alloc] init] autorelease];    
+    SBJsonWriter *writer = [[SBJsonWriter alloc] init];    
     NSString *json = [writer stringWithObject:self];
     if (!json)
         NSLog(@"-JSONRepresentation failed. Error is: %@", writer.error);
@@ -48,7 +48,7 @@ - (NSString *)JSONRepresentation {
 @implementation NSString (NSString_SBJsonParsing)
 
 - (id)JSONValue {
-    SBJsonParser *parser = [[[SBJsonParser alloc] init] autorelease];
+    SBJsonParser *parser = [[SBJsonParser alloc] init];
     id repr = [parser objectWithString:self];
     if (!repr)
         NSLog(@"-JSONValue failed. Error is: %@", parser.error);

diff --git a/Classes/SBJsonParser.m b/Classes/SBJsonParser.m
@@ -44,10 +44,6 @@ - (id)init {
     return self;
 }
 
-- (void)dealloc {
-    [error release];
-    [super dealloc];
-}
 
 #pragma mark Methods
 
@@ -58,12 +54,12 @@ - (id)objectWithData:(NSData *)data {
         return nil;
     }
 
-	SBJsonStreamParserAccumulator *accumulator = [[[SBJsonStreamParserAccumulator alloc] init] autorelease];
+	SBJsonStreamParserAccumulator *accumulator = [[SBJsonStreamParserAccumulator alloc] init];
 
-    SBJsonStreamParserAdapter *adapter = [[[SBJsonStreamParserAdapter alloc] init] autorelease];
+    SBJsonStreamParserAdapter *adapter = [[SBJsonStreamParserAdapter alloc] init];
     adapter.delegate = accumulator;
 
-	SBJsonStreamParser *parser = [[[SBJsonStreamParser alloc] init] autorelease];
+	SBJsonStreamParser *parser = [[SBJsonStreamParser alloc] init];
 	parser.maxDepth = self.maxDepth;
 	parser.delegate = adapter;
 

diff --git a/Classes/SBJsonStreamParser.h b/Classes/SBJsonStreamParser.h
@@ -102,8 +102,8 @@ typedef enum {
 	SBJsonTokeniser *tokeniser;
 }
 
-@property (nonatomic, assign) SBJsonStreamParserState *state; // Private
-@property (nonatomic, readonly, retain) NSMutableArray *stateStack; // Private
+@property (nonatomic, unsafe_unretained) SBJsonStreamParserState *state; // Private
+@property (nonatomic, readonly, strong) NSMutableArray *stateStack; // Private
 
 /**
  @brief Expect multiple documents separated by whitespace
@@ -129,7 +129,7 @@ typedef enum {
  Usually this should be an instance of SBJsonStreamParserAdapter, but you can
  substitute your own implementation of the SBJsonStreamParserDelegate protocol if you need to. 
  */
-@property (assign) id<SBJsonStreamParserDelegate> delegate;
+@property (unsafe_unretained) id<SBJsonStreamParserDelegate> delegate;
 
 /**
  @brief The max parse depth

diff --git a/Classes/SBJsonStreamParser.m b/Classes/SBJsonStreamParser.m
@@ -58,11 +58,7 @@ - (id)init {
 }
 
 - (void)dealloc {
-	self.error = nil;
     self.state = nil;
-	[stateStack release];
-	[tokeniser release];
-	[super dealloc];
 }
 
 #pragma mark Methods

diff --git a/Classes/SBJsonStreamParserAccumulator.m b/Classes/SBJsonStreamParserAccumulator.m
@@ -33,19 +33,15 @@ @implementation SBJsonStreamParserAccumulator
 
 @synthesize value;
 
-- (void)dealloc {
-    [value release];
-    [super dealloc];
-}
 
 #pragma mark SBJsonStreamParserAdapterDelegate
 
 - (void)parser:(SBJsonStreamParser*)parser foundArray:(NSArray *)array {
-	value = [array retain];
+	value = array;
 }
 
 - (void)parser:(SBJsonStreamParser*)parser foundObject:(NSDictionary *)dict {
-	value = [dict retain];
+	value = dict;
 }
 
 @end
diff --git a/Classes/SBJsonStreamParserAdapter.h b/Classes/SBJsonStreamParserAdapter.h
@@ -143,6 +143,6 @@ typedef enum {
  @brief Your delegate object
  Set this to the object you want to receive the SBJsonStreamParserAdapterDelegate messages.
  */
-@property (assign) id<SBJsonStreamParserAdapterDelegate> delegate;
+@property (unsafe_unretained) id<SBJsonStreamParserAdapterDelegate> delegate;
 
 @end
diff --git a/Classes/SBJsonStreamParserAdapter.m b/Classes/SBJsonStreamParserAdapter.m
@@ -59,11 +59,6 @@ - (id)init {
 	return self;
 }	
 
-- (void)dealloc {
-	[keyStack release];
-	[stack release];
-	[super dealloc];
-}
 
 #pragma mark Private methods
 
@@ -116,7 +111,7 @@ - (void)parser:(SBJsonStreamParser*)parser found:(id)obj {
 
 - (void)parserFoundObjectStart:(SBJsonStreamParser*)parser {
 	if (++depth > self.levelsToSkip) {
-		dict = [[NSMutableDictionary new] autorelease];
+		dict = [NSMutableDictionary new];
 		[stack addObject:dict];
 		currentType = SBJsonStreamParserAdapterObject;
 	}
@@ -128,27 +123,25 @@ - (void)parser:(SBJsonStreamParser*)parser foundObjectKey:(NSString*)key_ {
 
 - (void)parserFoundObjectEnd:(SBJsonStreamParser*)parser {
 	if (depth-- > self.levelsToSkip) {
-		id value = [dict retain];
+		id value = dict;
 		[self pop];
 		[self parser:parser found:value];
-		[value release];
 	}
 }
 
 - (void)parserFoundArrayStart:(SBJsonStreamParser*)parser {
 	if (++depth > self.levelsToSkip) {
-		array = [[NSMutableArray new] autorelease];
+		array = [NSMutableArray new];
 		[stack addObject:array];
 		currentType = SBJsonStreamParserAdapterArray;
 	}
 }
 
 - (void)parserFoundArrayEnd:(SBJsonStreamParser*)parser {
 	if (depth-- > self.levelsToSkip) {
-		id value = [array retain];
+		id value = array;
 		[self pop];
 		[self parser:parser found:value];
-		[value release];
 	}
 }
 

diff --git a/Classes/SBJsonStreamWriter.h b/Classes/SBJsonStreamWriter.h
@@ -86,14 +86,14 @@
     NSMutableDictionary *cache;
 }
 
-@property (nonatomic, assign) SBJsonStreamWriterState *state; // Internal
-@property (nonatomic, readonly, retain) NSMutableArray *stateStack; // Internal 
+@property (nonatomic, unsafe_unretained) SBJsonStreamWriterState *state; // Internal
+@property (nonatomic, readonly, strong) NSMutableArray *stateStack; // Internal 
 
 /**
  @brief delegate to receive JSON output
  Delegate that will receive messages with output.
  */
-@property (assign) id<SBJsonStreamWriterDelegate> delegate;
+@property (unsafe_unretained) id<SBJsonStreamWriterDelegate> delegate;
 
 /**
  @brief The maximum recursing depth.

diff --git a/Classes/SBJsonStreamWriter.m b/Classes/SBJsonStreamWriter.m
@@ -73,11 +73,7 @@ - (id)init {
 }
 
 - (void)dealloc {
-	self.error = nil;
     self.state = nil;
-    [stateStack release];
-    [cache release];
-	[super dealloc];
 }
 
 #pragma mark Methods

diff --git a/Classes/SBJsonStreamWriterAccumulator.m b/Classes/SBJsonStreamWriterAccumulator.m
@@ -42,10 +42,6 @@ - (id)init {
     return self;
 }
 
-- (void)dealloc {
-    [data release];
-    [super dealloc];
-}
 
 #pragma mark SBJsonStreamWriterDelegate
 

diff --git a/Classes/SBJsonTokeniser.h b/Classes/SBJsonTokeniser.h
@@ -57,7 +57,7 @@ typedef enum {
 
 @interface SBJsonTokeniser : NSObject 
 
-@property (retain) SBJsonUTF8Stream *stream;
+@property (strong) SBJsonUTF8Stream *stream;
 @property (copy) NSString *error;
 
 - (void)appendData:(NSData*)data_;

diff --git a/Classes/SBJsonTokeniser.m b/Classes/SBJsonTokeniser.m
@@ -51,11 +51,6 @@ - (id)init {
     return self;
 }
 
-- (void)dealloc {
-    [_error release];
-    [_stream release];
-    [super dealloc];
-}
 
 - (void)appendData:(NSData *)data_ {
     [_stream appendData:data_];
@@ -162,16 +157,16 @@ - (sbjson_token_t)getStringToken:(NSObject**)token {
                     [acc appendString:string];
 
                 } else if (ch == '"') {
-                    *token = [[string copy] autorelease];
+                    *token = [string copy];
                     [_stream skip];
                     return sbjson_token_string;
 
                 } else {
-                    acc = [[string mutableCopy] autorelease];
+                    acc = [string mutableCopy];
                 }
             }
             @finally {
-                [string release];
+                string = nil;
             }
         }
 

diff --git a/Classes/SBJsonUTF8Stream.m b/Classes/SBJsonUTF8Stream.m
@@ -44,10 +44,6 @@ - (id)init {
     return self;
 }
 
-- (void)dealloc {
-    [_data release];
-    [super dealloc];
-}
 
 - (void)appendData:(NSData *)data_ {
 
@@ -135,7 +131,7 @@ - (BOOL)skipCharacters:(const char *)chars length:(NSUInteger)len {
 }
 
 - (NSString*)stringWithRange:(NSRange)range {
-    return [[[NSString alloc] initWithBytes:_bytes + range.location length:range.length encoding:NSUTF8StringEncoding] autorelease];
+    return [[NSString alloc] initWithBytes:_bytes + range.location length:range.length encoding:NSUTF8StringEncoding];
 
 }
 

diff --git a/Classes/SBJsonWriter.m b/Classes/SBJsonWriter.m
@@ -52,15 +52,11 @@ - (id)init {
     return self;
 }
 
-- (void)dealloc {
-    [error release];
-    [super dealloc];
-}
 
 - (NSString*)stringWithObject:(id)value {
 	NSData *data = [self dataWithObject:value];
 	if (data)
-		return [[[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding] autorelease];
+		return [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
 	return nil;
 }	
 
@@ -80,9 +76,9 @@ - (NSString*)stringWithObject:(id)value error:(NSError**)error_ {
 - (NSData*)dataWithObject:(id)object {	
     self.error = nil;
 
-    SBJsonStreamWriterAccumulator *accumulator = [[[SBJsonStreamWriterAccumulator alloc] init] autorelease];
+    SBJsonStreamWriterAccumulator *accumulator = [[SBJsonStreamWriterAccumulator alloc] init];
 
-	SBJsonStreamWriter *streamWriter = [[[SBJsonStreamWriter alloc] init] autorelease];
+	SBJsonStreamWriter *streamWriter = [[SBJsonStreamWriter alloc] init];
 	streamWriter.sortKeys = self.sortKeys;
 	streamWriter.maxDepth = self.maxDepth;
 	streamWriter.humanReadable = self.humanReadable;

diff --git a/SBJson.xcodeproj/project.pbxproj b/SBJson.xcodeproj/project.pbxproj
@@ -729,6 +729,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				CLANG_ENABLE_OBJC_ARC = YES;
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 34;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -751,6 +752,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				CLANG_ENABLE_OBJC_ARC = YES;
 				COPY_PHASE_STRIP = YES;
 				CURRENT_PROJECT_VERSION = 34;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -773,6 +775,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				CLANG_ENABLE_OBJC_ARC = YES;
 				COPY_PHASE_STRIP = NO;
 				FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -795,6 +798,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				CLANG_ENABLE_OBJC_ARC = YES;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";