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

Void is an actual value

Browse source
This commit is contained in:
David Renshaw 2014-05-28 19:17:27 -04:00
parent 9db39d563e
commit ea641a6736
3 changed files with 18 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -245,7 +245,7 @@ private:
kj::StringTree typeName(schema::Type::Reader type) { kj::StringTree typeName(schema::Type::Reader type) {
switch (type.which()) { switch (type.which()) {
case schema::Type::VOID: return kj::strTree("void"); case schema::Type::VOID: return kj::strTree("org.capnproto.Void");
case schema::Type::BOOL: return kj::strTree("boolean"); case schema::Type::BOOL: return kj::strTree("boolean");
case schema::Type::INT8: return kj::strTree("byte"); case schema::Type::INT8: return kj::strTree("byte");
@ -802,7 +802,7 @@ private:
(typeBody.which() == schema::Type::ENUM ? (typeBody.which() == schema::Type::ENUM ?
kj::strTree(" return ", type, ".values()[_reader.getShortField(", offset, ")];\n") : kj::strTree(" return ", type, ".values()[_reader.getShortField(", offset, ")];\n") :
(typeBody.which() == schema::Type::VOID ? (typeBody.which() == schema::Type::VOID ?
kj::strTree(" // nothing to return\n") : kj::strTree(" return org.capnproto.Void.VOID;\n") :
kj::strTree(" return _reader.get",toTitleCase(type),"Field(", offset, ");\n"))), kj::strTree(" return _reader.get",toTitleCase(type),"Field(", offset, ");\n"))),
spaces(indent), " }\n", spaces(indent), " }\n",
"\n"), "\n"),
@ -814,26 +814,19 @@ private:
(typeBody.which() == schema::Type::ENUM ? (typeBody.which() == schema::Type::ENUM ?
kj::strTree(" return ", type, ".values()[_builder.getShortField(", offset, ")];\n") : kj::strTree(" return ", type, ".values()[_builder.getShortField(", offset, ")];\n") :
(typeBody.which() == schema::Type::VOID ? (typeBody.which() == schema::Type::VOID ?
kj::strTree(" // nothing to return\n") : kj::strTree(" return org.capnproto.Void.VOID;\n") :
kj::strTree(" return _builder.get",toTitleCase(type),"Field(", offset, ");\n"))), kj::strTree(" return _builder.get",toTitleCase(type),"Field(", offset, ");\n"))),
spaces(indent), " }\n", spaces(indent), " }\n",
(typeBody.which() == schema::Type::VOID ? spaces(indent), " public final void set", titleCase, "(", type, " value) {\n",
kj::strTree(spaces(indent), " public final void set", titleCase, "() {\n",
unionDiscrim.set, unionDiscrim.set,
spaces(indent), " }\n") :
(typeBody.which() == schema::Type::ENUM ? (typeBody.which() == schema::Type::ENUM ?
kj::strTree( kj::strTree(spaces(indent), " _builder.setShortField(", offset, ", (short)value.ordinal());\n") :
spaces(indent), " public final void set", titleCase, "(", type, " value) {\n", (typeBody.which() == schema::Type::VOID ?
unionDiscrim.set, kj::strTree() :
spaces(indent), " _builder.setShortField(", offset, ", (short)value.ordinal());\n", kj::strTree(spaces(indent), " _builder.set",
spaces(indent), " }\n") : toTitleCase(type), "Field(", offset, ", value);\n"))),
kj::strTree( spaces(indent), " }\n",
spaces(indent), " public final void set", titleCase, "(", type, " value) {\n",
unionDiscrim.set,
spaces(indent), " _builder.set", toTitleCase(type),
"Field(", offset, ", value);\n",
spaces(indent), " }\n"))),
"\n"), "\n"),
kj::strTree(), kj::strTree(),

2
examples/src/main/java/org/capnproto/examples/AddressbookMain.java
View file

@ -40,7 +40,7 @@ public class AddressbookMain {
bobPhones.get(0).setType(Person.PhoneNumber.Type.HOME); bobPhones.get(0).setType(Person.PhoneNumber.Type.HOME);
bobPhones.get(1).setNumber(new Text.Reader("555-7654")); bobPhones.get(1).setNumber(new Text.Reader("555-7654"));
bobPhones.get(1).setType(Person.PhoneNumber.Type.WORK); bobPhones.get(1).setType(Person.PhoneNumber.Type.WORK);
bob.getEmployment().setUnemployed(); bob.getEmployment().setUnemployed(org.capnproto.Void.VOID);
Serialize.writeMessage((new FileOutputStream(FileDescriptor.out)).getChannel(), Serialize.writeMessage((new FileOutputStream(FileDescriptor.out)).getChannel(),
message); message);

5
runtime/src/main/java/org/capnproto/Void.java Normal file
View file

@ -0,0 +1,5 @@
package org.capnproto;
public enum Void {
VOID
}