kUpb_EncodedType_Enum -> kUpb_EncodedType_OpenEnum

Now that we have a kUpb_EncodedType_ClosedEnum, rename for clarity.

PiperOrigin-RevId: 479621719
pull/13171/head
Eric Salo 2 years ago committed by Copybara-Service
parent 41686adf0f
commit 65946dc0e7
  1. 10
      upb/mini_table.c

@ -50,7 +50,7 @@ typedef enum {
kUpb_EncodedType_Int64 = 9, kUpb_EncodedType_Int64 = 9,
kUpb_EncodedType_UInt64 = 10, kUpb_EncodedType_UInt64 = 10,
kUpb_EncodedType_SInt64 = 11, kUpb_EncodedType_SInt64 = 11,
kUpb_EncodedType_Enum = 12, kUpb_EncodedType_OpenEnum = 12,
kUpb_EncodedType_Bool = 13, kUpb_EncodedType_Bool = 13,
kUpb_EncodedType_Bytes = 14, kUpb_EncodedType_Bytes = 14,
kUpb_EncodedType_String = 15, kUpb_EncodedType_String = 15,
@ -214,7 +214,7 @@ char* upb_MtDataEncoder_PutField(upb_MtDataEncoder* e, char* ptr,
[kUpb_FieldType_Message] = kUpb_EncodedType_Message, [kUpb_FieldType_Message] = kUpb_EncodedType_Message,
[kUpb_FieldType_Bytes] = kUpb_EncodedType_Bytes, [kUpb_FieldType_Bytes] = kUpb_EncodedType_Bytes,
[kUpb_FieldType_UInt32] = kUpb_EncodedType_UInt32, [kUpb_FieldType_UInt32] = kUpb_EncodedType_UInt32,
[kUpb_FieldType_Enum] = kUpb_EncodedType_Enum, [kUpb_FieldType_Enum] = kUpb_EncodedType_OpenEnum,
[kUpb_FieldType_SFixed32] = kUpb_EncodedType_SFixed32, [kUpb_FieldType_SFixed32] = kUpb_EncodedType_SFixed32,
[kUpb_FieldType_SFixed64] = kUpb_EncodedType_SFixed64, [kUpb_FieldType_SFixed64] = kUpb_EncodedType_SFixed64,
[kUpb_FieldType_SInt32] = kUpb_EncodedType_SInt32, [kUpb_FieldType_SInt32] = kUpb_EncodedType_SInt32,
@ -522,7 +522,7 @@ static void upb_MiniTable_SetField(upb_MtDecoder* d, uint8_t ch,
[kUpb_EncodedType_String] = kUpb_FieldRep_StringView, [kUpb_EncodedType_String] = kUpb_FieldRep_StringView,
[kUpb_EncodedType_Bytes] = kUpb_FieldRep_StringView, [kUpb_EncodedType_Bytes] = kUpb_FieldRep_StringView,
[kUpb_EncodedType_UInt32] = kUpb_FieldRep_4Byte, [kUpb_EncodedType_UInt32] = kUpb_FieldRep_4Byte,
[kUpb_EncodedType_Enum] = kUpb_FieldRep_4Byte, [kUpb_EncodedType_OpenEnum] = kUpb_FieldRep_4Byte,
[kUpb_EncodedType_SFixed32] = kUpb_FieldRep_4Byte, [kUpb_EncodedType_SFixed32] = kUpb_FieldRep_4Byte,
[kUpb_EncodedType_SFixed64] = kUpb_FieldRep_8Byte, [kUpb_EncodedType_SFixed64] = kUpb_FieldRep_8Byte,
[kUpb_EncodedType_SInt32] = kUpb_FieldRep_4Byte, [kUpb_EncodedType_SInt32] = kUpb_FieldRep_4Byte,
@ -544,7 +544,7 @@ static void upb_MiniTable_SetField(upb_MtDecoder* d, uint8_t ch,
[kUpb_EncodedType_Message] = kUpb_FieldType_Message, [kUpb_EncodedType_Message] = kUpb_FieldType_Message,
[kUpb_EncodedType_Bytes] = kUpb_FieldType_Bytes, [kUpb_EncodedType_Bytes] = kUpb_FieldType_Bytes,
[kUpb_EncodedType_UInt32] = kUpb_FieldType_UInt32, [kUpb_EncodedType_UInt32] = kUpb_FieldType_UInt32,
[kUpb_EncodedType_Enum] = kUpb_FieldType_Enum, [kUpb_EncodedType_OpenEnum] = kUpb_FieldType_Enum,
[kUpb_EncodedType_SFixed32] = kUpb_FieldType_SFixed32, [kUpb_EncodedType_SFixed32] = kUpb_FieldType_SFixed32,
[kUpb_EncodedType_SFixed64] = kUpb_FieldType_SFixed64, [kUpb_EncodedType_SFixed64] = kUpb_FieldType_SFixed64,
[kUpb_EncodedType_SInt32] = kUpb_FieldType_SInt32, [kUpb_EncodedType_SInt32] = kUpb_FieldType_SInt32,
@ -579,7 +579,7 @@ static void upb_MiniTable_SetField(upb_MtDecoder* d, uint8_t ch,
UPB_UNREACHABLE(); UPB_UNREACHABLE();
} }
upb_MiniTable_SetTypeAndSub(field, kUpb_EncodedToType[type], sub_count, upb_MiniTable_SetTypeAndSub(field, kUpb_EncodedToType[type], sub_count,
msg_modifiers, type == kUpb_EncodedType_Enum); msg_modifiers, type == kUpb_EncodedType_OpenEnum);
} }
static void upb_MtDecoder_ModifyField(upb_MtDecoder* d, static void upb_MtDecoder_ModifyField(upb_MtDecoder* d,

Loading…
Cancel
Save