Clang-format.

pull/13171/head
Joshua Haberman 3 years ago
parent 3692e6659f
commit 20e7802fca
  1. 11
      upb/mini_table.c
  2. 3
      upb/msg_internal.h
  3. 36
      upbc/protoc-gen-upb.cc

@ -117,7 +117,6 @@ bool upb_IsTypePackable(upb_FieldType type) {
return (1 << type) & kPackableTypes;
}
/** upb_MtDataEncoder *********************************************************/
typedef struct {
@ -476,7 +475,8 @@ static void upb_MiniTable_SetField(upb_MtDecoder* d, uint8_t ch,
}
#include <stdio.h>
static void upb_MtDecoder_ModifyField(upb_MtDecoder* d, uint32_t message_modifiers,
static void upb_MtDecoder_ModifyField(upb_MtDecoder* d,
uint32_t message_modifiers,
uint32_t field_modifiers,
upb_MiniTable_Field* field) {
if (field_modifiers & kUpb_EncodedFieldModifier_FlipPacked) {
@ -931,8 +931,7 @@ upb_MiniTable* upb_MiniTable_BuildMapEntry(upb_FieldType key_type,
upb_MiniTable_Sub* subs = NULL;
if (value_is_proto3_enum) value_type = kUpb_FieldType_Int32;
if (value_type == kUpb_FieldType_Message ||
value_type == kUpb_FieldType_Group ||
value_type == kUpb_FieldType_Enum) {
value_type == kUpb_FieldType_Group || value_type == kUpb_FieldType_Enum) {
subs = upb_Arena_Malloc(arena, sizeof(*subs));
if (!subs) return NULL;
}
@ -980,7 +979,7 @@ upb_MiniTable_Enum* upb_MiniTable_BuildEnum(const char* data, size_t len,
table->mask = 0;
table->value_count = 0;
table->values = NULL;
const char* ptr = data;
const char* end = UPB_PTRADD(data, len);
@ -1004,7 +1003,7 @@ upb_MiniTable_Enum* upb_MiniTable_BuildEnum(const char* data, size_t len,
table->values = upb_Arena_Malloc(arena, end - ptr);
upb_MtDecoder_CheckOutOfMemory(&decoder, table);
memcpy((void*)table->values, ptr, end - ptr);
table->value_count = bytes / 4;
table->value_count = bytes / 4;
}
return table;

@ -87,7 +87,8 @@ typedef enum {
} upb_FieldMode;
#define kUpb_FieldMode_Mask 3 /* Mask to isolate the mode from upb_FieldRep. */
#define kUpb_FieldMode_Mask 3 /* Mask to isolate the mode from upb_FieldRep. \
*/
/* Extra flags on the mode field. */
typedef enum {

@ -391,7 +391,8 @@ class FilePlatformLayout {
private:
typedef absl::flat_hash_map<const protobuf::Descriptor*, upb_MiniTable*>
TableMap;
typedef absl::flat_hash_map<const protobuf::FieldDescriptor*, upb_MiniTable_Extension>
typedef absl::flat_hash_map<const protobuf::FieldDescriptor*,
upb_MiniTable_Extension>
ExtensionMap;
upb::Arena arena_;
TableMap table_map_;
@ -765,8 +766,8 @@ void GenerateMessageFunctionsInHeader(const protobuf::Descriptor* message,
}
void GenerateOneofInHeader(const protobuf::OneofDescriptor* oneof,
const FileLayout& layout,
absl::string_view msg_name, Output& output) {
const FileLayout& layout, absl::string_view msg_name,
Output& output) {
std::string fullname = ToCIdent(oneof->full_name());
output("typedef enum {\n");
for (int j = 0; j < oneof->field_count(); j++) {
@ -783,8 +784,7 @@ void GenerateOneofInHeader(const protobuf::OneofDescriptor* oneof,
return ($0_oneofcases)*UPB_PTR_AT(msg, $3, int32_t);
}
)cc",
fullname, msg_name, oneof->name(),
layout.GetOneofCaseOffset(oneof));
fullname, msg_name, oneof->name(), layout.GetOneofCaseOffset(oneof));
}
void GenerateHazzer(const protobuf::FieldDescriptor* field,
@ -852,8 +852,7 @@ void GenerateMapGetters(const protobuf::FieldDescriptor* field,
return ($0)_upb_msg_map_next(msg, $3, iter);
}
)cc",
CTypeConst(field), msg_name, field->name(),
layout.GetFieldOffset(field));
CTypeConst(field), msg_name, field->name(), layout.GetFieldOffset(field));
}
void GenerateMapEntryGetters(const protobuf::FieldDescriptor* field,
@ -881,28 +880,26 @@ void GenerateRepeatedGetters(const protobuf::FieldDescriptor* field,
return ($0 const*)_upb_array_accessor(msg, $3, len);
}
)cc",
CTypeConst(field), msg_name, field->name(),
layout.GetFieldOffset(field));
CTypeConst(field), msg_name, field->name(), layout.GetFieldOffset(field));
}
void GenerateOneofGetters(const protobuf::FieldDescriptor* field,
const FileLayout& layout,
absl::string_view msg_name, Output& output) {
const FileLayout& layout, absl::string_view msg_name,
Output& output) {
output(
R"cc(
UPB_INLINE $0 $1_$2(const $1* msg) {
return UPB_READ_ONEOF(msg, $0, $3, $4, $5, $6);
}
)cc",
CTypeConst(field), msg_name, field->name(),
layout.GetFieldOffset(field),
CTypeConst(field), msg_name, field->name(), layout.GetFieldOffset(field),
layout.GetOneofCaseOffset(field->real_containing_oneof()),
field->number(), FieldDefault(field));
}
void GenerateScalarGetters(const protobuf::FieldDescriptor* field,
const FileLayout& layout,
absl::string_view msg_name, Output& output) {
const FileLayout& layout, absl::string_view msg_name,
Output& output) {
if (HasNonZeroDefault(field)) {
output(
R"cc(
@ -971,8 +968,7 @@ void GenerateMapSetters(const protobuf::FieldDescriptor* field,
return _upb_msg_map_delete(msg, $3, &key, $4);
}
)cc",
msg_name, field->name(), CType(key),
layout.GetFieldOffset(field),
msg_name, field->name(), CType(key), layout.GetFieldOffset(field),
key->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_STRING
? "0"
: "sizeof(key)");
@ -982,8 +978,7 @@ void GenerateMapSetters(const protobuf::FieldDescriptor* field,
return ($0)_upb_msg_map_next(msg, $3, iter);
}
)cc",
CType(field), msg_name, field->name(),
layout.GetFieldOffset(field));
CType(field), msg_name, field->name(), layout.GetFieldOffset(field));
}
void GenerateRepeatedSetters(const protobuf::FieldDescriptor* field,
@ -1534,8 +1529,7 @@ void WriteField(const upb_MiniTable_Field* field64,
// Writes a single field into a .upb.c source file.
void WriteMessageField(const upb_MiniTable_Field* field64,
const upb_MiniTable_Field* field32,
Output& output) {
const upb_MiniTable_Field* field32, Output& output) {
output(" ");
WriteField(field64, field32, output);
output(",\n");

Loading…
Cancel
Save