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

stop cheating

Browse source
This commit is contained in:
David Renshaw 2014-05-11 10:44:30 -04:00
parent 3ded3f4153
commit 5e9ade5d15
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -190,6 +190,8 @@ private:
std::unordered_set<uint64_t> usedImports; std::unordered_set<uint64_t> usedImports;
bool hasInterfaces = false; bool hasInterfaces = false;
kj::StringPtr outerClassName;
kj::StringTree javaFullName(Schema schema) { kj::StringTree javaFullName(Schema schema) {
auto node = schema.getProto(); auto node = schema.getProto();
if (node.getScopeId() == 0) { if (node.getScopeId() == 0) {
@ -199,7 +201,7 @@ private:
return kj::strTree("", annotation.getValue().getText()); return kj::strTree("", annotation.getValue().getText());
}*/ }*/
} }
return kj::strTree(" Addressbook"); // CHEATING! return kj::strTree(outerClassName);
} else { } else {
Schema parent = schemaLoader.get(node.getScopeId()); Schema parent = schemaLoader.get(node.getScopeId());
for (auto nested: parent.getProto().getNestedNodes()) { for (auto nested: parent.getProto().getNestedNodes()) {
@ -1457,8 +1459,7 @@ private:
}; };
FileText makeFileText(Schema schema, FileText makeFileText(Schema schema,
schema::CodeGeneratorRequest::RequestedFile::Reader request, schema::CodeGeneratorRequest::RequestedFile::Reader request) {
kj::StringPtr outerClassName) {
usedImports.clear(); usedImports.clear();
auto node = schema.getProto(); auto node = schema.getProto();
@ -1592,11 +1593,11 @@ private:
KJ_IF_MAYBE(dotpos, filename.findLast('.')) { KJ_IF_MAYBE(dotpos, filename.findLast('.')) {
stemend = *dotpos; stemend = *dotpos;
} }
auto outerClassName = toTitleCase(kj::str(filename.slice(stemstart, stemend))); outerClassName = toTitleCase(kj::str(filename.slice(stemstart, stemend)));
auto genFileName = kj::str(filename.slice(0, stemstart), outerClassName, ".java"); auto genFileName = kj::str(filename.slice(0, stemstart), outerClassName, ".java");
auto fileText = makeFileText(schema, requestedFile, outerClassName); auto fileText = makeFileText(schema, requestedFile);
writeFile(genFileName, fileText.header); writeFile(genFileName, fileText.header);
// writeFile(kj::str(schema.getProto().getDisplayName(), ".c++"), fileText.source); // writeFile(kj::str(schema.getProto().getDisplayName(), ".c++"), fileText.source);