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

stop using getDependency()

Browse source
This commit is contained in:
David Renshaw 2014-10-25 22:01:33 -04:00
parent c3f39801ca
commit 8599ffc7a7
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -549,7 +549,7 @@ private:
break; break;
} }
case schema::Field::GROUP: case schema::Field::GROUP:
getSlots(schema.getDependency(proto.getGroup().getTypeId()).asStruct(), slots); getSlots(field.getType().asStruct(), slots);
break; break;
} }
} }
@ -651,7 +651,7 @@ private:
ANY_POINTER ANY_POINTER
}; };
kj::StringTree makeEnumGetter(EnumSchema schema, kj::String member, uint offset, kj::String defaultMaskParam, int indent) { kj::StringTree makeEnumGetter(EnumSchema schema, uint offset, kj::String defaultMaskParam, int indent) {
auto enumerants = schema.getEnumerants(); auto enumerants = schema.getEnumerants();
return kj::strTree( return kj::strTree(
spaces(indent), "switch(_getShortField(", offset, defaultMaskParam, ")) {\n", spaces(indent), "switch(_getShortField(", offset, defaultMaskParam, ")) {\n",
@ -865,8 +865,8 @@ private:
spaces(indent), " public final ", type, " get", titleCase, "() {\n", spaces(indent), " public final ", type, " get", titleCase, "() {\n",
unionDiscrim.check, unionDiscrim.check,
(typeBody.which() == schema::Type::ENUM ? (typeBody.which() == schema::Type::ENUM ?
makeEnumGetter(structSchema.getDependency(typeBody.getEnum().getTypeId()).asEnum(), makeEnumGetter(field.getType().asEnum(),
kj::str("_reader"), 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(type),"Field(", offset, defaultMaskParam, ");\n"))),
@ -878,8 +878,8 @@ private:
spaces(indent), " public final ", type, " get", titleCase, "() {\n", spaces(indent), " public final ", type, " get", titleCase, "() {\n",
unionDiscrim.check, unionDiscrim.check,
(typeBody.which() == schema::Type::ENUM ? (typeBody.which() == schema::Type::ENUM ?
makeEnumGetter(structSchema.getDependency(typeBody.getEnum().getTypeId()).asEnum(), makeEnumGetter(field.getType().asEnum(),
kj::str("_builder"), 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(type),"Field(", offset, defaultMaskParam, ");\n"))),