Moved pointers left and added some comments.
diff --git a/python/descriptor.c b/python/descriptor.c
index e0d478c..8602f12 100644
--- a/python/descriptor.c
+++ b/python/descriptor.c
@@ -42,29 +42,28 @@
typedef struct {
PyObject_HEAD
- PyObject *pool; // We own a ref.
- const void *def; // Type depends on the class. Kept alive by "pool".
- PyObject *options; // NULL if not present or not cached.
+ PyObject* pool; // We own a ref.
+ const void* def; // Type depends on the class. Kept alive by "pool".
+ PyObject* options; // NULL if not present or not cached.
} PyUpb_DescriptorBase;
-PyObject *PyUpb_AnyDescriptor_GetPool(PyObject *desc) {
- PyUpb_DescriptorBase *base = (void*)desc;
+PyObject* PyUpb_AnyDescriptor_GetPool(PyObject* desc) {
+ PyUpb_DescriptorBase* base = (void*)desc;
return base->pool;
}
-const void *PyUpb_AnyDescriptor_GetDef(PyObject *desc) {
- PyUpb_DescriptorBase *base = (void*)desc;
+const void* PyUpb_AnyDescriptor_GetDef(PyObject* desc) {
+ PyUpb_DescriptorBase* base = (void*)desc;
return base->def;
}
-static PyUpb_DescriptorBase *PyUpb_DescriptorBase_DoCreate(PyUpb_DescriptorType type,
- const void *def,
- const upb_filedef *file) {
- PyUpb_ModuleState *state = PyUpb_ModuleState_Get();
- PyTypeObject *type_obj = state->descriptor_types[type];
+static PyUpb_DescriptorBase* PyUpb_DescriptorBase_DoCreate(
+ PyUpb_DescriptorType type, const void* def, const upb_filedef* file) {
+ PyUpb_ModuleState* state = PyUpb_ModuleState_Get();
+ PyTypeObject* type_obj = state->descriptor_types[type];
assert(def);
- PyUpb_DescriptorBase *base = (void*)PyType_GenericAlloc(type_obj, 0);
+ PyUpb_DescriptorBase* base = (void*)PyType_GenericAlloc(type_obj, 0);
base->pool = PyUpb_DescriptorPool_Get(upb_filedef_symtab(file));
base->def = def;
base->options = NULL;
@@ -76,9 +75,10 @@
// Returns a Python object wrapping |def|, of descriptor type |type|. If a
// wrapper was previously created for this def, returns it, otherwise creates a
// new wrapper.
-PyObject *PyUpb_DescriptorBase_Get(PyUpb_DescriptorType type, const void *def,
- const upb_filedef *file) {
- PyUpb_DescriptorBase *base = (PyUpb_DescriptorBase *)PyUpb_ObjCache_Get(def);
+static PyObject* PyUpb_DescriptorBase_Get(PyUpb_DescriptorType type,
+ const void* def,
+ const upb_filedef* file) {
+ PyUpb_DescriptorBase* base = (PyUpb_DescriptorBase*)PyUpb_ObjCache_Get(def);
if (!base) {
base = PyUpb_DescriptorBase_DoCreate(type, def, file);
@@ -87,39 +87,50 @@
return &base->ob_base;
}
-static PyUpb_DescriptorBase *PyUpb_DescriptorBase_Check(
- PyObject *obj, PyUpb_DescriptorType type) {
- PyUpb_ModuleState *state = PyUpb_ModuleState_Get();
- PyTypeObject *type_obj = state->descriptor_types[type];
+static PyUpb_DescriptorBase* PyUpb_DescriptorBase_Check(
+ PyObject* obj, PyUpb_DescriptorType type) {
+ PyUpb_ModuleState* state = PyUpb_ModuleState_Get();
+ PyTypeObject* type_obj = state->descriptor_types[type];
if (!PyObject_TypeCheck(obj, type_obj)) {
- PyErr_Format(PyExc_TypeError, "Expected object of type %S, but got %R", type_obj, obj);
+ PyErr_Format(PyExc_TypeError, "Expected object of type %S, but got %R",
+ type_obj, obj);
return NULL;
}
- return (PyUpb_DescriptorBase *)obj;
+ return (PyUpb_DescriptorBase*)obj;
}
-static PyObject *PyUpb_DescriptorBase_GetOptions(PyUpb_DescriptorBase *self,
- const upb_msg *opts,
- const upb_msglayout *layout,
- const char *msg_name) {
+static PyObject* PyUpb_DescriptorBase_GetOptions(PyUpb_DescriptorBase* self,
+ const upb_msg* opts,
+ const upb_msglayout* layout,
+ const char* msg_name) {
if (!self->options) {
- PyObject *mod = PyImport_ImportModule("google.protobuf.descriptor_pb2");
+ // Load descriptors protos if they are not loaded already. We have to do
+ // this lazily, otherwise, it would lead to circular imports.
+ PyObject* mod = PyImport_ImportModule("google.protobuf.descriptor_pb2");
Py_DECREF(mod);
- PyObject *default_pool = PyUpb_DescriptorPool_GetDefaultPool();
- const upb_symtab *symtab = PyUpb_DescriptorPool_GetSymtab(default_pool);
- const upb_msgdef *m = upb_symtab_lookupmsg(symtab, msg_name);
+
+ // Find the correct options message.
+ PyObject* default_pool = PyUpb_DescriptorPool_GetDefaultPool();
+ const upb_symtab* symtab = PyUpb_DescriptorPool_GetSymtab(default_pool);
+ const upb_msgdef* m = upb_symtab_lookupmsg(symtab, msg_name);
assert(m);
+
+ // Copy the options message from C to Python using serialize+parse.
+ // We don't wrap the C object directly because there is no guarantee that
+ // the descriptor_pb2 that was loaded at runtime has the same members or
+ // layout as the C types that were compiled in.
size_t size;
- PyObject *py_arena = PyUpb_Arena_New();
- upb_arena *arena = PyUpb_Arena_Get(py_arena);
- char *pb = upb_encode(opts, layout, arena, &size);
- upb_msg *opts2 = upb_msg_new(m, arena);
+ PyObject* py_arena = PyUpb_Arena_New();
+ upb_arena* arena = PyUpb_Arena_Get(py_arena);
+ char* pb = upb_encode(opts, layout, arena, &size);
+ upb_msg* opts2 = upb_msg_new(m, arena);
assert(opts2);
bool ok = _upb_decode(pb, size, opts2, upb_msgdef_layout(m),
upb_symtab_extreg(symtab), 0,
arena) == kUpb_DecodeStatus_Ok;
(void)ok;
assert(ok);
+
// Disabled until python/message.c is reviewed and checked in.
// self->options = PyUpb_CMessage_Get(opts2, m, py_arena);
Py_DECREF(py_arena);
@@ -131,17 +142,18 @@
return self->options;
}
-typedef void *PyUpb_ToProto_Func(const void *def, upb_arena *arena);
+typedef void* PyUpb_ToProto_Func(const void* def, upb_arena* arena);
-static PyObject *PyUpb_DescriptorBase_CopyToProto(
- PyObject *_self, void *(*func)(const void *def, upb_arena *arena),
- const upb_msglayout *layout, PyObject *py_proto) {
- PyUpb_DescriptorBase *self = (void*)_self;
- upb_arena *arena = upb_arena_new();
- upb_msg *proto = func(self->def, arena);
+static PyObject* PyUpb_DescriptorBase_CopyToProto(PyObject* _self,
+ PyUpb_ToProto_Func* func,
+ const upb_msglayout* layout,
+ PyObject* py_proto) {
+ PyUpb_DescriptorBase* self = (void*)_self;
+ upb_arena* arena = upb_arena_new();
+ upb_msg* proto = func(self->def, arena);
size_t size;
- char *pb = upb_encode(proto, layout, arena, &size);
- PyObject *str = PyBytes_FromStringAndSize(pb, size);
+ char* pb = upb_encode(proto, layout, arena, &size);
+ PyObject* str = PyBytes_FromStringAndSize(pb, size);
// Disabled until python/message.c is reviewed and checked in.
// PyObject *ret = PyUpb_CMessage_MergeFromString(py_proto, str);
upb_arena_free(arena);
@@ -149,77 +161,80 @@
return PyErr_Format(PyExc_NotImplementedError, "Not yet implemented");
}
-static void PyUpb_DescriptorBase_Clear(PyUpb_DescriptorBase *base) {
+static void PyUpb_DescriptorBase_Dealloc(PyUpb_DescriptorBase* base) {
PyUpb_ObjCache_Delete(base->def);
- Py_CLEAR(base->pool);
+ Py_DECREF(base->pool);
Py_XDECREF(base->options);
-}
-
-static void PyUpb_DescriptorBase_Dealloc(PyUpb_DescriptorBase *base) {
- PyUpb_DescriptorBase_Clear(base);
PyUpb_Dealloc(base);
}
-#define DESCRIPTOR_BASE_SLOTS \
- {Py_tp_new, (void*)&PyUpb_Forbidden_New}, \
- {Py_tp_dealloc, (void*)&PyUpb_DescriptorBase_Dealloc}
+#define DESCRIPTOR_BASE_SLOTS \
+ {Py_tp_new, (void*)&PyUpb_Forbidden_New}, { \
+ Py_tp_dealloc, (void*)&PyUpb_DescriptorBase_Dealloc \
+ }
// -----------------------------------------------------------------------------
// Descriptor
// -----------------------------------------------------------------------------
-PyObject *PyUpb_Descriptor_Get(const upb_msgdef *m) {
- const upb_filedef *file = upb_msgdef_file(m);
+PyObject* PyUpb_Descriptor_Get(const upb_msgdef* m) {
+ const upb_filedef* file = upb_msgdef_file(m);
return PyUpb_DescriptorBase_Get(kPyUpb_Descriptor, m, file);
}
-PyObject *PyUpb_Descriptor_GetClass(const upb_msgdef *m) {
- PyObject *ret = PyUpb_ObjCache_Get(upb_msgdef_layout(m));
+PyObject* PyUpb_Descriptor_GetClass(const upb_msgdef* m) {
+ PyObject* ret = PyUpb_ObjCache_Get(upb_msgdef_layout(m));
assert(ret);
return ret;
}
-static const void *PyUpb_Descriptor_LookupNestedMessage(const upb_msgdef *m,
- const char *name) {
- const upb_filedef *filedef = upb_msgdef_file(m);
- const upb_symtab *symtab = upb_filedef_symtab(filedef);
- PyObject *qname =
- PyUnicode_FromFormat("%s.%s", upb_msgdef_fullname(m), name);
- const upb_msgdef *ret =
+// The LookupNested*() functions provide name lookup for entities nested inside
+// a message. This uses the symtab's table, which requires that the symtab is
+// not being mutated concurrently. We can guarantee this for Python-owned
+// symtabs, but upb cannot guarantee it in general for an arbitrary
+// `const upb_msgdef*`.
+
+static const void* PyUpb_Descriptor_LookupNestedMessage(const upb_msgdef* m,
+ const char* name) {
+ const upb_filedef* filedef = upb_msgdef_file(m);
+ const upb_symtab* symtab = upb_filedef_symtab(filedef);
+ PyObject* qname = PyUnicode_FromFormat("%s.%s", upb_msgdef_fullname(m), name);
+ const upb_msgdef* ret =
upb_symtab_lookupmsg(symtab, PyUnicode_AsUTF8AndSize(qname, NULL));
Py_DECREF(qname);
return ret;
}
-static const void *PyUpb_Descriptor_LookupNestedEnum(const upb_msgdef *m,
- const char *name) {
- const upb_filedef *filedef = upb_msgdef_file(m);
- const upb_symtab *symtab = upb_filedef_symtab(filedef);
- PyObject *qname = PyUnicode_FromFormat("%s.%s", upb_msgdef_fullname(m), name);
- const upb_enumdef *ret =
+static const void* PyUpb_Descriptor_LookupNestedEnum(const upb_msgdef* m,
+ const char* name) {
+ const upb_filedef* filedef = upb_msgdef_file(m);
+ const upb_symtab* symtab = upb_filedef_symtab(filedef);
+ PyObject* qname = PyUnicode_FromFormat("%s.%s", upb_msgdef_fullname(m), name);
+ const upb_enumdef* ret =
upb_symtab_lookupenum(symtab, PyUnicode_AsUTF8AndSize(qname, NULL));
Py_DECREF(qname);
return ret;
}
-static const void *PyUpb_Descriptor_LookupNestedExtension(const upb_msgdef *m,
- const char *name) {
- const upb_filedef *filedef = upb_msgdef_file(m);
- const upb_symtab *symtab = upb_filedef_symtab(filedef);
- PyObject *qname = PyUnicode_FromFormat("%s.%s", upb_msgdef_fullname(m), name);
- const upb_fielddef *ret =
+static const void* PyUpb_Descriptor_LookupNestedExtension(const upb_msgdef* m,
+ const char* name) {
+ const upb_filedef* filedef = upb_msgdef_file(m);
+ const upb_symtab* symtab = upb_filedef_symtab(filedef);
+ PyObject* qname = PyUnicode_FromFormat("%s.%s", upb_msgdef_fullname(m), name);
+ const upb_fielddef* ret =
upb_symtab_lookupext(symtab, PyUnicode_AsUTF8AndSize(qname, NULL));
Py_DECREF(qname);
return ret;
}
-static PyObject *PyUpb_Descriptor_GetExtensionRanges(PyObject *_self, void *closure) {
- PyUpb_DescriptorBase *self = (void*)_self;
+static PyObject* PyUpb_Descriptor_GetExtensionRanges(PyObject* _self,
+ void* closure) {
+ PyUpb_DescriptorBase* self = (PyUpb_DescriptorBase*)_self;
int n = upb_msgdef_extrangecount(self->def);
PyObject* range_list = PyList_New(n);
for (int i = 0; i < n; i++) {
- const upb_extrange *range = upb_msgdef_extrange(self->def, i);
+ const upb_extrange* range = upb_msgdef_extrange(self->def, i);
PyObject* start = PyLong_FromLong(upb_extrange_start(range));
PyObject* end = PyLong_FromLong(upb_extrange_end(range));
PyList_SetItem(range_list, i, PyTuple_Pack(2, start, end));
@@ -228,204 +243,193 @@
return range_list;
}
-static PyObject *PyUpb_Descriptor_GetExtensions(PyObject *_self, void *closure) {
- PyUpb_DescriptorBase *self = (void*)_self;
+static PyObject* PyUpb_Descriptor_GetExtensions(PyObject* _self,
+ void* closure) {
+ PyUpb_DescriptorBase* self = (void*)_self;
static PyUpb_GenericSequence_Funcs funcs = {
- (void*)&upb_msgdef_nestedextcount,
- (void*)&upb_msgdef_nestedext,
- (void*)&PyUpb_FieldDescriptor_Get,
+ (void*)&upb_msgdef_nestedextcount,
+ (void*)&upb_msgdef_nestedext,
+ (void*)&PyUpb_FieldDescriptor_Get,
};
return PyUpb_GenericSequence_New(&funcs, self->def, self->pool);
}
-static PyObject *PyUpb_Descriptor_GetExtensionsByName(PyObject *_self,
- void *closure) {
- PyUpb_DescriptorBase *self = (void*)_self;
+static PyObject* PyUpb_Descriptor_GetExtensionsByName(PyObject* _self,
+ void* closure) {
+ PyUpb_DescriptorBase* self = (void*)_self;
static PyUpb_ByNameMap_Funcs funcs = {
{
- (void *)&upb_msgdef_nestedextcount,
- (void *)&upb_msgdef_nestedext,
- (void *)&PyUpb_FieldDescriptor_Get,
+ (void*)&upb_msgdef_nestedextcount,
+ (void*)&upb_msgdef_nestedext,
+ (void*)&PyUpb_FieldDescriptor_Get,
},
- (void *)&PyUpb_Descriptor_LookupNestedExtension,
- (void *)&upb_fielddef_name,
+ (void*)&PyUpb_Descriptor_LookupNestedExtension,
+ (void*)&upb_fielddef_name,
};
return PyUpb_ByNameMap_New(&funcs, self->def, self->pool);
}
-static PyObject *PyUpb_Descriptor_GetEnumTypes(PyObject *_self, void *closure) {
- PyUpb_DescriptorBase *self = (void*)_self;
+static PyObject* PyUpb_Descriptor_GetEnumTypes(PyObject* _self, void* closure) {
+ PyUpb_DescriptorBase* self = (void*)_self;
static PyUpb_GenericSequence_Funcs funcs = {
- (void*)&upb_msgdef_nestedenumcount,
- (void*)&upb_msgdef_nestedenum,
- (void*)&PyUpb_EnumDescriptor_Get,
+ (void*)&upb_msgdef_nestedenumcount,
+ (void*)&upb_msgdef_nestedenum,
+ (void*)&PyUpb_EnumDescriptor_Get,
};
return PyUpb_GenericSequence_New(&funcs, self->def, self->pool);
}
-static PyObject *PyUpb_Descriptor_GetOneofs(PyObject *_self, void *closure) {
- PyUpb_DescriptorBase *self = (void*)_self;
+static PyObject* PyUpb_Descriptor_GetOneofs(PyObject* _self, void* closure) {
+ PyUpb_DescriptorBase* self = (void*)_self;
static PyUpb_GenericSequence_Funcs funcs = {
- (void*)&upb_msgdef_oneofcount,
- (void*)&upb_msgdef_oneof,
- (void*)&PyUpb_OneofDescriptor_Get,
+ (void*)&upb_msgdef_oneofcount,
+ (void*)&upb_msgdef_oneof,
+ (void*)&PyUpb_OneofDescriptor_Get,
};
return PyUpb_GenericSequence_New(&funcs, self->def, self->pool);
}
static PyObject* PyUpb_Descriptor_GetOptions(PyObject* _self, PyObject* args) {
- PyUpb_DescriptorBase *self = (void*)_self;
+ PyUpb_DescriptorBase* self = (void*)_self;
return PyUpb_DescriptorBase_GetOptions(
self, upb_msgdef_options(self->def),
&google_protobuf_MessageOptions_msginit,
"google.protobuf.MessageOptions");
}
-static PyObject* PyUpb_Descriptor_CopyToProto(PyObject* _self, PyObject* py_proto) {
+static PyObject* PyUpb_Descriptor_CopyToProto(PyObject* _self,
+ PyObject* py_proto) {
return PyUpb_DescriptorBase_CopyToProto(
- _self, (PyUpb_ToProto_Func *)&upb_MessageDef_ToProto,
+ _self, (PyUpb_ToProto_Func*)&upb_MessageDef_ToProto,
&google_protobuf_DescriptorProto_msginit, py_proto);
}
-static PyObject* PyUpb_Descriptor_EnumValueName(PyObject* _self, PyObject* args) {
- PyUpb_DescriptorBase *self = (void*)_self;
- const char *enum_name;
+static PyObject* PyUpb_Descriptor_EnumValueName(PyObject* _self,
+ PyObject* args) {
+ PyUpb_DescriptorBase* self = (void*)_self;
+ const char* enum_name;
int number;
if (!PyArg_ParseTuple(args, "si", &enum_name, &number)) return NULL;
- const upb_enumdef *e =
+ const upb_enumdef* e =
PyUpb_Descriptor_LookupNestedEnum(self->def, enum_name);
if (!e) {
PyErr_SetString(PyExc_KeyError, enum_name);
return NULL;
}
- const upb_enumvaldef *ev = upb_enumdef_lookupnum(e, number);
+ const upb_enumvaldef* ev = upb_enumdef_lookupnum(e, number);
if (!ev) {
PyErr_Format(PyExc_KeyError, "%d", number);
return NULL;
- }
+ }
return PyUnicode_FromString(upb_enumvaldef_name(ev));
}
-static PyObject *PyUpb_Descriptor_GetFieldsByName(PyObject *_self,
- void *closure) {
- PyUpb_DescriptorBase *self = (void*)_self;
+static PyObject* PyUpb_Descriptor_GetFieldsByName(PyObject* _self,
+ void* closure) {
+ PyUpb_DescriptorBase* self = (void*)_self;
static PyUpb_ByNameMap_Funcs funcs = {
{
- (void *)&upb_msgdef_fieldcount,
- (void *)&upb_msgdef_field,
- (void *)&PyUpb_FieldDescriptor_Get,
+ (void*)&upb_msgdef_fieldcount,
+ (void*)&upb_msgdef_field,
+ (void*)&PyUpb_FieldDescriptor_Get,
},
- (void *)&upb_msgdef_ntofz,
- (void *)&upb_fielddef_name,
+ (void*)&upb_msgdef_ntofz,
+ (void*)&upb_fielddef_name,
};
return PyUpb_ByNameMap_New(&funcs, self->def, self->pool);
}
-static PyObject *PyUpb_Descriptor_GetFieldsByCamelcaseName(PyObject *_self,
- void *closure) {
- PyUpb_DescriptorBase *self = (void*)_self;
+static PyObject* PyUpb_Descriptor_GetFieldsByCamelcaseName(PyObject* _self,
+ void* closure) {
+ PyUpb_DescriptorBase* self = (void*)_self;
static PyUpb_ByNameMap_Funcs funcs = {
{
- (void *)&upb_msgdef_fieldcount,
- (void *)&upb_msgdef_field,
- (void *)&PyUpb_FieldDescriptor_Get,
+ (void*)&upb_msgdef_fieldcount,
+ (void*)&upb_msgdef_field,
+ (void*)&PyUpb_FieldDescriptor_Get,
},
- (void *)&upb_msgdef_lookupjsonnamez,
- (void *)&upb_fielddef_jsonname,
+ (void*)&upb_msgdef_lookupjsonnamez,
+ (void*)&upb_fielddef_jsonname,
};
return PyUpb_ByNameMap_New(&funcs, self->def, self->pool);
}
-static PyObject *PyUpb_Descriptor_GetFieldsByNumber(PyObject *_self,
- void *closure) {
+static PyObject* PyUpb_Descriptor_GetFieldsByNumber(PyObject* _self,
+ void* closure) {
static PyUpb_ByNumberMap_Funcs funcs = {
{
- (void *)&upb_msgdef_fieldcount,
- (void *)&upb_msgdef_field,
- (void *)&PyUpb_FieldDescriptor_Get,
+ (void*)&upb_msgdef_fieldcount,
+ (void*)&upb_msgdef_field,
+ (void*)&PyUpb_FieldDescriptor_Get,
},
- (void *)&upb_msgdef_itof,
- (void *)&upb_fielddef_number,
+ (void*)&upb_msgdef_itof,
+ (void*)&upb_fielddef_number,
};
- PyUpb_DescriptorBase *self = (void*)_self;
+ PyUpb_DescriptorBase* self = (void*)_self;
return PyUpb_ByNumberMap_New(&funcs, self->def, self->pool);
}
-static PyObject *PyUpb_Descriptor_GetNestedTypes(PyObject *_self, void *closure) {
- PyUpb_DescriptorBase *self = (void*)_self;
+static PyObject* PyUpb_Descriptor_GetNestedTypes(PyObject* _self,
+ void* closure) {
+ PyUpb_DescriptorBase* self = (void*)_self;
static PyUpb_GenericSequence_Funcs funcs = {
- (void*)&upb_msgdef_nestedmsgcount,
- (void*)&upb_msgdef_nestedmsg,
- (void*)&PyUpb_Descriptor_Get,
+ (void*)&upb_msgdef_nestedmsgcount,
+ (void*)&upb_msgdef_nestedmsg,
+ (void*)&PyUpb_Descriptor_Get,
};
return PyUpb_GenericSequence_New(&funcs, self->def, self->pool);
}
-static PyObject *PyUpb_Descriptor_GetNestedTypesByName(PyObject *_self,
- void *closure) {
- PyUpb_DescriptorBase *self = (void*)_self;
+static PyObject* PyUpb_Descriptor_GetNestedTypesByName(PyObject* _self,
+ void* closure) {
+ PyUpb_DescriptorBase* self = (void*)_self;
static PyUpb_ByNameMap_Funcs funcs = {
{
- (void *)&upb_msgdef_nestedmsgcount,
- (void *)&upb_msgdef_nestedmsg,
- (void *)&PyUpb_Descriptor_Get,
+ (void*)&upb_msgdef_nestedmsgcount,
+ (void*)&upb_msgdef_nestedmsg,
+ (void*)&PyUpb_Descriptor_Get,
},
- (void *)&PyUpb_Descriptor_LookupNestedMessage,
- (void *)&upb_msgdef_name,
+ (void*)&PyUpb_Descriptor_LookupNestedMessage,
+ (void*)&upb_msgdef_name,
};
return PyUpb_ByNameMap_New(&funcs, self->def, self->pool);
}
-static PyObject *PyUpb_Descriptor_GetContainingType(PyObject *_self,
- void *closure) {
- PyUpb_DescriptorBase *self = (void*)_self;
- const upb_msgdef *m = self->def;
- const upb_filedef *file = upb_msgdef_file(m);
- const upb_symtab *symtab = upb_filedef_symtab(file);
- const char *full_name = upb_msgdef_fullname(m);
- const char *last_dot = strrchr(full_name, '.');
+static PyObject* PyUpb_Descriptor_GetContainingType(PyObject* _self,
+ void* closure) {
+ // upb does not natively store the lexical parent of a message type, but we
+ // can derive it with some string manipulation and a lookup.
+ PyUpb_DescriptorBase* self = (void*)_self;
+ const upb_msgdef* m = self->def;
+ const upb_filedef* file = upb_msgdef_file(m);
+ const upb_symtab* symtab = upb_filedef_symtab(file);
+ const char* full_name = upb_msgdef_fullname(m);
+ const char* last_dot = strrchr(full_name, '.');
if (!last_dot) Py_RETURN_NONE;
- const upb_msgdef *parent =
+ const upb_msgdef* parent =
upb_symtab_lookupmsg2(symtab, full_name, last_dot - full_name);
if (!parent) Py_RETURN_NONE;
return PyUpb_Descriptor_Get(parent);
}
-static PyObject *PyUpb_Descriptor_GetEnumTypesByName(PyObject *_self,
- void *closure) {
- PyUpb_DescriptorBase *self = (void*)_self;
+static PyObject* PyUpb_Descriptor_GetEnumTypesByName(PyObject* _self,
+ void* closure) {
+ PyUpb_DescriptorBase* self = (void*)_self;
static PyUpb_ByNameMap_Funcs funcs = {
{
- (void *)&upb_msgdef_nestedenumcount,
- (void *)&upb_msgdef_nestedenum,
- (void *)&PyUpb_EnumDescriptor_Get,
+ (void*)&upb_msgdef_nestedenumcount,
+ (void*)&upb_msgdef_nestedenum,
+ (void*)&PyUpb_EnumDescriptor_Get,
},
- (void *)&PyUpb_Descriptor_LookupNestedEnum,
- (void *)&upb_enumdef_name,
+ (void*)&PyUpb_Descriptor_LookupNestedEnum,
+ (void*)&upb_enumdef_name,
};
return PyUpb_ByNameMap_New(&funcs, self->def, self->pool);
}
-/*
-static PyObject *PyUpb_Descriptor_GetEnumValuesByName(PyObject *_self,
- void *closure) {
- PyUpb_DescriptorBase *self = (void*)_self;
- static PyUpb_ByNameMap_Funcs funcs = {
- {
- (void *)&upb_msgdef_nestedenumcount,
- (void *)&upb_msgdef_nestedenum,
- (void *)&PyUpb_EnumDescriptor_Get,
- },
- (void *)&PyUpb_Descriptor_LookupNestedEnumValue,
- (void *)&upb_enumdef_name,
- };
- return PyUpb_ByNameMap_New(&funcs, self->def, self->pool);
-}
-*/
-
-static PyObject *PyUpb_Descriptor_GetIsExtendable(PyObject *_self,
- void *closure) {
- PyUpb_DescriptorBase *self = (void*)_self;
+static PyObject* PyUpb_Descriptor_GetIsExtendable(PyObject* _self,
+ void* closure) {
+ PyUpb_DescriptorBase* self = (void*)_self;
if (upb_msgdef_extrangecount(self->def) > 0) {
Py_RETURN_TRUE;
} else {
@@ -433,61 +437,61 @@
}
}
-static PyObject *PyUpb_Descriptor_GetFullName(PyObject *self, void *closure) {
- const upb_msgdef *msgdef = PyUpb_Descriptor_GetDef(self);
+static PyObject* PyUpb_Descriptor_GetFullName(PyObject* self, void* closure) {
+ const upb_msgdef* msgdef = PyUpb_Descriptor_GetDef(self);
return PyUnicode_FromString(upb_msgdef_fullname(msgdef));
}
-static PyObject *PyUpb_Descriptor_GetConcreteClass(PyObject *self,
- void *closure) {
- const upb_msgdef *msgdef = PyUpb_Descriptor_GetDef(self);
+static PyObject* PyUpb_Descriptor_GetConcreteClass(PyObject* self,
+ void* closure) {
+ const upb_msgdef* msgdef = PyUpb_Descriptor_GetDef(self);
return PyUpb_Descriptor_GetClass(msgdef);
}
-static PyObject *PyUpb_Descriptor_GetFile(PyObject *self, void *closure) {
- const upb_msgdef *msgdef = PyUpb_Descriptor_GetDef(self);
+static PyObject* PyUpb_Descriptor_GetFile(PyObject* self, void* closure) {
+ const upb_msgdef* msgdef = PyUpb_Descriptor_GetDef(self);
return PyUpb_FileDescriptor_Get(upb_msgdef_file(msgdef));
}
-static PyObject *PyUpb_Descriptor_GetFields(PyObject *_self, void *closure) {
- PyUpb_DescriptorBase *self = (void*)_self;
+static PyObject* PyUpb_Descriptor_GetFields(PyObject* _self, void* closure) {
+ PyUpb_DescriptorBase* self = (void*)_self;
static PyUpb_GenericSequence_Funcs funcs = {
- (void*)&upb_msgdef_fieldcount,
- (void*)&upb_msgdef_field,
- (void*)&PyUpb_FieldDescriptor_Get,
+ (void*)&upb_msgdef_fieldcount,
+ (void*)&upb_msgdef_field,
+ (void*)&PyUpb_FieldDescriptor_Get,
};
return PyUpb_GenericSequence_New(&funcs, self->def, self->pool);
}
-static PyObject *PyUpb_Descriptor_GetHasOptions(PyObject *_self,
- void *closure) {
- PyUpb_DescriptorBase *self = (void*)_self;
+static PyObject* PyUpb_Descriptor_GetHasOptions(PyObject* _self,
+ void* closure) {
+ PyUpb_DescriptorBase* self = (void*)_self;
return PyBool_FromLong(upb_msgdef_hasoptions(self->def));
}
-static PyObject *PyUpb_Descriptor_GetName(PyObject *self, void *closure) {
- const upb_msgdef *msgdef = PyUpb_Descriptor_GetDef(self);
+static PyObject* PyUpb_Descriptor_GetName(PyObject* self, void* closure) {
+ const upb_msgdef* msgdef = PyUpb_Descriptor_GetDef(self);
return PyUnicode_FromString(upb_msgdef_name(msgdef));
}
-static PyObject *PyUpb_Descriptor_GetOneofsByName(PyObject *_self,
- void *closure) {
- PyUpb_DescriptorBase *self = (void*)_self;
+static PyObject* PyUpb_Descriptor_GetOneofsByName(PyObject* _self,
+ void* closure) {
+ PyUpb_DescriptorBase* self = (void*)_self;
static PyUpb_ByNameMap_Funcs funcs = {
{
- (void *)&upb_msgdef_oneofcount,
- (void *)&upb_msgdef_oneof,
- (void *)&PyUpb_OneofDescriptor_Get,
+ (void*)&upb_msgdef_oneofcount,
+ (void*)&upb_msgdef_oneof,
+ (void*)&PyUpb_OneofDescriptor_Get,
},
- (void *)&upb_msgdef_ntooz,
- (void *)&upb_oneofdef_name,
+ (void*)&upb_msgdef_ntooz,
+ (void*)&upb_oneofdef_name,
};
return PyUpb_ByNameMap_New(&funcs, self->def, self->pool);
}
-static PyObject* PyUpb_Descriptor_GetSyntax(PyObject *self, void *closure) {
- const upb_msgdef *msgdef = PyUpb_Descriptor_GetDef(self);
- const char *syntax =
+static PyObject* PyUpb_Descriptor_GetSyntax(PyObject* self, void* closure) {
+ const upb_msgdef* msgdef = PyUpb_Descriptor_GetDef(self);
+ const char* syntax =
upb_msgdef_syntax(msgdef) == UPB_SYNTAX_PROTO2 ? "proto2" : "proto3";
return PyUnicode_InternFromString(syntax);
}
@@ -536,22 +540,21 @@
{NULL}};
static PyType_Slot PyUpb_Descriptor_Slots[] = {
- DESCRIPTOR_BASE_SLOTS,
- {Py_tp_methods, PyUpb_Descriptor_Methods},
- {Py_tp_getset, PyUpb_Descriptor_Getters},
- {0, NULL}
-};
+ DESCRIPTOR_BASE_SLOTS,
+ {Py_tp_methods, PyUpb_Descriptor_Methods},
+ {Py_tp_getset, PyUpb_Descriptor_Getters},
+ {0, NULL}};
static PyType_Spec PyUpb_Descriptor_Spec = {
- PYUPB_MODULE_NAME ".Descriptor", // tp_name
- sizeof(PyUpb_DescriptorBase), // tp_basicsize
- 0, // tp_itemsize
- Py_TPFLAGS_DEFAULT, // tp_flags
- PyUpb_Descriptor_Slots,
+ PYUPB_MODULE_NAME ".Descriptor", // tp_name
+ sizeof(PyUpb_DescriptorBase), // tp_basicsize
+ 0, // tp_itemsize
+ Py_TPFLAGS_DEFAULT, // tp_flags
+ PyUpb_Descriptor_Slots,
};
-const upb_msgdef *PyUpb_Descriptor_GetDef(PyObject *_self) {
- PyUpb_DescriptorBase *self =
+const upb_msgdef* PyUpb_Descriptor_GetDef(PyObject* _self) {
+ PyUpb_DescriptorBase* self =
PyUpb_DescriptorBase_Check(_self, kPyUpb_Descriptor);
return self ? self->def : NULL;
}
@@ -560,97 +563,98 @@
// EnumDescriptor
// -----------------------------------------------------------------------------
-PyObject *PyUpb_EnumDescriptor_Get(const upb_enumdef *enumdef) {
- const upb_filedef *file = upb_enumdef_file(enumdef);
+PyObject* PyUpb_EnumDescriptor_Get(const upb_enumdef* enumdef) {
+ const upb_filedef* file = upb_enumdef_file(enumdef);
return PyUpb_DescriptorBase_Get(kPyUpb_EnumDescriptor, enumdef, file);
}
-const upb_enumdef *PyUpb_EnumDescriptor_GetDef(PyObject *_self) {
- PyUpb_DescriptorBase *self =
+const upb_enumdef* PyUpb_EnumDescriptor_GetDef(PyObject* _self) {
+ PyUpb_DescriptorBase* self =
PyUpb_DescriptorBase_Check(_self, kPyUpb_EnumDescriptor);
return self ? self->def : NULL;
}
-static PyObject *PyUpb_EnumDescriptor_GetFullName(PyObject *self,
- void *closure) {
- const upb_enumdef *enumdef = PyUpb_EnumDescriptor_GetDef(self);
+static PyObject* PyUpb_EnumDescriptor_GetFullName(PyObject* self,
+ void* closure) {
+ const upb_enumdef* enumdef = PyUpb_EnumDescriptor_GetDef(self);
return PyUnicode_FromString(upb_enumdef_fullname(enumdef));
}
-static PyObject *PyUpb_EnumDescriptor_GetName(PyObject *self, void *closure) {
- const upb_enumdef *enumdef = PyUpb_EnumDescriptor_GetDef(self);
+static PyObject* PyUpb_EnumDescriptor_GetName(PyObject* self, void* closure) {
+ const upb_enumdef* enumdef = PyUpb_EnumDescriptor_GetDef(self);
return PyUnicode_FromString(upb_enumdef_name(enumdef));
}
-static PyObject *PyUpb_EnumDescriptor_GetFile(PyObject *self, void *closure) {
- const upb_enumdef *enumdef = PyUpb_EnumDescriptor_GetDef(self);
+static PyObject* PyUpb_EnumDescriptor_GetFile(PyObject* self, void* closure) {
+ const upb_enumdef* enumdef = PyUpb_EnumDescriptor_GetDef(self);
return PyUpb_FileDescriptor_Get(upb_enumdef_file(enumdef));
}
-static PyObject *PyUpb_EnumDescriptor_GetValues(PyObject *_self,
- void *closure) {
- PyUpb_DescriptorBase *self = (void *)_self;
+static PyObject* PyUpb_EnumDescriptor_GetValues(PyObject* _self,
+ void* closure) {
+ PyUpb_DescriptorBase* self = (void*)_self;
static PyUpb_GenericSequence_Funcs funcs = {
- (void *)&upb_enumdef_valuecount,
- (void *)&upb_enumdef_value,
- (void *)&PyUpb_EnumValueDescriptor_Get,
+ (void*)&upb_enumdef_valuecount,
+ (void*)&upb_enumdef_value,
+ (void*)&PyUpb_EnumValueDescriptor_Get,
};
return PyUpb_GenericSequence_New(&funcs, self->def, self->pool);
}
-static PyObject *PyUpb_EnumDescriptor_GetValuesByName(PyObject *_self,
- void *closure) {
+static PyObject* PyUpb_EnumDescriptor_GetValuesByName(PyObject* _self,
+ void* closure) {
static PyUpb_ByNameMap_Funcs funcs = {
{
- (void *)&upb_enumdef_valuecount,
- (void *)&upb_enumdef_value,
- (void *)&PyUpb_EnumValueDescriptor_Get,
+ (void*)&upb_enumdef_valuecount,
+ (void*)&upb_enumdef_value,
+ (void*)&PyUpb_EnumValueDescriptor_Get,
},
- (void *)&upb_enumdef_lookupnamez,
- (void *)&upb_enumvaldef_name,
+ (void*)&upb_enumdef_lookupnamez,
+ (void*)&upb_enumvaldef_name,
};
- PyUpb_DescriptorBase *self = (void*)_self;
+ PyUpb_DescriptorBase* self = (void*)_self;
return PyUpb_ByNameMap_New(&funcs, self->def, self->pool);
}
-static PyObject *PyUpb_EnumDescriptor_GetValuesByNumber(PyObject *_self,
- void *closure) {
+static PyObject* PyUpb_EnumDescriptor_GetValuesByNumber(PyObject* _self,
+ void* closure) {
static PyUpb_ByNumberMap_Funcs funcs = {
{
- (void *)&upb_enumdef_valuecount,
- (void *)&upb_enumdef_value,
- (void *)&PyUpb_EnumValueDescriptor_Get,
+ (void*)&upb_enumdef_valuecount,
+ (void*)&upb_enumdef_value,
+ (void*)&PyUpb_EnumValueDescriptor_Get,
},
- (void *)&upb_enumdef_lookupnum,
- (void *)&upb_enumvaldef_number,
+ (void*)&upb_enumdef_lookupnum,
+ (void*)&upb_enumvaldef_number,
};
- PyUpb_DescriptorBase *self = (void*)_self;
+ PyUpb_DescriptorBase* self = (void*)_self;
return PyUpb_ByNumberMap_New(&funcs, self->def, self->pool);
}
-static PyObject *PyUpb_EnumDescriptor_GetContainingType(PyObject *_self,
- void *closure) {
- PyUpb_DescriptorBase *self = (void *)_self;
+static PyObject* PyUpb_EnumDescriptor_GetContainingType(PyObject* _self,
+ void* closure) {
+ PyUpb_DescriptorBase* self = (void*)_self;
return PyUpb_Descriptor_Get(upb_enumdef_containingtype(self->def));
}
-static PyObject *PyUpb_EnumDescriptor_GetHasOptions(PyObject *_self,
- void *closure) {
- PyUpb_DescriptorBase *self = (void*)_self;
+static PyObject* PyUpb_EnumDescriptor_GetHasOptions(PyObject* _self,
+ void* closure) {
+ PyUpb_DescriptorBase* self = (void*)_self;
return PyBool_FromLong(upb_enumdef_hasoptions(self->def));
}
-static PyObject* PyUpb_EnumDescriptor_GetOptions(PyObject* _self, PyObject* args) {
- PyUpb_DescriptorBase *self = (void *)_self;
+static PyObject* PyUpb_EnumDescriptor_GetOptions(PyObject* _self,
+ PyObject* args) {
+ PyUpb_DescriptorBase* self = (void*)_self;
return PyUpb_DescriptorBase_GetOptions(self, upb_enumdef_options(self->def),
&google_protobuf_EnumOptions_msginit,
"google.protobuf.EnumOptions");
}
-static PyObject *PyUpb_EnumDescriptor_CopyToProto(PyObject *_self,
- PyObject *py_proto) {
+static PyObject* PyUpb_EnumDescriptor_CopyToProto(PyObject* _self,
+ PyObject* py_proto) {
return PyUpb_DescriptorBase_CopyToProto(
- _self, (PyUpb_ToProto_Func *)&upb_EnumDef_ToProto,
+ _self, (PyUpb_ToProto_Func*)&upb_EnumDef_ToProto,
&google_protobuf_EnumDescriptorProto_msginit, py_proto);
}
@@ -669,59 +673,68 @@
{NULL}};
static PyMethodDef PyUpb_EnumDescriptor_Methods[] = {
- { "GetOptions", PyUpb_EnumDescriptor_GetOptions, METH_NOARGS, },
- { "CopyToProto", PyUpb_EnumDescriptor_CopyToProto, METH_O, },
- {NULL}
-};
+ {
+ "GetOptions",
+ PyUpb_EnumDescriptor_GetOptions,
+ METH_NOARGS,
+ },
+ {
+ "CopyToProto",
+ PyUpb_EnumDescriptor_CopyToProto,
+ METH_O,
+ },
+ {NULL}};
static PyType_Slot PyUpb_EnumDescriptor_Slots[] = {
- DESCRIPTOR_BASE_SLOTS,
- {Py_tp_methods, PyUpb_EnumDescriptor_Methods},
- {Py_tp_getset, PyUpb_EnumDescriptor_Getters},
- {0, NULL}
-};
+ DESCRIPTOR_BASE_SLOTS,
+ {Py_tp_methods, PyUpb_EnumDescriptor_Methods},
+ {Py_tp_getset, PyUpb_EnumDescriptor_Getters},
+ {0, NULL}};
static PyType_Spec PyUpb_EnumDescriptor_Spec = {
- PYUPB_MODULE_NAME ".EnumDescriptor", // tp_name
- sizeof(PyUpb_DescriptorBase), // tp_basicsize
- 0, // tp_itemsize
- Py_TPFLAGS_DEFAULT, // tp_flags
- PyUpb_EnumDescriptor_Slots,
+ PYUPB_MODULE_NAME ".EnumDescriptor", // tp_name
+ sizeof(PyUpb_DescriptorBase), // tp_basicsize
+ 0, // tp_itemsize
+ Py_TPFLAGS_DEFAULT, // tp_flags
+ PyUpb_EnumDescriptor_Slots,
};
// -----------------------------------------------------------------------------
// EnumValueDescriptor
// -----------------------------------------------------------------------------
-PyObject *PyUpb_EnumValueDescriptor_Get(const upb_enumvaldef *ev) {
- const upb_filedef *file = upb_enumdef_file(upb_enumvaldef_enum(ev));
+PyObject* PyUpb_EnumValueDescriptor_Get(const upb_enumvaldef* ev) {
+ const upb_filedef* file = upb_enumdef_file(upb_enumvaldef_enum(ev));
return PyUpb_DescriptorBase_Get(kPyUpb_EnumValueDescriptor, ev, file);
}
-static PyObject *PyUpb_EnumValueDescriptor_GetName(PyObject *self, void *closure) {
- PyUpb_DescriptorBase *base = (PyUpb_DescriptorBase*)self;
+static PyObject* PyUpb_EnumValueDescriptor_GetName(PyObject* self,
+ void* closure) {
+ PyUpb_DescriptorBase* base = (PyUpb_DescriptorBase*)self;
return PyUnicode_FromString(upb_enumvaldef_name(base->def));
}
-static PyObject *PyUpb_EnumValueDescriptor_GetNumber(PyObject *self, void *closure) {
- PyUpb_DescriptorBase *base = (PyUpb_DescriptorBase*)self;
+static PyObject* PyUpb_EnumValueDescriptor_GetNumber(PyObject* self,
+ void* closure) {
+ PyUpb_DescriptorBase* base = (PyUpb_DescriptorBase*)self;
return PyLong_FromLong(upb_enumvaldef_number(base->def));
}
-static PyObject *PyUpb_EnumValueDescriptor_GetType(PyObject *self, void *closure) {
- PyUpb_DescriptorBase *base = (PyUpb_DescriptorBase*)self;
+static PyObject* PyUpb_EnumValueDescriptor_GetType(PyObject* self,
+ void* closure) {
+ PyUpb_DescriptorBase* base = (PyUpb_DescriptorBase*)self;
return PyUpb_EnumDescriptor_Get(upb_enumvaldef_enum(base->def));
}
-static PyObject *PyUpb_EnumValueDescriptor_GetHasOptions(PyObject *_self,
- void *closure) {
- PyUpb_DescriptorBase *self = (void *)_self;
+static PyObject* PyUpb_EnumValueDescriptor_GetHasOptions(PyObject* _self,
+ void* closure) {
+ PyUpb_DescriptorBase* self = (void*)_self;
return PyBool_FromLong(upb_enumvaldef_hasoptions(self->def));
}
-static PyObject *PyUpb_EnumValueDescriptor_GetOptions(PyObject *_self,
- PyObject *args) {
- PyUpb_DescriptorBase *self = (void *)_self;
+static PyObject* PyUpb_EnumValueDescriptor_GetOptions(PyObject* _self,
+ PyObject* args) {
+ PyUpb_DescriptorBase* self = (void*)_self;
return PyUpb_DescriptorBase_GetOptions(
self, upb_enumvaldef_options(self->def),
&google_protobuf_EnumValueOptions_msginit,
@@ -738,64 +751,66 @@
{NULL}};
static PyMethodDef PyUpb_EnumValueDescriptor_Methods[] = {
- { "GetOptions", PyUpb_EnumValueDescriptor_GetOptions, METH_NOARGS, },
- {NULL}
-};
+ {
+ "GetOptions",
+ PyUpb_EnumValueDescriptor_GetOptions,
+ METH_NOARGS,
+ },
+ {NULL}};
static PyType_Slot PyUpb_EnumValueDescriptor_Slots[] = {
- DESCRIPTOR_BASE_SLOTS,
- {Py_tp_methods, PyUpb_EnumValueDescriptor_Methods},
- {Py_tp_getset, PyUpb_EnumValueDescriptor_Getters},
- {0, NULL}
-};
+ DESCRIPTOR_BASE_SLOTS,
+ {Py_tp_methods, PyUpb_EnumValueDescriptor_Methods},
+ {Py_tp_getset, PyUpb_EnumValueDescriptor_Getters},
+ {0, NULL}};
static PyType_Spec PyUpb_EnumValueDescriptor_Spec = {
- PYUPB_MODULE_NAME ".EnumValueDescriptor", // tp_name
- sizeof(PyUpb_DescriptorBase), // tp_basicsize
- 0, // tp_itemsize
- Py_TPFLAGS_DEFAULT, // tp_flags
- PyUpb_EnumValueDescriptor_Slots,
+ PYUPB_MODULE_NAME ".EnumValueDescriptor", // tp_name
+ sizeof(PyUpb_DescriptorBase), // tp_basicsize
+ 0, // tp_itemsize
+ Py_TPFLAGS_DEFAULT, // tp_flags
+ PyUpb_EnumValueDescriptor_Slots,
};
// -----------------------------------------------------------------------------
// FieldDescriptor
// -----------------------------------------------------------------------------
-const upb_fielddef *PyUpb_FieldDescriptor_GetDef(PyObject *_self) {
- PyUpb_DescriptorBase *self =
+const upb_fielddef* PyUpb_FieldDescriptor_GetDef(PyObject* _self) {
+ PyUpb_DescriptorBase* self =
PyUpb_DescriptorBase_Check(_self, kPyUpb_FieldDescriptor);
return self ? self->def : NULL;
}
-PyObject *PyUpb_FieldDescriptor_Get(const upb_fielddef *field) {
- const upb_filedef *file = upb_fielddef_file(field);
+PyObject* PyUpb_FieldDescriptor_Get(const upb_fielddef* field) {
+ const upb_filedef* file = upb_fielddef_file(field);
return PyUpb_DescriptorBase_Get(kPyUpb_FieldDescriptor, field, file);
}
-static PyObject *PyUpb_FieldDescriptor_GetFullName(PyUpb_DescriptorBase *self,
- void *closure) {
+static PyObject* PyUpb_FieldDescriptor_GetFullName(PyUpb_DescriptorBase* self,
+ void* closure) {
return PyUnicode_FromString(upb_fielddef_fullname(self->def));
}
-static PyObject *PyUpb_FieldDescriptor_GetName(PyUpb_DescriptorBase *self,
- void *closure) {
+static PyObject* PyUpb_FieldDescriptor_GetName(PyUpb_DescriptorBase* self,
+ void* closure) {
return PyUnicode_FromString(upb_fielddef_name(self->def));
}
-static PyObject *PyUpb_FieldDescriptor_GetCamelcaseName(
- PyUpb_DescriptorBase *self, void *closure) {
+static PyObject* PyUpb_FieldDescriptor_GetCamelcaseName(
+ PyUpb_DescriptorBase* self, void* closure) {
// TODO: Ok to use jsonname here?
return PyUnicode_FromString(upb_fielddef_jsonname(self->def));
}
-static PyObject *PyUpb_FieldDescriptor_GetJsonName(PyUpb_DescriptorBase *self,
- void *closure) {
+static PyObject* PyUpb_FieldDescriptor_GetJsonName(PyUpb_DescriptorBase* self,
+ void* closure) {
return PyUnicode_FromString(upb_fielddef_jsonname(self->def));
}
-static PyObject *PyUpb_FieldDescriptor_GetFile(PyUpb_DescriptorBase *self,
- void *closure) {
- const upb_filedef *file = upb_fielddef_file(self->def);
+static PyObject* PyUpb_FieldDescriptor_GetFile(PyUpb_DescriptorBase* self,
+ void* closure) {
+ const upb_filedef* file = upb_fielddef_file(self->def);
if (file) {
return PyUpb_FileDescriptor_Get(file);
} else {
@@ -803,40 +818,40 @@
}
}
-static PyObject *PyUpb_FieldDescriptor_GetType(PyUpb_DescriptorBase *self,
- void *closure) {
+static PyObject* PyUpb_FieldDescriptor_GetType(PyUpb_DescriptorBase* self,
+ void* closure) {
return PyLong_FromLong(upb_fielddef_descriptortype(self->def));
}
-static PyObject *PyUpb_FieldDescriptor_GetCppType(PyUpb_DescriptorBase *self,
- void *closure) {
+static PyObject* PyUpb_FieldDescriptor_GetCppType(PyUpb_DescriptorBase* self,
+ void* closure) {
static const uint8_t cpp_types[] = {-1, 7, 6, 1, 3, 8, 10, 5, 2, 4, 9, 9};
return PyLong_FromLong(cpp_types[upb_fielddef_type(self->def)]);
}
-static PyObject *PyUpb_FieldDescriptor_GetLabel(PyUpb_DescriptorBase *self,
- void *closure) {
+static PyObject* PyUpb_FieldDescriptor_GetLabel(PyUpb_DescriptorBase* self,
+ void* closure) {
return PyLong_FromLong(upb_fielddef_label(self->def));
}
-static PyObject *PyUpb_FieldDescriptor_GetIsExtension(
- PyUpb_DescriptorBase *self, void *closure) {
+static PyObject* PyUpb_FieldDescriptor_GetIsExtension(
+ PyUpb_DescriptorBase* self, void* closure) {
return PyBool_FromLong(upb_fielddef_isextension(self->def));
}
-static PyObject *PyUpb_FieldDescriptor_GetNumber(PyUpb_DescriptorBase *self,
- void *closure) {
+static PyObject* PyUpb_FieldDescriptor_GetNumber(PyUpb_DescriptorBase* self,
+ void* closure) {
return PyLong_FromLong(upb_fielddef_number(self->def));
}
-static PyObject *PyUpb_FieldDescriptor_GetIndex(PyUpb_DescriptorBase *self,
- void *closure) {
+static PyObject* PyUpb_FieldDescriptor_GetIndex(PyUpb_DescriptorBase* self,
+ void* closure) {
return PyLong_FromLong(upb_fielddef_index(self->def));
}
-static PyObject *PyUpb_FieldDescriptor_GetMessageType(
- PyUpb_DescriptorBase *self, void *closure) {
- const upb_msgdef *subdef = upb_fielddef_msgsubdef(self->def);
+static PyObject* PyUpb_FieldDescriptor_GetMessageType(
+ PyUpb_DescriptorBase* self, void* closure) {
+ const upb_msgdef* subdef = upb_fielddef_msgsubdef(self->def);
if (subdef) {
return PyUpb_Descriptor_Get(subdef);
} else {
@@ -844,9 +859,9 @@
}
}
-static PyObject *PyUpb_FieldDescriptor_GetEnumType(
- PyUpb_DescriptorBase *self, void *closure) {
- const upb_enumdef *enumdef = upb_fielddef_enumsubdef(self->def);
+static PyObject* PyUpb_FieldDescriptor_GetEnumType(PyUpb_DescriptorBase* self,
+ void* closure) {
+ const upb_enumdef* enumdef = upb_fielddef_enumsubdef(self->def);
if (enumdef) {
return PyUpb_EnumDescriptor_Get(enumdef);
} else {
@@ -854,9 +869,9 @@
}
}
-static PyObject *PyUpb_FieldDescriptor_GetContainingType(
- PyUpb_DescriptorBase *self, void *closure) {
- const upb_msgdef *m = upb_fielddef_containingtype(self->def);
+static PyObject* PyUpb_FieldDescriptor_GetContainingType(
+ PyUpb_DescriptorBase* self, void* closure) {
+ const upb_msgdef* m = upb_fielddef_containingtype(self->def);
if (m) {
return PyUpb_Descriptor_Get(m);
} else {
@@ -864,22 +879,22 @@
}
}
-static PyObject *PyUpb_FieldDescriptor_HasDefaultValue(
- PyUpb_DescriptorBase *self, void *closure) {
+static PyObject* PyUpb_FieldDescriptor_HasDefaultValue(
+ PyUpb_DescriptorBase* self, void* closure) {
return PyBool_FromLong(upb_fielddef_hasdefault(self->def));
}
-static PyObject *PyUpb_FieldDescriptor_GetDefaultValue(
- PyUpb_DescriptorBase *self, void *closure) {
- const upb_fielddef *f = self->def;
+static PyObject* PyUpb_FieldDescriptor_GetDefaultValue(
+ PyUpb_DescriptorBase* self, void* closure) {
+ const upb_fielddef* f = self->def;
if (upb_fielddef_isseq(f)) return PyList_New(0);
if (upb_fielddef_issubmsg(f)) Py_RETURN_NONE;
return PyUpb_UpbToPy(upb_fielddef_default(self->def), self->def, NULL);
}
-
-static PyObject *PyUpb_FieldDescriptor_GetContainingOneof(
- PyUpb_DescriptorBase *self, void *closure) {
- const upb_oneofdef *oneof = upb_fielddef_containingoneof(self->def);
+
+static PyObject* PyUpb_FieldDescriptor_GetContainingOneof(
+ PyUpb_DescriptorBase* self, void* closure) {
+ const upb_oneofdef* oneof = upb_fielddef_containingoneof(self->def);
if (oneof) {
return PyUpb_OneofDescriptor_Get(oneof);
} else {
@@ -887,15 +902,15 @@
}
}
-static PyObject *PyUpb_FieldDescriptor_GetHasOptions(
- PyUpb_DescriptorBase *_self, void *closure) {
- PyUpb_DescriptorBase *self = (void *)_self;
+static PyObject* PyUpb_FieldDescriptor_GetHasOptions(
+ PyUpb_DescriptorBase* _self, void* closure) {
+ PyUpb_DescriptorBase* self = (void*)_self;
return PyBool_FromLong(upb_fielddef_hasoptions(self->def));
}
-static PyObject *PyUpb_FieldDescriptor_GetOptions(PyObject *_self,
- PyObject *args) {
- PyUpb_DescriptorBase *self = (void *)_self;
+static PyObject* PyUpb_FieldDescriptor_GetOptions(PyObject* _self,
+ PyObject* args) {
+ PyUpb_DescriptorBase* self = (void*)_self;
return PyUpb_DescriptorBase_GetOptions(self, upb_fielddef_options(self->def),
&google_protobuf_FieldOptions_msginit,
"google.protobuf.FieldOptions");
@@ -918,7 +933,6 @@
{"has_default_value", (getter)PyUpb_FieldDescriptor_HasDefaultValue},
{"is_extension", (getter)PyUpb_FieldDescriptor_GetIsExtension, NULL, "ID"},
//{ "id", (getter)GetID, NULL, "ID"},
- //{ "_cdescriptor", (getter)GetCDescriptor, NULL, "HAACK REMOVE ME"},
{"message_type", (getter)PyUpb_FieldDescriptor_GetMessageType, NULL,
"Message type"},
{"enum_type", (getter)PyUpb_FieldDescriptor_GetEnumType, NULL, "Enum type"},
@@ -936,7 +950,11 @@
{NULL}};
static PyMethodDef PyUpb_FieldDescriptor_Methods[] = {
- { "GetOptions", PyUpb_FieldDescriptor_GetOptions, METH_NOARGS, },
+ {
+ "GetOptions",
+ PyUpb_FieldDescriptor_GetOptions,
+ METH_NOARGS,
+ },
{NULL}};
static PyType_Slot PyUpb_FieldDescriptor_Slots[] = {
@@ -957,7 +975,7 @@
// FileDescriptor
// -----------------------------------------------------------------------------
-PyObject *PyUpb_FileDescriptor_Get(const upb_filedef *file) {
+PyObject* PyUpb_FileDescriptor_Get(const upb_filedef* file) {
return PyUpb_DescriptorBase_Get(kPyUpb_FileDescriptor, file, file);
}
@@ -965,17 +983,17 @@
// symtab's hash table. This works for Python because everything happens under
// the GIL, but in general the caller has to guarantee that the symtab is not
// being mutated concurrently.
-typedef const void *PyUpb_FileDescriptor_LookupFunc(const upb_symtab *,
- const char *);
+typedef const void* PyUpb_FileDescriptor_LookupFunc(const upb_symtab*,
+ const char*);
-static const void *PyUpb_FileDescriptor_NestedLookup(
- const upb_filedef *filedef, const char *name,
- PyUpb_FileDescriptor_LookupFunc *func) {
- const upb_symtab *symtab = upb_filedef_symtab(filedef);
- const char *package = upb_filedef_package(filedef);
+static const void* PyUpb_FileDescriptor_NestedLookup(
+ const upb_filedef* filedef, const char* name,
+ PyUpb_FileDescriptor_LookupFunc* func) {
+ const upb_symtab* symtab = upb_filedef_symtab(filedef);
+ const char* package = upb_filedef_package(filedef);
if (package) {
- PyObject *qname = PyUnicode_FromFormat("%s.%s", package, name);
- const void *ret = func(symtab, PyUnicode_AsUTF8AndSize(qname, NULL));
+ PyObject* qname = PyUnicode_FromFormat("%s.%s", package, name);
+ const void* ret = func(symtab, PyUnicode_AsUTF8AndSize(qname, NULL));
Py_DECREF(qname);
return ret;
} else {
@@ -983,155 +1001,155 @@
}
}
-static const void *PyUpb_FileDescriptor_LookupMessage(
- const upb_filedef *filedef, const char *name) {
+static const void* PyUpb_FileDescriptor_LookupMessage(
+ const upb_filedef* filedef, const char* name) {
return PyUpb_FileDescriptor_NestedLookup(filedef, name,
- (void *)&upb_symtab_lookupmsg);
+ (void*)&upb_symtab_lookupmsg);
}
-static const void *PyUpb_FileDescriptor_LookupEnum(const upb_filedef *filedef,
- const char *name) {
+static const void* PyUpb_FileDescriptor_LookupEnum(const upb_filedef* filedef,
+ const char* name) {
return PyUpb_FileDescriptor_NestedLookup(filedef, name,
(void*)&upb_symtab_lookupenum);
}
-static const void *PyUpb_FileDescriptor_LookupExtension(
- const upb_filedef *filedef, const char *name) {
+static const void* PyUpb_FileDescriptor_LookupExtension(
+ const upb_filedef* filedef, const char* name) {
return PyUpb_FileDescriptor_NestedLookup(filedef, name,
(void*)&upb_symtab_lookupext);
}
-static const void *PyUpb_FileDescriptor_LookupService(
- const upb_filedef *filedef, const char *name) {
+static const void* PyUpb_FileDescriptor_LookupService(
+ const upb_filedef* filedef, const char* name) {
return PyUpb_FileDescriptor_NestedLookup(filedef, name,
(void*)&upb_symtab_lookupservice);
}
-static PyObject *PyUpb_FileDescriptor_GetName(PyUpb_DescriptorBase *self,
- void *closure) {
+static PyObject* PyUpb_FileDescriptor_GetName(PyUpb_DescriptorBase* self,
+ void* closure) {
return PyUnicode_FromString(upb_filedef_name(self->def));
}
-static PyObject *PyUpb_FileDescriptor_GetPool(PyObject *_self, void *closure) {
- PyUpb_DescriptorBase *self = (PyUpb_DescriptorBase *)_self;
+static PyObject* PyUpb_FileDescriptor_GetPool(PyObject* _self, void* closure) {
+ PyUpb_DescriptorBase* self = (PyUpb_DescriptorBase*)_self;
Py_INCREF(self->pool);
return self->pool;
}
-static PyObject *PyUpb_FileDescriptor_GetPackage(PyObject *_self,
- void *closure) {
- PyUpb_DescriptorBase *self = (PyUpb_DescriptorBase*)_self;
+static PyObject* PyUpb_FileDescriptor_GetPackage(PyObject* _self,
+ void* closure) {
+ PyUpb_DescriptorBase* self = (PyUpb_DescriptorBase*)_self;
return PyUnicode_FromString(upb_filedef_package(self->def));
}
-static PyObject *PyUpb_FileDescriptor_GetMessageTypesByName(PyObject *_self,
- void *closure) {
+static PyObject* PyUpb_FileDescriptor_GetMessageTypesByName(PyObject* _self,
+ void* closure) {
static PyUpb_ByNameMap_Funcs funcs = {
{
- (void *)&upb_filedef_toplvlmsgcount,
- (void *)&upb_filedef_toplvlmsg,
- (void *)&PyUpb_Descriptor_Get,
+ (void*)&upb_filedef_toplvlmsgcount,
+ (void*)&upb_filedef_toplvlmsg,
+ (void*)&PyUpb_Descriptor_Get,
},
- (void *)&PyUpb_FileDescriptor_LookupMessage,
- (void *)&upb_msgdef_name,
+ (void*)&PyUpb_FileDescriptor_LookupMessage,
+ (void*)&upb_msgdef_name,
};
- PyUpb_DescriptorBase *self = (void*)_self;
+ PyUpb_DescriptorBase* self = (void*)_self;
return PyUpb_ByNameMap_New(&funcs, self->def, self->pool);
}
-static PyObject *PyUpb_FileDescriptor_GetEnumTypesByName(PyObject *_self,
- void *closure) {
+static PyObject* PyUpb_FileDescriptor_GetEnumTypesByName(PyObject* _self,
+ void* closure) {
static PyUpb_ByNameMap_Funcs funcs = {
{
- (void *)&upb_filedef_toplvlenumcount,
- (void *)&upb_filedef_toplvlenum,
- (void *)&PyUpb_EnumDescriptor_Get,
+ (void*)&upb_filedef_toplvlenumcount,
+ (void*)&upb_filedef_toplvlenum,
+ (void*)&PyUpb_EnumDescriptor_Get,
},
- (void *)&PyUpb_FileDescriptor_LookupEnum,
- (void *)&upb_enumdef_name,
+ (void*)&PyUpb_FileDescriptor_LookupEnum,
+ (void*)&upb_enumdef_name,
};
- PyUpb_DescriptorBase *self = (void*)_self;
+ PyUpb_DescriptorBase* self = (void*)_self;
return PyUpb_ByNameMap_New(&funcs, self->def, self->pool);
}
-static PyObject *PyUpb_FileDescriptor_GetExtensionsByName(PyObject *_self,
- void *closure) {
+static PyObject* PyUpb_FileDescriptor_GetExtensionsByName(PyObject* _self,
+ void* closure) {
static PyUpb_ByNameMap_Funcs funcs = {
{
- (void *)&upb_filedef_toplvlextcount,
- (void *)&upb_filedef_toplvlext,
- (void *)&PyUpb_FieldDescriptor_Get,
+ (void*)&upb_filedef_toplvlextcount,
+ (void*)&upb_filedef_toplvlext,
+ (void*)&PyUpb_FieldDescriptor_Get,
},
- (void *)&PyUpb_FileDescriptor_LookupExtension,
- (void *)&upb_fielddef_name,
+ (void*)&PyUpb_FileDescriptor_LookupExtension,
+ (void*)&upb_fielddef_name,
};
- PyUpb_DescriptorBase *self = (void*)_self;
+ PyUpb_DescriptorBase* self = (void*)_self;
return PyUpb_ByNameMap_New(&funcs, self->def, self->pool);
}
-static PyObject *PyUpb_FileDescriptor_GetServicesByName(PyObject *_self,
- void *closure) {
+static PyObject* PyUpb_FileDescriptor_GetServicesByName(PyObject* _self,
+ void* closure) {
static PyUpb_ByNameMap_Funcs funcs = {
{
- (void *)&upb_filedef_servicecount,
- (void *)&upb_filedef_service,
- (void *)&PyUpb_ServiceDescriptor_Get,
+ (void*)&upb_filedef_servicecount,
+ (void*)&upb_filedef_service,
+ (void*)&PyUpb_ServiceDescriptor_Get,
},
- (void *)&PyUpb_FileDescriptor_LookupService,
- (void *)&upb_servicedef_name,
+ (void*)&PyUpb_FileDescriptor_LookupService,
+ (void*)&upb_servicedef_name,
};
- PyUpb_DescriptorBase *self = (void*)_self;
+ PyUpb_DescriptorBase* self = (void*)_self;
return PyUpb_ByNameMap_New(&funcs, self->def, self->pool);
}
-static PyObject *PyUpb_FileDescriptor_GetDependencies(PyObject *_self,
- void *closure) {
- PyUpb_DescriptorBase *self = (void*)_self;
+static PyObject* PyUpb_FileDescriptor_GetDependencies(PyObject* _self,
+ void* closure) {
+ PyUpb_DescriptorBase* self = (void*)_self;
static PyUpb_GenericSequence_Funcs funcs = {
- (void *)&upb_filedef_depcount,
- (void *)&upb_filedef_dep,
- (void *)&PyUpb_FileDescriptor_Get,
+ (void*)&upb_filedef_depcount,
+ (void*)&upb_filedef_dep,
+ (void*)&PyUpb_FileDescriptor_Get,
};
return PyUpb_GenericSequence_New(&funcs, self->def, self->pool);
}
-static PyObject *PyUpb_FileDescriptor_GetPublicDependencies(PyObject *_self,
- void *closure) {
- PyUpb_DescriptorBase *self = (void*)_self;
+static PyObject* PyUpb_FileDescriptor_GetPublicDependencies(PyObject* _self,
+ void* closure) {
+ PyUpb_DescriptorBase* self = (void*)_self;
static PyUpb_GenericSequence_Funcs funcs = {
- (void *)&upb_filedef_publicdepcount,
- (void *)&upb_filedef_publicdep,
- (void *)&PyUpb_FileDescriptor_Get,
+ (void*)&upb_filedef_publicdepcount,
+ (void*)&upb_filedef_publicdep,
+ (void*)&PyUpb_FileDescriptor_Get,
};
return PyUpb_GenericSequence_New(&funcs, self->def, self->pool);
}
-static PyObject *PyUpb_FileDescriptor_GetSyntax(PyObject *_self,
- void *closure) {
- PyUpb_DescriptorBase *self = (void *)_self;
- const char *syntax =
+static PyObject* PyUpb_FileDescriptor_GetSyntax(PyObject* _self,
+ void* closure) {
+ PyUpb_DescriptorBase* self = (void*)_self;
+ const char* syntax =
upb_filedef_syntax(self->def) == UPB_SYNTAX_PROTO2 ? "proto2" : "proto3";
return PyUnicode_FromString(syntax);
}
-static PyObject *PyUpb_FileDescriptor_GetHasOptions(PyObject *_self,
- void *closure) {
- PyUpb_DescriptorBase *self = (void *)_self;
+static PyObject* PyUpb_FileDescriptor_GetHasOptions(PyObject* _self,
+ void* closure) {
+ PyUpb_DescriptorBase* self = (void*)_self;
return PyBool_FromLong(upb_filedef_hasoptions(self->def));
}
-static PyObject *PyUpb_FileDescriptor_GetOptions(PyObject *_self,
- PyObject *args) {
- PyUpb_DescriptorBase *self = (void *)_self;
+static PyObject* PyUpb_FileDescriptor_GetOptions(PyObject* _self,
+ PyObject* args) {
+ PyUpb_DescriptorBase* self = (void*)_self;
return PyUpb_DescriptorBase_GetOptions(self, upb_filedef_options(self->def),
&google_protobuf_FileOptions_msginit,
"google.protobuf.FileOptions");
}
-static PyObject *PyUpb_FileDescriptor_CopyToProto(PyObject *_self,
- PyObject *py_proto) {
+static PyObject* PyUpb_FileDescriptor_CopyToProto(PyObject* _self,
+ PyObject* py_proto) {
return PyUpb_DescriptorBase_CopyToProto(
- _self, (PyUpb_ToProto_Func *)&upb_FileDef_ToProto,
+ _self, (PyUpb_ToProto_Func*)&upb_FileDef_ToProto,
&google_protobuf_FileDescriptorProto_msginit, py_proto);
}
@@ -1175,8 +1193,8 @@
PyUpb_FileDescriptor_Slots,
};
-const upb_filedef *PyUpb_FileDescriptor_GetDef(PyObject *_self) {
- PyUpb_DescriptorBase *self =
+const upb_filedef* PyUpb_FileDescriptor_GetDef(PyObject* _self) {
+ PyUpb_DescriptorBase* self =
PyUpb_DescriptorBase_Check(_self, kPyUpb_FileDescriptor);
return self ? self->def : NULL;
}
@@ -1185,57 +1203,58 @@
// MethodDescriptor
// -----------------------------------------------------------------------------
-const upb_methoddef *PyUpb_MethodDescriptor_GetDef(PyObject *_self) {
- PyUpb_DescriptorBase *self =
+const upb_methoddef* PyUpb_MethodDescriptor_GetDef(PyObject* _self) {
+ PyUpb_DescriptorBase* self =
PyUpb_DescriptorBase_Check(_self, kPyUpb_MethodDescriptor);
return self ? self->def : NULL;
}
-PyObject *PyUpb_MethodDescriptor_Get(const upb_methoddef *m) {
- const upb_filedef *file = upb_servicedef_file(upb_methoddef_service(m));
+PyObject* PyUpb_MethodDescriptor_Get(const upb_methoddef* m) {
+ const upb_filedef* file = upb_servicedef_file(upb_methoddef_service(m));
return PyUpb_DescriptorBase_Get(kPyUpb_MethodDescriptor, m, file);
}
-static PyObject *PyUpb_MethodDescriptor_GetName(PyObject *self, void *closure) {
- const upb_methoddef *m = PyUpb_MethodDescriptor_GetDef(self);
+static PyObject* PyUpb_MethodDescriptor_GetName(PyObject* self, void* closure) {
+ const upb_methoddef* m = PyUpb_MethodDescriptor_GetDef(self);
return PyUnicode_FromString(upb_methoddef_name(m));
}
-static PyObject *PyUpb_MethodDescriptor_GetFullName(PyObject *self,
- void *closure) {
- const upb_methoddef *m = PyUpb_MethodDescriptor_GetDef(self);
+static PyObject* PyUpb_MethodDescriptor_GetFullName(PyObject* self,
+ void* closure) {
+ const upb_methoddef* m = PyUpb_MethodDescriptor_GetDef(self);
return PyUnicode_FromString(upb_methoddef_fullname(m));
}
-static PyObject *PyUpb_MethodDescriptor_GetContainingService(PyObject *self,
- void *closure) {
- const upb_methoddef *m = PyUpb_MethodDescriptor_GetDef(self);
+static PyObject* PyUpb_MethodDescriptor_GetContainingService(PyObject* self,
+ void* closure) {
+ const upb_methoddef* m = PyUpb_MethodDescriptor_GetDef(self);
return PyUpb_ServiceDescriptor_Get(upb_methoddef_service(m));
}
-static PyObject *PyUpb_MethodDescriptor_GetInputType(PyObject *self,
- void *closure) {
- const upb_methoddef *m = PyUpb_MethodDescriptor_GetDef(self);
+static PyObject* PyUpb_MethodDescriptor_GetInputType(PyObject* self,
+ void* closure) {
+ const upb_methoddef* m = PyUpb_MethodDescriptor_GetDef(self);
return PyUpb_Descriptor_Get(upb_methoddef_inputtype(m));
}
-static PyObject *PyUpb_MethodDescriptor_GetOutputType(PyObject *self,
- void *closure) {
- const upb_methoddef *m = PyUpb_MethodDescriptor_GetDef(self);
+static PyObject* PyUpb_MethodDescriptor_GetOutputType(PyObject* self,
+ void* closure) {
+ const upb_methoddef* m = PyUpb_MethodDescriptor_GetDef(self);
return PyUpb_Descriptor_Get(upb_methoddef_outputtype(m));
}
-static PyObject *PyUpb_MethodDescriptor_GetOptions(PyObject *_self,
- PyObject *args) {
- PyUpb_DescriptorBase *self = (void *)_self;
+static PyObject* PyUpb_MethodDescriptor_GetOptions(PyObject* _self,
+ PyObject* args) {
+ PyUpb_DescriptorBase* self = (void*)_self;
return PyUpb_DescriptorBase_GetOptions(self, upb_methoddef_options(self->def),
&google_protobuf_MethodOptions_msginit,
"google.protobuf.MethodOptions");
}
-static PyObject* PyUpb_MethodDescriptor_CopyToProto(PyObject* _self, PyObject* py_proto) {
+static PyObject* PyUpb_MethodDescriptor_CopyToProto(PyObject* _self,
+ PyObject* py_proto) {
return PyUpb_DescriptorBase_CopyToProto(
- _self, (PyUpb_ToProto_Func *)&upb_MethodDef_ToProto,
+ _self, (PyUpb_ToProto_Func*)&upb_MethodDef_ToProto,
&google_protobuf_MethodDescriptorProto_msginit, py_proto);
}
@@ -1243,8 +1262,8 @@
{"name", PyUpb_MethodDescriptor_GetName, NULL, "Name", NULL},
{"full_name", PyUpb_MethodDescriptor_GetFullName, NULL, "Full name", NULL},
//{ "index", PyUpb_MethodDescriptor_GetIndex, NULL, "Index", NULL},
- { "containing_service", PyUpb_MethodDescriptor_GetContainingService, NULL,
- "Containing service", NULL},
+ {"containing_service", PyUpb_MethodDescriptor_GetContainingService, NULL,
+ "Containing service", NULL},
{"input_type", PyUpb_MethodDescriptor_GetInputType, NULL, "Input type",
NULL},
{"output_type", PyUpb_MethodDescriptor_GetOutputType, NULL, "Output type",
@@ -1257,66 +1276,67 @@
{NULL}};
static PyType_Slot PyUpb_MethodDescriptor_Slots[] = {
- DESCRIPTOR_BASE_SLOTS,
- {Py_tp_methods, PyUpb_MethodDescriptor_Methods},
- {Py_tp_getset, PyUpb_MethodDescriptor_Getters},
- {0, NULL}
-};
+ DESCRIPTOR_BASE_SLOTS,
+ {Py_tp_methods, PyUpb_MethodDescriptor_Methods},
+ {Py_tp_getset, PyUpb_MethodDescriptor_Getters},
+ {0, NULL}};
static PyType_Spec PyUpb_MethodDescriptor_Spec = {
- PYUPB_MODULE_NAME ".MethodDescriptor", // tp_name
- sizeof(PyUpb_DescriptorBase), // tp_basicsize
- 0, // tp_itemsize
- Py_TPFLAGS_DEFAULT, // tp_flags
- PyUpb_MethodDescriptor_Slots,
+ PYUPB_MODULE_NAME ".MethodDescriptor", // tp_name
+ sizeof(PyUpb_DescriptorBase), // tp_basicsize
+ 0, // tp_itemsize
+ Py_TPFLAGS_DEFAULT, // tp_flags
+ PyUpb_MethodDescriptor_Slots,
};
// -----------------------------------------------------------------------------
// OneofDescriptor
// -----------------------------------------------------------------------------
-const upb_oneofdef *PyUpb_OneofDescriptor_GetDef(PyObject *_self) {
- PyUpb_DescriptorBase *self =
+const upb_oneofdef* PyUpb_OneofDescriptor_GetDef(PyObject* _self) {
+ PyUpb_DescriptorBase* self =
PyUpb_DescriptorBase_Check(_self, kPyUpb_OneofDescriptor);
return self ? self->def : NULL;
}
-PyObject *PyUpb_OneofDescriptor_Get(const upb_oneofdef *oneof) {
- const upb_filedef *file = upb_msgdef_file(upb_oneofdef_containingtype(oneof));
+PyObject* PyUpb_OneofDescriptor_Get(const upb_oneofdef* oneof) {
+ const upb_filedef* file = upb_msgdef_file(upb_oneofdef_containingtype(oneof));
return PyUpb_DescriptorBase_Get(kPyUpb_OneofDescriptor, oneof, file);
}
-static PyObject *PyUpb_OneofDescriptor_GetName(PyObject *self, void *closure) {
- const upb_oneofdef *oneof = PyUpb_OneofDescriptor_GetDef(self);
+static PyObject* PyUpb_OneofDescriptor_GetName(PyObject* self, void* closure) {
+ const upb_oneofdef* oneof = PyUpb_OneofDescriptor_GetDef(self);
return PyUnicode_FromString(upb_oneofdef_name(oneof));
}
-static PyObject *PyUpb_OneofDescriptor_GetFullName(PyObject *self, void *closure) {
- const upb_oneofdef *oneof = PyUpb_OneofDescriptor_GetDef(self);
+static PyObject* PyUpb_OneofDescriptor_GetFullName(PyObject* self,
+ void* closure) {
+ const upb_oneofdef* oneof = PyUpb_OneofDescriptor_GetDef(self);
return PyUnicode_FromFormat(
"%s.%s", upb_msgdef_fullname(upb_oneofdef_containingtype(oneof)),
upb_oneofdef_name(oneof));
}
-static PyObject *PyUpb_OneofDescriptor_GetIndex(PyObject *self, void *closure) {
- const upb_oneofdef *oneof = PyUpb_OneofDescriptor_GetDef(self);
+static PyObject* PyUpb_OneofDescriptor_GetIndex(PyObject* self, void* closure) {
+ const upb_oneofdef* oneof = PyUpb_OneofDescriptor_GetDef(self);
return PyLong_FromLong(upb_oneofdef_index(oneof));
}
-static PyObject *PyUpb_OneofDescriptor_GetContainingType(PyObject *self,
- void *closure) {
- const upb_oneofdef *oneof = PyUpb_OneofDescriptor_GetDef(self);
+static PyObject* PyUpb_OneofDescriptor_GetContainingType(PyObject* self,
+ void* closure) {
+ const upb_oneofdef* oneof = PyUpb_OneofDescriptor_GetDef(self);
return PyUpb_Descriptor_Get(upb_oneofdef_containingtype(oneof));
}
-static PyObject *PyUpb_OneofDescriptor_GetHasOptions(PyObject *_self,
- void *closure) {
- PyUpb_DescriptorBase *self = (void *)_self;
+static PyObject* PyUpb_OneofDescriptor_GetHasOptions(PyObject* _self,
+ void* closure) {
+ PyUpb_DescriptorBase* self = (void*)_self;
return PyBool_FromLong(upb_oneofdef_hasoptions(self->def));
}
-static PyObject* PyUpb_OneofDescriptor_GetOptions(PyObject* _self, PyObject* args) {
- PyUpb_DescriptorBase *self = (void *)_self;
+static PyObject* PyUpb_OneofDescriptor_GetOptions(PyObject* _self,
+ PyObject* args) {
+ PyUpb_DescriptorBase* self = (void*)_self;
return PyUpb_DescriptorBase_GetOptions(self, upb_oneofdef_options(self->def),
&google_protobuf_OneofOptions_msginit,
"google.protobuf.OneofOptions");
@@ -1336,106 +1356,106 @@
{"GetOptions", PyUpb_OneofDescriptor_GetOptions, METH_NOARGS}, {NULL}};
static PyType_Slot PyUpb_OneofDescriptor_Slots[] = {
- DESCRIPTOR_BASE_SLOTS,
- {Py_tp_methods, PyUpb_OneofDescriptor_Methods},
- {Py_tp_getset, PyUpb_OneofDescriptor_Getters},
- {0, NULL}
-};
+ DESCRIPTOR_BASE_SLOTS,
+ {Py_tp_methods, PyUpb_OneofDescriptor_Methods},
+ {Py_tp_getset, PyUpb_OneofDescriptor_Getters},
+ {0, NULL}};
static PyType_Spec PyUpb_OneofDescriptor_Spec = {
- PYUPB_MODULE_NAME ".OneofDescriptor", // tp_name
- sizeof(PyUpb_DescriptorBase), // tp_basicsize
- 0, // tp_itemsize
- Py_TPFLAGS_DEFAULT, // tp_flags
- PyUpb_OneofDescriptor_Slots,
+ PYUPB_MODULE_NAME ".OneofDescriptor", // tp_name
+ sizeof(PyUpb_DescriptorBase), // tp_basicsize
+ 0, // tp_itemsize
+ Py_TPFLAGS_DEFAULT, // tp_flags
+ PyUpb_OneofDescriptor_Slots,
};
// -----------------------------------------------------------------------------
// ServiceDescriptor
// -----------------------------------------------------------------------------
-const upb_servicedef *PyUpb_ServiceDescriptor_GetDef(PyObject *_self) {
- PyUpb_DescriptorBase *self =
+const upb_servicedef* PyUpb_ServiceDescriptor_GetDef(PyObject* _self) {
+ PyUpb_DescriptorBase* self =
PyUpb_DescriptorBase_Check(_self, kPyUpb_ServiceDescriptor);
return self ? self->def : NULL;
}
-PyObject *PyUpb_ServiceDescriptor_Get(const upb_servicedef *s) {
- const upb_filedef *file = upb_servicedef_file(s);
+PyObject* PyUpb_ServiceDescriptor_Get(const upb_servicedef* s) {
+ const upb_filedef* file = upb_servicedef_file(s);
return PyUpb_DescriptorBase_Get(kPyUpb_ServiceDescriptor, s, file);
}
-static PyObject *PyUpb_ServiceDescriptor_GetFullName(PyObject *self,
- void *closure) {
- const upb_servicedef *s = PyUpb_ServiceDescriptor_GetDef(self);
+static PyObject* PyUpb_ServiceDescriptor_GetFullName(PyObject* self,
+ void* closure) {
+ const upb_servicedef* s = PyUpb_ServiceDescriptor_GetDef(self);
return PyUnicode_FromString(upb_servicedef_fullname(s));
}
-static PyObject *PyUpb_ServiceDescriptor_GetName(PyObject *self,
- void *closure) {
- const upb_servicedef *s = PyUpb_ServiceDescriptor_GetDef(self);
+static PyObject* PyUpb_ServiceDescriptor_GetName(PyObject* self,
+ void* closure) {
+ const upb_servicedef* s = PyUpb_ServiceDescriptor_GetDef(self);
return PyUnicode_FromString(upb_servicedef_name(s));
}
-static PyObject *PyUpb_ServiceDescriptor_GetFile(PyObject *self,
- void *closure) {
- const upb_servicedef *s = PyUpb_ServiceDescriptor_GetDef(self);
+static PyObject* PyUpb_ServiceDescriptor_GetFile(PyObject* self,
+ void* closure) {
+ const upb_servicedef* s = PyUpb_ServiceDescriptor_GetDef(self);
return PyUpb_FileDescriptor_Get(upb_servicedef_file(s));
}
-static PyObject *PyUpb_ServiceDescriptor_GetIndex(PyObject *self,
- void *closure) {
- const upb_servicedef *s = PyUpb_ServiceDescriptor_GetDef(self);
+static PyObject* PyUpb_ServiceDescriptor_GetIndex(PyObject* self,
+ void* closure) {
+ const upb_servicedef* s = PyUpb_ServiceDescriptor_GetDef(self);
return PyLong_FromLong(upb_servicedef_index(s));
}
-static PyObject *PyUpb_ServiceDescriptor_GetMethods(PyObject *_self,
- void *closure) {
- PyUpb_DescriptorBase *self = (void*)_self;
+static PyObject* PyUpb_ServiceDescriptor_GetMethods(PyObject* _self,
+ void* closure) {
+ PyUpb_DescriptorBase* self = (void*)_self;
static PyUpb_GenericSequence_Funcs funcs = {
- (void *)&upb_servicedef_methodcount,
- (void *)&upb_servicedef_method,
- (void *)&PyUpb_MethodDescriptor_Get,
+ (void*)&upb_servicedef_methodcount,
+ (void*)&upb_servicedef_method,
+ (void*)&PyUpb_MethodDescriptor_Get,
};
return PyUpb_GenericSequence_New(&funcs, self->def, self->pool);
}
-static PyObject *PyUpb_ServiceDescriptor_GetMethodsByName(PyObject *_self,
- void *closure) {
+static PyObject* PyUpb_ServiceDescriptor_GetMethodsByName(PyObject* _self,
+ void* closure) {
static PyUpb_ByNameMap_Funcs funcs = {
{
- (void *)&upb_servicedef_methodcount,
- (void *)&upb_servicedef_method,
- (void *)&PyUpb_MethodDescriptor_Get,
+ (void*)&upb_servicedef_methodcount,
+ (void*)&upb_servicedef_method,
+ (void*)&PyUpb_MethodDescriptor_Get,
},
- (void *)&upb_servicedef_lookupmethod,
- (void *)&upb_methoddef_name,
+ (void*)&upb_servicedef_lookupmethod,
+ (void*)&upb_methoddef_name,
};
- PyUpb_DescriptorBase *self = (void*)_self;
+ PyUpb_DescriptorBase* self = (void*)_self;
return PyUpb_ByNameMap_New(&funcs, self->def, self->pool);
}
-static PyObject* PyUpb_ServiceDescriptor_GetOptions(PyObject* _self, PyObject* args) {
- PyUpb_DescriptorBase *self = (void *)_self;
+static PyObject* PyUpb_ServiceDescriptor_GetOptions(PyObject* _self,
+ PyObject* args) {
+ PyUpb_DescriptorBase* self = (void*)_self;
return PyUpb_DescriptorBase_GetOptions(
self, upb_servicedef_options(self->def),
&google_protobuf_ServiceOptions_msginit,
"google.protobuf.ServiceOptions");
}
-static PyObject *PyUpb_ServiceDescriptor_CopyToProto(PyObject *_self,
- PyObject *py_proto) {
+static PyObject* PyUpb_ServiceDescriptor_CopyToProto(PyObject* _self,
+ PyObject* py_proto) {
return PyUpb_DescriptorBase_CopyToProto(
- _self, (PyUpb_ToProto_Func *)&upb_ServiceDef_ToProto,
+ _self, (PyUpb_ToProto_Func*)&upb_ServiceDef_ToProto,
&google_protobuf_ServiceDescriptorProto_msginit, py_proto);
}
-static PyObject *PyUpb_ServiceDescriptor_FindMethodByName(PyObject *_self,
- PyObject *py_name) {
- PyUpb_DescriptorBase *self = (void*)_self;
- const char *name = PyUnicode_AsUTF8AndSize(py_name, NULL);
+static PyObject* PyUpb_ServiceDescriptor_FindMethodByName(PyObject* _self,
+ PyObject* py_name) {
+ PyUpb_DescriptorBase* self = (void*)_self;
+ const char* name = PyUnicode_AsUTF8AndSize(py_name, NULL);
if (!name) return NULL;
- const upb_methoddef *method = upb_servicedef_lookupmethod(self->def, name);
+ const upb_methoddef* method = upb_servicedef_lookupmethod(self->def, name);
if (method == NULL) {
return PyErr_Format(PyExc_KeyError, "Couldn't find method %.200s", name);
}
@@ -1465,11 +1485,11 @@
{0, NULL}};
static PyType_Spec PyUpb_ServiceDescriptor_Spec = {
- PYUPB_MODULE_NAME ".ServiceDescriptor", // tp_name
- sizeof(PyUpb_DescriptorBase), // tp_basicsize
- 0, // tp_itemsize
- Py_TPFLAGS_DEFAULT, // tp_flags
- PyUpb_ServiceDescriptor_Slots,
+ PYUPB_MODULE_NAME ".ServiceDescriptor", // tp_name
+ sizeof(PyUpb_DescriptorBase), // tp_basicsize
+ 0, // tp_itemsize
+ Py_TPFLAGS_DEFAULT, // tp_flags
+ PyUpb_ServiceDescriptor_Slots,
};
// -----------------------------------------------------------------------------
@@ -1477,7 +1497,7 @@
// -----------------------------------------------------------------------------
// These must be in the same order as PyUpb_DescriptorType in the header.
-static PyType_Spec *desc_specs[] = {
+static PyType_Spec* desc_specs[] = {
&PyUpb_Descriptor_Spec, &PyUpb_EnumDescriptor_Spec,
&PyUpb_EnumValueDescriptor_Spec, &PyUpb_FieldDescriptor_Spec,
&PyUpb_FileDescriptor_Spec, &PyUpb_MethodDescriptor_Spec,
@@ -1485,7 +1505,7 @@
};
bool PyUpb_InitDescriptor(PyObject* m) {
- PyUpb_ModuleState *s = PyUpb_ModuleState_GetFromModule(m);
+ PyUpb_ModuleState* s = PyUpb_ModuleState_GetFromModule(m);
for (size_t i = 0; i < kPyUpb_Descriptor_Count; i++) {
s->descriptor_types[i] = PyUpb_AddClass(m, desc_specs[i]);
diff --git a/python/descriptor.h b/python/descriptor.h
index 5b050a8..58ac0df 100644
--- a/python/descriptor.h
+++ b/python/descriptor.h
@@ -47,31 +47,31 @@
// Given a descriptor object |desc|, returns a Python message class object for
// the msgdef |m|, which must be from the same pool.
-PyObject *PyUpb_Descriptor_GetClass(const upb_msgdef *m);
+PyObject* PyUpb_Descriptor_GetClass(const upb_msgdef* m);
// Returns a Python wrapper object for the given def. This will return an
// existing object if one already exists, otherwise a new object will be
// created. The caller always owns a ref on the returned object.
-PyObject *PyUpb_Descriptor_Get(const upb_msgdef *msgdef);
-PyObject *PyUpb_EnumDescriptor_Get(const upb_enumdef *enumdef);
-PyObject *PyUpb_FieldDescriptor_Get(const upb_fielddef *field);
-PyObject *PyUpb_FileDescriptor_Get(const upb_filedef *file);
-PyObject *PyUpb_OneofDescriptor_Get(const upb_oneofdef *oneof);
-PyObject *PyUpb_EnumValueDescriptor_Get(const upb_enumvaldef *enumval);
-PyObject *PyUpb_Descriptor_GetOrCreateWrapper(const upb_msgdef *msg);
-PyObject *PyUpb_ServiceDescriptor_Get(const upb_servicedef *s);
+PyObject* PyUpb_Descriptor_Get(const upb_msgdef* msgdef);
+PyObject* PyUpb_EnumDescriptor_Get(const upb_enumdef* enumdef);
+PyObject* PyUpb_FieldDescriptor_Get(const upb_fielddef* field);
+PyObject* PyUpb_FileDescriptor_Get(const upb_filedef* file);
+PyObject* PyUpb_OneofDescriptor_Get(const upb_oneofdef* oneof);
+PyObject* PyUpb_EnumValueDescriptor_Get(const upb_enumvaldef* enumval);
+PyObject* PyUpb_Descriptor_GetOrCreateWrapper(const upb_msgdef* msg);
+PyObject* PyUpb_ServiceDescriptor_Get(const upb_servicedef* s);
// Returns the underlying |def| for a given wrapper object. The caller must
// have already verified that the given Python object is of the expected type.
-const upb_filedef *PyUpb_FileDescriptor_GetDef(PyObject *file);
-const upb_fielddef *PyUpb_FieldDescriptor_GetDef(PyObject *file);
-const upb_msgdef *PyUpb_Descriptor_GetDef(PyObject *_self);
-const void *PyUpb_AnyDescriptor_GetDef(PyObject *_self);
+const upb_filedef* PyUpb_FileDescriptor_GetDef(PyObject* file);
+const upb_fielddef* PyUpb_FieldDescriptor_GetDef(PyObject* file);
+const upb_msgdef* PyUpb_Descriptor_GetDef(PyObject* _self);
+const void* PyUpb_AnyDescriptor_GetDef(PyObject* _self);
// Returns the underlying |def| for a given wrapper object. The caller must
// have already verified that the given Python object is of the expected type.
-const upb_filedef *PyUpb_FileDescriptor_GetDef(PyObject *file);
-const void *PyUpb_AnyDescriptor_GetDef(PyObject *_self);
+const upb_filedef* PyUpb_FileDescriptor_GetDef(PyObject* file);
+const void* PyUpb_AnyDescriptor_GetDef(PyObject* _self);
// Module-level init.
bool PyUpb_InitDescriptor(PyObject* m);
diff --git a/python/descriptor_pool.h b/python/descriptor_pool.h
index 77f994f..f43764e 100644
--- a/python/descriptor_pool.h
+++ b/python/descriptor_pool.h
@@ -34,9 +34,9 @@
PyObject* PyUpb_DescriptorPool_GetSerializedPb(PyObject* _self,
const char* filename);
-PyObject* PyUpb_DescriptorPool_Get(const upb_symtab *symtab);
-upb_symtab *PyUpb_DescriptorPool_GetSymtab(PyObject *pool);
-PyObject *PyUpb_DescriptorPool_GetDefaultPool(void);
+PyObject* PyUpb_DescriptorPool_Get(const upb_symtab* symtab);
+upb_symtab* PyUpb_DescriptorPool_GetSymtab(PyObject* pool);
+PyObject* PyUpb_DescriptorPool_GetDefaultPool(void);
bool PyUpb_InitDescriptorPool(PyObject* m);
diff --git a/python/protobuf.c b/python/protobuf.c
index 1906eb6..9d27af4 100644
--- a/python/protobuf.c
+++ b/python/protobuf.c
@@ -96,23 +96,22 @@
// -----------------------------------------------------------------------------
typedef struct {
- PyObject_HEAD
- upb_arena *arena;
+ PyObject_HEAD upb_arena* arena;
} PyUpb_Arena;
-PyObject *PyUpb_Arena_New(void) {
- PyUpb_ModuleState *state = PyUpb_ModuleState_Get();
- PyUpb_Arena *arena = (void*)PyType_GenericAlloc(state->arena_type, 0);
+PyObject* PyUpb_Arena_New(void) {
+ PyUpb_ModuleState* state = PyUpb_ModuleState_Get();
+ PyUpb_Arena* arena = (void*)PyType_GenericAlloc(state->arena_type, 0);
arena->arena = upb_arena_new();
return &arena->ob_base;
}
-static void PyUpb_Arena_Dealloc(PyObject *self) {
+static void PyUpb_Arena_Dealloc(PyObject* self) {
upb_arena_free(PyUpb_Arena_Get(self));
PyUpb_Dealloc(self);
}
-upb_arena *PyUpb_Arena_Get(PyObject *arena) {
+upb_arena* PyUpb_Arena_Get(PyObject* arena) {
return ((PyUpb_Arena*)arena)->arena;
}
@@ -129,8 +128,8 @@
PyUpb_Arena_Slots,
};
-static bool PyUpb_InitArena(PyObject *m) {
- PyUpb_ModuleState *state = PyUpb_ModuleState_GetFromModule(m);
+static bool PyUpb_InitArena(PyObject* m) {
+ PyUpb_ModuleState* state = PyUpb_ModuleState_GetFromModule(m);
state->arena_type = PyUpb_AddClass(m, &PyUpb_Arena_Spec);
return state->arena_type;
}
