From f5246b70fdf30e4222bb658439b4780d97302ee5 Mon Sep 17 00:00:00 2001 From: Joshua Haberman Date: Sat, 5 Mar 2022 20:36:27 -0800 Subject: [PATCH] clang-format --- upb/mini_table.c | 42 +++++++++++++++++++----------------------- upb/mini_table.h | 8 +++----- upb/mini_table_test.cc | 8 ++++---- 3 files changed, 26 insertions(+), 32 deletions(-) diff --git a/upb/mini_table.c b/upb/mini_table.c index e48fb675f2..3efe15cace 100644 --- a/upb/mini_table.c +++ b/upb/mini_table.c @@ -573,7 +573,8 @@ static void upb_MtDecoder_Parse(upb_MtDecoder* d, const char* ptr, size_t len, upb_MiniTable_SetField(d, ch, field, msg_modifiers, sub_count); } else if (kUpb_EncodedValue_MinModifier <= ch && ch <= kUpb_EncodedValue_MaxModifier) { - ptr = upb_MtDecoder_ParseModifier(d, ptr, ch, *field_count, &msg_modifiers); + ptr = + upb_MtDecoder_ParseModifier(d, ptr, ch, *field_count, &msg_modifiers); } else if (ch == kUpb_EncodedValue_End) { if (!d->table) { upb_MtDecoder_ErrorFormat(d, "Extensions cannot have oneofs."); @@ -686,19 +687,16 @@ static void upb_MtDecoder_AssignHasbits(upb_MiniTable* ret) { ret->size = upb_MiniTable_DivideRoundUp(last_hasbit, 8); } -size_t upb_MtDecoder_SizeOfRep(upb_FieldRep rep, upb_MiniTablePlatform platform) { +size_t upb_MtDecoder_SizeOfRep(upb_FieldRep rep, + upb_MiniTablePlatform platform) { static const uint8_t kRepToSize32[] = { - [kUpb_FieldRep_1Byte] = 1, - [kUpb_FieldRep_4Byte] = 4, - [kUpb_FieldRep_Pointer] = 4, - [kUpb_FieldRep_StringView] = 8, + [kUpb_FieldRep_1Byte] = 1, [kUpb_FieldRep_4Byte] = 4, + [kUpb_FieldRep_Pointer] = 4, [kUpb_FieldRep_StringView] = 8, [kUpb_FieldRep_8Byte] = 8, }; static const uint8_t kRepToSize64[] = { - [kUpb_FieldRep_1Byte] = 1, - [kUpb_FieldRep_4Byte] = 4, - [kUpb_FieldRep_Pointer] = 8, - [kUpb_FieldRep_StringView] = 16, + [kUpb_FieldRep_1Byte] = 1, [kUpb_FieldRep_4Byte] = 4, + [kUpb_FieldRep_Pointer] = 8, [kUpb_FieldRep_StringView] = 16, [kUpb_FieldRep_8Byte] = 8, }; assert(sizeof(upb_StringView) == @@ -707,19 +705,16 @@ size_t upb_MtDecoder_SizeOfRep(upb_FieldRep rep, upb_MiniTablePlatform platform) : kRepToSize64[rep]; } -size_t upb_MtDecoder_AlignOfRep(upb_FieldRep rep, upb_MiniTablePlatform platform) { +size_t upb_MtDecoder_AlignOfRep(upb_FieldRep rep, + upb_MiniTablePlatform platform) { static const uint8_t kRepToAlign32[] = { - [kUpb_FieldRep_1Byte] = 1, - [kUpb_FieldRep_4Byte] = 4, - [kUpb_FieldRep_Pointer] = 4, - [kUpb_FieldRep_StringView] = 4, + [kUpb_FieldRep_1Byte] = 1, [kUpb_FieldRep_4Byte] = 4, + [kUpb_FieldRep_Pointer] = 4, [kUpb_FieldRep_StringView] = 4, [kUpb_FieldRep_8Byte] = 8, }; static const uint8_t kRepToAlign64[] = { - [kUpb_FieldRep_1Byte] = 1, - [kUpb_FieldRep_4Byte] = 4, - [kUpb_FieldRep_Pointer] = 8, - [kUpb_FieldRep_StringView] = 8, + [kUpb_FieldRep_1Byte] = 1, [kUpb_FieldRep_4Byte] = 4, + [kUpb_FieldRep_Pointer] = 8, [kUpb_FieldRep_StringView] = 8, [kUpb_FieldRep_8Byte] = 8, }; assert(UPB_ALIGN_OF(upb_StringView) == @@ -781,7 +776,8 @@ static bool upb_MtDecoder_AssignOffsets(upb_MtDecoder* d) { upb_MiniTable* upb_MiniTable_BuildWithBuf(const char* data, size_t len, upb_MiniTablePlatform platform, upb_Arena* arena, void** buf, - size_t* buf_size, upb_Status* status) { + size_t* buf_size, + upb_Status* status) { upb_MtDecoder decoder = { .platform = platform, .vec = @@ -843,7 +839,8 @@ upb_MiniTable* upb_MiniTable_BuildMapEntry(upb_FieldType key_type, if (!ret || !fields) return NULL; upb_MiniTable_Sub* subs = NULL; - if (value_type == kUpb_FieldType_Message || value_type == kUpb_FieldType_Group) { + if (value_type == kUpb_FieldType_Message || + value_type == kUpb_FieldType_Group) { subs = upb_Arena_Malloc(arena, sizeof(*subs)); if (!subs) return NULL; } @@ -929,8 +926,7 @@ void upb_MiniTable_SetSubMessage(upb_MiniTable* table, table_sub->submsg = sub; } -void upb_MiniTable_SetSubEnum(upb_MiniTable* table, - upb_MiniTable_Field* field, +void upb_MiniTable_SetSubEnum(upb_MiniTable* table, upb_MiniTable_Field* field, const upb_MiniTable_Enum* sub) { assert((uintptr_t)table->fields <= (uintptr_t)field && (uintptr_t)field < (uintptr_t)(table->fields + table->field_count)); diff --git a/upb/mini_table.h b/upb/mini_table.h index 0f82875b1a..b8d607f944 100644 --- a/upb/mini_table.h +++ b/upb/mini_table.h @@ -101,7 +101,6 @@ char* upb_MtDataEncoder_StartOneof(upb_MtDataEncoder* e, char* buf); char* upb_MtDataEncoder_PutOneofField(upb_MtDataEncoder* e, char* buf, uint32_t field_num); - /** upb_MiniTable *************************************************************/ typedef enum { @@ -121,8 +120,7 @@ upb_MiniTable* upb_MiniTable_Build(const char* data, size_t len, void upb_MiniTable_SetSubMessage(upb_MiniTable* table, upb_MiniTable_Field* field, const upb_MiniTable* sub); -void upb_MiniTable_SetSubEnum(upb_MiniTable* table, - upb_MiniTable_Field* field, +void upb_MiniTable_SetSubEnum(upb_MiniTable* table, upb_MiniTable_Field* field, const upb_MiniTable_Enum* sub); upb_MiniTable_Extension* upb_MiniTable_BuildExtensions(const char* data, @@ -154,9 +152,9 @@ upb_MiniTable* upb_MiniTable_BuildWithBuf(const char* data, size_t len, size_t* buf_size, upb_Status* status); #ifdef __cplusplus -} /* extern "C" */ +} /* extern "C" */ #endif #include "upb/port_undef.inc" -#endif /* UPB_MINI_TABLE_H_ */ +#endif /* UPB_MINI_TABLE_H_ */ diff --git a/upb/mini_table_test.cc b/upb/mini_table_test.cc index 94d2814eda..9425608227 100644 --- a/upb/mini_table_test.cc +++ b/upb/mini_table_test.cc @@ -50,7 +50,7 @@ TEST_P(MiniTableTest, AllScalarTypes) { upb::MtDataEncoder e; ASSERT_TRUE(e.StartMessage(0)); int count = 0; - for (int i = kUpb_FieldType_Double ; i < kUpb_FieldType_SInt64; i++) { + for (int i = kUpb_FieldType_Double; i < kUpb_FieldType_SInt64; i++) { ASSERT_TRUE(e.PutField(static_cast(i), i, 0)); count++; } @@ -77,7 +77,7 @@ TEST_P(MiniTableTest, AllRepeatedTypes) { upb::MtDataEncoder e; ASSERT_TRUE(e.StartMessage(0)); int count = 0; - for (int i = kUpb_FieldType_Double ; i < kUpb_FieldType_SInt64; i++) { + for (int i = kUpb_FieldType_Double; i < kUpb_FieldType_SInt64; i++) { ASSERT_TRUE(e.PutField(static_cast(i), i, kUpb_FieldModifier_IsRepeated)); count++; @@ -135,12 +135,12 @@ TEST_P(MiniTableTest, AllScalarTypesOneof) { upb::MtDataEncoder e; ASSERT_TRUE(e.StartMessage(0)); int count = 0; - for (int i = kUpb_FieldType_Double ; i < kUpb_FieldType_SInt64; i++) { + for (int i = kUpb_FieldType_Double; i < kUpb_FieldType_SInt64; i++) { ASSERT_TRUE(e.PutField(static_cast(i), i, 0)); count++; } ASSERT_TRUE(e.StartOneof()); - for (int i = kUpb_FieldType_Double ; i < kUpb_FieldType_SInt64; i++) { + for (int i = kUpb_FieldType_Double; i < kUpb_FieldType_SInt64; i++) { ASSERT_TRUE(e.PutOneofField(i)); } fprintf(stderr, "YO: %s\n", e.data().c_str());