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

Fix for the removal of DynamicUnion from the C++ API

Browse Source
This commit is contained in:
Jason Paryani
2013-08-22 09:18:29 -07:00
parent f82cdc5c99
commit 8507eb6901
2 changed files with 18 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
capnp/capnp_cpp.pxd
View File

@@ -32,30 +32,23 @@ cdef extern from "capnp/schema.h" namespace " ::capnp":
Schema getDependency(uint64_t id) except +
#InterfaceSchema asInterface() const;
cdef cppclass MemberForward" ::capnp::StructSchema::Member":
cdef cppclass MemberForward" ::capnp::StructSchema::Field":
pass
cdef cppclass StructSchema(Schema):
cppclass MemberList:
cppclass FieldList:
uint size()
MemberForward operator[](uint index)
cppclass Union:
StructNode.Union.Reader getProto()
MemberList getMembers()
MemberForward getMemberByName(char * name)
cppclass Member:
cppclass Field:
StructNode.Member.Reader getProto()
StructSchema getContainingStruct()
uint getIndex()
MemberList getMembers()
Union asUnion() except +
FieldList getFields()
Node.Reader getProto()
MemberList getMembers()
Member getMemberByName(char * name)
Maybe[StructSchema.Union] getUnnamedUnion()
FieldList getFields()
Field getFieldByName(char * name)
cdef cppclass EnumSchema:
cppclass Enumerant:
@@ -96,28 +89,26 @@ cdef extern from "capnp/dynamic.h" namespace " ::capnp":
TYPE_LIST " ::capnp::DynamicValue::LIST"
TYPE_ENUM " ::capnp::DynamicValue::ENUM"
TYPE_STRUCT " ::capnp::DynamicValue::STRUCT"
TYPE_UNION " ::capnp::DynamicValue::UNION"
TYPE_INTERFACE " ::capnp::DynamicValue::INTERFACE"
TYPE_OBJECT " ::capnp::DynamicValue::OBJECT"
cdef cppclass DynamicStruct:
cppclass Reader:
DynamicValueForward.Reader get(char *) except +ValueError
DynamicValueForward.Reader getByUnion'get'(StructSchema.Union member) except +ValueError
bint has(char *) except +ValueError
StructSchema getSchema()
Maybe[StructSchema.Field] which()
cppclass Builder:
DynamicValueForward.Builder get(char *) except +ValueError
DynamicValueForward.Builder getByUnion'get'(StructSchema.Union member) except +ValueError
bint has(char *) except +ValueError
void set(char *, DynamicValueForward.Reader&) except +ValueError
DynamicValueForward.Builder init(char *, uint size)
DynamicValueForward.Builder init(char *)
StructSchema getSchema()
Maybe[StructSchema.Field] which()
cdef extern from "fixMaybe.h":
StructSchema.Member fixMaybe(Maybe[StructSchema.Member]) except+
StructSchema.Union fixMaybeUnion'fixMaybe'(Maybe[StructSchema.Union]) except+
StructSchema.Field fixMaybe(Maybe[StructSchema.Field]) except+
EnumSchema.Enumerant fixMaybe(Maybe[EnumSchema.Enumerant]) except+
cdef extern from "capnp/dynamic.h" namespace " ::capnp":
@@ -125,17 +116,6 @@ cdef extern from "capnp/dynamic.h" namespace " ::capnp":
uint16_t getRaw()
Maybe[EnumSchema.Enumerant] getEnumerant()
cdef cppclass DynamicUnion:
cppclass Reader:
DynamicValueForward.Reader get() except +ValueError
Maybe[StructSchema.Member] which()
cppclass Builder:
DynamicValueForward.Builder get() except +ValueError
Maybe[StructSchema.Member] which()
void set(char *, DynamicValueForward.Reader&) except +ValueError
DynamicValueForward.Builder init(char *, uint size)
DynamicValueForward.Builder init(char *)
cdef cppclass DynamicList:
cppclass Reader:
DynamicValueForward.Reader operator[](uint) except +ValueError
@@ -167,7 +147,6 @@ cdef extern from "capnp/dynamic.h" namespace " ::capnp":
Reader(DynamicList.Reader& value)
Reader(DynamicEnum value)
Reader(DynamicStruct.Reader& value)
Reader(DynamicUnion.Reader& value)
Type getType()
int64_t asInt"as<int64_t>"()
uint64_t asUint"as<uint64_t>"()
@@ -176,7 +155,6 @@ cdef extern from "capnp/dynamic.h" namespace " ::capnp":
char * asText"as< ::capnp::Text>().cStr"()
DynamicList.Reader asList"as< ::capnp::DynamicList>"()
DynamicStruct.Reader asStruct"as< ::capnp::DynamicStruct>"()
DynamicUnion.Reader asUnion"as< ::capnp::DynamicUnion>"()
DynamicEnum asEnum"as< ::capnp::DynamicEnum>"()
Data.Reader asData"as< ::capnp::Data>"()
cppclass Builder:
@@ -188,7 +166,6 @@ cdef extern from "capnp/dynamic.h" namespace " ::capnp":
char * asText"as< ::capnp::Text>().cStr"()
DynamicList.Builder asList"as< ::capnp::DynamicList>"()
DynamicStruct.Builder asStruct"as< ::capnp::DynamicStruct>"()
DynamicUnion.Builder asUnion"as< ::capnp::DynamicUnion>"()
DynamicEnum asEnum"as< ::capnp::DynamicEnum>"()
Data.Builder asData"as< ::capnp::Data>"()