Move to 64-bit only & remove instance variables for properties.

stig · stig · commit f90f0c8d6f0b · 2011-06-24T20:57:54.000+08:00
diff --git a/Classes/SBJsonParser.h b/Classes/SBJsonParser.h
@@ -38,13 +38,7 @@
 
  */
 
-@interface SBJsonParser : NSObject {
-
-@private
-	NSString *error;
-    NSUInteger depth, maxDepth;
-
-}
+@interface SBJsonParser : NSObject
 
 /**
  @brief The maximum recursing depth.
diff --git a/Classes/SBJsonStreamParser.h b/Classes/SBJsonStreamParser.h
@@ -99,13 +99,7 @@ typedef enum {
  */
 @interface SBJsonStreamParser : NSObject {
 @private
-	BOOL supportMultipleDocuments;
-	id<SBJsonStreamParserDelegate> delegate;
 	SBJsonTokeniser *tokeniser;
-    NSMutableArray *stateStack;
-	__weak SBJsonStreamParserState *state;
-	NSUInteger maxDepth;
-	NSString *error;
 }
 
 @property (nonatomic, assign) __weak SBJsonStreamParserState *state; // Private
diff --git a/Classes/SBJsonStreamParserAccumulator.h b/Classes/SBJsonStreamParserAccumulator.h
@@ -30,11 +30,8 @@
 #import <Foundation/Foundation.h>
 #import "SBJsonStreamParserAdapter.h"
 
-@interface SBJsonStreamParserAccumulator : NSObject <SBJsonStreamParserAdapterDelegate> {
-@private
-    id value;    
-}
+@interface SBJsonStreamParserAccumulator : NSObject <SBJsonStreamParserAdapterDelegate>
 
-@property (readonly, copy) id value;
+@property (copy) id value;
 
 @end
diff --git a/Classes/SBJsonStreamParserAdapter.h b/Classes/SBJsonStreamParserAdapter.h
@@ -117,8 +117,7 @@ typedef enum {
 */
 @interface SBJsonStreamParserAdapter : NSObject <SBJsonStreamParserDelegate> {
 @private
-	id<SBJsonStreamParserAdapterDelegate> delegate;
-	NSUInteger levelsToSkip, depth;
+	NSUInteger depth;
 	__weak NSMutableArray *array;
 	__weak NSMutableDictionary *dict;
 	NSMutableArray *keyStack;
diff --git a/Classes/SBJsonStreamParserAdapter.m b/Classes/SBJsonStreamParserAdapter.m
@@ -115,7 +115,7 @@ - (void)parser:(SBJsonStreamParser*)parser found:(id)obj {
 #pragma mark Delegate methods
 
 - (void)parserFoundObjectStart:(SBJsonStreamParser*)parser {
-	if (++depth > levelsToSkip) {
+	if (++depth > self.levelsToSkip) {
 		dict = [[NSMutableDictionary new] autorelease];
 		[stack addObject:dict];
 		currentType = SBJsonStreamParserAdapterObject;
@@ -127,7 +127,7 @@ - (void)parser:(SBJsonStreamParser*)parser foundObjectKey:(NSString*)key_ {
 }
 
 - (void)parserFoundObjectEnd:(SBJsonStreamParser*)parser {
-	if (depth-- > levelsToSkip) {
+	if (depth-- > self.levelsToSkip) {
 		id value = [dict retain];
 		[self pop];
 		[self parser:parser found:value];
@@ -136,15 +136,15 @@ - (void)parserFoundObjectEnd:(SBJsonStreamParser*)parser {
 }
 
 - (void)parserFoundArrayStart:(SBJsonStreamParser*)parser {
-	if (++depth > levelsToSkip) {
+	if (++depth > self.levelsToSkip) {
 		array = [[NSMutableArray new] autorelease];
 		[stack addObject:array];
 		currentType = SBJsonStreamParserAdapterArray;
 	}
 }
 
 - (void)parserFoundArrayEnd:(SBJsonStreamParser*)parser {
-	if (depth-- > levelsToSkip) {
+	if (depth-- > self.levelsToSkip) {
 		id value = [array retain];
 		[self pop];
 		[self parser:parser found:value];
diff --git a/Classes/SBJsonStreamWriter.h b/Classes/SBJsonStreamWriter.h
@@ -82,15 +82,7 @@
 
  */
 
-@interface SBJsonStreamWriter : NSObject {
-@private
-	NSString *error;
-    NSMutableArray *stateStack;
-    __weak SBJsonStreamWriterState *state;
-    id<SBJsonStreamWriterDelegate> delegate;
-	NSUInteger maxDepth;
-    BOOL sortKeys, humanReadable;
-}
+@interface SBJsonStreamWriter : NSObject
 
 @property (nonatomic, assign) __weak SBJsonStreamWriterState *state; // Internal
 @property (nonatomic, readonly, retain) NSMutableArray *stateStack; // Internal 
diff --git a/Classes/SBJsonStreamWriterAccumulator.h b/Classes/SBJsonStreamWriterAccumulator.h
@@ -29,11 +29,8 @@
 
 #import "SBJsonStreamWriter.h"
 
-@interface SBJsonStreamWriterAccumulator : NSObject <SBJsonStreamWriterDelegate> {
-@private
-    NSMutableData *data;
-}
+@interface SBJsonStreamWriterAccumulator : NSObject <SBJsonStreamWriterDelegate>
 
-@property (readonly, copy) NSData* data;
+@property (readonly, copy) NSMutableData* data;
 
 @end
diff --git a/Classes/SBJsonTokeniser.h b/Classes/SBJsonTokeniser.h
@@ -55,12 +55,9 @@ typedef enum {
 
 @class SBJsonUTF8Stream;
 
-@interface SBJsonTokeniser : NSObject {
-@private
-    SBJsonUTF8Stream *_stream;
-    NSString *_error;
-}
+@interface SBJsonTokeniser : NSObject 
 
+@property (retain) SBJsonUTF8Stream *stream;
 @property (copy) NSString *error;
 
 - (void)appendData:(NSData*)data_;
diff --git a/Classes/SBJsonTokeniser.m b/Classes/SBJsonTokeniser.m
@@ -38,6 +38,7 @@
 @implementation SBJsonTokeniser
 
 @synthesize error = _error;
+@synthesize stream = _stream;
 
 - (id)init {
     self = [super init];
diff --git a/Classes/SBJsonUTF8Stream.h b/Classes/SBJsonUTF8Stream.h
@@ -37,7 +37,6 @@
     const char *_bytes;
     NSMutableData *_data;
     NSUInteger _length;
-    NSUInteger _index;
 }
 
 @property (assign) NSUInteger index;
diff --git a/Classes/SBJsonWriter.h b/Classes/SBJsonWriter.h
@@ -37,12 +37,7 @@
  @see @ref json2objc
  */
 
-@interface SBJsonWriter : NSObject {
-@private
-    NSString *error;
-    NSUInteger maxDepth;
-    BOOL sortKeys, humanReadable;
-}
+@interface SBJsonWriter : NSObject
 
 /**
  @brief The maximum recursing depth.
diff --git a/Examples/DisplayPretty/DisplayPretty.xcodeproj/project.pbxproj b/Examples/DisplayPretty/DisplayPretty.xcodeproj/project.pbxproj
@@ -346,6 +346,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -365,6 +366,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				FRAMEWORK_SEARCH_PATHS = (
diff --git a/SBJson.xcodeproj/project.pbxproj b/SBJson.xcodeproj/project.pbxproj
@@ -728,6 +728,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 31;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -749,6 +750,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = YES;
 				CURRENT_PROJECT_VERSION = 31;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -770,6 +772,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = NO;
 				FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -791,6 +794,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@`
`37`	`37`	`const char *_bytes;`
`38`	`38`	`NSMutableData *_data;`
`39`	`39`	`NSUInteger _length;`
`40`		`- NSUInteger _index;`
`41`	`40`	`}`
`42`	`41`
`43`	`42`	`@property (assign) NSUInteger index;`