From 1d36fffae0c3ad6bc2e38b3f8b6ff709a0f7945c Mon Sep 17 00:00:00 2001
From: David Renshaw <dwrenshaw@gmail.com>
Date: Sat, 10 May 2014 17:56:28 -0400
Subject: [PATCH] more

---
 src/compiler/capnpc-java.c++ | 34 ++++++++++------------------------
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/src/compiler/capnpc-java.c++ b/src/compiler/capnpc-java.c++
index 3f1ca60..aa8b090 100644
--- a/src/compiler/capnpc-java.c++
+++ b/src/compiler/capnpc-java.c++
@@ -529,7 +529,8 @@ private:
 
   DiscriminantChecks makeDiscriminantChecks(kj::StringPtr scope,
                                             kj::StringPtr memberName,
-                                            StructSchema containingStruct) {
+                                            StructSchema containingStruct,
+                                            int indent) {
     auto discrimOffset = containingStruct.getProto().getStruct().getDiscriminantOffset();
 
     kj::String titleCase = toTitleCase(memberName);
@@ -545,8 +546,8 @@ private:
             "  _builder.setDataField<", scope, "Which>(\n"
             "      ", discrimOffset, " * ::capnp::ELEMENTS, ",
                       scope, upperCase, ");\n"),
-        kj::strTree("  inline bool is", titleCase, "() const;\n"),
-        kj::strTree("  inline bool is", titleCase, "();\n"),
+          kj::strTree(spaces(indent), "  public bool is", titleCase, "();\n"),
+          kj::strTree(spaces(indent), "  public bool is", titleCase, "();\n"),
         kj::strTree(
             "inline bool ", scope, "Reader::is", titleCase, "() const {\n"
             "  return which() == ", scope, upperCase, ";\n"
@@ -581,7 +582,7 @@ private:
 
     DiscriminantChecks unionDiscrim;
     if (hasDiscriminantValue(proto)) {
-      unionDiscrim = makeDiscriminantChecks(scope, proto.getName(), field.getContainingStruct());
+      unionDiscrim = makeDiscriminantChecks(scope, proto.getName(), field.getContainingStruct(), indent);
     }
 
     switch (proto.which()) {
@@ -1044,7 +1045,7 @@ private:
           "  struct ", name, ";\n"),
 
         kj::strTree(
-          "public static class ", fullName, " {\n",
+                    spaces(indent), "public static class ", fullName, " {\n",
           kj::strTree(makeReaderDef(fullName, name, structNode.getDiscriminantCount() != 0,
                                     KJ_MAP(f, fieldTexts) { return kj::mv(f.readerMethodDecls); },
                                     indent + 1)),
@@ -1058,8 +1059,8 @@ private:
                 }
               },
               "  };\n"),
-          KJ_MAP(n, nestedTypeDecls) { return kj::mv(n); },
-          "};\n"
+                    KJ_MAP(n, nestedTypeDecls) { return kj::mv(n); },
+                    spaces(indent), "};\n"
           "\n"),
 
       kj::strTree(
@@ -1297,7 +1298,7 @@ private:
 
     NodeTextNoSchema top = makeNodeTextWithoutNested(
         namespace_, scope, name, schema,
-        KJ_MAP(n, nestedTexts) { return kj::mv(n.outerTypeDecl); }, indent);
+        KJ_MAP(n, nestedTexts) { return kj::mv(n.outerTypeDef); }, indent);
 
     return NodeText {
       kj::mv(top.outerTypeDecl),
@@ -1526,27 +1527,12 @@ private:
           KJ_MAP(n, nodeTexts) { return kj::mv(n.outerTypeDef); },
           KJ_MAP(n, namespaceParts) { return kj::strTree("}  // namespace\n"); }, "\n",
 
-          separator, "\n"
-          "namespace capnp {\n"
-          "namespace schemas {\n"
-          "\n",
-          KJ_MAP(n, nodeTexts) { return kj::mv(n.capnpSchemaDecls); },
-          "\n"
-          "}  // namespace schemas\n"
-          "namespace _ {  // private\n"
-          "\n",
-          KJ_MAP(n, nodeTexts) { return kj::mv(n.capnpPrivateDecls); },
-          "\n"
-          "}  // namespace _ (private)\n"
-          "}  // namespace capnp\n"
-
           "\n", separator, "\n",
           KJ_MAP(n, namespaceParts) { return kj::strTree("namespace ", n, " {\n"); }, "\n",
           KJ_MAP(n, nodeTexts) { return kj::mv(n.readerBuilderDefs); },
           separator, "\n",
           KJ_MAP(n, nodeTexts) { return kj::mv(n.inlineMethodDefs); },
-          KJ_MAP(n, namespaceParts) { return kj::strTree("}  // namespace\n"); }, "\n",
-          "#endif  // CAPNP_INCLUDED_", kj::hex(node.getId()), "_\n"),
+          KJ_MAP(n, namespaceParts) { return kj::strTree("}  // namespace\n"); }, "\n"),
 
       kj::strTree(
           "// Generated by Cap'n Proto compiler, DO NOT EDIT\n"