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

remove an unneeded field and add more tests

Browse source
This commit is contained in:
David Renshaw 2014-09-02 17:44:27 -04:00
parent 957b513c99
commit 3d56bf3bcb
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1422,7 +1422,6 @@ private:
}; };
struct NodeTextNoSchema { struct NodeTextNoSchema {
kj::StringTree outerTypeDecl;
kj::StringTree outerTypeDef; kj::StringTree outerTypeDef;
kj::StringTree readerBuilderDefs; kj::StringTree readerBuilderDefs;
kj::StringTree inlineMethodDefs; kj::StringTree inlineMethodDefs;
@ -1531,10 +1530,8 @@ private:
scope, name, schema, scope, name, schema,
KJ_MAP(n, nestedTexts) { return kj::mv(n.outerTypeDef); }, indent); KJ_MAP(n, nestedTexts) { return kj::mv(n.outerTypeDef); }, indent);
KJ_LOG(ERROR, top.outerTypeDecl);
return NodeText { return NodeText {
kj::mv(top.outerTypeDecl), kj::strTree(),
kj::strTree( kj::strTree(
kj::mv(top.outerTypeDef), kj::mv(top.outerTypeDef),
@ -1588,7 +1585,6 @@ private:
auto structNode = proto.getStruct(); auto structNode = proto.getStruct();
return NodeTextNoSchema { return NodeTextNoSchema {
kj::mv(structText.outerTypeDecl),
kj::mv(structText.outerTypeDef), kj::mv(structText.outerTypeDef),
kj::mv(structText.readerBuilderDefs), kj::mv(structText.readerBuilderDefs),
kj::mv(structText.inlineMethodDefs), kj::mv(structText.inlineMethodDefs),
@ -1604,8 +1600,6 @@ private:
auto enumerants = schema.asEnum().getEnumerants(); auto enumerants = schema.asEnum().getEnumerants();
return NodeTextNoSchema { return NodeTextNoSchema {
kj::strTree(),
kj::strTree( kj::strTree(
spaces(indent), "public enum ", name, " {\n", spaces(indent), "public enum ", name, " {\n",
KJ_MAP(e, enumerants) { KJ_MAP(e, enumerants) {
@ -1633,7 +1627,6 @@ private:
auto constText = makeConstText(scope, name, schema.asConst()); auto constText = makeConstText(scope, name, schema.asConst());
return NodeTextNoSchema { return NodeTextNoSchema {
kj::strTree(),
kj::mv(constText.decl), kj::mv(constText.decl),
kj::strTree(), kj::strTree(),
kj::strTree(), kj::strTree(),
@ -1653,7 +1646,6 @@ private:
kj::strTree(), kj::strTree(),
kj::strTree(), kj::strTree(),
kj::strTree(), kj::strTree(),
kj::strTree(),
}; };
} }
} }

7
compiler/src/test/scala/org/capnproto/EncodingTest.scala
View file

@ -34,6 +34,13 @@ class EncodingSuite extends FunSuite {
test("Constants") { test("Constants") {
assert(true == TestConstants.BOOL_CONST); assert(true == TestConstants.BOOL_CONST);
assert(-123 == TestConstants.INT8_CONST);
assert(-12345 == TestConstants.INT16_CONST);
assert(-12345678 == TestConstants.INT32_CONST);
assert(-123456789012345L == TestConstants.INT64_CONST);
assert(1234.5f == TestConstants.FLOAT32_CONST);
assert(-123e45 == TestConstants.FLOAT64_CONST);
} }