rshen/c-capnproto
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

don't autoresolve pointers

Browse source
This commit is contained in:
James McKaskill 2013-09-12 16:51:10 -04:00
parent e6c57a665e
commit 081c783bbf
7 changed files with 344 additions and 214 deletions
Download patch file Download diff file Expand all files Collapse all files

28
capn-test.cpp
View file

@ -46,7 +46,7 @@ TEST(WireFormat, SimpleRawDataStruct) {
EXPECT_EQ(1, ctx.segnum);
EXPECT_EQ(0, seg.id);
struct capn_ptr ptr = capn_getp(capn_root(&ctx), 0);
struct capn_ptr ptr = capn_getp(capn_root(&ctx), 0, 1);
EXPECT_EQ(CAPN_STRUCT, ptr.type);
EXPECT_EQ(8, ptr.datasz);
EXPECT_EQ(0, ptr.ptrsz);
@ -111,7 +111,7 @@ static void setupStruct(struct capn *ctx) {
EXPECT_EQ(8, list.ptrsz);
EXPECT_EQ(0, capn_setp(ptr, 2, list));
for (int i = 0; i < 4; i++) {
capn_ptr element = capn_getp(list, i);
capn_ptr element = capn_getp(list, i, 1);
ASSERT_EQ(CAPN_LIST_MEMBER, element.type);
EXPECT_EQ(8, element.datasz);
EXPECT_EQ(8, element.ptrsz);
@ -151,7 +151,7 @@ static void setupStruct(struct capn *ctx) {
}
static void checkStruct(struct capn *ctx) {
capn_ptr ptr = capn_getp(capn_root(ctx), 0);
capn_ptr ptr = capn_getp(capn_root(ctx), 0, 1);
EXPECT_EQ(CAPN_STRUCT, ptr.type);
EXPECT_EQ(16, ptr.datasz);
EXPECT_EQ(48, ptr.ptrsz);
@ -161,13 +161,13 @@ static void checkStruct(struct capn *ctx) {
EXPECT_EQ(0x40, capn_read8(ptr, 14));
EXPECT_EQ((1 << 6) | (1 << 5) | (1 << 4) | (1 << 2), capn_read8(ptr, 15));
capn_ptr subStruct = capn_getp(ptr, 0);
capn_ptr subStruct = capn_getp(ptr, 0, 1);
EXPECT_EQ(CAPN_STRUCT, subStruct.type);
EXPECT_EQ(8, subStruct.datasz);
EXPECT_EQ(0, subStruct.ptrsz);
EXPECT_EQ(123, capn_read32(subStruct, 0));
capn_list32 list32 = {capn_getp(ptr, 1)};
capn_list32 list32 = {capn_getp(ptr, 1, 1)};
capn_list8 list8 = {list32.p};
capn_list16 list16 = {list32.p};
capn_list64 list64 = {list32.p};
@ -183,31 +183,31 @@ static void checkStruct(struct capn *ctx) {
EXPECT_EQ(201, capn_get8(list8, 1));
EXPECT_EQ(202, capn_get16(list16, 2));
capn_ptr list = capn_getp(ptr, 2);
capn_ptr list = capn_getp(ptr, 2, 1);
EXPECT_EQ(CAPN_COMPOSITE_LIST, list.type);
EXPECT_EQ(4, list.len);
EXPECT_EQ(8, list.datasz);
EXPECT_EQ(8, list.ptrsz);
for (int i = 0; i < 4; i++) {
capn_ptr element = capn_getp(list, i);
capn_ptr element = capn_getp(list, i, 1);
EXPECT_EQ(CAPN_LIST_MEMBER, element.type);
EXPECT_EQ(8, element.datasz);
EXPECT_EQ(8, element.ptrsz);
EXPECT_EQ(300+i, capn_read32(element,0));
capn_ptr subelement = capn_getp(element, 0);
capn_ptr subelement = capn_getp(element, 0, 1);
EXPECT_EQ(CAPN_STRUCT, subelement.type);
EXPECT_EQ(8, subelement.datasz);
EXPECT_EQ(0, subelement.ptrsz);
EXPECT_EQ(400+i, capn_read32(subelement, 0));
}
list = capn_getp(ptr, 3);
list = capn_getp(ptr, 3, 1);
EXPECT_EQ(CAPN_PTR_LIST, list.type);
EXPECT_EQ(5, list.len);
for (int i = 0; i < 5; i++) {
capn_list16 element = {capn_getp(list, i)};
capn_list16 element = {capn_getp(list, i, 1)};
EXPECT_EQ(CAPN_LIST, element.p.type);
EXPECT_EQ(i+1, element.p.len);
EXPECT_EQ(2, element.p.datasz);
@ -217,17 +217,17 @@ static void checkStruct(struct capn *ctx) {
}
}
capn_ptr recurse = capn_getp(ptr, 4);
capn_ptr recurse = capn_getp(ptr, 4, 1);
EXPECT_EQ(CAPN_STRUCT, recurse.type);
EXPECT_EQ(0, recurse.datasz);
EXPECT_EQ(16, recurse.ptrsz);
capn_ptr recurse_mbr = capn_getp(recurse, 0);
capn_ptr recurse_mbr = capn_getp(recurse, 0, 1);
EXPECT_EQ(CAPN_STRUCT, recurse_mbr.type);
EXPECT_EQ(0, recurse_mbr.datasz);
EXPECT_EQ(16, recurse_mbr.ptrsz);
EXPECT_EQ(recurse.seg, recurse_mbr.seg);
EXPECT_EQ(recurse.data, recurse_mbr.data);
EXPECT_EQ(CAPN_NULL, capn_getp(recurse, 1).type);
EXPECT_EQ(CAPN_NULL, capn_getp(recurse, 1, 1).type);
}
TEST(WireFormat, StructRoundTrip_OneSegment) {
@ -433,7 +433,7 @@ TEST(WireFormat, CopyStruct) {
checkStruct(&ctx1.capn);
capn_ptr root = capn_root(&ctx2.capn);
EXPECT_EQ(0, capn_setp(root, 0, capn_getp(capn_root(&ctx1.capn), 0)));
EXPECT_EQ(0, capn_setp(root, 0, capn_getp(capn_root(&ctx1.capn), 0, 1)));
checkStruct(&ctx2.capn);
}

37
capn.c
View file

@ -407,7 +407,17 @@ err:
return ret;
}
capn_ptr capn_getp(capn_ptr p, int off) {
void capn_resolve(capn_ptr *p) {
if (p->type == CAPN_FAR_POINTER)
*p = read_ptr(p->seg, p->data);
}
capn_ptr capn_getp(capn_ptr p, int off, int resolve) {
capn_ptr ret = {CAPN_FAR_POINTER};
ret.seg = p.seg;
capn_resolve(&p);
switch (p.type) {
case CAPN_COMPOSITE_LIST:
case CAPN_LIST:
@ -429,20 +439,26 @@ capn_ptr capn_getp(capn_ptr p, int off) {
if (off >= p.ptrsz) {
goto err;
}
return read_ptr(p.seg, p.data + p.datasz + off);
ret.data = p.data + p.datasz + off;
break;
case CAPN_PTR_LIST:
if (off >= p.len) {
goto err;
}
return read_ptr(p.seg, p.data + off * 8);
ret.data = p.data + off * 8;
break;
default:
goto err;
}
if (resolve) {
ret = read_ptr(ret.seg, ret.data);
}
return ret;
err:
memset(&p, 0, sizeof(p));
return p;
@ -750,6 +766,9 @@ int capn_setp(capn_ptr p, int off, capn_ptr tgt) {
char *data;
int err, dep = 0;
capn_resolve(&p);
capn_resolve(&tgt);
switch (p.type) {
case CAPN_LIST:
case CAPN_COMPOSITE_LIST:
@ -812,8 +831,8 @@ int capn_setp(capn_ptr p, int off, capn_ptr tgt) {
}
if (tc->type == CAPN_COMPOSITE_LIST) {
*fn = capn_getp(*fc, 0);
*tn = capn_getp(*tc, 0);
*fn = capn_getp(*fc, 0, 1);
*tn = capn_getp(*tc, 0, 1);
copy_list_member(tn, fn, &dep);
@ -1019,7 +1038,7 @@ capn_ptr capn_new_string(struct capn_segment *seg, const char *str, int sz) {
}
capn_text capn_get_text(capn_ptr p, int off, capn_text def) {
capn_ptr m = capn_getp(p, off);
capn_ptr m = capn_getp(p, off, 1);
capn_text ret = def;
if (m.type == CAPN_LIST && m.datasz == 1 && m.len && m.data[m.len - 1] == 0) {
ret.seg = m.seg;
@ -1045,7 +1064,7 @@ int capn_set_text(capn_ptr p, int off, capn_text tgt) {
capn_data capn_get_data(capn_ptr p, int off) {
capn_data ret;
ret.p = capn_getp(p, off);
ret.p = capn_getp(p, off, 1);
if (ret.p.type != CAPN_LIST || ret.p.datasz != 1) {
memset(&ret, 0, sizeof(ret));
}

4
capn.h
View file

@ -100,6 +100,7 @@ enum CAPN_TYPE {
CAPN_LIST = 2,
CAPN_PTR_LIST = 3,
CAPN_BIT_LIST = 4,
CAPN_FAR_POINTER = 5,
CAPN_LIST_MEMBER = 6,
CAPN_COMPOSITE_LIST = 7
};
@ -140,6 +141,7 @@ struct capn_msg {
void capn_append_segment(struct capn*, struct capn_segment*);
capn_ptr capn_root(struct capn *c);
void capn_resolve(capn_ptr *p);
/* capn_getp|setp functions get/set ptrs in list/structs
* off is the list index or pointer index in a struct
@ -147,7 +149,7 @@ capn_ptr capn_root(struct capn *c);
* is in a different segment/context.
* Both of these will use/return inner pointers for composite lists.
*/
capn_ptr capn_getp(capn_ptr p, int off);
capn_ptr capn_getp(capn_ptr p, int off, int resolve);
int capn_setp(capn_ptr p, int off, capn_ptr tgt);
capn_text capn_get_text(capn_ptr p, int off, capn_text def);

35
compiler/capnpc-c.c
View file

@ -68,6 +68,8 @@ static void resolve_names(struct str *b, struct node *n, capn_text name, struct
str_add(&n->name, b->str, b->len);
str_add(b, "_", 1);
capn_resolve(&n->n.nestedNodes.p);
for (i = n->n.nestedNodes.p.len-1; i >= 0; i--) {
struct Node_NestedNode nest;
get_Node_NestedNode(&nest, n->n.nestedNodes, i);
@ -93,6 +95,7 @@ static void resolve_names(struct str *b, struct node *n, capn_text name, struct
static void define_enum(struct node *n) {
int i;
capn_resolve(&n->n._enum.enumerants.p);
str_addf(&HDR, "\nenum %s {", n->name.str);
for (i = 0; i < n->n._enum.enumerants.p.len; i++) {
struct Enumerant e;
@ -236,7 +239,7 @@ static void decode_value(struct value* v, Type_ptr type, Value_ptr value, const
fprintf(stderr, "failed to copy text\n");
exit(2);
}
p = capn_getp(p, 0);
p = capn_getp(p, 0, 1);
if (!p.type)
break;
@ -266,7 +269,7 @@ static void decode_value(struct value* v, Type_ptr type, Value_ptr value, const
fprintf(stderr, "failed to copy object\n");
exit(2);
}
p = capn_getp(p, 0);
p = capn_getp(p, 0, 1);
if (!p.type)
break;
@ -575,7 +578,7 @@ static void get_member(struct str *func, struct field *f, const char *ptr, const
case Type__interface:
case Type_object:
case Type__list:
str_addf(func, "%s = capn_getp(%s, %d);\n", pvar, ptr, f->f.slot.offset);
str_addf(func, "%s = capn_getp(%s, %d, 0);\n", pvar, ptr, f->f.slot.offset);
break;
default:
return;
@ -880,22 +883,24 @@ static void define_struct(struct node *n) {
str_addf(&SRC, "}\n");
str_addf(&SRC, "void read_%s(struct %s *s, %s_ptr p) {\n", n->name.str, n->name.str, n->name.str);
str_addf(&SRC, "\tcapn_resolve(&p.p);\n");
str_add(&SRC, s.get.str, s.get.len);
str_addf(&SRC, "}\n");
str_addf(&SRC, "void write_%s(const struct %s *s, %s_ptr p) {\n", n->name.str, n->name.str, n->name.str);
str_addf(&SRC, "\tcapn_resolve(&p.p);\n");
str_add(&SRC, s.set.str, s.set.len);
str_addf(&SRC, "}\n");
str_addf(&SRC, "void get_%s(struct %s *s, %s_list l, int i) {\n", n->name.str, n->name.str, n->name.str);
str_addf(&SRC, "\t%s_ptr p;\n", n->name.str);
str_addf(&SRC, "\tp.p = capn_getp(l.p, i);\n");
str_addf(&SRC, "\tp.p = capn_getp(l.p, i, 0);\n");
str_addf(&SRC, "\tread_%s(s, p);\n", n->name.str);
str_addf(&SRC, "}\n");
str_addf(&SRC, "void set_%s(const struct %s *s, %s_list l, int i) {\n", n->name.str, n->name.str, n->name.str);
str_addf(&SRC, "\t%s_ptr p;\n", n->name.str);
str_addf(&SRC, "\tp.p = capn_getp(l.p, i);\n");
str_addf(&SRC, "\tp.p = capn_getp(l.p, i, 0);\n");
str_addf(&SRC, "\twrite_%s(s, p);\n", n->name.str);
str_addf(&SRC, "}\n");
}
@ -1076,9 +1081,11 @@ int main() {
g_valseg.data = calloc(1, capn.seglist->len);
g_valseg.cap = capn.seglist->len;
root.p = capn_getp(capn_root(&capn), 0);
root.p = capn_getp(capn_root(&capn), 0, 1);
read_CodeGeneratorRequest(&req, root);
capn_resolve(&req.nodes.p);
for (i = 0; i < req.nodes.p.len; i++) {
n = calloc(1, sizeof(*n));
get_Node(&n->n, req.nodes, i);
@ -1091,6 +1098,7 @@ int main() {
break;
case Node__struct:
capn_resolve(&n->n._struct.fields.p);
n->next = all_structs;
all_structs = n;
break;
@ -1109,6 +1117,7 @@ int main() {
for (n = all_files; n != NULL; n = n->next) {
struct str b = STR_INIT;
capn_resolve(&n->n.nestedNodes.p);
for (i = n->n.nestedNodes.p.len-1; i >= 0; i--) {
struct Node_NestedNode nest;
@ -1119,6 +1128,8 @@ int main() {
str_release(&b);
}
capn_resolve(&req.requestedFiles.p);
for (i = 0; i < req.requestedFiles.p.len; i++) {
struct CodeGeneratorRequest_RequestedFile file_req;
static struct str b = STR_INIT;
@ -1143,6 +1154,8 @@ int main() {
str_addf(&HDR, "/* AUTO GENERATED - DO NOT EDIT */\n");
str_addf(&HDR, "#include <capn.h>\n");
capn_resolve(&file_req.imports.p);
for (j = 0; j < file_req.imports.p.len; j++) {
struct CodeGeneratorRequest_RequestedFile_Import im;
get_CodeGeneratorRequest_RequestedFile_Import(&im, file_req.imports, j);
@ -1208,14 +1221,14 @@ int main() {
if (g_nullused)
fprintf(srcf, "static const capn_ptr capn_null = {CAPN_NULL};\n");
if (g_valseg.len) {
if (g_valseg.len > 8) {
fprintf(srcf, "static const uint8_t capn_buf[%d] = {", g_valseg.len-8);
for (i = 8; i < g_valseg.len; i++) {
if (i > 8)
for (j = 8; j < g_valseg.len; j++) {
if (j > 8)
fprintf(srcf, ",");
if ((i % 8) == 0)
if ((j % 8) == 0)
fprintf(srcf, "\n\t");
fprintf(srcf, "%u", ((uint8_t*)g_valseg.data)[i]);
fprintf(srcf, "%u", ((uint8_t*)g_valseg.data)[j]);
}
fprintf(srcf, "\n};\n");

2
compiler/schema-test.cpp
View file

@ -184,7 +184,7 @@ TEST(Schema, ReadSimple) {
struct capn ctx;
ASSERT_EQ(0, capn_init_mem(&ctx, simple_schema, sizeof(simple_schema), 0));
CodeGeneratorRequest_ptr root = {capn_getp(capn_root(&ctx), 0)};
CodeGeneratorRequest_ptr root = {capn_getp(capn_root(&ctx), 0, 1)};
EXPECT_EQ(CAPN_STRUCT, root.p.type);
struct CodeGeneratorRequest req;

120
compiler/schema.capnp.c
View file

@ -13,12 +13,13 @@ Node_list new_Node_list(struct capn_segment *s, int len) {
return p;
}
void read_Node(struct Node *s, Node_ptr p) {
capn_resolve(&p.p);
s->id = capn_read64(p.p, 0);
s->displayName = capn_get_text(p.p, 0, capn_val0);
s->displayNamePrefixLength = capn_read32(p.p, 8);
s->scopeId = capn_read64(p.p, 16);
s->nestedNodes.p = capn_getp(p.p, 1);
s->annotations.p = capn_getp(p.p, 2);
s->nestedNodes.p = capn_getp(p.p, 1, 0);
s->annotations.p = capn_getp(p.p, 2, 0);
s->which = (enum Node_which) capn_read16(p.p, 12);
switch (s->which) {
case Node__struct:
@ -28,20 +29,20 @@ void read_Node(struct Node *s, Node_ptr p) {
s->_struct.isGroup = (capn_read8(p.p, 28) & 1) != 0;
s->_struct.discriminantCount = capn_read16(p.p, 30);
s->_struct.discriminantOffset = capn_read32(p.p, 32);
s->_struct.fields.p = capn_getp(p.p, 3);
s->_struct.fields.p = capn_getp(p.p, 3, 0);
break;
case Node__enum:
s->_enum.enumerants.p = capn_getp(p.p, 3);
s->_enum.enumerants.p = capn_getp(p.p, 3, 0);
break;
case Node__interface:
s->_interface.methods.p = capn_getp(p.p, 3);
s->_interface.methods.p = capn_getp(p.p, 3, 0);
break;
case Node__const:
s->_const.type.p = capn_getp(p.p, 3);
s->_const.value.p = capn_getp(p.p, 4);
s->_const.type.p = capn_getp(p.p, 3, 0);
s->_const.value.p = capn_getp(p.p, 4, 0);
break;
case Node_annotation:
s->annotation.type.p = capn_getp(p.p, 3);
s->annotation.type.p = capn_getp(p.p, 3, 0);
s->annotation.targetsFile = (capn_read8(p.p, 14) & 1) != 0;
s->annotation.targetsConst = (capn_read8(p.p, 14) & 2) != 0;
s->annotation.targetsEnum = (capn_read8(p.p, 14) & 4) != 0;
@ -60,6 +61,7 @@ void read_Node(struct Node *s, Node_ptr p) {
}
}
void write_Node(const struct Node *s, Node_ptr p) {
capn_resolve(&p.p);
capn_write64(p.p, 0, s->id);
capn_set_text(p.p, 0, s->displayName);
capn_write32(p.p, 8, s->displayNamePrefixLength);
@ -108,12 +110,12 @@ void write_Node(const struct Node *s, Node_ptr p) {
}
void get_Node(struct Node *s, Node_list l, int i) {
Node_ptr p;
p.p = capn_getp(l.p, i);
p.p = capn_getp(l.p, i, 0);
read_Node(s, p);
}
void set_Node(const struct Node *s, Node_list l, int i) {
Node_ptr p;
p.p = capn_getp(l.p, i);
p.p = capn_getp(l.p, i, 0);
write_Node(s, p);
}
@ -128,21 +130,23 @@ Node_NestedNode_list new_Node_NestedNode_list(struct capn_segment *s, int len) {
return p;
}
void read_Node_NestedNode(struct Node_NestedNode *s, Node_NestedNode_ptr p) {
capn_resolve(&p.p);
s->name = capn_get_text(p.p, 0, capn_val0);
s->id = capn_read64(p.p, 0);
}
void write_Node_NestedNode(const struct Node_NestedNode *s, Node_NestedNode_ptr p) {
capn_resolve(&p.p);
capn_set_text(p.p, 0, s->name);
capn_write64(p.p, 0, s->id);
}
void get_Node_NestedNode(struct Node_NestedNode *s, Node_NestedNode_list l, int i) {
Node_NestedNode_ptr p;
p.p = capn_getp(l.p, i);
p.p = capn_getp(l.p, i, 0);
read_Node_NestedNode(s, p);
}
void set_Node_NestedNode(const struct Node_NestedNode *s, Node_NestedNode_list l, int i) {
Node_NestedNode_ptr p;
p.p = capn_getp(l.p, i);
p.p = capn_getp(l.p, i, 0);
write_Node_NestedNode(s, p);
}
@ -157,16 +161,17 @@ Field_list new_Field_list(struct capn_segment *s, int len) {
return p;
}
void read_Field(struct Field *s, Field_ptr p) {
capn_resolve(&p.p);
s->name = capn_get_text(p.p, 0, capn_val0);
s->codeOrder = capn_read16(p.p, 0);
s->annotations.p = capn_getp(p.p, 1);
s->annotations.p = capn_getp(p.p, 1, 0);
s->discriminantValue = capn_read16(p.p, 2) ^ 65535u;
s->which = (enum Field_which) capn_read16(p.p, 8);
switch (s->which) {
case Field_slot:
s->slot.offset = capn_read32(p.p, 4);
s->slot.type.p = capn_getp(p.p, 2);
s->slot.defaultValue.p = capn_getp(p.p, 3);
s->slot.type.p = capn_getp(p.p, 2, 0);
s->slot.defaultValue.p = capn_getp(p.p, 3, 0);
break;
case Field_group:
s->group.typeId = capn_read64(p.p, 16);
@ -184,6 +189,7 @@ void read_Field(struct Field *s, Field_ptr p) {
}
}
void write_Field(const struct Field *s, Field_ptr p) {
capn_resolve(&p.p);
capn_set_text(p.p, 0, s->name);
capn_write16(p.p, 0, s->codeOrder);
capn_setp(p.p, 1, s->annotations.p);
@ -212,12 +218,12 @@ void write_Field(const struct Field *s, Field_ptr p) {
}
void get_Field(struct Field *s, Field_list l, int i) {
Field_ptr p;
p.p = capn_getp(l.p, i);
p.p = capn_getp(l.p, i, 0);
read_Field(s, p);
}
void set_Field(const struct Field *s, Field_list l, int i) {
Field_ptr p;
p.p = capn_getp(l.p, i);
p.p = capn_getp(l.p, i, 0);
write_Field(s, p);
}
@ -232,23 +238,25 @@ Enumerant_list new_Enumerant_list(struct capn_segment *s, int len) {
return p;
}
void read_Enumerant(struct Enumerant *s, Enumerant_ptr p) {
capn_resolve(&p.p);
s->name = capn_get_text(p.p, 0, capn_val0);
s->codeOrder = capn_read16(p.p, 0);
s->annotations.p = capn_getp(p.p, 1);
s->annotations.p = capn_getp(p.p, 1, 0);
}
void write_Enumerant(const struct Enumerant *s, Enumerant_ptr p) {
capn_resolve(&p.p);
capn_set_text(p.p, 0, s->name);
capn_write16(p.p, 0, s->codeOrder);
capn_setp(p.p, 1, s->annotations.p);
}
void get_Enumerant(struct Enumerant *s, Enumerant_list l, int i) {
Enumerant_ptr p;
p.p = capn_getp(l.p, i);
p.p = capn_getp(l.p, i, 0);
read_Enumerant(s, p);
}
void set_Enumerant(const struct Enumerant *s, Enumerant_list l, int i) {
Enumerant_ptr p;
p.p = capn_getp(l.p, i);
p.p = capn_getp(l.p, i, 0);
write_Enumerant(s, p);
}
@ -263,14 +271,16 @@ Method_list new_Method_list(struct capn_segment *s, int len) {
return p;
}
void read_Method(struct Method *s, Method_ptr p) {
capn_resolve(&p.p);
s->name = capn_get_text(p.p, 0, capn_val0);
s->codeOrder = capn_read16(p.p, 0);
s->params.p = capn_getp(p.p, 1);
s->params.p = capn_getp(p.p, 1, 0);
s->requiredParamCount = capn_read16(p.p, 2);
s->returnType.p = capn_getp(p.p, 2);
s->annotations.p = capn_getp(p.p, 3);
s->returnType.p = capn_getp(p.p, 2, 0);
s->annotations.p = capn_getp(p.p, 3, 0);
}
void write_Method(const struct Method *s, Method_ptr p) {
capn_resolve(&p.p);
capn_set_text(p.p, 0, s->name);
capn_write16(p.p, 0, s->codeOrder);
capn_setp(p.p, 1, s->params.p);
@ -280,12 +290,12 @@ void write_Method(const struct Method *s, Method_ptr p) {
}
void get_Method(struct Method *s, Method_list l, int i) {
Method_ptr p;
p.p = capn_getp(l.p, i);
p.p = capn_getp(l.p, i, 0);
read_Method(s, p);
}
void set_Method(const struct Method *s, Method_list l, int i) {
Method_ptr p;
p.p = capn_getp(l.p, i);
p.p = capn_getp(l.p, i, 0);
write_Method(s, p);
}
@ -300,12 +310,14 @@ Method_Param_list new_Method_Param_list(struct capn_segment *s, int len) {
return p;
}
void read_Method_Param(struct Method_Param *s, Method_Param_ptr p) {
capn_resolve(&p.p);
s->name = capn_get_text(p.p, 0, capn_val0);
s->type.p = capn_getp(p.p, 1);
s->defaultValue.p = capn_getp(p.p, 2);
s->annotations.p = capn_getp(p.p, 3);
s->type.p = capn_getp(p.p, 1, 0);
s->defaultValue.p = capn_getp(p.p, 2, 0);
s->annotations.p = capn_getp(p.p, 3, 0);
}
void write_Method_Param(const struct Method_Param *s, Method_Param_ptr p) {
capn_resolve(&p.p);
capn_set_text(p.p, 0, s->name);
capn_setp(p.p, 1, s->type.p);
capn_setp(p.p, 2, s->defaultValue.p);
@ -313,12 +325,12 @@ void write_Method_Param(const struct Method_Param *s, Method_Param_ptr p) {
}
void get_Method_Param(struct Method_Param *s, Method_Param_list l, int i) {
Method_Param_ptr p;
p.p = capn_getp(l.p, i);
p.p = capn_getp(l.p, i, 0);
read_Method_Param(s, p);
}
void set_Method_Param(const struct Method_Param *s, Method_Param_list l, int i) {
Method_Param_ptr p;
p.p = capn_getp(l.p, i);
p.p = capn_getp(l.p, i, 0);
write_Method_Param(s, p);
}
@ -333,10 +345,11 @@ Type_list new_Type_list(struct capn_segment *s, int len) {
return p;
}
void read_Type(struct Type *s, Type_ptr p) {
capn_resolve(&p.p);
s->which = (enum Type_which) capn_read16(p.p, 0);
switch (s->which) {
case Type__list:
s->_list.elementType.p = capn_getp(p.p, 0);
s->_list.elementType.p = capn_getp(p.p, 0, 0);
break;
case Type__enum:
s->_enum.typeId = capn_read64(p.p, 8);
@ -352,6 +365,7 @@ void read_Type(struct Type *s, Type_ptr p) {
}
}
void write_Type(const struct Type *s, Type_ptr p) {
capn_resolve(&p.p);
capn_write16(p.p, 0, s->which);
switch (s->which) {
case Type__list:
@ -372,12 +386,12 @@ void write_Type(const struct Type *s, Type_ptr p) {
}
void get_Type(struct Type *s, Type_list l, int i) {
Type_ptr p;
p.p = capn_getp(l.p, i);
p.p = capn_getp(l.p, i, 0);
read_Type(s, p);
}
void set_Type(const struct Type *s, Type_list l, int i) {
Type_ptr p;
p.p = capn_getp(l.p, i);
p.p = capn_getp(l.p, i, 0);
write_Type(s, p);
}
@ -392,6 +406,7 @@ Value_list new_Value_list(struct capn_segment *s, int len) {
return p;
}
void read_Value(struct Value *s, Value_ptr p) {
capn_resolve(&p.p);
s->which = (enum Value_which) capn_read16(p.p, 0);
switch (s->which) {
case Value__bool:
@ -425,13 +440,14 @@ void read_Value(struct Value *s, Value_ptr p) {
case Value__list:
case Value__struct:
case Value_object:
s->object = capn_getp(p.p, 0);
s->object = capn_getp(p.p, 0, 0);
break;
default:
break;
}
}
void write_Value(const struct Value *s, Value_ptr p) {
capn_resolve(&p.p);
capn_write16(p.p, 0, s->which);
switch (s->which) {
case Value__bool:
@ -473,12 +489,12 @@ void write_Value(const struct Value *s, Value_ptr p) {
}
void get_Value(struct Value *s, Value_list l, int i) {
Value_ptr p;
p.p = capn_getp(l.p, i);
p.p = capn_getp(l.p, i, 0);
read_Value(s, p);
}
void set_Value(const struct Value *s, Value_list l, int i) {
Value_ptr p;
p.p = capn_getp(l.p, i);
p.p = capn_getp(l.p, i, 0);
write_Value(s, p);
}
@ -493,21 +509,23 @@ Annotation_list new_Annotation_list(struct capn_segment *s, int len) {
return p;
}
void read_Annotation(struct Annotation *s, Annotation_ptr p) {
capn_resolve(&p.p);
s->id = capn_read64(p.p, 0);
s->value.p = capn_getp(p.p, 0);
s->value.p = capn_getp(p.p, 0, 0);
}
void write_Annotation(const struct Annotation *s, Annotation_ptr p) {
capn_resolve(&p.p);
capn_write64(p.p, 0, s->id);
capn_setp(p.p, 0, s->value.p);
}
void get_Annotation(struct Annotation *s, Annotation_list l, int i) {
Annotation_ptr p;
p.p = capn_getp(l.p, i);
p.p = capn_getp(l.p, i, 0);
read_Annotation(s, p);
}
void set_Annotation(const struct Annotation *s, Annotation_list l, int i) {
Annotation_ptr p;
p.p = capn_getp(l.p, i);
p.p = capn_getp(l.p, i, 0);
write_Annotation(s, p);
}
@ -522,21 +540,23 @@ CodeGeneratorRequest_list new_CodeGeneratorRequest_list(struct capn_segment *s,
return p;
}
void read_CodeGeneratorRequest(struct CodeGeneratorRequest *s, CodeGeneratorRequest_ptr p) {
s->nodes.p = capn_getp(p.p, 0);
s->requestedFiles.p = capn_getp(p.p, 1);
capn_resolve(&p.p);
s->nodes.p = capn_getp(p.p, 0, 0);
s->requestedFiles.p = capn_getp(p.p, 1, 0);
}
void write_CodeGeneratorRequest(const struct CodeGeneratorRequest *s, CodeGeneratorRequest_ptr p) {
capn_resolve(&p.p);
capn_setp(p.p, 0, s->nodes.p);
capn_setp(p.p, 1, s->requestedFiles.p);
}
void get_CodeGeneratorRequest(struct CodeGeneratorRequest *s, CodeGeneratorRequest_list l, int i) {
CodeGeneratorRequest_ptr p;
p.p = capn_getp(l.p, i);
p.p = capn_getp(l.p, i, 0);
read_CodeGeneratorRequest(s, p);
}
void set_CodeGeneratorRequest(const struct CodeGeneratorRequest *s, CodeGeneratorRequest_list l, int i) {
CodeGeneratorRequest_ptr p;
p.p = capn_getp(l.p, i);
p.p = capn_getp(l.p, i, 0);
write_CodeGeneratorRequest(s, p);
}
@ -551,23 +571,25 @@ CodeGeneratorRequest_RequestedFile_list new_CodeGeneratorRequest_RequestedFile_l
return p;
}
void read_CodeGeneratorRequest_RequestedFile(struct CodeGeneratorRequest_RequestedFile *s, CodeGeneratorRequest_RequestedFile_ptr p) {
capn_resolve(&p.p);
s->id = capn_read64(p.p, 0);
s->filename = capn_get_text(p.p, 0, capn_val0);
s->imports.p = capn_getp(p.p, 1);
s->imports.p = capn_getp(p.p, 1, 0);
}
void write_CodeGeneratorRequest_RequestedFile(const struct CodeGeneratorRequest_RequestedFile *s, CodeGeneratorRequest_RequestedFile_ptr p) {
capn_resolve(&p.p);
capn_write64(p.p, 0, s->id);
capn_set_text(p.p, 0, s->filename);
capn_setp(p.p, 1, s->imports.p);
}
void get_CodeGeneratorRequest_RequestedFile(struct CodeGeneratorRequest_RequestedFile *s, CodeGeneratorRequest_RequestedFile_list l, int i) {
CodeGeneratorRequest_RequestedFile_ptr p;
p.p = capn_getp(l.p, i);
p.p = capn_getp(l.p, i, 0);
read_CodeGeneratorRequest_RequestedFile(s, p);
}
void set_CodeGeneratorRequest_RequestedFile(const struct CodeGeneratorRequest_RequestedFile *s, CodeGeneratorRequest_RequestedFile_list l, int i) {
CodeGeneratorRequest_RequestedFile_ptr p;
p.p = capn_getp(l.p, i);
p.p = capn_getp(l.p, i, 0);
write_CodeGeneratorRequest_RequestedFile(s, p);
}
@ -582,20 +604,22 @@ CodeGeneratorRequest_RequestedFile_Import_list new_CodeGeneratorRequest_Requeste
return p;
}
void read_CodeGeneratorRequest_RequestedFile_Import(struct CodeGeneratorRequest_RequestedFile_Import *s, CodeGeneratorRequest_RequestedFile_Import_ptr p) {
capn_resolve(&p.p);
s->id = capn_read64(p.p, 0);
s->name = capn_get_text(p.p, 0, capn_val0);
}
void write_CodeGeneratorRequest_RequestedFile_Import(const struct CodeGeneratorRequest_RequestedFile_Import *s, CodeGeneratorRequest_RequestedFile_Import_ptr p) {
capn_resolve(&p.p);
capn_write64(p.p, 0, s->id);
capn_set_text(p.p, 0, s->name);
}
void get_CodeGeneratorRequest_RequestedFile_Import(struct CodeGeneratorRequest_RequestedFile_Import *s, CodeGeneratorRequest_RequestedFile_Import_list l, int i) {
CodeGeneratorRequest_RequestedFile_Import_ptr p;
p.p = capn_getp(l.p, i);
p.p = capn_getp(l.p, i, 0);
read_CodeGeneratorRequest_RequestedFile_Import(s, p);
}
void set_CodeGeneratorRequest_RequestedFile_Import(const struct CodeGeneratorRequest_RequestedFile_Import *s, CodeGeneratorRequest_RequestedFile_Import_list l, int i) {
CodeGeneratorRequest_RequestedFile_Import_ptr p;
p.p = capn_getp(l.p, i);
p.p = capn_getp(l.p, i, 0);
write_CodeGeneratorRequest_RequestedFile_Import(s, p);
}

332
compiler/test.capnp.c
View file

File diff suppressed because it is too large Load diff