Skip to content

Refactor protobuf getter generation macros to distinguish enum types. #2716

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

Open
copybara-service wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Refactor protobuf getter generation macros to distinguish enum types. #2716

Show file tree
Hide file tree
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
16 changes: 4 additions & 12 deletions protobuf/runtime/src/com/google/protobuf/Descriptors.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,6 @@
#import "java/util/Arrays.h"
#import "java/util/Collections.h"

// Defines the field in the CGPValue union type to use for each field type.
#define VALUE_FIELD_Int valueInt
#define VALUE_FIELD_Long valueLong
#define VALUE_FIELD_Float valueFloat
#define VALUE_FIELD_Double valueDouble
#define VALUE_FIELD_Bool valueBool
#define VALUE_FIELD_Enum valueId
#define VALUE_FIELD_Retainable valueId

BOOL CGPIsRetainedType(CGPFieldJavaType type) {
switch (type) {
case ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_Enum_INT:
Expand All @@ -79,7 +70,7 @@ BOOL CGPIsRetainedType(CGPFieldJavaType type) {
size_t CGPGetTypeSize(CGPFieldJavaType type) {
#define GET_TYPE_SIZE_CASE(NAME) return sizeof(TYPE_##NAME);

SWITCH_TYPES_NO_ENUM(type, GET_TYPE_SIZE_CASE)
SWITCH_TYPES(type, GET_TYPE_SIZE_CASE, GET_TYPE_SIZE_CASE, GET_TYPE_SIZE_CASE)

#undef GET_TYPE_SIZE_CASE
}
Expand Down Expand Up @@ -459,9 +450,10 @@ id CGPFieldGetDefaultValue(CGPFieldDescriptor *field) {
}

#define GET_DEFAULT_VALUE_CASE(NAME) \
return CGPToReflectionType##NAME(field->data_->defaultValue.VALUE_FIELD_##NAME, field);
return CGPToReflectionType##NAME(field->data_->defaultValue.CGPValueField_##NAME, field);

SWITCH_TYPES_WITH_ENUM(CGPFieldGetJavaType(field), GET_DEFAULT_VALUE_CASE)
SWITCH_TYPES(CGPFieldGetJavaType(field), GET_DEFAULT_VALUE_CASE, GET_DEFAULT_VALUE_CASE,
GET_DEFAULT_VALUE_CASE)

#undef GET_DEFAULT_VALUE_CASE
}
Expand Down
99 changes: 83 additions & 16 deletions protobuf/runtime/src/com/google/protobuf/Descriptors_PackagePrivate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ typedef union {
#define CGPValueField_Double valueDouble
#define CGPValueField_Bool valueBool
#define CGPValueField_Enum valueId
#define CGPValueField_Retainable valueId
#define CGPValueField_Id valueId

typedef NS_OPTIONS(uint32_t, CGPMessageFlags) {
Expand Down Expand Up @@ -160,26 +159,13 @@ typedef struct CGPOneofData {

@end

// Functions that convert a value from its field storage type to the type
// expected by a reflection accessor. (accessing with a descriptor)
// For enums, the reflection type is a EnumValueDescriptor.
#define CGPToReflectionTypeInt(value, field) [JavaLangInteger valueOfWithInt:value]
#define CGPToReflectionTypeLong(value, field) [JavaLangLong valueOfWithLong:value]
#define CGPToReflectionTypeFloat(value, field) [JavaLangFloat valueOfWithFloat:value]
#define CGPToReflectionTypeDouble(value, field) [JavaLangDouble valueOfWithDouble:value]
#define CGPToReflectionTypeBool(value, field) [JavaLangBoolean valueOfWithBoolean:value]
#define CGPToReflectionTypeEnum(value, field) \
((CGPEnumDescriptor *)field->valueType_)->values_->buffer_[[(JavaLangEnum *)value ordinal]]
#define CGPToReflectionTypeRetainable(value, field) RETAIN_AND_AUTORELEASE(value)

CF_EXTERN_C_BEGIN

NS_RETURNS_RETAINED CGPDescriptor *CGPInitDescriptor(Class messageClass, Class builderClass,
CGPMessageFlags flags, size_t storageSize);

void CGPInitFields(
CGPDescriptor *descriptor, jint fieldCount, CGPFieldData *fieldData,
jint oneofCount, const CGPOneofData *oneofData);
void CGPInitFields(CGPDescriptor *descriptor, jint fieldCount, CGPFieldData *fieldData,
jint oneofCount, const CGPOneofData *oneofData);

CGP_ALWAYS_INLINE BOOL CGPIsExtendable(const CGPDescriptor *descriptor) {
return descriptor->flags_ & CGPMessageFlagExtendable;
Expand Down Expand Up @@ -306,4 +292,85 @@ J2OBJC_FIELD_SETTER(ComGoogleProtobufDescriptors_FieldDescriptor_Type, javaType_

J2OBJC_FIELD_SETTER(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, defaultDefault_, id)

// Functions that box a value from its field storage type into an object type.
// For enums, the boxed type is a Java enum object.
CGP_ALWAYS_INLINE JavaLangInteger *CGPBoxedValueInt(jint value) {
return [JavaLangInteger valueOfWithInt:value];
}
CGP_ALWAYS_INLINE JavaLangLong *CGPBoxedValueLong(jlong value) {
return [JavaLangLong valueOfWithLong:value];
}
CGP_ALWAYS_INLINE JavaLangFloat *CGPBoxedValueFloat(jfloat value) {
return [JavaLangFloat valueOfWithFloat:value];
}
CGP_ALWAYS_INLINE JavaLangDouble *CGPBoxedValueDouble(jdouble value) {
return [JavaLangDouble valueOfWithDouble:value];
}
CGP_ALWAYS_INLINE JavaLangBoolean *CGPBoxedValueBool(bool value) {
return [JavaLangBoolean valueOfWithBoolean:value];
}
CGP_ALWAYS_INLINE JavaLangEnum<ComGoogleProtobufProtocolMessageEnum> *CGPBoxedValueEnum(
JavaLangEnum<ComGoogleProtobufProtocolMessageEnum> *value) {
return value;
}
CGP_ALWAYS_INLINE id CGPBoxedValueId(id value) { return value; }

// Functions that unbox a value into its primitive type.
CGP_ALWAYS_INLINE jint CGPUnboxValueInt(JavaLangInteger *value) { return [value intValue]; }
CGP_ALWAYS_INLINE jlong CGPUnboxValueLong(JavaLangLong *value) { return [value longLongValue]; }
CGP_ALWAYS_INLINE jfloat CGPUnboxValueFloat(JavaLangFloat *value) { return [value floatValue]; }
CGP_ALWAYS_INLINE jdouble CGPUnboxValueDouble(JavaLangDouble *value) { return [value doubleValue]; }
CGP_ALWAYS_INLINE bool CGPUnboxValueBool(JavaLangBoolean *value) { return [value booleanValue]; }
CGP_ALWAYS_INLINE JavaLangEnum<ComGoogleProtobufProtocolMessageEnum> *CGPUnboxValueEnum(
JavaLangEnum<ComGoogleProtobufProtocolMessageEnum> *value) {
return value;
}
CGP_ALWAYS_INLINE id CGPUnboxValueId(id value) { return value; }

// Functions that convert a value from its reflection to its storage type.
CGP_ALWAYS_INLINE jint CGPFromReflectionTypeInt(JavaLangInteger *value) { return [value intValue]; }
CGP_ALWAYS_INLINE jlong CGPFromReflectionTypeLong(JavaLangLong *value) {
return [value longLongValue];
}
CGP_ALWAYS_INLINE jfloat CGPFromReflectionTypeFloat(JavaLangFloat *value) {
return [value floatValue];
}
CGP_ALWAYS_INLINE jdouble CGPFromReflectionTypeDouble(JavaLangDouble *value) {
return [value doubleValue];
}
CGP_ALWAYS_INLINE bool CGPFromReflectionTypeBool(JavaLangBoolean *value) {
return [value booleanValue];
}
CGP_ALWAYS_INLINE id CGPFromReflectionTypeEnum(CGPEnumValueDescriptor *value) {
return value->enum_;
}
CGP_ALWAYS_INLINE id CGPFromReflectionTypeId(id value) { return value; }

// Functions that convert a value from its field storage type to the type
// expected by a reflection accessor. (accessing with a descriptor)
// For enums, the reflection type is a EnumValueDescriptor.
CGP_ALWAYS_INLINE JavaLangInteger *CGPToReflectionTypeInt(jint value, CGPFieldDescriptor *field) {
return [JavaLangInteger valueOfWithInt:value];
}
CGP_ALWAYS_INLINE JavaLangLong *CGPToReflectionTypeLong(jlong value, CGPFieldDescriptor *field) {
return [JavaLangLong valueOfWithLong:value];
}
CGP_ALWAYS_INLINE JavaLangFloat *CGPToReflectionTypeFloat(jfloat value, CGPFieldDescriptor *field) {
return [JavaLangFloat valueOfWithFloat:value];
}
CGP_ALWAYS_INLINE JavaLangDouble *CGPToReflectionTypeDouble(jdouble value,
CGPFieldDescriptor *field) {
return [JavaLangDouble valueOfWithDouble:value];
}
CGP_ALWAYS_INLINE JavaLangBoolean *CGPToReflectionTypeBool(bool value, CGPFieldDescriptor *field) {
return [JavaLangBoolean valueOfWithBoolean:value];
}
CGP_ALWAYS_INLINE CGPEnumValueDescriptor *CGPToReflectionTypeEnum(
JavaLangEnum<ComGoogleProtobufProtocolMessageEnum> *value, CGPFieldDescriptor *field) {
return ((CGPEnumDescriptor *)field->valueType_)->values_->buffer_[[value ordinal]];
}
CGP_ALWAYS_INLINE id CGPToReflectionTypeId(id value, CGPFieldDescriptor *field) {
return RETAIN_AND_AUTORELEASE(value);
}

#endif // __ComGoogleProtobufDescriptors_PackagePrivate_H__
Loading