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

tidy up interface generation

Browse source
This commit is contained in:
Vaci Koblizek 2020-11-02 16:56:10 +00:00
parent dba99ca17a
commit 407d25c8c2
1 changed files with 38 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -331,7 +331,6 @@ private:
return kj::strTree(javaFullName(type.asStruct()), ".", suffix); return kj::strTree(javaFullName(type.asStruct()), ".", suffix);
} }
} }
case schema::Type::INTERFACE: { case schema::Type::INTERFACE: {
auto interfaceSchema = type.asInterface(); auto interfaceSchema = type.asInterface();
if (interfaceSchema.getProto().getIsGeneric()) { if (interfaceSchema.getProto().getIsGeneric()) {
@ -347,7 +346,6 @@ private:
return kj::strTree(javaFullName(type.asInterface()), ".", suffix); return kj::strTree(javaFullName(type.asInterface()), ".", suffix);
} }
} }
case schema::Type::LIST: case schema::Type::LIST:
{ {
auto elementType = type.asList().getElementType(); auto elementType = type.asList().getElementType();
@ -392,7 +390,7 @@ private:
return kj::strTree("org.capnproto.ListList.", suffix, "<", kj::mv(inner), ">"); return kj::strTree("org.capnproto.ListList.", suffix, "<", kj::mv(inner), ">");
} }
case schema::Type::INTERFACE: case schema::Type::INTERFACE:
return kj::strTree("org.capnproto.PrimitiveList.Void.", suffix); return kj::strTree("org.capnproto.AnyPointer.", suffix);
case schema::Type::ANY_POINTER: case schema::Type::ANY_POINTER:
KJ_FAIL_REQUIRE("unimplemented"); KJ_FAIL_REQUIRE("unimplemented");
} }
@ -930,7 +928,6 @@ private:
auto typeBody = slot.getType(); auto typeBody = slot.getType();
auto defaultBody = slot.getDefaultValue(); auto defaultBody = slot.getDefaultValue();
switch (typeBody.which()) { switch (typeBody.which()) {
case schema::Type::VOID: case schema::Type::VOID:
kind = FieldKind::PRIMITIVE; kind = FieldKind::PRIMITIVE;
@ -1088,7 +1085,6 @@ private:
}; };
} else if (kind == FieldKind::INTERFACE) { } else if (kind == FieldKind::INTERFACE) {
auto factoryArg = makeFactoryArg(field.getType()); auto factoryArg = makeFactoryArg(field.getType());
auto clientType = typeName(field.getType(), kj::str("Client")).flatten(); auto clientType = typeName(field.getType(), kj::str("Client")).flatten();
auto serverType = typeName(field.getType(), kj::str("Server")).flatten(); auto serverType = typeName(field.getType(), kj::str("Server")).flatten();
@ -1501,7 +1497,6 @@ private:
">"); ">");
} }
kj::String readerTypeParams = readerTypeParamsTree.flatten(); kj::String readerTypeParams = readerTypeParamsTree.flatten();
auto readerTypeParamsInferred = (hasTypeParams ? "<>" : "");
kj::String builderTypeParams = builderTypeParamsTree.flatten(); kj::String builderTypeParams = builderTypeParamsTree.flatten();
kj::String factoryTypeParams = factoryTypeParamsTree.flatten(); kj::String factoryTypeParams = factoryTypeParamsTree.flatten();
@ -1529,8 +1524,8 @@ private:
" 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", factoryTypeParams, "\n", spaces(indent), " public static final class Factory", factoryTypeParams,
spaces(indent), " extends org.capnproto.StructFactory<Builder", builderTypeParams, ", Reader", readerTypeParams, "> {\n", " extends org.capnproto.StructFactory<Builder", builderTypeParams, ", Reader", readerTypeParams, "> {\n",
factoryMembers.flatten(), factoryMembers.flatten(),
spaces(indent), " public Factory(", spaces(indent), " public Factory(",
factoryArgs.flatten(), factoryArgs.flatten(),
@ -1650,8 +1645,7 @@ private:
spaces(indent), " _NOT_IN_SCHEMA,\n", spaces(indent), " _NOT_IN_SCHEMA,\n",
spaces(indent), " }\n"), spaces(indent), " }\n"),
KJ_MAP(n, nestedTypeDecls) { return kj::mv(n); }, KJ_MAP(n, nestedTypeDecls) { return kj::mv(n); },
spaces(indent), " public interface Pipeline", readerTypeParams, "\n", spaces(indent), " public interface Pipeline", readerTypeParams, " extends org.capnproto.Pipeline {\n",
spaces(indent), " extends org.capnproto.Pipeline {\n",
KJ_MAP(f, fieldTexts) { KJ_MAP(f, fieldTexts) {
return kj::mv(f.pipelineMethodDecls); return kj::mv(f.pipelineMethodDecls);
}, },
@ -1720,73 +1714,40 @@ private:
auto typeParamVec = getTypeParameters(schema); auto typeParamVec = getTypeParameters(schema);
bool hasTypeParams = typeParamVec.size() > 0; bool hasTypeParams = typeParamVec.size() > 0;
kj::String genericParamTypes = proto.getIsGeneric() auto params = [&](auto& prefix, auto& sep, auto& suffix, auto item) {
? kj::strTree("<", return kj::strTree(prefix, kj::StringTree(KJ_MAP(p, typeParamVec) { return item(p); }, sep), suffix).flatten();
kj::StringTree( };
KJ_MAP(arg, typeParamVec) {
return kj::strTree(arg); auto genericParamTypes = proto.getIsGeneric()
}, ", "), ? params("<", ", ", ">", [](auto& p) { return kj::strTree(p); })
">").flatten()
: kj::str(); : kj::str();
kj::StringTree readerTypeParamsTree; auto readerTypeParamsInferred = hasTypeParams ? "<>" : "";
kj::StringTree builderTypeParamsTree;
kj::StringTree factoryTypeParamsTree;
if (hasTypeParams) {
builderTypeParamsTree = kj::strTree(
"<",
kj::StringTree(KJ_MAP(p, typeParamVec) {
return kj::strTree(p, "_Builder");
}, ", "),
">");
readerTypeParamsTree = kj::strTree(
"<",
kj::StringTree(KJ_MAP(p, typeParamVec) {
return kj::strTree(p, "_Reader");
}, ", "),
">");
factoryTypeParamsTree = kj::strTree( auto factoryRef = hasTypeParams
"<", ? params("newFactory(", ", ", ")", [](auto& p) { return kj::strTree(p, "_Factory"); })
kj::StringTree(KJ_MAP(p, typeParamVec) {
return kj::strTree(p, "_Builder, ", p, "_Reader");
}, ", "),
">");
}
kj::String readerTypeParams = readerTypeParamsTree.flatten();
auto readerTypeParamsInferred = (hasTypeParams ? "<>" : "");
kj::String builderTypeParams = builderTypeParamsTree.flatten();
kj::String factoryTypeParams = factoryTypeParamsTree.flatten();
kj::StringTree factoryArgs = kj::StringTree(KJ_MAP(p, typeParamVec) {
return kj::strTree("org.capnproto.PointerFactory<", p, "_Builder, ", p, "_Reader> ", p, "_Factory");
}, ", ");
kj::StringTree factoryMembers = kj::strTree(KJ_MAP(p, typeParamVec) {
return kj::strTree(spaces(indent), " final org.capnproto.PointerFactory<", p, "_Builder, ", p, "_Reader> ", p, "_Factory;\n");
});
auto factoryConstructorParams = kj::StringTree(KJ_MAP(p, typeParamVec) {
return kj::strTree(p, "_Factory");
}, ", ").flatten();
kj::String factoryRef = hasTypeParams
? kj::str(kj::strTree("newFactory(",
kj::StringTree(KJ_MAP(p, typeParamVec) {
return kj::strTree(p, "_Factory");
}, ", ")
, ")"))
: kj::str("factory"); : kj::str("factory");
auto factoryTypeParams = hasTypeParams
? params("<", ", ", ">", [](auto& p) { return kj::strTree(p, "_Builder, ", p, "_Reader"); })
: kj::str();
auto factoryArgs = kj::StringTree(KJ_MAP(p, typeParamVec) {
return kj::strTree("org.capnproto.PointerFactory<", p, "_Builder, ", p, "_Reader> ", p, "_Factory");
}, ", ").flatten();
auto factoryMembers = kj::strTree(KJ_MAP(p, typeParamVec) {
return kj::strTree(spaces(indent), " final org.capnproto.PointerFactory<", p, "_Builder, ", p, "_Reader> ", p, "_Factory;\n");
}).flatten();
return InterfaceText { return InterfaceText {
kj::strTree( kj::strTree(
sp, "public static class ", name, genericParamTypes, " {\n", sp, "public static class ", name, genericParamTypes, " {\n",
sp, " public static final class Factory", factoryTypeParams, "\n", sp, " public static final class Factory", factoryTypeParams, "\n",
sp, " extends org.capnproto.Capability.Factory<Client> {\n", sp, " extends org.capnproto.Capability.Factory<Client> {\n",
factoryMembers.flatten(), factoryMembers,
sp, " public Factory(", sp, " public Factory(",
factoryArgs.flatten(), factoryArgs,
") {\n", ") {\n",
KJ_MAP(p, typeParamVec) { KJ_MAP(p, typeParamVec) {
return kj::strTree(sp, " this.", p, "_Factory = ", p, "_Factory;\n"); return kj::strTree(sp, " this.", p, "_Factory = ", p, "_Factory;\n");
@ -1799,24 +1760,21 @@ private:
"\n", "\n",
(hasTypeParams (hasTypeParams
? kj::strTree( ? kj::strTree(
sp, " public static final ", factoryTypeParams, "Factory", factoryTypeParams, "\n", sp, " public static ", factoryTypeParams, "Factory", factoryTypeParams, " newFactory(", factoryArgs, ") {\n",
sp, " newFactory(", factoryArgs.flatten(), ") {\n", sp, " return new Factory<>(",
sp, " return new Factory<>(", factoryConstructorParams, ");\n", params("", ", ", "", [](auto& p) { return kj::strTree(p, "_Factory"); }), ");\n",
sp, " }\n" sp, " }\n")
) : kj::strTree(sp, " public static final Factory factory = new Factory();\n")
: kj::strTree(
sp, " public static final Factory factory = new Factory();\n"
)
), ),
"\n", "\n",
sp, " public static class Client\n", sp, " public static class Client\n",
(superclasses.size() == 0 (superclasses.size() == 0
? kj::str(sp, " extends org.capnproto.Capability.Client ") ? kj::str(sp, " extends org.capnproto.Capability.Client ")
: kj::str( : kj::str(
KJ_MAP(s, superclasses) { KJ_MAP(s, superclasses) {
return kj::strTree(sp, " extends ", s.typeName, ".Client "); return kj::strTree(sp, " extends ", s.typeName, ".Client ");
}) })
), ),
"{\n", "{\n",
sp, " public Client() {}\n", sp, " public Client() {}\n",
sp, " public Client(org.capnproto.ClientHook hook) { super(hook); }\n", sp, " public Client(org.capnproto.ClientHook hook) { super(hook); }\n",