Skip to content

C
capnproto
Commit a784f2f7 authored by Kenton Varda's avatar Kenton Varda
Browse files
Options

Regenerate bootstraps for streaming. 

Note: Apparently, json.capnp had not been added to the bootstrap test, and the checked-in bootstrap had drifted from the source file.
parent bd6d75ba
Hide whitespace changes
Inline Side-by-side
Showing with 269 additions and 22 deletions
c++/src/capnp/compat/json.capnp.c++
View file @ a784f2f7
......@@ -548,6 +548,37 @@ const ::capnp::_::RawSchema s_f061e22f0ae5c7b5 = {
0, 0, nullptr, nullptr, nullptr, { &s_f061e22f0ae5c7b5, nullptr, nullptr, 0, 0, nullptr }
};
#endif // !CAPNP_LITE
static const ::capnp::_::AlignedData<22> b_a0a054dea32fd98c = {
{ 0, 0, 0, 0, 5, 0, 6, 0,
140, 217, 47, 163, 222, 84, 160, 160,
24, 0, 0, 0, 5, 0, 0, 2,
52, 94, 58, 164, 151, 146, 249, 142,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
21, 0, 0, 0, 42, 1, 0, 0,
37, 0, 0, 0, 7, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
32, 0, 0, 0, 3, 0, 1, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
99, 97, 112, 110, 112, 47, 99, 111,
109, 112, 97, 116, 47, 106, 115, 111,
110, 46, 99, 97, 112, 110, 112, 58,
110, 111, 116, 105, 102, 105, 99, 97,
116, 105, 111, 110, 0, 0, 0, 0,
0, 0, 0, 0, 1, 0, 1, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, }
};
::capnp::word const* const bp_a0a054dea32fd98c = b_a0a054dea32fd98c.words;
#if !CAPNP_LITE
const ::capnp::_::RawSchema s_a0a054dea32fd98c = {
0xa0a054dea32fd98c, b_a0a054dea32fd98c.words, 22, nullptr, nullptr,
0, 0, nullptr, nullptr, nullptr, { &s_a0a054dea32fd98c, nullptr, nullptr, 0, 0, nullptr }
};
#endif // !CAPNP_LITE
} // namespace schemas
} // namespace capnp
......
c++/src/capnp/compat/json.capnp.h
View file @ a784f2f7
......@@ -27,6 +27,7 @@ CAPNP_DECLARE_SCHEMA(cfa794e8d19a0162);
CAPNP_DECLARE_SCHEMA(c2f8c20c293e5319);
CAPNP_DECLARE_SCHEMA(d7d879450a253e4b);
CAPNP_DECLARE_SCHEMA(f061e22f0ae5c7b5);
CAPNP_DECLARE_SCHEMA(a0a054dea32fd98c);
} // namespace schemas
} // namespace capnp
......
c++/src/capnp/compiler/grammar.capnp.c++
View file @ a784f2f7
......@@ -1675,17 +1675,17 @@ const ::capnp::_::RawSchema s_94099c3f9eb32d6b = {
0, 0, nullptr, nullptr, nullptr, { &s_94099c3f9eb32d6b, nullptr, nullptr, 0, 0, nullptr }
};
#endif // !CAPNP_LITE
static const ::capnp::_::AlignedData<87> b_b3f66e7a79d81bcd = {
static const ::capnp::_::AlignedData<102> b_b3f66e7a79d81bcd = {
{ 0, 0, 0, 0, 5, 0, 6, 0,
205, 27, 216, 121, 122, 110, 246, 179,
41, 0, 0, 0, 1, 0, 2, 0,
187, 131, 126, 193, 135, 231, 239, 150,
1, 0, 7, 0, 0, 0, 2, 0,
1, 0, 7, 0, 0, 0, 3, 0,
0, 0, 0, 0, 0, 0, 0, 0,
21, 0, 0, 0, 154, 1, 0, 0,
45, 0, 0, 0, 7, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
41, 0, 0, 0, 231, 0, 0, 0,
41, 0, 0, 0, 31, 1, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
99, 97, 112, 110, 112, 47, 99, 111,
......@@ -1696,35 +1696,42 @@ static const ::capnp::_::AlignedData<87> b_b3f66e7a79d81bcd = {
46, 80, 97, 114, 97, 109, 76, 105,
115, 116, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 1, 0, 1, 0,
16, 0, 0, 0, 3, 0, 4, 0,
20, 0, 0, 0, 3, 0, 4, 0,
0, 0, 255, 255, 0, 0, 0, 0,
0, 0, 1, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
97, 0, 0, 0, 82, 0, 0, 0,
125, 0, 0, 0, 82, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
96, 0, 0, 0, 3, 0, 1, 0,
124, 0, 0, 0, 2, 0, 1, 0,
124, 0, 0, 0, 3, 0, 1, 0,
152, 0, 0, 0, 2, 0, 1, 0,
1, 0, 254, 255, 0, 0, 0, 0,
0, 0, 1, 0, 1, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
121, 0, 0, 0, 42, 0, 0, 0,
149, 0, 0, 0, 42, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
116, 0, 0, 0, 3, 0, 1, 0,
128, 0, 0, 0, 2, 0, 1, 0,
2, 0, 0, 0, 1, 0, 0, 0,
144, 0, 0, 0, 3, 0, 1, 0,
156, 0, 0, 0, 2, 0, 1, 0,
3, 0, 0, 0, 1, 0, 0, 0,
0, 0, 1, 0, 2, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
125, 0, 0, 0, 82, 0, 0, 0,
153, 0, 0, 0, 82, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
124, 0, 0, 0, 3, 0, 1, 0,
136, 0, 0, 0, 2, 0, 1, 0,
3, 0, 0, 0, 2, 0, 0, 0,
152, 0, 0, 0, 3, 0, 1, 0,
164, 0, 0, 0, 2, 0, 1, 0,
4, 0, 0, 0, 2, 0, 0, 0,
0, 0, 1, 0, 3, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
133, 0, 0, 0, 66, 0, 0, 0,
161, 0, 0, 0, 66, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
156, 0, 0, 0, 3, 0, 1, 0,
168, 0, 0, 0, 2, 0, 1, 0,
2, 0, 253, 255, 0, 0, 0, 0,
0, 0, 1, 0, 4, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
128, 0, 0, 0, 3, 0, 1, 0,
140, 0, 0, 0, 2, 0, 1, 0,
165, 0, 0, 0, 58, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
160, 0, 0, 0, 3, 0, 1, 0,
172, 0, 0, 0, 2, 0, 1, 0,
110, 97, 109, 101, 100, 76, 105, 115,
116, 0, 0, 0, 0, 0, 0, 0,
14, 0, 0, 0, 0, 0, 0, 0,
......@@ -1762,6 +1769,14 @@ static const ::capnp::_::AlignedData<87> b_b3f66e7a79d81bcd = {
0, 0, 0, 0, 0, 0, 0, 0,
8, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
115, 116, 114, 101, 97, 109, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, }
};
::capnp::word const* const bp_b3f66e7a79d81bcd = b_b3f66e7a79d81bcd.words;
......@@ -1770,11 +1785,11 @@ static const ::capnp::_::RawSchema* const d_b3f66e7a79d81bcd[] = {
&s_8e207d4dfe54d0de,
&s_fffe08a9a697d2a5,
};
static const uint16_t m_b3f66e7a79d81bcd[] = {3, 0, 2, 1};
static const uint16_t i_b3f66e7a79d81bcd[] = {0, 1, 2, 3};
static const uint16_t m_b3f66e7a79d81bcd[] = {3, 0, 2, 4, 1};
static const uint16_t i_b3f66e7a79d81bcd[] = {0, 1, 4, 2, 3};
const ::capnp::_::RawSchema s_b3f66e7a79d81bcd = {
0xb3f66e7a79d81bcd, b_b3f66e7a79d81bcd.words, 87, d_b3f66e7a79d81bcd, m_b3f66e7a79d81bcd,
2, 4, i_b3f66e7a79d81bcd, nullptr, nullptr, { &s_b3f66e7a79d81bcd, nullptr, nullptr, 0, 0, nullptr }
0xb3f66e7a79d81bcd, b_b3f66e7a79d81bcd.words, 102, d_b3f66e7a79d81bcd, m_b3f66e7a79d81bcd,
2, 5, i_b3f66e7a79d81bcd, nullptr, nullptr, { &s_b3f66e7a79d81bcd, nullptr, nullptr, 0, 0, nullptr }
};
#endif // !CAPNP_LITE
static const ::capnp::_::AlignedData<110> b_fffe08a9a697d2a5 = {
......
c++/src/capnp/compiler/grammar.capnp.h
View file @ a784f2f7
......@@ -295,6 +295,7 @@ struct Declaration::ParamList {
enum Which: uint16_t {
NAMED_LIST,
TYPE,
STREAM,
};
struct _capnpPrivate {
......@@ -1968,6 +1969,9 @@ public:
inline ::uint32_t getEndByte() const;
inline bool isStream() const;
inline ::capnp::Void getStream() const;
private:
::capnp::_::StructReader _reader;
template <typename, ::capnp::Kind>
......@@ -2019,6 +2023,10 @@ public:
inline ::uint32_t getEndByte();
inline void setEndByte( ::uint32_t value);
inline bool isStream();
inline ::capnp::Void getStream();
inline void setStream( ::capnp::Void value = ::capnp::VOID);
private:
::capnp::_::StructBuilder _builder;
template <typename, ::capnp::Kind>
......@@ -5758,6 +5766,32 @@ inline void Declaration::ParamList::Builder::setEndByte( ::uint32_t value) {
::capnp::bounded<2>() * ::capnp::ELEMENTS, value);
}
inline bool Declaration::ParamList::Reader::isStream() const {
return which() == Declaration::ParamList::STREAM;
}
inline bool Declaration::ParamList::Builder::isStream() {
return which() == Declaration::ParamList::STREAM;
}
inline ::capnp::Void Declaration::ParamList::Reader::getStream() const {
KJ_IREQUIRE((which() == Declaration::ParamList::STREAM),
"Must check which() before get()ing a union member.");
return _reader.getDataField< ::capnp::Void>(
::capnp::bounded<0>() * ::capnp::ELEMENTS);
}
inline ::capnp::Void Declaration::ParamList::Builder::getStream() {
KJ_IREQUIRE((which() == Declaration::ParamList::STREAM),
"Must check which() before get()ing a union member.");
return _builder.getDataField< ::capnp::Void>(
::capnp::bounded<0>() * ::capnp::ELEMENTS);
}
inline void Declaration::ParamList::Builder::setStream( ::capnp::Void value) {
_builder.setDataField<Declaration::ParamList::Which>(
::capnp::bounded<0>() * ::capnp::ELEMENTS, Declaration::ParamList::STREAM);
_builder.setDataField< ::capnp::Void>(
::capnp::bounded<0>() * ::capnp::ELEMENTS, value);
}
inline bool Declaration::Param::Reader::hasName() const {
return !_reader.getPointerField(
::capnp::bounded<0>() * ::capnp::POINTERS).isNull();
......
c++/src/capnp/stream.capnp.c++ 0 → 100644
View file @ a784f2f7
// Generated by Cap'n Proto compiler, DO NOT EDIT
// source: stream.capnp
#include "stream.capnp.h"
namespace capnp {
namespace schemas {
static const ::capnp::_::AlignedData<17> b_995f9a3377c0b16e = {
{ 0, 0, 0, 0, 5, 0, 6, 0,
110, 177, 192, 119, 51, 154, 95, 153,
19, 0, 0, 0, 1, 0, 0, 0,
248, 243, 147, 19, 169, 102, 195, 134,
0, 0, 7, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
21, 0, 0, 0, 2, 1, 0, 0,
33, 0, 0, 0, 7, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
99, 97, 112, 110, 112, 47, 115, 116,
114, 101, 97, 109, 46, 99, 97, 112,
110, 112, 58, 83, 116, 114, 101, 97,
109, 82, 101, 115, 117, 108, 116, 0,
0, 0, 0, 0, 1, 0, 1, 0, }
};
::capnp::word const* const bp_995f9a3377c0b16e = b_995f9a3377c0b16e.words;
#if !CAPNP_LITE
const ::capnp::_::RawSchema s_995f9a3377c0b16e = {
0x995f9a3377c0b16e, b_995f9a3377c0b16e.words, 17, nullptr, nullptr,
0, 0, nullptr, nullptr, nullptr, { &s_995f9a3377c0b16e, nullptr, nullptr, 0, 0, nullptr }
};
#endif // !CAPNP_LITE
} // namespace schemas
} // namespace capnp
// =======================================================================================
namespace capnp {
// StreamResult
constexpr uint16_t StreamResult::_capnpPrivate::dataWordSize;
constexpr uint16_t StreamResult::_capnpPrivate::pointerCount;
#if !CAPNP_LITE
constexpr ::capnp::Kind StreamResult::_capnpPrivate::kind;
constexpr ::capnp::_::RawSchema const* StreamResult::_capnpPrivate::schema;
#endif // !CAPNP_LITE
} // namespace
c++/src/capnp/stream.capnp.h 0 → 100644
View file @ a784f2f7
// Generated by Cap'n Proto compiler, DO NOT EDIT
// source: stream.capnp
#pragma once
#include <capnp/generated-header-support.h>
#include <kj/windows-sanity.h>
#if CAPNP_VERSION != 8000
#error "Version mismatch between generated code and library headers. You must use the same version of the Cap'n Proto compiler and library."
#endif
namespace capnp {
namespace schemas {
CAPNP_DECLARE_SCHEMA(995f9a3377c0b16e);
} // namespace schemas
} // namespace capnp
namespace capnp {
struct StreamResult {
StreamResult() = delete;
class Reader;
class Builder;
class Pipeline;
struct _capnpPrivate {
CAPNP_DECLARE_STRUCT_HEADER(995f9a3377c0b16e, 0, 0)
#if !CAPNP_LITE
static constexpr ::capnp::_::RawBrandedSchema const* brand() { return &schema->defaultBrand; }
#endif // !CAPNP_LITE
};
};
// =======================================================================================
class StreamResult::Reader {
public:
typedef StreamResult Reads;
Reader() = default;
inline explicit Reader(::capnp::_::StructReader base): _reader(base) {}
inline ::capnp::MessageSize totalSize() const {
return _reader.totalSize().asPublic();
}
#if !CAPNP_LITE
inline ::kj::StringTree toString() const {
return ::capnp::_::structString(_reader, *_capnpPrivate::brand());
}
#endif // !CAPNP_LITE
private:
::capnp::_::StructReader _reader;
template <typename, ::capnp::Kind>
friend struct ::capnp::ToDynamic_;
template <typename, ::capnp::Kind>
friend struct ::capnp::_::PointerHelpers;
template <typename, ::capnp::Kind>
friend struct ::capnp::List;
friend class ::capnp::MessageBuilder;
friend class ::capnp::Orphanage;
};
class StreamResult::Builder {
public:
typedef StreamResult Builds;
Builder() = delete; // Deleted to discourage incorrect usage.
// You can explicitly initialize to nullptr instead.
inline Builder(decltype(nullptr)) {}
inline explicit Builder(::capnp::_::StructBuilder base): _builder(base) {}
inline operator Reader() const { return Reader(_builder.asReader()); }
inline Reader asReader() const { return *this; }
inline ::capnp::MessageSize totalSize() const { return asReader().totalSize(); }
#if !CAPNP_LITE
inline ::kj::StringTree toString() const { return asReader().toString(); }
#endif // !CAPNP_LITE
private:
::capnp::_::StructBuilder _builder;
template <typename, ::capnp::Kind>
friend struct ::capnp::ToDynamic_;
friend class ::capnp::Orphanage;
template <typename, ::capnp::Kind>
friend struct ::capnp::_::PointerHelpers;
};
#if !CAPNP_LITE
class StreamResult::Pipeline {
public:
typedef StreamResult Pipelines;
inline Pipeline(decltype(nullptr)): _typeless(nullptr) {}
inline explicit Pipeline(::capnp::AnyPointer::Pipeline&& typeless)
: _typeless(kj::mv(typeless)) {}
private:
::capnp::AnyPointer::Pipeline _typeless;
friend class ::capnp::PipelineHook;
template <typename, ::capnp::Kind>
friend struct ::capnp::ToDynamic_;
};
#endif // !CAPNP_LITE
// =======================================================================================
} // namespace
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment