From f9234195ac811e54dc168bf401362749f3b7c573 Mon Sep 17 00:00:00 2001 From: Dave MacLachlan Date: Fri, 10 Apr 2026 15:50:33 -0700 Subject: [PATCH] Refactor `CGPFieldData` to be const. PiperOrigin-RevId: 897927646 --- .../protobuf/compiler/j2objc/j2objc_enum.cc | 2 +- .../protobuf/compiler/j2objc/j2objc_field.cc | 30 +- .../protobuf/compiler/j2objc/j2objc_field.h | 3 - .../compiler/j2objc/j2objc_message.cc | 15 +- .../compiler/j2objc/j2objc_message_lite.cc | 2 +- .../src/com/google/protobuf/Descriptors.m | 655 +++++++++++------- .../protobuf/Descriptors_PackagePrivate.h | 42 +- .../src/com/google/protobuf/ExtensionLite.h | 4 +- .../src/com/google/protobuf/ExtensionLite.m | 4 +- .../com/google/protobuf/ExtensionRegistry.mm | 2 +- .../com/google/protobuf/GeneratedMessage.mm | 67 +- 11 files changed, 463 insertions(+), 363 deletions(-) diff --git a/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_enum.cc b/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_enum.cc index d47e061dcb..7ebd77492f 100644 --- a/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_enum.cc +++ b/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_enum.cc @@ -255,7 +255,7 @@ void EnumGenerator::GenerateSource(io::Printer* printer) { "\n" "$classname$ *$classname$_values_[$count$];\n" "\n" - "ComGoogleProtobufDescriptors_EnumDescriptor" + "static ComGoogleProtobufDescriptors_EnumDescriptor" " *$classname$_descriptor_ = nil;\n" "\n" "@implementation $classname$\n" diff --git a/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_field.cc b/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_field.cc index a1a2ff967c..89715cc8b2 100644 --- a/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_field.cc +++ b/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_field.cc @@ -178,10 +178,6 @@ void CollectForwardDeclarationsForFieldType(std::set* declarations, declarations->insert("@class ComGoogleProtobufDescriptors_EnumDescriptor"); declarations->insert("J2OBJC_CLASS_DECLARATION(" + ClassName(descriptor->enum_type()) + ")"); - declarations->insert( - "FOUNDATION_EXPORT " - "ComGoogleProtobufDescriptors_EnumDescriptor * _Nonnull " + - ClassName(descriptor->enum_type()) + "_descriptor_"); } else if (type == JAVATYPE_MESSAGE) { std::string classname = ClassName(descriptor->message_type()); declarations->insert("@class " + classname); @@ -279,7 +275,6 @@ void FieldGenerator::GenerateFieldData(io::Printer *printer) const { ); GenerateFieldDataOffset(printer); GenerateClassNameOrMapData(printer); - GenerateStaticRefs(printer); printer->Print(variables_, " .containingType = NULL,\n" // Used by extensions. " .optionsData = $options_data$,\n" @@ -295,21 +290,6 @@ void FieldGenerator::GenerateClassNameOrMapData(io::Printer *printer) const { GenerateObjcClassRef(printer, descriptor_); } -void FieldGenerator::GenerateStaticRefs(io::Printer *printer) const { - JavaType type = GetJavaType(descriptor_); - std::string staticref; - if (type == JAVATYPE_MESSAGE) { - staticref = "&" + - GetParameterType(descriptor_) + "_descriptor_"; - } else if (type == JAVATYPE_ENUM) { - staticref = "&" + - GetParameterType(descriptor_) + "_descriptor_"; - } else { - staticref = "NULL"; - } - printer->Print(" .descriptorRef = $staticref$,\n", "staticref", staticref); -} - SingleFieldGenerator::SingleFieldGenerator( const FieldDescriptor *descriptor, uint32_t *numHasBits) : FieldGenerator(descriptor) { @@ -333,7 +313,7 @@ void SingleFieldGenerator::GenerateFieldBuilderHeader(io::Printer* printer) "- (nonnull $classname$_Builder *)clear$capitalized_name$;\n"); if (IsGenerateProperties(descriptor_->file())) { - printer->Print(GetStorageType(descriptor_) == GetNonNullType(descriptor_) + printer->Print(GetStorageType(descriptor_) == GetNonNullType(descriptor_) ? "@property (" : "@property (nonnull, retain, "); printer->Print( variables_, @@ -600,10 +580,6 @@ void MapEntryFieldGenerator::GenerateFieldDataOffset(io::Printer *printer) printer->Print(variables_, " .offset = 0,\n"); } -void MapFieldGenerator::GenerateStaticRefs(io::Printer *printer) const { - printer->Print(variables_, " .descriptorRef = NULL,\n"); -} - void MapEntryFieldGenerator::GenerateFieldBuilderHeader(io::Printer* printer) const { } @@ -615,10 +591,6 @@ void MapEntryFieldGenerator::GenerateMessageOrBuilderProtocol( void MapEntryFieldGenerator::GenerateDeclaration(io::Printer* printer) const { } -void MapEntryFieldGenerator::GenerateStaticRefs(io::Printer *printer) const { - printer->Print(variables_, " .descriptorRef = NULL,\n"); -} - FieldGeneratorMap::FieldGeneratorMap(const Descriptor* descriptor) : descriptor_(descriptor), field_generators_( diff --git a/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_field.h b/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_field.h index 1d7102b6b6..3691bc92bb 100644 --- a/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_field.h +++ b/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_field.h @@ -83,7 +83,6 @@ class FieldGenerator { virtual void GenerateFieldDataOffset(io::Printer *printer) const; virtual void GenerateClassNameOrMapData(io::Printer *printer) const; - virtual void GenerateStaticRefs(io::Printer *printer) const; private: GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FieldGenerator); @@ -158,7 +157,6 @@ class MapFieldGenerator : public FieldGenerator { protected: virtual void GenerateClassNameOrMapData(io::Printer *printer) const; - virtual void GenerateStaticRefs(io::Printer *printer) const; private: const FieldDescriptor* key_field_; @@ -181,7 +179,6 @@ class MapEntryFieldGenerator : public FieldGenerator { protected: virtual void GenerateFieldDataOffset(io::Printer *printer) const; - virtual void GenerateStaticRefs(io::Printer *printer) const; private: GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MapEntryFieldGenerator); diff --git a/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_message.cc b/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_message.cc index 94b7bddf31..974644a569 100644 --- a/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_message.cc +++ b/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_message.cc @@ -304,10 +304,7 @@ void MessageGenerator::GenerateHeader(io::Printer* printer) { "\n" "J2OBJC_STATIC_INIT($classname$)\n" "\n" - "J2OBJC_TYPE_LITERAL_HEADER($classname$)\n" - "\n" - "FOUNDATION_EXPORT ComGoogleProtobufDescriptors_Descriptor " - "* _Nonnull $classname$_descriptor_;\n", + "J2OBJC_TYPE_LITERAL_HEADER($classname$)\n", "classname", ClassName(descriptor_)); for (int i = 0; i < descriptor_->real_oneof_decl_count(); i++) { @@ -358,7 +355,7 @@ void MessageGenerator::GenerateSource(io::Printer* printer) { "\n" "J2OBJC_INITIALIZED_DEFN($classname$);\n" "\n" - "ComGoogleProtobufDescriptors_Descriptor * _Nonnull " + "static ComGoogleProtobufDescriptors_Descriptor * _Nonnull " "$classname$_descriptor_;\n", "classname", ClassName(descriptor_)); @@ -459,7 +456,7 @@ void MessageGenerator::GenerateSource(io::Printer* printer) { "classname", ClassName(descriptor_), "flags", GetMessageFlags(descriptor_)); if (field_generators_.numMapFields() > 0) { - printer->Print("static CGPFieldData mapEntryFields[] = {\n"); + printer->Print("static const CGPFieldData mapEntryFields[] = {\n"); printer->Indent(); for (int i = 0; i < descriptor_->field_count(); i++) { field_generators_.get(descriptor_->field(i)) @@ -468,7 +465,7 @@ void MessageGenerator::GenerateSource(io::Printer* printer) { printer->Outdent(); printer->Print("};\n"); } - printer->Print("static CGPFieldData fields[] = {\n"); + printer->Print("static const CGPFieldData fields[] = {\n"); printer->Indent(); for (int i = 0; i < descriptor_->field_count(); i++) { field_generators_.get(descriptor_->field(i)).GenerateFieldData(printer); @@ -476,7 +473,7 @@ void MessageGenerator::GenerateSource(io::Printer* printer) { printer->Outdent(); printer->Print("};\n"); if (descriptor_->real_oneof_decl_count() > 0) { - printer->Print("static CGPOneofData oneofs[] = {\n"); + printer->Print("static const CGPOneofData oneofs[] = {\n"); printer->Indent(); for (int i = 0; i < descriptor_->real_oneof_decl_count(); i++) { OneofGenerator(descriptor_->oneof_decl(i)).GenerateOneofData(printer); @@ -493,7 +490,7 @@ void MessageGenerator::GenerateSource(io::Printer* printer) { descriptor_->real_oneof_decl_count() > 0 ? "oneofs" : "NULL"); if (descriptor_->extension_count() > 0) { - printer->Print("static CGPFieldData extensionFields[] = {\n"); + printer->Print("static const CGPFieldData extensionFields[] = {\n"); printer->Indent(); for (int i = 0; i < descriptor_->extension_count(); i++) { ExtensionGenerator(descriptor_->extension(i)).GenerateFieldData(printer); diff --git a/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_message_lite.cc b/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_message_lite.cc index e8c73a822f..cea575fffe 100644 --- a/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_message_lite.cc +++ b/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_message_lite.cc @@ -355,7 +355,7 @@ void MessageLiteGenerator::GenerateSource(io::Printer* printer) { printer->Outdent(); printer->Print("};\n"); if (descriptor_->oneof_decl_count() > 0) { - printer->Print("static CGPOneofData oneofs[] = {\n"); + printer->Print("static const CGPOneofData oneofs[] = {\n"); printer->Indent(); for (int i = 0; i < descriptor_->oneof_decl_count(); i++) { OneofGenerator(descriptor_->oneof_decl(i)).GenerateOneofData(printer); diff --git a/protobuf/runtime/src/com/google/protobuf/Descriptors.m b/protobuf/runtime/src/com/google/protobuf/Descriptors.m index 0b44191796..6329399fa2 100644 --- a/protobuf/runtime/src/com/google/protobuf/Descriptors.m +++ b/protobuf/runtime/src/com/google/protobuf/Descriptors.m @@ -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: @@ -77,18 +68,18 @@ BOOL CGPIsRetainedType(CGPFieldJavaType type) { } size_t CGPGetTypeSize(CGPFieldJavaType type) { -#define GET_TYPE_SIZE_CASE(NAME) \ - return sizeof(TYPE_##NAME); +#define GET_TYPE_SIZE_CASE(NAME) return sizeof(TYPE_##NAME); SWITCH_TYPES_NO_ENUM(type, GET_TYPE_SIZE_CASE) #undef GET_TYPE_SIZE_CASE } -IOSObjectArray *CreateFields( - jint fieldCount, CGPFieldData *fieldData, CGPDescriptor *containingType) { - IOSObjectArray *fields = [IOSObjectArray newArrayWithLength:fieldCount - type:ComGoogleProtobufDescriptors_FieldDescriptor_class_()]; +static IOSObjectArray *CreateFields(jint fieldCount, const CGPFieldData *fieldData, + CGPDescriptor *containingType) { + IOSObjectArray *fields = + [IOSObjectArray newArrayWithLength:fieldCount + type:ComGoogleProtobufDescriptors_FieldDescriptor_class_()]; CGPFieldDescriptor **fieldsBuf = fields->buffer_; for (jint i = 0; i < fieldCount; i++) { fieldsBuf[i] = [[CGPFieldDescriptor alloc] initWithData:&fieldData[i]]; @@ -96,24 +87,22 @@ size_t CGPGetTypeSize(CGPFieldJavaType type) { return fields; } -CGPDescriptor *CGPInitDescriptor( - Class messageClass, Class builderClass, CGPMessageFlags flags, - size_t storageSize) { - return [[CGPDescriptor alloc] - initWithMessageClass:messageClass - builderClass:builderClass - flags:flags - storageSize:storageSize]; +CGPDescriptor *CGPInitDescriptor(Class messageClass, Class builderClass, CGPMessageFlags flags, + size_t storageSize) { + return [[CGPDescriptor alloc] initWithMessageClass:messageClass + builderClass:builderClass + flags:flags + storageSize:storageSize]; } -void CGPInitFields( - CGPDescriptor *descriptor, jint fieldCount, CGPFieldData *fieldData, - jint oneofCount, CGPOneofData *oneofData) { +void CGPInitFields(CGPDescriptor *descriptor, jint fieldCount, const CGPFieldData *fieldData, + jint oneofCount, const CGPOneofData *oneofData) { descriptor->fields_ = CreateFields(fieldCount, fieldData, descriptor); if (oneofCount > 0) { - IOSObjectArray *oneofs = [IOSObjectArray newArrayWithLength:oneofCount - type:ComGoogleProtobufDescriptors_OneofDescriptor_class_()]; + IOSObjectArray *oneofs = + [IOSObjectArray newArrayWithLength:oneofCount + type:ComGoogleProtobufDescriptors_OneofDescriptor_class_()]; CGPFieldDescriptor **fieldsBuf = descriptor->fields_->buffer_; for (jint i = 0; i < oneofCount; i++) { CGPOneofDescriptor *newOneof = [[CGPOneofDescriptor alloc] initWithData:&oneofData[i] @@ -129,7 +118,7 @@ void CGPInitFields( } } -CGPDescriptor *NewMapEntryDescriptor(CGPFieldData *fieldData) { +static CGPDescriptor *NewMapEntryDescriptor(const CGPFieldData *fieldData) { CGPDescriptor *descriptor = [[CGPDescriptor alloc] init]; descriptor->fields_ = CreateFields(2, fieldData, descriptor); return descriptor; @@ -150,8 +139,9 @@ void CGPInitFields( uintptr_t enumDescPtr = enumPtr + enumSize * valuesCount; uintptr_t enumValueDescPtr = enumDescPtr + enumDescSize; - IOSObjectArray *valuesArray = [IOSObjectArray newArrayWithLength:valuesCount - type:ComGoogleProtobufDescriptors_EnumValueDescriptor_class_()]; + IOSObjectArray *valuesArray = + [IOSObjectArray newArrayWithLength:valuesCount + type:ComGoogleProtobufDescriptors_EnumValueDescriptor_class_()]; id *valueDescBuf = valuesArray->buffer_; for (jint i = 0; i < valuesCount; i++) { @@ -175,14 +165,12 @@ void CGPInitFields( // Construct the enum descriptor. CGPEnumDescriptor *enumDesc = objc_constructInstance([CGPEnumDescriptor class], (void *)enumDescPtr); - return [enumDesc initWithValueOffset:valueOffset - retainedValues:valuesArray - is_closed:is_closed]; + return [enumDesc initWithValueOffset:valueOffset retainedValues:valuesArray is_closed:is_closed]; } -void CGPInitializeOneofCaseEnum( - Class enumClass, jint valuesCount, JavaLangEnum *values[], - NSString **names, jint *intValues) { +void CGPInitializeOneofCaseEnum(Class enumClass, jint valuesCount, + JavaLangEnum *values[], + NSString **names, jint *intValues) { Ivar valueIvar = class_getInstanceVariable(enumClass, "value_"); ptrdiff_t valueOffset = ivar_getOffset(valueIvar); @@ -274,7 +262,7 @@ - (CGPFieldDescriptor *)findFieldByNumberWithInt:(jint)fieldId { int SerializationOrderComp(const void *a, const void *b) { return CGPFieldGetNumber(*(const CGPFieldDescriptor **)a) - - CGPFieldGetNumber(*(const CGPFieldDescriptor **)b); + CGPFieldGetNumber(*(const CGPFieldDescriptor **)b); } IOSObjectArray *CGPGetSerializationOrderFields(CGPDescriptor *descriptor) { @@ -293,7 +281,7 @@ int SerializationOrderComp(const void *a, const void *b) { @implementation ComGoogleProtobufDescriptors_FieldDescriptor -static uint32_t TagFromData(CGPFieldData *data) { +static uint32_t TagFromData(const CGPFieldData *data) { BOOL isPacked = data->flags & CGPFieldFlagPacked; return CGPWireFormatMakeTag(data->number, CGPWireFormatForType(data->type, isPacked)); } @@ -316,8 +304,8 @@ static uint32_t TagFromData(CGPFieldData *data) { } // Default values for enums and message types can't be assigned in static data. -static void CGPFieldFixDefaultValue(CGPFieldDescriptor *descriptor) { - CGPFieldData *data = descriptor->data_; +static void CGPFieldUpdateValueType(CGPFieldDescriptor *descriptor) { + const CGPFieldData *data = descriptor->data_; switch (descriptor->javaType_) { case ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_Enum_INT: case ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_Enum_LONG: @@ -326,20 +314,16 @@ static void CGPFieldFixDefaultValue(CGPFieldDescriptor *descriptor) { case ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_Enum_BOOLEAN: case ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_Enum_STRING: break; - case ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_Enum_ENUM: - { - Class enumClass = data->objcType; - NSCAssert(enumClass != nil, @"Field data is missing objc enum type."); - CGPEnumDescriptor *enumDescriptor = [enumClass performSelector:@selector(getDescriptor)]; - CGPEnumValueDescriptor *valueDescriptor = - IOSObjectArray_Get(enumDescriptor->values_, data->defaultValue.valueInt); - data->defaultValue.valueId = valueDescriptor->enum_; - descriptor->valueType_ = enumDescriptor; - break; - } + case ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_Enum_ENUM: { + Class enumClass = data->objcType; + NSCAssert(enumClass != nil, @"Field data is missing objc enum type."); + CGPEnumDescriptor *enumDescriptor = [enumClass performSelector:@selector(getDescriptor)]; + descriptor->valueType_ = enumDescriptor; + break; + } case ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_Enum_BYTE_STRING: if (data->defaultValue.valueId == nil) { - data->defaultValue.valueId = ComGoogleProtobufByteString_get_EMPTY(); + descriptor->valueType_ = ComGoogleProtobufByteString_get_EMPTY(); } else { // Default byte string data is written to static data as a length // prefixed c-string. @@ -350,36 +334,29 @@ static void CGPFieldFixDefaultValue(CGPFieldDescriptor *descriptor) { rawBytes += sizeof(length); CGPByteString *byteString = CGPNewByteString(length); memcpy(byteString->buffer_, rawBytes, length); - data->defaultValue.valueId = byteString; + descriptor->valueType_ = byteString; } break; - case ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_Enum_MESSAGE: - { - if (CGPFieldIsMap(descriptor)) { - descriptor->valueType_ = NewMapEntryDescriptor(data->mapEntryFields); - break; - } - CGPDescriptor *msgDescriptor = - data->descriptorRef ? (__bridge id)*(data->descriptorRef) : nil; - if (msgDescriptor == nil) { - // The descriptorRef wasn't specified, so use its accessor. - Class msgClass = data->objcType; - msgDescriptor = [msgClass performSelector:@selector(getDescriptor)]; - } - NSCAssert(msgDescriptor != nil, @"Field data is missing descriptor reference."); - data->defaultValue.valueId = msgDescriptor->defaultInstance_; - descriptor->valueType_ = msgDescriptor; + case ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_Enum_MESSAGE: { + if (CGPFieldIsMap(descriptor)) { + descriptor->valueType_ = NewMapEntryDescriptor(data->mapEntryFields); break; } + Class msgClass = data->objcType; + CGPDescriptor *msgDescriptor = [msgClass performSelector:@selector(getDescriptor)]; + NSCAssert(msgDescriptor != nil, @"Field data is missing descriptor reference."); + descriptor->valueType_ = msgDescriptor; + break; + } } } -- (instancetype)initWithData:(CGPFieldData *)data { +- (instancetype)initWithData:(const CGPFieldData *)data { if (self = [self init]) { data_ = data; tag_ = TagFromData(data); javaType_ = [GetTypeObj(data->type)->javaType_ ordinal]; - CGPFieldFixDefaultValue(self); + CGPFieldUpdateValueType(self); } return self; } @@ -423,22 +400,22 @@ - (CGPOneofDescriptor *)getContainingOneof { - (CGPDescriptor *)getMessageType { if (!CGPJavaTypeIsMessage(CGPFieldGetJavaType(self))) { - @throw [[[JavaLangUnsupportedOperationException alloc] initWithNSString: - @"This field is not of message type."] autorelease]; + @throw [[[JavaLangUnsupportedOperationException alloc] + initWithNSString:@"This field is not of message type."] autorelease]; } return valueType_; } - (CGPEnumDescriptor *)getEnumType { if (!CGPJavaTypeIsEnum(CGPFieldGetJavaType(self))) { - @throw [[[JavaLangUnsupportedOperationException alloc] initWithNSString: - @"This field is not of enum type."] autorelease]; + @throw [[[JavaLangUnsupportedOperationException alloc] + initWithNSString:@"This field is not of enum type."] autorelease]; } return valueType_; } - (id)getDefaultValue { - return CGPFieldGetDefaultValue(self); + return CGPFieldGetDefaultValueObject(self); } - (ComGoogleProtobufDescriptorProtos_FieldOptions *)getOptions { @@ -458,17 +435,59 @@ - (ComGoogleProtobufDescriptorProtos_FieldOptions *)getOptions { J2OBJC_CLASS_TYPE_LITERAL_SOURCE(ComGoogleProtobufDescriptors_FieldDescriptor) -id CGPFieldGetDefaultValue(CGPFieldDescriptor *field) { +CGPValue CGPFieldGetDefaultValue(const CGPFieldDescriptor *field) { + CGPValue value; + switch (CGPFieldGetJavaType(field)) { + case ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_Enum_INT: + case ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_Enum_LONG: + case ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_Enum_FLOAT: + case ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_Enum_DOUBLE: + case ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_Enum_BOOLEAN: + case ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_Enum_STRING: + value = field->data_->defaultValue; + break; + case ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_Enum_BYTE_STRING: + value.valueId = field->valueType_; + break; + case ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_Enum_ENUM: + value.valueId = ((CGPEnumValueDescriptor *)((CGPEnumDescriptor *)field->valueType_) + ->values_->buffer_[field->data_->defaultValue.valueInt]) + ->enum_; + break; + case ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_Enum_MESSAGE: + value.valueId = ((CGPDescriptor *)field->valueType_)->defaultInstance_; + break; + } + return value; +} + +id CGPFieldGetDefaultValueObject(CGPFieldDescriptor *field) { if (CGPFieldIsRepeated(field)) { return [JavaUtilCollections emptyList]; } -#define GET_DEFAULT_VALUE_CASE(NAME) \ - return CGPToReflectionType##NAME(field->data_->defaultValue.VALUE_FIELD_##NAME, field); - - SWITCH_TYPES_WITH_ENUM(CGPFieldGetJavaType(field), GET_DEFAULT_VALUE_CASE) - -#undef GET_DEFAULT_VALUE_CASE + switch (CGPFieldGetJavaType(field)) { + case ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_Enum_INT: + return [JavaLangInteger valueOfWithInt:field->data_->defaultValue.valueInt]; + case ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_Enum_LONG: + return [JavaLangLong valueOfWithLong:field->data_->defaultValue.valueLong]; + case ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_Enum_FLOAT: + return [JavaLangFloat valueOfWithFloat:field->data_->defaultValue.valueFloat]; + case ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_Enum_DOUBLE: + return [JavaLangDouble valueOfWithDouble:field->data_->defaultValue.valueDouble]; + case ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_Enum_BOOLEAN: + return [JavaLangBoolean valueOfWithBoolean:field->data_->defaultValue.valueBool]; + case ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_Enum_STRING: + return field->data_->defaultValue.valueId; + case ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_Enum_BYTE_STRING: + return field->valueType_; + case ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_Enum_ENUM: + return ((CGPEnumValueDescriptor *)((CGPEnumDescriptor *)field->valueType_) + ->values_->buffer_[field->data_->defaultValue.valueInt]) + ->enum_; + case ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_Enum_MESSAGE: + return ((CGPDescriptor *)field->valueType_)->defaultInstance_; + } } CGPEnumValueDescriptor *CGPEnumValueDescriptorFromInt(CGPEnumDescriptor *enumType, jint value) { @@ -492,7 +511,7 @@ - (instancetype)initWithValueOffset:(ptrdiff_t)valueOffset is_closed:(bool)is_closed { if (self = [super init]) { valueOffset_ = valueOffset; - values_ = values; // Already retained. + values_ = values; // Already retained. is_closed_ = is_closed; } return self; @@ -526,7 +545,7 @@ - (NSString *)getName { @implementation ComGoogleProtobufDescriptors_OneofDescriptor -- (instancetype)initWithData:(CGPOneofData *)data +- (instancetype)initWithData:(const CGPOneofData *)data containingType:(CGPDescriptor *)containingType { if (self = [self init]) { data_ = data; @@ -573,20 +592,25 @@ - (CGPDescriptor *)getContainingType { J2OBJC_INITIALIZED_DEFN(ComGoogleProtobufDescriptors_FieldDescriptor_Type) -ComGoogleProtobufDescriptors_FieldDescriptor_Type *ComGoogleProtobufDescriptors_FieldDescriptor_Type_values_[18]; +ComGoogleProtobufDescriptors_FieldDescriptor_Type + *ComGoogleProtobufDescriptors_FieldDescriptor_Type_values_[18]; @implementation ComGoogleProtobufDescriptors_FieldDescriptor_Type - (ComGoogleProtobufDescriptorProtos_FieldDescriptorProto_Type *)toProto { - return ComGoogleProtobufDescriptorProtos_FieldDescriptorProto_Type_valueOfWithInt_([self ordinal] + 1); + return ComGoogleProtobufDescriptorProtos_FieldDescriptorProto_Type_valueOfWithInt_( + [self ordinal] + 1); } - (ComGoogleProtobufDescriptors_FieldDescriptor_JavaType *)getJavaType { return javaType_; } -+ (ComGoogleProtobufDescriptors_FieldDescriptor_Type *)valueOfWithComGoogleProtobufDescriptorProtos_FieldDescriptorProto_Type:(ComGoogleProtobufDescriptorProtos_FieldDescriptorProto_Type *)type { - return ComGoogleProtobufDescriptors_FieldDescriptor_Type_valueOfWithComGoogleProtobufDescriptorProtos_FieldDescriptorProto_Type_(type); ++ (ComGoogleProtobufDescriptors_FieldDescriptor_Type *) + valueOfWithComGoogleProtobufDescriptorProtos_FieldDescriptorProto_Type: + (ComGoogleProtobufDescriptorProtos_FieldDescriptorProto_Type *)type { + return ComGoogleProtobufDescriptors_FieldDescriptor_Type_valueOfWithComGoogleProtobufDescriptorProtos_FieldDescriptorProto_Type_( + type); } + (IOSObjectArray *)values { @@ -618,55 +642,116 @@ + (void)initialize { size_t allocSize = 18 * objSize; uintptr_t ptr = (uintptr_t)calloc(allocSize, 1); id e; - (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, DOUBLE) = e = objc_constructInstance(self, (void *)ptr), ptr += objSize); - ComGoogleProtobufDescriptors_FieldDescriptor_Type_initWithComGoogleProtobufDescriptors_FieldDescriptor_JavaType_withNSString_withInt_(e, JreLoadEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, DOUBLE), @"DOUBLE", 0); - (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, FLOAT) = e = objc_constructInstance(self, (void *)ptr), ptr += objSize); - ComGoogleProtobufDescriptors_FieldDescriptor_Type_initWithComGoogleProtobufDescriptors_FieldDescriptor_JavaType_withNSString_withInt_(e, JreLoadEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, FLOAT), @"FLOAT", 1); - (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, INT64) = e = objc_constructInstance(self, (void *)ptr), ptr += objSize); - ComGoogleProtobufDescriptors_FieldDescriptor_Type_initWithComGoogleProtobufDescriptors_FieldDescriptor_JavaType_withNSString_withInt_(e, JreLoadEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, LONG), @"INT64", 2); - (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, UINT64) = e = objc_constructInstance(self, (void *)ptr), ptr += objSize); - ComGoogleProtobufDescriptors_FieldDescriptor_Type_initWithComGoogleProtobufDescriptors_FieldDescriptor_JavaType_withNSString_withInt_(e, JreLoadEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, LONG), @"UINT64", 3); - (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, INT32) = e = objc_constructInstance(self, (void *)ptr), ptr += objSize); - ComGoogleProtobufDescriptors_FieldDescriptor_Type_initWithComGoogleProtobufDescriptors_FieldDescriptor_JavaType_withNSString_withInt_(e, JreLoadEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, INT), @"INT32", 4); - (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, FIXED64) = e = objc_constructInstance(self, (void *)ptr), ptr += objSize); - ComGoogleProtobufDescriptors_FieldDescriptor_Type_initWithComGoogleProtobufDescriptors_FieldDescriptor_JavaType_withNSString_withInt_(e, JreLoadEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, LONG), @"FIXED64", 5); - (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, FIXED32) = e = objc_constructInstance(self, (void *)ptr), ptr += objSize); - ComGoogleProtobufDescriptors_FieldDescriptor_Type_initWithComGoogleProtobufDescriptors_FieldDescriptor_JavaType_withNSString_withInt_(e, JreLoadEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, INT), @"FIXED32", 6); - (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, BOOL) = e = objc_constructInstance(self, (void *)ptr), ptr += objSize); - ComGoogleProtobufDescriptors_FieldDescriptor_Type_initWithComGoogleProtobufDescriptors_FieldDescriptor_JavaType_withNSString_withInt_(e, JreLoadEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, BOOLEAN), @"BOOL", 7); - (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, STRING) = e = objc_constructInstance(self, (void *)ptr), ptr += objSize); - ComGoogleProtobufDescriptors_FieldDescriptor_Type_initWithComGoogleProtobufDescriptors_FieldDescriptor_JavaType_withNSString_withInt_(e, JreLoadEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, STRING), @"STRING", 8); - (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, GROUP) = e = objc_constructInstance(self, (void *)ptr), ptr += objSize); - ComGoogleProtobufDescriptors_FieldDescriptor_Type_initWithComGoogleProtobufDescriptors_FieldDescriptor_JavaType_withNSString_withInt_(e, JreLoadEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, MESSAGE), @"GROUP", 9); - (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, MESSAGE) = e = objc_constructInstance(self, (void *)ptr), ptr += objSize); - ComGoogleProtobufDescriptors_FieldDescriptor_Type_initWithComGoogleProtobufDescriptors_FieldDescriptor_JavaType_withNSString_withInt_(e, JreLoadEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, MESSAGE), @"MESSAGE", 10); - (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, BYTES) = e = objc_constructInstance(self, (void *)ptr), ptr += objSize); - ComGoogleProtobufDescriptors_FieldDescriptor_Type_initWithComGoogleProtobufDescriptors_FieldDescriptor_JavaType_withNSString_withInt_(e, JreLoadEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, BYTE_STRING), @"BYTES", 11); - (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, UINT32) = e = objc_constructInstance(self, (void *)ptr), ptr += objSize); - ComGoogleProtobufDescriptors_FieldDescriptor_Type_initWithComGoogleProtobufDescriptors_FieldDescriptor_JavaType_withNSString_withInt_(e, JreLoadEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, INT), @"UINT32", 12); - (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, ENUM) = e = objc_constructInstance(self, (void *)ptr), ptr += objSize); - ComGoogleProtobufDescriptors_FieldDescriptor_Type_initWithComGoogleProtobufDescriptors_FieldDescriptor_JavaType_withNSString_withInt_(e, JreLoadEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, ENUM), @"ENUM", 13); - (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, SFIXED32) = e = objc_constructInstance(self, (void *)ptr), ptr += objSize); - ComGoogleProtobufDescriptors_FieldDescriptor_Type_initWithComGoogleProtobufDescriptors_FieldDescriptor_JavaType_withNSString_withInt_(e, JreLoadEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, INT), @"SFIXED32", 14); - (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, SFIXED64) = e = objc_constructInstance(self, (void *)ptr), ptr += objSize); - ComGoogleProtobufDescriptors_FieldDescriptor_Type_initWithComGoogleProtobufDescriptors_FieldDescriptor_JavaType_withNSString_withInt_(e, JreLoadEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, LONG), @"SFIXED64", 15); - (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, SINT32) = e = objc_constructInstance(self, (void *)ptr), ptr += objSize); - ComGoogleProtobufDescriptors_FieldDescriptor_Type_initWithComGoogleProtobufDescriptors_FieldDescriptor_JavaType_withNSString_withInt_(e, JreLoadEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, INT), @"SINT32", 16); - (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, SINT64) = e = objc_constructInstance(self, (void *)ptr), ptr += objSize); - ComGoogleProtobufDescriptors_FieldDescriptor_Type_initWithComGoogleProtobufDescriptors_FieldDescriptor_JavaType_withNSString_withInt_(e, JreLoadEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, LONG), @"SINT64", 17); + (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, DOUBLE) = e = + objc_constructInstance(self, (void *)ptr), + ptr += objSize); + ComGoogleProtobufDescriptors_FieldDescriptor_Type_initWithComGoogleProtobufDescriptors_FieldDescriptor_JavaType_withNSString_withInt_( + e, JreLoadEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, DOUBLE), @"DOUBLE", + 0); + (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, FLOAT) = e = + objc_constructInstance(self, (void *)ptr), + ptr += objSize); + ComGoogleProtobufDescriptors_FieldDescriptor_Type_initWithComGoogleProtobufDescriptors_FieldDescriptor_JavaType_withNSString_withInt_( + e, JreLoadEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, FLOAT), @"FLOAT", 1); + (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, INT64) = e = + objc_constructInstance(self, (void *)ptr), + ptr += objSize); + ComGoogleProtobufDescriptors_FieldDescriptor_Type_initWithComGoogleProtobufDescriptors_FieldDescriptor_JavaType_withNSString_withInt_( + e, JreLoadEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, LONG), @"INT64", 2); + (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, UINT64) = e = + objc_constructInstance(self, (void *)ptr), + ptr += objSize); + ComGoogleProtobufDescriptors_FieldDescriptor_Type_initWithComGoogleProtobufDescriptors_FieldDescriptor_JavaType_withNSString_withInt_( + e, JreLoadEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, LONG), @"UINT64", 3); + (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, INT32) = e = + objc_constructInstance(self, (void *)ptr), + ptr += objSize); + ComGoogleProtobufDescriptors_FieldDescriptor_Type_initWithComGoogleProtobufDescriptors_FieldDescriptor_JavaType_withNSString_withInt_( + e, JreLoadEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, INT), @"INT32", 4); + (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, FIXED64) = e = + objc_constructInstance(self, (void *)ptr), + ptr += objSize); + ComGoogleProtobufDescriptors_FieldDescriptor_Type_initWithComGoogleProtobufDescriptors_FieldDescriptor_JavaType_withNSString_withInt_( + e, JreLoadEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, LONG), @"FIXED64", 5); + (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, FIXED32) = e = + objc_constructInstance(self, (void *)ptr), + ptr += objSize); + ComGoogleProtobufDescriptors_FieldDescriptor_Type_initWithComGoogleProtobufDescriptors_FieldDescriptor_JavaType_withNSString_withInt_( + e, JreLoadEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, INT), @"FIXED32", 6); + (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, BOOL) = e = + objc_constructInstance(self, (void *)ptr), + ptr += objSize); + ComGoogleProtobufDescriptors_FieldDescriptor_Type_initWithComGoogleProtobufDescriptors_FieldDescriptor_JavaType_withNSString_withInt_( + e, JreLoadEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, BOOLEAN), @"BOOL", 7); + (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, STRING) = e = + objc_constructInstance(self, (void *)ptr), + ptr += objSize); + ComGoogleProtobufDescriptors_FieldDescriptor_Type_initWithComGoogleProtobufDescriptors_FieldDescriptor_JavaType_withNSString_withInt_( + e, JreLoadEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, STRING), @"STRING", + 8); + (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, GROUP) = e = + objc_constructInstance(self, (void *)ptr), + ptr += objSize); + ComGoogleProtobufDescriptors_FieldDescriptor_Type_initWithComGoogleProtobufDescriptors_FieldDescriptor_JavaType_withNSString_withInt_( + e, JreLoadEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, MESSAGE), @"GROUP", + 9); + (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, MESSAGE) = e = + objc_constructInstance(self, (void *)ptr), + ptr += objSize); + ComGoogleProtobufDescriptors_FieldDescriptor_Type_initWithComGoogleProtobufDescriptors_FieldDescriptor_JavaType_withNSString_withInt_( + e, JreLoadEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, MESSAGE), @"MESSAGE", + 10); + (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, BYTES) = e = + objc_constructInstance(self, (void *)ptr), + ptr += objSize); + ComGoogleProtobufDescriptors_FieldDescriptor_Type_initWithComGoogleProtobufDescriptors_FieldDescriptor_JavaType_withNSString_withInt_( + e, JreLoadEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, BYTE_STRING), + @"BYTES", 11); + (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, UINT32) = e = + objc_constructInstance(self, (void *)ptr), + ptr += objSize); + ComGoogleProtobufDescriptors_FieldDescriptor_Type_initWithComGoogleProtobufDescriptors_FieldDescriptor_JavaType_withNSString_withInt_( + e, JreLoadEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, INT), @"UINT32", 12); + (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, ENUM) = e = + objc_constructInstance(self, (void *)ptr), + ptr += objSize); + ComGoogleProtobufDescriptors_FieldDescriptor_Type_initWithComGoogleProtobufDescriptors_FieldDescriptor_JavaType_withNSString_withInt_( + e, JreLoadEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, ENUM), @"ENUM", 13); + (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, SFIXED32) = e = + objc_constructInstance(self, (void *)ptr), + ptr += objSize); + ComGoogleProtobufDescriptors_FieldDescriptor_Type_initWithComGoogleProtobufDescriptors_FieldDescriptor_JavaType_withNSString_withInt_( + e, JreLoadEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, INT), @"SFIXED32", + 14); + (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, SFIXED64) = e = + objc_constructInstance(self, (void *)ptr), + ptr += objSize); + ComGoogleProtobufDescriptors_FieldDescriptor_Type_initWithComGoogleProtobufDescriptors_FieldDescriptor_JavaType_withNSString_withInt_( + e, JreLoadEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, LONG), @"SFIXED64", + 15); + (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, SINT32) = e = + objc_constructInstance(self, (void *)ptr), + ptr += objSize); + ComGoogleProtobufDescriptors_FieldDescriptor_Type_initWithComGoogleProtobufDescriptors_FieldDescriptor_JavaType_withNSString_withInt_( + e, JreLoadEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, INT), @"SINT32", 16); + (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, SINT64) = e = + objc_constructInstance(self, (void *)ptr), + ptr += objSize); + ComGoogleProtobufDescriptors_FieldDescriptor_Type_initWithComGoogleProtobufDescriptors_FieldDescriptor_JavaType_withNSString_withInt_( + e, JreLoadEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, LONG), @"SINT64", 17); J2OBJC_SET_INITIALIZED(ComGoogleProtobufDescriptors_FieldDescriptor_Type) } } + (const J2ObjcClassInfo *)__metadata { static J2ObjcMethodInfo methods[] = { - { NULL, "LComGoogleProtobufDescriptorProtos_FieldDescriptorProto_Type;", 0x1, -1, -1, -1, -1, - -1, -1 }, - { NULL, "LComGoogleProtobufDescriptors_FieldDescriptor_JavaType;", 0x1, -1, -1, -1, -1, -1, - -1 }, - { NULL, "LComGoogleProtobufDescriptors_FieldDescriptor_Type;", 0x9, 0, 1, -1, -1, -1, -1 }, - { NULL, "[LComGoogleProtobufDescriptors_FieldDescriptor_Type;", 0x9, -1, -1, -1, -1, -1, -1 }, - { NULL, "LComGoogleProtobufDescriptors_FieldDescriptor_Type;", 0x9, 0, 2, -1, -1, -1, -1 }, + {NULL, "LComGoogleProtobufDescriptorProtos_FieldDescriptorProto_Type;", 0x1, -1, -1, -1, -1, + -1, -1}, + {NULL, "LComGoogleProtobufDescriptors_FieldDescriptor_JavaType;", 0x1, -1, -1, -1, -1, -1, + -1}, + {NULL, "LComGoogleProtobufDescriptors_FieldDescriptor_Type;", 0x9, 0, 1, -1, -1, -1, -1}, + {NULL, "[LComGoogleProtobufDescriptors_FieldDescriptor_Type;", 0x9, -1, -1, -1, -1, -1, -1}, + {NULL, "LComGoogleProtobufDescriptors_FieldDescriptor_Type;", 0x9, 0, 2, -1, -1, -1, -1}, }; methods[0].selector = @selector(toProto); @@ -677,89 +762,101 @@ + (const J2ObjcClassInfo *)__metadata { methods[4].selector = @selector(valueOfWithNSString:); static const J2ObjcFieldInfo fields[] = { - { "DOUBLE", "LComGoogleProtobufDescriptors_FieldDescriptor_Type;", .constantValue.asLong = 0, - 0x4019, -1, 3, -1, -1 }, - { "FLOAT", "LComGoogleProtobufDescriptors_FieldDescriptor_Type;", .constantValue.asLong = 0, - 0x4019, -1, 4, -1, -1 }, - { "INT64", "LComGoogleProtobufDescriptors_FieldDescriptor_Type;", .constantValue.asLong = 0, - 0x4019, -1, 5, -1, -1 }, - { "UINT64", "LComGoogleProtobufDescriptors_FieldDescriptor_Type;", .constantValue.asLong = 0, - 0x4019, -1, 6, -1, -1 }, - { "INT32", "LComGoogleProtobufDescriptors_FieldDescriptor_Type;", .constantValue.asLong = 0, - 0x4019, -1, 7, -1, -1 }, - { "FIXED64", "LComGoogleProtobufDescriptors_FieldDescriptor_Type;", .constantValue.asLong = 0, - 0x4019, -1, 8, -1, -1 }, - { "FIXED32", "LComGoogleProtobufDescriptors_FieldDescriptor_Type;", .constantValue.asLong = 0, - 0x4019, -1, 9, -1, -1 }, - { "BOOL", "LComGoogleProtobufDescriptors_FieldDescriptor_Type;", .constantValue.asLong = 0, - 0x4019, -1, 10, -1, -1 }, - { "STRING", "LComGoogleProtobufDescriptors_FieldDescriptor_Type;", .constantValue.asLong = 0, - 0x4019, -1, 11, -1, -1 }, - { "GROUP", "LComGoogleProtobufDescriptors_FieldDescriptor_Type;", .constantValue.asLong = 0, - 0x4019, -1, 12, -1, -1 }, - { "MESSAGE", "LComGoogleProtobufDescriptors_FieldDescriptor_Type;", .constantValue.asLong = 0, - 0x4019, -1, 13, -1, -1 }, - { "BYTES", "LComGoogleProtobufDescriptors_FieldDescriptor_Type;", .constantValue.asLong = 0, - 0x4019, -1, 14, -1, -1 }, - { "UINT32", "LComGoogleProtobufDescriptors_FieldDescriptor_Type;", .constantValue.asLong = 0, - 0x4019, -1, 15, -1, -1 }, - { "ENUM", "LComGoogleProtobufDescriptors_FieldDescriptor_Type;", .constantValue.asLong = 0, - 0x4019, -1, 16, -1, -1 }, - { "SFIXED32", "LComGoogleProtobufDescriptors_FieldDescriptor_Type;", .constantValue.asLong = 0, - 0x4019, -1, 17, -1, -1 }, - { "SFIXED64", "LComGoogleProtobufDescriptors_FieldDescriptor_Type;", .constantValue.asLong = 0, - 0x4019, -1, 18, -1, -1 }, - { "SINT32", "LComGoogleProtobufDescriptors_FieldDescriptor_Type;", .constantValue.asLong = 0, - 0x4019, -1, 19, -1, -1 }, - { "SINT64", "LComGoogleProtobufDescriptors_FieldDescriptor_Type;", .constantValue.asLong = 0, - 0x4019, -1, 20, -1, -1 }, - { "javaType_", "LComGoogleProtobufDescriptors_FieldDescriptor_JavaType;", - .constantValue.asLong = 0, 0x2, -1, -1, -1, -1 }, + {"DOUBLE", "LComGoogleProtobufDescriptors_FieldDescriptor_Type;", .constantValue.asLong = 0, + 0x4019, -1, 3, -1, -1}, + {"FLOAT", "LComGoogleProtobufDescriptors_FieldDescriptor_Type;", .constantValue.asLong = 0, + 0x4019, -1, 4, -1, -1}, + {"INT64", "LComGoogleProtobufDescriptors_FieldDescriptor_Type;", .constantValue.asLong = 0, + 0x4019, -1, 5, -1, -1}, + {"UINT64", "LComGoogleProtobufDescriptors_FieldDescriptor_Type;", .constantValue.asLong = 0, + 0x4019, -1, 6, -1, -1}, + {"INT32", "LComGoogleProtobufDescriptors_FieldDescriptor_Type;", .constantValue.asLong = 0, + 0x4019, -1, 7, -1, -1}, + {"FIXED64", "LComGoogleProtobufDescriptors_FieldDescriptor_Type;", .constantValue.asLong = 0, + 0x4019, -1, 8, -1, -1}, + {"FIXED32", "LComGoogleProtobufDescriptors_FieldDescriptor_Type;", .constantValue.asLong = 0, + 0x4019, -1, 9, -1, -1}, + {"BOOL", "LComGoogleProtobufDescriptors_FieldDescriptor_Type;", .constantValue.asLong = 0, + 0x4019, -1, 10, -1, -1}, + {"STRING", "LComGoogleProtobufDescriptors_FieldDescriptor_Type;", .constantValue.asLong = 0, + 0x4019, -1, 11, -1, -1}, + {"GROUP", "LComGoogleProtobufDescriptors_FieldDescriptor_Type;", .constantValue.asLong = 0, + 0x4019, -1, 12, -1, -1}, + {"MESSAGE", "LComGoogleProtobufDescriptors_FieldDescriptor_Type;", .constantValue.asLong = 0, + 0x4019, -1, 13, -1, -1}, + {"BYTES", "LComGoogleProtobufDescriptors_FieldDescriptor_Type;", .constantValue.asLong = 0, + 0x4019, -1, 14, -1, -1}, + {"UINT32", "LComGoogleProtobufDescriptors_FieldDescriptor_Type;", .constantValue.asLong = 0, + 0x4019, -1, 15, -1, -1}, + {"ENUM", "LComGoogleProtobufDescriptors_FieldDescriptor_Type;", .constantValue.asLong = 0, + 0x4019, -1, 16, -1, -1}, + {"SFIXED32", "LComGoogleProtobufDescriptors_FieldDescriptor_Type;", .constantValue.asLong = 0, + 0x4019, -1, 17, -1, -1}, + {"SFIXED64", "LComGoogleProtobufDescriptors_FieldDescriptor_Type;", .constantValue.asLong = 0, + 0x4019, -1, 18, -1, -1}, + {"SINT32", "LComGoogleProtobufDescriptors_FieldDescriptor_Type;", .constantValue.asLong = 0, + 0x4019, -1, 19, -1, -1}, + {"SINT64", "LComGoogleProtobufDescriptors_FieldDescriptor_Type;", .constantValue.asLong = 0, + 0x4019, -1, 20, -1, -1}, + {"javaType_", "LComGoogleProtobufDescriptors_FieldDescriptor_JavaType;", + .constantValue.asLong = 0, 0x2, -1, -1, -1, -1}, }; static const void *ptrTable[] = { - "valueOf", "LComGoogleProtobufDescriptorProtos_FieldDescriptorProto_Type;", "LNSString;", - &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, DOUBLE), - &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, FLOAT), - &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, INT64), - &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, UINT64), - &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, INT32), - &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, FIXED64), - &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, FIXED32), - &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, BOOL), - &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, STRING), - &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, GROUP), - &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, MESSAGE), - &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, BYTES), - &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, UINT32), - &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, ENUM), - &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, SFIXED32), - &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, SFIXED64), - &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, SINT32), - &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, SINT64), - "LComGoogleProtobufDescriptors_FieldDescriptor;", - "Ljava/lang/Enum;" }; + "valueOf", + "LComGoogleProtobufDescriptorProtos_FieldDescriptorProto_Type;", + "LNSString;", + &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, DOUBLE), + &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, FLOAT), + &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, INT64), + &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, UINT64), + &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, INT32), + &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, FIXED64), + &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, FIXED32), + &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, BOOL), + &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, STRING), + &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, GROUP), + &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, MESSAGE), + &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, BYTES), + &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, UINT32), + &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, ENUM), + &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, SFIXED32), + &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, SFIXED64), + &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, SINT32), + &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_Type, SINT64), + "LComGoogleProtobufDescriptors_FieldDescriptor;", + "Ljava/lang/Enum;"}; static const J2ObjcClassInfo _ComGoogleProtobufDescriptors_FieldDescriptor_Type = { - "Type", "com.google.protobuf", ptrTable, methods, fields, 7, 0x4019, 5, 19, 21, -1, -1, 22, -1 - }; + "Type", "com.google.protobuf", ptrTable, methods, fields, 7, 0x4019, 5, 19, 21, -1, -1, 22, + -1}; return &_ComGoogleProtobufDescriptors_FieldDescriptor_Type; } @end -ComGoogleProtobufDescriptors_FieldDescriptor_Type *ComGoogleProtobufDescriptors_FieldDescriptor_Type_valueOfWithComGoogleProtobufDescriptorProtos_FieldDescriptorProto_Type_(ComGoogleProtobufDescriptorProtos_FieldDescriptorProto_Type *type) { +ComGoogleProtobufDescriptors_FieldDescriptor_Type * +ComGoogleProtobufDescriptors_FieldDescriptor_Type_valueOfWithComGoogleProtobufDescriptorProtos_FieldDescriptorProto_Type_( + ComGoogleProtobufDescriptorProtos_FieldDescriptorProto_Type *type) { ComGoogleProtobufDescriptors_FieldDescriptor_Type_initialize(); - return IOSObjectArray_Get(nil_chk(ComGoogleProtobufDescriptors_FieldDescriptor_Type_values()), [((ComGoogleProtobufDescriptorProtos_FieldDescriptorProto_Type *) nil_chk(type)) getNumber] - 1); + return IOSObjectArray_Get( + nil_chk(ComGoogleProtobufDescriptors_FieldDescriptor_Type_values()), + [((ComGoogleProtobufDescriptorProtos_FieldDescriptorProto_Type *)nil_chk(type)) getNumber] - + 1); } IOSObjectArray *ComGoogleProtobufDescriptors_FieldDescriptor_Type_values() { ComGoogleProtobufDescriptors_FieldDescriptor_Type_initialize(); - return [IOSObjectArray arrayWithObjects:ComGoogleProtobufDescriptors_FieldDescriptor_Type_values_ count:18 type:ComGoogleProtobufDescriptors_FieldDescriptor_Type_class_()]; + return + [IOSObjectArray arrayWithObjects:ComGoogleProtobufDescriptors_FieldDescriptor_Type_values_ + count:18 + type:ComGoogleProtobufDescriptors_FieldDescriptor_Type_class_()]; } -ComGoogleProtobufDescriptors_FieldDescriptor_Type *ComGoogleProtobufDescriptors_FieldDescriptor_Type_valueOfWithNSString_(NSString *name) { +ComGoogleProtobufDescriptors_FieldDescriptor_Type * +ComGoogleProtobufDescriptors_FieldDescriptor_Type_valueOfWithNSString_(NSString *name) { ComGoogleProtobufDescriptors_FieldDescriptor_Type_initialize(); for (int i = 0; i < 18; i++) { - ComGoogleProtobufDescriptors_FieldDescriptor_Type *e = ComGoogleProtobufDescriptors_FieldDescriptor_Type_values_[i]; + ComGoogleProtobufDescriptors_FieldDescriptor_Type *e = + ComGoogleProtobufDescriptors_FieldDescriptor_Type_values_[i]; if ([name isEqual:[e name]]) { return e; } @@ -768,7 +865,8 @@ + (const J2ObjcClassInfo *)__metadata { return nil; } -ComGoogleProtobufDescriptors_FieldDescriptor_Type *ComGoogleProtobufDescriptors_FieldDescriptor_Type_fromOrdinal(NSUInteger ordinal) { +ComGoogleProtobufDescriptors_FieldDescriptor_Type * +ComGoogleProtobufDescriptors_FieldDescriptor_Type_fromOrdinal(NSUInteger ordinal) { ComGoogleProtobufDescriptors_FieldDescriptor_Type_initialize(); if (ordinal >= 18) { return nil; @@ -780,7 +878,8 @@ + (const J2ObjcClassInfo *)__metadata { J2OBJC_INITIALIZED_DEFN(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType) -ComGoogleProtobufDescriptors_FieldDescriptor_JavaType *ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_values_[9]; +ComGoogleProtobufDescriptors_FieldDescriptor_JavaType + *ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_values_[9]; @implementation ComGoogleProtobufDescriptors_FieldDescriptor_JavaType @@ -811,74 +910,108 @@ + (void)initialize { size_t allocSize = 9 * objSize; uintptr_t ptr = (uintptr_t)calloc(allocSize, 1); id e; - (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, INT) = e = objc_constructInstance(self, (void *)ptr), ptr += objSize); - ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_initWithId_withNSString_withInt_(e, JavaLangInteger_valueOfWithInt_(0), @"INT", 0); - (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, LONG) = e = objc_constructInstance(self, (void *)ptr), ptr += objSize); - ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_initWithId_withNSString_withInt_(e, JavaLangLong_valueOfWithLong_(0LL), @"LONG", 1); - (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, FLOAT) = e = objc_constructInstance(self, (void *)ptr), ptr += objSize); - ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_initWithId_withNSString_withInt_(e, JavaLangFloat_valueOfWithFloat_(0.0f), @"FLOAT", 2); - (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, DOUBLE) = e = objc_constructInstance(self, (void *)ptr), ptr += objSize); - ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_initWithId_withNSString_withInt_(e, JavaLangDouble_valueOfWithDouble_(0.0), @"DOUBLE", 3); - (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, BOOLEAN) = e = objc_constructInstance(self, (void *)ptr), ptr += objSize); - ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_initWithId_withNSString_withInt_(e, JavaLangBoolean_valueOfWithBoolean_(false), @"BOOLEAN", 4); - (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, STRING) = e = objc_constructInstance(self, (void *)ptr), ptr += objSize); - ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_initWithId_withNSString_withInt_(e, @"", @"STRING", 5); - (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, BYTE_STRING) = e = objc_constructInstance(self, (void *)ptr), ptr += objSize); - ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_initWithId_withNSString_withInt_(e, JreLoadStatic(ComGoogleProtobufByteString, EMPTY), @"BYTE_STRING", 6); - (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, ENUM) = e = objc_constructInstance(self, (void *)ptr), ptr += objSize); - ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_initWithId_withNSString_withInt_(e, nil, @"ENUM", 7); - (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, MESSAGE) = e = objc_constructInstance(self, (void *)ptr), ptr += objSize); - ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_initWithId_withNSString_withInt_(e, nil, @"MESSAGE", 8); + (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, INT) = e = + objc_constructInstance(self, (void *)ptr), + ptr += objSize); + ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_initWithId_withNSString_withInt_( + e, JavaLangInteger_valueOfWithInt_(0), @"INT", 0); + (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, LONG) = e = + objc_constructInstance(self, (void *)ptr), + ptr += objSize); + ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_initWithId_withNSString_withInt_( + e, JavaLangLong_valueOfWithLong_(0LL), @"LONG", 1); + (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, FLOAT) = e = + objc_constructInstance(self, (void *)ptr), + ptr += objSize); + ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_initWithId_withNSString_withInt_( + e, JavaLangFloat_valueOfWithFloat_(0.0f), @"FLOAT", 2); + (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, DOUBLE) = e = + objc_constructInstance(self, (void *)ptr), + ptr += objSize); + ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_initWithId_withNSString_withInt_( + e, JavaLangDouble_valueOfWithDouble_(0.0), @"DOUBLE", 3); + (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, BOOLEAN) = e = + objc_constructInstance(self, (void *)ptr), + ptr += objSize); + ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_initWithId_withNSString_withInt_( + e, JavaLangBoolean_valueOfWithBoolean_(false), @"BOOLEAN", 4); + (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, STRING) = e = + objc_constructInstance(self, (void *)ptr), + ptr += objSize); + ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_initWithId_withNSString_withInt_( + e, @"", @"STRING", 5); + (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, BYTE_STRING) = e = + objc_constructInstance(self, (void *)ptr), + ptr += objSize); + ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_initWithId_withNSString_withInt_( + e, JreLoadStatic(ComGoogleProtobufByteString, EMPTY), @"BYTE_STRING", 6); + (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, ENUM) = e = + objc_constructInstance(self, (void *)ptr), + ptr += objSize); + ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_initWithId_withNSString_withInt_( + e, nil, @"ENUM", 7); + (JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, MESSAGE) = e = + objc_constructInstance(self, (void *)ptr), + ptr += objSize); + ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_initWithId_withNSString_withInt_( + e, nil, @"MESSAGE", 8); J2OBJC_SET_INITIALIZED(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType) } } + (const J2ObjcClassInfo *)__metadata { static J2ObjcMethodInfo methods[] = { - { NULL, "[LComGoogleProtobufDescriptors_FieldDescriptor_JavaType;", 0x9, -1, -1, -1, -1, -1, - -1 }, - { NULL, "LComGoogleProtobufDescriptors_FieldDescriptor_JavaType;", 0x9, 0, 1, -1, -1, -1, -1 }, + {NULL, "[LComGoogleProtobufDescriptors_FieldDescriptor_JavaType;", 0x9, -1, -1, -1, -1, -1, + -1}, + {NULL, "LComGoogleProtobufDescriptors_FieldDescriptor_JavaType;", 0x9, 0, 1, -1, -1, -1, -1}, }; methods[0].selector = @selector(values); methods[1].selector = @selector(valueOfWithNSString:); static const J2ObjcFieldInfo fields[] = { - { "INT", "LComGoogleProtobufDescriptors_FieldDescriptor_JavaType;", .constantValue.asLong = 0, - 0x4019, -1, 2, -1, -1 }, - { "LONG", "LComGoogleProtobufDescriptors_FieldDescriptor_JavaType;", .constantValue.asLong = 0, - 0x4019, -1, 3, -1, -1 }, - { "FLOAT", "LComGoogleProtobufDescriptors_FieldDescriptor_JavaType;", .constantValue.asLong = 0, - 0x4019, -1, 4, -1, -1 }, - { "DOUBLE", "LComGoogleProtobufDescriptors_FieldDescriptor_JavaType;", - .constantValue.asLong = 0, 0x4019, -1, 5, -1, -1 }, - { "BOOLEAN", "LComGoogleProtobufDescriptors_FieldDescriptor_JavaType;", - .constantValue.asLong = 0, 0x4019, -1, 6, -1, -1 }, - { "STRING", "LComGoogleProtobufDescriptors_FieldDescriptor_JavaType;", - .constantValue.asLong = 0, 0x4019, -1, 7, -1, -1 }, - { "BYTE_STRING", "LComGoogleProtobufDescriptors_FieldDescriptor_JavaType;", - .constantValue.asLong = 0, 0x4019, -1, 8, -1, -1 }, - { "ENUM", "LComGoogleProtobufDescriptors_FieldDescriptor_JavaType;", .constantValue.asLong = 0, - 0x4019, -1, 9, -1, -1 }, - { "MESSAGE", "LComGoogleProtobufDescriptors_FieldDescriptor_JavaType;", - .constantValue.asLong = 0, 0x4019, -1, 10, -1, -1 }, - { "defaultDefault_", "LNSObject;", .constantValue.asLong = 0, 0x12, -1, -1, -1, -1 }, + {"INT", "LComGoogleProtobufDescriptors_FieldDescriptor_JavaType;", .constantValue.asLong = 0, + 0x4019, -1, 2, -1, -1}, + {"LONG", "LComGoogleProtobufDescriptors_FieldDescriptor_JavaType;", .constantValue.asLong = 0, + 0x4019, -1, 3, -1, -1}, + {"FLOAT", "LComGoogleProtobufDescriptors_FieldDescriptor_JavaType;", + .constantValue.asLong = 0, 0x4019, -1, 4, -1, -1}, + {"DOUBLE", "LComGoogleProtobufDescriptors_FieldDescriptor_JavaType;", + .constantValue.asLong = 0, 0x4019, -1, 5, -1, -1}, + {"BOOLEAN", "LComGoogleProtobufDescriptors_FieldDescriptor_JavaType;", + .constantValue.asLong = 0, 0x4019, -1, 6, -1, -1}, + {"STRING", "LComGoogleProtobufDescriptors_FieldDescriptor_JavaType;", + .constantValue.asLong = 0, 0x4019, -1, 7, -1, -1}, + {"BYTE_STRING", "LComGoogleProtobufDescriptors_FieldDescriptor_JavaType;", + .constantValue.asLong = 0, 0x4019, -1, 8, -1, -1}, + {"ENUM", "LComGoogleProtobufDescriptors_FieldDescriptor_JavaType;", .constantValue.asLong = 0, + 0x4019, -1, 9, -1, -1}, + {"MESSAGE", "LComGoogleProtobufDescriptors_FieldDescriptor_JavaType;", + .constantValue.asLong = 0, 0x4019, -1, 10, -1, -1}, + {"defaultDefault_", "LNSObject;", .constantValue.asLong = 0, 0x12, -1, -1, -1, -1}, }; static const void *ptrTable[] = { - "valueOf", "LNSString;", &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, INT), - &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, LONG), - &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, FLOAT), - &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, DOUBLE), - &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, BOOLEAN), - &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, STRING), - &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, BYTE_STRING), - &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, ENUM), - &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, MESSAGE), - "LComGoogleProtobufDescriptors_FieldDescriptor;", - "Ljava/lang/Enum;" }; + "valueOf", + "LNSString;", + &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, INT), + &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, LONG), + &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, FLOAT), + &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, DOUBLE), + &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, BOOLEAN), + &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, STRING), + &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, BYTE_STRING), + &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, ENUM), + &JreEnum(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, MESSAGE), + "LComGoogleProtobufDescriptors_FieldDescriptor;", + "Ljava/lang/Enum;"}; static const J2ObjcClassInfo _ComGoogleProtobufDescriptors_FieldDescriptor_JavaType = { - "JavaType", "com.google.protobuf", ptrTable, methods, fields, 7, 0x4019, 2, 10, 11, -1, -1, 12, - -1 }; + "JavaType", "com.google.protobuf", + ptrTable, methods, + fields, 7, + 0x4019, 2, + 10, 11, + -1, -1, + 12, -1}; return &_ComGoogleProtobufDescriptors_FieldDescriptor_JavaType; } @@ -886,13 +1019,18 @@ + (const J2ObjcClassInfo *)__metadata { IOSObjectArray *ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_values() { ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_initialize(); - return [IOSObjectArray arrayWithObjects:ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_values_ count:9 type:ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_class_()]; + return [IOSObjectArray + arrayWithObjects:ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_values_ + count:9 + type:ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_class_()]; } -ComGoogleProtobufDescriptors_FieldDescriptor_JavaType *ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_valueOfWithNSString_(NSString *name) { +ComGoogleProtobufDescriptors_FieldDescriptor_JavaType * +ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_valueOfWithNSString_(NSString *name) { ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_initialize(); for (int i = 0; i < 9; i++) { - ComGoogleProtobufDescriptors_FieldDescriptor_JavaType *e = ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_values_[i]; + ComGoogleProtobufDescriptors_FieldDescriptor_JavaType *e = + ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_values_[i]; if ([name isEqual:[e name]]) { return e; } @@ -901,7 +1039,8 @@ + (const J2ObjcClassInfo *)__metadata { return nil; } -ComGoogleProtobufDescriptors_FieldDescriptor_JavaType *ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_fromOrdinal(NSUInteger ordinal) { +ComGoogleProtobufDescriptors_FieldDescriptor_JavaType * +ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_fromOrdinal(NSUInteger ordinal) { ComGoogleProtobufDescriptors_FieldDescriptor_JavaType_initialize(); if (ordinal >= 9) { return nil; diff --git a/protobuf/runtime/src/com/google/protobuf/Descriptors_PackagePrivate.h b/protobuf/runtime/src/com/google/protobuf/Descriptors_PackagePrivate.h index fa3536a24a..25285b1c67 100644 --- a/protobuf/runtime/src/com/google/protobuf/Descriptors_PackagePrivate.h +++ b/protobuf/runtime/src/com/google/protobuf/Descriptors_PackagePrivate.h @@ -80,9 +80,8 @@ typedef struct CGPFieldData { uint32_t offset; union { Class objcType; - struct CGPFieldData *mapEntryFields; + const struct CGPFieldData *mapEntryFields; }; - const __unsafe_unretained id *descriptorRef; const char *containingType; const char *optionsData; } CGPFieldData; @@ -116,16 +115,17 @@ typedef struct CGPOneofData { @interface ComGoogleProtobufDescriptors_FieldDescriptor () { @package - CGPFieldData *data_; + const CGPFieldData *data_; uint32_t tag_; CGPFieldJavaType javaType_; - // Either nil, a Descriptor or a EnumDescriptor depending on the field type. + // Either nil, a ComGoogleProtobufByteString, a Descriptor or a EnumDescriptor depending on the + // field type. id valueType_; ComGoogleProtobufDescriptorProtos_FieldOptions *fieldOptions_; CGPOneofDescriptor *containingOneof_; } -- (instancetype)initWithData:(CGPFieldData *)data; +- (instancetype)initWithData:(const CGPFieldData *)data; @end @@ -151,11 +151,11 @@ typedef struct CGPOneofData { @interface ComGoogleProtobufDescriptors_OneofDescriptor () { @package - CGPOneofData *data_; + const CGPOneofData *data_; CGPDescriptor *containingType_; } -- (instancetype)initWithData:(CGPOneofData *)data +- (instancetype)initWithData:(const CGPOneofData *)data containingType:(CGPDescriptor *)containingType; @end @@ -169,18 +169,16 @@ typedef struct CGPOneofData { #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]] + ((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); +NS_RETURNS_RETAINED CGPDescriptor *CGPInitDescriptor(Class messageClass, Class builderClass, + CGPMessageFlags flags, size_t storageSize); -void CGPInitFields( - CGPDescriptor *descriptor, jint fieldCount, CGPFieldData *fieldData, - jint oneofCount, CGPOneofData *oneofData); +void CGPInitFields(CGPDescriptor *descriptor, jint fieldCount, const CGPFieldData *fieldData, + jint oneofCount, const CGPOneofData *oneofData); CGP_ALWAYS_INLINE BOOL CGPIsExtendable(const CGPDescriptor *descriptor) { return descriptor->flags_ & CGPMessageFlagExtendable; @@ -197,11 +195,9 @@ NS_RETURNS_RETAINED CGPEnumDescriptor *CGPInitializeEnumType( __strong JavaLangEnum *values[], __strong NSString **names, jint *intValues, bool is_closed); -void CGPInitializeOneofCaseEnum( - Class enumClass, jint valuesCount, - __strong JavaLangEnum *values[], - __strong NSString **names, jint *intValues); - +void CGPInitializeOneofCaseEnum(Class enumClass, jint valuesCount, + __strong JavaLangEnum *values[], + __strong NSString **names, jint *intValues); id CGPValueOfEnumOrOneOfWithNSString(NSString *name, __strong id values[], jint count); @@ -271,7 +267,8 @@ CGP_ALWAYS_INLINE jint CGPEnumGetIntValue(CGPEnumDescriptor *descriptor, id enum return *(jint *)((char *)(ARCBRIDGE void *)enumObj + descriptor->valueOffset_); } -id CGPFieldGetDefaultValue(CGPFieldDescriptor *field); +id CGPFieldGetDefaultValueObject(CGPFieldDescriptor *field); +CGPValue CGPFieldGetDefaultValue(const CGPFieldDescriptor *field); Class CGPOneofGetCaseClass(CGPOneofDescriptor *oneof); @@ -297,7 +294,8 @@ CF_EXTERN_C_END @end -J2OBJC_FIELD_SETTER(ComGoogleProtobufDescriptors_FieldDescriptor_Type, javaType_, ComGoogleProtobufDescriptors_FieldDescriptor_JavaType *) +J2OBJC_FIELD_SETTER(ComGoogleProtobufDescriptors_FieldDescriptor_Type, javaType_, + ComGoogleProtobufDescriptors_FieldDescriptor_JavaType *) @interface ComGoogleProtobufDescriptors_FieldDescriptor_JavaType () { @public @@ -308,4 +306,4 @@ J2OBJC_FIELD_SETTER(ComGoogleProtobufDescriptors_FieldDescriptor_Type, javaType_ J2OBJC_FIELD_SETTER(ComGoogleProtobufDescriptors_FieldDescriptor_JavaType, defaultDefault_, id) -#endif // __ComGoogleProtobufDescriptors_PackagePrivate_H__ +#endif // __ComGoogleProtobufDescriptors_PackagePrivate_H__ diff --git a/protobuf/runtime/src/com/google/protobuf/ExtensionLite.h b/protobuf/runtime/src/com/google/protobuf/ExtensionLite.h index 000eca72db..7fddbc60ee 100644 --- a/protobuf/runtime/src/com/google/protobuf/ExtensionLite.h +++ b/protobuf/runtime/src/com/google/protobuf/ExtensionLite.h @@ -46,7 +46,7 @@ struct CGPFieldData; CGPFieldDescriptor *fieldDescriptor_; } -- (instancetype)initWithFieldData:(struct CGPFieldData *)data; +- (instancetype)initWithFieldData:(const struct CGPFieldData *)data; - (ComGoogleProtobufDescriptors_FieldDescriptor *)getDescriptor; @@ -60,7 +60,7 @@ typedef ComGoogleProtobufExtensionLite CGPExtensionLite; CF_EXTERN_C_BEGIN void ComGoogleProtobufExtensionLite_initWithFieldData_(CGPExtensionLite *self, - struct CGPFieldData *data); + const struct CGPFieldData *data); CF_EXTERN_C_END J2OBJC_EMPTY_STATIC_INIT(ComGoogleProtobufExtensionLite) diff --git a/protobuf/runtime/src/com/google/protobuf/ExtensionLite.m b/protobuf/runtime/src/com/google/protobuf/ExtensionLite.m index a2df6097f3..9bcfad1fef 100644 --- a/protobuf/runtime/src/com/google/protobuf/ExtensionLite.m +++ b/protobuf/runtime/src/com/google/protobuf/ExtensionLite.m @@ -36,7 +36,7 @@ @implementation ComGoogleProtobufExtensionLite -- (instancetype)initWithFieldData:(struct CGPFieldData *)data { +- (instancetype)initWithFieldData:(const struct CGPFieldData *)data { ComGoogleProtobufExtensionLite_initWithFieldData_(self, data); return self; } @@ -61,7 +61,7 @@ - (jint)getNumber { @end void ComGoogleProtobufExtensionLite_initWithFieldData_(CGPExtensionLite *self, - struct CGPFieldData *data) { + const struct CGPFieldData *data) { NSObject_init(self); self->fieldDescriptor_ = [[CGPFieldDescriptor alloc] initWithData:data]; } diff --git a/protobuf/runtime/src/com/google/protobuf/ExtensionRegistry.mm b/protobuf/runtime/src/com/google/protobuf/ExtensionRegistry.mm index c0f9a18f99..33e3a20338 100644 --- a/protobuf/runtime/src/com/google/protobuf/ExtensionRegistry.mm +++ b/protobuf/runtime/src/com/google/protobuf/ExtensionRegistry.mm @@ -122,7 +122,7 @@ - (instancetype)initWithField:(CGPFieldDescriptor *)field { descriptor_ = field; if (CGPFieldTypeIsMessage(field)) { // No need to retain. Default message values are eternal. - defaultInstance_ = CGPFieldGetDefaultValue(field); + defaultInstance_ = CGPFieldGetDefaultValueObject(field); } } return self; diff --git a/protobuf/runtime/src/com/google/protobuf/GeneratedMessage.mm b/protobuf/runtime/src/com/google/protobuf/GeneratedMessage.mm index bf62678693..5d03b8946a 100644 --- a/protobuf/runtime/src/com/google/protobuf/GeneratedMessage.mm +++ b/protobuf/runtime/src/com/google/protobuf/GeneratedMessage.mm @@ -90,18 +90,16 @@ static inline int SerializedSizeForMessage(ComGoogleProtobufGeneratedMessage *ms static void MessageToString(id msg, CGPDescriptor *descriptor, NSMutableString *builder, int indent); -#define REPEATED_PRIMITIVE_FIELD_GETTER_IMP(NAME) \ - CGP_ALWAYS_INLINE TYPE_##NAME CGPRepeatedFieldGet##NAME(CGPRepeatedField *field, \ - jint idx) { \ - CGPRepeatedFieldCheckBounds(field, idx); \ - return ((TYPE_##NAME *)field->data->buffer)[idx]; \ +#define REPEATED_PRIMITIVE_FIELD_GETTER_IMP(NAME) \ + CGP_ALWAYS_INLINE TYPE_##NAME CGPRepeatedFieldGet##NAME(CGPRepeatedField *field, jint idx) { \ + CGPRepeatedFieldCheckBounds(field, idx); \ + return ((TYPE_##NAME *)field->data->buffer)[idx]; \ } -#define REPEATED_RETAINABLE_FIELD_GETTER_IMP(NAME) \ - CGP_ALWAYS_INLINE TYPE_##NAME CGPRepeatedFieldGet##NAME(CGPRepeatedField *field, \ - jint idx) { \ - CGPRepeatedFieldCheckBounds(field, idx); \ - return RETAIN_AND_AUTORELEASE(((TYPE_##NAME *)field->data->buffer)[idx]); \ +#define REPEATED_RETAINABLE_FIELD_GETTER_IMP(NAME) \ + CGP_ALWAYS_INLINE TYPE_##NAME CGPRepeatedFieldGet##NAME(CGPRepeatedField *field, jint idx) { \ + CGPRepeatedFieldCheckBounds(field, idx); \ + return RETAIN_AND_AUTORELEASE(((TYPE_##NAME *)field->data->buffer)[idx]); \ } FOR_EACH_TYPE_NO_ENUM(REPEATED_PRIMITIVE_FIELD_GETTER_IMP, REPEATED_RETAINABLE_FIELD_GETTER_IMP) @@ -109,26 +107,25 @@ static void MessageToString(id msg, CGPDescriptor *descriptor, NSMutableString * #undef REPEATED_PRIMITIVE_FIELD_GETTER_IMP #undef REPEATED_RETAINABLE_FIELD_GETTER_IMP -#define REPEATED_FIELD_ADDER_IMP(NAME) \ - CGP_ALWAYS_INLINE void CGPRepeatedFieldAdd##NAME(CGPRepeatedField *field, \ - TYPE_##NAME value) { \ - uint32_t total_size = CGPRepeatedFieldTotalSize(field); \ - if (CGPRepeatedFieldSize(field) == total_size) { \ - CGPRepeatedFieldReserve(field, total_size + 1, sizeof(TYPE_##NAME)); \ - } \ - ((TYPE_##NAME *)field->data->buffer)[field->data->size++] = TYPE_RETAIN_##NAME(value); \ +#define REPEATED_FIELD_ADDER_IMP(NAME) \ + CGP_ALWAYS_INLINE void CGPRepeatedFieldAdd##NAME(CGPRepeatedField *field, TYPE_##NAME value) { \ + uint32_t total_size = CGPRepeatedFieldTotalSize(field); \ + if (CGPRepeatedFieldSize(field) == total_size) { \ + CGPRepeatedFieldReserve(field, total_size + 1, sizeof(TYPE_##NAME)); \ + } \ + ((TYPE_##NAME *)field->data->buffer)[field->data->size++] = TYPE_RETAIN_##NAME(value); \ } FOR_EACH_TYPE_WITH_ENUM(REPEATED_FIELD_ADDER_IMP) #undef REPEATED_FIELD_ADDER_IMP -#define REPEATED_FIELD_SETTER_IMP(NAME) \ - CGP_ALWAYS_INLINE void CGPRepeatedFieldSet##NAME(CGPRepeatedField *field, jint idx, \ - TYPE_##NAME value) { \ - CGPRepeatedFieldCheckBounds(field, idx); \ - TYPE_##NAME *ptr = &((TYPE_##NAME *)field->data->buffer)[idx]; \ - TYPE_ASSIGN_##NAME(*ptr, value); \ +#define REPEATED_FIELD_SETTER_IMP(NAME) \ + CGP_ALWAYS_INLINE void CGPRepeatedFieldSet##NAME(CGPRepeatedField *field, jint idx, \ + TYPE_##NAME value) { \ + CGPRepeatedFieldCheckBounds(field, idx); \ + TYPE_##NAME *ptr = &((TYPE_##NAME *)field->data->buffer)[idx]; \ + TYPE_ASSIGN_##NAME(*ptr, value); \ } FOR_EACH_TYPE_WITH_ENUM(REPEATED_FIELD_SETTER_IMP) @@ -384,11 +381,11 @@ static BOOL AddGetterMethod(Class cls, SEL sel, CGPFieldDescriptor *field) { size_t offset = CGPFieldGetOffset(field, cls); CGPHasLocator hasLoc = GetHasLocator(cls, field); -#define ADD_GETTER_METHOD_CASE(NAME) \ - imp = repeated \ - ? GetRepeatedGetterImp##NAME(offset) \ - : GetSingularGetterImp##NAME(offset, hasLoc, field->data_->defaultValue.value##NAME); \ - strcpy(encoding, @encode(TYPE_##NAME)); \ +#define ADD_GETTER_METHOD_CASE(NAME) \ + imp = repeated ? GetRepeatedGetterImp##NAME(offset) \ + : GetSingularGetterImp##NAME(offset, hasLoc, \ + CGPFieldGetDefaultValue(field).value##NAME); \ + strcpy(encoding, @encode(TYPE_##NAME)); \ break; SWITCH_TYPES_NO_ENUM(CGPFieldGetJavaType(field), ADD_GETTER_METHOD_CASE) @@ -1299,11 +1296,11 @@ static id GetSingularField(id msg, CGPFieldDescriptor *field) { bool isSet = GetHas(msg, GetHasLocator(msgCls, field)); size_t offset = CGPFieldGetOffset(field, msgCls); -#define GET_FIELD_CASE(NAME) \ - { \ - TYPE_##NAME value = isSet ? *FIELD_PTR(TYPE_##NAME, msg, offset) \ - : field->data_->defaultValue.CGPValueField_##NAME; \ - return CGPToReflectionType##NAME(value, field); \ +#define GET_FIELD_CASE(NAME) \ + { \ + TYPE_##NAME value = isSet ? *FIELD_PTR(TYPE_##NAME, msg, offset) \ + : CGPFieldGetDefaultValue(field).CGPValueField_##NAME; \ + return CGPToReflectionType##NAME(value, field); \ } SWITCH_TYPES_WITH_ENUM(CGPFieldGetJavaType(field), GET_FIELD_CASE) @@ -3953,7 +3950,7 @@ static id GetSingularExtension(CGPExtensionMap *extensionMap, if (it != extensionMap->end()) { value = it->second.get(); } else { - value = CGPFieldGetDefaultValue(field); + value = CGPFieldGetDefaultValueObject(field); } return FromReflectionType(field, value); }