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

some cleanup

Browse source
This commit is contained in:
David Renshaw 2014-10-28 17:27:02 -04:00
parent 20c20702e1
commit 5f4a5f79ed
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1116,7 +1116,7 @@ private:
spaces(indent), " return !_pointerFieldIsNull(", offset, ");\n", spaces(indent), " return !_pointerFieldIsNull(", offset, ");\n",
spaces(indent), " }\n", spaces(indent), " }\n",
spaces(indent), " public ", type, ".Reader", spaces(indent), " public ", readerType,
" get", titleCase, "() {\n", " get", titleCase, "() {\n",
spaces(indent), " return _getPointerField(", factory, ", ", spaces(indent), " return _getPointerField(", factory, ", ",
offset, ", ", defaultParams, ");\n", offset, ", ", defaultParams, ");\n",
@ -1128,21 +1128,21 @@ private:
unionDiscrim.has, unionDiscrim.has,
spaces(indent), " return !_pointerFieldIsNull(", offset, ");\n", spaces(indent), " return !_pointerFieldIsNull(", offset, ");\n",
spaces(indent), " }\n", spaces(indent), " }\n",
spaces(indent), " public final ", type, ".Builder get", titleCase, "() {\n", spaces(indent), " public final ", builderType, " get", titleCase, "() {\n",
spaces(indent), " return _getPointerField(", factory, ", ", spaces(indent), " return _getPointerField(", factory, ", ",
offset, ", ", defaultParams, ");\n", offset, ", ", defaultParams, ");\n",
spaces(indent), " }\n", spaces(indent), " }\n",
spaces(indent), " public final void set", titleCase, "(", type, ".Reader value) {\n", spaces(indent), " public final void set", titleCase, "(", readerType, " value) {\n",
unionDiscrim.set, unionDiscrim.set,
spaces(indent), " _setPointerField(", factory, ", ", offset, ", value);\n", spaces(indent), " _setPointerField(", factory, ", ", offset, ", value);\n",
spaces(indent), " }\n", spaces(indent), " }\n",
spaces(indent), " public final void set", titleCase, "(", setterInputType, " value) {\n", spaces(indent), " public final void set", titleCase, "(", setterInputType, " value) {\n",
unionDiscrim.set, unionDiscrim.set,
spaces(indent), " _setPointerField(", factory, ", ", offset, ", new", spaces(indent), " _setPointerField(", factory, ", ", offset, ", new ",
type, ".Reader(value));\n", readerType, "(value));\n",
spaces(indent), " }\n", spaces(indent), " }\n",
spaces(indent), " public final ", type, ".Builder init", titleCase, "(int size) {\n", spaces(indent), " public final ", builderType, " init", titleCase, "(int size) {\n",
spaces(indent), " return _initPointerField(", factory, ", ", offset, ", size);\n", spaces(indent), " return _initPointerField(", factory, ", ", offset, ", size);\n",
spaces(indent), " }\n"), spaces(indent), " }\n"),
}; };
@ -1153,8 +1153,6 @@ private:
"Schemas.b_", kj::hex(typeId), ", ", defaultOffset); "Schemas.b_", kj::hex(typeId), ", ", defaultOffset);
kj::String listFactory = makeFactoryArg(field.getType()); kj::String listFactory = makeFactoryArg(field.getType());
kj::String readerClass = kj::str(typeName(field.getType(), kj::str(".Reader")));
kj::String builderClass = kj::str(typeName(field.getType(), kj::str(".Builder")));
return FieldText { return FieldText {
kj::strTree( kj::strTree(
@ -1163,7 +1161,7 @@ private:
spaces(indent), " return !_pointerFieldIsNull(", offset, ");\n", spaces(indent), " return !_pointerFieldIsNull(", offset, ");\n",
spaces(indent), " }\n", spaces(indent), " }\n",
spaces(indent), " public final ", readerClass, spaces(indent), " public final ", readerType,
" get", titleCase, "() {\n", " get", titleCase, "() {\n",
spaces(indent), " return _getPointerField(", listFactory, ", ", offset, ", ", defaultParams, ");\n", spaces(indent), " return _getPointerField(", listFactory, ", ", offset, ", ", defaultParams, ");\n",
spaces(indent), " }\n", spaces(indent), " }\n",
@ -1175,16 +1173,16 @@ private:
spaces(indent), " return !_pointerFieldIsNull(", offset, ");\n", spaces(indent), " return !_pointerFieldIsNull(", offset, ");\n",
spaces(indent), " }\n", spaces(indent), " }\n",
spaces(indent), " public final ", builderClass, spaces(indent), " public final ", builderType,
" get", titleCase, "() {\n", " get", titleCase, "() {\n",
spaces(indent), " return _getPointerField(", listFactory, ", ", offset, ", ", defaultParams, ");\n", spaces(indent), " return _getPointerField(", listFactory, ", ", offset, ", ", defaultParams, ");\n",
spaces(indent), " }\n", spaces(indent), " }\n",
spaces(indent), " public final void set", titleCase, "(", readerClass, " value) {\n", spaces(indent), " public final void set", titleCase, "(", readerType, " value) {\n",
spaces(indent), " _setPointerField(", listFactory, ", ", offset, ", value);\n", spaces(indent), " _setPointerField(", listFactory, ", ", offset, ", value);\n",
spaces(indent), " }\n", spaces(indent), " }\n",
spaces(indent), " public final ", builderClass, spaces(indent), " public final ", builderType,
" init", titleCase, "(int size) {\n", " init", titleCase, "(int size) {\n",
spaces(indent), " return _initPointerField(", listFactory, ", ", offset, ", size);\n", spaces(indent), " return _initPointerField(", listFactory, ", ", offset, ", size);\n",
spaces(indent), " }\n"), spaces(indent), " }\n"),