Rearrange declarations to avoid circular imports.

Circular imports make import pxd's order sensitive, and violating this
order results in hard to understand errors.  As far as I can tell, this
rearrangement removes the circular nature, and has no other side
affects.

Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
This commit is contained in:
Keith Rothman
2020-02-28 16:43:28 -08:00
parent 970d443911
commit 3b2eedb741
4 changed files with 15 additions and 12 deletions

View File

@@ -4,8 +4,8 @@ cdef extern from "capnp/helpers/checkCompiler.h":
pass
from libcpp cimport bool
from capnp.includes.schema_cpp cimport Node, Data, StructNode, EnumNode, InterfaceNode, MessageBuilder, MessageReader, ReaderOptions
from capnp.helpers.non_circular cimport PythonInterfaceDynamicImpl, reraise_kj_exception, PyRefCounter, PyEventPort, ErrorHandler
from capnp.includes.schema_cpp cimport Node, Data, StructNode, EnumNode, InterfaceNode, MessageBuilder, MessageReader, ReaderOptions
from capnp.includes.types cimport *
cdef extern from "capnp/common.h" namespace " ::capnp":
@@ -517,3 +517,10 @@ cdef extern from "kj/async.h" namespace " ::kj":
Own[PromiseFulfiller] fulfiller
PromiseFulfillerPair newPromiseAndFulfiller" ::kj::newPromiseAndFulfiller<void>"()
PyPromiseArray joinPromises(Array[PyPromise])
cdef extern from "capnp/helpers/asyncIoHelper.h":
cdef cppclass AsyncIoStreamReadHelper:
AsyncIoStreamReadHelper(AsyncIoStream *, WaitScope *, size_t)
bool poll()
size_t read_size()
void* read_buffer()

View File

@@ -2,7 +2,6 @@
# distutils: language = c++
from libc.stdint cimport *
from capnp.includes.capnp_cpp cimport DynamicOrphan
from capnp.helpers.non_circular cimport reraise_kj_exception
from capnp.includes.types cimport *
@@ -20,6 +19,11 @@ cdef extern from "capnp/dynamic.h" namespace " ::capnp":
cdef cppclass DynamicStruct_Builder" ::capnp::DynamicStruct::Builder":
pass
cdef extern from "capnp/orphan.h" namespace " ::capnp":
cdef cppclass DynamicOrphan" ::capnp::Orphan< ::capnp::DynamicValue>":
DynamicValue.Builder get()
DynamicValue.Reader getReader()
cdef extern from "capnp/schema.h" namespace " ::capnp":
cdef cppclass Schema:
pass