IQ.Lvbs/pycapnp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to fix rename of 'extends' to 'superclasses' upstream

Browse Source
This commit is contained in:
Jason Paryani
2014-10-19 21:34:46 -07:00
parent f14bcb1e85
commit 0a120ef4cd
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
capnp/includes/capnp_cpp.pxd
View File

@@ -157,8 +157,13 @@ cdef extern from "capnp/schema.h" namespace " ::capnp":
Maybe[Method] findMethodByName(StringPtr name) Maybe[Method] findMethodByName(StringPtr name)
Method getMethodByName(StringPtr name) Method getMethodByName(StringPtr name)
bint extends(InterfaceSchema other) bint extends(InterfaceSchema other)
SuperclassList getSuperclasses()
# kj::Maybe<InterfaceSchema> findSuperclass(uint64_t typeId) const; # kj::Maybe<InterfaceSchema> findSuperclass(uint64_t typeId) const;
cdef cppclass SuperclassList" ::capnp::InterfaceSchema::SuperclassList":
uint size()
InterfaceSchema operator[](uint index)
cdef cppclass StructSchema(Schema): cdef cppclass StructSchema(Schema):
cppclass Field: cppclass Field:
StructNode.Member.Reader getProto() StructNode.Member.Reader getProto()

12
capnp/lib/capnp.pyx
View File

@@ -2447,15 +2447,16 @@ cdef class _InterfaceSchema:
nfields = fieldlist.size() nfields = fieldlist.size()
ret = set(<char*>fieldlist[i].getProto().getName().cStr() ret = set(<char*>fieldlist[i].getProto().getName().cStr()
for i in xrange(nfields)) for i in xrange(nfields))
for interface in self.extends: for interface in self.superclasses:
ret |= interface.method_names_inherited ret |= interface.method_names_inherited
return ret return ret
property extends: property superclasses:
"""A list of interfaces that this interface extends""" """A list of superclasses for this interface"""
def __get__(self): def __get__(self):
return [self.get_dependency(i).as_interface() for i in self.node.interface.extends] cdef capnp.SuperclassList classes = self.thisptr.getSuperclasses()
return [_InterfaceSchema()._init(classes[i]) for i in range(classes.size())]
property node: property node:
"""The raw schema node""" """The raw schema node"""
@@ -2952,9 +2953,6 @@ cdef class _MessageReader:
def __init__(self): def __init__(self):
raise NotImplementedError("This is an abstract base class") raise NotImplementedError("This is an abstract base class")
cpdef _get_root_node(self):
return _NodeReader().init(self.thisptr.getRootNode())
cpdef get_root(self, schema) except +reraise_kj_exception: cpdef get_root(self, schema) except +reraise_kj_exception:
"""A method for instantiating Cap'n Proto structs """A method for instantiating Cap'n Proto structs