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

Fixed code generator. Added missing union type initialization when using lists in unions.

Browse source
This commit is contained in:
Amer Banet 2016-12-16 19:51:16 +01:00
parent 99107e64a5
commit cb0fdba7b8
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1177,6 +1177,7 @@ private:
spaces(indent), " }\n", spaces(indent), " }\n",
spaces(indent), " public final ", builderType, " init", titleCase, "(int size) {\n", spaces(indent), " public final ", builderType, " init", titleCase, "(int size) {\n",
unionDiscrim.set,
spaces(indent), " return _initPointerField(", factory, ", ", offset, ", size);\n", spaces(indent), " return _initPointerField(", factory, ", ", offset, ", size);\n",
spaces(indent), " }\n"), spaces(indent), " }\n"),
}; };
@ -1273,11 +1274,13 @@ private:
"> ")), "> ")),
"void set", titleCase, "void set", titleCase,
"(org.capnproto.SetPointerBuilder<", builderType, ", ", readerType, "> factory, ", readerType, " value) {\n", "(org.capnproto.SetPointerBuilder<", builderType, ", ", readerType, "> factory, ", readerType, " value) {\n",
unionDiscrim.set,
spaces(indent), " _setPointerField(factory, ", offset, ", value);\n", spaces(indent), " _setPointerField(factory, ", offset, ", value);\n",
spaces(indent), " }\n" spaces(indent), " }\n"
) : ) :
kj::strTree( kj::strTree(
spaces(indent), " public final void set", titleCase, "(", readerType, " value) {\n", spaces(indent), " public final void set", titleCase, "(", readerType, " value) {\n",
unionDiscrim.set,
spaces(indent), " _setPointerField(", listFactory, ", ", offset, ", value);\n", spaces(indent), " _setPointerField(", listFactory, ", ", offset, ", value);\n",
spaces(indent), " }\n" spaces(indent), " }\n"
) )
@ -1295,12 +1298,14 @@ private:
"> ")), "> ")),
builderType, builderType,
" init", titleCase, "( org.capnproto.ListFactory<", builderType, ", ", readerType, "> factory, int size) {\n", " init", titleCase, "( org.capnproto.ListFactory<", builderType, ", ", readerType, "> factory, int size) {\n",
unionDiscrim.set,
spaces(indent), " return _initPointerField(factory, ", offset, ", size);\n", spaces(indent), " return _initPointerField(factory, ", offset, ", size);\n",
spaces(indent), " }\n" spaces(indent), " }\n"
) : ) :
kj::strTree( kj::strTree(
spaces(indent), " public final ", builderType, spaces(indent), " public final ", builderType,
" init", titleCase, "(int size) {\n", " init", titleCase, "(int size) {\n",
unionDiscrim.set,
spaces(indent), " return _initPointerField(", listFactory, ", ", offset, ", size);\n", spaces(indent), " return _initPointerField(", listFactory, ", ", offset, ", size);\n",
spaces(indent), " }\n") spaces(indent), " }\n")
) )