Skip to content

Re-add proper boolean support for object subclassing. #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 15, 2015
Merged

Re-add proper boolean support for object subclassing. #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions Parse/Internal/Object/Subclassing/PFObjectSubclassingController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,30 @@ static CFNumberType PFNumberTypeForObjCType(const char *encodedType) {
['f'] = kCFNumberFloatType,
['d'] = kCFNumberDoubleType,

// C99 & CXX boolean
// C99 & CXX boolean. We are keeping this here for decoding, as you can safely use CFNumberGetBytes on a
// CFBoolean, and extract it into a char.
['B'] = kCFNumberCharType,
};

return (CFNumberType)types[encodedType[0]];
}

static NSNumber *PFNumberCreateSafe(const char *typeEncoding, const void *bytes) {
// NOTE: This is required because NSJSONSerialization treats all NSNumbers with the 'char' type as numbers, not
// booleans. As such, we must treat any and all boolean type encodings as explicit booleans, otherwise we will
// send '1' and '0' to the api server rather than 'true' and 'false'.
//
// TODO (richardross): When we drop support for 10.9/iOS 7, remove the 'c' encoding and only use the new 'B'
// encoding.
if (typeEncoding[0] == 'B' || typeEncoding[0] == 'c') {
return [NSNumber numberWithBool:*(BOOL *)bytes];
}

CFNumberType numberType = PFNumberTypeForObjCType(typeEncoding);
PFConsistencyAssert(numberType != kCFNumberTypeUnknown, @"Unsupported type encoding %s!", typeEncoding);
return (__bridge_transfer NSNumber *)CFNumberCreate(NULL, numberType, bytes);
}

@implementation PFObjectSubclassingController {
dispatch_queue_t _registeredSubclassesAccessQueue;
NSMutableDictionary *_registeredSubclasses;
Expand Down Expand Up @@ -230,11 +247,7 @@ - (void)_forwardSetterInvocation:(NSInvocation *)invocation
dictionaryValue = [dictionaryValue copy];
}
} else {
CFNumberType numberType = PFNumberTypeForObjCType(argumentType);
PFConsistencyAssert(numberType != kCFNumberTypeUnknown, @"Unsupported type encoding %s!", argumentType);

CFNumberRef number = CFNumberCreate(NULL, numberType, argumentValueBytes);
dictionaryValue = (__bridge_transfer id)number;
dictionaryValue = PFNumberCreateSafe(argumentType, argumentValueBytes);
}

if (dictionaryValue == nil) {
Expand Down