Auto-generate files after cl/631620526
diff --git a/php/ext/google/protobuf/php-upb.h b/php/ext/google/protobuf/php-upb.h
index 66ff534..a8e5a0d 100644
--- a/php/ext/google/protobuf/php-upb.h
+++ b/php/ext/google/protobuf/php-upb.h
@@ -1878,6 +1878,11 @@
e->UPB_PRIVATE(sub).UPB_PRIVATE(submsg) = m;
}
+UPB_INLINE upb_FieldRep UPB_PRIVATE(_upb_MiniTableExtension_GetRep)(
+ const struct upb_MiniTableExtension* e) {
+ return UPB_PRIVATE(_upb_MiniTableField_GetRep)(&e->UPB_PRIVATE(field));
+}
+
#ifdef __cplusplus
} /* extern "C" */
#endif
@@ -2792,7 +2797,6 @@
// const upb_MiniTableField* field,
// bool value, upb_Arena* a) {
// UPB_ASSUME(field->UPB_PRIVATE(descriptortype) == kUpb_FieldType_Bool);
-// UPB_ASSUME(upb_MiniTableField_IsScalar(field));
// UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(field) ==
// kUpb_FieldRep_1Byte);
// upb_Message_SetField(msg, field, &value, a);
@@ -2923,8 +2927,8 @@
const upb_MiniTableField* f,
bool default_val) {
UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Bool);
- UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_1Byte);
UPB_ASSUME(upb_MiniTableField_IsScalar(f));
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_1Byte);
upb_MessageValue def;
def.bool_val = default_val;
return upb_Message_GetField(msg, f, def).bool_val;
@@ -2934,8 +2938,8 @@
const upb_MiniTableField* f,
double default_val) {
UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Double);
- UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_8Byte);
UPB_ASSUME(upb_MiniTableField_IsScalar(f));
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_8Byte);
upb_MessageValue def;
def.double_val = default_val;
@@ -2946,8 +2950,8 @@
const upb_MiniTableField* f,
float default_val) {
UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Float);
- UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_4Byte);
UPB_ASSUME(upb_MiniTableField_IsScalar(f));
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_4Byte);
upb_MessageValue def;
def.float_val = default_val;
@@ -2959,8 +2963,8 @@
int32_t default_val) {
UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Int32 ||
upb_MiniTableField_CType(f) == kUpb_CType_Enum);
- UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_4Byte);
UPB_ASSUME(upb_MiniTableField_IsScalar(f));
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_4Byte);
upb_MessageValue def;
def.int32_val = default_val;
@@ -2971,8 +2975,8 @@
const upb_MiniTableField* f,
int64_t default_val) {
UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Int64);
- UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_8Byte);
UPB_ASSUME(upb_MiniTableField_IsScalar(f));
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_8Byte);
upb_MessageValue def;
def.int64_val = default_val;
@@ -3123,7 +3127,6 @@
upb_MiniTableField_CType(f) == kUpb_CType_Bytes);
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) ==
kUpb_FieldRep_StringView);
- UPB_ASSUME(upb_MiniTableField_IsScalar(f));
upb_MessageValue def;
def.str_val = default_val;
@@ -3134,8 +3137,8 @@
const upb_MiniTableField* f,
uint32_t default_val) {
UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_UInt32);
- UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_4Byte);
UPB_ASSUME(upb_MiniTableField_IsScalar(f));
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_4Byte);
upb_MessageValue def;
def.uint32_val = default_val;
@@ -3146,23 +3149,89 @@
const upb_MiniTableField* f,
uint64_t default_val) {
UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_UInt64);
- UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_8Byte);
UPB_ASSUME(upb_MiniTableField_IsScalar(f));
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_8Byte);
upb_MessageValue def;
def.uint64_val = default_val;
return upb_Message_GetField(msg, f, def).uint64_val;
}
-UPB_API_INLINE bool upb_Message_SetBool(struct upb_Message* msg,
- const upb_MiniTableField* f, bool value,
- upb_Arena* a) {
+// BaseField Setters ///////////////////////////////////////////////////////////
+
+UPB_API_INLINE void upb_Message_SetBaseFieldBool(struct upb_Message* msg,
+ const upb_MiniTableField* f,
+ bool value) {
UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Bool);
- UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_1Byte);
UPB_ASSUME(upb_MiniTableField_IsScalar(f));
- upb_MessageValue val;
- val.bool_val = value;
- return UPB_PRIVATE(_upb_Message_SetField)(msg, f, val, a);
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_1Byte);
+ upb_Message_SetBaseField(msg, f, &value);
+}
+
+UPB_API_INLINE void upb_Message_SetBaseFieldDouble(struct upb_Message* msg,
+ const upb_MiniTableField* f,
+ double value) {
+ UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Double);
+ UPB_ASSUME(upb_MiniTableField_IsScalar(f));
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_8Byte);
+ upb_Message_SetBaseField(msg, f, &value);
+}
+
+UPB_API_INLINE void upb_Message_SetBaseFieldFloat(struct upb_Message* msg,
+ const upb_MiniTableField* f,
+ float value) {
+ UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Float);
+ UPB_ASSUME(upb_MiniTableField_IsScalar(f));
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_4Byte);
+ upb_Message_SetBaseField(msg, f, &value);
+}
+
+UPB_API_INLINE void upb_Message_SetBaseFieldInt32(struct upb_Message* msg,
+ const upb_MiniTableField* f,
+ int32_t value) {
+ UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Int32 ||
+ upb_MiniTableField_CType(f) == kUpb_CType_Enum);
+ UPB_ASSUME(upb_MiniTableField_IsScalar(f));
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_4Byte);
+ upb_Message_SetBaseField(msg, f, &value);
+}
+
+UPB_API_INLINE void upb_Message_SetBaseFieldInt64(struct upb_Message* msg,
+ const upb_MiniTableField* f,
+ int64_t value) {
+ UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Int64);
+ UPB_ASSUME(upb_MiniTableField_IsScalar(f));
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_8Byte);
+ upb_Message_SetBaseField(msg, f, &value);
+}
+
+UPB_API_INLINE void upb_Message_SetBaseFieldString(struct upb_Message* msg,
+ const upb_MiniTableField* f,
+ upb_StringView value) {
+ UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_String ||
+ upb_MiniTableField_CType(f) == kUpb_CType_Bytes);
+ UPB_ASSUME(upb_MiniTableField_IsScalar(f));
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) ==
+ kUpb_FieldRep_StringView);
+ upb_Message_SetBaseField(msg, f, &value);
+}
+
+UPB_API_INLINE void upb_Message_SetBaseFieldUInt32(struct upb_Message* msg,
+ const upb_MiniTableField* f,
+ uint32_t value) {
+ UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_UInt32);
+ UPB_ASSUME(upb_MiniTableField_IsScalar(f));
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_4Byte);
+ upb_Message_SetBaseField(msg, f, &value);
+}
+
+UPB_API_INLINE void upb_Message_SetBaseFieldUInt64(struct upb_Message* msg,
+ const upb_MiniTableField* f,
+ uint64_t value) {
+ UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_UInt64);
+ UPB_ASSUME(upb_MiniTableField_IsScalar(f));
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_8Byte);
+ upb_Message_SetBaseField(msg, f, &value);
}
UPB_API_INLINE void upb_Message_SetClosedEnum(
@@ -3170,55 +3239,132 @@
const upb_MiniTableField* f, int32_t value) {
UPB_ASSERT(upb_MiniTableField_IsClosedEnum(f));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_4Byte);
- UPB_ASSUME(upb_MiniTableField_IsScalar(f));
UPB_ASSERT(upb_MiniTableEnum_CheckValue(
upb_MiniTable_GetSubEnumTable(msg_mini_table, f), value));
upb_Message_SetBaseField(msg, f, &value);
}
+// Extension Setters ///////////////////////////////////////////////////////////
+
+UPB_API_INLINE bool upb_Message_SetExtensionBool(
+ struct upb_Message* msg, const upb_MiniTableExtension* e, bool value,
+ upb_Arena* a) {
+ UPB_ASSUME(upb_MiniTableExtension_CType(e) == kUpb_CType_Bool);
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableExtension_GetRep)(e) ==
+ kUpb_FieldRep_1Byte);
+ return upb_Message_SetExtension(msg, e, &value, a);
+}
+
+UPB_API_INLINE bool upb_Message_SetExtensionDouble(
+ struct upb_Message* msg, const upb_MiniTableExtension* e, double value,
+ upb_Arena* a) {
+ UPB_ASSUME(upb_MiniTableExtension_CType(e) == kUpb_CType_Double);
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableExtension_GetRep)(e) ==
+ kUpb_FieldRep_8Byte);
+ return upb_Message_SetExtension(msg, e, &value, a);
+}
+
+UPB_API_INLINE bool upb_Message_SetExtensionFloat(
+ struct upb_Message* msg, const upb_MiniTableExtension* e, float value,
+ upb_Arena* a) {
+ UPB_ASSUME(upb_MiniTableExtension_CType(e) == kUpb_CType_Float);
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableExtension_GetRep)(e) ==
+ kUpb_FieldRep_4Byte);
+ return upb_Message_SetExtension(msg, e, &value, a);
+}
+
+UPB_API_INLINE bool upb_Message_SetExtensionInt32(
+ struct upb_Message* msg, const upb_MiniTableExtension* e, int32_t value,
+ upb_Arena* a) {
+ UPB_ASSUME(upb_MiniTableExtension_CType(e) == kUpb_CType_Int32 ||
+ upb_MiniTableExtension_CType(e) == kUpb_CType_Enum);
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableExtension_GetRep)(e) ==
+ kUpb_FieldRep_4Byte);
+ return upb_Message_SetExtension(msg, e, &value, a);
+}
+
+UPB_API_INLINE bool upb_Message_SetExtensionInt64(
+ struct upb_Message* msg, const upb_MiniTableExtension* e, int64_t value,
+ upb_Arena* a) {
+ UPB_ASSUME(upb_MiniTableExtension_CType(e) == kUpb_CType_Int64);
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableExtension_GetRep)(e) ==
+ kUpb_FieldRep_8Byte);
+ return upb_Message_SetExtension(msg, e, &value, a);
+}
+
+UPB_API_INLINE bool upb_Message_SetExtensionString(
+ struct upb_Message* msg, const upb_MiniTableExtension* e,
+ upb_StringView value, upb_Arena* a) {
+ UPB_ASSUME(upb_MiniTableExtension_CType(e) == kUpb_CType_String ||
+ upb_MiniTableExtension_CType(e) == kUpb_CType_Bytes);
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableExtension_GetRep)(e) ==
+ kUpb_FieldRep_StringView);
+ return upb_Message_SetExtension(msg, e, &value, a);
+}
+
+UPB_API_INLINE bool upb_Message_SetExtensionUInt32(
+ struct upb_Message* msg, const upb_MiniTableExtension* e, uint32_t value,
+ upb_Arena* a) {
+ UPB_ASSUME(upb_MiniTableExtension_CType(e) == kUpb_CType_UInt32);
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableExtension_GetRep)(e) ==
+ kUpb_FieldRep_4Byte);
+ return upb_Message_SetExtension(msg, e, &value, a);
+}
+
+UPB_API_INLINE bool upb_Message_SetExtensionUInt64(
+ struct upb_Message* msg, const upb_MiniTableExtension* e, uint64_t value,
+ upb_Arena* a) {
+ UPB_ASSUME(upb_MiniTableExtension_CType(e) == kUpb_CType_UInt64);
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableExtension_GetRep)(e) ==
+ kUpb_FieldRep_8Byte);
+ return upb_Message_SetExtension(msg, e, &value, a);
+}
+
+// Universal Setters ///////////////////////////////////////////////////////////
+
+UPB_API_INLINE bool upb_Message_SetBool(struct upb_Message* msg,
+ const upb_MiniTableField* f, bool value,
+ upb_Arena* a) {
+ return upb_MiniTableField_IsExtension(f)
+ ? upb_Message_SetExtensionBool(
+ msg, (const upb_MiniTableExtension*)f, value, a)
+ : (upb_Message_SetBaseFieldBool(msg, f, value), true);
+}
+
UPB_API_INLINE bool upb_Message_SetDouble(struct upb_Message* msg,
const upb_MiniTableField* f,
double value, upb_Arena* a) {
- UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Double);
- UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_8Byte);
- UPB_ASSUME(upb_MiniTableField_IsScalar(f));
- upb_MessageValue val;
- val.double_val = value;
- return UPB_PRIVATE(_upb_Message_SetField)(msg, f, val, a);
+ return upb_MiniTableField_IsExtension(f)
+ ? upb_Message_SetExtensionDouble(
+ msg, (const upb_MiniTableExtension*)f, value, a)
+ : (upb_Message_SetBaseFieldDouble(msg, f, value), true);
}
UPB_API_INLINE bool upb_Message_SetFloat(struct upb_Message* msg,
const upb_MiniTableField* f,
float value, upb_Arena* a) {
- UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Float);
- UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_4Byte);
- UPB_ASSUME(upb_MiniTableField_IsScalar(f));
- upb_MessageValue val;
- val.float_val = value;
- return UPB_PRIVATE(_upb_Message_SetField)(msg, f, val, a);
+ return upb_MiniTableField_IsExtension(f)
+ ? upb_Message_SetExtensionFloat(
+ msg, (const upb_MiniTableExtension*)f, value, a)
+ : (upb_Message_SetBaseFieldFloat(msg, f, value), true);
}
UPB_API_INLINE bool upb_Message_SetInt32(struct upb_Message* msg,
const upb_MiniTableField* f,
int32_t value, upb_Arena* a) {
- UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Int32 ||
- upb_MiniTableField_CType(f) == kUpb_CType_Enum);
- UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_4Byte);
- UPB_ASSUME(upb_MiniTableField_IsScalar(f));
- upb_MessageValue val;
- val.int32_val = value;
- return UPB_PRIVATE(_upb_Message_SetField)(msg, f, val, a);
+ return upb_MiniTableField_IsExtension(f)
+ ? upb_Message_SetExtensionInt32(
+ msg, (const upb_MiniTableExtension*)f, value, a)
+ : (upb_Message_SetBaseFieldInt32(msg, f, value), true);
}
UPB_API_INLINE bool upb_Message_SetInt64(struct upb_Message* msg,
const upb_MiniTableField* f,
int64_t value, upb_Arena* a) {
- UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Int64);
- UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_8Byte);
- UPB_ASSUME(upb_MiniTableField_IsScalar(f));
- upb_MessageValue val;
- val.int64_val = value;
- return UPB_PRIVATE(_upb_Message_SetField)(msg, f, val, a);
+ return upb_MiniTableField_IsExtension(f)
+ ? upb_Message_SetExtensionInt64(
+ msg, (const upb_MiniTableExtension*)f, value, a)
+ : (upb_Message_SetBaseFieldInt64(msg, f, value), true);
}
// Sets the value of a message-typed field. The mini_tables of `msg` and
@@ -3238,36 +3384,28 @@
UPB_API_INLINE bool upb_Message_SetString(struct upb_Message* msg,
const upb_MiniTableField* f,
upb_StringView value, upb_Arena* a) {
- UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_String ||
- upb_MiniTableField_CType(f) == kUpb_CType_Bytes);
- UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) ==
- kUpb_FieldRep_StringView);
- UPB_ASSUME(upb_MiniTableField_IsScalar(f));
- upb_MessageValue val;
- val.str_val = value;
- return UPB_PRIVATE(_upb_Message_SetField)(msg, f, val, a);
+ return upb_MiniTableField_IsExtension(f)
+ ? upb_Message_SetExtensionString(
+ msg, (const upb_MiniTableExtension*)f, value, a)
+ : (upb_Message_SetBaseFieldString(msg, f, value), true);
}
UPB_API_INLINE bool upb_Message_SetUInt32(struct upb_Message* msg,
const upb_MiniTableField* f,
uint32_t value, upb_Arena* a) {
- UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_UInt32);
- UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_4Byte);
- UPB_ASSUME(upb_MiniTableField_IsScalar(f));
- upb_MessageValue val;
- val.uint32_val = value;
- return UPB_PRIVATE(_upb_Message_SetField)(msg, f, val, a);
+ return upb_MiniTableField_IsExtension(f)
+ ? upb_Message_SetExtensionUInt32(
+ msg, (const upb_MiniTableExtension*)f, value, a)
+ : (upb_Message_SetBaseFieldUInt32(msg, f, value), true);
}
UPB_API_INLINE bool upb_Message_SetUInt64(struct upb_Message* msg,
const upb_MiniTableField* f,
uint64_t value, upb_Arena* a) {
- UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_UInt64);
- UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_8Byte);
- UPB_ASSUME(upb_MiniTableField_IsScalar(f));
- upb_MessageValue val;
- val.uint64_val = value;
- return UPB_PRIVATE(_upb_Message_SetField)(msg, f, val, a);
+ return upb_MiniTableField_IsExtension(f)
+ ? upb_Message_SetExtensionUInt64(
+ msg, (const upb_MiniTableExtension*)f, value, a)
+ : (upb_Message_SetBaseFieldUInt64(msg, f, value), true);
}
UPB_API_INLINE void upb_Message_Clear(struct upb_Message* msg,
diff --git a/ruby/ext/google/protobuf_c/ruby-upb.h b/ruby/ext/google/protobuf_c/ruby-upb.h
index b4345c8..63ff2c9 100755
--- a/ruby/ext/google/protobuf_c/ruby-upb.h
+++ b/ruby/ext/google/protobuf_c/ruby-upb.h
@@ -1880,6 +1880,11 @@
e->UPB_PRIVATE(sub).UPB_PRIVATE(submsg) = m;
}
+UPB_INLINE upb_FieldRep UPB_PRIVATE(_upb_MiniTableExtension_GetRep)(
+ const struct upb_MiniTableExtension* e) {
+ return UPB_PRIVATE(_upb_MiniTableField_GetRep)(&e->UPB_PRIVATE(field));
+}
+
#ifdef __cplusplus
} /* extern "C" */
#endif
@@ -2794,7 +2799,6 @@
// const upb_MiniTableField* field,
// bool value, upb_Arena* a) {
// UPB_ASSUME(field->UPB_PRIVATE(descriptortype) == kUpb_FieldType_Bool);
-// UPB_ASSUME(upb_MiniTableField_IsScalar(field));
// UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(field) ==
// kUpb_FieldRep_1Byte);
// upb_Message_SetField(msg, field, &value, a);
@@ -2925,8 +2929,8 @@
const upb_MiniTableField* f,
bool default_val) {
UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Bool);
- UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_1Byte);
UPB_ASSUME(upb_MiniTableField_IsScalar(f));
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_1Byte);
upb_MessageValue def;
def.bool_val = default_val;
return upb_Message_GetField(msg, f, def).bool_val;
@@ -2936,8 +2940,8 @@
const upb_MiniTableField* f,
double default_val) {
UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Double);
- UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_8Byte);
UPB_ASSUME(upb_MiniTableField_IsScalar(f));
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_8Byte);
upb_MessageValue def;
def.double_val = default_val;
@@ -2948,8 +2952,8 @@
const upb_MiniTableField* f,
float default_val) {
UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Float);
- UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_4Byte);
UPB_ASSUME(upb_MiniTableField_IsScalar(f));
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_4Byte);
upb_MessageValue def;
def.float_val = default_val;
@@ -2961,8 +2965,8 @@
int32_t default_val) {
UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Int32 ||
upb_MiniTableField_CType(f) == kUpb_CType_Enum);
- UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_4Byte);
UPB_ASSUME(upb_MiniTableField_IsScalar(f));
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_4Byte);
upb_MessageValue def;
def.int32_val = default_val;
@@ -2973,8 +2977,8 @@
const upb_MiniTableField* f,
int64_t default_val) {
UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Int64);
- UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_8Byte);
UPB_ASSUME(upb_MiniTableField_IsScalar(f));
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_8Byte);
upb_MessageValue def;
def.int64_val = default_val;
@@ -3125,7 +3129,6 @@
upb_MiniTableField_CType(f) == kUpb_CType_Bytes);
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) ==
kUpb_FieldRep_StringView);
- UPB_ASSUME(upb_MiniTableField_IsScalar(f));
upb_MessageValue def;
def.str_val = default_val;
@@ -3136,8 +3139,8 @@
const upb_MiniTableField* f,
uint32_t default_val) {
UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_UInt32);
- UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_4Byte);
UPB_ASSUME(upb_MiniTableField_IsScalar(f));
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_4Byte);
upb_MessageValue def;
def.uint32_val = default_val;
@@ -3148,23 +3151,89 @@
const upb_MiniTableField* f,
uint64_t default_val) {
UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_UInt64);
- UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_8Byte);
UPB_ASSUME(upb_MiniTableField_IsScalar(f));
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_8Byte);
upb_MessageValue def;
def.uint64_val = default_val;
return upb_Message_GetField(msg, f, def).uint64_val;
}
-UPB_API_INLINE bool upb_Message_SetBool(struct upb_Message* msg,
- const upb_MiniTableField* f, bool value,
- upb_Arena* a) {
+// BaseField Setters ///////////////////////////////////////////////////////////
+
+UPB_API_INLINE void upb_Message_SetBaseFieldBool(struct upb_Message* msg,
+ const upb_MiniTableField* f,
+ bool value) {
UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Bool);
- UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_1Byte);
UPB_ASSUME(upb_MiniTableField_IsScalar(f));
- upb_MessageValue val;
- val.bool_val = value;
- return UPB_PRIVATE(_upb_Message_SetField)(msg, f, val, a);
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_1Byte);
+ upb_Message_SetBaseField(msg, f, &value);
+}
+
+UPB_API_INLINE void upb_Message_SetBaseFieldDouble(struct upb_Message* msg,
+ const upb_MiniTableField* f,
+ double value) {
+ UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Double);
+ UPB_ASSUME(upb_MiniTableField_IsScalar(f));
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_8Byte);
+ upb_Message_SetBaseField(msg, f, &value);
+}
+
+UPB_API_INLINE void upb_Message_SetBaseFieldFloat(struct upb_Message* msg,
+ const upb_MiniTableField* f,
+ float value) {
+ UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Float);
+ UPB_ASSUME(upb_MiniTableField_IsScalar(f));
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_4Byte);
+ upb_Message_SetBaseField(msg, f, &value);
+}
+
+UPB_API_INLINE void upb_Message_SetBaseFieldInt32(struct upb_Message* msg,
+ const upb_MiniTableField* f,
+ int32_t value) {
+ UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Int32 ||
+ upb_MiniTableField_CType(f) == kUpb_CType_Enum);
+ UPB_ASSUME(upb_MiniTableField_IsScalar(f));
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_4Byte);
+ upb_Message_SetBaseField(msg, f, &value);
+}
+
+UPB_API_INLINE void upb_Message_SetBaseFieldInt64(struct upb_Message* msg,
+ const upb_MiniTableField* f,
+ int64_t value) {
+ UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Int64);
+ UPB_ASSUME(upb_MiniTableField_IsScalar(f));
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_8Byte);
+ upb_Message_SetBaseField(msg, f, &value);
+}
+
+UPB_API_INLINE void upb_Message_SetBaseFieldString(struct upb_Message* msg,
+ const upb_MiniTableField* f,
+ upb_StringView value) {
+ UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_String ||
+ upb_MiniTableField_CType(f) == kUpb_CType_Bytes);
+ UPB_ASSUME(upb_MiniTableField_IsScalar(f));
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) ==
+ kUpb_FieldRep_StringView);
+ upb_Message_SetBaseField(msg, f, &value);
+}
+
+UPB_API_INLINE void upb_Message_SetBaseFieldUInt32(struct upb_Message* msg,
+ const upb_MiniTableField* f,
+ uint32_t value) {
+ UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_UInt32);
+ UPB_ASSUME(upb_MiniTableField_IsScalar(f));
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_4Byte);
+ upb_Message_SetBaseField(msg, f, &value);
+}
+
+UPB_API_INLINE void upb_Message_SetBaseFieldUInt64(struct upb_Message* msg,
+ const upb_MiniTableField* f,
+ uint64_t value) {
+ UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_UInt64);
+ UPB_ASSUME(upb_MiniTableField_IsScalar(f));
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_8Byte);
+ upb_Message_SetBaseField(msg, f, &value);
}
UPB_API_INLINE void upb_Message_SetClosedEnum(
@@ -3172,55 +3241,132 @@
const upb_MiniTableField* f, int32_t value) {
UPB_ASSERT(upb_MiniTableField_IsClosedEnum(f));
UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_4Byte);
- UPB_ASSUME(upb_MiniTableField_IsScalar(f));
UPB_ASSERT(upb_MiniTableEnum_CheckValue(
upb_MiniTable_GetSubEnumTable(msg_mini_table, f), value));
upb_Message_SetBaseField(msg, f, &value);
}
+// Extension Setters ///////////////////////////////////////////////////////////
+
+UPB_API_INLINE bool upb_Message_SetExtensionBool(
+ struct upb_Message* msg, const upb_MiniTableExtension* e, bool value,
+ upb_Arena* a) {
+ UPB_ASSUME(upb_MiniTableExtension_CType(e) == kUpb_CType_Bool);
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableExtension_GetRep)(e) ==
+ kUpb_FieldRep_1Byte);
+ return upb_Message_SetExtension(msg, e, &value, a);
+}
+
+UPB_API_INLINE bool upb_Message_SetExtensionDouble(
+ struct upb_Message* msg, const upb_MiniTableExtension* e, double value,
+ upb_Arena* a) {
+ UPB_ASSUME(upb_MiniTableExtension_CType(e) == kUpb_CType_Double);
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableExtension_GetRep)(e) ==
+ kUpb_FieldRep_8Byte);
+ return upb_Message_SetExtension(msg, e, &value, a);
+}
+
+UPB_API_INLINE bool upb_Message_SetExtensionFloat(
+ struct upb_Message* msg, const upb_MiniTableExtension* e, float value,
+ upb_Arena* a) {
+ UPB_ASSUME(upb_MiniTableExtension_CType(e) == kUpb_CType_Float);
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableExtension_GetRep)(e) ==
+ kUpb_FieldRep_4Byte);
+ return upb_Message_SetExtension(msg, e, &value, a);
+}
+
+UPB_API_INLINE bool upb_Message_SetExtensionInt32(
+ struct upb_Message* msg, const upb_MiniTableExtension* e, int32_t value,
+ upb_Arena* a) {
+ UPB_ASSUME(upb_MiniTableExtension_CType(e) == kUpb_CType_Int32 ||
+ upb_MiniTableExtension_CType(e) == kUpb_CType_Enum);
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableExtension_GetRep)(e) ==
+ kUpb_FieldRep_4Byte);
+ return upb_Message_SetExtension(msg, e, &value, a);
+}
+
+UPB_API_INLINE bool upb_Message_SetExtensionInt64(
+ struct upb_Message* msg, const upb_MiniTableExtension* e, int64_t value,
+ upb_Arena* a) {
+ UPB_ASSUME(upb_MiniTableExtension_CType(e) == kUpb_CType_Int64);
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableExtension_GetRep)(e) ==
+ kUpb_FieldRep_8Byte);
+ return upb_Message_SetExtension(msg, e, &value, a);
+}
+
+UPB_API_INLINE bool upb_Message_SetExtensionString(
+ struct upb_Message* msg, const upb_MiniTableExtension* e,
+ upb_StringView value, upb_Arena* a) {
+ UPB_ASSUME(upb_MiniTableExtension_CType(e) == kUpb_CType_String ||
+ upb_MiniTableExtension_CType(e) == kUpb_CType_Bytes);
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableExtension_GetRep)(e) ==
+ kUpb_FieldRep_StringView);
+ return upb_Message_SetExtension(msg, e, &value, a);
+}
+
+UPB_API_INLINE bool upb_Message_SetExtensionUInt32(
+ struct upb_Message* msg, const upb_MiniTableExtension* e, uint32_t value,
+ upb_Arena* a) {
+ UPB_ASSUME(upb_MiniTableExtension_CType(e) == kUpb_CType_UInt32);
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableExtension_GetRep)(e) ==
+ kUpb_FieldRep_4Byte);
+ return upb_Message_SetExtension(msg, e, &value, a);
+}
+
+UPB_API_INLINE bool upb_Message_SetExtensionUInt64(
+ struct upb_Message* msg, const upb_MiniTableExtension* e, uint64_t value,
+ upb_Arena* a) {
+ UPB_ASSUME(upb_MiniTableExtension_CType(e) == kUpb_CType_UInt64);
+ UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableExtension_GetRep)(e) ==
+ kUpb_FieldRep_8Byte);
+ return upb_Message_SetExtension(msg, e, &value, a);
+}
+
+// Universal Setters ///////////////////////////////////////////////////////////
+
+UPB_API_INLINE bool upb_Message_SetBool(struct upb_Message* msg,
+ const upb_MiniTableField* f, bool value,
+ upb_Arena* a) {
+ return upb_MiniTableField_IsExtension(f)
+ ? upb_Message_SetExtensionBool(
+ msg, (const upb_MiniTableExtension*)f, value, a)
+ : (upb_Message_SetBaseFieldBool(msg, f, value), true);
+}
+
UPB_API_INLINE bool upb_Message_SetDouble(struct upb_Message* msg,
const upb_MiniTableField* f,
double value, upb_Arena* a) {
- UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Double);
- UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_8Byte);
- UPB_ASSUME(upb_MiniTableField_IsScalar(f));
- upb_MessageValue val;
- val.double_val = value;
- return UPB_PRIVATE(_upb_Message_SetField)(msg, f, val, a);
+ return upb_MiniTableField_IsExtension(f)
+ ? upb_Message_SetExtensionDouble(
+ msg, (const upb_MiniTableExtension*)f, value, a)
+ : (upb_Message_SetBaseFieldDouble(msg, f, value), true);
}
UPB_API_INLINE bool upb_Message_SetFloat(struct upb_Message* msg,
const upb_MiniTableField* f,
float value, upb_Arena* a) {
- UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Float);
- UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_4Byte);
- UPB_ASSUME(upb_MiniTableField_IsScalar(f));
- upb_MessageValue val;
- val.float_val = value;
- return UPB_PRIVATE(_upb_Message_SetField)(msg, f, val, a);
+ return upb_MiniTableField_IsExtension(f)
+ ? upb_Message_SetExtensionFloat(
+ msg, (const upb_MiniTableExtension*)f, value, a)
+ : (upb_Message_SetBaseFieldFloat(msg, f, value), true);
}
UPB_API_INLINE bool upb_Message_SetInt32(struct upb_Message* msg,
const upb_MiniTableField* f,
int32_t value, upb_Arena* a) {
- UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Int32 ||
- upb_MiniTableField_CType(f) == kUpb_CType_Enum);
- UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_4Byte);
- UPB_ASSUME(upb_MiniTableField_IsScalar(f));
- upb_MessageValue val;
- val.int32_val = value;
- return UPB_PRIVATE(_upb_Message_SetField)(msg, f, val, a);
+ return upb_MiniTableField_IsExtension(f)
+ ? upb_Message_SetExtensionInt32(
+ msg, (const upb_MiniTableExtension*)f, value, a)
+ : (upb_Message_SetBaseFieldInt32(msg, f, value), true);
}
UPB_API_INLINE bool upb_Message_SetInt64(struct upb_Message* msg,
const upb_MiniTableField* f,
int64_t value, upb_Arena* a) {
- UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_Int64);
- UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_8Byte);
- UPB_ASSUME(upb_MiniTableField_IsScalar(f));
- upb_MessageValue val;
- val.int64_val = value;
- return UPB_PRIVATE(_upb_Message_SetField)(msg, f, val, a);
+ return upb_MiniTableField_IsExtension(f)
+ ? upb_Message_SetExtensionInt64(
+ msg, (const upb_MiniTableExtension*)f, value, a)
+ : (upb_Message_SetBaseFieldInt64(msg, f, value), true);
}
// Sets the value of a message-typed field. The mini_tables of `msg` and
@@ -3240,36 +3386,28 @@
UPB_API_INLINE bool upb_Message_SetString(struct upb_Message* msg,
const upb_MiniTableField* f,
upb_StringView value, upb_Arena* a) {
- UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_String ||
- upb_MiniTableField_CType(f) == kUpb_CType_Bytes);
- UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) ==
- kUpb_FieldRep_StringView);
- UPB_ASSUME(upb_MiniTableField_IsScalar(f));
- upb_MessageValue val;
- val.str_val = value;
- return UPB_PRIVATE(_upb_Message_SetField)(msg, f, val, a);
+ return upb_MiniTableField_IsExtension(f)
+ ? upb_Message_SetExtensionString(
+ msg, (const upb_MiniTableExtension*)f, value, a)
+ : (upb_Message_SetBaseFieldString(msg, f, value), true);
}
UPB_API_INLINE bool upb_Message_SetUInt32(struct upb_Message* msg,
const upb_MiniTableField* f,
uint32_t value, upb_Arena* a) {
- UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_UInt32);
- UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_4Byte);
- UPB_ASSUME(upb_MiniTableField_IsScalar(f));
- upb_MessageValue val;
- val.uint32_val = value;
- return UPB_PRIVATE(_upb_Message_SetField)(msg, f, val, a);
+ return upb_MiniTableField_IsExtension(f)
+ ? upb_Message_SetExtensionUInt32(
+ msg, (const upb_MiniTableExtension*)f, value, a)
+ : (upb_Message_SetBaseFieldUInt32(msg, f, value), true);
}
UPB_API_INLINE bool upb_Message_SetUInt64(struct upb_Message* msg,
const upb_MiniTableField* f,
uint64_t value, upb_Arena* a) {
- UPB_ASSUME(upb_MiniTableField_CType(f) == kUpb_CType_UInt64);
- UPB_ASSUME(UPB_PRIVATE(_upb_MiniTableField_GetRep)(f) == kUpb_FieldRep_8Byte);
- UPB_ASSUME(upb_MiniTableField_IsScalar(f));
- upb_MessageValue val;
- val.uint64_val = value;
- return UPB_PRIVATE(_upb_Message_SetField)(msg, f, val, a);
+ return upb_MiniTableField_IsExtension(f)
+ ? upb_Message_SetExtensionUInt64(
+ msg, (const upb_MiniTableExtension*)f, value, a)
+ : (upb_Message_SetBaseFieldUInt64(msg, f, value), true);
}
UPB_API_INLINE void upb_Message_Clear(struct upb_Message* msg,
