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

starting to work on indentation

Browse source
This commit is contained in:
David Renshaw 2014-05-10 17:03:14 -04:00
parent fb296d1e86
commit d115df6f05
1 changed files with 36 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -42,6 +42,8 @@
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#include <string>
#if HAVE_CONFIG_H #if HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif #endif
@ -164,6 +166,10 @@ kj::String safeIdentifier(kj::StringPtr identifier) {
} }
} }
kj::String spaces(int n) {
return kj::str(std::string(" ", n));
}
// ======================================================================================= // =======================================================================================
class CapnpcCppMain { class CapnpcCppMain {
@ -1064,27 +1070,24 @@ private:
}; };
kj::StringTree makeReaderDef(kj::StringPtr fullName, kj::StringPtr unqualifiedParentType, kj::StringTree makeReaderDef(kj::StringPtr fullName, kj::StringPtr unqualifiedParentType,
bool isUnion, kj::Array<kj::StringTree>&& methodDecls) { bool isUnion, kj::Array<kj::StringTree>&& methodDecls,
int indent) {
return kj::strTree( return kj::strTree(
"public static class Reader {\n" spaces(indent), "public static class Reader {\n",
" public Reader(::capnp::_::StructReader base): _reader(base) {}\n" spaces(indent), " public Reader(::capnp::_::StructReader base): _reader(base) {}\n",
"\n" "\n",
" inline ::capnp::MessageSize totalSize() const {\n" spaces(indent), " inline ::capnp::MessageSize totalSize() const {\n",
" return _reader.totalSize().asPublic();\n" spaces(indent), " return _reader.totalSize().asPublic();\n",
" }\n" spaces(indent), " }\n",
"\n", "\n",
isUnion ? kj::strTree(" inline Which which() const;\n") : kj::strTree(), isUnion ? kj::strTree(spaces(indent), " inline Which which() const;\n") : kj::strTree(),
kj::mv(methodDecls), kj::mv(methodDecls),
"private:\n" spaces(indent), " ::capnp::_::StructReader _reader;\n",
" ::capnp::_::StructReader _reader;\n" spaces(indent), " template <typename T, ::capnp::Kind k>\n",
" template <typename T, ::capnp::Kind k>\n" spaces(indent), " friend struct ::capnp::ToDynamic_;\n",
" friend struct ::capnp::ToDynamic_;\n" spaces(indent), " template <typename T, ::capnp::Kind k>\n",
" template <typename T, ::capnp::Kind k>\n" spaces(indent), "};\n"
" friend struct ::capnp::_::PointerHelpers;\n" "\n");
" template <typename T, ::capnp::Kind k>\n"
" friend struct ::capnp::List;\n"
"};\n"
"\n");
} }
kj::StringTree makeBuilderDef(kj::StringPtr fullName, kj::StringPtr unqualifiedParentType, kj::StringTree makeBuilderDef(kj::StringPtr fullName, kj::StringPtr unqualifiedParentType,
@ -1104,7 +1107,7 @@ private:
} }
StructText makeStructText(kj::StringPtr scope, kj::StringPtr name, StructSchema schema, StructText makeStructText(kj::StringPtr scope, kj::StringPtr name, StructSchema schema,
kj::Array<kj::StringTree> nestedTypeDecls) { 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, "::");
@ -1120,7 +1123,8 @@ private:
kj::strTree( kj::strTree(
"public static class ", fullName, " {\n", "public static class ", fullName, " {\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)),
" class Reader;\n" " class Reader;\n"
" class Builder;\n" " class Builder;\n"
" class Pipeline;\n", " class Pipeline;\n",
@ -1274,7 +1278,8 @@ private:
}; };
NodeText makeNodeText(kj::StringPtr namespace_, kj::StringPtr scope, NodeText makeNodeText(kj::StringPtr namespace_, kj::StringPtr scope,
kj::StringPtr name, Schema schema) { kj::StringPtr name, Schema schema,
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, "::");
@ -1284,7 +1289,8 @@ private:
kj::Vector<NodeText> nestedTexts(proto.getNestedNodes().size()); kj::Vector<NodeText> nestedTexts(proto.getNestedNodes().size());
for (auto nested: proto.getNestedNodes()) { for (auto nested: proto.getNestedNodes()) {
nestedTexts.add(makeNodeText( nestedTexts.add(makeNodeText(
namespace_, subScope, nested.getName(), schemaLoader.get(nested.getId()))); namespace_,
subScope, nested.getName(), schemaLoader.get(nested.getId()), indent + 1));
}; };
if (proto.isStruct()) { if (proto.isStruct()) {
@ -1292,7 +1298,7 @@ private:
if (field.isGroup()) { if (field.isGroup()) {
nestedTexts.add(makeNodeText( nestedTexts.add(makeNodeText(
namespace_, subScope, toTitleCase(field.getName()), namespace_, subScope, toTitleCase(field.getName()),
schemaLoader.get(field.getGroup().getTypeId()))); schemaLoader.get(field.getGroup().getTypeId()), indent + 1));
} }
} }
} else if (proto.isInterface()) { } else if (proto.isInterface()) {
@ -1371,7 +1377,7 @@ private:
NodeTextNoSchema top = makeNodeTextWithoutNested( NodeTextNoSchema top = makeNodeTextWithoutNested(
namespace_, scope, name, schema, namespace_, scope, name, schema,
KJ_MAP(n, nestedTexts) { return kj::mv(n.outerTypeDecl); }); KJ_MAP(n, nestedTexts) { return kj::mv(n.outerTypeDecl); }, indent);
return NodeText { return NodeText {
kj::mv(top.outerTypeDecl), kj::mv(top.outerTypeDecl),
@ -1412,7 +1418,8 @@ private:
NodeTextNoSchema makeNodeTextWithoutNested(kj::StringPtr namespace_, kj::StringPtr scope, NodeTextNoSchema makeNodeTextWithoutNested(kj::StringPtr namespace_, kj::StringPtr scope,
kj::StringPtr name, Schema schema, kj::StringPtr name, Schema schema,
kj::Array<kj::StringTree> nestedTypeDecls) { 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 hexId = kj::hex(proto.getId()); auto hexId = kj::hex(proto.getId());
@ -1423,7 +1430,7 @@ private:
case schema::Node::STRUCT: { case schema::Node::STRUCT: {
StructText structText = StructText structText =
makeStructText(scope, name, schema.asStruct(), kj::mv(nestedTypeDecls)); makeStructText(scope, name, schema.asStruct(), kj::mv(nestedTypeDecls), indent);
auto structNode = proto.getStruct(); auto structNode = proto.getStruct();
return NodeTextNoSchema { return NodeTextNoSchema {
@ -1562,7 +1569,7 @@ private:
} }
auto nodeTexts = KJ_MAP(nested, node.getNestedNodes()) { auto nodeTexts = KJ_MAP(nested, node.getNestedNodes()) {
return makeNodeText(namespacePrefix, "", nested.getName(), schemaLoader.get(nested.getId())); return makeNodeText(namespacePrefix, "", nested.getName(), schemaLoader.get(nested.getId()), 0);
}; };
kj::String separator = kj::str("// ", kj::repeat('=', 87), "\n"); kj::String separator = kj::str("// ", kj::repeat('=', 87), "\n");