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

some cleanup

Browse source
This commit is contained in:
David Renshaw 2014-05-11 13:49:50 -04:00
parent 8c5bc477fe
commit 89f060c8af
2 changed files with 3 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -27,7 +27,7 @@ CAPNPC_JAVA_SOURCES=src/compiler/capnpc-java.c++
all : capnpc-java addressbook capnp all : capnpc-java addressbook capnp
clean : clean :
rm -rf capnpc-java capnp rm -rf capnpc-java capnp examples/*.class
capnp : $(CAPNP_COMPILATION_MARKER) capnp : $(CAPNP_COMPILATION_MARKER)

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

@ -1464,7 +1464,6 @@ private:
// ----------------------------------------------------------------- // -----------------------------------------------------------------
struct FileText { struct FileText {
kj::StringTree header;
kj::StringTree source; kj::StringTree source;
}; };
@ -1523,24 +1522,10 @@ private:
"// source: ", baseName(displayName), "\n", "// source: ", baseName(displayName), "\n",
"\n", "\n",
//"import capnp;\n", //"import capnp;\n",
hasInterfaces ? kj::strTree("#include <capnp/capability.h>\n") : kj::strTree(),
"\n",
KJ_MAP(path, includes) {
if (path.startsWith("/")) {
return kj::strTree("#include <", path.slice(1), ".h>\n");
} else {
return kj::strTree("#include \"", path, ".h\"\n");
}
},
"\n",
// KJ_MAP(n, namespaceParts) { return kj::strTree("namespace ", n, " {\n"); }, "\n", // KJ_MAP(n, namespaceParts) { return kj::strTree("namespace ", n, " {\n"); }, "\n",
"public class ", outerClassName, " {\n", "public class ", outerClassName, " {\n",
KJ_MAP(n, nodeTexts) { return kj::mv(n.outerTypeDef); }, KJ_MAP(n, nodeTexts) { return kj::mv(n.outerTypeDef); },
KJ_MAP(n, namespaceParts) { return kj::strTree("}\n"); }, "\n"), KJ_MAP(n, namespaceParts) { return kj::strTree("}\n"); }, "\n")
kj::strTree()
}; };
} }
@ -1609,8 +1594,7 @@ private:
auto fileText = makeFileText(schema, requestedFile); auto fileText = makeFileText(schema, requestedFile);
writeFile(genFileName, fileText.header); writeFile(genFileName, fileText.source);
// writeFile(kj::str(schema.getProto().getDisplayName(), ".c++"), fileText.source);
} }
return true; return true;