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

actually write out the enum def

Browse source
This commit is contained in:
David Renshaw 2014-05-10 19:51:11 -04:00
parent 475bf83450
commit b5a9cc7939
1 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/compiler/capnpc-java.c++
View file

@ -598,7 +598,9 @@ private:
return FieldText { return FieldText {
kj::strTree( kj::strTree(
kj::mv(unionDiscrim.readerIsDecl), kj::mv(unionDiscrim.readerIsDecl),
spaces(indent), " public ", titleCase, ".Reader get", titleCase, "();\n" spaces(indent), " public ", titleCase, ".Reader get", titleCase, "() {\n",
spaces(indent), " return new ", scope, titleCase, ".Reader(_reader);\n",
spaces(indent), " }\n",
"\n"), "\n"),
kj::strTree( kj::strTree(
@ -1045,7 +1047,7 @@ private:
kj::Array<kj::StringTree> nestedTypeDecls, int indent) { kj::Array<kj::StringTree> nestedTypeDecls, int indent) {
auto proto = schema.getProto(); auto proto = schema.getProto();
auto fullName = kj::str(scope, name); auto fullName = kj::str(scope, name);
auto subScope = kj::str(fullName, "::"); auto subScope = kj::str(fullName, ".");
auto fieldTexts = KJ_MAP(f, schema.getFields()) { return makeFieldText(subScope, f, indent + 1); }; auto fieldTexts = KJ_MAP(f, schema.getFields()) { return makeFieldText(subScope, f, indent + 1); };
auto structNode = proto.getStruct(); auto structNode = proto.getStruct();
@ -1056,7 +1058,7 @@ private:
" struct ", name, ";\n"), " struct ", name, ";\n"),
kj::strTree( kj::strTree(
spaces(indent), "public static class ", fullName, " {\n", spaces(indent), "public static class ", name, " {\n",
kj::strTree(makeReaderDef(fullName, name, structNode.getDiscriminantCount() != 0, kj::strTree(makeReaderDef(fullName, name, structNode.getDiscriminantCount() != 0,
KJ_MAP(f, fieldTexts) { return kj::mv(f.readerMethodDecls); }, KJ_MAP(f, fieldTexts) { return kj::mv(f.readerMethodDecls); },
indent + 1)), indent + 1)),
@ -1216,7 +1218,7 @@ private:
int indent) { int indent) {
auto proto = schema.getProto(); auto proto = schema.getProto();
auto fullName = kj::str(scope, name); auto fullName = kj::str(scope, name);
auto subScope = kj::str(fullName, "::"); auto subScope = kj::str(fullName, ".");
auto hexId = kj::hex(proto.getId()); auto hexId = kj::hex(proto.getId());
// Compute nested nodes, including groups. // Compute nested nodes, including groups.
@ -1392,20 +1394,14 @@ private:
auto enumerants = schema.asEnum().getEnumerants(); auto enumerants = schema.asEnum().getEnumerants();
return NodeTextNoSchema { return NodeTextNoSchema {
scope.size() == 0 ? kj::strTree() : kj::strTree( kj::strTree(),
" enum class ", name, ": uint16_t {\n",
KJ_MAP(e, enumerants) {
return kj::strTree(" ", toUpperCase(e.getProto().getName()), ",\n");
},
" };\n"
"\n"),
scope.size() > 0 ? kj::strTree() : kj::strTree( kj::strTree(
"enum class ", name, ": uint16_t {\n", spaces(indent), "public enum ", name, " {\n",
KJ_MAP(e, enumerants) { KJ_MAP(e, enumerants) {
return kj::strTree(" ", toUpperCase(e.getProto().getName()), ",\n"); return kj::strTree(spaces(indent), " ", toUpperCase(e.getProto().getName()), ",\n");
}, },
"};\n" spaces(indent), "};\n"
"\n"), "\n"),
kj::strTree(), kj::strTree(),