serverscanning/capnproto-java-rpc
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

a start on generics

Browse source
This commit is contained in:
David Renshaw 2014-10-27 13:29:16 -04:00
parent 39eb2ed557
commit d1a2ce4049
2 changed files with 59 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
compiler/src/main/cpp/capnpc-java.c++
View file

@ -1091,11 +1091,23 @@ private:
} }
kj::StringTree makeReaderDef(kj::StringPtr fullName, kj::StringPtr unqualifiedParentType, kj::Vector<kj::String> getTypeParameters(Schema schema) {
StructSchema schema, kj::Array<kj::StringTree>&& methodDecls, auto node = schema.getProto();
kj::Vector<kj::String> result;
if (node.getScopeId() != 0) {
Schema parent = schemaLoader.get(node.getScopeId());
result = getTypeParameters(parent);
}
for (auto parameter : node.getParameters()) {
result.add(kj::str(parameter.getName(), "_", kj::hex(node.getId())));
}
return kj::mv(result);
}
kj::StringTree makeReaderDef(StructSchema schema, kj::StringPtr typeParams, kj::Array<kj::StringTree>&& methodDecls,
int indent) { int indent) {
return kj::strTree( return kj::strTree(
spaces(indent), "public static final class Reader extends org.capnproto.StructReader {\n", spaces(indent), "public static final class Reader", typeParams, " extends org.capnproto.StructReader {\n",
spaces(indent), " Reader(org.capnproto.SegmentReader segment, int data, int pointers,", spaces(indent), " Reader(org.capnproto.SegmentReader segment, int data, int pointers,",
"int dataSize, short pointerCount, int nestingLimit){\n", "int dataSize, short pointerCount, int nestingLimit){\n",
spaces(indent), " super(segment, data, pointers, dataSize, pointerCount, nestingLimit);\n", spaces(indent), " super(segment, data, pointers, dataSize, pointerCount, nestingLimit);\n",
@ -1107,11 +1119,10 @@ private:
"\n"); "\n");
} }
kj::StringTree makeBuilderDef(kj::StringPtr fullName, kj::StringPtr unqualifiedParentType, kj::StringTree makeBuilderDef(StructSchema schema, kj::StringPtr typeParams, kj::Array<kj::StringTree>&& methodDecls,
StructSchema schema, kj::Array<kj::StringTree>&& methodDecls,
int indent) { int indent) {
return kj::strTree( return kj::strTree(
spaces(indent), "public static final class Builder extends org.capnproto.StructBuilder {\n", spaces(indent), "public static final class Builder", typeParams, " extends org.capnproto.StructBuilder {\n",
spaces(indent), " Builder(org.capnproto.SegmentBuilder segment, int data, int pointers,", spaces(indent), " Builder(org.capnproto.SegmentBuilder segment, int data, int pointers,",
"int dataSize, short pointerCount){\n", "int dataSize, short pointerCount){\n",
spaces(indent), " super(segment, data, pointers, dataSize, pointerCount);\n", spaces(indent), " super(segment, data, pointers, dataSize, pointerCount);\n",
@ -1136,12 +1147,25 @@ private:
uint discrimOffset = structNode.getDiscriminantOffset(); uint discrimOffset = structNode.getDiscriminantOffset();
structNode.getPointerCount(); structNode.getPointerCount();
auto typeParamVec = getTypeParameters(schema);
kj::StringTree typeParamsTree;
if (typeParamVec.size() > 0) {
typeParamsTree = kj::strTree(
"<",
kj::StringTree(KJ_MAP(p, typeParamVec) {
return kj::strTree(p);
}, ", "),
">");
}
kj::String typeParams = typeParamsTree.flatten();
return StructText { return StructText {
kj::strTree( kj::strTree(
spaces(indent), "public static class ", name, " {\n", spaces(indent), "public static class ", name, " {\n",
kj::strTree( kj::strTree(
spaces(indent), " public static final org.capnproto.StructSize STRUCT_SIZE =\n", spaces(indent), " public static final org.capnproto.StructSize STRUCT_SIZE =",
spaces(indent), " new org.capnproto.StructSize((short)", structNode.getDataWordCount(), " new org.capnproto.StructSize((short)", structNode.getDataWordCount(),
",(short)", structNode.getPointerCount(), ");\n"), ",(short)", structNode.getPointerCount(), ");\n"),
spaces(indent), " public static final class Factory extends org.capnproto.StructFactory<Builder, Reader> {\n", spaces(indent), " public static final class Factory extends org.capnproto.StructFactory<Builder, Reader> {\n",
@ -1167,10 +1191,10 @@ private:
spaces(indent), " new org.capnproto.StructList.Factory<Builder, Reader>(factory);\n", spaces(indent), " new org.capnproto.StructList.Factory<Builder, Reader>(factory);\n",
kj::strTree(makeReaderDef(fullName, name, schema, kj::strTree(makeReaderDef(schema, typeParams,
KJ_MAP(f, fieldTexts) { return kj::mv(f.readerMethodDecls); }, KJ_MAP(f, fieldTexts) { return kj::mv(f.readerMethodDecls); },
indent + 1), indent + 1),
makeBuilderDef(fullName, name, schema, makeBuilderDef(schema, typeParams,
KJ_MAP(f, fieldTexts) { return kj::mv(f.builderMethodDecls); }, KJ_MAP(f, fieldTexts) { return kj::mv(f.builderMethodDecls); },
indent + 1)), indent + 1)),

25
compiler/src/test/schema/test.capnp
View file

@ -322,6 +322,31 @@ struct TestNewVersion {
new2 @4 :Text = "baz"; new2 @4 :Text = "baz";
} }
struct TestGenerics(Foo, Bar) {
foo @0 :Foo;
# rev @1 :TestGenerics(Bar, Foo);
# struct Inner {
# foo @0 :Foo;
# bar @1 :Bar;
# }
# struct Inner2(Baz) {
# bar @0 :Bar;
# baz @1 :Baz;
# innerBound @2 :Inner;
# innerUnbound @3 :TestGenerics.Inner;
# struct DeepNest(Qux) {
# foo @0 :Foo;
# bar @1 :Bar;
# baz @2 :Baz;
# qux @3 :Qux;
# }
# }
}
struct TestEmptyStruct {} struct TestEmptyStruct {}
struct TestConstants { struct TestConstants {