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

more

Browse source
This commit is contained in:
David Renshaw 2014-10-28 17:34:54 -04:00
parent 71c77a97f8
commit 2557bd30c9
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
compiler/src/main/cpp/capnpc-java.c++
View file

@ -826,7 +826,6 @@ private:
FieldKind kind = FieldKind::PRIMITIVE; FieldKind kind = FieldKind::PRIMITIVE;
kj::String ownedType; kj::String ownedType;
kj::String type = typeName(field.getType(), kj::str("")).flatten();
kj::String builderType = typeName(field.getType(), kj::str(".Builder")).flatten(); kj::String builderType = typeName(field.getType(), kj::str(".Builder")).flatten();
kj::String readerType = typeName(field.getType(), kj::str(".Reader")).flatten(); kj::String readerType = typeName(field.getType(), kj::str(".Reader")).flatten();
kj::String defaultMask; // primitives only kj::String defaultMask; // primitives only
@ -939,37 +938,37 @@ private:
return FieldText { return FieldText {
kj::strTree( kj::strTree(
kj::mv(unionDiscrim.readerIsDef), kj::mv(unionDiscrim.readerIsDef),
spaces(indent), " public final ", type, " get", titleCase, "() {\n", spaces(indent), " public final ", readerType, " get", titleCase, "() {\n",
unionDiscrim.check, unionDiscrim.check,
(typeBody.which() == schema::Type::ENUM ? (typeBody.which() == schema::Type::ENUM ?
makeEnumGetter(field.getType().asEnum(), makeEnumGetter(field.getType().asEnum(),
offset, kj::str(defaultMaskParam), indent + 2) : offset, kj::str(defaultMaskParam), indent + 2) :
(typeBody.which() == schema::Type::VOID ? (typeBody.which() == schema::Type::VOID ?
kj::strTree(spaces(indent), " return org.capnproto.Void.VOID;\n") : kj::strTree(spaces(indent), " return org.capnproto.Void.VOID;\n") :
kj::strTree(spaces(indent), " return _get",toTitleCase(type),"Field(", offset, defaultMaskParam, ");\n"))), kj::strTree(spaces(indent), " return _get",toTitleCase(readerType),"Field(", offset, defaultMaskParam, ");\n"))),
spaces(indent), " }\n", spaces(indent), " }\n",
"\n"), "\n"),
kj::strTree( kj::strTree(
kj::mv(unionDiscrim.builderIsDef), kj::mv(unionDiscrim.builderIsDef),
spaces(indent), " public final ", type, " get", titleCase, "() {\n", spaces(indent), " public final ", builderType, " get", titleCase, "() {\n",
unionDiscrim.check, unionDiscrim.check,
(typeBody.which() == schema::Type::ENUM ? (typeBody.which() == schema::Type::ENUM ?
makeEnumGetter(field.getType().asEnum(), makeEnumGetter(field.getType().asEnum(),
offset, kj::str(defaultMaskParam), indent + 2) : offset, kj::str(defaultMaskParam), indent + 2) :
(typeBody.which() == schema::Type::VOID ? (typeBody.which() == schema::Type::VOID ?
kj::strTree(spaces(indent), " return org.capnproto.Void.VOID;\n") : kj::strTree(spaces(indent), " return org.capnproto.Void.VOID;\n") :
kj::strTree(spaces(indent), " return _get",toTitleCase(type),"Field(", offset, defaultMaskParam, ");\n"))), kj::strTree(spaces(indent), " return _get",toTitleCase(builderType),"Field(", offset, defaultMaskParam, ");\n"))),
spaces(indent), " }\n", spaces(indent), " }\n",
spaces(indent), " public final void set", titleCase, "(", type, " value) {\n", spaces(indent), " public final void set", titleCase, "(", readerType, " value) {\n",
unionDiscrim.set, unionDiscrim.set,
(typeBody.which() == schema::Type::ENUM ? (typeBody.which() == schema::Type::ENUM ?
kj::strTree(spaces(indent), " _setShortField(", offset, ", (short)value.ordinal());\n") : kj::strTree(spaces(indent), " _setShortField(", offset, ", (short)value.ordinal());\n") :
(typeBody.which() == schema::Type::VOID ? (typeBody.which() == schema::Type::VOID ?
kj::strTree() : kj::strTree() :
kj::strTree(spaces(indent), " _set", kj::strTree(spaces(indent), " _set",
toTitleCase(type), "Field(", offset, ", value", defaultMaskParam, ");\n"))), toTitleCase(builderType), "Field(", offset, ", value", defaultMaskParam, ");\n"))),
spaces(indent), " }\n", spaces(indent), " }\n",
"\n") "\n")
}; };