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

don't use values() for enums

Browse source
This commit is contained in:
David Renshaw 2014-10-01 20:50:44 -04:00
parent 582b0eb54f
commit ff04e3a98c
1 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -644,6 +644,20 @@ private:
ANY_POINTER ANY_POINTER
}; };
kj::StringTree makeEnumGetter(EnumSchema schema, kj::String member, uint offset, int indent) {
auto enumerants = schema.getEnumerants();
return kj::strTree(
spaces(indent), "switch(", member, ".getShortField(", offset, ")) {\n",
KJ_MAP(e, enumerants) {
return kj::strTree(spaces(indent+1), "case ", e.getOrdinal(), " : return ",
javaFullName(schema), ".",
toUpperCase(e.getProto().getName()), ";\n");
},
spaces(indent+1), "default: return ", javaFullName(schema), "._UNKNOWN;\n",
spaces(indent), "}\n"
);
}
FieldText makeFieldText(kj::StringPtr scope, StructSchema::Field field, int indent) { FieldText makeFieldText(kj::StringPtr scope, StructSchema::Field field, int indent) {
auto proto = field.getProto(); auto proto = field.getProto();
kj::String titleCase = toTitleCase(proto.getName()); kj::String titleCase = toTitleCase(proto.getName());
@ -813,31 +827,31 @@ private:
uint offset = slot.getOffset(); uint offset = slot.getOffset();
auto structSchema = field.getContainingStruct();
if (kind == FieldKind::PRIMITIVE) { if (kind == FieldKind::PRIMITIVE) {
return FieldText { return FieldText {
kj::strTree( kj::strTree(
kj::mv(unionDiscrim.readerIsDecl), kj::mv(unionDiscrim.readerIsDecl),
spaces(indent), " public final ", type, " get", titleCase, "() {\n", spaces(indent), " public final ", type, " get", titleCase, "() {\n",
spaces(indent),
(typeBody.which() == schema::Type::ENUM ? (typeBody.which() == schema::Type::ENUM ?
kj::strTree(" return org.capnproto.GeneratedClassSupport.clampOrdinal(", type, ".values(),", makeEnumGetter(structSchema.getDependency(typeBody.getEnum().getTypeId()).asEnum(),
"_reader.getShortField(", offset, "));\n") : kj::str("_reader"), offset, indent + 2) :
(typeBody.which() == schema::Type::VOID ? (typeBody.which() == schema::Type::VOID ?
kj::strTree(" return org.capnproto.Void.VOID;\n") : kj::strTree(spaces(indent), " return org.capnproto.Void.VOID;\n") :
kj::strTree(" return _reader.get",toTitleCase(type),"Field(", offset, defaultMaskParam, ");\n"))), kj::strTree(spaces(indent), " return _reader.get",toTitleCase(type),"Field(", offset, defaultMaskParam, ");\n"))),
spaces(indent), " }\n", spaces(indent), " }\n",
"\n"), "\n"),
kj::strTree( kj::strTree(
kj::mv(unionDiscrim.builderIsDecl), kj::mv(unionDiscrim.builderIsDecl),
spaces(indent), " public final ", type, " get", titleCase, "() {\n", spaces(indent), " public final ", type, " get", titleCase, "() {\n",
spaces(indent),
(typeBody.which() == schema::Type::ENUM ? (typeBody.which() == schema::Type::ENUM ?
kj::strTree(" return org.capnproto.GeneratedClassSupport.clampOrdinal(", type, ".values(),", makeEnumGetter(structSchema.getDependency(typeBody.getEnum().getTypeId()).asEnum(),
"_builder.getShortField(", offset, "));\n") : kj::str("_builder"), offset, indent + 2) :
(typeBody.which() == schema::Type::VOID ? (typeBody.which() == schema::Type::VOID ?
kj::strTree(" return org.capnproto.Void.VOID;\n") : kj::strTree(spaces(indent), " return org.capnproto.Void.VOID;\n") :
kj::strTree(" return _builder.get",toTitleCase(type),"Field(", offset, defaultMaskParam, ");\n"))), kj::strTree(spaces(indent), " return _builder.get",toTitleCase(type),"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, "(", type, " value) {\n",